From aad613b22131fb166af0f31d20fbc8f2bc2921c7 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Wed, 9 Apr 2025 23:44:17 -0400 Subject: [PATCH 01/15] 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) { From d5a33f6f81cdb03ec1731d13acef2f7c460ecce1 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 00:07:59 -0400 Subject: [PATCH 02/15] Use getTotalWorldTime --- .../alchemicalWizardry/common/items/ArmourInhibitor.java | 3 ++- .../alchemicalWizardry/common/items/ItemBloodLetterPack.java | 2 +- .../alchemicalWizardry/common/items/ItemRitualDiviner.java | 2 +- .../alchemicalWizardry/common/items/armour/BoundArmour.java | 2 +- .../alchemicalWizardry/common/items/armour/OmegaArmour.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java index 0384d7a0..d635a1b9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java @@ -109,7 +109,8 @@ public class ArmourInhibitor extends EnergyItems { } if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) {} + if (par2World.getTotalWorldTime() % tickDelay + == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) {} // TODO Do stuff par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 2, 0)); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java index f6bab41d..af826e92 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemBloodLetterPack.java @@ -129,7 +129,7 @@ public class ItemBloodLetterPack extends ItemArmor implements ArmourUpgrade, IAl return; } - if (world.getWorldTime() % tickRate == 0) { + if (world.getTotalWorldTime() % tickRate == 0) { boolean shouldExecute = player.getHealth() / player.getMaxHealth() > activationPoint && this.getStoredLP(itemStack) < maxStored; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index 25ad0f5a..0b102bf0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -302,7 +302,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner { @Override public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) { - if (entity instanceof EntityPlayer && hasStoredLocation(stack) && world.getWorldTime() % 5 == 0) { + if (entity instanceof EntityPlayer && hasStoredLocation(stack) && world.getTotalWorldTime() % 5 == 0) { Int3 loc = getStoredLocation(stack); int x = loc.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 3da52bba..af13d913 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java @@ -378,7 +378,7 @@ public class BoundArmour extends ItemArmor blood--; } - if (par2World.getWorldTime() % 200 == 0) { + if (par2World.getTotalWorldTime() % 200 == 0) { if (getUpgradeCostMultiplier(par1ItemStack) > 0.02f) { EnergyItems.syphonBatteries( par1ItemStack, diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java index f2525bcf..4ec8dda5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java @@ -79,7 +79,7 @@ public abstract class OmegaArmour extends BoundArmour { public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) { super.onArmorTick(world, player, itemStack); - if (world.getWorldTime() % 50 == 0) { + if (world.getTotalWorldTime() % 50 == 0) { if (this.storeBiomeID()) { int xCoord = (int) Math.floor(player.posX); int zCoord = (int) Math.floor(player.posZ); From ac59510594183633bb391f85dd8b71f1417cd925 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 01:24:42 -0400 Subject: [PATCH 03/15] Update syntax --- settings.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index ff436f2c..7ea8beeb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,8 +3,8 @@ pluginManagement { repositories { maven { // RetroFuturaGradle - name "GTNH Maven" - url "https://nexus.gtnewhorizons.com/repository/public/" + name = "GTNH Maven" + url = "https://nexus.gtnewhorizons.com/repository/public/" mavenContent { includeGroup("com.gtnewhorizons") includeGroupByRegex("com\\.gtnewhorizons\\..+") From 46a8c566d7d6de506a1b7b8e8fcd070961829cc3 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 03:14:18 -0400 Subject: [PATCH 04/15] Make the Energy Bazooka extend the Energy Blaster because the two items are very similar and shared a lot of code. --- .../common/items/EnergyBazooka.java | 174 +++++------------- .../common/items/EnergyBlast.java | 136 +++++++------- 2 files changed, 103 insertions(+), 207 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java index e4aa28a2..1ad3ff91 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java @@ -17,30 +17,10 @@ import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazooka import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class EnergyBazooka extends EnergyItems { - - @SideOnly(Side.CLIENT) - private IIcon activeIcon; - - @SideOnly(Side.CLIENT) - private IIcon activeIconTier2; - - @SideOnly(Side.CLIENT) - private IIcon activeIconTier3; - - @SideOnly(Side.CLIENT) - private IIcon passiveIcon; - - private int tier; - private int damage; +public class EnergyBazooka extends EnergyBlast { public EnergyBazooka(int tier) { - super(); - setMaxStackSize(1); - setCreativeTab(AlchemicalWizardry.tabBloodMagic); - setFull3D(); - setMaxDamage(250); - this.tier = tier; + super(tier); switch (this.tier) { case 1: this.setEnergyUsed(AlchemicalWizardry.energyBazookaLPPerShot); @@ -66,136 +46,64 @@ public class EnergyBazooka extends EnergyItems { this.activeIconTier3 = iconRegister.registerIcon("AlchemicalWizardry:EnergyBazooka3_activated"); this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); } - + @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { - switch (this.tier) { - case 1: - return this.activeIcon; - case 2: - return this.activeIconTier2; - case 3: - return this.activeIconTier3; - } - return this.activeIcon; - } else { - return this.passiveIcon; - } - } - - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int maxDelay = 1; - int maxDelayAfterActivation = 1; - switch (this.tier) { - case 1: - maxDelay = AlchemicalWizardry.energyBazookaMaxDelay; - maxDelayAfterActivation = AlchemicalWizardry.energyBazookaMaxDelayAfterActivation + 1; - break; - case 2: - maxDelay = AlchemicalWizardry.energyBazookaSecondTierMaxDelay; - maxDelayAfterActivation = AlchemicalWizardry.energyBazookaSecondTierMaxDelayAfterActivation + 1; - break; - case 3: - maxDelay = AlchemicalWizardry.energyBazookaThirdTierMaxDelay; - maxDelayAfterActivation = AlchemicalWizardry.energyBazookaThirdTierMaxDelayAfterActivation + 1; - break; - } - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { - this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.getTagCompound() - .setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % maxDelayAfterActivation); - return par1ItemStack; - } - - if (!getActivated(par1ItemStack)) { - return par1ItemStack; - } - - if (this.getDelay(par1ItemStack) > 0) { - return par1ItemStack; - } - - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed())) { - return par1ItemStack; - } - } - - par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - - if (!par2World.isRemote) { - par2World.spawnEntityInWorld( - new EntityEnergyBazookaMainProjectile(par2World, par3EntityPlayer, this.damage)); - this.setDelay(par1ItemStack, maxDelay); - } - + public void shoot(World par2World, EntityPlayer par3EntityPlayer) { + par2World.spawnEntityInWorld( + new EntityEnergyBazookaMainProjectile(par2World, par3EntityPlayer, this.damage)); + Vec3 vec = par3EntityPlayer.getLookVec(); - double wantedVelocity = (double) this.tier * 2.0D; + double wantedVelocity = this.tier * 2.0D; par3EntityPlayer.motionX = -vec.xCoord * wantedVelocity; par3EntityPlayer.motionY = -vec.yCoord * wantedVelocity; par3EntityPlayer.motionZ = -vec.zCoord * wantedVelocity; par2World.playSoundEffect( - (double) ((float) par3EntityPlayer.posX + 0.5F), - (double) ((float) par3EntityPlayer.posY + 0.5F), - (double) ((float) par3EntityPlayer.posZ + 0.5F), + par3EntityPlayer.posX + 0.5F, + par3EntityPlayer.posY + 0.5F, + par3EntityPlayer.posZ + 0.5F, "random.fizz", 0.5F, 2.6F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.8F); par3EntityPlayer.fallDistance = 0; - return par1ItemStack; } @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if (!(par3Entity instanceof EntityPlayer)) { - return; - } - - EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; - - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - int delay = this.getDelay(par1ItemStack); - - if (!par2World.isRemote && delay > 0) { - this.setDelay(par1ItemStack, delay - 1); - } - int lpPerActivation = 0; - int maxDelayAfterActivation = 1; + public int getMaxDelay() { switch (this.tier) { case 1: - lpPerActivation = AlchemicalWizardry.energyBazookaLPPerActivation; - maxDelayAfterActivation = AlchemicalWizardry.energyBazookaMaxDelayAfterActivation + 1; - break; + return AlchemicalWizardry.energyBazookaMaxDelay; case 2: - lpPerActivation = AlchemicalWizardry.energyBazookaSecondTierLPPerActivation; - maxDelayAfterActivation = AlchemicalWizardry.energyBazookaSecondTierMaxDelayAfterActivation + 1; - break; + return AlchemicalWizardry.energyBazookaSecondTierMaxDelay; case 3: - lpPerActivation = AlchemicalWizardry.energyBazookaThirdTierLPPerActivation; - maxDelayAfterActivation = AlchemicalWizardry.energyBazookaThirdTierMaxDelayAfterActivation + 1; - break; - } - if (par2World.getWorldTime() % maxDelayAfterActivation - == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, lpPerActivation)) { - this.setActivated(par1ItemStack, false); - } - } + return AlchemicalWizardry.energyBazookaThirdTierMaxDelay; } + return 1; + } - par1ItemStack.setItemDamage(0); + @Override + public int getMaxDelayAfterActivation() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBazookaMaxDelayAfterActivation; + case 2: + return AlchemicalWizardry.energyBazookaSecondTierMaxDelayAfterActivation; + case 3: + return AlchemicalWizardry.energyBazookaThirdTierMaxDelayAfterActivation; + } + return 1; + } + + @Override + public int getActivationCost() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBazookaLPPerActivation; + case 2: + return AlchemicalWizardry.energyBazookaSecondTierLPPerActivation; + case 3: + return AlchemicalWizardry.energyBazookaThirdTierLPPerActivation; + } + return 0; } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index 36ea9bd1..0155120c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -19,19 +19,19 @@ import cpw.mods.fml.relauncher.SideOnly; public class EnergyBlast extends EnergyItems { @SideOnly(Side.CLIENT) - private IIcon activeIcon; + public IIcon activeIcon; @SideOnly(Side.CLIENT) - private IIcon activeIconTier2; + public IIcon activeIconTier2; @SideOnly(Side.CLIENT) - private IIcon activeIconTier3; + public IIcon activeIconTier3; @SideOnly(Side.CLIENT) - private IIcon passiveIcon; + public IIcon passiveIcon; - private int tier; - private int damage; + public int tier; + public int damage; public EnergyBlast(int tier) { super(); @@ -70,13 +70,7 @@ public class EnergyBlast extends EnergyItems { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (isActive(stack)) { switch (this.tier) { case 1: return this.activeIcon; @@ -93,53 +87,29 @@ public class EnergyBlast extends EnergyItems { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int maxDelay = 1; - int maxDelayAfterActivation = 1; - switch (this.tier) { - case 1: - maxDelay = AlchemicalWizardry.energyBlastMaxDelay; - maxDelayAfterActivation = AlchemicalWizardry.energyBlastMaxDelayAfterActivation + 1; - break; - case 2: - maxDelay = AlchemicalWizardry.energyBlastSecondTierMaxDelay; - maxDelayAfterActivation = AlchemicalWizardry.energyBlastSecondTierMaxDelayAfterActivation + 1; - break; - case 3: - maxDelay = AlchemicalWizardry.energyBlastThirdTierMaxDelay; - maxDelayAfterActivation = AlchemicalWizardry.energyBlastThirdTierMaxDelayAfterActivation + 1; - break; - } - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { - this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.getTagCompound() - .setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % maxDelayAfterActivation); + if (getDelay(par1ItemStack) > 0 && isActive(par1ItemStack) && !par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (!getActivated(par1ItemStack)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), false)) { + setDelay(par1ItemStack, getMaxDelayAfterActivation()); return par1ItemStack; } - if (this.getDelay(par1ItemStack) > 0) { - return par1ItemStack; - } - - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!syphonBatteries(par1ItemStack, par3EntityPlayer, this.getEnergyUsed())) { - return par1ItemStack; - } - } - par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if (!par2World.isRemote) { - par2World.spawnEntityInWorld(new EnergyBlastProjectile(par2World, par3EntityPlayer, this.damage)); - this.setDelay(par1ItemStack, maxDelay); + shoot(par2World, par3EntityPlayer); + this.setDelay(par1ItemStack, getMaxDelay()); } return par1ItemStack; } + public void shoot(World par2World, EntityPlayer par3EntityPlayer) { + par2World.spawnEntityInWorld(new EnergyBlastProjectile(par2World, par3EntityPlayer, this.damage)); + } + @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { if (!(par3Entity instanceof EntityPlayer)) { @@ -147,43 +117,53 @@ public class EnergyBlast extends EnergyItems { } EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } int delay = this.getDelay(par1ItemStack); if (!par2World.isRemote && delay > 0) { this.setDelay(par1ItemStack, delay - 1); } - int lpPerActivation = 0; - int maxDelayAfterActivation = 1; - switch (this.tier) { - case 1: - lpPerActivation = AlchemicalWizardry.energyBlastLPPerActivation; - maxDelayAfterActivation = AlchemicalWizardry.energyBlastMaxDelayAfterActivation + 1; - break; - case 2: - lpPerActivation = AlchemicalWizardry.energyBlastSecondTierLPPerActivation; - maxDelayAfterActivation = AlchemicalWizardry.energyBlastSecondTierMaxDelayAfterActivation + 1; - break; - case 3: - lpPerActivation = AlchemicalWizardry.energyBlastThirdTierLPPerActivation; - maxDelayAfterActivation = AlchemicalWizardry.energyBlastThirdTierMaxDelayAfterActivation + 1; - break; - } - if (par2World.getWorldTime() % maxDelayAfterActivation - == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, lpPerActivation)) { - this.setActivated(par1ItemStack, false); - } - } - } + + passiveDrain(par1ItemStack, par2World, par3EntityPlayer, getMaxDelayAfterActivation(), getActivationCost()); par1ItemStack.setItemDamage(0); } + public int getMaxDelay() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBlastMaxDelay; + case 2: + return AlchemicalWizardry.energyBlastSecondTierMaxDelay; + case 3: + return AlchemicalWizardry.energyBlastThirdTierMaxDelay; + } + return 1; + } + + public int getMaxDelayAfterActivation() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBlastMaxDelayAfterActivation; + case 2: + return AlchemicalWizardry.energyBlastSecondTierMaxDelayAfterActivation; + case 3: + return AlchemicalWizardry.energyBlastThirdTierMaxDelayAfterActivation; + } + return 1; + } + + public int getActivationCost() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBlastLPPerActivation; + case 2: + return AlchemicalWizardry.energyBlastSecondTierLPPerActivation; + case 3: + return AlchemicalWizardry.energyBlastThirdTierLPPerActivation; + } + return 0; + } + @Override @SideOnly(Side.CLIENT) @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -193,4 +173,12 @@ public class EnergyBlast extends EnergyItems { par3List.add(StatCollector.translateToLocal("tooltip.alchemy.damage") + " " + this.damage); addBindingInformation(par1ItemStack, par3List); } + + public void setDelay(ItemStack par1ItemStack, int delay) { + getTag(par1ItemStack).setInteger("delay", delay); + } + + public int getDelay(ItemStack par1ItemStack) { + return getTag(par1ItemStack).getInteger("delay"); + } } From b14aded91ff0be8fd14504cda73ac15b1d6500f2 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 15:25:15 -0400 Subject: [PATCH 05/15] Replace a bunch of duplicated checks done for various items with methods in IBindable. Replace a bunch of duplicated checks for toggling sigils in ISigil. Move static methods from EnergyItems to IBindable so they are more relevant for the bound tools (they don't extend EnergyItems because they need to extend the tool classes). --- .../api/items/interfaces/IBindable.java | 137 ++++++++++++++++-- .../api/items/interfaces/ISigil.java | 31 +++- .../common/block/BlockMasterStone.java | 3 +- .../common/commands/CommandBind.java | 5 +- .../common/commands/CommandUnbind.java | 3 +- .../common/commands/sub/SubCommandBind.java | 5 +- .../common/items/ActivationCrystal.java | 3 +- .../common/items/ArmourInhibitor.java | 31 +--- .../common/items/BlankSpell.java | 3 +- .../common/items/BoundAxe.java | 72 ++------- .../common/items/BoundPickaxe.java | 74 ++-------- .../common/items/BoundShovel.java | 73 ++-------- .../common/items/CheatyItem.java | 2 +- .../common/items/EnergyBattery.java | 2 +- .../common/items/EnergyBlast.java | 12 +- .../common/items/EnergyItems.java | 32 ---- .../common/items/EnergySword.java | 52 +------ .../common/items/ItemComplexSpellCrystal.java | 3 +- .../common/items/ItemDiabloKey.java | 6 +- .../common/items/ItemRitualDismantler.java | 3 +- .../common/items/ItemRitualDiviner.java | 7 +- .../common/items/LavaCrystal.java | 3 +- .../common/items/ScribeTool.java | 10 +- .../common/items/TelepositionFocus.java | 3 +- .../common/items/armour/BoundArmour.java | 6 +- .../common/items/sigil/SigilAir.java | 3 +- .../common/items/sigil/SigilBloodLight.java | 5 +- .../common/items/sigil/SigilDivination.java | 4 +- .../common/items/sigil/SigilHarvest.java | 43 +----- .../common/items/sigil/SigilLava.java | 3 +- .../items/sigil/SigilOfElementalAffinity.java | 36 +---- .../items/sigil/SigilOfEnderSeverance.java | 43 +----- .../common/items/sigil/SigilOfGrowth.java | 37 +---- .../common/items/sigil/SigilOfHaste.java | 36 +---- .../common/items/sigil/SigilOfMagnetism.java | 35 +---- .../common/items/sigil/SigilOfSupression.java | 49 +------ .../items/sigil/SigilOfTheAssassin.java | 3 +- .../common/items/sigil/SigilOfTheBridge.java | 39 +---- .../items/sigil/SigilOfTheFastMiner.java | 36 +---- .../common/items/sigil/SigilOfWind.java | 36 +---- .../common/items/sigil/SigilPackRat.java | 43 +----- .../common/items/sigil/SigilSeer.java | 4 +- .../common/items/sigil/SigilVoid.java | 3 +- .../common/items/sigil/SigilWater.java | 3 +- .../items/sigil/holding/InventoryHolding.java | 2 +- .../items/sigil/holding/SigilOfHolding.java | 10 +- .../common/rituals/RitualEffectExpulsion.java | 3 +- .../common/rituals/RitualEffectUnbinding.java | 5 +- .../common/spell/simple/SpellEarthBender.java | 9 +- .../common/spell/simple/SpellExplosions.java | 9 +- .../common/spell/simple/SpellFireBurst.java | 9 +- .../common/spell/simple/SpellFrozenWater.java | 7 +- .../common/spell/simple/SpellHolyBlast.java | 9 +- .../spell/simple/SpellLightningBolt.java | 9 +- .../common/spell/simple/SpellTeleport.java | 9 +- .../common/spell/simple/SpellWateryGrave.java | 9 +- .../common/spell/simple/SpellWindGust.java | 9 +- 57 files changed, 382 insertions(+), 759 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 e21e94d1..ae219de4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.api.items.interfaces; import java.util.List; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -13,21 +14,133 @@ 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")); + // The number of ticks between passive drains + int tickDelay = 200; + + default boolean checkRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, + int rightClickCost, boolean isBoundTool) { + if (toggle(par1ItemStack, par2World, par3EntityPlayer)) { + return true; + } + + if (par2World.isRemote) { + return true; + } + + if (!isActive(par1ItemStack) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) { + return true; + } + + if (isBoundTool && AlchemicalWizardry.disableBoundToolsRightClick) { + return true; + } + + if (par3EntityPlayer.isPotionActive(AlchemicalWizardry.customPotionInhibit)) { + return true; + } + + if (!(par3EntityPlayer.capabilities.isCreativeMode + || EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, rightClickCost))) { + return true; + } + + return false; + } + + default void addBindingInformation(ItemStack par1ItemStack, List par3List) { + NBTTagCompound itemTag = getTag(par1ItemStack); + if (itemTag.getBoolean("isActive")) { + par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.activated")); + } else if (itemTag.hasKey("isActive")) { // Only if present and set to false rather than not present at all + par3List.add(StatCollector.translateToLocal("tooltip.sigil.state.deactivated")); + } + + if (!itemTag.getString("ownerName").equals("")) { + par3List.add( + StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + + itemTag.getString("ownerName")); + } + } + + static void setActive(ItemStack par1ItemStack, boolean state) { + NBTTagCompound itemTag = getTag(par1ItemStack); + itemTag.setBoolean("isActive", state); + } + + static boolean isActive(ItemStack par1ItemStack) { + NBTTagCompound itemTag = getTag(par1ItemStack); + return itemTag.getBoolean("isActive"); + } + + static NBTTagCompound getTag(ItemStack par1ItemStack) { + NBTTagCompound itemTag = par1ItemStack.getTagCompound(); + + if (itemTag == null) { + par1ItemStack.setTagCompound(new NBTTagCompound()); + itemTag = par1ItemStack.getTagCompound(); + } + return itemTag; + } + + static boolean toggle(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + if (!checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + setActive(par1ItemStack, !isActive(par1ItemStack)); + setDrainTick(par1ItemStack, par2World, tickDelay); + return true; + } + return false; + } + + static void passiveDrain(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int delay, + int cost) { + NBTTagCompound itemTag = getTag(par1ItemStack); + if (par2World.getTotalWorldTime() % delay == itemTag.getInteger("worldTimeDelay") + && itemTag.getBoolean("isActive")) { + if (!par3EntityPlayer.capabilities.isCreativeMode) { + if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, cost)) { + setActive(par1ItemStack, false); + } } } } + /** + * Sets the drain tick delay based on the current world age and the given modulus + */ + static void setDrainTick(ItemStack par1ItemStack, World par2World, int modulus) { + getTag(par1ItemStack).setInteger("worldTimeDelay", (int) (par2World.getTotalWorldTime() - 1) % modulus); + } + + // Global static methods + static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) { + return !SpellHelper.isFakePlayer(player) && SoulNetworkHandler.checkAndSetItemPlayer(item, player); + } + + static void setItemOwner(ItemStack item, String ownerName) { + if (item.getTagCompound() == null) { + item.setTagCompound(new NBTTagCompound()); + } + + item.getTagCompound().setString("ownerName", ownerName); + } + + static void checkAndSetItemOwner(ItemStack item, String ownerName) { + if (item.getTagCompound() == null) { + item.setTagCompound(new NBTTagCompound()); + } + NBTTagCompound tag = IBindable.getTag(item); + + if (item.getTagCompound().getString("ownerName").isEmpty()) { + item.getTagCompound().setString("ownerName", ownerName); + } + } + + static String getOwnerName(ItemStack item) { + if (item.getTagCompound() == null) { + item.setTagCompound(new NBTTagCompound()); + } + + return item.getTagCompound().getString("ownerName"); + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java index d610c211..1dec308a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java @@ -1,4 +1,33 @@ package WayofTime.alchemicalWizardry.api.items.interfaces; -public interface ISigil { +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import WayofTime.alchemicalWizardry.common.items.EnergyItems; + +public interface ISigil extends IBindable { + + /** + * Toggles the state of the sigil. Returns true if the sigil is active after the toggle or false if it is inactive + * after the toggle. + */ + static boolean toggleSigil(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int energyUsed, + int tickDelay) { + IBindable.setActive(par1ItemStack, !IBindable.isActive(par1ItemStack)); + + if (!par3EntityPlayer.capabilities.isCreativeMode + && !EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, energyUsed)) { + IBindable.setActive(par1ItemStack, false); + } + + if (IBindable.isActive(par1ItemStack) && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, energyUsed)) { + par1ItemStack.setItemDamage(1); + IBindable.setDrainTick(par1ItemStack, par2World, tickDelay); + return true; + } else { + par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); + return false; + } + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java index 62303eac..da5c6333 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java @@ -1,5 +1,6 @@ package WayofTime.alchemicalWizardry.common.block; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -79,7 +80,7 @@ public class BlockMasterStone extends BlockContainer { acItem.getCrystalLevel(playerItem), playerItem, player, - acItem.getOwnerName(playerItem)); + IBindable.getOwnerName(playerItem)); world.markBlockForUpdate(x, y, z); return true; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandBind.java b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandBind.java index f6aca90b..bd9ae618 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandBind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandBind.java @@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; public class CommandBind extends CommandBase { @@ -38,8 +37,8 @@ public class CommandBind extends CommandBase { } if (item != null && item.getItem() instanceof IBindable) { - if (EnergyItems.getOwnerName(item).isEmpty()) { - EnergyItems.checkAndSetItemOwner(item, targetPlayer); + if (IBindable.getOwnerName(item).isEmpty()) { + IBindable.checkAndSetItemOwner(item, targetPlayer); func_152373_a(iCommandSender, this, "commands.bind.success"); } else { throw new CommandException("commands.bind.failed.alreadyBound"); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandUnbind.java b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandUnbind.java index 0b5cb2de..6a27ab91 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandUnbind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/commands/CommandUnbind.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; public class CommandUnbind extends CommandBase { @@ -30,7 +29,7 @@ public class CommandUnbind extends CommandBase { ItemStack item = entityplayermp.getCurrentEquippedItem(); if (item != null && item.getItem() instanceof IBindable) { - if (!EnergyItems.getOwnerName(item).isEmpty()) { + if (!IBindable.getOwnerName(item).isEmpty()) { item.getTagCompound().removeTag("ownerName"); func_152373_a(iCommandSender, this, "commands.unbind.success"); } else { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/commands/sub/SubCommandBind.java b/src/main/java/WayofTime/alchemicalWizardry/common/commands/sub/SubCommandBind.java index 359b4648..d5f63ce8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/commands/sub/SubCommandBind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/commands/sub/SubCommandBind.java @@ -9,7 +9,6 @@ import net.minecraft.util.StatCollector; import WayofTime.alchemicalWizardry.api.command.SubCommandBase; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; public class SubCommandBind extends SubCommandBase { @@ -56,10 +55,10 @@ public class SubCommandBind extends SubCommandBase { } if (bind) { - EnergyItems.setItemOwner(held, playerName); + IBindable.setItemOwner(held, playerName); commandSender.addChatMessage(new ChatComponentTranslation("commands.bind.success")); } else { - if (!EnergyItems.getOwnerName(held).isEmpty()) { + if (!IBindable.getOwnerName(held).isEmpty()) { held.stackTagCompound.removeTag("ownerName"); commandSender.addChatMessage(new ChatComponentTranslation("commands.bind.remove.success")); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java index be9f4890..7fb82d7a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -97,7 +98,7 @@ public class ActivationCrystal extends EnergyItems { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java index d635a1b9..04e97e1d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java @@ -2,11 +2,11 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; @@ -24,8 +24,6 @@ public class ArmourInhibitor extends EnergyItems { @SideOnly(Side.CLIENT) private IIcon passiveIcon; - private int tickDelay = 200; - public ArmourInhibitor() { super(); this.maxStackSize = 1; @@ -50,13 +48,7 @@ public class ArmourInhibitor extends EnergyItems { @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -75,20 +67,15 @@ public class ArmourInhibitor extends EnergyItems { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } + IBindable.setActive(par1ItemStack, !IBindable.isActive(par1ItemStack)); - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(par1ItemStack)) { par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); + IBindable.setDrainTick(par1ItemStack, par2World, tickDelay); } else { par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } @@ -104,11 +91,7 @@ public class ArmourInhibitor extends EnergyItems { EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { + if (IBindable.isActive(par1ItemStack)) { if (par2World.getTotalWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) {} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java index 472e2e25..f1e9ab41 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -52,7 +53,7 @@ public class BlankSpell extends EnergyItems { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index 35649f59..144a2a7a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -32,6 +32,7 @@ public class BoundAxe extends ItemAxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; + public int rightClickCost = 10000; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -75,13 +76,7 @@ public class BoundAxe extends ItemAxe implements IBindable { @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -90,29 +85,7 @@ public class BoundAxe extends ItemAxe implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { - this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); - return par1ItemStack; - } - - if (par2World.isRemote) { - return par1ItemStack; - } - - if (!getActivated(par1ItemStack) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) { - return par1ItemStack; - } - - if (AlchemicalWizardry.disableBoundToolsRightClick) { - return par1ItemStack; - } - - if (par3EntityPlayer.isPotionActive(AlchemicalWizardry.customPotionInhibit)) { - return par1ItemStack; - } - - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 10000)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost, true)) { return par1ItemStack; } @@ -172,45 +145,18 @@ public class BoundAxe extends ItemAxe implements IBindable { if (par1ItemStack.getTagCompound() == null) { par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) { - this.setActivated(par1ItemStack, false); - } - } - } + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 200, 20); par1ItemStack.setItemDamage(0); } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); - } - - public boolean getActivated(ItemStack par1ItemStack) { - if (!par1ItemStack.hasTagCompound()) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - return itemTag.getBoolean("isActive"); - } - /** * Returns the strength of the stack against a given block. 1.0F base, (Quality+1)*2 if correct blocktype, 1.5F if * sword */ @Override public float func_150893_a(ItemStack par1ItemStack, Block par2Block) { - if (!getActivated(par1ItemStack)) { + if (!IBindable.isActive(par1ItemStack)) { return 0.0F; } @@ -223,7 +169,7 @@ public class BoundAxe extends ItemAxe implements IBindable { */ public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - return getActivated(par1ItemStack); + return IBindable.isActive(par1ItemStack); } public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, Block par3, int par4, int par5, int par6, @@ -253,7 +199,7 @@ public class BoundAxe extends ItemAxe implements IBindable { */ @Override public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!getActivated(stack)) { + if (!IBindable.isActive(stack)) { return 0.0F; } @@ -266,11 +212,11 @@ public class BoundAxe extends ItemAxe implements IBindable { @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - return !getActivated(stack); + return !IBindable.isActive(stack); } @Override public int getHarvestLevel(ItemStack stack, String toolClass) { - return getActivated(stack) ? super.getHarvestLevel(stack, toolClass) : -1; + return IBindable.isActive(stack) ? super.getHarvestLevel(stack, toolClass) : -1; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index 9e497286..910c25a6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -33,6 +33,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; + public int rightClickCost = 10000; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -77,13 +78,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -92,32 +87,9 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { - this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost, true)) { return par1ItemStack; } - - if (par2World.isRemote) { - return par1ItemStack; - } - - if (!getActivated(par1ItemStack) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) { - return par1ItemStack; - } - - if (AlchemicalWizardry.disableBoundToolsRightClick) { - return par1ItemStack; - } - - if (par3EntityPlayer.isPotionActive(AlchemicalWizardry.customPotionInhibit)) { - return par1ItemStack; - } - - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 10000)) { - return par1ItemStack; - } - Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer); int posX = (int) (blockVec.xCoord); int posY = (int) (blockVec.yCoord); @@ -190,38 +162,11 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) { - this.setActivated(par1ItemStack, false); - } - } - } + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 200, 20); par1ItemStack.setItemDamage(0); } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); - } - - public boolean getActivated(ItemStack par1ItemStack) { - if (!par1ItemStack.hasTagCompound()) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - return itemTag.getBoolean("isActive"); - } - /** * Returns the strength of the stack against a given block. 1.0F base, (Quality+1)*2 if correct blocktype, 1.5F if * sword @@ -229,7 +174,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { @Override public float func_150893_a(ItemStack par1ItemStack, Block par2Block) // getStrVsBlock { - if (!getActivated(par1ItemStack)) { + if (!IBindable.isActive(par1ItemStack)) { return 0.0F; } @@ -240,9 +185,10 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { * Current implementations of this method in child classes do not use the entry argument beside ev. They just raise * the damage on the stack. */ + @Override public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - return getActivated(par1ItemStack); + return IBindable.isActive(par1ItemStack); } @Override @@ -277,7 +223,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { */ @Override public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!getActivated(stack)) { + if (!IBindable.isActive(stack)) { return 0.0F; } @@ -290,11 +236,11 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - return !getActivated(stack); + return !IBindable.isActive(stack); } @Override public int getHarvestLevel(ItemStack stack, String toolClass) { - return getActivated(stack) ? super.getHarvestLevel(stack, toolClass) : -1; + return IBindable.isActive(stack) ? super.getHarvestLevel(stack, toolClass) : -1; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index 1e6221b7..4baca49b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -34,6 +34,7 @@ public class BoundShovel extends ItemSpade implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; + public int rightClickCost = 10000; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -77,13 +78,7 @@ public class BoundShovel extends ItemSpade implements IBindable { @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -92,29 +87,7 @@ public class BoundShovel extends ItemSpade implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { - this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); - return par1ItemStack; - } - - if (par2World.isRemote) { - return par1ItemStack; - } - - if (!getActivated(par1ItemStack) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) { - return par1ItemStack; - } - - if (AlchemicalWizardry.disableBoundToolsRightClick) { - return par1ItemStack; - } - - if (par3EntityPlayer.isPotionActive(AlchemicalWizardry.customPotionInhibit)) { - return par1ItemStack; - } - - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 10000)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost, true)) { return par1ItemStack; } @@ -173,45 +146,19 @@ public class BoundShovel extends ItemSpade implements IBindable { if (par1ItemStack.getTagCompound() == null) { par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 20)) { - this.setActivated(par1ItemStack, false); - } - } - } + + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 200, 20); par1ItemStack.setItemDamage(0); } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); - } - - public boolean getActivated(ItemStack par1ItemStack) { - if (!par1ItemStack.hasTagCompound()) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - return itemTag.getBoolean("isActive"); - } - /** * Returns the strength of the stack against a given block. 1.0F base, (Quality+1)*2 if correct blocktype, 1.5F if * sword */ @Override public float func_150893_a(ItemStack par1ItemStack, Block par2Block) { - if (!getActivated(par1ItemStack)) { + if (!IBindable.isActive(par1ItemStack)) { return 0.0F; } @@ -224,7 +171,7 @@ public class BoundShovel extends ItemSpade implements IBindable { */ public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { - return getActivated(par1ItemStack); + return IBindable.isActive(par1ItemStack); } public boolean onBlockDestroyed(ItemStack par1ItemStack, World par2World, int par3, int par4, int par5, int par6, @@ -262,7 +209,7 @@ public class BoundShovel extends ItemSpade implements IBindable { */ @Override public float getDigSpeed(ItemStack stack, Block block, int meta) { - if (!getActivated(stack)) { + if (!IBindable.isActive(stack)) { return 0.0F; } @@ -275,11 +222,11 @@ public class BoundShovel extends ItemSpade implements IBindable { @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - return !getActivated(stack); + return !IBindable.isActive(stack); } @Override public int getHarvestLevel(ItemStack stack, String toolClass) { - return getActivated(stack) ? super.getHarvestLevel(stack, toolClass) : -1; + return IBindable.isActive(stack) ? super.getHarvestLevel(stack, toolClass) : -1; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java index 69a5236e..aa4be358 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java @@ -45,7 +45,7 @@ public class CheatyItem extends Item implements IBindable { public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { World world = par3EntityPlayer.worldObj; - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java index 7a14dc38..efb904e5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java @@ -47,7 +47,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable, IBl } public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index 0155120c..ec6536a4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -2,11 +2,11 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -70,7 +70,7 @@ public class EnergyBlast extends EnergyItems { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (isActive(stack)) { + if (IBindable.isActive(stack)) { switch (this.tier) { case 1: return this.activeIcon; @@ -87,7 +87,7 @@ public class EnergyBlast extends EnergyItems { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (getDelay(par1ItemStack) > 0 && isActive(par1ItemStack) && !par3EntityPlayer.isSneaking()) { + if (getDelay(par1ItemStack) > 0 && IBindable.isActive(par1ItemStack) && !par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -123,7 +123,7 @@ public class EnergyBlast extends EnergyItems { this.setDelay(par1ItemStack, delay - 1); } - passiveDrain(par1ItemStack, par2World, par3EntityPlayer, getMaxDelayAfterActivation(), getActivationCost()); + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, getMaxDelayAfterActivation(), getActivationCost()); par1ItemStack.setItemDamage(0); } @@ -175,10 +175,10 @@ public class EnergyBlast extends EnergyItems { } public void setDelay(ItemStack par1ItemStack, int delay) { - getTag(par1ItemStack).setInteger("delay", delay); + IBindable.getTag(par1ItemStack).setInteger("delay", delay); } public int getDelay(ItemStack par1ItemStack) { - return getTag(par1ItemStack).getInteger("delay"); + return IBindable.getTag(par1ItemStack).getInteger("delay"); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java index d6b6de55..3a0a7c28 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java @@ -3,7 +3,6 @@ package WayofTime.alchemicalWizardry.common.items; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.util.DamageSource; import net.minecraft.world.World; @@ -181,37 +180,6 @@ public class EnergyItems extends Item implements IBindable { return true; } - // Global static methods - public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) { - return !SpellHelper.isFakePlayer(player) && SoulNetworkHandler.checkAndSetItemPlayer(item, player); - } - - public static void setItemOwner(ItemStack item, String ownerName) { - if (item.getTagCompound() == null) { - item.setTagCompound(new NBTTagCompound()); - } - - item.getTagCompound().setString("ownerName", ownerName); - } - - public static void checkAndSetItemOwner(ItemStack item, String ownerName) { - if (item.getTagCompound() == null) { - item.setTagCompound(new NBTTagCompound()); - } - - if (item.getTagCompound().getString("ownerName").equals("")) { - item.getTagCompound().setString("ownerName", ownerName); - } - } - - public static String getOwnerName(ItemStack item) { - if (item.getTagCompound() == null) { - item.setTagCompound(new NBTTagCompound()); - } - - return item.getTagCompound().getString("ownerName"); - } - @Deprecated public static void drainPlayerNetwork(EntityPlayer player, int damageToBeDone) { String ownerName = SpellHelper.getUsername(player); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java index 1574eea9..713cd103 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java @@ -34,6 +34,8 @@ public class EnergySword extends ItemSword implements IBindable { private IIcon passiveIcon; private int energyUsed; + // The number of ticks between passive drains + protected int tickDelay = 100; public EnergySword() { super(AlchemicalWizardry.bloodBoundToolMaterial); @@ -62,13 +64,7 @@ public class EnergySword extends ItemSword implements IBindable { @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -81,7 +77,7 @@ public class EnergySword extends ItemSword implements IBindable { @Override public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) { - boolean isActive = getActivated(stack); + boolean isActive = IBindable.isActive(stack); if (isActive && !player.worldObj.isRemote) { OmegaParadigm parad = this.getOmegaParadigmOfWeilder(player); @@ -98,7 +94,7 @@ public class EnergySword extends ItemSword implements IBindable { public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { if (par3EntityLivingBase instanceof EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase) || !EnergyItems + if (!IBindable.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase) || !EnergyItems .syphonBatteries(par1ItemStack, (EntityPlayer) par3EntityLivingBase, this.getEnergyUsed())) { return false; } @@ -111,15 +107,8 @@ public class EnergySword extends ItemSword implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer); - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { - this.setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); - return par1ItemStack; - } - if (!getActivated(par1ItemStack)) { - return par1ItemStack; - } + IBindable.toggle(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -141,38 +130,11 @@ public class EnergySword extends ItemSword implements IBindable { par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par2World.getWorldTime() % 100 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 50)) { - this.setActivated(par1ItemStack, false); - } - } - } + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 100, 50); par1ItemStack.setItemDamage(0); } - public void setActivated(ItemStack par1ItemStack, boolean newActivated) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); - } - - public boolean getActivated(ItemStack par1ItemStack) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - return itemTag.getBoolean("isActive"); - } - public float func_82803_g() { return 4.0F; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java index 68e0e5d9..29a79835 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -52,7 +53,7 @@ public class ItemComplexSpellCrystal extends EnergyItems { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java index 48c283aa..7b8eecbc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java @@ -43,7 +43,7 @@ public class ItemDiabloKey extends EnergyItems { public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { World world = par3EntityPlayer.worldObj; - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer) { return par1ItemStack; } @@ -101,7 +101,7 @@ public class ItemDiabloKey extends EnergyItems { } if (item instanceof IBindable) { - EnergyItems.checkAndSetItemOwner(itemStack, ownerName); + IBindable.checkAndSetItemOwner(itemStack, ownerName); } } par3EntityPlayer.inventoryContainer.detectAndSendChanges(); @@ -114,7 +114,7 @@ public class ItemDiabloKey extends EnergyItems { public void getSubItems(Item id, CreativeTabs creativeTab, List list) { list.add(new ItemStack(ModItems.itemKeyOfDiablo)); ItemStack boundKey = new ItemStack(ModItems.itemKeyOfDiablo); - EnergyItems.checkAndSetItemOwner(boundKey, "Server-wide Soul Network"); + IBindable.checkAndSetItemOwner(boundKey, "Server-wide Soul Network"); list.add(boundKey); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java index 30fba3e2..959642dd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -42,7 +43,7 @@ public class ItemRitualDismantler extends EnergyItems { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) { - return EnergyItems.checkAndSetItemOwner(stack, player) + return IBindable.checkAndSetItemOwner(stack, player) && breakRitualStoneAtMasterStone(stack, player, world, x, y, z); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index 0b102bf0..71548974 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -189,7 +190,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10) { - if (!EnergyItems.checkAndSetItemOwner(stack, player)) return false; + if (!IBindable.checkAndSetItemOwner(stack, player)) return false; if (placeRitualStoneAtMasterStone(stack, player, world, x, y, z)) { this.setStoredLocation(stack, new Int3(x, y, z)); @@ -367,7 +368,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner { @Override public ItemStack onItemRightClick(ItemStack stack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(stack, par3EntityPlayer) && par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(stack, par3EntityPlayer) && par3EntityPlayer.isSneaking()) { rotateRituals(par2World, par3EntityPlayer, stack, true); } @@ -379,7 +380,7 @@ public class ItemRitualDiviner extends EnergyItems implements IRitualDiviner { if (entityLiving instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entityLiving; - if (!EnergyItems.checkAndSetItemOwner(stack, player)) return true; + if (!IBindable.checkAndSetItemOwner(stack, player)) return true; if (!player.isSwingInProgress) { if (player.isSneaking()) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java index 3b31d433..94a7c902 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -52,7 +53,7 @@ public class LavaCrystal extends EnergyItems { } public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java index 5b80d337..2c268699 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; @@ -25,17 +26,12 @@ public class ScribeTool extends EnergyItems { @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.scribetool.desc")); - - if (!(par1ItemStack.getTagCompound() == null)) { - par3List.add( - StatCollector.translateToLocal("tooltip.owner.currentowner") + " " - + par1ItemStack.getTagCompound().getString("ownerName")); - } + addBindingInformation(par1ItemStack, par3List); } @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { if (par1ItemStack.getItemDamage() > 0) { par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java index c86d74b3..925bc3f7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -53,7 +54,7 @@ public class TelepositionFocus extends EnergyItems { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { if (par3EntityPlayer.isSneaking()) { return par1ItemStack; } 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 af13d913..dc0e9990 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/BoundArmour.java @@ -262,7 +262,7 @@ public class BoundArmour extends ItemArmor @Override public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { if (entity instanceof EntityPlayer) { - EnergyItems.checkAndSetItemOwner(stack, (EntityPlayer) entity); + IBindable.checkAndSetItemOwner(stack, (EntityPlayer) entity); if (((EntityPlayer) entity).capabilities.isCreativeMode) { return; @@ -327,7 +327,7 @@ public class BoundArmour extends ItemArmor @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); return super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer); } @@ -348,7 +348,7 @@ public class BoundArmour extends ItemArmor public void repairArmour(World world, EntityPlayer player, ItemStack itemStack) { if (itemStack.getItemDamage() > 0) { - EnergyItems.checkAndSetItemOwner(itemStack, player); + IBindable.checkAndSetItemOwner(itemStack, player); if (!player.capabilities.isCreativeMode) { if (EnergyItems.syphonBatteries(itemStack, player, itemStack.getItemDamage() * 75)) { 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 9bc39a53..819b2ea6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -41,7 +42,7 @@ public class SigilAir extends EnergyItems implements ArmourUpgrade, ISigil { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } 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 9d888026..d8bd18c8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -45,7 +46,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer) + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer) || !EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed())) { return true; } @@ -83,7 +84,7 @@ public class SigilBloodLight extends EnergyItems implements IHolding, ArmourUpgr @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } 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 a0592fb8..849e4e8f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java @@ -50,9 +50,9 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote) { return par1ItemStack; } 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 bcd933ab..87f9266a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -51,13 +52,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -76,29 +71,11 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive")) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); - - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - tag.setBoolean("isActive", false); - } - } - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); - } + ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); return par1ItemStack; } @@ -115,7 +92,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { + if (IBindable.isActive(par1ItemStack)) { int range = 3; int verticalRange = 1; int posX = (int) Math.round(par3Entity.posX - 0.5f); @@ -130,14 +107,8 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade } } } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } - } + + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); } @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 cf1cf465..c2306340 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -75,7 +76,7 @@ public class SigilLava extends ItemBucket implements ArmourUpgrade, ISigil { @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (world.isRemote || !EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { + if (world.isRemote || !IBindable.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return false; } 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 0c0ff7fd..26de2374 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -51,13 +52,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil { @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -76,25 +71,13 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive") - && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); + if (ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay)) { par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.waterBreathing.id, 2, 0, true)); par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 2, 0, true)); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } return par1ItemStack; @@ -112,19 +95,12 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil { par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { + if (IBindable.isActive(par1ItemStack)) { par3EntityPlayer.fallDistance = 0; par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.waterBreathing.id, 2, 0, true)); par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 2, 0, true)); } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } - } + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); } } 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 4f5d23f8..cd60c203 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -52,13 +53,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -77,29 +72,11 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive")) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); - - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - tag.setBoolean("isActive", false); - } - } - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); - } + ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); return par1ItemStack; } @@ -116,7 +93,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { + if (IBindable.isActive(par1ItemStack)) { List list = SpellHelper .getEntitiesInRange(par2World, par3Entity.posX, par3Entity.posY, par3Entity.posZ, 4.5, 4.5); for (Entity entity : list) { @@ -126,15 +103,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig } } } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } - } - return; + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); } } 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 237572af..467004a2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.client.renderer.texture.IIconRegister; @@ -58,13 +59,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -84,7 +79,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer)) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer)) { if (applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer)) { EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()); @@ -101,7 +96,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -109,20 +104,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive") - && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); - } + ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); return par1ItemStack; } @@ -137,12 +119,9 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { - if (!EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } + if (IBindable.isActive(par1ItemStack)) { + + IBindable.passiveDrain(par1ItemStack, par2World, (EntityPlayer) par3Entity, tickDelay, getEnergyUsed()); int range = 3; int verticalRange = 2; int posX = (int) Math.round(par3Entity.posX - 0.5f); 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 372d3fd3..e178ee9d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -50,13 +51,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil { @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -75,24 +70,12 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive") - && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); + if (ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay)) { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionBoost.id, 3, 1)); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } return par1ItemStack; @@ -110,18 +93,11 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil { par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { + if (IBindable.isActive(par1ItemStack)) { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionBoost.id, 3, 1)); } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } - } + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); } @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 8a7ab06d..3978e7c4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -55,13 +56,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -80,24 +75,11 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive") - && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); - } + ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); return par1ItemStack; } @@ -114,12 +96,9 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { - if (!EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } + if (IBindable.isActive(par1ItemStack)) { + + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); int range = 5; int verticalRange = 5; 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 174edd91..99f09f88 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -57,16 +58,10 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { - return activeIcon; + if (IBindable.isActive(stack)) { + return this.activeIcon; } else { - return passiveIcon; + return this.passiveIcon; } } @@ -82,9 +77,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - int tickDelay = 200; - - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) { return par1ItemStack; } @@ -93,25 +86,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive")) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); - - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - tag.setBoolean("isActive", false); - } - } - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); - } + ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); return par1ItemStack; } @@ -132,7 +107,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive") && (!par2World.isRemote)) { + if (IBindable.isActive(par1ItemStack) && (!par2World.isRemote)) { Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer); int x = (int) blockVec.xCoord; int y = (int) blockVec.yCoord; @@ -162,15 +137,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi } } } - - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } - } + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); } @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 88165d16..90863dc4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -69,7 +70,7 @@ public class SigilOfTheAssassin extends EnergyItems implements ArmourUpgrade, IS * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } 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 98c8bbdd..76410a54 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -30,8 +31,6 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig @SideOnly(Side.CLIENT) private IIcon passiveIcon; - private int tickDelay = 200; - public SigilOfTheBridge() { super(); this.maxStackSize = 1; @@ -56,13 +55,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -81,24 +74,11 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive") - && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); - } + ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); return par1ItemStack; } @@ -115,15 +95,8 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) { - if (EnergyItems - .syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, this.getLPUsed(par1ItemStack))) { - this.setLPUsed(par1ItemStack, 0); - } else { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } + if (IBindable.isActive(par1ItemStack)) { + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); if (!par3EntityPlayer.onGround && !par3EntityPlayer.isSneaking()) { return; } 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 f5ed24d5..70addd6d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -51,13 +52,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -76,24 +71,12 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive") - && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); + if (ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay)) { par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 2, 1, true)); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } return par1ItemStack; @@ -111,18 +94,11 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { + if (IBindable.isActive(par1ItemStack)) { par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 2, 1, true)); } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } - } + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); } @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 20416a73..0c45d463 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -50,13 +51,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade, ISigil { @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -75,24 +70,12 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade, ISigil { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive") - && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); + if (ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay)) { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionProjProt.id, 2, 1)); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } return par1ItemStack; @@ -110,18 +93,11 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade, ISigil { par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { + if (IBindable.isActive(par1ItemStack)) { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionProjProt.id, 2, 1)); } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } - } + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 200, getEnergyUsed()); } @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 ccf65592..8515fee8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -52,13 +53,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade @Override public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - if (stack.getTagCompound() == null) { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.getTagCompound(); - - if (tag.getBoolean("isActive")) { + if (IBindable.isActive(stack)) { return this.activeIcon; } else { return this.passiveIcon; @@ -77,29 +72,11 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = par1ItemStack.getTagCompound(); - tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); - - if (tag.getBoolean("isActive")) { - par1ItemStack.setItemDamage(1); - tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); - - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - tag.setBoolean("isActive", false); - } - } - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); - } + ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); return par1ItemStack; } @@ -116,7 +93,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade par1ItemStack.setTagCompound(new NBTTagCompound()); } - if (par1ItemStack.getTagCompound().getBoolean("isActive")) { + if (IBindable.isActive(par1ItemStack)) { ItemStack stack = CompressionRegistry .compressInventory(par3EntityPlayer.inventory.mainInventory, par2World); if (stack != null) { @@ -129,14 +106,8 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade par2World.spawnEntityInWorld(entityItem); } } - if (par2World.getWorldTime() % 200 == par1ItemStack.getTagCompound().getInteger("worldTimeDelay") - && par1ItemStack.getTagCompound().getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed())) { - par1ItemStack.getTagCompound().setBoolean("isActive", false); - } - } - } + + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); } @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 2e57285c..2a6f0a3e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -14,7 +15,6 @@ import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -40,7 +40,7 @@ public class SigilSeer extends Item implements IHolding, ArmourUpgrade, ISigil { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote) { return par1ItemStack; } 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 b63db16a..17cefb5e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBucket; @@ -69,7 +70,7 @@ public class SigilVoid extends ItemBucket implements ArmourUpgrade, ISigil { @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (world.isRemote || !EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { + if (world.isRemote || !IBindable.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return false; } 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 42329285..eb58db47 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -73,7 +74,7 @@ public class SigilWater extends ItemBucket implements ArmourUpgrade, ISigil { @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (world.isRemote || !EnergyItems.checkAndSetItemOwner(stack, player) || player.isSneaking()) { + if (world.isRemote || !IBindable.checkAndSetItemOwner(stack, player) || player.isSneaking()) { return false; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/InventoryHolding.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/InventoryHolding.java index 75a6c4fc..80a23934 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/InventoryHolding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/InventoryHolding.java @@ -153,7 +153,7 @@ public class InventoryHolding implements IInventory { @Override public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { - return itemStack.getItem() instanceof ISigil; + return itemStack.getItem() instanceof ISigil && !(itemStack.getItem() instanceof SigilOfHolding); } public void readFromNBT(NBTTagCompound nbtTagCompound) { 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 3524dd1a..3fbc35d6 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 @@ -2,6 +2,8 @@ package WayofTime.alchemicalWizardry.common.items.sigil.holding; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -18,7 +20,7 @@ import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class SigilOfHolding extends EnergyItems { +public class SigilOfHolding extends EnergyItems implements ISigil { private static int invSize = 5; @@ -90,7 +92,7 @@ public class SigilOfHolding extends EnergyItems { @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if (checkAndSetItemOwner(par1ItemStack, par2EntityPlayer)) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer)) { int currentSlot = getCurrentItem(par1ItemStack); ItemStack[] inv = getInternalInventory(par1ItemStack); @@ -117,7 +119,7 @@ public class SigilOfHolding extends EnergyItems { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { if (par3EntityPlayer.isSneaking()) { InventoryHolding.setUUID(par1ItemStack); par3EntityPlayer.openGui( @@ -152,7 +154,7 @@ public class SigilOfHolding extends EnergyItems { @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - if (checkAndSetItemOwner(stack, player)) { + if (IBindable.checkAndSetItemOwner(stack, player)) { int currentSlot = getCurrentItem(stack); ItemStack[] inv = getInternalInventory(stack); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java index 197d6b8d..78e19115 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java @@ -24,7 +24,6 @@ import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.spell.simple.SpellTeleport; @@ -74,7 +73,7 @@ public class RitualEffectExpulsion extends RitualEffect { for (int i = 0; i < inventoryTile.getSizeInventory(); i++) { ItemStack stack = inventoryTile.getStackInSlot(i); if (stack != null && stack.getItem() instanceof IBindable - && EnergyItems.getOwnerName(stack).equals(playerString)) { + && IBindable.getOwnerName(stack).equals(playerString)) { test = true; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java index 2da10b30..b3bf2958 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java @@ -20,7 +20,6 @@ import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.items.armour.BoundArmour; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; @@ -65,13 +64,13 @@ public class RitualEffectUnbinding extends RitualEffect { boolean hasSanctus = this .canDrainReagent(ritualStone, ReagentRegistry.sanctusReagent, sanctusDrain, false); if (hasSanctus) { - if (itemStack.getItem() instanceof IBindable && !EnergyItems.getOwnerName(itemStack).equals("")) { + if (itemStack.getItem() instanceof IBindable && !IBindable.getOwnerName(itemStack).equals("")) { world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z - 5)); world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z + 5)); world.addWeatherEffect(new EntityLightningBolt(world, x - 5, y + 1, z)); world.addWeatherEffect(new EntityLightningBolt(world, x + 5, y + 1, z)); - EnergyItems.setItemOwner(itemStack, ""); + IBindable.setItemOwner(itemStack, ""); this.canDrainReagent(ritualStone, ReagentRegistry.sanctusReagent, sanctusDrain, true); drain = true; ritualStone.setActive(false); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java index 1d373ee6..8ebc532c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import java.util.Random; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -24,7 +25,7 @@ public class SpellEarthBender extends HomSpell { @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -41,7 +42,7 @@ public class SpellEarthBender extends HomSpell { @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -74,7 +75,7 @@ public class SpellEarthBender extends HomSpell { @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -143,7 +144,7 @@ public class SpellEarthBender extends HomSpell { @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java index db2a1756..2f473ba5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import java.util.Random; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -21,7 +22,7 @@ public class SpellExplosions extends HomSpell { @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -42,7 +43,7 @@ public class SpellExplosions extends HomSpell { @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -66,7 +67,7 @@ public class SpellExplosions extends HomSpell { @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -88,7 +89,7 @@ public class SpellExplosions extends HomSpell { @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java index abfe1cf4..6978c2a0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -27,7 +28,7 @@ public class SpellFireBurst extends HomSpell { @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -49,7 +50,7 @@ public class SpellFireBurst extends HomSpell { @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -83,7 +84,7 @@ public class SpellFireBurst extends HomSpell { @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -121,7 +122,7 @@ public class SpellFireBurst extends HomSpell { @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java index 31a1eef0..3747e4f4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import java.util.Random; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -23,7 +24,7 @@ public class SpellFrozenWater extends HomSpell { @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -44,7 +45,7 @@ public class SpellFrozenWater extends HomSpell { @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -184,7 +185,7 @@ public class SpellFrozenWater extends HomSpell { @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java index 507ec181..10efcfb6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -27,7 +28,7 @@ public class SpellHolyBlast extends HomSpell { @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -48,7 +49,7 @@ public class SpellHolyBlast extends HomSpell { @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -115,7 +116,7 @@ public class SpellHolyBlast extends HomSpell { @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -145,7 +146,7 @@ public class SpellHolyBlast extends HomSpell { @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java index 3ffc8adc..02470321 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import java.util.Random; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,7 +24,7 @@ public class SpellLightningBolt extends HomSpell { @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -45,7 +46,7 @@ public class SpellLightningBolt extends HomSpell { public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { // TODO Make it work better...? - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -88,7 +89,7 @@ public class SpellLightningBolt extends HomSpell { @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -132,7 +133,7 @@ public class SpellLightningBolt extends HomSpell { @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java index a305abd8..cedd34ee 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +32,7 @@ public class SpellTeleport extends HomSpell { @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -48,7 +49,7 @@ public class SpellTeleport extends HomSpell { @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -63,7 +64,7 @@ public class SpellTeleport extends HomSpell { @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -99,7 +100,7 @@ public class SpellTeleport extends HomSpell { @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java index c34755e4..10b98d53 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -30,7 +31,7 @@ public class SpellWateryGrave extends HomSpell { @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -47,7 +48,7 @@ public class SpellWateryGrave extends HomSpell { @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -79,7 +80,7 @@ public class SpellWateryGrave extends HomSpell { @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -144,7 +145,7 @@ public class SpellWateryGrave extends HomSpell { @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java index ecd1ab81..c9cb3f7b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java @@ -4,6 +4,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -27,7 +28,7 @@ public class SpellWindGust extends HomSpell { @Override public ItemStack onOffensiveRangedRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -48,7 +49,7 @@ public class SpellWindGust extends HomSpell { @Override public ItemStack onOffensiveMeleeRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -107,7 +108,7 @@ public class SpellWindGust extends HomSpell { @Override public ItemStack onDefensiveRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } @@ -161,7 +162,7 @@ public class SpellWindGust extends HomSpell { @Override public ItemStack onEnvironmentalRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { return par1ItemStack; } From 5a6c998070c9704785c1feddc2062a928ff9c069 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 15:36:07 -0400 Subject: [PATCH 06/15] Remove quotes from "Developer" username set in gradle.properties. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index dde74d98..0551f3f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,7 +37,7 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co # Select a default username for testing your mod. You can always override this per-run by running # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE. -developmentEnvironmentUserName = "Developer" +developmentEnvironmentUserName = Developer # Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8. # See https://github.com/bsideup/jabel for details on how this works. From 082b41cb8ca74afac9d1d86fa5ded2952a1963f6 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 16:18:31 -0400 Subject: [PATCH 07/15] Add these back as wrappers for the new methods to fix a problem with Blood Arsenal. --- .../common/items/EnergyItems.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java index 3a0a7c28..6887731e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java @@ -180,6 +180,26 @@ public class EnergyItems extends Item implements IBindable { return true; } + @Deprecated + public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) { + return IBindable.checkAndSetItemOwner(item, player); + } + + @Deprecated + public static void setItemOwner(ItemStack item, String ownerName) { + IBindable.setItemOwner(item, ownerName); + } + + @Deprecated + public static void checkAndSetItemOwner(ItemStack item, String ownerName) { + IBindable.checkAndSetItemOwner(item, ownerName); + } + + @Deprecated + public static String getOwnerName(ItemStack item) { + return IBindable.getOwnerName(item); + } + @Deprecated public static void drainPlayerNetwork(EntityPlayer player, int damageToBeDone) { String ownerName = SpellHelper.getUsername(player); From 38a7bbbe552828725b61c18c1ec341956a13664f Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 16:24:42 -0400 Subject: [PATCH 08/15] Replace checkAndSetItemOwner in SoulNetworkHandler with a wrapper for the new version in IBindable. Spotless. --- .../api/items/interfaces/IBindable.java | 39 ++++++++++--------- .../api/items/interfaces/ISigil.java | 5 ++- .../api/soulNetwork/SoulNetworkHandler.java | 10 ++--- .../api/spell/SpellParadigmTool.java | 3 +- .../common/block/BlockMasterStone.java | 2 +- .../common/items/ActivationCrystal.java | 2 +- .../common/items/ArmourInhibitor.java | 2 +- .../common/items/BlankSpell.java | 2 +- .../common/items/EnergyBazooka.java | 10 ++--- .../common/items/EnergyBlast.java | 9 ++++- .../common/items/ItemComplexSpellCrystal.java | 2 +- .../common/items/ItemRitualDismantler.java | 2 +- .../common/items/ItemRitualDiviner.java | 2 +- .../common/items/LavaCrystal.java | 2 +- .../common/items/ScribeTool.java | 2 +- .../common/items/TelepositionFocus.java | 2 +- .../common/items/armour/OmegaArmour.java | 3 +- .../common/items/sigil/SigilAir.java | 2 +- .../common/items/sigil/SigilBloodLight.java | 2 +- .../common/items/sigil/SigilHarvest.java | 2 +- .../common/items/sigil/SigilLava.java | 2 +- .../items/sigil/SigilOfElementalAffinity.java | 2 +- .../items/sigil/SigilOfEnderSeverance.java | 2 +- .../common/items/sigil/SigilOfGrowth.java | 2 +- .../common/items/sigil/SigilOfHaste.java | 2 +- .../common/items/sigil/SigilOfMagnetism.java | 2 +- .../common/items/sigil/SigilOfSupression.java | 2 +- .../items/sigil/SigilOfTheAssassin.java | 2 +- .../common/items/sigil/SigilOfTheBridge.java | 2 +- .../items/sigil/SigilOfTheFastMiner.java | 2 +- .../common/items/sigil/SigilOfWind.java | 2 +- .../common/items/sigil/SigilPackRat.java | 2 +- .../common/items/sigil/SigilSeer.java | 2 +- .../common/items/sigil/SigilVoid.java | 2 +- .../common/items/sigil/SigilWater.java | 2 +- .../items/sigil/holding/SigilOfHolding.java | 4 +- .../common/spell/simple/SpellEarthBender.java | 2 +- .../common/spell/simple/SpellExplosions.java | 2 +- .../common/spell/simple/SpellFireBurst.java | 2 +- .../common/spell/simple/SpellFrozenWater.java | 2 +- .../common/spell/simple/SpellHolyBlast.java | 2 +- .../spell/simple/SpellLightningBolt.java | 2 +- .../common/spell/simple/SpellTeleport.java | 2 +- .../common/spell/simple/SpellWateryGrave.java | 2 +- .../common/spell/simple/SpellWindGust.java | 2 +- 45 files changed, 79 insertions(+), 78 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 ae219de4..74006e15 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.api.items.interfaces; import java.util.List; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +9,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; @@ -18,6 +18,9 @@ public interface IBindable { // The number of ticks between passive drains int tickDelay = 200; + /** + * Used by bound tools and the energy blaster/bazooka to check if they should skip their right click function. + */ default boolean checkRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int rightClickCost, boolean isBoundTool) { if (toggle(par1ItemStack, par2World, par3EntityPlayer)) { @@ -48,6 +51,9 @@ public interface IBindable { return false; } + /** + * Adds the active state and owner information to an item if it has the relevant tags. + */ default void addBindingInformation(ItemStack par1ItemStack, List par3List) { NBTTagCompound itemTag = getTag(par1ItemStack); if (itemTag.getBoolean("isActive")) { @@ -93,7 +99,7 @@ public interface IBindable { } static void passiveDrain(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int delay, - int cost) { + int cost) { NBTTagCompound itemTag = getTag(par1ItemStack); if (par2World.getTotalWorldTime() % delay == itemTag.getInteger("worldTimeDelay") && itemTag.getBoolean("isActive")) { @@ -112,35 +118,30 @@ public interface IBindable { getTag(par1ItemStack).setInteger("worldTimeDelay", (int) (par2World.getTotalWorldTime() - 1) % modulus); } - // Global static methods static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) { return !SpellHelper.isFakePlayer(player) && SoulNetworkHandler.checkAndSetItemPlayer(item, player); } + /** + * Sets the item's owner even if it already has one. + */ static void setItemOwner(ItemStack item, String ownerName) { - if (item.getTagCompound() == null) { - item.setTagCompound(new NBTTagCompound()); - } - - item.getTagCompound().setString("ownerName", ownerName); + NBTTagCompound tag = IBindable.getTag(item); + tag.setString("ownerName", ownerName); } + /** + * Sets the item's owner only if it does not already have one. + */ static void checkAndSetItemOwner(ItemStack item, String ownerName) { - if (item.getTagCompound() == null) { - item.setTagCompound(new NBTTagCompound()); - } NBTTagCompound tag = IBindable.getTag(item); - - if (item.getTagCompound().getString("ownerName").isEmpty()) { - item.getTagCompound().setString("ownerName", ownerName); + if (tag.getString("ownerName").isEmpty()) { + tag.setString("ownerName", ownerName); } } static String getOwnerName(ItemStack item) { - if (item.getTagCompound() == null) { - item.setTagCompound(new NBTTagCompound()); - } - - return item.getTagCompound().getString("ownerName"); + NBTTagCompound tag = IBindable.getTag(item); + return tag.getString("ownerName"); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java index 1dec308a..84f7dde2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java @@ -13,7 +13,7 @@ public interface ISigil extends IBindable { * after the toggle. */ static boolean toggleSigil(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int energyUsed, - int tickDelay) { + int tickDelay) { IBindable.setActive(par1ItemStack, !IBindable.isActive(par1ItemStack)); if (!par3EntityPlayer.capabilities.isCreativeMode @@ -21,7 +21,8 @@ public interface ISigil extends IBindable { IBindable.setActive(par1ItemStack, false); } - if (IBindable.isActive(par1ItemStack) && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, energyUsed)) { + if (IBindable.isActive(par1ItemStack) + && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, energyUsed)) { par1ItemStack.setItemDamage(1); IBindable.setDrainTick(par1ItemStack, par2World, tickDelay); return true; diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java index 638f7495..1df6973a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/soulNetwork/SoulNetworkHandler.java @@ -14,6 +14,7 @@ import WayofTime.alchemicalWizardry.api.event.AddToNetworkEvent; import WayofTime.alchemicalWizardry.api.event.ItemBindEvent; import WayofTime.alchemicalWizardry.api.event.ItemDrainInContainerEvent; import WayofTime.alchemicalWizardry.api.event.ItemDrainNetworkEvent; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.Event.Result; @@ -340,14 +341,9 @@ public class SoulNetworkHandler { return false; } + @Deprecated public static void checkAndSetItemOwner(ItemStack item, String ownerName) { - if (item.getTagCompound() == null) { - item.setTagCompound(new NBTTagCompound()); - } - - if (item.getTagCompound().getString("ownerName").equals("")) { - item.getTagCompound().setString("ownerName", ownerName); - } + IBindable.checkAndSetItemOwner(item, ownerName); } public static String getUsername(EntityPlayer player) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java index 0294fc5e..4f1b68d1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java @@ -17,6 +17,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import WayofTime.alchemicalWizardry.api.items.ItemSpellMultiTool; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; public class SpellParadigmTool extends SpellParadigm { @@ -159,7 +160,7 @@ public class SpellParadigmTool extends SpellParadigm { itemTool.setDuration(toolStack, world, this.duration); itemTool.loadParadigmIntoStack(toolStack, this.bufferedEffectList); - SoulNetworkHandler.checkAndSetItemOwner(toolStack, SoulNetworkHandler.getOwnerName(crystalStack)); + IBindable.checkAndSetItemOwner(toolStack, SoulNetworkHandler.getOwnerName(crystalStack)); itemTool.setContainedCrystal(toolStack, crystalStack); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java index da5c6333..f6476abd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java @@ -1,6 +1,5 @@ package WayofTime.alchemicalWizardry.common.block; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,6 +11,7 @@ import net.minecraft.world.Explosion; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.ActivationCrystal; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java index 7fb82d7a..f136d426 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -18,6 +17,7 @@ import org.lwjgl.input.Keyboard; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.alchemy.AlchemyRecipeRegistry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java index 04e97e1d..997d2d47 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +12,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java index f1e9ab41..58e25786 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +12,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java index 1ad3ff91..4172a449 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java @@ -3,11 +3,8 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -46,12 +43,11 @@ public class EnergyBazooka extends EnergyBlast { this.activeIconTier3 = iconRegister.registerIcon("AlchemicalWizardry:EnergyBazooka3_activated"); this.passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); } - + @Override public void shoot(World par2World, EntityPlayer par3EntityPlayer) { - par2World.spawnEntityInWorld( - new EntityEnergyBazookaMainProjectile(par2World, par3EntityPlayer, this.damage)); - + par2World.spawnEntityInWorld(new EntityEnergyBazookaMainProjectile(par2World, par3EntityPlayer, this.damage)); + Vec3 vec = par3EntityPlayer.getLookVec(); double wantedVelocity = this.tier * 2.0D; par3EntityPlayer.motionX = -vec.xCoord * wantedVelocity; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index ec6536a4..a1eda72f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -12,6 +11,7 @@ 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.entity.projectile.EnergyBlastProjectile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -123,7 +123,12 @@ public class EnergyBlast extends EnergyItems { this.setDelay(par1ItemStack, delay - 1); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, getMaxDelayAfterActivation(), getActivationCost()); + IBindable.passiveDrain( + par1ItemStack, + par2World, + par3EntityPlayer, + getMaxDelayAfterActivation(), + getActivationCost()); par1ItemStack.setItemDamage(0); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java index 29a79835..732778f5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +12,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.tileEntity.TESpellParadigmBlock; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java index 959642dd..a1bb5c5c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +12,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.block.RitualStone; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java index 71548974..9555fdbe 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -24,6 +23,7 @@ import org.lwjgl.input.Keyboard; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.Int3; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IRitualDiviner; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.IRitualStone; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java index 94a7c902..c5dacc04 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,6 +11,7 @@ import net.minecraft.world.WorldProvider; import net.minecraftforge.common.DimensionManager; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java index 2c268699..8b25136a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java @@ -2,13 +2,13 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; public class ScribeTool extends EnergyItems { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java index 925bc3f7..5d861f11 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,6 +10,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java index 4ec8dda5..d2b36b22 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/armour/OmegaArmour.java @@ -24,6 +24,7 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import WayofTime.alchemicalWizardry.api.alchemy.energy.Reagent; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.api.spell.APISpellHelper; import WayofTime.alchemicalWizardry.common.items.EnergyItems; @@ -137,7 +138,7 @@ public abstract class OmegaArmour extends BoundArmour { omegaStack.setTagCompound(tag); } this.setContainedArmourStack(omegaStack, boundStack); - SoulNetworkHandler.checkAndSetItemOwner(omegaStack, SoulNetworkHandler.getOwnerName(boundStack)); + IBindable.checkAndSetItemOwner(omegaStack, SoulNetworkHandler.getOwnerName(boundStack)); this.setItemEnchantability(omegaStack, Math.min(enchantability, 70)); EnchantmentHelper.setEnchantments(new HashMap(), omegaStack); 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 819b2ea6..103af65a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -13,6 +12,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; 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 d8bd18c8..f314cfdb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -15,6 +14,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightProjectile; 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 87f9266a..337ecee8 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -15,6 +14,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.harvest.HarvestRegistry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; 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 c2306340..a681a5bb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +21,7 @@ import net.minecraftforge.fluids.IFluidHandler; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyBattery; import WayofTime.alchemicalWizardry.common.items.EnergyItems; 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 26de2374..11f991b1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -15,6 +14,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; 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 cd60c203..a6c73d3d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -15,6 +14,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; 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 467004a2..1ce12679 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,6 +18,7 @@ import net.minecraftforge.event.entity.player.BonemealEvent; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.common.eventhandler.Event.Result; 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 e178ee9d..16dd4677 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -15,6 +14,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; 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 3978e7c4..3babd5cb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -17,6 +16,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; 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 99f09f88..88407256 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -17,6 +16,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; 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 90863dc4..cb2f96ca 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -23,6 +22,7 @@ import net.minecraftforge.event.entity.living.EnderTeleportEvent; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; 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 76410a54..004782c3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -17,6 +16,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.tileEntity.TESpectralBlock; 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 70addd6d..1f51636b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -16,6 +15,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; 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 0c45d463..6d9bdc56 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -15,6 +14,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; 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 8515fee8..acf78937 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -16,6 +15,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.compress.CompressionRegistry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; 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 2a6f0a3e..32f1bb59 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -13,6 +12,7 @@ import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.IHolding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import cpw.mods.fml.relauncher.Side; 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 17cefb5e..85ac31b2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBucket; @@ -16,6 +15,7 @@ import net.minecraftforge.fluids.IFluidHandler; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; 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 eb58db47..4e658b91 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java @@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +21,7 @@ import net.minecraftforge.fluids.IFluidHandler; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.tileEntity.TESocket; 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 3fbc35d6..9ee54c71 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 @@ -2,8 +2,6 @@ package WayofTime.alchemicalWizardry.common.items.sigil.holding; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -16,6 +14,8 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java index 8ebc532c..8cfa2994 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java @@ -2,13 +2,13 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import java.util.Random; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.entity.projectile.MudProjectile; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java index 2f473ba5..b63acfa3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java @@ -2,11 +2,11 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import java.util.Random; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.entity.projectile.ExplosionProjectile; import WayofTime.alchemicalWizardry.common.items.EnergyItems; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java index 6978c2a0..95aca9a6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java @@ -4,7 +4,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -13,6 +12,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.entity.projectile.FireProjectile; import WayofTime.alchemicalWizardry.common.items.EnergyItems; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java index 3747e4f4..a335eb93 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java @@ -2,13 +2,13 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import java.util.Random; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile; import WayofTime.alchemicalWizardry.common.items.EnergyItems; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java index 10efcfb6..9257c1a0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java @@ -4,7 +4,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,6 +11,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java index 02470321..6163c6c3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java @@ -2,12 +2,12 @@ package WayofTime.alchemicalWizardry.common.spell.simple; import java.util.Random; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.entity.projectile.LightningBoltProjectile; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java index cedd34ee..ae8dbd62 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java @@ -4,7 +4,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -16,6 +15,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.entity.projectile.TeleportProjectile; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java index 10b98d53..09304e62 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java @@ -4,7 +4,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -15,6 +14,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.entity.projectile.WaterProjectile; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java index c9cb3f7b..e44904b9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java @@ -4,7 +4,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -12,6 +11,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.entity.projectile.WindGustProjectile; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; From 1ea6d9c700f2b1bbaa079861fa9e6080e535179a Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 16:37:23 -0400 Subject: [PATCH 09/15] Replace hardcoded values --- .../WayofTime/alchemicalWizardry/common/items/BoundAxe.java | 2 +- .../WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java | 2 +- .../WayofTime/alchemicalWizardry/common/items/BoundShovel.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index 144a2a7a..036984a9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -145,7 +145,7 @@ public class BoundAxe extends ItemAxe implements IBindable { if (par1ItemStack.getTagCompound() == null) { par1ItemStack.setTagCompound(new NBTTagCompound()); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 200, 20); + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, 20); par1ItemStack.setItemDamage(0); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index 910c25a6..d0dfacb5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -162,7 +162,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { par1ItemStack.setTagCompound(new NBTTagCompound()); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 200, 20); + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, 20); par1ItemStack.setItemDamage(0); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index 4baca49b..98788d09 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -147,7 +147,7 @@ public class BoundShovel extends ItemSpade implements IBindable { par1ItemStack.setTagCompound(new NBTTagCompound()); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 200, 20); + IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, 20); par1ItemStack.setItemDamage(0); } From e153c7011636d78341185fd4604b628818007804 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 16:44:54 -0400 Subject: [PATCH 10/15] Simplify this method. --- .../alchemicalWizardry/api/items/interfaces/IBindable.java | 4 +++- .../WayofTime/alchemicalWizardry/common/items/BoundAxe.java | 3 ++- .../alchemicalWizardry/common/items/BoundPickaxe.java | 3 ++- .../alchemicalWizardry/common/items/BoundShovel.java | 3 ++- .../alchemicalWizardry/common/items/EnergyBlast.java | 2 +- 5 files changed, 10 insertions(+), 5 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 74006e15..aa432147 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java @@ -17,12 +17,14 @@ public interface IBindable { // The number of ticks between passive drains int tickDelay = 200; + // Set this to true if the right click function should be disabled with the config disableBoundToolsRightClick + boolean isBoundTool = false; /** * Used by bound tools and the energy blaster/bazooka to check if they should skip their right click function. */ default boolean checkRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, - int rightClickCost, boolean isBoundTool) { + int rightClickCost) { if (toggle(par1ItemStack, par2World, par3EntityPlayer)) { return true; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index 036984a9..028b1d97 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -33,6 +33,7 @@ public class BoundAxe extends ItemAxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; public int rightClickCost = 10000; + public boolean isBoundTool = true; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -85,7 +86,7 @@ public class BoundAxe extends ItemAxe implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost, true)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost)) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index d0dfacb5..386addf4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -34,6 +34,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; public int rightClickCost = 10000; + public boolean isBoundTool = true; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -87,7 +88,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost, true)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost)) { return par1ItemStack; } Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index 98788d09..3c317a6a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -35,6 +35,7 @@ public class BoundShovel extends ItemSpade implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; public int rightClickCost = 10000; + public boolean isBoundTool = true; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -87,7 +88,7 @@ public class BoundShovel extends ItemSpade implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost, true)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost)) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index a1eda72f..d0b71ae4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -91,7 +91,7 @@ public class EnergyBlast extends EnergyItems { return par1ItemStack; } - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), false)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed())) { setDelay(par1ItemStack, getMaxDelayAfterActivation()); return par1ItemStack; } From 681fa92af5792059f01c0c4bccaaca9653b21dee Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 16:56:59 -0400 Subject: [PATCH 11/15] Simplify these tooltip methods. --- .../items/DemonicTelepositionFocus.java | 23 ++++++++----------- .../items/EnhancedTelepositionFocus.java | 23 ++++++++----------- .../items/ReinforcedTelepositionFocus.java | 23 ++++++++----------- .../common/items/TelepositionFocus.java | 22 ++++++++---------- 4 files changed, 39 insertions(+), 52 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java index 52a86598..94488d80 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -29,18 +30,14 @@ public class DemonicTelepositionFocus extends TelepositionFocus { par3List.add(StatCollector.translateToLocal("tooltip.demonictelepfocus.desc2")); addBindingInformation(par1ItemStack, par3List); - if (!(par1ItemStack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.coords") + " " - + itemTag.getInteger("xCoord") - + ", " - + itemTag.getInteger("yCoord") - + ", " - + itemTag.getInteger("zCoord")); - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); - } + NBTTagCompound itemTag = IBindable.getTag(par1ItemStack); + par3List.add( + StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + + itemTag.getInteger("xCoord") + + ", " + + itemTag.getInteger("yCoord") + + ", " + + itemTag.getInteger("zCoord")); + par3List.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java index 427d11e3..c84b371e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -28,18 +29,14 @@ public class EnhancedTelepositionFocus extends TelepositionFocus { par3List.add(StatCollector.translateToLocal("tooltip.enhancedtelepfocus.desc")); addBindingInformation(par1ItemStack, par3List); - if (!(par1ItemStack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.coords") + " " - + itemTag.getInteger("xCoord") - + ", " - + itemTag.getInteger("yCoord") - + ", " - + itemTag.getInteger("zCoord")); - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); - } + NBTTagCompound itemTag = IBindable.getTag(par1ItemStack); + par3List.add( + StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + + itemTag.getInteger("xCoord") + + ", " + + itemTag.getInteger("yCoord") + + ", " + + itemTag.getInteger("zCoord")); + par3List.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java index cd6b6e5d..15f7716e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java @@ -2,6 +2,7 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -29,18 +30,14 @@ public class ReinforcedTelepositionFocus extends TelepositionFocus { par3List.add(StatCollector.translateToLocal("tooltip.reinforcedtelepfocus.desc2")); addBindingInformation(par1ItemStack, par3List); - if (!(par1ItemStack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.coords") + " " - + itemTag.getInteger("xCoord") - + ", " - + itemTag.getInteger("yCoord") - + ", " - + itemTag.getInteger("zCoord")); - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); - } + NBTTagCompound itemTag = IBindable.getTag(par1ItemStack); + par3List.add( + StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + + itemTag.getInteger("xCoord") + + ", " + + itemTag.getInteger("yCoord") + + ", " + + itemTag.getInteger("zCoord")); + par3List.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java index 5d861f11..c77fe4ba 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java @@ -37,19 +37,15 @@ public class TelepositionFocus extends EnergyItems { par3List.add(StatCollector.translateToLocal("tooltip.telepositionfocus.desc")); addBindingInformation(par1ItemStack, par3List); - if (!(par1ItemStack.getTagCompound() == null)) { - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.coords") + " " - + itemTag.getInteger("xCoord") - + ", " - + itemTag.getInteger("yCoord") - + ", " - + itemTag.getInteger("zCoord")); - par3List.add( - StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); - } + NBTTagCompound itemTag = IBindable.getTag(par1ItemStack); + par3List.add( + StatCollector.translateToLocal("tooltip.alchemy.coords") + " " + + itemTag.getInteger("xCoord") + + ", " + + itemTag.getInteger("yCoord") + + ", " + + itemTag.getInteger("zCoord")); + par3List.add(StatCollector.translateToLocal("tooltip.alchemy.dimension") + " " + getDimensionID(par1ItemStack)); } @Override From b0096a3279d2087b2bbab22d65c42e0711e498dd Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 18:19:01 -0400 Subject: [PATCH 12/15] Spotless --- .../common/items/EnhancedTelepositionFocus.java | 2 +- .../common/items/ReinforcedTelepositionFocus.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java index c84b371e..2a9bbd4a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java @@ -2,13 +2,13 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java index 15f7716e..35509114 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java @@ -2,13 +2,13 @@ package WayofTime.alchemicalWizardry.common.items; import java.util.List; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; From 3e40aa9708f570f2dc93980b30d8b1dfd35de5ad Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Sun, 20 Apr 2025 03:23:14 -0400 Subject: [PATCH 13/15] Revert change to settings.gradle --- settings.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index 7ea8beeb..ff436f2c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,8 +3,8 @@ pluginManagement { repositories { maven { // RetroFuturaGradle - name = "GTNH Maven" - url = "https://nexus.gtnewhorizons.com/repository/public/" + name "GTNH Maven" + url "https://nexus.gtnewhorizons.com/repository/public/" mavenContent { includeGroup("com.gtnewhorizons") includeGroupByRegex("com\\.gtnewhorizons\\..+") From fc589690d0ca816c2c55a151e9094ce241df4c46 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Sun, 20 Apr 2025 06:58:06 -0400 Subject: [PATCH 14/15] Replace fields for tickDelay and isBoundTool as well as the drain cost and bound tool right click cost with overridable methods. Removed parameters from various methods and made some static methods instance methods as a consequence. Improved the check for valid sigils to put in the Sigil of Holding by using an overridable method instead of checking if it's a SigilOfHolding. --- .../api/items/interfaces/IBindable.java | 77 ++++++++++++++----- .../api/items/interfaces/ISigil.java | 17 ++-- .../common/items/ArmourInhibitor.java | 6 +- .../common/items/BoundAxe.java | 20 ++++- .../common/items/BoundPickaxe.java | 22 +++++- .../common/items/BoundShovel.java | 20 ++++- .../common/items/EnergyBazooka.java | 6 +- .../common/items/EnergyBlast.java | 32 +++++--- .../common/items/EnergyItems.java | 19 +++-- .../common/items/EnergySword.java | 13 ++-- .../common/items/sigil/SigilDivination.java | 8 +- .../common/items/sigil/SigilHarvest.java | 4 +- .../items/sigil/SigilOfElementalAffinity.java | 4 +- .../items/sigil/SigilOfEnderSeverance.java | 4 +- .../common/items/sigil/SigilOfGrowth.java | 11 ++- .../common/items/sigil/SigilOfHaste.java | 4 +- .../common/items/sigil/SigilOfMagnetism.java | 11 ++- .../common/items/sigil/SigilOfSupression.java | 4 +- .../common/items/sigil/SigilOfTheBridge.java | 4 +- .../items/sigil/SigilOfTheFastMiner.java | 4 +- .../common/items/sigil/SigilOfWind.java | 4 +- .../common/items/sigil/SigilPackRat.java | 4 +- .../items/sigil/holding/InventoryHolding.java | 2 +- .../items/sigil/holding/SigilOfHolding.java | 5 ++ 24 files changed, 204 insertions(+), 101 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 aa432147..799096b1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java @@ -15,16 +15,11 @@ import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; public interface IBindable { - // The number of ticks between passive drains - int tickDelay = 200; - // Set this to true if the right click function should be disabled with the config disableBoundToolsRightClick - boolean isBoundTool = false; - /** * Used by bound tools and the energy blaster/bazooka to check if they should skip their right click function. + * Drains the soul network by the amount returned by rightClickCost. */ - default boolean checkRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, - int rightClickCost) { + default boolean checkRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { if (toggle(par1ItemStack, par2World, par3EntityPlayer)) { return true; } @@ -37,7 +32,7 @@ public interface IBindable { return true; } - if (isBoundTool && AlchemicalWizardry.disableBoundToolsRightClick) { + if (isBoundTool() && AlchemicalWizardry.disableBoundToolsRightClick) { return true; } @@ -46,7 +41,7 @@ public interface IBindable { } if (!(par3EntityPlayer.capabilities.isCreativeMode - || EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, rightClickCost))) { + || EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, rightClickCost()))) { return true; } @@ -91,33 +86,45 @@ public interface IBindable { return itemTag; } - static boolean toggle(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + default boolean toggle(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { if (!checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { setActive(par1ItemStack, !isActive(par1ItemStack)); - setDrainTick(par1ItemStack, par2World, tickDelay); + setDrainTick(par1ItemStack, par2World); return true; } return false; } - static void passiveDrain(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int delay, - int cost) { + /** + * Checks if the current tick is the proper tick to do a passive drain based on getDrainTicks. If it is, it runs doPassiveDrain and returns true. Otherwise, returns false. + */ + default boolean checkPassiveDrain(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { NBTTagCompound itemTag = getTag(par1ItemStack); - if (par2World.getTotalWorldTime() % delay == itemTag.getInteger("worldTimeDelay") + if (par2World.getTotalWorldTime() % this.drainTicks() == itemTag.getInteger("worldTimeDelay") && itemTag.getBoolean("isActive")) { - if (!par3EntityPlayer.capabilities.isCreativeMode) { - if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, cost)) { - setActive(par1ItemStack, false); - } + this.doPassiveDrain(par1ItemStack, par3EntityPlayer); + return true; + } + return false; + } + + /** + * The action to take when checkPassiveDrain is run on the proper tick based on getDrainTicks. + */ + default void doPassiveDrain(ItemStack par1ItemStack, EntityPlayer par3EntityPlayer) { + if (!par3EntityPlayer.capabilities.isCreativeMode) { + if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, drainCost())) { + setActive(par1ItemStack, false); } } } /** - * Sets the drain tick delay based on the current world age and the given modulus + * Sets the drain tick delay based on the current world age and getDrainTicks(). */ - static void setDrainTick(ItemStack par1ItemStack, World par2World, int modulus) { - getTag(par1ItemStack).setInteger("worldTimeDelay", (int) (par2World.getTotalWorldTime() - 1) % modulus); + default void setDrainTick(ItemStack par1ItemStack, World par2World) { + getTag(par1ItemStack) + .setInteger("worldTimeDelay", (int) (par2World.getTotalWorldTime() - 1) % this.drainTicks()); } static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) { @@ -146,4 +153,32 @@ public interface IBindable { NBTTagCompound tag = IBindable.getTag(item); return tag.getString("ownerName"); } + + /** + * The number of ticks between passive drains from the soul network while the item is active. + */ + default int drainTicks() { + return 200; + } + + /** + * Return true if the right click function should be disabled with the config disableBoundToolsRightClick. + */ + default boolean isBoundTool() { + return false; + } + + /** + * The cost to use the right click function of this item. Used by bound tools and the Energy Blaster/Bazooka. + */ + default int rightClickCost() { + return 0; + } + + /** + * The amount of LP drained from the soul network for each passive drain while the item is active. + */ + default int drainCost() { + return 0; + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java index 84f7dde2..7b0aa972 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/ISigil.java @@ -12,23 +12,28 @@ public interface ISigil extends IBindable { * Toggles the state of the sigil. Returns true if the sigil is active after the toggle or false if it is inactive * after the toggle. */ - static boolean toggleSigil(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int energyUsed, - int tickDelay) { + default boolean toggleSigil(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { IBindable.setActive(par1ItemStack, !IBindable.isActive(par1ItemStack)); if (!par3EntityPlayer.capabilities.isCreativeMode - && !EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, energyUsed)) { + && !EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, this.drainCost())) { IBindable.setActive(par1ItemStack, false); } - if (IBindable.isActive(par1ItemStack) - && EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, energyUsed)) { + if (IBindable.isActive(par1ItemStack)) { par1ItemStack.setItemDamage(1); - IBindable.setDrainTick(par1ItemStack, par2World, tickDelay); + this.setDrainTick(par1ItemStack, par2World); return true; } else { par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); return false; } } + + /** + * Return false if this sigil should not be able to be put in the Sigil of Holding. + */ + default boolean canBeStored() { + return true; + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java index 997d2d47..e0016787 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java @@ -75,7 +75,7 @@ public class ArmourInhibitor extends EnergyItems { if (IBindable.isActive(par1ItemStack)) { par1ItemStack.setItemDamage(1); - IBindable.setDrainTick(par1ItemStack, par2World, tickDelay); + this.setDrainTick(par1ItemStack, par2World); } else { par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } @@ -92,10 +92,6 @@ public class ArmourInhibitor extends EnergyItems { EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; if (IBindable.isActive(par1ItemStack)) { - if (par2World.getTotalWorldTime() % tickDelay - == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) {} - - // TODO Do stuff par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 2, 0)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index 028b1d97..0083942e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -33,7 +33,6 @@ public class BoundAxe extends ItemAxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; public int rightClickCost = 10000; - public boolean isBoundTool = true; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -61,6 +60,11 @@ public class BoundAxe extends ItemAxe implements IBindable { return this.energyUsed; } + @Override + public int drainCost() { + return this.energyUsed; + } + @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.boundaxe.desc")); @@ -86,7 +90,7 @@ public class BoundAxe extends ItemAxe implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer)) { return par1ItemStack; } @@ -146,7 +150,7 @@ public class BoundAxe extends ItemAxe implements IBindable { if (par1ItemStack.getTagCompound() == null) { par1ItemStack.setTagCompound(new NBTTagCompound()); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, 20); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); par1ItemStack.setItemDamage(0); } @@ -220,4 +224,14 @@ public class BoundAxe extends ItemAxe implements IBindable { public int getHarvestLevel(ItemStack stack, String toolClass) { return IBindable.isActive(stack) ? super.getHarvestLevel(stack, toolClass) : -1; } + + @Override + public boolean isBoundTool() { + return true; + } + + @Override + public int rightClickCost() { + return rightClickCost; + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index 386addf4..a9a2c7c9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -34,7 +34,6 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; public int rightClickCost = 10000; - public boolean isBoundTool = true; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -62,6 +61,11 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { return this.energyUsed; } + @Override + public int drainCost() { + return this.energyUsed; + } + @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.boundpickaxe.desc1")); @@ -88,7 +92,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer)) { return par1ItemStack; } Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer); @@ -163,7 +167,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { par1ItemStack.setTagCompound(new NBTTagCompound()); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, 20); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); par1ItemStack.setItemDamage(0); } @@ -197,7 +201,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { EntityLivingBase par7EntityLivingBase) { if (par7EntityLivingBase instanceof EntityPlayer) { - EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, getEnergyUsed()); + EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par7EntityLivingBase, drainCost()); } return true; } @@ -244,4 +248,14 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { public int getHarvestLevel(ItemStack stack, String toolClass) { return IBindable.isActive(stack) ? super.getHarvestLevel(stack, toolClass) : -1; } + + @Override + public boolean isBoundTool() { + return true; + } + + @Override + public int rightClickCost() { + return rightClickCost; + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index 3c317a6a..0668de88 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -35,7 +35,6 @@ public class BoundShovel extends ItemSpade implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; public int rightClickCost = 10000; - public boolean isBoundTool = true; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -63,6 +62,11 @@ public class BoundShovel extends ItemSpade implements IBindable { return this.energyUsed; } + @Override + public int drainCost() { + return this.energyUsed; + } + @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("tooltip.boundshovel.desc")); @@ -88,7 +92,7 @@ public class BoundShovel extends ItemSpade implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer)) { return par1ItemStack; } @@ -148,7 +152,7 @@ public class BoundShovel extends ItemSpade implements IBindable { par1ItemStack.setTagCompound(new NBTTagCompound()); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, 20); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); par1ItemStack.setItemDamage(0); } @@ -230,4 +234,14 @@ public class BoundShovel extends ItemSpade implements IBindable { public int getHarvestLevel(ItemStack stack, String toolClass) { return IBindable.isActive(stack) ? super.getHarvestLevel(stack, toolClass) : -1; } + + @Override + public boolean isBoundTool() { + return true; + } + + @Override + public int rightClickCost() { + return rightClickCost; + } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java index 4172a449..c1e70d4b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java @@ -64,7 +64,7 @@ public class EnergyBazooka extends EnergyBlast { } @Override - public int getMaxDelay() { + public int getShotDelay() { switch (this.tier) { case 1: return AlchemicalWizardry.energyBazookaMaxDelay; @@ -77,7 +77,7 @@ public class EnergyBazooka extends EnergyBlast { } @Override - public int getMaxDelayAfterActivation() { + public int drainTicks() { switch (this.tier) { case 1: return AlchemicalWizardry.energyBazookaMaxDelayAfterActivation; @@ -90,7 +90,7 @@ public class EnergyBazooka extends EnergyBlast { } @Override - public int getActivationCost() { + public int drainCost() { switch (this.tier) { case 1: return AlchemicalWizardry.energyBazookaLPPerActivation; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index d0b71ae4..6af1c15f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -91,8 +91,8 @@ public class EnergyBlast extends EnergyItems { return par1ItemStack; } - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed())) { - setDelay(par1ItemStack, getMaxDelayAfterActivation()); + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer)) { + setDelay(par1ItemStack, drainTicks()); return par1ItemStack; } @@ -100,7 +100,7 @@ public class EnergyBlast extends EnergyItems { if (!par2World.isRemote) { shoot(par2World, par3EntityPlayer); - this.setDelay(par1ItemStack, getMaxDelay()); + this.setDelay(par1ItemStack, getShotDelay()); } return par1ItemStack; @@ -123,17 +123,15 @@ public class EnergyBlast extends EnergyItems { this.setDelay(par1ItemStack, delay - 1); } - IBindable.passiveDrain( - par1ItemStack, - par2World, - par3EntityPlayer, - getMaxDelayAfterActivation(), - getActivationCost()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); par1ItemStack.setItemDamage(0); } - public int getMaxDelay() { + /** + * The delay between firing multiple shots. + */ + public int getShotDelay() { switch (this.tier) { case 1: return AlchemicalWizardry.energyBlastMaxDelay; @@ -145,7 +143,11 @@ public class EnergyBlast extends EnergyItems { return 1; } - public int getMaxDelayAfterActivation() { + /** + * Used for the warmup delay as well as for passive draining. + */ + @Override + public int drainTicks() { switch (this.tier) { case 1: return AlchemicalWizardry.energyBlastMaxDelayAfterActivation; @@ -157,7 +159,8 @@ public class EnergyBlast extends EnergyItems { return 1; } - public int getActivationCost() { + @Override + public int drainCost() { switch (this.tier) { case 1: return AlchemicalWizardry.energyBlastLPPerActivation; @@ -169,6 +172,11 @@ public class EnergyBlast extends EnergyItems { return 0; } + @Override + public int rightClickCost() { + return getEnergyUsed(); + } + @Override @SideOnly(Side.CLIENT) @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java index 6887731e..727f3f81 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java @@ -22,11 +22,16 @@ public class EnergyItems extends Item implements IBindable { setCreativeTab(AlchemicalWizardry.tabBloodMagic); } - protected void setEnergyUsed(int par1int) { + public void setEnergyUsed(int par1int) { this.energyUsed = par1int; } - protected int getEnergyUsed() { + public int getEnergyUsed() { + return this.energyUsed; + } + + @Override + public int drainCost() { return this.energyUsed; } @@ -89,9 +94,9 @@ public class EnergyItems extends Item implements IBindable { posY, posZ); world.playSoundEffect( - (double) ((float) player.posX + 0.5F), - (double) ((float) player.posY + 0.5F), - (double) ((float) player.posZ + 0.5F), + ((float) player.posX + 0.5F), + ((float) player.posY + 0.5F), + ((float) player.posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); @@ -180,21 +185,25 @@ public class EnergyItems extends Item implements IBindable { return true; } + // Used by some addon mods like Blood Arsenal @Deprecated public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) { return IBindable.checkAndSetItemOwner(item, player); } + // Used by some addon mods like Blood Arsenal @Deprecated public static void setItemOwner(ItemStack item, String ownerName) { IBindable.setItemOwner(item, ownerName); } + // Used by some addon mods like Blood Arsenal @Deprecated public static void checkAndSetItemOwner(ItemStack item, String ownerName) { IBindable.checkAndSetItemOwner(item, ownerName); } + // Used by some addon mods like Blood Arsenal @Deprecated public static String getOwnerName(ItemStack item) { return IBindable.getOwnerName(item); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java index 713cd103..33370f7f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java @@ -34,8 +34,6 @@ public class EnergySword extends ItemSword implements IBindable { private IIcon passiveIcon; private int energyUsed; - // The number of ticks between passive drains - protected int tickDelay = 100; public EnergySword() { super(AlchemicalWizardry.bloodBoundToolMaterial); @@ -54,6 +52,11 @@ public class EnergySword extends ItemSword implements IBindable { return this.energyUsed; } + @Override + public int drainCost() { + return this.energyUsed; + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { @@ -95,7 +98,7 @@ public class EnergySword extends ItemSword implements IBindable { EntityLivingBase par3EntityLivingBase) { if (par3EntityLivingBase instanceof EntityPlayer) { if (!IBindable.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase) || !EnergyItems - .syphonBatteries(par1ItemStack, (EntityPlayer) par3EntityLivingBase, this.getEnergyUsed())) { + .syphonBatteries(par1ItemStack, (EntityPlayer) par3EntityLivingBase, this.drainCost())) { return false; } } @@ -108,7 +111,7 @@ public class EnergySword extends ItemSword implements IBindable { public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer); - IBindable.toggle(par1ItemStack, par2World, par3EntityPlayer); + this.toggle(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -130,7 +133,7 @@ public class EnergySword extends ItemSword implements IBindable { par1ItemStack.setTagCompound(new NBTTagCompound()); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 100, 50); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); par1ItemStack.setItemDamage(0); } 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 13e1c3ff..5b0eb87c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java @@ -60,13 +60,7 @@ public class SigilDivination extends Item implements ArmourUpgrade, IReagentMani return par1ItemStack; } - NBTTagCompound itemTag = par1ItemStack.getTagCompound(); - - if (itemTag == null || itemTag.getString("ownerName").equals("")) { - return par1ItemStack; - } - - String ownerName = itemTag.getString("ownerName"); + String ownerName = IBindable.getOwnerName(par1ItemStack); MovingObjectPosition movingobjectposition = this .getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, false); 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 337ecee8..375479ce 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java @@ -75,7 +75,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade return par1ItemStack; } - ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -108,7 +108,7 @@ public class SigilHarvest extends EnergyItems implements IHolding, ArmourUpgrade } } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } @Override 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 11f991b1..9ac6ab04 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java @@ -75,7 +75,7 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil { return par1ItemStack; } - if (ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay)) { + if (toggleSigil(par1ItemStack, par2World, par3EntityPlayer)) { par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.waterBreathing.id, 2, 0, true)); par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 2, 0, true)); } @@ -101,6 +101,6 @@ public class SigilOfElementalAffinity extends EnergyItems implements ISigil { par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 2, 0, true)); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } } 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 a6c73d3d..645289ac 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java @@ -76,7 +76,7 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig return par1ItemStack; } - ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -104,6 +104,6 @@ public class SigilOfEnderSeverance extends EnergyItems implements IHolding, ISig } } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } } 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 1ce12679..b85bcf98 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java @@ -33,8 +33,6 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil @SideOnly(Side.CLIENT) private IIcon passiveIcon; - private int tickDelay = 100; - public SigilOfGrowth() { super(); this.maxStackSize = 1; @@ -104,7 +102,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil return par1ItemStack; } - ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -121,7 +119,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil if (IBindable.isActive(par1ItemStack)) { - IBindable.passiveDrain(par1ItemStack, par2World, (EntityPlayer) par3Entity, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, (EntityPlayer) par3Entity); int range = 3; int verticalRange = 2; int posX = (int) Math.round(par3Entity.posX - 0.5f); @@ -174,6 +172,11 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade, ISigil return false; } + @Override + public int drainTicks() { + return 100; + } + @Override public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) { if (world.isRemote) { 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 16dd4677..62ecd01c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java @@ -74,7 +74,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil { return par1ItemStack; } - if (ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay)) { + if (toggleSigil(par1ItemStack, par2World, par3EntityPlayer)) { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionBoost.id, 3, 1)); } @@ -97,7 +97,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade, ISigil { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionBoost.id, 3, 1)); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } @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 3babd5cb..ad2d2388 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java @@ -31,8 +31,6 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol @SideOnly(Side.CLIENT) private IIcon passiveIcon; - private int tickDelay = 300; - public SigilOfMagnetism() { super(); this.maxStackSize = 1; @@ -79,7 +77,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol return par1ItemStack; } - ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -98,7 +96,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol if (IBindable.isActive(par1ItemStack)) { - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); int range = 5; int verticalRange = 5; @@ -138,6 +136,11 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol } } + @Override + public int drainTicks() { + return 300; + } + @Override public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack) { int range = 5; 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 88407256..9e27dd89 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java @@ -86,7 +86,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi return par1ItemStack; } - ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -137,7 +137,7 @@ public class SigilOfSupression extends EnergyItems implements ArmourUpgrade, ISi } } } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } @Override 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 004782c3..23f6457b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java @@ -78,7 +78,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig return par1ItemStack; } - ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -96,7 +96,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade, ISig } if (IBindable.isActive(par1ItemStack)) { - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); if (!par3EntityPlayer.onGround && !par3EntityPlayer.isSneaking()) { return; } 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 1f51636b..46acaee9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java @@ -75,7 +75,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I return par1ItemStack; } - if (ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay)) { + if (toggleSigil(par1ItemStack, par2World, par3EntityPlayer)) { par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 2, 1, true)); } @@ -98,7 +98,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade, I par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 2, 1, true)); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } @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 6d9bdc56..8ed414e5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java @@ -74,7 +74,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade, ISigil { return par1ItemStack; } - if (ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay)) { + if (toggleSigil(par1ItemStack, par2World, par3EntityPlayer)) { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionProjProt.id, 2, 1)); } @@ -97,7 +97,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade, ISigil { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionProjProt.id, 2, 1)); } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, 200, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } @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 acf78937..b4017a6f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java @@ -76,7 +76,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade return par1ItemStack; } - ISigil.toggleSigil(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), tickDelay); + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -107,7 +107,7 @@ public class SigilPackRat extends EnergyItems implements IHolding, ArmourUpgrade } } - IBindable.passiveDrain(par1ItemStack, par2World, par3EntityPlayer, tickDelay, getEnergyUsed()); + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } @Override diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/InventoryHolding.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/InventoryHolding.java index 80a23934..390f0cc6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/InventoryHolding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/InventoryHolding.java @@ -153,7 +153,7 @@ public class InventoryHolding implements IInventory { @Override public boolean isItemValidForSlot(int slotIndex, ItemStack itemStack) { - return itemStack.getItem() instanceof ISigil && !(itemStack.getItem() instanceof SigilOfHolding); + return itemStack.getItem() instanceof ISigil && ((ISigil) itemStack.getItem()).canBeStored(); } public void readFromNBT(NBTTagCompound nbtTagCompound) { 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 9ee54c71..387432a5 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 @@ -306,4 +306,9 @@ public class SigilOfHolding extends EnergyItems implements ISigil { inv[i].getItem().onUpdate(inv[i], par2World, par3Entity, par4, par5); } } + + @Override + public boolean canBeStored() { + return false; + } } From efc0c52bc857ec698e659aaef573a17f145c42db Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Sun, 20 Apr 2025 06:58:40 -0400 Subject: [PATCH 15/15] Spotless --- .../alchemicalWizardry/api/items/interfaces/IBindable.java | 3 ++- .../alchemicalWizardry/common/items/sigil/SigilDivination.java | 1 - 2 files changed, 2 insertions(+), 2 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 799096b1..99d1fc01 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java @@ -96,7 +96,8 @@ public interface IBindable { } /** - * Checks if the current tick is the proper tick to do a passive drain based on getDrainTicks. If it is, it runs doPassiveDrain and returns true. Otherwise, returns false. + * Checks if the current tick is the proper tick to do a passive drain based on getDrainTicks. If it is, it runs + * doPassiveDrain and returns true. Otherwise, returns false. */ default boolean checkPassiveDrain(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { NBTTagCompound itemTag = getTag(par1ItemStack); 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 5b0eb87c..66fe55e7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilDivination.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.MovingObjectPosition;