From c3919978407ee2fe22789bfbe74934c7e8ce6c07 Mon Sep 17 00:00:00 2001
From: Patrick Crain <patrickacrain@gmail.com>
Date: Wed, 20 Dec 2023 20:54:37 -0500
Subject: [PATCH] Fix incompatibility with GungeonCraft due to janky ILHook
 logic for semiautomatic firing

---
 changelog.md                    |  3 +++
 genproject                      | 18 ++++++++---------
 src/DefaultConfigs/QoLConfig.cs | 34 +++++----------------------------
 3 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/changelog.md b/changelog.md
index 2d663d8..f424aca 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.1 (2023-12-20)
+- Simplify logic for "Auto-fire Semi-Automatic Weapons" hook to fix compatibility issues with GungeonCraft and other mods
+
 ## 1.0.0 (2023-12-17)
 	
 - Initial Release! :D
diff --git a/genproject b/genproject
index 37b3ad4..376a182 100755
--- a/genproject
+++ b/genproject
@@ -216,15 +216,15 @@ if [ $rebuild -eq 1 ]; then
   echo -e "[${GRN}>${BLN}] Importing ${dllname} to EtG plugins directory"
   /bin/cp "$dllname" "$plugindir"
 
-  #Import the mod to GungeonCraft
-  echo -e "[${GRN}>${BLN}] Importing ${dllname} to Gungeoncraft project"
-  gcpath="/home/pretzel/workspace/gungy-cwaffing"
-  if [ -e "${gcpath}" ]; then
-    gcpackagepath="${gcpath}/packages/EtG.${namespace}.${projectversion}/lib/net35"
-    mkdir -p "$gcpackagepath"
-    /bin/cp "$dllname" "$gcpackagepath"
-    /bin/cp "$dllname" "${gcpath}/bin/Debug"
-  fi
+  #Import the mod to GungeonCraft (disabled for now)
+  # echo -e "[${GRN}>${BLN}] Importing ${dllname} to Gungeoncraft project"
+  # gcpath="/home/pretzel/workspace/gungy-cwaffing"
+  # if [ -e "${gcpath}" ]; then
+  #   gcpackagepath="${gcpath}/packages/EtG.${namespace}.${projectversion}/lib/net35"
+  #   mkdir -p "$gcpackagepath"
+  #   /bin/cp "$dllname" "$gcpackagepath"
+  #   /bin/cp "$dllname" "${gcpath}/bin/Debug"
+  # fi
 fi
 
 #Generate new Thunderstore Package
diff --git a/src/DefaultConfigs/QoLConfig.cs b/src/DefaultConfigs/QoLConfig.cs
index 8e37b86..f029b66 100644
--- a/src/DefaultConfigs/QoLConfig.cs
+++ b/src/DefaultConfigs/QoLConfig.cs
@@ -104,9 +104,9 @@ private static void InitQoLHooks()
       );
 
     // Remove cooldown for semiautomatic weapons
-    new ILHook(
-      typeof(PlayerController).GetMethod("HandleGunFiringInternal", BindingFlags.Instance | BindingFlags.NonPublic),
-      HandleGunFiringInternalIL
+    new Hook(
+      typeof(BraveInput).GetMethod("get_ControllerFakeSemiAutoCooldown", BindingFlags.Static | BindingFlags.Public),
+      typeof(QoLConfig).GetMethod("OverrideSemiAutoCooldown", BindingFlags.Static | BindingFlags.NonPublic)
       );
 
     // Change default coop character
@@ -154,35 +154,11 @@ private static void OnHandleFillbarValueChanged(Action<BraveOptionsMenuItem> ori
       AkSoundEngine.PostEvent("Play_UI_menu_select_01", item.gameObject);
   }
 
-  // ILHook references
-  // https://github.com/ThadHouse/quicnet/blob/522289d7f3206574d672c936b3129eedf415e735/src/Interop/ApiGenerator.cs#L78
-  // https://github.com/StrawberryJam2021/StrawberryJam2021/blob/21079f1c2521aa704fc5ddc91f67ff3ebc95c317/Entities/ToggleSwapBlock.cs#L32
-  private static void HandleGunFiringInternalIL(ILContext il)
-  {
-      ILCursor cursor = new ILCursor(il);
-      // cursor.DumpIL("HandlePlayerPhasingInputIL");
-
-      while (cursor.TryGotoNext(MoveType.After, instr => instr.MatchAdd(), instr => instr.MatchStfld<PlayerController>("m_controllerSemiAutoTimer")))
-      {
-          /* the next four instructions after this point are as follows
-              [keep   ] IL_0272: ldarg.0
-              [keep   ] IL_0273: ldfld System.Single PlayerController::m_controllerSemiAutoTimer
-              [replace] IL_0278: call System.Single BraveInput::get_ControllerFakeSemiAutoCooldown()
-              [keep   ] 637 ... ble.un ... MonoMod.Cil.ILLabel
-          */
-          cursor.Index += 2; // skip the next two instructions so we still have m_controllerSemiAutoTimer on the stack
-          cursor.Remove(); // remove the get_ControllerFakeSemiAutoCooldown() instruction
-          cursor.Emit(OpCodes.Ldarg_0); // load the player instance as arg0
-          cursor.Emit(OpCodes.Call, typeof(QoLConfig).GetMethod("OverrideSemiAutoCooldown", BindingFlags.Static | BindingFlags.NonPublic)); // replace with our own custom hook
-          break; // we only care about the first occurrence of this pattern in the function
-      }
-  }
-
-  private static float OverrideSemiAutoCooldown(PlayerController pc)
+  private static float OverrideSemiAutoCooldown(Func<float> orig)
   {
     if (_Gunfig.Enabled(FINGER_SAVER))
         return 0f; // replace the value we're checking against with 0f to completely remove semi-automatic fake cooldown
-    return BraveInput.ControllerFakeSemiAutoCooldown; // return the original value
+    return orig(); // return the original value
   }
 
   private static PlayerController OnGenerateCoopPlayer(Func<HutongGames.PlayMaker.Actions.ChangeCoopMode, PlayerController> orig, HutongGames.PlayMaker.Actions.ChangeCoopMode coop)