Fix some issues with button positioning and editor

Author: NotRyken

common/src/main/java/dev/terminalmc/clientsort/client/gui/ControlButtonManager.java

@@ -22,6 +22,10 @@
 
 import java.util.LinkedList;
 
+/**
+ * An implementation of {@link PositionEditScreen} for editing container
+ * buttons.
+ */
 public class ContainerPositionEditScreen extends PositionEditScreen {
     public ContainerPositionEditScreen(Screen underlay, ControlButton button) {
         super(underlay, button);

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/ContainerPositionEditScreen.java

@@ -44,23 +44,22 @@ public GroupSelectorScreen(Screen underlay, Screen lastScreen) {
         this.font = Minecraft.getInstance().font;
         this.underlay = underlay;
         this.lastScreen = lastScreen;
-
-        resetButtons();
-    }
-
-    private void resetButtons() {
-        buttons.clear();
-        buttons.addAll(ControlButtonManager.getContainerButtons());
-        buttons.addAll(ControlButtonManager.getPlayerButtons());
     }
 
     @Override
     public void init() {
+        super.init();
         underlay.init(Minecraft.getInstance(), width, height);
-        resetButtons();
+        reloadButtons();
         rebuildGui();
     }
 
+    private void reloadButtons() {
+        buttons.clear();
+        buttons.addAll(ControlButtonManager.getContainerButtons());
+        buttons.addAll(ControlButtonManager.getPlayerButtons());
+    }
+
     private void rebuildGui() {
         clearWidgets();
 

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/GroupSelectorScreen.java

@@ -22,6 +22,10 @@
 
 import java.util.LinkedList;
 
+/**
+ * An implementation of {@link PositionEditScreen} for editing player inventory
+ * buttons.
+ */
 public class PlayerPositionEditScreen extends PositionEditScreen {
     public PlayerPositionEditScreen(Screen underlay, ControlButton button) {
         super(underlay, button);

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/PlayerPositionEditScreen.java

@@ -66,33 +66,34 @@ public PositionEditScreen(Screen underlay, ControlButton button, Screen lastScre
     @Override
     public void init() {
         super.init();
-
-        if (Minecraft.getInstance().screen != this) {
-            Minecraft.getInstance().setScreen(this);
-        }
-
         underlay.init(Minecraft.getInstance(), width, height);
-
-        reloadButtons();
+        
+        if (!reloadButtons()) {
+            clearWidgets();
+            return;
+        }
+        
         setSelected(buttons.getFirst());
-
         rebuildGui();
     }
 
     /**
      * Reloads the list of editable buttons.
      */
-    private void reloadButtons() {
+    private boolean reloadButtons() {
         buttons.clear();
         buttons.addAll(getButtons());
 
         // Should never happen, but worth catching anyway
         if (buttons.size() != 3) {
             ClientSort.LOG.error("Failed to reload buttons on PositionEditScreen: "
-                    + "Button list is too small or does not contain provided button");
+                    + "Button list is too small (size: {}) or does not contain provided button",
+                    buttons.size());
             onClose();
             Minecraft.getInstance().setScreen(underlay);
+            return false;
         }
+        return true;
     }
 
     /**
@@ -260,7 +261,6 @@ private void rebuildGui() {
     @Override
     public void render(@NotNull GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
         underlay.render(graphics, mouseX, mouseY, partialTick);
-
         super.render(graphics, mouseX, mouseY, partialTick);
 
         // Render trace lines
@@ -386,7 +386,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
             return true;
         } else {
             for (ControlButton cb : buttons) {
-                if (isMouseOver(cb, mouseX, mouseY)) {
+                if (cb.isMouseOver(mouseX, mouseY)) {
                     cb.mouseClicked(mouseX, mouseY, mouseButton);
                     setSelected(cb);
                     dragging = true;
@@ -433,17 +433,6 @@ public void setSelected(@NotNull ControlButton widget) {
         if (statusButton != null) statusButton.setValue(selected.active);
     }
 
-    /**
-     * A status-agnostic alternative to {@link AbstractWidget#isMouseOver}.
-     * @return {@code true} if the mouse position overlaps {@code widget}.
-     */
-    public boolean isMouseOver(AbstractWidget widget, double mouseX, double mouseY) {
-        return mouseX >= (double)widget.getX() &&
-                mouseY >= (double)widget.getY() &&
-                mouseX < (double)(widget.getX() + widget.getWidth())
-                && mouseY < (double)(widget.getY() + widget.getHeight());
-    }
-
     /**
      * If {@code before} does not match the current offset of {@code button},
      * moves all other widgets to match how {@code button} was moved.

common/src/main/java/dev/terminalmc/clientsort/client/gui/screen/edit/PositionEditScreen.java

@@ -18,6 +18,7 @@
 package dev.terminalmc.clientsort.client.gui.widget;
 
 import com.mojang.blaze3d.platform.InputConstants;
+import dev.terminalmc.clientsort.client.ClientSort;
 import dev.terminalmc.clientsort.client.config.Vec2i;
 import dev.terminalmc.clientsort.client.gui.screen.edit.ContainerPositionEditScreen;
 import dev.terminalmc.clientsort.client.gui.screen.edit.PlayerPositionEditScreen;
@@ -86,17 +87,30 @@ protected ControlButton(
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
-        if (mouseButton == InputConstants.MOUSE_BUTTON_RIGHT) {
-            openEditScreen();
-            return true;
-        } else if (Minecraft.getInstance().screen instanceof PositionEditScreen) {
-            return true;
-        } else {
-            return super.mouseClicked(mouseX, mouseY, mouseButton);
+        if (isMouseOver(mouseX, mouseY)) {
+            if (mouseButton == InputConstants.MOUSE_BUTTON_RIGHT) {
+                openEditScreen();
+                return true;
+            } else if (Minecraft.getInstance().screen instanceof PositionEditScreen) {
+                return true;
+            }
         }
+        return super.mouseClicked(mouseX, mouseY, mouseButton);
+    }
+
+    /**
+     * Checks mouse position irrespective of widget status or visibility.
+     */
+    @Override
+    public boolean isMouseOver(double mouseX, double mouseY) {
+        return mouseX >= (double)getX()
+                && mouseY >= (double)getY()
+                && mouseX < (double)(getX() + width)
+                && mouseY < (double)(getY() + height);
     }
 
     public void openEditScreen() {
+        ClientSort.LOG.warn("openEditScreen for button with isPlayerInv {}", isPlayerInv);
         Minecraft.getInstance().setScreen(isPlayerInv
                 ? new PlayerPositionEditScreen(screen, this)
                 : new ContainerPositionEditScreen(screen, this)
@@ -123,9 +137,7 @@ public void renderWidget(@NotNull GuiGraphics graphics, int mouseX, int mouseY,
         setY(newY);
 
         ResourceLocation texture = sprites.get(isActive(), isHoveredOrFocused());
-        if (isActive() || Minecraft.getInstance().screen instanceof PositionEditScreen) {
-            graphics.blitSprite(texture, getX(), getY(), 0, width, height);
-        }
+        graphics.blitSprite(texture, getX(), getY(), 0, width, height);
     }
 
     @Override

common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/ControlButton.java

@@ -35,6 +35,7 @@
 public class SortButton extends ControlButton {
     private static final WidgetSprites SPRITES = new WidgetSprites(
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/sort"),
+            ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/sort_disabled"),
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/sort_highlighted")
     );
 

common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/SortButton.java

@@ -31,10 +31,12 @@
 public class StackFillButton extends ControlButton {
     private static final WidgetSprites SPRITES_UP = new WidgetSprites(
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/stack_fill_up"),
+            ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/stack_fill_up_disabled"),
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/stack_fill_up_highlighted")
     );
     private static final WidgetSprites SPRITES_DOWN = new WidgetSprites(
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/stack_fill_down"),
+            ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/stack_fill_down_disabled"),
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/stack_fill_down_highlighted")
     );
 

common/src/main/java/dev/terminalmc/clientsort/client/gui/widget/StackFillButton.java

@@ -31,10 +31,12 @@
 public class TransferButton extends ControlButton {
     private static final WidgetSprites SPRITES_UP = new WidgetSprites(
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/transfer_up"),
+            ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/transfer_up_disabled"),
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/transfer_up_highlighted")
     );
     private static final WidgetSprites SPRITES_DOWN = new WidgetSprites(
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/transfer_down"),
+            ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/transfer_down_disabled"),
             ResourceLocation.fromNamespaceAndPath(ClientSort.MOD_ID, "widget/transfer_down_highlighted")
     );