Allow switching button anchor side, close #56

NotRyken · NotRyken · commit 73b7c656b119 · 2025-11-15T20:26:08.000+08:00
diff --git a/changelog.md b/changelog.md
@@ -3,6 +3,7 @@
 ## 2.1.3
 
 - Improved compatibility with Accessories mod
+- Added an option to anchor buttons to the left side of the inventory
 
 ## 2.1.2
 
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/config/Config.java b/common/src/main/java/dev/terminalmc/clientsort/client/config/Config.java
@@ -231,6 +231,9 @@ public enum ExtraSlotScope {
         public static final boolean showButtonsDefault = true;
         public boolean showButtons = showButtonsDefault;
 
+        public static final boolean anchorButtonsLeftDefault = false;
+        public boolean anchorButtonsLeft = anchorButtonsLeftDefault;
+
         private static Operation validateUniqueOp(
                 @Nullable Operation val,
                 @Nullable Operation... others
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/TriggerButtonManager.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/TriggerButtonManager.java
@@ -29,6 +29,7 @@
 import dev.terminalmc.clientsort.client.inventory.helper.ContainerScreenHelper;
 import dev.terminalmc.clientsort.client.util.KeybindManager;
 import dev.terminalmc.clientsort.client.util.PolicyManager;
+import dev.terminalmc.clientsort.mixin.client.accessor.AbstractContainerScreenAccessor;
 import dev.terminalmc.clientsort.mixin.client.accessor.ScreenAccessor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
@@ -136,22 +137,24 @@ public static void afterScreenInit(Screen initScreen) {
             isEditorP = true;
         }
 
+        boolean left = options().anchorButtonsLeft;
+
         // Generate container-side buttons
-        Slot refSlotC = getReferenceSlot(acs, false);
+        Slot refSlotC = getReferenceSlot(acs, false, left);
         if (refSlotC != null) {
-            generate(acs, refSlotC, false, isEditorC, enabled, options().firstButtonOp);
-            generate(acs, refSlotC, false, isEditorC, enabled, options().secondButtonOp);
-            generate(acs, refSlotC, false, isEditorC, enabled, options().thirdButtonOp);
-            generate(acs, refSlotC, false, isEditorC, enabled, options().fourthButtonOp);
+            generate(acs, refSlotC, left, false, isEditorC, enabled, options().firstButtonOp);
+            generate(acs, refSlotC, left, false, isEditorC, enabled, options().secondButtonOp);
+            generate(acs, refSlotC, left, false, isEditorC, enabled, options().thirdButtonOp);
+            generate(acs, refSlotC, left, false, isEditorC, enabled, options().fourthButtonOp);
         }
 
         // Generate player-side buttons
-        Slot refSlotP = getReferenceSlot(acs, true);
+        Slot refSlotP = getReferenceSlot(acs, true, left);
         if (refSlotP != null) {
-            generate(acs, refSlotP, true, isEditorP, enabled, options().firstButtonOp);
-            generate(acs, refSlotP, true, isEditorP, enabled, options().secondButtonOp);
-            generate(acs, refSlotP, true, isEditorP, enabled, options().thirdButtonOp);
-            generate(acs, refSlotP, true, isEditorP, enabled, options().fourthButtonOp);
+            generate(acs, refSlotP, left, true, isEditorP, enabled, options().firstButtonOp);
+            generate(acs, refSlotP, left, true, isEditorP, enabled, options().secondButtonOp);
+            generate(acs, refSlotP, left, true, isEditorP, enabled, options().thirdButtonOp);
+            generate(acs, refSlotP, left, true, isEditorP, enabled, options().fourthButtonOp);
         }
     }
 
@@ -161,7 +164,8 @@ public static void afterScreenInit(Screen initScreen) {
      */
     private static void generate(
             AbstractContainerScreen<?> screen,
-            Slot refSlot,
+            Slot referenceSlot,
+            boolean referenceLeft,
             boolean isPlayerInv,
             boolean isEditor,
             boolean enabled,
@@ -170,7 +174,8 @@ private static void generate(
         switch (op) {
             case SORT -> generateSimpleButton(
                     screen,
-                    refSlot,
+                    referenceSlot,
+                    referenceLeft,
                     isPlayerInv,
                     isEditor,
                     enabled,
@@ -182,7 +187,8 @@ private static void generate(
             );
             case STACK_FILL -> generateDirectionalButton(
                     screen,
-                    refSlot,
+                    referenceSlot,
+                    referenceLeft,
                     isPlayerInv,
                     isEditor,
                     enabled,
@@ -194,7 +200,8 @@ private static void generate(
             );
             case MATCH_TRANSFER -> generateDirectionalButton(
                     screen,
-                    refSlot,
+                    referenceSlot,
+                    referenceLeft,
                     isPlayerInv,
                     isEditor,
                     enabled,
@@ -206,7 +213,8 @@ private static void generate(
             );
             case TRANSFER -> generateDirectionalButton(
                     screen,
-                    refSlot,
+                    referenceSlot,
+                    referenceLeft,
                     isPlayerInv,
                     isEditor,
                     enabled,
@@ -222,6 +230,7 @@ private static void generate(
     private static void generateSimpleButton(
             AbstractContainerScreen<?> screen,
             Slot referenceSlot,
+            boolean referenceLeft,
             boolean isPlayerInv,
             boolean isEditor,
             boolean enabled,
@@ -275,6 +284,7 @@ private static void generateSimpleButton(
                 screen,
                 container,
                 referenceSlot,
+                referenceLeft,
                 isPlayerInv,
                 policy,
                 object.getClass().getName(),
@@ -304,6 +314,7 @@ private static void generateSimpleButton(
     private static void generateDirectionalButton(
             AbstractContainerScreen<?> screen,
             Slot referenceSlot,
+            boolean referenceLeft,
             boolean isPlayerInv,
             boolean isEditor,
             boolean enabled,
@@ -381,6 +392,7 @@ private static void generateDirectionalButton(
                 screen,
                 container,
                 referenceSlot,
+                referenceLeft,
                 isPlayerInv,
                 policy,
                 object.getClass().getName(),
@@ -452,7 +464,8 @@ public ScoredContainer(Container container, int score) {
      */
     private static @Nullable Slot getReferenceSlot(
             AbstractContainerScreen<?> screen,
-            boolean isPlayerInv
+            boolean isPlayerInv,
+            boolean anchorButtonsLeft
     ) {
         ContainerScreenHelper<?> helper = ContainerScreenHelper.of(screen);
         Slot bestSlot = null;
@@ -461,8 +474,13 @@ public ScoredContainer(Container container, int score) {
         Scope scope = isPlayerInv ? Scope.PLAYER_INV : Scope.CONTAINER_INV;
         for (Slot slot : helper.getLargestSlotGroup(scope)) {
             // Calculate the weighted positional score
-            double x = Math.clamp(slot.x, 0, screen.width)
-                    / (double) screen.width;
+            double x;
+            if (anchorButtonsLeft) {
+                x = Math.clamp(slot.x, 0, screen.width) / (double) screen.width;
+            } else {
+                x = ((AbstractContainerScreenAccessor) screen).clientsort$getImageWidth()
+                        - Math.clamp(slot.x, 0, screen.width) / (double) screen.width;
+            }
             double y = (screen.height - Math.clamp(slot.y, 0, screen.height))
                     / (double) screen.height;
             double score = x * 0.8D + y * 0.2D;
@@ -497,6 +515,7 @@ TriggerButton create(
                 AbstractContainerScreen<?> screen,
                 Container container,
                 Slot referenceSlot,
+                boolean referenceLeft,
                 boolean isPlayerInv,
                 @Nullable ClassPolicy policy,
                 String lowestPolicyKey,
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/config/ClothScreenProvider.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/config/ClothScreenProvider.java
@@ -512,6 +512,15 @@ else if (val > Config.Options.SOUND_VOLUME_MAX)
                 .setSaveConsumer(val -> options.showButtons = val)
                 .build());
 
+        buttons.addEntry(eb.startBooleanToggle(
+                        localized("option", "anchorButtonsLeft"),
+                        options.anchorButtonsLeft
+                )
+                .setTooltip(localized("option", "anchorButtonsLeft.tooltip"))
+                .setDefaultValue(Config.Options.anchorButtonsLeftDefault)
+                .setSaveConsumer(val -> options.anchorButtonsLeft = val)
+                .build());
+
         firstSelector = eb.startEnumSelector(
                         localized("option", "firstButtonOp"),
                         Operation.class,
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/MatchTransferButton.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/MatchTransferButton.java
@@ -62,6 +62,7 @@ public MatchTransferButton(
             AbstractContainerScreen<?> screen,
             Container container,
             Slot referenceSlot,
+            boolean referenceLeft,
             boolean isPlayerInv,
             @Nullable ClassPolicy policy,
             String lowestPolicyKey,
@@ -72,6 +73,7 @@ public MatchTransferButton(
                 screen,
                 container,
                 referenceSlot,
+                referenceLeft,
                 isPlayerInv,
                 isPlayerInv ? SPRITES_UP : SPRITES_DOWN,
                 name,
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/SortButton.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/SortButton.java
@@ -47,6 +47,7 @@ public SortButton(
             AbstractContainerScreen<?> screen,
             Container container,
             Slot referenceSlot,
+            boolean referenceLeft,
             boolean isPlayerInv,
             @Nullable ClassPolicy policy,
             String lowestPolicyKey,
@@ -57,6 +58,7 @@ public SortButton(
                 screen,
                 container,
                 referenceSlot,
+                referenceLeft,
                 isPlayerInv,
                 SPRITES,
                 name,
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/StackFillButton.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/StackFillButton.java
@@ -62,6 +62,7 @@ public StackFillButton(
             AbstractContainerScreen<?> screen,
             Container container,
             Slot referenceSlot,
+            boolean referenceLeft,
             boolean isPlayerInv,
             @Nullable ClassPolicy policy,
             String lowestPolicyKey,
@@ -72,6 +73,7 @@ public StackFillButton(
                 screen,
                 container,
                 referenceSlot,
+                referenceLeft,
                 isPlayerInv,
                 isPlayerInv ? SPRITES_UP : SPRITES_DOWN,
                 name,
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/TransferButton.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/TransferButton.java
@@ -59,6 +59,7 @@ public TransferButton(
             AbstractContainerScreen<?> screen,
             Container container,
             Slot referenceSlot,
+            boolean referenceLeft,
             boolean isPlayerInv,
             @Nullable ClassPolicy policy,
             String lowestPolicyKey,
@@ -69,6 +70,7 @@ public TransferButton(
                 screen,
                 container,
                 referenceSlot,
+                referenceLeft,
                 isPlayerInv,
                 isPlayerInv ? SPRITES_UP : SPRITES_DOWN,
                 name,
diff --git a/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/TriggerButton.java b/common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/TriggerButton.java
@@ -57,6 +57,7 @@ public abstract class TriggerButton extends Button {
     private final AbstractContainerScreen<?> screen;
     public final Container container;
     public final Slot referenceSlot;
+    public final boolean referenceLeft;
     public final boolean isPlayerInv;
 
     private final WidgetSprites sprites;
@@ -72,6 +73,7 @@ protected TriggerButton(
             AbstractContainerScreen<?> screen,
             Container container,
             Slot referenceSlot,
+            boolean referenceLeft,
             boolean isPlayerInv,
             WidgetSprites sprites,
             Component name,
@@ -98,6 +100,7 @@ protected TriggerButton(
         this.screen = screen;
         this.container = container;
         this.referenceSlot = referenceSlot;
+        this.referenceLeft = referenceLeft;
         this.isPlayerInv = isPlayerInv;
         this.sprites = sprites;
         this.offset = offset;
@@ -158,11 +161,7 @@ public void renderWidget(
         AbstractContainerScreenAccessor acs = (AbstractContainerScreenAccessor) screen;
 
         // Keep visible
-        int newX = Math.clamp(
-                acs.clientsort$getLeftPos() + acs.clientsort$getImageWidth() + offset.x(),
-                0,
-                screen.width - WIDTH
-        );
+        int newX = Math.clamp(getAnchorSideX(acs) + offset.x(), 0, screen.width - WIDTH);
         int newY = Math.clamp(
                 acs.clientsort$getTopPos() + Math.max(0, referenceSlot.y) + offset.y(),
                 0,
@@ -212,7 +211,7 @@ protected void onDrag(double mouseX, double mouseY, double dragX, double dragY)
             int newY = Math.clamp((int) mouseY - HALF_HEIGHT, 0, screen.height - HEIGHT);
 
             offset = new Vec2i(
-                    newX - (acs.clientsort$getLeftPos() + acs.clientsort$getImageWidth()),
+                    newX - getAnchorSideX(acs),
                     newY - (acs.clientsort$getTopPos()
                             + Math.clamp(referenceSlot.y, 0, screen.height))
             );
@@ -246,4 +245,11 @@ public abstract void savePolicy(
             boolean autoOpOther,
             Collection<Integer> slots
     );
+
+    private int getAnchorSideX(AbstractContainerScreenAccessor acs) {
+        int anchorSideX = acs.clientsort$getLeftPos();
+        if (!referenceLeft)
+            anchorSideX += acs.clientsort$getImageWidth();
+        return anchorSideX;
+    }
 }
diff --git a/common/src/main/resources/assets/clientsort/lang/en_us.json b/common/src/main/resources/assets/clientsort/lang/en_us.json
@@ -133,6 +133,8 @@
   "option.clientsort.buttons": "Buttons",
   "option.clientsort.showButtons": "Show Buttons",
   "option.clientsort.showButtons.tooltip": "Whether to show extra buttons on the GUI for inventory operations.",
+  "option.clientsort.anchorButtonsLeft": "Anchor Left",
+  "option.clientsort.anchorButtonsLeft.tooltip": "Whether to anchor the buttons to the left side of the inventory.",
   "option.clientsort.firstButtonOp": "First Button Operation",
   "option.clientsort.secondButtonOp": "Second Button Operation",
   "option.clientsort.thirdButtonOp": "Third Button Operation",
diff --git a/common/src/main/resources/assets/clientsort/lang/ru_ru.json b/common/src/main/resources/assets/clientsort/lang/ru_ru.json
@@ -133,6 +133,8 @@
   "option.clientsort.buttons": "Интерфейс",
   "option.clientsort.showButtons": "Показывать кнопки",
   "option.clientsort.showButtons.tooltip": "Показывать ли дополнительные кнопки в интерфейсе для операций с инвентарём.",
+  "option.clientsort.anchorButtonsLeft": "Прикрепить слева",
+  "option.clientsort.anchorButtonsLeft.tooltip": "Определяет, нужно ли закреплять кнопки слева от инвентаря.",
   "option.clientsort.firstButtonOp": "Операция первой кнопки",
   "option.clientsort.secondButtonOp": "Операция второй кнопки",
   "option.clientsort.thirdButtonOp": "Операция третьей кнопки",
diff --git a/common/src/main/resources/assets/clientsort/lang/zh_cn.json b/common/src/main/resources/assets/clientsort/lang/zh_cn.json
@@ -135,6 +135,8 @@
   "option.clientsort.buttons": "按钮",
   "option.clientsort.showButtons": "显示按钮",
   "option.clientsort.showButtons.tooltip": "是否在图形界面上显示用于物品栏操作的额外按钮。",
+  "option.clientsort.anchorButtonsLeft": "固定在左侧",
+  "option.clientsort.anchorButtonsLeft.tooltip": "是否将按钮固定在物品栏左侧",
   "option.clientsort.firstButtonOp": "第一个按钮操作",
   "option.clientsort.secondButtonOp": "第二个按钮操作",
   "option.clientsort.thirdButtonOp": "第三个按钮操作",
