diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 8d3d1c937..5834a1e1b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -88,9 +88,10 @@ public class RenderBin extends TileEntitySpecialRenderer TextureManager renderEngine = Minecraft.getMinecraft().renderEngine; GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); renderItem.renderItemAndEffectIntoGUI(func_147498_b()/*getFontRenderer()*/, renderEngine, itemStack, 0, 0); - + GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 5fe70bdb8..a13f8fe18 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -364,9 +364,15 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento } else if(i == 1) { - if(isValid(itemstack)) + if(itemstack == null) { - add(itemstack); + topStack = null; + } + else { + if(isValid(itemstack) && itemstack.stackSize > StackUtils.getSize(topStack)) + { + add(StackUtils.size(itemstack, itemstack.stackSize-StackUtils.getSize(topStack))); + } } } } diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index b692e096a..03210d4cb 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -182,8 +182,9 @@ public final class InventoryUtils return toInsert; } - public static boolean areItemsStackable(ItemStack toInsert, ItemStack inSlot) { - return inSlot.isItemEqual(toInsert) && ItemStack.areItemStackTagsEqual(inSlot, toInsert); + public static boolean areItemsStackable(ItemStack toInsert, ItemStack inSlot) + { + return inSlot.isItemEqual(toInsert) && ItemStack.areItemStackTagsEqual(inSlot, toInsert); } public static InvStack takeTopItem(IInventory inventory, int side)