From 1b2a989441306bca91677474d6d144a73872884f Mon Sep 17 00:00:00 2001 From: pas2704 Date: Thu, 31 Aug 2023 23:53:46 -0400 Subject: [PATCH] Update for 1.203.22 --- Torch.API/Torch.API.csproj | 2 +- Torch.API/packages.lock.json | 6 +++--- Torch.Server.ReferenceAssemblies.net7.nuspec | 2 +- Torch.Server/Managers/InstanceManager.cs | 5 +++-- Torch.Server/Torch.Server.csproj | 2 +- Torch.Server/packages.lock.json | 6 +++--- Torch/Managers/EntityManager.cs | 5 +++-- Torch/Managers/ScriptCompilationManager.cs | 2 +- Torch/Patches/KeenLogPatch.cs | 5 ++++- Torch/Torch.csproj | 2 +- Torch/packages.lock.json | 6 +++--- 11 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj index 8cb8c67..0408475 100644 --- a/Torch.API/Torch.API.csproj +++ b/Torch.API/Torch.API.csproj @@ -22,7 +22,7 @@ - + all compile diff --git a/Torch.API/packages.lock.json b/Torch.API/packages.lock.json index c692f40..5c0dd22 100644 --- a/Torch.API/packages.lock.json +++ b/Torch.API/packages.lock.json @@ -54,9 +54,9 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Direct", - "requested": "[1.202.124, )", - "resolved": "1.202.124", - "contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==", + "requested": "[1.203.22, )", + "resolved": "1.203.22", + "contentHash": "ruf6DT1sAh2DnpsJUsGG4ZSdPKrVr5ReKfHSDcYggeacge/nsdqpcij53HSNwnMxve6cfnTRG9SXE2iGSGEtEQ==", "dependencies": { "protobuf-net": "1.0.0" } diff --git a/Torch.Server.ReferenceAssemblies.net7.nuspec b/Torch.Server.ReferenceAssemblies.net7.nuspec index 0cbbd62..2c3a217 100644 --- a/Torch.Server.ReferenceAssemblies.net7.nuspec +++ b/Torch.Server.ReferenceAssemblies.net7.nuspec @@ -11,7 +11,7 @@ - + diff --git a/Torch.Server/Managers/InstanceManager.cs b/Torch.Server/Managers/InstanceManager.cs index e45ac83..c00cd7c 100644 --- a/Torch.Server/Managers/InstanceManager.cs +++ b/Torch.Server/Managers/InstanceManager.cs @@ -28,6 +28,7 @@ using VRage.FileSystem; using VRage.Game; using VRage.Game.ObjectBuilder; using VRage.ObjectBuilders; +using VRage.ObjectBuilders.Private; using VRage.Plugins; namespace Torch.Server.Managers @@ -363,10 +364,10 @@ namespace Torch.Server.Managers public void SaveSandbox() { using (var f = File.Open(_checkpointPath, FileMode.Create)) - MyObjectBuilderSerializer.SerializeXML(f, Checkpoint); + MyObjectBuilderSerializerKeen.SerializeXML(f, Checkpoint); using (var f = File.Open(_worldConfigPath, FileMode.Create)) - MyObjectBuilderSerializer.SerializeXML(f, WorldConfiguration); + MyObjectBuilderSerializerKeen.SerializeXML(f, WorldConfiguration); } public void LoadSandbox() diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj index 1679c88..e175eb3 100644 --- a/Torch.Server/Torch.Server.csproj +++ b/Torch.Server/Torch.Server.csproj @@ -50,7 +50,7 @@ - + all compile diff --git a/Torch.Server/packages.lock.json b/Torch.Server/packages.lock.json index 5d07ecc..3f83c8f 100644 --- a/Torch.Server/packages.lock.json +++ b/Torch.Server/packages.lock.json @@ -113,9 +113,9 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Direct", - "requested": "[1.202.124, )", - "resolved": "1.202.124", - "contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==", + "requested": "[1.203.22, )", + "resolved": "1.203.22", + "contentHash": "ruf6DT1sAh2DnpsJUsGG4ZSdPKrVr5ReKfHSDcYggeacge/nsdqpcij53HSNwnMxve6cfnTRG9SXE2iGSGEtEQ==", "dependencies": { "protobuf-net": "1.0.0" } diff --git a/Torch/Managers/EntityManager.cs b/Torch/Managers/EntityManager.cs index 7486517..ff6a591 100644 --- a/Torch/Managers/EntityManager.cs +++ b/Torch/Managers/EntityManager.cs @@ -27,6 +27,7 @@ using VRage.Game.ModAPI; using VRage.Groups; using VRage.ModAPI; using VRage.ObjectBuilders; +using VRage.ObjectBuilders.Private; using VRage.Sync; using VRageMath; @@ -45,14 +46,14 @@ namespace Torch.Managers { var ob = grid.GetObjectBuilder(true); using (var f = File.Open(path, FileMode.CreateNew)) - MyObjectBuilderSerializer.SerializeXML(f, ob); + MyObjectBuilderSerializerKeen.SerializeXML(f, ob); } public void ImportGrid(string path, Vector3D position) { MyObjectBuilder_EntityBase gridOb; using (var f = File.OpenRead(path)) - MyObjectBuilderSerializer.DeserializeXML(f, out gridOb); + MyObjectBuilderSerializerKeen.DeserializeXML(f, out gridOb); var grid = MyEntities.CreateFromObjectBuilderParallel(gridOb); grid.PositionComp.SetPosition(position); diff --git a/Torch/Managers/ScriptCompilationManager.cs b/Torch/Managers/ScriptCompilationManager.cs index ecc4d57..9075bd4 100644 --- a/Torch/Managers/ScriptCompilationManager.cs +++ b/Torch/Managers/ScriptCompilationManager.cs @@ -82,7 +82,7 @@ public class ScriptCompilationManager : Manager TerminationReasonSetter(block, MyProgrammableBlock.ScriptTerminationReason.None); var component = ScriptComponentGetter(block); - component.NextUpdate = UpdateType.None; + component.UpdateFrequency = UpdateFrequency.None; component.NeedsUpdate = MyEntityUpdateEnum.NONE; try diff --git a/Torch/Patches/KeenLogPatch.cs b/Torch/Patches/KeenLogPatch.cs index 074331b..b22f729 100644 --- a/Torch/Patches/KeenLogPatch.cs +++ b/Torch/Patches/KeenLogPatch.cs @@ -78,6 +78,9 @@ namespace Torch.Patches [ReflectedSetter(Name = "m_enabled")] private static Action _enabledSetter = null!; + + [ReflectedMethod(Type = typeof(MyLog), Name = "LogFlag")] + private static Func _logFlag = null!; private static int GetIndentByCurrentThread() { @@ -122,7 +125,7 @@ namespace Torch.Patches } 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}"); return false; } diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj index 91c0202..8775de2 100644 --- a/Torch/Torch.csproj +++ b/Torch/Torch.csproj @@ -35,7 +35,7 @@ - + all compile diff --git a/Torch/packages.lock.json b/Torch/packages.lock.json index 4ab5fec..ac3b631 100644 --- a/Torch/packages.lock.json +++ b/Torch/packages.lock.json @@ -100,9 +100,9 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Direct", - "requested": "[1.202.124, )", - "resolved": "1.202.124", - "contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==", + "requested": "[1.203.22, )", + "resolved": "1.203.22", + "contentHash": "ruf6DT1sAh2DnpsJUsGG4ZSdPKrVr5ReKfHSDcYggeacge/nsdqpcij53HSNwnMxve6cfnTRG9SXE2iGSGEtEQ==", "dependencies": { "protobuf-net": "1.0.0" }