PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Update for 1.203.22

Browse Source
This commit is contained in:
pas2704
2023-08-31 23:53:46 -04:00
parent d7e5f53e4f
commit 1b2a989441
11 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Torch.API/Torch.API.csproj
View File

@@ -22,7 +22,7 @@
<PackageReference Include="NuGet.Commands" Version="6.6.1" /> <PackageReference Include="NuGet.Commands" Version="6.6.1" />
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.6.1" /> <PackageReference Include="NuGet.DependencyResolver.Core" Version="6.6.1" />
<PackageReference Include="SemanticVersioning" Version="2.0.2" /> <PackageReference Include="SemanticVersioning" Version="2.0.2" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.124"> <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile</IncludeAssets> <IncludeAssets>compile</IncludeAssets>
</PackageReference> </PackageReference>

6
Torch.API/packages.lock.json
View File

@@ -54,9 +54,9 @@
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct", "type": "Direct",
"requested": "[1.202.124, )", "requested": "[1.203.22, )",
"resolved": "1.202.124", "resolved": "1.203.22",
"contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==", "contentHash": "ruf6DT1sAh2DnpsJUsGG4ZSdPKrVr5ReKfHSDcYggeacge/nsdqpcij53HSNwnMxve6cfnTRG9SXE2iGSGEtEQ==",
"dependencies": { "dependencies": {
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
} }

2
Torch.Server.ReferenceAssemblies.net7.nuspec
View File

@@ -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.120" /> <dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.203.22" />
<dependency id="Torch.Server" version="torchVersion" /> <dependency id="Torch.Server" version="torchVersion" />
</group> </group>
</dependencies> </dependencies>

5
Torch.Server/Managers/InstanceManager.cs
View File

@@ -28,6 +28,7 @@ using VRage.FileSystem;
using VRage.Game; using VRage.Game;
using VRage.Game.ObjectBuilder; using VRage.Game.ObjectBuilder;
using VRage.ObjectBuilders; using VRage.ObjectBuilders;
using VRage.ObjectBuilders.Private;
using VRage.Plugins; using VRage.Plugins;
namespace Torch.Server.Managers namespace Torch.Server.Managers
@@ -363,10 +364,10 @@ namespace Torch.Server.Managers
public void SaveSandbox() public void SaveSandbox()
{ {
using (var f = File.Open(_checkpointPath, FileMode.Create)) using (var f = File.Open(_checkpointPath, FileMode.Create))
MyObjectBuilderSerializer.SerializeXML(f, Checkpoint); MyObjectBuilderSerializerKeen.SerializeXML(f, Checkpoint);
using (var f = File.Open(_worldConfigPath, FileMode.Create)) using (var f = File.Open(_worldConfigPath, FileMode.Create))
MyObjectBuilderSerializer.SerializeXML(f, WorldConfiguration); MyObjectBuilderSerializerKeen.SerializeXML(f, WorldConfiguration);
} }
public void LoadSandbox() public void LoadSandbox()

2
Torch.Server/Torch.Server.csproj
View File

@@ -50,7 +50,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.2" /> <PackageReference Include="System.Management" Version="7.0.2" />
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.5" /> <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.5" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.124"> <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile</IncludeAssets> <IncludeAssets>compile</IncludeAssets>
</PackageReference> </PackageReference>

6
Torch.Server/packages.lock.json
View File

@@ -113,9 +113,9 @@
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct", "type": "Direct",
"requested": "[1.202.124, )", "requested": "[1.203.22, )",
"resolved": "1.202.124", "resolved": "1.203.22",
"contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==", "contentHash": "ruf6DT1sAh2DnpsJUsGG4ZSdPKrVr5ReKfHSDcYggeacge/nsdqpcij53HSNwnMxve6cfnTRG9SXE2iGSGEtEQ==",
"dependencies": { "dependencies": {
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
} }

5
Torch/Managers/EntityManager.cs
View File

@@ -27,6 +27,7 @@ using VRage.Game.ModAPI;
using VRage.Groups; using VRage.Groups;
using VRage.ModAPI; using VRage.ModAPI;
using VRage.ObjectBuilders; using VRage.ObjectBuilders;
using VRage.ObjectBuilders.Private;
using VRage.Sync; using VRage.Sync;
using VRageMath; using VRageMath;
@@ -45,14 +46,14 @@ namespace Torch.Managers
{ {
var ob = grid.GetObjectBuilder(true); var ob = grid.GetObjectBuilder(true);
using (var f = File.Open(path, FileMode.CreateNew)) using (var f = File.Open(path, FileMode.CreateNew))
MyObjectBuilderSerializer.SerializeXML(f, ob); MyObjectBuilderSerializerKeen.SerializeXML(f, ob);
} }
public void ImportGrid(string path, Vector3D position) public void ImportGrid(string path, Vector3D position)
{ {
MyObjectBuilder_EntityBase gridOb; MyObjectBuilder_EntityBase gridOb;
using (var f = File.OpenRead(path)) using (var f = File.OpenRead(path))
MyObjectBuilderSerializer.DeserializeXML(f, out gridOb); MyObjectBuilderSerializerKeen.DeserializeXML(f, out gridOb);
var grid = MyEntities.CreateFromObjectBuilderParallel(gridOb); var grid = MyEntities.CreateFromObjectBuilderParallel(gridOb);
grid.PositionComp.SetPosition(position); grid.PositionComp.SetPosition(position);

2
Torch/Managers/ScriptCompilationManager.cs
View File

@@ -82,7 +82,7 @@ public class ScriptCompilationManager : Manager
TerminationReasonSetter(block, MyProgrammableBlock.ScriptTerminationReason.None); TerminationReasonSetter(block, MyProgrammableBlock.ScriptTerminationReason.None);
var component = ScriptComponentGetter(block); var component = ScriptComponentGetter(block);
component.NextUpdate = UpdateType.None; component.UpdateFrequency = UpdateFrequency.None;
component.NeedsUpdate = MyEntityUpdateEnum.NONE; component.NeedsUpdate = MyEntityUpdateEnum.NONE;
try try

5
Torch/Patches/KeenLogPatch.cs
View File

@@ -78,6 +78,9 @@ namespace Torch.Patches
[ReflectedSetter(Name = "m_enabled")] [ReflectedSetter(Name = "m_enabled")]
private static Action<MyLog, bool> _enabledSetter = null!; private static Action<MyLog, bool> _enabledSetter = null!;
[ReflectedMethod(Type = typeof(MyLog), Name = "LogFlag")]
private static Func<MyLog, LoggingOptions, bool> _logFlag = null!;
private static int GetIndentByCurrentThread() private static int GetIndentByCurrentThread()
{ {
@@ -122,7 +125,7 @@ namespace Torch.Patches
} }
private static bool PrefixWriteLineOptions(MyLog __instance, string message, LoggingOptions option) private static bool PrefixWriteLineOptions(MyLog __instance, string message, LoggingOptions option)
{ {
if (__instance.LogEnabled && __instance.LogFlag(option) && _log.IsDebugEnabled) if (__instance.LogEnabled && _logFlag(__instance, option) && _log.IsDebugEnabled)
_log.Info($"{string.Empty.PadRight(3 * GetIndentByCurrentThread(), ' ')}{message}"); _log.Info($"{string.Empty.PadRight(3 * GetIndentByCurrentThread(), ' ')}{message}");
return false; return false;
} }

2
Torch/Torch.csproj
View File

@@ -35,7 +35,7 @@
<PackageReference Include="protobuf-net" Version="3.2.26" /> <PackageReference Include="protobuf-net" Version="3.2.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.124"> <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>compile</IncludeAssets> <IncludeAssets>compile</IncludeAssets>
</PackageReference> </PackageReference>

6
Torch/packages.lock.json
View File

@@ -100,9 +100,9 @@
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct", "type": "Direct",
"requested": "[1.202.124, )", "requested": "[1.203.22, )",
"resolved": "1.202.124", "resolved": "1.203.22",
"contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==", "contentHash": "ruf6DT1sAh2DnpsJUsGG4ZSdPKrVr5ReKfHSDcYggeacge/nsdqpcij53HSNwnMxve6cfnTRG9SXE2iGSGEtEQ==",
"dependencies": { "dependencies": {
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
} }