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 8d11b78b..4f81b1e7 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,6 +41,7 @@ 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; @@ -257,9 +258,11 @@ 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) { stored += receive; ItemNBTHelper.setInteger(container, "Energy", stored); @@ -269,10 +272,11 @@ 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) { stored -= extract; ItemNBTHelper.setInteger(container, "Energy", stored); 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 e9a60e5d..5e4211a8 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,6 +32,7 @@ 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; @@ -195,9 +196,11 @@ 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) { stored += receive; ItemNBTHelper.setInteger(container, "Energy", stored); @@ -207,10 +210,11 @@ 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) { stored -= extract; ItemNBTHelper.setInteger(container, "Energy", stored); 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 7ef4845f..330a2333 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 @@ -190,32 +190,28 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem, IRende @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - - if (container.stackTagCompound == null) { - container.stackTagCompound = new NBTTagCompound(); + if (container.getTagCompound() == null) { + container.setTagCompound(new NBTTagCompound()); } - int energy = container.stackTagCompound.getInteger("Energy"); + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(this.maxReceive, maxReceive)); - if (!simulate) { energy += energyReceived; - container.stackTagCompound.setInteger("Energy", energy); + ItemNBTHelper.setInteger(container, "Energy", energy); } return energyReceived; } @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - - if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; + if (container.getTagCompound() == null) { + container.setTagCompound(new NBTTagCompound()); } - int energy = container.stackTagCompound.getInteger("Energy"); + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - if (!simulate) { energy -= energyExtracted; - container.stackTagCompound.setInteger("Energy", energy); + ItemNBTHelper.setInteger(container, "Energy", energy); } return energyExtracted; } 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 f64acc70..ebf100fd 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 @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -80,9 +81,11 @@ 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) { energy += energyReceived; ItemNBTHelper.setInteger(container, "Energy", energy); @@ -92,9 +95,11 @@ public class RFItemBase extends ItemDE implements IEnergyContainerItem, IConfigu @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(getMaxExtract(container), maxExtract)); - if (!simulate) { energy -= energyExtracted; ItemNBTHelper.setInteger(container, "Energy", energy); 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 11263332..dc873781 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,6 +31,7 @@ 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; @@ -283,13 +284,11 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - - if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; + 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) { energy += energyReceived; ItemNBTHelper.setInteger(container, "Energy", energy); @@ -299,13 +298,11 @@ public class DraconicBow extends ItemBow implements IInventoryTool, IUpgradableI @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - - if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; + 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) { energy -= energyExtracted; ItemNBTHelper.setInteger(container, "Energy", energy); 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 f82a6a70..f8568731 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 @@ -111,32 +111,28 @@ public class DraconicSword extends ItemSword implements IEnergyContainerWeaponIt @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - - if (container.stackTagCompound == null) { - container.stackTagCompound = new NBTTagCompound(); + if (container.getTagCompound() == null) { + container.setTagCompound(new NBTTagCompound()); } - int energy = container.stackTagCompound.getInteger("Energy"); + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(this.maxReceive, maxReceive)); - if (!simulate) { energy += energyReceived; - container.stackTagCompound.setInteger("Energy", energy); + ItemNBTHelper.setInteger(container, "Energy", energy); } return energyReceived; } @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - - if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; + if (container.getTagCompound() == null) { + container.setTagCompound(new NBTTagCompound()); } - int energy = container.stackTagCompound.getInteger("Energy"); + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - if (!simulate) { energy -= energyExtracted; - container.stackTagCompound.setInteger("Energy", energy); + ItemNBTHelper.setInteger(container, "Energy", energy); } return energyExtracted; } 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 2758b838..2cdd9102 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,6 +31,7 @@ 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; @@ -281,13 +282,11 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - - if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; + 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) { energy += energyReceived; ItemNBTHelper.setInteger(container, "Energy", energy); @@ -297,13 +296,11 @@ public class WyvernBow extends ItemBow implements IInventoryTool, IUpgradableIte @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - - if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; + 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) { energy -= energyExtracted; ItemNBTHelper.setInteger(container, "Energy", energy); 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 44003a06..af1219b6 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 @@ -119,32 +119,28 @@ public class WyvernSword extends ItemSword implements IEnergyContainerWeaponItem @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - - if (container.stackTagCompound == null) { - container.stackTagCompound = new NBTTagCompound(); + if (container.getTagCompound() == null) { + container.setTagCompound(new NBTTagCompound()); } - int energy = container.stackTagCompound.getInteger("Energy"); + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(this.maxReceive, maxReceive)); - if (!simulate) { energy += energyReceived; - container.stackTagCompound.setInteger("Energy", energy); + ItemNBTHelper.setInteger(container, "Energy", energy); } return energyReceived; } @Override public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - - if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; + if (container.getTagCompound() == null) { + container.setTagCompound(new NBTTagCompound()); } - int energy = container.stackTagCompound.getInteger("Energy"); + int energy = ItemNBTHelper.getInteger(container, "Energy", 0); int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - if (!simulate) { energy -= energyExtracted; - container.stackTagCompound.setInteger("Energy", energy); + ItemNBTHelper.setInteger(container, "Energy", energy); } return energyExtracted; }