add 1.12.2 compatibility to "Allow drop key to work properly with sid…

…e mouse buttons"
Polyfrost · Aug 10, 2024 · 0efebf4 · 0efebf4
1 parent cceeace
commit 0efebf4
Showing 1 changed file with 22 additions and 2 deletions.
diff --git a/.../java/club/sk1er/patcher/mixins/bugfixes/mousebindfix/GuiContainerMixin_MouseBindFix.java b/.../java/club/sk1er/patcher/mixins/bugfixes/mousebindfix/GuiContainerMixin_MouseBindFix.java
@@ -2,6 +2,9 @@
 
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
+//#if MC==11202
+//$$ import net.minecraft.inventory.ClickType;
+//#endif
 import net.minecraft.inventory.Slot;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -11,25 +14,42 @@
 
 @Mixin(GuiContainer.class)
 public abstract class GuiContainerMixin_MouseBindFix extends GuiScreen {
+    //#if MC==10809
     @Shadow
     private Slot theSlot;
 
     @Shadow
     protected abstract void handleMouseClick(Slot par1, int par2, int par3, int par4);
+    //#else
+    //$$ @Shadow
+    //$$ private Slot hoveredSlot;
+    //$$
+    //$$ @Shadow
+    //$$ protected abstract void handleMouseClick(Slot slotIn, int slotId, int mouseButton, ClickType type);
+    //#endif
 
-    @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "mouseClicked", at = @At("HEAD"))
     private void patcher$checkCloseClick(int mouseX, int mouseY, int mouseButton, CallbackInfo ci) {
         int keyCode = mouseButton - 100;
         if (keyCode == mc.gameSettings.keyBindInventory.getKeyCode()) {
             mc.thePlayer.closeScreen();
-            ci.cancel();
         }
+        //#if MC==10809
         if (theSlot != null && theSlot.getHasStack()) {
             if (keyCode == mc.gameSettings.keyBindPickBlock.getKeyCode()) {
                 handleMouseClick(theSlot, theSlot.slotNumber, 0, 3);
             } else if (keyCode == mc.gameSettings.keyBindDrop.getKeyCode()) {
                 handleMouseClick(theSlot, theSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4);
             }
         }
+        //#else
+        //$$ if (hoveredSlot != null && hoveredSlot.getHasStack()) {
+        //$$    if (mc.gameSettings.keyBindPickBlock.isActiveAndMatches(keyCode)) {
+        //$$        handleMouseClick(hoveredSlot, hoveredSlot.slotNumber, 0, ClickType.CLONE);
+        //$$    } else if (mc.gameSettings.keyBindDrop.isActiveAndMatches(keyCode)) {
+        //$$        handleMouseClick(hoveredSlot, hoveredSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, ClickType.THROW);
+        //$$    }
+        //$$ }
+        //#endif
     }
 }