Fix Backpack Crafting when stacksize not 1

hammy275 · May 8, 2022 · cbdaba4 · cbdaba4
1 parent 3b0d613
commit cbdaba4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/net/blf02/immersivemc/client/immersive/BackpackImmersive.java b/src/main/java/net/blf02/immersivemc/client/immersive/BackpackImmersive.java
@@ -161,7 +161,8 @@ public static void onHitboxInteract(PlayerEntity player, BackpackInfo info, int
             Network.INSTANCE.sendToServer(new InventorySwapPacket(slot + 9));
             Swap.handleInventorySwap(player, slot + 9, Hand.MAIN_HAND); // Do swap on both sides
         } else if (slot <= 30) {
-            info.craftingInput[slot - 27] = player.getItemInHand(Hand.MAIN_HAND);
+            info.craftingInput[slot - 27] = player.getItemInHand(Hand.MAIN_HAND).copy();
+            if (!info.craftingInput[slot - 27].isEmpty()) info.craftingInput[slot - 27].setCount(1);
             Network.INSTANCE.sendToServer(new CraftPacket(info.craftingInput, player.blockPosition(),
                     true));
         } else if (slot == 31) {

diff --git a/src/main/java/net/blf02/immersivemc/server/swap/Swap.java b/src/main/java/net/blf02/immersivemc/server/swap/Swap.java
@@ -262,7 +262,7 @@ protected static boolean removeNeededIngredients(ServerPlayerEntity player, Craf
         if (player.isCreative()) return true; // Always succeed if in creative mode
 
         NonNullList<ItemStack> toRemoves = NonNullList.create();
-        for (int i = 0; i < 9; i++) {
+        for (int i = 0; i < inv.getHeight() * inv.getWidth(); i++) {
             toRemoves.add(inv.getItem(i));
         }