Allow shift-click when both input slots are interactable

See WesJD#355
0dinD · Oct 24, 2024 · b16ad17 · b16ad17
1 parent 884c720
commit b16ad17
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/api/src/main/java/net/wesjd/anvilgui/AnvilGUI.java b/api/src/main/java/net/wesjd/anvilgui/AnvilGUI.java
@@ -319,7 +319,13 @@ public void onInventoryClick(InventoryClickEvent event) {
             final Inventory clickedInventory = event.getClickedInventory();
 
             if (clickedInventory != null) {
-                if (clickedInventory.equals(clicker.getInventory())) {
+                // We could in some cases allow quick-move (shift) and stack merge (double-click) even if only
+                // one input slot is interactable, but figuring that out would require re-implementing all the
+                // inventory logic, so instead we'll just require both input slots to be interactable.
+                // The plugin using AnvilGUI could still reimplement that logic on its own if desired.
+                final boolean inputSlotsInteractable =
+                        interactableSlots.contains(Slot.INPUT_LEFT) && interactableSlots.contains(Slot.INPUT_RIGHT);
+                if (clickedInventory.equals(clicker.getInventory()) && !inputSlotsInteractable) {
                     // prevent players from merging items from the anvil inventory
                     if (event.getClick().equals(ClickType.DOUBLE_CLICK)) {
                         event.setCancelled(true);
@@ -334,13 +340,13 @@ public void onInventoryClick(InventoryClickEvent event) {
                 // prevent players from swapping items in the anvil gui
                 if ((event.getCursor() != null && event.getCursor().getType() != Material.AIR)
                         && !interactableSlots.contains(rawSlot)
-                        && event.getClickedInventory().equals(inventory)) {
+                        && clickedInventory.equals(inventory)) {
                     event.setCancelled(true);
                     return;
                 }
             }
 
-            if (rawSlot < 3 && rawSlot >= 0 || event.getAction().equals(InventoryAction.MOVE_TO_OTHER_INVENTORY)) {
+            if (rawSlot < 3 && rawSlot >= 0) {
                 event.setCancelled(!interactableSlots.contains(rawSlot));
                 if (clickHandlerRunning && !concurrentClickHandlerExecution) {
                     // A click handler is running, don't launch another one