Slight refactor

PiTheGuy · Dec 7, 2024 · b79d383 · b79d383
1 parent d00c9dc
commit b79d383
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java
@@ -661,7 +661,7 @@ && getEmptyingAction(slot, menu.getCarried()) != null) {
             InventoryAction action;
             if (hasShiftDown()) {
                 action = InventoryAction.CRAFT_SHIFT;
-            } else if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_KEY_SPACE)) {
+            } else if (InputConstants.isKeyDown(getMinecraft().getWindow().getWindow(), GLFW.GLFW_KEY_SPACE)) {
                 action = InventoryAction.CRAFT_ALL;
             } else {
                 // Craft stack on right-click, craft single on left-click
@@ -674,8 +674,7 @@ && getEmptyingAction(slot, menu.getCarried()) != null) {
             return;
         }
 
-        if (slot != null &&
-                InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_KEY_SPACE)) {
+        if (slot != null && InputConstants.isKeyDown(getMinecraft().getWindow().getWindow(), GLFW.GLFW_KEY_SPACE)) {
             int slotNum = slot.index;
             final InventoryActionPacket p = new InventoryActionPacket(InventoryAction.MOVE_REGION, slotNum, 0);
             PacketDistributor.sendToServer(p);

diff --git a/src/main/java/appeng/menu/AEBaseMenu.java b/src/main/java/appeng/menu/AEBaseMenu.java
@@ -538,13 +538,13 @@ public void doAction(ServerPlayer player, InventoryAction action, int slot, long
         }
         var s = this.getSlot(slot);
 
-        if (s instanceof CraftingTermSlot) {
+        if (s instanceof CraftingTermSlot craftingTermSlot) {
             switch (action) {
                 case CRAFT_SHIFT:
                 case CRAFT_ALL:
                 case CRAFT_ITEM:
                 case CRAFT_STACK:
-                    ((CraftingTermSlot) s).doClick(action, player);
+                    craftingTermSlot.doClick(action, player);
                 default:
             }
         }