From 088cd2f4d377ae21d17b519675af71388e3c5422 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 17 Mar 2015 17:26:59 -0400 Subject: [PATCH] A few bin fixes --- .../mekanism/client/render/tileentity/RenderBin.java | 3 ++- src/main/java/mekanism/common/tile/TileEntityBin.java | 10 ++++++++-- src/main/java/mekanism/common/util/InventoryUtils.java | 5 +++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index cf21f9a86..63b61e37a 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 9c13d3693..aa31b089b 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 2d7a2b33f..ff1f9271c 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -170,8 +170,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)