From aad613b22131fb166af0f31d20fbc8f2bc2921c7 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Wed, 9 Apr 2025 23:44:17 -0400 Subject: [PATCH] Make a generic method in order to remove tons of duplicate code that adds an item's owner and its active state to the tooltip. --- .../api/items/interfaces/IBindable.java | 29 +++++++++++++ .../common/items/ActivationCrystal.java | 8 +--- .../common/items/ArmourInhibitor.java | 13 +----- .../common/items/BlankSpell.java | 7 +--- .../common/items/BoundAxe.java | 15 +------ .../common/items/BoundPickaxe.java | 15 +------ .../common/items/BoundShovel.java | 15 +------ .../common/items/CheatyItem.java | 7 +--- .../items/DemonicTelepositionFocus.java | 7 +--- .../common/items/EnergyBattery.java | 6 +-- .../common/items/EnergyBazooka.java | 41 +------------------ .../common/items/EnergyBlast.java | 41 +------------------ .../common/items/EnergySword.java | 18 ++------ .../items/EnhancedTelepositionFocus.java | 7 +--- .../common/items/ItemComplexSpellCrystal.java | 7 +--- .../common/items/ItemDiabloKey.java | 6 +-- .../common/items/ItemRitualDismantler.java | 4 +- .../common/items/ItemRitualDiviner.java | 4 +- .../common/items/LavaCrystal.java | 7 +--- .../items/ReinforcedTelepositionFocus.java | 7 +--- .../common/items/TelepositionFocus.java | 7 +--- .../common/items/armour/BoundArmour.java | 7 +--- .../common/items/sigil/SigilAir.java | 7 +--- .../common/items/sigil/SigilBloodLight.java | 7 +--- .../common/items/sigil/SigilDivination.java | 7 +--- .../common/items/sigil/SigilHarvest.java | 13 +----- .../common/items/sigil/SigilLava.java | 7 +--- .../items/sigil/SigilOfElementalAffinity.java | 13 +----- .../items/sigil/SigilOfEnderSeverance.java | 13 +----- .../common/items/sigil/SigilOfGrowth.java | 13 +----- .../common/items/sigil/SigilOfHaste.java | 13 +----- .../common/items/sigil/SigilOfMagnetism.java | 13 +----- .../common/items/sigil/SigilOfSupression.java | 13 +----- .../items/sigil/SigilOfTheAssassin.java | 7 +--- .../common/items/sigil/SigilOfTheBridge.java | 13 +----- .../items/sigil/SigilOfTheFastMiner.java | 13 +----- .../common/items/sigil/SigilOfWind.java | 13 +----- .../common/items/sigil/SigilPackRat.java | 13 +----- .../common/items/sigil/SigilSeer.java | 7 +--- .../common/items/sigil/SigilVoid.java | 7 +--- .../common/items/sigil/SigilWater.java | 7 +--- .../items/sigil/holding/SigilOfHolding.java | 5 +-- 42 files changed, 74 insertions(+), 408 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java index 8b735834..e21e94d1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java @@ -1,4 +1,33 @@ package WayofTime.alchemicalWizardry.api.items.interfaces; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; + public interface IBindable { + default void addBindingInformation(ItemStack par1ItemStack, List par3List) { + NBTTagCompound itemTag = par1ItemStack.getTagCompound(); + if (!(itemTag == null)) { + if (itemTag.getBoolean("isActive")) { + par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); + } else if (itemTag.hasKey("isActive")) { + par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); + } + + if (!itemTag.getString("ownerName").equals("")) { + par3List.add( + StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + + itemTag.getString("ownerName")); + } + } + } + } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java index e72706c0..be9f4890 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java @@ -92,11 +92,7 @@ public class ActivationCrystal extends EnergyItems { } } - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override @@ -113,7 +109,7 @@ public class ActivationCrystal extends EnergyItems { public String getUnlocalizedName(ItemStack itemStack) { // This is what will do all the localisation things on the alchemy components so you dont have to set it :D int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, ACTIVATION_CRYSTAL_NAMES.length - 1); - return ("" + "item.activationCrystal" + ACTIVATION_CRYSTAL_NAMES[meta]); + return ("item.activationCrystal" + ACTIVATION_CRYSTAL_NAMES[meta]); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java index dc1e061c..0384d7a0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java @@ -37,18 +37,7 @@ public class ArmourInhibitor extends EnergyItems { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.armorinhibitor.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.armorinhibitor.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java index fc98b07f..472e2e25 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java @@ -33,16 +33,11 @@ public class BlankSpell extends EnergyItems { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.blankspell.desc")); + addBindingInformation(par1ItemStack, par3List); if (!(par1ItemStack.getTagCompound() == null)) { NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - par3List.add( StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + itemTag.getInteger("xCoord") diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index 8c18fd3f..35649f59 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -62,20 +62,7 @@ public class BoundAxe extends ItemAxe implements IBindable { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.boundaxe.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index e0ae49de..9e497286 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -64,20 +64,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.boundpickaxe.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.boundpickaxe.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index e05b3ebe..1e6221b7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -64,20 +64,7 @@ public class BoundShovel extends ItemSpade implements IBindable { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.boundshovel.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java index f3d6e069..69a5236e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java @@ -39,12 +39,7 @@ public class CheatyItem extends Item implements IBindable { par3List.add(StatCollector.translateToLocal("tooltip.mode.creative")); par3List.add(StatCollector.translateToLocal("tooltip.cheatyitem.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.cheatyitem.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java index 99ee30ef..52a86598 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java @@ -27,16 +27,11 @@ public class DemonicTelepositionFocus extends TelepositionFocus { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.demonictelepfocus.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.demonictelepfocus.desc2")); + addBindingInformation(par1ItemStack, par3List); if (!(par1ItemStack.getTagCompound() == null)) { NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - par3List.add( StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + itemTag.getInteger("xCoord") diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java index c9bbd245..7a14dc38 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java @@ -43,11 +43,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.energybattery.desc")); - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java index 21ca452f..e4aa28a2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java @@ -204,45 +204,6 @@ public class EnergyBazooka extends EnergyItems { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.energybazooka.desc")); par3List.add(StatCollector.translateToLocal("tooltip.alchemy.damage") + " " + this.damage); - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - } - } - - public void setActivated(ItemStack par1ItemStack, boolean newActivated) { - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - par1ItemStack.getTagCompound().setBoolean("isActive", newActivated); - } - - public boolean getActivated(ItemStack par1ItemStack) { - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - return par1ItemStack.getTagCompound().getBoolean("isActive"); - } - - public void setDelay(ItemStack par1ItemStack, int newDelay) { - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - par1ItemStack.getTagCompound().setInteger("delay", newDelay); - } - - public int getDelay(ItemStack par1ItemStack) { - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - return par1ItemStack.getTagCompound().getInteger("delay"); + addBindingInformation(par1ItemStack, par3List); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index d9b6b5cc..36ea9bd1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -191,45 +191,6 @@ public class EnergyBlast extends EnergyItems { par3List.add(StatCollector.translateToLocal("tooltip.energyblast.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.energyblast.desc2")); par3List.add(StatCollector.translateToLocal("tooltip.alchemy.damage") + " " + this.damage); - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - } - } - - public void setActivated(ItemStack par1ItemStack, boolean newActivated) { - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - par1ItemStack.getTagCompound().setBoolean("isActive", newActivated); - } - - public boolean getActivated(ItemStack par1ItemStack) { - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - return par1ItemStack.getTagCompound().getBoolean("isActive"); - } - - public void setDelay(ItemStack par1ItemStack, int newDelay) { - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - par1ItemStack.getTagCompound().setInteger("delay", newDelay); - } - - public int getDelay(ItemStack par1ItemStack) { - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - return par1ItemStack.getTagCompound().getInteger("delay"); + addBindingInformation(par1ItemStack, par3List); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java index 92207166..1574eea9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java @@ -19,12 +19,13 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigm; import WayofTime.alchemicalWizardry.common.omega.OmegaRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class EnergySword extends ItemSword { +public class EnergySword extends ItemSword implements IBindable { @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -180,20 +181,7 @@ public class EnergySword extends ItemSword { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.caution.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.caution.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java index cfd5943e..427d11e3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java @@ -26,16 +26,11 @@ public class EnhancedTelepositionFocus extends TelepositionFocus { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.enhancedtelepfocus.desc")); + addBindingInformation(par1ItemStack, par3List); if (!(par1ItemStack.getTagCompound() == null)) { NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - par3List.add( StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + itemTag.getInteger("xCoord") diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java index e9312645..68e0e5d9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java @@ -33,16 +33,11 @@ public class ItemComplexSpellCrystal extends EnergyItems { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.complexspellcrystal.desc")); + addBindingInformation(par1ItemStack, par3List); if (!(par1ItemStack.getTagCompound() == null)) { NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - par3List.add( StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + itemTag.getInteger("xCoord") diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java index 4e07e46b..48c283aa 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java @@ -38,11 +38,7 @@ public class ItemDiabloKey extends EnergyItems { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.diablokey.desc")); - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java index 680ab5a0..30fba3e2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java @@ -36,9 +36,7 @@ public class ItemRitualDismantler extends EnergyItems { @Override public void addInformation(ItemStack stack, EntityPlayer player, List par3List, boolean x) { par3List.add(StatCollector.translateToLocal("tooltip.dismatler.desc")); - if (stack.hasTagCompound()) par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + stack.getTagCompound().getString("ownerName")); + addBindingInformation(stack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index 0e4d20b1..25ad0f5a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -74,9 +74,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner { if (!(stack.getTagCompound() == null)) { String ritualID = this.getCurrentRitual(stack); // TODO - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + stack.getTagCompound().getString("ownerName")); + addBindingInformation(stack, par3List); par3List.add(StatCollector.translateToLocal("tooltip.alchemy.ritualid") + " " + ritualID); List ritualList = Rituals.getRitualList(this.getCurrentRitual(stack)); if (ritualList == null) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java index d9c02955..3b31d433 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -60,12 +60,7 @@ public class LavaCrystal extends EnergyItems { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.lavacrystal.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.lavacrystal.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } public boolean hasEnoughEssence(ItemStack itemStack) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java index f28be15c..cd6b6e5d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java @@ -27,16 +27,11 @@ public class ReinforcedTelepositionFocus extends TelepositionFocus { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.reinforcedtelepfocus.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.reinforcedtelepfocus.desc2")); + addBindingInformation(par1ItemStack, par3List); if (!(par1ItemStack.getTagCompound() == null)) { NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - par3List.add( StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + itemTag.getInteger("xCoord") diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java index 262b205c..c86d74b3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java @@ -34,16 +34,11 @@ public class TelepositionFocus extends EnergyItems { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.telepositionfocus.desc")); + addBindingInformation(par1ItemStack, par3List); if (!(par1ItemStack.getTagCompound() == null)) { NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - par3List.add( StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + itemTag.getInteger("xCoord") diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java index 1b4a4523..3da52bba 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java @@ -275,14 +275,9 @@ public class BoundArmour extends ItemArmor @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.boundarmor.devprotect")); + addBindingInformation(par1ItemStack, par3List); if (!(par1ItemStack.getTagCompound() == null)) { - if (!par1ItemStack.getTagCompound().getString("ownerName").equals("")) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } - ItemStack[] inv = getInternalInventory(par1ItemStack); if (inv == null) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java index 2cd7a19f..9bc39a53 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java @@ -30,12 +30,7 @@ public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.airsigil.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java index d934628c..9d888026 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java @@ -33,12 +33,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.bloodlightsigil.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java index 2c186e92..a0592fb8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java @@ -45,12 +45,7 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.divinationsigil.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.divinationsigil.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java index eeae08e7..bcd933ab 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java @@ -38,18 +38,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.harvestsigil.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java index 3d4232ea..cf1cf465 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java @@ -62,12 +62,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.lavasigil.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.lavasigil.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java index 86aea99e..0c0ff7fd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java @@ -38,18 +38,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil { public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigilofelementalaffinity.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.sigilofelementalaffinity.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java index 5d446612..4f5d23f8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java @@ -39,18 +39,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigilofenderseverance.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java index 1c6eb834..237572af 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java @@ -45,18 +45,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigilofgrowth.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.sigilofgrowth.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java index 5c32767b..372d3fd3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java @@ -37,18 +37,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigilofhaste.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java index 9865ad0e..8a7ab06d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java @@ -42,18 +42,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigilofmagnetism.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java index 28509158..174edd91 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java @@ -44,18 +44,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigilofsupression.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java index 84a9a330..88165d16 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java @@ -62,12 +62,7 @@ public class SigilOfTheAssassin extends EnergyItems implements ArmourUpgrade, IS @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigiloftheassassin.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java index 112158d2..98c8bbdd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java @@ -43,18 +43,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigilofthebridge.desc1")); par3List.add(StatCollector.translateToLocal("tooltip.sigilofthebridge.desc2")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java index 44e583f6..f5ed24d5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java @@ -38,18 +38,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigilofthefastminer.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java index 32a62d71..20416a73 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java @@ -37,18 +37,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade, ISigil { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.sigilofwind.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java index 320415b3..ccf65592 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java @@ -39,18 +39,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.packratsigil.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); - } else { - par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); - } - - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java index cb590f8f..2e57285c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java @@ -35,12 +35,7 @@ public class SigilSeer extends Item implements IHolding, ArmourUpgrade, ISigil { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.seersigil.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java index ffd0f043..b63db16a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java @@ -43,12 +43,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil { @Override public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.voidsigil.desc")); - - if (!(stack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + stack.getTagCompound().getString("ownerName")); - } + addBindingInformation(stack, par3List); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java index bcb74747..42329285 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java @@ -60,12 +60,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil { @Override public void addInformation(ItemStack stack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.watersigil.desc")); - - if (!(stack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + stack.getTagCompound().getString("ownerName")); - } + addBindingInformation(stack, par3List); } /** diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java index 7da1ac5b..3524dd1a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java @@ -60,9 +60,8 @@ public class SigilOfHolding extends EnergyItems { par3List.add(StatCollector.translateToLocal("tooltip.sigilofholding.desc")); if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); + addBindingInformation(par1ItemStack, par3List); + ItemStack[] inv = getInternalInventory(par1ItemStack); if (inv == null) {