diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java index 4f81b1e7..50de155e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java @@ -41,7 +41,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; @@ -258,9 +257,6 @@ public class DraconicArmor /* IEnergyContainerItem */ @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int stored = ItemNBTHelper.getInteger(container, "Energy", 0); int receive = Math.min(maxReceive, Math.min(getMaxEnergyStored(container) - stored, maxTransfer)); if (!simulate) { @@ -272,9 +268,6 @@ public class DraconicArmor @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int stored = ItemNBTHelper.getInteger(container, "Energy", 0); int extract = Math.min(maxExtract, Math.min(maxTransfer, stored)); if (!simulate) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java index 5e4211a8..b6c0aebf 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java @@ -32,7 +32,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.*; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; @@ -196,9 +195,6 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IConfigurab /* IEnergyContainerItem */ @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int stored = ItemNBTHelper.getInteger(container, "Energy", 0); int receive = Math.min(maxReceive, Math.min(getMaxEnergyStored(container) - stored, maxTransfer)); if (!simulate) { @@ -210,9 +206,6 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IConfigurab @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int stored = ItemNBTHelper.getInteger(container, "Energy", 0); int extract = Math.min(maxExtract, Math.min(maxTransfer, stored)); if (!simulate) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java index 330a2333..d97ceb75 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java @@ -31,7 +31,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; @@ -190,9 +189,6 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRende @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(this.maxReceive, maxReceive)); if (!simulate) { @@ -204,9 +200,6 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRende @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); if (!simulate) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java index ebf100fd..00c61016 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java @@ -81,9 +81,6 @@ public class RFItemBase extends ItemDE implements IEnergyContainerItem, IConfigu @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getCapacity(container) - energy, Math.min(getMaxReceive(container), maxReceive)); if (!simulate) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java index dc873781..80b965e1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java @@ -31,7 +31,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; @@ -284,9 +283,6 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(this.maxReceive, maxReceive)); if (!simulate) { @@ -298,9 +294,6 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); if (!simulate) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java index f8568731..c35e5457 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java @@ -32,7 +32,6 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -111,9 +110,6 @@ public class DraconicSword extends ItemSword implements IEnergyContainerWeaponIt @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(this.maxReceive, maxReceive)); if (!simulate) { @@ -125,9 +121,6 @@ public class DraconicSword extends ItemSword implements IEnergyContainerWeaponIt @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); if (!simulate) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java index 2cdd9102..dc4640f0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java @@ -31,7 +31,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; @@ -282,9 +281,6 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(this.maxReceive, maxReceive)); if (!simulate) { @@ -296,9 +292,6 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); if (!simulate) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java index af1219b6..3bb17f57 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java @@ -33,7 +33,6 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -119,9 +118,6 @@ public class WyvernSword extends ItemSword implements IEnergyContainerWeaponItem @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(this.maxReceive, maxReceive)); if (!simulate) { @@ -133,9 +129,6 @@ public class WyvernSword extends ItemSword implements IEnergyContainerWeaponItem @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.getTagCompound() == null) { - container.setTagCompound(new NBTTagCompound()); - } int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); if (!simulate) {