Merge remote-tracking branch 'origin/1.15.2-forge' into 1.16.5-forge

TeamOpenIndustry · Sep 13, 2023 · 0911f3a · 0911f3a
2 parents b284f81 + 691b19a
commit 0911f3a
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/src/main/java/cam72cam/mod/event/ClientEvents.java b/src/main/java/cam72cam/mod/event/ClientEvents.java
@@ -127,10 +127,25 @@ public static void onGuiRelease(GuiScreenEvent.MouseReleasedEvent.Pre event) {
             onGuiMouse(event, event.getButton(), MouseAction.RELEASE);
         }
 
+        private static void hackInputState(InputEvent.MouseInputEvent event) {
+            int attackID = Minecraft.getInstance().options.keyAttack.getKey().getValue();
+            int useID = Minecraft.getInstance().options.keyUse.getKey().getValue();
+
+            // This prevents the event from firing
+            if (event.getButton() == attackID) {
+                Minecraft.getInstance().options.keyAttack.consumeClick();
+            }
+            if (event.getButton() == useID) {
+                Minecraft.getInstance().options.keyUse.consumeClick();
+            }
+        }
+
         @SubscribeEvent
         public static void onClick(InputEvent.MouseInputEvent event) {
             if (skipNextMouseInputEvent) {
+                // This is the path from onGuiMouse
                 skipNextMouseInputEvent = false;
+                hackInputState(event);
                 return;
             }
             int attackID = Minecraft.getInstance().options.keyAttack.getKey().getValue();
@@ -141,10 +156,12 @@ public static void onClick(InputEvent.MouseInputEvent event) {
                     Player.Hand button = attackID == event.getButton() ? Player.Hand.SECONDARY : Player.Hand.PRIMARY;
                     if (!DRAG.executeCancellable(x -> x.apply(button))) {
                         //event.setCanceled(true);
+                        hackInputState(event);
                         dragPos = new Vec3d(0, 0, 0);
                     }
                     if (!CLICK.executeCancellable(x -> x.apply(button))) {
                         //event.setCanceled(true);
+                        hackInputState(event);
                     }
                 } else {
                     dragPos = null;