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. 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..99d1fc01 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,185 @@ 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.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; + public interface IBindable { + + /** + * 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) { + 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; + } + + /** + * 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")) { + 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; + } + + default boolean toggle(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + if (!checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking()) { + setActive(par1ItemStack, !isActive(par1ItemStack)); + setDrainTick(par1ItemStack, par2World); + return true; + } + return 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); + if (par2World.getTotalWorldTime() % this.drainTicks() == itemTag.getInteger("worldTimeDelay") + && itemTag.getBoolean("isActive")) { + 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 getDrainTicks(). + */ + default void setDrainTick(ItemStack par1ItemStack, World par2World) { + getTag(par1ItemStack) + .setInteger("worldTimeDelay", (int) (par2World.getTotalWorldTime() - 1) % this.drainTicks()); + } + + 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) { + 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) { + NBTTagCompound tag = IBindable.getTag(item); + if (tag.getString("ownerName").isEmpty()) { + tag.setString("ownerName", ownerName); + } + } + + static String getOwnerName(ItemStack item) { + 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 d610c211..7b0aa972 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,39 @@ 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. + */ + default boolean toggleSigil(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + IBindable.setActive(par1ItemStack, !IBindable.isActive(par1ItemStack)); + + if (!par3EntityPlayer.capabilities.isCreativeMode + && !EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, this.drainCost())) { + IBindable.setActive(par1ItemStack, false); + } + + if (IBindable.isActive(par1ItemStack)) { + par1ItemStack.setItemDamage(1); + 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/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 62303eac..f6476abd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java @@ -11,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; @@ -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 e72706c0..f136d426 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java @@ -17,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; @@ -92,16 +93,12 @@ public class ActivationCrystal extends EnergyItems { } } - 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) { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); return par1ItemStack; } @@ -113,7 +110,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..e0016787 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java @@ -6,13 +6,13 @@ 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; 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; @@ -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; @@ -37,18 +35,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 @@ -61,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; @@ -86,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); + this.setDrainTick(par1ItemStack, par2World); } else { par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } @@ -115,14 +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 (par2World.getWorldTime() % tickDelay == par1ItemStack.getTagCompound().getInteger("worldTimeDelay")) {} - - // TODO Do stuff + if (IBindable.isActive(par1ItemStack)) { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 2, 0)); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java index fc98b07f..58e25786 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BlankSpell.java @@ -12,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; @@ -33,16 +34,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") @@ -57,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 8c18fd3f..0083942e 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; @@ -59,23 +60,15 @@ 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")); - - 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 @@ -88,13 +81,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; @@ -103,29 +90,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)) { return par1ItemStack; } @@ -185,45 +150,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); - } - } - } + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); 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; } @@ -236,7 +174,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, @@ -266,7 +204,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; } @@ -279,11 +217,21 @@ 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; + } + + @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 e0ae49de..a9a2c7c9 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; @@ -60,24 +61,16 @@ 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")); 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 @@ -90,13 +83,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; @@ -105,32 +92,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)) { 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); @@ -203,38 +167,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); - } - } - } + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); 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 @@ -242,7 +179,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; } @@ -253,9 +190,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 @@ -263,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; } @@ -290,7 +228,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; } @@ -303,11 +241,21 @@ 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; + } + + @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 e05b3ebe..0668de88 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; @@ -61,23 +62,15 @@ 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")); - - 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 @@ -90,13 +83,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; @@ -105,29 +92,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)) { return par1ItemStack; } @@ -186,45 +151,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); - } - } - } + + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); 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; } @@ -237,7 +176,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, @@ -275,7 +214,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; } @@ -288,11 +227,21 @@ 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; + } + + @Override + public boolean isBoundTool() { + return true; + } + + @Override + public int rightClickCost() { + return rightClickCost; } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java index f3d6e069..aa4be358 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/CheatyItem.java @@ -39,18 +39,13 @@ 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) { 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/DemonicTelepositionFocus.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java index 99ee30ef..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; @@ -27,25 +28,16 @@ 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") - + ", " - + 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/EnergyBattery.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java index c9bbd245..efb904e5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java @@ -43,15 +43,11 @@ 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) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer)) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java index 21ca452f..c1e70d4b 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; @@ -17,30 +14,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); @@ -68,134 +45,61 @@ public class EnergyBazooka 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")) { - 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 getShotDelay() { 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 drainTicks() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBazookaMaxDelayAfterActivation; + case 2: + return AlchemicalWizardry.energyBazookaSecondTierMaxDelayAfterActivation; + case 3: + return AlchemicalWizardry.energyBazookaThirdTierMaxDelayAfterActivation; + } + return 1; + } + + @Override + public int drainCost() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBazookaLPPerActivation; + case 2: + return AlchemicalWizardry.energyBazookaSecondTierLPPerActivation; + case 3: + return AlchemicalWizardry.energyBazookaThirdTierLPPerActivation; + } + return 0; } @Override @@ -204,45 +108,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..6af1c15f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -6,12 +6,12 @@ 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; 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; @@ -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 (IBindable.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 && IBindable.isActive(par1ItemStack) && !par3EntityPlayer.isSneaking()) { return par1ItemStack; } - if (!getActivated(par1ItemStack)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer)) { + setDelay(par1ItemStack, drainTicks()); 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, getShotDelay()); } 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,66 @@ 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); - } - } - } + + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); par1ItemStack.setItemDamage(0); } + /** + * The delay between firing multiple shots. + */ + public int getShotDelay() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBlastMaxDelay; + case 2: + return AlchemicalWizardry.energyBlastSecondTierMaxDelay; + case 3: + return AlchemicalWizardry.energyBlastThirdTierMaxDelay; + } + return 1; + } + + /** + * Used for the warmup delay as well as for passive draining. + */ + @Override + public int drainTicks() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBlastMaxDelayAfterActivation; + case 2: + return AlchemicalWizardry.energyBlastSecondTierMaxDelayAfterActivation; + case 3: + return AlchemicalWizardry.energyBlastThirdTierMaxDelayAfterActivation; + } + return 1; + } + + @Override + public int drainCost() { + switch (this.tier) { + case 1: + return AlchemicalWizardry.energyBlastLPPerActivation; + case 2: + return AlchemicalWizardry.energyBlastSecondTierLPPerActivation; + case 3: + return AlchemicalWizardry.energyBlastThirdTierLPPerActivation; + } + return 0; + } + + @Override + public int rightClickCost() { + return getEnergyUsed(); + } + @Override @SideOnly(Side.CLIENT) @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -191,45 +184,14 @@ 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")); - } - } + addBindingInformation(par1ItemStack, par3List); } - 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 void setDelay(ItemStack par1ItemStack, int delay) { + IBindable.getTag(par1ItemStack).setInteger("delay", delay); } public int getDelay(ItemStack par1ItemStack) { - if (par1ItemStack.getTagCompound() == null) { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - return par1ItemStack.getTagCompound().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..727f3f81 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; @@ -23,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; } @@ -90,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); @@ -181,35 +185,28 @@ public class EnergyItems extends Item implements IBindable { return true; } - // Global static methods + // Used by some addon mods like Blood Arsenal + @Deprecated public static boolean checkAndSetItemOwner(ItemStack item, EntityPlayer player) { - return !SpellHelper.isFakePlayer(player) && SoulNetworkHandler.checkAndSetItemPlayer(item, player); + return IBindable.checkAndSetItemOwner(item, player); } + // Used by some addon mods like Blood Arsenal + @Deprecated public static void setItemOwner(ItemStack item, String ownerName) { - if (item.getTagCompound() == null) { - item.setTagCompound(new NBTTagCompound()); - } - - item.getTagCompound().setString("ownerName", ownerName); + IBindable.setItemOwner(item, ownerName); } + // Used by some addon mods like Blood Arsenal + @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); } + // Used by some addon mods like Blood Arsenal + @Deprecated public static String getOwnerName(ItemStack item) { - if (item.getTagCompound() == null) { - item.setTagCompound(new NBTTagCompound()); - } - - return item.getTagCompound().getString("ownerName"); + return IBindable.getOwnerName(item); } @Deprecated diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java index 92207166..33370f7f 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; @@ -51,6 +52,11 @@ public class EnergySword extends ItemSword { return this.energyUsed; } + @Override + public int drainCost() { + return this.energyUsed; + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconRegister) { @@ -61,13 +67,7 @@ public class EnergySword extends ItemSword { @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,7 +80,7 @@ public class EnergySword extends ItemSword { @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); @@ -97,8 +97,8 @@ public class EnergySword extends ItemSword { public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) { if (par3EntityLivingBase instanceof EntityPlayer) { - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase) || !EnergyItems - .syphonBatteries(par1ItemStack, (EntityPlayer) par3EntityLivingBase, this.getEnergyUsed())) { + if (!IBindable.checkAndSetItemOwner(par1ItemStack, (EntityPlayer) par3EntityLivingBase) || !EnergyItems + .syphonBatteries(par1ItemStack, (EntityPlayer) par3EntityLivingBase, this.drainCost())) { return false; } } @@ -110,15 +110,8 @@ public class EnergySword extends ItemSword { @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; - } + this.toggle(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -140,38 +133,11 @@ public class EnergySword extends ItemSword { 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); - } - } - } + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); 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; } @@ -180,20 +146,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..2a9bbd4a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnhancedTelepositionFocus.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; @@ -26,25 +27,16 @@ 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") - + ", " - + 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/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/ItemComplexSpellCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java index e9312645..732778f5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemComplexSpellCrystal.java @@ -12,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; @@ -33,16 +34,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") @@ -57,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 4e07e46b..7b8eecbc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java @@ -38,16 +38,12 @@ 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) { World world = par3EntityPlayer.worldObj; - if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) + if (!IBindable.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer instanceof FakePlayer) { return par1ItemStack; } @@ -105,7 +101,7 @@ public class ItemDiabloKey extends EnergyItems { } if (item instanceof IBindable) { - EnergyItems.checkAndSetItemOwner(itemStack, ownerName); + IBindable.checkAndSetItemOwner(itemStack, ownerName); } } par3EntityPlayer.inventoryContainer.detectAndSendChanges(); @@ -118,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 680ab5a0..a1bb5c5c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDismantler.java @@ -12,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; @@ -36,15 +37,13 @@ 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 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 0e4d20b1..9555fdbe 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java @@ -23,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; @@ -74,9 +75,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) { @@ -191,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)); @@ -304,7 +303,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; @@ -369,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); } @@ -381,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 d9c02955..c5dacc04 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -11,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; @@ -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; } @@ -60,12 +61,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..35509114 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ReinforcedTelepositionFocus.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; @@ -27,25 +28,16 @@ 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") - + ", " - + 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/ScribeTool.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java index 5b80d337..8b25136a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/ScribeTool.java @@ -8,6 +8,7 @@ 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 { @@ -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 262b205c..c77fe4ba 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/TelepositionFocus.java @@ -10,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; @@ -34,31 +35,22 @@ 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") - + ", " - + 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 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 1b4a4523..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; @@ -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) { @@ -332,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); } @@ -353,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)) { @@ -383,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..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; @@ -79,7 +80,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); @@ -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 2cd7a19f..103af65a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilAir.java @@ -12,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; @@ -30,12 +31,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 @@ -46,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 d934628c..f314cfdb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilBloodLight.java @@ -14,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; @@ -33,12 +34,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 @@ -50,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; } @@ -88,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 5ac27bca..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; @@ -45,19 +44,14 @@ 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 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; } @@ -65,13 +59,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 eeae08e7..375479ce 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilHarvest.java @@ -14,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; @@ -38,18 +39,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 @@ -62,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; @@ -87,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()); - } + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -126,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); @@ -141,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); - } - } - } + + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } @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..a681a5bb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilLava.java @@ -21,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; @@ -62,12 +63,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); } /** @@ -80,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 86aea99e..9ac6ab04 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java @@ -14,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; @@ -38,18 +39,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 @@ -62,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; @@ -87,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 (toggleSigil(par1ItemStack, par2World, par3EntityPlayer)) { 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; @@ -123,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); - } - } - } + 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 5d446612..645289ac 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfEnderSeverance.java @@ -14,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; @@ -39,18 +40,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 @@ -63,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; @@ -88,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()); - } + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -127,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) { @@ -137,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; + 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 1c6eb834..b85bcf98 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java @@ -18,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; @@ -32,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; @@ -45,18 +44,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 @@ -69,13 +57,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; @@ -95,7 +77,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()); @@ -112,7 +94,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; } @@ -120,20 +102,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()); - } + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -148,12 +117,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)) { + + checkPassiveDrain(par1ItemStack, par2World, (EntityPlayer) par3Entity); int range = 3; int verticalRange = 2; int posX = (int) Math.round(par3Entity.posX - 0.5f); @@ -206,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 5c32767b..62ecd01c 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java @@ -14,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; @@ -37,18 +38,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 @@ -61,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; @@ -86,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 (toggleSigil(par1ItemStack, par2World, par3EntityPlayer)) { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionBoost.id, 3, 1)); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } return par1ItemStack; @@ -121,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); - } - } - } + 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 9865ad0e..ad2d2388 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java @@ -16,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; @@ -30,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; @@ -42,18 +41,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 @@ -66,13 +54,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; @@ -91,24 +73,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()); - } + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -125,12 +94,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)) { + + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); int range = 5; int verticalRange = 5; @@ -170,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 28509158..9e27dd89 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfSupression.java @@ -16,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; @@ -44,18 +45,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 @@ -68,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; } } @@ -93,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; } @@ -104,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()); - } + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -143,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; @@ -173,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); - } - } - } + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } @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..cb2f96ca 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheAssassin.java @@ -22,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; @@ -62,19 +63,14 @@ 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); } /** * 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 112158d2..23f6457b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java @@ -16,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; @@ -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; @@ -43,18 +42,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 @@ -67,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; @@ -92,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()); - } + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -126,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)) { + 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 44e583f6..46acaee9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java @@ -15,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; @@ -38,18 +39,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 @@ -62,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; @@ -87,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 (toggleSigil(par1ItemStack, par2World, par3EntityPlayer)) { par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 2, 1, true)); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } return par1ItemStack; @@ -122,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); - } - } - } + 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 32a62d71..8ed414e5 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java @@ -14,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; @@ -37,18 +38,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 @@ -61,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; @@ -86,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 (toggleSigil(par1ItemStack, par2World, par3EntityPlayer)) { par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionProjProt.id, 2, 1)); - } else { - par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); } return par1ItemStack; @@ -121,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); - } - } - } + 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 320415b3..b4017a6f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilPackRat.java @@ -15,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; @@ -39,18 +40,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 @@ -63,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; @@ -88,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()); - } + toggleSigil(par1ItemStack, par2World, par3EntityPlayer); return par1ItemStack; } @@ -127,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) { @@ -140,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); - } - } - } + + checkPassiveDrain(par1ItemStack, par2World, par3EntityPlayer); } @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..32f1bb59 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilSeer.java @@ -12,9 +12,9 @@ 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; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -35,17 +35,12 @@ 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 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 ffd0f043..85ac31b2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilVoid.java @@ -15,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; @@ -43,12 +44,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 @@ -74,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 bcb74747..4e658b91 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilWater.java @@ -21,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; @@ -60,12 +61,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); } /** @@ -78,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..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; + 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 7da1ac5b..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 @@ -14,11 +14,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.api.items.interfaces.ISigil; 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; @@ -60,9 +62,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) { @@ -91,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); @@ -118,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( @@ -153,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); @@ -305,4 +306,9 @@ public class SigilOfHolding extends EnergyItems { inv[i].getItem().onUpdate(inv[i], par2World, par3Entity, par4, par5); } } + + @Override + public boolean canBeStored() { + return false; + } } 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..8cfa2994 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellEarthBender.java @@ -8,6 +8,7 @@ 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; @@ -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..b63acfa3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellExplosions.java @@ -6,6 +6,7 @@ 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; @@ -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..95aca9a6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFireBurst.java @@ -12,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; @@ -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..a335eb93 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellFrozenWater.java @@ -8,6 +8,7 @@ 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; @@ -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..9257c1a0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellHolyBlast.java @@ -11,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; @@ -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..6163c6c3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellLightningBolt.java @@ -7,6 +7,7 @@ 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; @@ -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..ae8dbd62 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellTeleport.java @@ -15,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; @@ -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..09304e62 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWateryGrave.java @@ -14,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; @@ -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..e44904b9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/spell/simple/SpellWindGust.java @@ -11,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; @@ -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; }