Fix tiered backup support

Equinox- · Mar 19, 2024 · 90480d7 · 90480d7
1 parent ef4bccb
commit 90480d7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Meds.Wrapper/Shim/NoDoubleReplicationPatches.cs b/Meds.Wrapper/Shim/NoDoubleReplicationPatches.cs
@@ -66,7 +66,8 @@ public static void Postfix(ref int __state)
     }
 
     [HarmonyPatch(typeof(MyProceduralEnvironmentProvider), nameof(MyProceduralEnvironmentProvider.GetObjectBuilder))]
-    [AlwaysPatch]
+    [AlwaysPatch(ByRequest = nameof(NoDoubleReplicationEnvironmentSectors))]
+    // This seems to be causing some issues where environment sectors don't synchronize in time. Not totally sure why. 
     public static class NoDoubleReplicationEnvironmentSectors
     {
         public static bool Prefix(ref MyObjectBuilder_EnvironmentDataProvider __result)
@@ -79,7 +80,7 @@ public static bool Prefix(ref MyObjectBuilder_EnvironmentDataProvider __result)
     }
 
     [HarmonyPatch(typeof(MyInventory), nameof(MyInventory.Serialize))]
-    // [AlwaysPatch]
+    [AlwaysPatch(ByRequest = nameof(NoDoubleReplicationInventory))]
     // For this to work correctly the client also needs to be updated so that it always sends the inventory changed event, even on the initial deserialization.
     public static class NoDoubleReplicationInventory
     {

diff --git a/Meds.Wrapper/Shim/TieredBackups.cs b/Meds.Wrapper/Shim/TieredBackups.cs
@@ -151,9 +151,19 @@ public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructio
         }
     }
 
-    [HarmonyPatch(typeof(MySessionBackup), "MakeBackup")]
+    [HarmonyPatch]
+    [AlwaysPatch]
     public static class TieredBackupsHookRetention
     {
+
+        public static IEnumerable<MethodBase> TargetMethods()
+        {
+            foreach (var method in AccessTools.GetDeclaredMethods(typeof(MySessionBackup)))
+                if (method.Name == "MakeBackup" && method.GetParameters().Length == 1 &&
+                    method.GetParameters()[0].ParameterType == AccessTools.Inner(typeof(MySessionBackup), "BackupArgs"))
+                    yield return method;
+        }
+
         public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
         {
             foreach (var instruction in instructions)