From 81a452d9051082fc4fb9c910a8e0bf967864ec25 Mon Sep 17 00:00:00 2001 From: Rasheeq Date: Tue, 22 Dec 2015 22:37:39 -0500 Subject: [PATCH] Allow Hopperhock to split stacks Change hopperhock logic so that it will split a stack on the ground if the adjacent inventories only have space for some of it. Fixes #1683. --- .../subtile/functional/SubTileHopperhock.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index f64fd02a7..23fc2e2b6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -73,6 +73,7 @@ public class SubTileHopperhock extends SubTileFunctional { IInventory invToPutItemIn = null; ForgeDirection sideToPutItemIn = ForgeDirection.UNKNOWN; boolean priorityInv = false; + int amountToPutIn = 0; for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { int x_ = x + dir.offsetX; @@ -83,8 +84,8 @@ public class SubTileHopperhock extends SubTileFunctional { if(inv != null) { List filter = getFilterForInventory(inv, x_, y_, z_, true); boolean canAccept = canAcceptItem(stack, filter, filterType); - int stackSize = InventoryHelper.testInventoryInsertion(inv, stack, dir); - canAccept &= stackSize == stack.stackSize; + int availablePut = InventoryHelper.testInventoryInsertion(inv, stack, dir); + canAccept &= availablePut > 0; if(canAccept) { boolean priority = !filter.isEmpty(); @@ -96,19 +97,22 @@ public class SubTileHopperhock extends SubTileFunctional { invToPutItemIn = inv; priorityInv = priority; sideToPutItemIn = dir.getOpposite(); + amountToPutIn = availablePut; } } } } if(invToPutItemIn != null) { - boolean remote = supertile.getWorldObj().isRemote; + boolean remote = supertile.getWorldObj().isRemote; if(!item.isDead && remote) SubTileSpectranthemum.spawnExplosionParticles(item, 1); else { - InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.copy(), sideToPutItemIn, -1); + InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.splitStack(amountToPutIn), sideToPutItemIn, -1); invToPutItemIn.markDirty(); - item.setDead(); + item.setEntityItemStack(stack.splitStack(stack.stackSize - amountToPutIn)); + if(item.getEntityItem().stackSize == 0) + item.setDead(); pulledAny = true; } }