diff --git a/src/main/java/mekanism/api/energy/IEnergizedItem.java b/src/main/java/mekanism/api/energy/IEnergizedItem.java index b67254597..bcfb5ca29 100644 --- a/src/main/java/mekanism/api/energy/IEnergizedItem.java +++ b/src/main/java/mekanism/api/energy/IEnergizedItem.java @@ -50,10 +50,4 @@ public interface IEnergizedItem * @return if the item can send energy */ public boolean canSend(ItemStack itemStack); - - /** - * Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display. - * @return if the item contains metadata-specific subtypes - */ - public boolean isMetadataSpecific(ItemStack itemStack); } diff --git a/src/main/java/mekanism/api/gas/IGasItem.java b/src/main/java/mekanism/api/gas/IGasItem.java index 9c7d33230..04231cd81 100644 --- a/src/main/java/mekanism/api/gas/IGasItem.java +++ b/src/main/java/mekanism/api/gas/IGasItem.java @@ -72,10 +72,4 @@ public interface IGasItem * @return maximum gas */ public int getMaxGas(ItemStack itemstack); - - /** - * Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display. - * @return if the item contains metadata-specific subtypes - */ - public boolean isMetadataSpecific(ItemStack itemstack); } diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 283b6dd4a..103ed3e1e 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -361,10 +361,4 @@ public class ItemBlockBasic extends ItemBlock implements IEnergizedItem, ITierIt { return false; } - - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return true; - } } diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index ae1180361..90ed0c961 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -204,10 +204,7 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE return 0; } - double electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); - - return electricityStored; + return itemStack.stackTagCompound.getDouble("electricity"); } @Override @@ -225,7 +222,6 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); itemStack.stackTagCompound.setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); } @Override @@ -303,9 +299,15 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index d67b42e12..12e60416b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -49,8 +49,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI metaBlock = block; setHasSubtypes(true); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } @@ -125,17 +123,7 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI return null; } - GasStack stored = GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); - - if(stored == null) - { - itemstack.setItemDamage(100); - } - else { - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); - } - - return stored; + return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); } @Override @@ -148,14 +136,12 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI if(stack == null || stack.amount == 0) { - itemstack.setItemDamage(100); itemstack.stackTagCompound.removeTag("stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound())); } } @@ -165,7 +151,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI ItemStack empty = new ItemStack(this); setBaseTier(empty, tier.getBaseTier()); setGas(empty, null); - empty.setItemDamage(100); return empty; } @@ -178,7 +163,6 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI ItemStack empty = new ItemStack(this); setBaseTier(empty, tier.getBaseTier()); setGas(empty, null); - empty.setItemDamage(100); list.add(empty); } @@ -310,8 +294,14 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 98f05721a..bc72e0ae6 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -908,12 +908,6 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return (int)(getMaxEnergy(theItem) * general.TO_TE); } - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return true; - } - @Override @Method(modid = "IC2") public IElectricItemManager getManager(ItemStack itemStack) diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 5b5570472..4400a3ef5 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -35,10 +35,20 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec super(); MAX_ELECTRICITY = maxElectricity; setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } + + @Override + public boolean showDurabilityBar(ItemStack stack) + { + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); + } @Override public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) @@ -48,16 +58,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec public ItemStack getUnchargedItem() { - ItemStack stack = new ItemStack(this); - stack.setItemDamage(100); - return stack; + return new ItemStack(this); } @Override public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack discharged = new ItemStack(this); - discharged.setItemDamage(100); list.add(discharged); ItemStack charged = new ItemStack(this); setEnergy(charged, ((IEnergizedItem)charged.getItem()).getMaxEnergy(charged)); @@ -114,10 +121,7 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec return 0; } - double electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); - - return electricityStored; + return itemStack.stackTagCompound.getDouble("electricity"); } @Override @@ -130,7 +134,6 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); itemStack.stackTagCompound.setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); } @Override @@ -207,12 +210,6 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec return (int)Math.round(getMaxEnergy(theItem)* general.TO_TE); } - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return false; - } - @Override @Method(modid = "IC2") public IElectricItemManager getManager(ItemStack itemStack) diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java index 4b59bb13f..ab0c9a337 100644 --- a/src/main/java/mekanism/common/item/ItemFlamethrower.java +++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java @@ -26,8 +26,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { super(); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); } @Override @@ -117,23 +115,19 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem return null; } - GasStack stored = GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); - - if(stored == null) - { - itemstack.setItemDamage(100); - } - else { - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); - } - - return stored; + return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } @Override @@ -146,14 +140,12 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem if(stack == null || stack.amount == 0) { - itemstack.setItemDamage(100); itemstack.stackTagCompound.removeTag("stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound())); } } @@ -162,7 +154,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); return empty; } @@ -171,7 +162,6 @@ public class ItemFlamethrower extends ItemMekanism implements IGasItem { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); list.add(empty); ItemStack filled = new ItemStack(this); diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index 638d53aaf..556610497 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -47,8 +47,6 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci { super(EnumHelper.addArmorMaterial("FRICTIONBOOTS", 0, new int[] {0, 0, 0, 0}, 0), 0, 3); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } @@ -85,16 +83,13 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci public ItemStack getUnchargedItem() { - ItemStack charged = new ItemStack(this); - charged.setItemDamage(100); - return charged; + return new ItemStack(this); } @Override public void getSubItems(Item item, CreativeTabs tabs, List list) { ItemStack discharged = new ItemStack(this); - discharged.setItemDamage(100); list.add(discharged); ItemStack charged = new ItemStack(this); setEnergy(charged, ((IEnergizedItem)charged.getItem()).getMaxEnergy(charged)); @@ -151,10 +146,7 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci return 0; } - double electricityStored = itemStack.stackTagCompound.getDouble("electricity"); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); - - return electricityStored; + return itemStack.stackTagCompound.getDouble("electricity"); } @Override @@ -167,7 +159,6 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci double electricityStored = Math.max(Math.min(amount, getMaxEnergy(itemStack)), 0); itemStack.stackTagCompound.setDouble("electricity", electricityStored); - itemStack.setItemDamage((int)Math.max(1, (Math.abs(((electricityStored/getMaxEnergy(itemStack))*100)-100)))); } @Override @@ -245,9 +236,15 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-(getEnergy(stack)/getMaxEnergy(stack)); } @Override diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java index 3a0cd7d5e..8d2d3dd6f 100644 --- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java +++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java @@ -30,34 +30,12 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo { super(); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); setCreativeTab(Mekanism.tabMekanism); } - private void updateDamage(ItemStack stack) - { - GasStack gas = getGas_do(stack); - FluidStack fluid = getFluid_do(stack); - - if((gas == null || gas.amount == 0) && (fluid == null || fluid.amount == 0)) - { - stack.setItemDamage(100); - } - else if(gas != null && gas.amount > 0) - { - stack.setItemDamage((int)Math.max(1, (Math.abs((((float)gas.amount/getMaxGas(stack))*100)-100)))); - } - else if(fluid != null && fluid.amount > 0) - { - stack.setItemDamage((int)Math.max(1, (Math.abs((((float)fluid.amount/getCapacity(stack))*100)-100)))); - } - } - public ItemStack getEmptyItem() { ItemStack empty = new ItemStack(this); - empty.setItemDamage(100); setGas(empty, null); setFluid(empty, null); return empty; @@ -69,6 +47,21 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo list.add(getEmptyItem()); } + @Override + public boolean showDurabilityBar(ItemStack stack) + { + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + double gasRatio = ((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)CAPACITY); + double fluidRatio = ((getFluid(stack) != null ? (double)getFluid(stack).amount : 0D)/(double)CAPACITY); + + return 1D-Math.max(gasRatio, fluidRatio); + } + @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { @@ -124,7 +117,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo @Override public FluidStack getFluid(ItemStack container) { - updateDamage(container); return getFluid_do(container); } @@ -142,8 +134,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo else { container.stackTagCompound.setTag("fluidStack", stack.writeToNBT(new NBTTagCompound())); } - - updateDamage(container); } @Override @@ -267,7 +257,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo @Override public GasStack getGas(ItemStack itemstack) { - updateDamage(itemstack); return getGas_do(itemstack); } @@ -289,8 +278,6 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo itemstack.stackTagCompound.setTag("gasStack", gasStack.write(new NBTTagCompound())); } - - updateDamage(itemstack); } @Override @@ -298,10 +285,4 @@ public class ItemGaugeDropper extends ItemMekanism implements IGasItem, IFluidCo { return CAPACITY; } - - @Override - public boolean isMetadataSpecific(ItemStack itemstack) - { - return false; - } } diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 02554a937..db5100d2e 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -175,12 +175,6 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); } - - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return false; - } public JetpackMode getMode(ItemStack stack) { diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java index 013f3d444..7e8953fdd 100644 --- a/src/main/java/mekanism/common/item/ItemScubaTank.java +++ b/src/main/java/mekanism/common/item/ItemScubaTank.java @@ -221,12 +221,6 @@ public class ItemScubaTank extends ItemArmor implements IGasItem itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound())); } } - - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return false; - } public ItemStack getEmptyItem() { diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index 4f3e5c857..d47d52e20 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -48,61 +48,37 @@ public class RecipeUtils { return false; } - - if(!(target.getItem() instanceof IEnergizedItem) && !(input.getItem() instanceof IEnergizedItem) && !(target.getItem() instanceof IGasItem) && !(input.getItem() instanceof IGasItem)) + + if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) { - if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) + return false; + } + + if(target.getItem() instanceof IEnergyCube && input.getItem() instanceof IEnergyCube) + { + if(((IEnergyCube)target.getItem()).getEnergyCubeTier(target) != ((IEnergyCube)input.getItem()).getEnergyCubeTier(input)) { return false; } } - else { - if(target.getItem() instanceof IEnergizedItem && input.getItem() instanceof IEnergizedItem) + + if(target.getItem() instanceof ITierItem && input.getItem() instanceof ITierItem) + { + if(((ITierItem)target.getItem()).getBaseTier(target) != ((ITierItem)input.getItem()).getBaseTier(input)) { - if(((IEnergizedItem)target.getItem()).isMetadataSpecific(target) && ((IEnergizedItem)input.getItem()).isMetadataSpecific(input)) - { - if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) - { - return false; - } - } + return false; } - - if(target.getItem() instanceof IGasItem && input.getItem() instanceof IGasItem) + } + + if(target.getItem() instanceof IFactory && input.getItem() instanceof IFactory) + { + if(isFactory(target) && isFactory(input)) { - if(((IGasItem)target.getItem()).isMetadataSpecific(target) && ((IGasItem)input.getItem()).isMetadataSpecific(input)) - { - if(target.getItemDamage() != input.getItemDamage() && target.getItemDamage() != OreDictionary.WILDCARD_VALUE) - { - return false; - } - } - } - - if(target.getItem() instanceof IEnergyCube && input.getItem() instanceof IEnergyCube) - { - if(((IEnergyCube)target.getItem()).getEnergyCubeTier(target) != ((IEnergyCube)input.getItem()).getEnergyCubeTier(input)) + if(((IFactory)target.getItem()).getRecipeType(target) != ((IFactory)input.getItem()).getRecipeType(input)) { return false; } } - else if(target.getItem() instanceof ITierItem && input.getItem() instanceof ITierItem) - { - if(((ITierItem)target.getItem()).getBaseTier(target) != ((ITierItem)input.getItem()).getBaseTier(input)) - { - return false; - } - } - else if(target.getItem() instanceof IFactory && input.getItem() instanceof IFactory) - { - if(isFactory(target) && isFactory(input)) - { - if(((IFactory)target.getItem()).getRecipeType(target) != ((IFactory)input.getItem()).getRecipeType(input)) - { - return false; - } - } - } } return true; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 0afbb3995..9c1be3eb5 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -450,12 +450,6 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp return (int)(getMaxEnergy(theItem)* general.TO_TE); } - @Override - public boolean isMetadataSpecific(ItemStack itemStack) - { - return true; - } - @Override @Method(modid = "IC2") public IElectricItemManager getManager(ItemStack itemStack) diff --git a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java index b830d81fd..f3282062f 100644 --- a/src/main/java/mekanism/generators/common/item/ItemHohlraum.java +++ b/src/main/java/mekanism/generators/common/item/ItemHohlraum.java @@ -24,8 +24,6 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem { super(); setMaxStackSize(1); - setMaxDamage(100); - setNoRepair(); } @Override @@ -113,23 +111,19 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem return null; } - GasStack stored = GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); - - if(stored == null) - { - itemstack.setItemDamage(100); - } - else { - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)stored.amount/getMaxGas(itemstack))*100)-100)))); - } - - return stored; + return GasStack.readFromNBT(itemstack.stackTagCompound.getCompoundTag("stored")); } @Override - public boolean isMetadataSpecific(ItemStack itemStack) + public boolean showDurabilityBar(ItemStack stack) { - return false; + return true; + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) + { + return 1D-((getGas(stack) != null ? (double)getGas(stack).amount : 0D)/(double)getMaxGas(stack)); } @Override @@ -142,14 +136,12 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem if(stack == null || stack.amount == 0) { - itemstack.setItemDamage(100); itemstack.stackTagCompound.removeTag("stored"); } else { int amount = Math.max(0, Math.min(stack.amount, getMaxGas(itemstack))); GasStack gasStack = new GasStack(stack.getGas(), amount); - itemstack.setItemDamage((int)Math.max(1, (Math.abs((((float)amount/getMaxGas(itemstack))*100)-100)))); itemstack.stackTagCompound.setTag("stored", gasStack.write(new NBTTagCompound())); } } @@ -158,7 +150,7 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem { ItemStack stack = new ItemStack(this); setGas(stack, null); - stack.setItemDamage(100); + return stack; } @@ -167,7 +159,6 @@ public class ItemHohlraum extends ItemMekanism implements IGasItem { ItemStack empty = new ItemStack(this); setGas(empty, null); - empty.setItemDamage(100); list.add(empty); ItemStack filled = new ItemStack(this);