From e153c7011636d78341185fd4604b628818007804 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Thu, 10 Apr 2025 16:44:54 -0400 Subject: [PATCH] Simplify this method. --- .../alchemicalWizardry/api/items/interfaces/IBindable.java | 4 +++- .../WayofTime/alchemicalWizardry/common/items/BoundAxe.java | 3 ++- .../alchemicalWizardry/common/items/BoundPickaxe.java | 3 ++- .../alchemicalWizardry/common/items/BoundShovel.java | 3 ++- .../alchemicalWizardry/common/items/EnergyBlast.java | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java index 74006e15..aa432147 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/interfaces/IBindable.java @@ -17,12 +17,14 @@ public interface IBindable { // The number of ticks between passive drains int tickDelay = 200; + // Set this to true if the right click function should be disabled with the config disableBoundToolsRightClick + boolean isBoundTool = false; /** * Used by bound tools and the energy blaster/bazooka to check if they should skip their right click function. */ default boolean checkRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, - int rightClickCost, boolean isBoundTool) { + int rightClickCost) { if (toggle(par1ItemStack, par2World, par3EntityPlayer)) { return true; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java index 036984a9..028b1d97 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundAxe.java @@ -33,6 +33,7 @@ public class BoundAxe extends ItemAxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; public int rightClickCost = 10000; + public boolean isBoundTool = true; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -85,7 +86,7 @@ public class BoundAxe extends ItemAxe implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost, true)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost)) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index d0dfacb5..386addf4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -34,6 +34,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; public int rightClickCost = 10000; + public boolean isBoundTool = true; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -87,7 +88,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost, true)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost)) { return par1ItemStack; } Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java index 98788d09..3c317a6a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundShovel.java @@ -35,6 +35,7 @@ public class BoundShovel extends ItemSpade implements IBindable { public float efficiencyOnProperMaterial = 12.0F; public float damageVsEntity; public int rightClickCost = 10000; + public boolean isBoundTool = true; @SideOnly(Side.CLIENT) private IIcon activeIcon; @@ -87,7 +88,7 @@ public class BoundShovel extends ItemSpade implements IBindable { @Override public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost, true)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, rightClickCost)) { return par1ItemStack; } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java index a1eda72f..d0b71ae4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java @@ -91,7 +91,7 @@ public class EnergyBlast extends EnergyItems { return par1ItemStack; } - if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed(), false)) { + if (checkRightClick(par1ItemStack, par2World, par3EntityPlayer, getEnergyUsed())) { setDelay(par1ItemStack, getMaxDelayAfterActivation()); return par1ItemStack; }