From bc67bb83795163cf65246ef88f24f7fdeab676e0 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Mon, 27 Jul 2015 14:02:32 -0400 Subject: [PATCH] Added in #396 and gave the sword blocking --- .../WayofTime/alchemicalWizardry/AlchemicalWizardry.java | 1 + .../alchemicalWizardry/BloodMagicConfiguration.java | 1 + .../alchemicalWizardry/common/entity/mob/EntityDemon.java | 2 +- .../alchemicalWizardry/common/items/BoundAxe.java | 7 ++++++- .../alchemicalWizardry/common/items/BoundPickaxe.java | 5 +++++ .../alchemicalWizardry/common/items/BoundShovel.java | 5 +++++ .../alchemicalWizardry/common/items/EnergySword.java | 1 + 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 35970dab..21a183b9 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/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 wellBlacklist; diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index 78e94f4a..910b5dbf 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/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); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java index c398a961..a9179329 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java @@ -61,7 +61,7 @@ public class EntityDemon extends EntityTameable implements IDemon // TODO Auto-generated method stub return null; } - + @Override public void writeToNBT(NBTTagCompound tag) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index f0ac52c4..bd32d14d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -117,7 +117,7 @@ public class BoundAxe extends ItemAxe implements IBindable par1ItemStack.getTagCompound().setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); return par1ItemStack; } - + if (par2World.isRemote) { return par1ItemStack; @@ -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; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index 1a358bca..cae100b1 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/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; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index 3dbfc338..bd70d517 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/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; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java index 2ac7f609..65477341 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergySword.java +++ b/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));