From 01d1e9df4b5d025326bc41891ec2c4ce1d7774b0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 7 Jan 2019 16:54:46 -0600 Subject: [PATCH] Fix #2822 --- .../botania/common/block/tile/TileCraftCrate.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 688cc65b2..4400fb1da 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -24,6 +24,7 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; +import java.util.List; public class TileCraftCrate extends TileOpenCrate { @@ -128,7 +129,7 @@ public class TileCraftCrate extends TileOpenCrate { return false; } }, 3, 3); - for(int i = 0; i < 9; i++) { + for(int i = 0; i < craft.getSizeInventory(); i++) { ItemStack stack = itemHandler.getStackInSlot(i); if(stack.isEmpty() || isLocked(i) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 11) @@ -141,13 +142,9 @@ public class TileCraftCrate extends TileOpenCrate { if(recipe.matches(craft, world)) { itemHandler.setStackInSlot(9, recipe.getCraftingResult(craft)); - for(int i = 0; i < 9; i++) { - ItemStack stack = itemHandler.getStackInSlot(i); - if(stack.isEmpty()) - continue; - - ItemStack container = stack.getItem().getContainerItem(stack); - itemHandler.setStackInSlot(i, container); + List remainders = recipe.getRemainingItems(craft); + for(int i = 0; i < craft.getSizeInventory(); i++) { + itemHandler.setStackInSlot(i, remainders.get(i)); } return true; }