Allow configuring modifier keys, close #5

NotRyken · NotRyken · commit 5099fbe572d9 · 2025-05-03T21:36:24.000+08:00
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.2
+
+- Made CTRL (all matching slots) and ALT (drop) function keys configurable keybinds
+
 ## 1.0.1
 
 - Fixed scroll interaction breaking MouseTweaks scroll behavior in certain inventories
diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/MoreMouseTweaks.java b/common/src/main/java/dev/terminalmc/moremousetweaks/MoreMouseTweaks.java
@@ -16,12 +16,15 @@
 
 package dev.terminalmc.moremousetweaks;
 
+import com.mojang.blaze3d.platform.InputConstants;
 import dev.terminalmc.moremousetweaks.config.Config;
 import dev.terminalmc.moremousetweaks.network.InteractionManager;
 import dev.terminalmc.moremousetweaks.util.ModLogger;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.registries.BuiltInRegistries;
 
+import static dev.terminalmc.moremousetweaks.config.Config.options;
+
 public class MoreMouseTweaks {
     public static final String MOD_ID = "moremousetweaks";
     public static final String MOD_NAME = "MoreMouseTweaks";
@@ -70,4 +73,20 @@ public static double getMouseY() {
         Minecraft mc = Minecraft.getInstance();
         return mc.mouseHandler.ypos() * (double) mc.getWindow().getGuiScaledHeight() / (double) mc.getWindow().getScreenHeight();
     }
+    
+    public static boolean isMatchingSlotsKeyDown() {
+        return isMatchingSlotsKeyDown(Minecraft.getInstance().getWindow().getWindow());
+    }
+
+    public static boolean isMatchingSlotsKeyDown(long window) {
+        return options().matchingSlotsKey != -1 && InputConstants.isKeyDown(window, options().matchingSlotsKey);
+    }
+
+    public static boolean isDropKeyDown() {
+        return isDropKeyDown(Minecraft.getInstance().getWindow().getWindow());
+    }
+
+    public static boolean isDropKeyDown(long window) {
+        return options().dropKey != -1 && InputConstants.isKeyDown(window, options().dropKey);
+    }
 }
diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/config/Config.java b/common/src/main/java/dev/terminalmc/moremousetweaks/config/Config.java
@@ -18,6 +18,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.mojang.blaze3d.platform.InputConstants;
 import dev.terminalmc.moremousetweaks.MoreMouseTweaks;
 import dev.terminalmc.moremousetweaks.platform.Services;
 import net.minecraft.world.item.Item;
@@ -85,6 +86,12 @@ public enum ExtraSlotScope {
             INVENTORY,
             NONE
         }
+        
+        public static final int matchingSlotsKeyDefault = InputConstants.KEY_LCONTROL;
+        public int matchingSlotsKey = matchingSlotsKeyDefault;
+
+        public static final int dropKeyDefault = InputConstants.KEY_LALT;
+        public int dropKey = dropKeyDefault;
 
         public static final boolean alwaysMatchByTypeDefault = false;
         public boolean alwaysMatchByType = alwaysMatchByTypeDefault;
diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/gui/screen/ClothScreenProvider.java b/common/src/main/java/dev/terminalmc/moremousetweaks/gui/screen/ClothScreenProvider.java
@@ -16,6 +16,7 @@
 
 package dev.terminalmc.moremousetweaks.gui.screen;
 
+import com.mojang.blaze3d.platform.InputConstants;
 import dev.terminalmc.moremousetweaks.config.Config;
 import me.shedaniel.clothconfig2.api.*;
 import net.minecraft.ChatFormatting;
@@ -120,6 +121,24 @@ else if (val > Config.Options.interactionRateMax) return Optional.of(
                 .setSaveConsumer(val -> options.extraSlotScope = val)
                 .build());
 
+        general.addEntry(eb.startKeyCodeField(localized("option", "matchingSlotsKey"),
+                        InputConstants.getKey(options.matchingSlotsKey, options.matchingSlotsKey))
+                .setTooltip(localized("option", "matchingSlotsKey.tooltip"))
+                .setDefaultValue(InputConstants.getKey(Config.Options.matchingSlotsKeyDefault,
+                        Config.Options.matchingSlotsKeyDefault))
+                .setKeySaveConsumer(val -> options.matchingSlotsKey = val.getValue())
+                .setAllowMouse(false) // op, default true
+                .build());
+
+        general.addEntry(eb.startKeyCodeField(localized("option", "dropKey"),
+                        InputConstants.getKey(options.dropKey, options.dropKey))
+                .setTooltip(localized("option", "dropKey.tooltip"))
+                .setDefaultValue(InputConstants.getKey(Config.Options.dropKeyDefault,
+                        Config.Options.dropKeyDefault))
+                .setKeySaveConsumer(val -> options.dropKey = val.getValue())
+                .setAllowMouse(false) // op, default true
+                .build());
+
         general.addEntry(eb.startBooleanToggle(localized("option", "alwaysMatchByType"),
                         options.alwaysMatchByType)
                 .setTooltip(localized("option", "alwaysMatchByType.tooltip"))
diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/inventory/InventoryHelper.java b/common/src/main/java/dev/terminalmc/moremousetweaks/inventory/InventoryHelper.java
@@ -108,12 +108,12 @@ public static boolean handleSlotClick(Slot slot, int button, ClickType clickType
         // Only operate on unlocked slots
         if (ItemLocksWrapper.isLocked(slot)) return false;
 
-        if (Screen.hasControlDown()) {
+        if (MoreMouseTweaks.isMatchingSlotsKeyDown()) {
             // Quick-move or drop all matching slots
             handleControlClick(slot, clickConsumer, slotSupplier);
             return true;
         }
-        else if (Screen.hasAltDown()) {
+        else if (MoreMouseTweaks.isDropKeyDown()) {
             // Drop single slot
             clickConsumer.call(slot, MouseButton.RIGHT.getValue(), ClickType.THROW);
             return true;
@@ -124,8 +124,8 @@ else if (Screen.hasAltDown()) {
     private static void handleControlClick(Slot slot, ClickConsumer original,
                                            Supplier<List<Slot>> slotSupplier) {
         // Quick-move or throw all matching items
-        int button = Screen.hasAltDown() ? MouseButton.RIGHT.getValue() : MouseButton.LEFT.getValue();
-        ClickType clickType = Screen.hasAltDown() ? ClickType.THROW : ClickType.QUICK_MOVE;
+        int button = MoreMouseTweaks.isDropKeyDown() ? MouseButton.RIGHT.getValue() : MouseButton.LEFT.getValue();
+        ClickType clickType = MoreMouseTweaks.isDropKeyDown() ? ClickType.THROW : ClickType.QUICK_MOVE;
         ItemStack stack = slot.getItem().copy();
 
         // Operate on the original slot immediately to avoid delayed conflict
diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/mousetweaks/MixinMain.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/mousetweaks/MixinMain.java
@@ -18,6 +18,7 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import dev.terminalmc.moremousetweaks.MoreMouseTweaks;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
@@ -39,7 +40,7 @@ public class MixinMain {
      * Wraps the first 
      * {@link com.mojang.blaze3d.platform.InputConstants#isKeyDown}
      * invocation in {@link Main#onMouseDrag} to allow MouseTweaks' LMB drag
-     * functionality to work when CTRL or ALT is pressed, not only SHIFT.
+     * functionality to work when MoreMouseTweaks' keybinds are pressed.
      */
     @WrapOperation(
             method = "onMouseDrag",
@@ -50,7 +51,9 @@ public class MixinMain {
             )
     )
     private static boolean wrapIsKeyDown(long window, int key, Operation<Boolean> original) {
-        return Screen.hasShiftDown() || Screen.hasControlDown() || Screen.hasAltDown();
+        return Screen.hasShiftDown()
+                || MoreMouseTweaks.isMatchingSlotsKeyDown(window)
+                || MoreMouseTweaks.isDropKeyDown(window);
     }
 
     /**
@@ -68,7 +71,9 @@ private static boolean wrapIsKeyDown(long window, int key, Operation<Boolean> or
     )
     private static boolean wrapIsEmpty(ItemStack instance, Operation<Boolean> original) {
         if (original.call(instance)) {
-            if (oldSelectedSlot != null && (Screen.hasControlDown() || Screen.hasAltDown())) {
+            if (oldSelectedSlot != null && (
+                    MoreMouseTweaks.isMatchingSlotsKeyDown() 
+                            || MoreMouseTweaks.isDropKeyDown())) {
                 handler.clickSlot(oldSelectedSlot, MouseButton.LEFT, Screen.hasShiftDown());
             }
             return true;
diff --git a/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/quick/craft/MixinRecipeBookComponent.java b/common/src/main/java/dev/terminalmc/moremousetweaks/mixin/quick/craft/MixinRecipeBookComponent.java
@@ -135,7 +135,7 @@ public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoRet
                 return;
             }
             int resSlot = menu.getResultSlotIndex();
-            if (Screen.hasControlDown()) {
+            if (MoreMouseTweaks.isMatchingSlotsKeyDown()) {
                 if (
                         oldRecipeEntry != recipeEntry
                                 || menu.slots.get(resSlot).getItem().isEmpty()
diff --git a/common/src/main/resources/assets/moremousetweaks/lang/en_us.json b/common/src/main/resources/assets/moremousetweaks/lang/en_us.json
@@ -15,6 +15,10 @@
   "option.moremousetweaks.qcOverflowMode": "Quick Crafting Overflow Mode",
   "option.moremousetweaks.hotbarScope": "Hotbar Scope",
   "option.moremousetweaks.extraSlotScope": "Extra Slot Scope",
+  "option.moremousetweaks.matchingSlotsKey": "Matching Slots Key",
+  "option.moremousetweaks.matchingSlotsKey.tooltip": "The key to hold to apply an action to all slots with matching items",
+  "option.moremousetweaks.dropKey": "Drop Key",
+  "option.moremousetweaks.dropKey.tooltip": "The key to hold to allow dropping items via LMB",
   "option.moremousetweaks.alwaysMatchByType": "Always Match by Type",
   "option.moremousetweaks.alwaysMatchByType.tooltip": "CTRL-clicking will always match all items of the same type",
   "option.moremousetweaks.typeMatchTags": "Type Match Tags",
diff --git a/common/src/main/resources/assets/moremousetweaks/lang/ru_ru.json b/common/src/main/resources/assets/moremousetweaks/lang/ru_ru.json
@@ -15,6 +15,10 @@
   "option.moremousetweaks.qcOverflowMode": "Режим переполнения быстрого крафта",
   "option.moremousetweaks.hotbarScope": "Режим панели быстрого доступа",
   "option.moremousetweaks.extraSlotScope": "Режим дополнительных слотов",
+  "option.moremousetweaks.matchingSlotsKey": "Matching Slots Key",
+  "option.moremousetweaks.matchingSlotsKey.tooltip": "The key to hold to apply an action to all slots with matching items",
+  "option.moremousetweaks.dropKey": "Drop Key",
+  "option.moremousetweaks.dropKey.tooltip": "The key to hold to allow dropping items via LMB",
   "option.moremousetweaks.alwaysMatchByType": "Подбор по типу",
   "option.moremousetweaks.alwaysMatchByType.tooltip": "При нажатии CTRL всегда будут соответствовать все предметы одного типа",
   "option.moremousetweaks.typeMatchTags": "Теги соответствия типа",
@@ -41,5 +45,5 @@
   "extraSlotScope.moremousetweaks.INVENTORY": "Инвентарь",
   "extraSlotScope.moremousetweaks.INVENTORY.tooltip": "Дополнительные слоты будут учитываться как часть основного инвентаря",
   "extraSlotScope.moremousetweaks.NONE": "Нет",
-  "extraSlotScope.moremousetweaks.NONE.tooltip": "Дополнительные слоты будут проигнорированы"
+  "extraSlotScope.moremousetweaks.NONE.tooltip": "Дополнительные слоты будут проигнорированы",
 }
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 # Neo/Forge version ranges: https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
 
 # Project
-mod_version=1.0.1
+mod_version=1.0.2
 mod_group=dev.terminalmc
 mod_id=moremousetweaks
 mod_id_alt=mmt

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoRet`
`135`	`135`	`return;`
`136`	`136`	`}`
`137`	`137`	`int resSlot = menu.getResultSlotIndex();`
`138`		`- if (Screen.hasControlDown()) {`
	`138`	`+ if (MoreMouseTweaks.isMatchingSlotsKeyDown()) {`
`139`	`139`	`if (`
`140`	`140`	`oldRecipeEntry != recipeEntry`
`141`	`141`	`\|\| menu.slots.get(resSlot).getItem().isEmpty()`