1.2 and Allow Tool compatibility

Fixed: Allow Tool preventing setting custom hotkeys. Gizmos not displaying multi-keybindings. Only the first gizmo hotkey using the same final key would work.
AzeTheGreat · Jan 2, 2021 · d237ef2 · d237ef2
1 parent 900d69e
commit d237ef2
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 66 deletions.
diff --git a/1.2/Assemblies/Hotkeys.dll b/1.2/Assemblies/Hotkeys.dll
diff --git a/About/About.xml b/About/About.xml
@@ -5,6 +5,7 @@
 	<supportedVersions>
       <li>1.0</li>
       <li>1.1</li>
+	  <li>1.2</li>
    </supportedVersions>
    <packageId>Aze.HotkeysDev</packageId>
 	<description>This mod adds keybindings to the Architect subtabs, direct hotkeys to access any designator, and the ability to create multi-keybindings.</description>

diff --git a/Source/Hotkeys/Command Hotkeys/Direct Hotkeys/Patch_CheckGizmoKeybindings.cs b/Source/Hotkeys/Command Hotkeys/Direct Hotkeys/Patch_CheckGizmoKeybindings.cs
@@ -4,7 +4,7 @@
 
 namespace Hotkeys
 {
-    [HarmonyPatch(typeof(Command), nameof(Command.GizmoOnGUI))]
+    [HarmonyPatch(typeof(Command), "GizmoOnGUIInt")]
     public class Patch_CheckGizmoKeybindings
     {
         static void Postfix(Command __instance)
@@ -18,6 +18,3 @@ static void Postfix(Command __instance)
         }
     }
 }
-
-
-
diff --git a/Source/Hotkeys/Command Hotkeys/Patch_ApplyGizmoHotkeys.cs b/Source/Hotkeys/Command Hotkeys/Patch_ApplyGizmoHotkeys.cs
@@ -5,7 +5,7 @@
 
 namespace Hotkeys
 {
-    [HarmonyPatch(typeof(Command), nameof(Command.GizmoOnGUI))]
+    [HarmonyPatch(typeof(Command), "GizmoOnGUIInt")]
     class Patch_ApplyGizmoHotkeys
     {
         public static List<Command> newCommands = new List<Command>();

diff --git a/Source/Hotkeys/Command Hotkeys/Patch_AssignGizmoKey.cs b/Source/Hotkeys/Command Hotkeys/Patch_AssignGizmoKey.cs
@@ -7,93 +7,83 @@
 
 namespace Hotkeys
 {
-    [HarmonyPatch(typeof(Command), nameof(Command.GizmoOnGUI))]
-    class Patch_AssignGizmoKey
+    [HarmonyPatch(typeof(Command), "GizmoOnGUIInt")]
+    static class Patch_AssignGizmoKey
     {
         [HarmonyPriority(Priority.First)]
         static void Postfix(ref GizmoResult __result, Command __instance)
         {
-            if (__result.State != GizmoState.OpenedFloatMenu) { return; }
-            if (!Hotkeys.settings.useCommandHotkeys) { return; }
+            if (!Hotkeys.settings.useCommandHotkeys || __result.State != GizmoState.OpenedFloatMenu)
+                return;
 
-            KeyBindingDef keyDef = DefDatabase<KeyBindingDef>.AllDefsListForReading.Find(x => x.defName == "Hotkeys_GizmoAssigner");
-            if (Event.current.button == 1 && keyDef.IsDown)
-            {
-                var options = new List<FloatMenuOption>();
-                bool alreadyDirect = DirectKeys.KeyPresent(__instance);
-                bool alreadyGizmo = GizmoKeys.KeyPresent(__instance);
+            Log.Message("PATCH Proceeds: " + __result.State);
 
-                if (!alreadyGizmo)
-                {
-                    if (!alreadyDirect)
-                    {
-                        options.Add(new FloatMenuOption("Make Hotkey", delegate ()
-                        {
-                            MakeGizmoHotkey(__instance);
-                        }));
-                    }
-                }
+            var keyDef = DefDatabase<KeyBindingDef>.AllDefsListForReading.Find(x => x.defName == "Hotkeys_GizmoAssigner");
+            if (!(Event.current.button == 1 && keyDef.IsDown))
+                return;
 
-                if (!alreadyDirect && __instance is Designator)
-                {
-                    if (!alreadyGizmo)
-                    {
-                        options.Add(new FloatMenuOption("Make Direct Hotkey", delegate ()
-                        {
-                            MakeDirectHotkey(__instance);
-                        }));
-                    } 
-                }
+            var options = GetFloatMenuOptions(__instance);
+            var window = new FloatMenu(options, "Select Category", false);
+            Find.WindowStack.Add(window);
+            __result = new GizmoResult(GizmoState.Clear, null);
+        }
 
-                if (alreadyGizmo)
-                {
-                    options.Add(new FloatMenuOption("Edit Key", delegate ()
-                    {
-                        var edit = new Dialog_EditKeySpecificity();
-                        edit.Command = __instance;
-                        Find.WindowStack.Add(edit);
-                    }));
-                }
+        private static List<FloatMenuOption> GetFloatMenuOptions(Command __instance)
+        {
+            var options = new List<FloatMenuOption>();
+            bool alreadyDirect = DirectKeys.KeyPresent(__instance);
+            bool alreadyGizmo = GizmoKeys.KeyPresent(__instance);
 
-                if (alreadyGizmo || alreadyDirect)
-                {
-                    options.Add(new FloatMenuOption("Clear Hotkey", delegate ()
-                    {
-                        ClearHotkey(__instance, alreadyDirect, alreadyGizmo);
-                    }));
-                }
-
-                var window = new FloatMenu(options, "Select Category", false);
-                Find.WindowStack.Add(window);
+            if (!alreadyGizmo && !alreadyDirect)
+            {
+                options.Add(new FloatMenuOption("Make Hotkey", () => __instance.MakeGizmoHotkey()));
+                if (__instance is Designator)
+                    options.Add(new FloatMenuOption("Make Direct Hotkey", () => __instance.MakeDirectHotkey()));
+            }
 
-                __result = new GizmoResult(GizmoState.Mouseover, null);
+            if (alreadyGizmo)
+            {
+                options.Add(new FloatMenuOption("Edit Key", () =>
+                {
+                    var edit = new Dialog_EditKeySpecificity();
+                    edit.Command = __instance;
+                    Find.WindowStack.Add(edit);
+                }));
             }
+
+            if (alreadyGizmo || alreadyDirect)
+                options.Add(new FloatMenuOption("Clear Hotkey", () => __instance.ClearHotkey()));
+
+            return options;
         }
 
-        private static void MakeGizmoHotkey(Command __instance)
+        private static void MakeGizmoHotkey(this Command __instance)
         {
             GizmoKeys.AddKey(__instance);
-            Messages.Message("Gizmo Hotkey '" + __instance.LabelCap + "' added.", MessageTypeDefOf.TaskCompletion, false);
+            Message(__instance, "Gizmo", "added");
         }
 
-        private static void MakeDirectHotkey(Command __instance)
+        private static void MakeDirectHotkey(this Command __instance)
         {
             DirectKeys.AddKey(__instance);
-            Messages.Message("Direct Hotkey '" + __instance.LabelCap + "' added.", MessageTypeDefOf.TaskCompletion, false);
+            Message(__instance, "Direct", "added");
         }
 
-        private static void ClearHotkey(Command __instance, bool alreadyDirect, bool alreadyGizmo)
+        private static void ClearHotkey(this Command __instance)
         {
-            if (alreadyDirect)
+            if (DirectKeys.KeyPresent(__instance))
             {
                 DirectKeys.RemoveKey(__instance);
-                Messages.Message("Direct Hotkey '" + __instance.LabelCap + "' cleared.", MessageTypeDefOf.TaskCompletion, false);
+                Message(__instance, "Direct", "cleared");
             }
-            if (alreadyGizmo)
+            if (GizmoKeys.KeyPresent(__instance))
             {
                 GizmoKeys.RemoveKey(__instance);
-                Messages.Message("Gizmo Hotkey '" + __instance.LabelCap + "' cleared.", MessageTypeDefOf.TaskCompletion, false);
+                Message(__instance, "Gizmo", "cleared");
             }
         }
+
+        private static void Message(Command __instance, string keyType, string change) => 
+            Messages.Message(keyType + " Hotkey " + __instance.LabelCap + " " + change, MessageTypeDefOf.TaskCompletion, false);
     }
 }
diff --git a/Source/Hotkeys/Hotkeys.csproj b/Source/Hotkeys/Hotkeys.csproj
@@ -18,7 +18,7 @@
     <DebugSymbols>false</DebugSymbols>
     <DebugType>none</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\1.1\Assemblies\</OutputPath>
+    <OutputPath>..\..\1.2\Assemblies\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -37,6 +37,7 @@
   <ItemGroup>
     <Reference Include="0Harmony, Version=2.0.0.6, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\Lib.Harmony.2.0.0.6\lib\net472\0Harmony.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>

diff --git a/Source/Hotkeys/Multi Keys/Trans_GizmoRenderKeyMods.cs b/Source/Hotkeys/Multi Keys/Trans_GizmoRenderKeyMods.cs
@@ -8,7 +8,7 @@
 namespace Hotkeys
 {
     // Transpiler to show multi key labels
-    [HarmonyPatch(typeof(Command), nameof(Command.GizmoOnGUI))]
+    [HarmonyPatch(typeof(Command), "GizmoOnGUIInt")]
     public class Trans_GizmoRenderKeyMods
     {
         static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)