diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index ca50a8b54..2c7d58986 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -31,11 +31,6 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { setMaxStackSize(1); } - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @Override @SideOnly(Side.CLIENT) public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { @@ -79,13 +74,6 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { itemList.add(charged); } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { for (int i = 0; i < player.inventory.getSizeInventory(); i++) { @@ -104,9 +92,4 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { } } - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } - } diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index a25116367..82f03a23b 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -31,11 +31,6 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { setCreativeTab(TechRebornCreativeTab.instance); } - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { for (int i = 0; i < player.inventory.getSizeInventory(); i++) { @@ -97,16 +92,5 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { itemList.add(charged); } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } } diff --git a/src/main/java/techreborn/items/battery/ItemBattery.java b/src/main/java/techreborn/items/battery/ItemBattery.java index b5f17cb5a..60eb763fe 100644 --- a/src/main/java/techreborn/items/battery/ItemBattery.java +++ b/src/main/java/techreborn/items/battery/ItemBattery.java @@ -45,23 +45,6 @@ public class ItemBattery extends ItemTRNoDestroy implements IEnergyItemInfo { }); } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } - - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @Override public double getMaxPower(ItemStack stack) { return maxEnergy; diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 7bd1be4bc..911e9e287 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -56,11 +56,6 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { }); } - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @Override public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { @@ -112,15 +107,4 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { return tier; } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } } diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index f4a4953d5..95f85913b 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -31,11 +31,6 @@ public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemIn setCreativeTab(TechRebornCreativeTab.instance); } - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @Override public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { if (PoweredItem.canUseEnergy(ConfigTechReborn.CloakingDeviceEUTick, itemStack)) { @@ -95,14 +90,4 @@ public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemIn itemList.add(uncharged); itemList.add(charged); } - - public double getDurabilityForDisplay(ItemStack stack) { - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - - public boolean showDurabilityBar(ItemStack stack) { - return true; - } } diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 66f6aaa11..c55c32df4 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -35,11 +35,6 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo { this.unpoweredSpeed = unpoweredSpeed; } - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @Override public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { @@ -99,15 +94,4 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo { return tier; } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } } diff --git a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java index 27ba28dbd..0d52fb281 100644 --- a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java @@ -75,20 +75,6 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI return tier; } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - - - @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) public void getSubItems(Item item, @@ -101,8 +87,4 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI itemList.add(charged); } - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } } \ No newline at end of file diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index f6be57b36..59a3f3751 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -42,11 +42,6 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { this.tier = tier; } - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @Override public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { @@ -118,18 +113,4 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { itemList.add(charged); } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - if (PoweredItem.getEnergy(stack) > getMaxPower(stack)) { - return 0; - } - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } } diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 0bfc7ac46..cd3d7e9aa 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -87,11 +87,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { } } - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) public void getSubItems(Item item, @@ -123,10 +118,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { } } - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } @Override public ActionResult onItemRightClick(World world, EntityPlayer player, @@ -176,16 +167,6 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { } } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - if (PoweredItem.getEnergy(stack) > getMaxPower(stack)) { - return 0; - } - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - @Override public boolean isRepairable() { return false; diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 147371990..d0571181b 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -40,11 +40,6 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { setUnlocalizedName("techreborn.omniTool"); } - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @Override public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { @@ -134,17 +129,6 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { itemList.add(charged); } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } @Override public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index 91967b390..a12ddd2ba 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -40,11 +40,6 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { efficiencyOnProperMaterial = 16F; } - @Override - public int getRGBDurabilityForDisplay(ItemStack stack) { - return PowerSystem.getDisplayPower().colour; - } - @Override public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState blockIn, BlockPos pos, EntityLivingBase entityLiving) { @@ -132,16 +127,5 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { itemList.add(charged); } - @Override - public double getDurabilityForDisplay(ItemStack stack) { - double charge = (PoweredItem.getEnergy(stack) / getMaxPower(stack)); - return 1 - charge; - - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return true; - } }