Merge pull request #399 from Arcaratus/master

Added in #396 and sword blocking

src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java

@@ -427,6 +427,7 @@ public class AlchemicalWizardry
     public static boolean lockdownAltar;
     public static boolean causeHungerWithRegen;
     public static boolean causeHungerChatMessage = true;
+    public static boolean disableBoundToolsRightClick;
 
     public static List<Class> wellBlacklist;
 

src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java

@@ -106,6 +106,7 @@ public class BloodMagicConfiguration
 		AlchemicalWizardry.causeHungerChatMessage = config.get("WimpySettings", "causeHungerChatMessage", true).getBoolean();
 //		AlchemicalWizardry.lockdownAltar = config.get("WimpySettings", "LockdownAltarWithRegen", true).getBoolean();
 		AlchemicalWizardry.lockdownAltar = false;
+		AlchemicalWizardry.disableBoundToolsRightClick = config.get("WimpySettings", "disableBoundToolsRightClick", false).getBoolean(false);
 
 		AlchemicalWizardry.ritualDisabledWater = config.get("Ritual Blacklist", "Ritual of the Full Spring", false).getBoolean(false);
 		AlchemicalWizardry.ritualDisabledLava = config.get("Ritual Blacklist", "Serenade of the Nether", false).getBoolean(false);

src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java

@@ -128,6 +128,11 @@ public class BoundAxe extends ItemAxe implements IBindable
             return par1ItemStack;
         }
 
+        if (AlchemicalWizardry.disableBoundToolsRightClick)
+        {
+            return par1ItemStack;
+        }
+
         if (par3EntityPlayer.isPotionActive(AlchemicalWizardry.customPotionInhibit))
         {
             return par1ItemStack;

src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java

@@ -131,6 +131,11 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
             return par1ItemStack;
         }
 
+        if (AlchemicalWizardry.disableBoundToolsRightClick)
+        {
+            return par1ItemStack;
+        }
+
         if (par3EntityPlayer.isPotionActive(AlchemicalWizardry.customPotionInhibit))
         {
             return par1ItemStack;

src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java

@@ -132,6 +132,11 @@ public class BoundShovel extends ItemSpade implements IBindable
             return par1ItemStack;
         }
 
+        if (AlchemicalWizardry.disableBoundToolsRightClick)
+        {
+            return par1ItemStack;
+        }
+
         if (par3EntityPlayer.isPotionActive(AlchemicalWizardry.customPotionInhibit))
         {
             return par1ItemStack;

src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java

@@ -121,6 +121,7 @@ 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));