Add quick craft functionality

PiTheGuy · Aug 5, 2024 · 07fad0d · 07fad0d
1 parent bb1038d
commit 07fad0d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java
@@ -661,6 +661,8 @@ && getEmptyingAction(slot, menu.getCarried()) != null) {
             InventoryAction action;
             if (hasShiftDown()) {
                 action = InventoryAction.CRAFT_SHIFT;
+            } else if (hasAltDown()) {
+                action = InventoryAction.CRAFT_ALL;
             } else {
                 // Craft stack on right-click, craft single on left-click
                 action = mouseButton == 1 ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;

diff --git a/src/main/java/appeng/helpers/InventoryAction.java b/src/main/java/appeng/helpers/InventoryAction.java
@@ -23,7 +23,7 @@ public enum InventoryAction {
     PICKUP_OR_SET_DOWN, SPLIT_OR_PLACE_SINGLE, CREATIVE_DUPLICATE, SHIFT_CLICK,
 
     // crafting term
-    CRAFT_STACK, CRAFT_ITEM, CRAFT_SHIFT,
+    CRAFT_STACK, CRAFT_ITEM, CRAFT_SHIFT, CRAFT_ALL,
 
     // fluid term
     FILL_ITEM, FILL_ITEM_MOVE_TO_PLAYER, FILL_ENTIRE_ITEM, FILL_ENTIRE_ITEM_MOVE_TO_PLAYER, EMPTY_ITEM,

diff --git a/src/main/java/appeng/menu/AEBaseMenu.java b/src/main/java/appeng/menu/AEBaseMenu.java
@@ -541,6 +541,7 @@ public void doAction(ServerPlayer player, InventoryAction action, int slot, long
         if (s instanceof CraftingTermSlot) {
             switch (action) {
                 case CRAFT_SHIFT:
+                case CRAFT_ALL:
                 case CRAFT_ITEM:
                 case CRAFT_STACK:
                     ((CraftingTermSlot) s).doClick(action, player);

diff --git a/src/main/java/appeng/menu/slot/CraftingTermSlot.java b/src/main/java/appeng/menu/slot/CraftingTermSlot.java
@@ -24,6 +24,7 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
+import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.CraftingInput;
@@ -97,10 +98,14 @@ public void doClick(InventoryAction action, Player who) {
 
         int maxTimesToCraft;
         InternalInventory target;
-        if (action == InventoryAction.CRAFT_SHIFT) // craft into player inventory...
+        if (action == InventoryAction.CRAFT_SHIFT || action == InventoryAction.CRAFT_ALL) // craft into player inventory...
         {
             target = new PlayerInternalInventory(who.getInventory());
-            maxTimesToCraft = (int) Math.floor((double) this.getItem().getMaxStackSize() / (double) howManyPerCraft);
+            if (action == InventoryAction.CRAFT_SHIFT) {
+                maxTimesToCraft = (int) Math.floor((double) this.getItem().getMaxStackSize() / (double) howManyPerCraft);
+            } else {
+                maxTimesToCraft = (int) Math.floor((double) this.getItem().getMaxStackSize() / (double) howManyPerCraft * Inventory.INVENTORY_SIZE);
+            }
         } else if (action == InventoryAction.CRAFT_STACK) // craft into hand, full stack
         {
             target = new CarriedItemInventory(getMenu());