diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 0c175ea0a..cf30580f7 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -38,7 +38,7 @@ public class ItemBlockCardboardBox extends ItemBlock public ItemBlockCardboardBox(Block block) { super(block); - setMaxStackSize(1); + setMaxStackSize(16); metaBlock = block; MinecraftForge.EVENT_BUS.register(this); @@ -168,4 +168,15 @@ public class ItemBlockCardboardBox extends ItemBlock event.setCanceled(true); } } + + @Override + public int getItemStackLimit(ItemStack stack) + { + BlockData blockData = getBlockData(stack); + if(blockData != null) + { + return 1; + } + return super.getItemStackLimit(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index 0464af627..014c708d3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -61,7 +61,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI super(block); metaBlock = block; setHasSubtypes(true); - setMaxStackSize(1); + setMaxStackSize(16); setCreativeTab(Mekanism.tabMekanism); } @@ -333,7 +333,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI @Override public boolean showDurabilityBar(ItemStack stack) { - return true; + return getGas(stack) != null; // No bar for empty containers as bars are drawn on top of stack count number } @Override @@ -399,4 +399,15 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI { return hasSecurity(stack); } + + @Override + public int getItemStackLimit(ItemStack stack) + { + GasStack gasStack = getGas(stack); + if(gasStack != null) + { + return 1; + } + return super.getItemStackLimit(stack); + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 57709b239..3cf75f52e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -971,4 +971,18 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec } } } + + @Override + public int getItemStackLimit(ItemStack stack) + { + if(MachineType.get(stack) == MachineType.FLUID_TANK) + { + if(getFluidStack(stack) != null) + { + return 1; + } + return 16; + } + return super.getItemStackLimit(stack); + } }