Version 0.1.8, protocol 7

Fix sound sustainers

Author: Zetrith

About/Manifest.xml

@@ -2,7 +2,7 @@
 
 <Manifest>
   <identifier>Multiplayer</identifier>
-  <version>0.1.7</version>
+  <version>0.1.8</version>
   <manifestUri>https://github.com/Zetrith/Multiplayer/master/About/Manifest.xml</manifestUri>
   <downloadUri>https://github.com/Zetrith/Multiplayer/releases/latest</downloadUri>
 </Manifest>

Languages/English/Keyed/Multiplayer.xml

@@ -21,7 +21,7 @@
   <MpArbiterDesc>A game instance which runs in the background and helps with desync solving.</MpArbiterDesc>
 
   <MpReplayOutdated>(Outdated)</MpReplayOutdated>
-  <MpReplayOutdatedDesc>This replay was made for protocol version {0}, but you are running version {1}.\n\nThe replay might not play correctly.</MpReplayOutdatedDesc>
+  <MpReplayOutdatedDesc>This replay was made for protocol version {0}, but you are running version {1}.\n\nThe replay might not play correctly.\nPossible incompatibilities are listed with the release history.</MpReplayOutdatedDesc>
 
   <MpServerCloseConfirmation>Are you sure you want to close the server? Unsaved progress will be lost.</MpServerCloseConfirmation>
 

Source/Client/Designators.cs

@@ -132,29 +132,4 @@ static void Postfix(ref Thing __result)
         }
     }
 
-    [HarmonyPatch(typeof(Game))]
-    [HarmonyPatch(nameof(Game.CurrentMap), MethodType.Getter)]
-    public static class CurrentMapGetPatch
-    {
-        public static Map currentMap;
-
-        static void Postfix(ref Map __result)
-        {
-            if (currentMap != null)
-                __result = currentMap;
-        }
-    }
-
-    [HarmonyPatch(typeof(Game))]
-    [HarmonyPatch(nameof(Game.CurrentMap), MethodType.Setter)]
-    [HarmonyPriority(Priority.First)]
-    public static class CurrentMapSetPatch
-    {
-        public static bool ignore;
-
-        static bool Prefix()
-        {
-            return !ignore;
-        }
-    }
 }

Source/Client/Multiplayer.cs

@@ -455,18 +455,6 @@ private static void DoPatches()
                 var setMapTimePrefix = new HarmonyMethod(AccessTools.Method(typeof(SetMapTimeForUI), "Prefix"));
                 var setMapTimePostfix = new HarmonyMethod(AccessTools.Method(typeof(SetMapTimeForUI), "Postfix"));
 
-                var mapInterfaceMethods = new[]
-                {
-                    nameof(MapInterface.MapInterfaceOnGUI_BeforeMainTabs),
-                    nameof(MapInterface.MapInterfaceOnGUI_AfterMainTabs),
-                    nameof(MapInterface.HandleMapClicks),
-                    nameof(MapInterface.HandleLowPriorityInput),
-                    nameof(MapInterface.MapInterfaceUpdate)
-                };
-
-                foreach (string m in mapInterfaceMethods)
-                    harmony.Patch(AccessTools.Method(typeof(MapInterface), m), setMapTimePrefix, setMapTimePostfix);
-
                 var windowMethods = new[] { "DoWindowContents", "WindowUpdate" };
                 foreach (string m in windowMethods)
                     harmony.Patch(typeof(MainTabWindow_Inspect).GetMethod(m), setMapTimePrefix, setMapTimePostfix);
@@ -477,16 +465,6 @@ private static void DoPatches()
                     if (method != null && !method.IsAbstract)
                         harmony.Patch(method, setMapTimePrefix, setMapTimePostfix);
                 }
-
-                harmony.Patch(
-                    AccessTools.Method(typeof(SoundRoot), nameof(SoundRoot.Update)), 
-                    setMapTimePrefix, setMapTimePostfix
-                );
-
-                harmony.Patch(
-                    AccessTools.Method(typeof(FloatMenuMakerMap), nameof(FloatMenuMakerMap.ChoicesAtFor)),
-                    setMapTimePrefix, setMapTimePostfix
-                );
             }
         }
 

Source/Client/SetMapTime.cs

@@ -10,6 +10,14 @@
 
 namespace Multiplayer.Client
 {
+    // Set the map time for GUI methods depending on it
+    [MpPatch(typeof(MapInterface), nameof(MapInterface.MapInterfaceOnGUI_BeforeMainTabs))]
+    [MpPatch(typeof(MapInterface), nameof(MapInterface.MapInterfaceOnGUI_AfterMainTabs))]
+    [MpPatch(typeof(MapInterface), nameof(MapInterface.HandleMapClicks))]
+    [MpPatch(typeof(MapInterface), nameof(MapInterface.HandleLowPriorityInput))]
+    [MpPatch(typeof(MapInterface), nameof(MapInterface.MapInterfaceUpdate))]
+    [MpPatch(typeof(SoundRoot), nameof(SoundRoot.Update))]
+    [MpPatch(typeof(FloatMenuMakerMap), nameof(FloatMenuMakerMap.ChoicesAtFor))]
     static class SetMapTimeForUI
     {
         static void Prefix(ref PrevTime? __state)
@@ -81,7 +89,8 @@ static void Prefix(DangerWatcher __instance, ref PrevTime? __state)
         static void Postfix(PrevTime? __state) => __state?.Set();
     }
 
-    [HarmonyPatch(typeof(Sustainer), nameof(Sustainer.SustainerUpdate))]
+    [MpPatch(typeof(Sustainer), nameof(Sustainer.SustainerUpdate))]
+    [MpPatch(typeof(Sustainer), "<Sustainer>m__0")]
     static class SustainerUpdateMapTime
     {
         static void Prefix(Sustainer __instance, ref PrevTime? __state)

Source/Common/Version.cs

@@ -2,8 +2,8 @@
 {
     public static class MpVersion
     {
-        public const string Version = "0.1.7";
-        public const int Protocol = 6;
+        public const string Version = "0.1.8";
+        public const int Protocol = 7;
 
 #if DEBUG
         public const bool IsDebug = true;