Changes to Item Binding

Allows event to cancel the binding (rather than set key to "" which had the same effect but was messy) Prevents binding by Fake Players
2015-01-31 23:37:17 +00:00 · 2015-01-31 23:37:17 +00:00 · 976599afe0
commit 976599afe0
parent aa33b6b8ff
50 changed files with 152 additions and 268 deletions
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java
@ -49,9 +49,7 @@ public class AirSigil extends EnergyItems implements ArmourUpgrade
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java
@ -59,7 +59,7 @@ public class DivinationSigil extends Item implements ArmourUpgrade, IReagentMani
    {
        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);

-        if (par3EntityPlayer.worldObj.isRemote)
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote)
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java
@ -49,8 +49,7 @@ public class ItemBloodLightSigil extends EnergyItems implements IHolding
    @Override
    public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer);
-        if(!EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()))
+        if(!EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer) || !EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed()))
        {
        	return true;
        }
@ -96,9 +95,7 @@ public class ItemBloodLightSigil extends EnergyItems implements IHolding
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemHarvestSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemHarvestSigil.java
@ -96,9 +96,7 @@ public class ItemHarvestSigil extends EnergyItems implements IHolding, ArmourUpg
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemPackRatSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemPackRatSigil.java
@ -97,9 +97,7 @@ public class ItemPackRatSigil extends EnergyItems implements IHolding, ArmourUpg
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSeerSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSeerSigil.java
@ -46,9 +46,7 @@ public class ItemSeerSigil extends Item implements IHolding, ArmourUpgrade
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.worldObj.isRemote)
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.worldObj.isRemote)
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfEnderSeverance.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfEnderSeverance.java
@ -97,9 +97,7 @@ public class ItemSigilOfEnderSeverance extends EnergyItems implements IHolding
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfSupression.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfSupression.java
@ -100,9 +100,7 @@ public class ItemSigilOfSupression extends EnergyItems implements ArmourUpgrade
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || SpellHelper.isFakePlayer(par2World, par3EntityPlayer))
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfTheAssassin.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/ItemSigilOfTheAssassin.java
@ -78,9 +78,7 @@ public class ItemSigilOfTheAssassin extends EnergyItems implements ArmourUpgrade
     */
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java
@ -75,9 +75,7 @@ public class LavaSigil extends ItemBucket implements ArmourUpgrade
     */
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java
@ -96,9 +96,7 @@ public class SigilOfElementalAffinity extends EnergyItems
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java
@ -101,35 +101,33 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
    @Override
    public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer);
-
-        if (applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer))
+        if (EnergyItems.checkAndSetItemOwner(par1ItemStack, par2EntityPlayer))
        {
-            EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
-
-            if (par3World.isRemote)
+            if (applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer))
            {
-                par3World.playAuxSFX(2005, par4, par5, par6, 0);
+                EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
+
+                if (par3World.isRemote)
+                {
+                    par3World.playAuxSFX(2005, par4, par5, par6, 0);
+                    return true;
+                }
+
                return true;
            }
-
-            return true;
        }
-
        return false;
    }

    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par2World.isRemote)
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }

-        if (par3EntityPlayer.isSneaking())
+        if (par2World.isRemote)
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java
@ -95,9 +95,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHolding.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHolding.java
@ -100,36 +100,37 @@ public class SigilOfHolding extends EnergyItems
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
        //TODO Might be a good idea to have this item need to be in the player's first slot
-        this.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (checkAndSetItemOwner(par1ItemStack, par3EntityPlayer))
        {
-            if (this.addSigilToInventory(par1ItemStack, par3EntityPlayer))
+            if (par3EntityPlayer.isSneaking())
+            {
+                if (this.addSigilToInventory(par1ItemStack, par3EntityPlayer))
+                {
+                    return par1ItemStack;
+                }
+
+                selectNextSlot(par1ItemStack);
+                return par1ItemStack;
+            }
+
+            int currentSlot = this.getSelectedSlot(par1ItemStack);
+            ItemStack[] inv = getInternalInventory(par1ItemStack);
+
+            if (inv == null)
            {
                return par1ItemStack;
            }

-            selectNextSlot(par1ItemStack);
-            return par1ItemStack;
+            ItemStack itemUsed = inv[currentSlot];
+
+            if (itemUsed == null)
+            {
+                return par1ItemStack;
+            }
+
+            itemUsed.getItem().onItemRightClick(itemUsed, par2World, par3EntityPlayer);
+            saveInternalInventory(par1ItemStack, inv);
        }
-
-        int currentSlot = this.getSelectedSlot(par1ItemStack);
-        ItemStack[] inv = getInternalInventory(par1ItemStack);
-
-        if (inv == null)
-        {
-            return par1ItemStack;
-        }
-
-        ItemStack itemUsed = inv[currentSlot];
-
-        if (itemUsed == null)
-        {
-            return par1ItemStack;
-        }
-
-        itemUsed.getItem().onItemRightClick(itemUsed, par2World, par3EntityPlayer);
-        saveInternalInventory(par1ItemStack, inv);
        return par1ItemStack;
    }

--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java
@ -96,9 +96,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade, IHol
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java
@ -98,9 +98,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java
@ -96,9 +96,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java
@ -95,9 +95,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java
@ -76,9 +76,7 @@ public class VoidSigil extends ItemBucket implements ArmourUpgrade
    @Override
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java
@ -79,9 +79,7 @@ public class WaterSigil extends ItemBucket implements ArmourUpgrade
     */
    public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
    {
-        EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
-
-        if (par3EntityPlayer.isSneaking())
+        if (!EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer) || par3EntityPlayer.isSneaking())
        {
            return par1ItemStack;
        }