mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-21 20:42:17 +00:00
Merge branch 'master' into development
This commit is contained in:
commit
a5a9ab9daf
3 files changed
+13
-5
No files matched your search
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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)));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user