From 250a25d25f4f657a31c623bc315525acf06d90af Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 23 May 2018 01:33:07 +0300 Subject: [PATCH] Fixed durability bar --- src/main/java/techreborn/items/armor/ItemLapotronPack.java | 6 ++---- .../java/techreborn/items/armor/ItemLithiumBatpack.java | 5 ++--- src/main/java/techreborn/items/battery/ItemBattery.java | 6 ++---- src/main/java/techreborn/items/tools/ItemChainsaw.java | 6 ++---- .../java/techreborn/items/tools/ItemCloakingDevice.java | 5 ++--- src/main/java/techreborn/items/tools/ItemDrill.java | 6 ++---- .../java/techreborn/items/tools/ItemElectricTreetap.java | 5 ++--- src/main/java/techreborn/items/tools/ItemJackhammer.java | 6 ++---- src/main/java/techreborn/items/tools/ItemNanosaber.java | 5 ++--- src/main/java/techreborn/items/tools/ItemOmniTool.java | 5 ++--- src/main/java/techreborn/items/tools/ItemRockCutter.java | 6 ++---- 11 files changed, 22 insertions(+), 39 deletions(-) diff --git a/src/main/java/techreborn/items/armor/ItemLapotronPack.java b/src/main/java/techreborn/items/armor/ItemLapotronPack.java index 7cc65ea02..a1f70e2e9 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronPack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronPack.java @@ -35,13 +35,13 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.util.ItemUtils; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -82,9 +82,7 @@ public class ItemLapotronPack extends ItemArmor implements IEnergyItemInfo { @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java index bd2e3afca..24f683204 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumBatpack.java @@ -42,6 +42,7 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.util.ItemUtils; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -89,9 +90,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo { @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/battery/ItemBattery.java b/src/main/java/techreborn/items/battery/ItemBattery.java index d902f58ea..7a63c98a9 100644 --- a/src/main/java/techreborn/items/battery/ItemBattery.java +++ b/src/main/java/techreborn/items/battery/ItemBattery.java @@ -32,12 +32,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.util.ItemUtils; import techreborn.items.ItemTR; import javax.annotation.Nullable; @@ -71,9 +71,7 @@ public class ItemBattery extends ItemTR implements IEnergyItemInfo { // Item @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index babf32d05..02b864eb1 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -39,12 +39,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.util.ItemUtils; import techreborn.client.TechRebornCreativeTab; import javax.annotation.Nullable; @@ -114,9 +114,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo { @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java index 1114b5c27..4f11e5721 100644 --- a/src/main/java/techreborn/items/tools/ItemCloakingDevice.java +++ b/src/main/java/techreborn/items/tools/ItemCloakingDevice.java @@ -44,6 +44,7 @@ import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.registration.RebornRegistry; import reborncore.common.registration.impl.ConfigRegistry; +import reborncore.common.util.ItemUtils; import techreborn.api.Reference; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; @@ -106,9 +107,7 @@ public class ItemCloakingDevice extends ItemTRArmour implements IEnergyItemInfo @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 90570c4f2..86f06c889 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -36,10 +36,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.IEnergyStorage; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.util.ItemUtils; import techreborn.client.TechRebornCreativeTab; import javax.annotation.Nullable; @@ -99,9 +99,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo { @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java index 164b93a66..6befcb0e5 100644 --- a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java @@ -46,6 +46,7 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.util.ItemUtils; import techreborn.client.TechRebornCreativeTab; import techreborn.compat.CompatManager; import techreborn.init.ModItems; @@ -84,9 +85,7 @@ public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo { @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index da4864376..d4dc934fb 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -37,10 +37,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.IEnergyStorage; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; +import reborncore.common.util.ItemUtils; import techreborn.client.TechRebornCreativeTab; import techreborn.utils.OreDictUtils; @@ -103,9 +103,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo { @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 3604083ba..7c3335e35 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -53,6 +53,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; import reborncore.common.util.ChatUtils; +import reborncore.common.util.ItemUtils; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; import techreborn.lib.MessageIDs; @@ -177,9 +178,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo { @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 947df80c9..dbb9b7419 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -46,6 +46,7 @@ import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.util.ItemUtils; import reborncore.common.util.TorchHelper; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; @@ -134,9 +135,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo { @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index f3fde282a..8477480e6 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -40,13 +40,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; -import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.powerSystem.forge.ForgePowerItemManager; +import reborncore.common.util.ItemUtils; import techreborn.client.TechRebornCreativeTab; import techreborn.config.ConfigTechReborn; import techreborn.init.ModItems; @@ -116,9 +116,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo { @Override public double getDurabilityForDisplay(ItemStack stack) { - IEnergyStorage capEnergy = stack.getCapability(CapabilityEnergy.ENERGY, null); - double charge = (capEnergy.getEnergyStored() / capEnergy.getMaxEnergyStored()); - return 1 - charge; + return 1 - ItemUtils.getPowerForDurabilityBar(stack); } @Override