Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
f21976cf2d | |||
0c918106bc | |||
6c9ec57d87 | |||
![]() |
b0f491ac88 |
@@ -21,7 +21,7 @@
|
|||||||
<PackageReference Include="NuGet.Commands" Version="6.4.0" />
|
<PackageReference Include="NuGet.Commands" Version="6.4.0" />
|
||||||
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.4.0" />
|
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.4.0" />
|
||||||
<PackageReference Include="SemanticVersioning" Version="2.0.2" />
|
<PackageReference Include="SemanticVersioning" Version="2.0.2" />
|
||||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.66">
|
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.117">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>compile</IncludeAssets>
|
<IncludeAssets>compile</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
@@ -43,9 +43,9 @@
|
|||||||
},
|
},
|
||||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[1.202.66, )",
|
"requested": "[1.202.117, )",
|
||||||
"resolved": "1.202.66",
|
"resolved": "1.202.117",
|
||||||
"contentHash": "VTOwwfTPnov6WWJNrsmB9lWs5s+6XVUXtV8SgLvgJTswK11MTA0e+TZFfZJoSZ1WUsE2dvxlMrNOYJ6aL6j0wA==",
|
"contentHash": "eMyu/AJiKxgmQqMiMUuyL+XdHgNpzw6AfpL6OJkYugXnOJQ10tU8sVvEpmlPqIjWGcRrOhyA6bIGIN4s0JyyUw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"protobuf-net": "1.0.0"
|
"protobuf-net": "1.0.0"
|
||||||
}
|
}
|
||||||
|
@@ -11,7 +11,7 @@
|
|||||||
<repository type="git" url="https://github.com/PveTeam/Torch" />
|
<repository type="git" url="https://github.com/PveTeam/Torch" />
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<group targetFramework="net7.0-windows7.0">
|
<group targetFramework="net7.0-windows7.0">
|
||||||
<dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.202.66" />
|
<dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.202.117" />
|
||||||
<dependency id="Torch.Server" version="torchVersion" />
|
<dependency id="Torch.Server" version="torchVersion" />
|
||||||
</group>
|
</group>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@@ -30,7 +30,7 @@ namespace Torch.Server
|
|||||||
private const string TOOL_DIR = "tool";
|
private const string TOOL_DIR = "tool";
|
||||||
private const string TOOL_ZIP = "temp.zip";
|
private const string TOOL_ZIP = "temp.zip";
|
||||||
private static readonly string TOOL_EXE = "DepotDownloader.exe";
|
private static readonly string TOOL_EXE = "DepotDownloader.exe";
|
||||||
private const string TOOL_ARGS = "-app 298740 -depot {1} -dir \"{0}\"";
|
private const string TOOL_ARGS = "-app 298740 -depot {1} -dir \"{0}\" -manifest {2}";
|
||||||
private static readonly int[] Depots = { 298741, 1004 };
|
private static readonly int[] Depots = { 298741, 1004 };
|
||||||
private TorchServer _server;
|
private TorchServer _server;
|
||||||
|
|
||||||
@@ -123,6 +123,8 @@ namespace Torch.Server
|
|||||||
Config.TempAutostart = false;
|
Config.TempAutostart = false;
|
||||||
_server.Start();
|
_server.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
uiThread.Join();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,7 +172,7 @@ namespace Torch.Server
|
|||||||
{
|
{
|
||||||
var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
|
var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
|
||||||
{
|
{
|
||||||
Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../"), depotId),
|
Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../"), depotId, "3215730643277932637"),
|
||||||
WorkingDirectory = path,
|
WorkingDirectory = path,
|
||||||
RedirectStandardOutput = true
|
RedirectStandardOutput = true
|
||||||
};
|
};
|
||||||
|
@@ -51,7 +51,7 @@
|
|||||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||||
<PackageReference Include="System.Management" Version="7.0.0" />
|
<PackageReference Include="System.Management" Version="7.0.0" />
|
||||||
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.3" />
|
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.3" />
|
||||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.66">
|
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.117">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>compile</IncludeAssets>
|
<IncludeAssets>compile</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
@@ -122,9 +122,9 @@
|
|||||||
},
|
},
|
||||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[1.202.66, )",
|
"requested": "[1.202.117, )",
|
||||||
"resolved": "1.202.66",
|
"resolved": "1.202.117",
|
||||||
"contentHash": "VTOwwfTPnov6WWJNrsmB9lWs5s+6XVUXtV8SgLvgJTswK11MTA0e+TZFfZJoSZ1WUsE2dvxlMrNOYJ6aL6j0wA==",
|
"contentHash": "eMyu/AJiKxgmQqMiMUuyL+XdHgNpzw6AfpL6OJkYugXnOJQ10tU8sVvEpmlPqIjWGcRrOhyA6bIGIN4s0JyyUw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"protobuf-net": "1.0.0"
|
"protobuf-net": "1.0.0"
|
||||||
}
|
}
|
||||||
|
@@ -35,7 +35,7 @@
|
|||||||
<PackageReference Include="protobuf-net" Version="3.1.26" />
|
<PackageReference Include="protobuf-net" Version="3.1.26" />
|
||||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||||
<PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
|
<PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
|
||||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.66">
|
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.117">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>compile</IncludeAssets>
|
<IncludeAssets>compile</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
@@ -165,7 +165,7 @@ namespace Torch
|
|||||||
_tweakGameSettings();
|
_tweakGameSettings();
|
||||||
|
|
||||||
MyFileSystem.Reset();
|
MyFileSystem.Reset();
|
||||||
MyInitializer.InvokeBeforeRun(_appSteamId, _appName, _userDataPath);
|
MyInitializer.InvokeBeforeRun(_appSteamId, _appName, MyVRage.Platform.System.GetRootPath(), _userDataPath);
|
||||||
|
|
||||||
_log.Info("Loading Dedicated Config");
|
_log.Info("Loading Dedicated Config");
|
||||||
// object created in SpaceEngineersGame.SetupPerGameSettings()
|
// object created in SpaceEngineersGame.SetupPerGameSettings()
|
||||||
@@ -193,7 +193,7 @@ namespace Torch
|
|||||||
{
|
{
|
||||||
service = MyEOSService.Create();
|
service = MyEOSService.Create();
|
||||||
|
|
||||||
MyEOSService.InitNetworking(dedicated,
|
MyEOSService.InitNetworking(dedicated, true, //true because using Eos
|
||||||
"Space Engineers",
|
"Space Engineers",
|
||||||
service,
|
service,
|
||||||
"xyza7891A4WeGrpP85BTlBa3BSfUEABN",
|
"xyza7891A4WeGrpP85BTlBa3BSfUEABN",
|
||||||
@@ -225,7 +225,8 @@ namespace Torch
|
|||||||
|
|
||||||
MyGameService.WorkshopService.AddAggregate(MyModIoService.Create(service, "spaceengineers", "264",
|
MyGameService.WorkshopService.AddAggregate(MyModIoService.Create(service, "spaceengineers", "264",
|
||||||
"1fb4489996a5e8ffc6ec1135f9985b5b", "331", "f2b64abe55452252b030c48adc0c1f0e",
|
"1fb4489996a5e8ffc6ec1135f9985b5b", "331", "f2b64abe55452252b030c48adc0c1f0e",
|
||||||
MyPlatformGameSettings.UGC_TEST_ENVIRONMENT, true));
|
MyPlatformGameSettings.UGC_TEST_ENVIRONMENT, true, MyPlatformGameSettings.MODIO_PLATFORM,
|
||||||
|
MyPlatformGameSettings.MODIO_PORTAL));
|
||||||
|
|
||||||
if (!isEos && !MyGameService.HasGameServer)
|
if (!isEos && !MyGameService.HasGameServer)
|
||||||
{
|
{
|
||||||
|
@@ -102,9 +102,9 @@
|
|||||||
},
|
},
|
||||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[1.202.66, )",
|
"requested": "[1.202.117, )",
|
||||||
"resolved": "1.202.66",
|
"resolved": "1.202.117",
|
||||||
"contentHash": "VTOwwfTPnov6WWJNrsmB9lWs5s+6XVUXtV8SgLvgJTswK11MTA0e+TZFfZJoSZ1WUsE2dvxlMrNOYJ6aL6j0wA==",
|
"contentHash": "eMyu/AJiKxgmQqMiMUuyL+XdHgNpzw6AfpL6OJkYugXnOJQ10tU8sVvEpmlPqIjWGcRrOhyA6bIGIN4s0JyyUw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"protobuf-net": "1.0.0"
|
"protobuf-net": "1.0.0"
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user