Add modes to tools (#2423)

* Add tool modes change

* Deprecate! Deprecate! Deprecate!

* Add mode to item name

* Opsie

* Byte 8 bit

* Add enum

* Spotless

* Types types types!!!! God I love types

* Make it trigger when player clicks midair

* update deps + fix wci

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

3 files changed, 52 insertions, 15 deletions

diff --git a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
index e0d23f0237..4b2a5aca67 100644
--- a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
+++ b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
@@ -761,18 +761,19 @@ public abstract class MultiTileEntity extends CoverableTileEntity
                         && GT_Utility.areStacksEqual(new ItemStack(Items.water_bucket, 1), tCurrentItem)) {
                         // TODO (Colorization)
                     }
+
                     if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWrenchList))
-                        return onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
+                        return onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
                     if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sScrewdriverList))
-                        return onScrewdriverRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
+                        return onScrewdriverRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
                     if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sHardHammerList))
-                        return onHammerRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
+                        return onHammerRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
                     if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList))
-                        return onMalletRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
+                        return onMalletRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
                     if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSolderingToolList))
-                        return onSolderingRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
+                        return onSolderingRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
                     if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sWireCutterList))
-                        return onWireCutterRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
+                        return onWireCutterRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ, tCurrentItem);
 
                     final ForgeDirection coverSide = getCoverIDAtSide(side) == 0 ? wrenchSide : side;
 
@@ -857,16 +858,16 @@ public abstract class MultiTileEntity extends CoverableTileEntity
     }
 
     public boolean onWrenchRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
-        float aY, float aZ) {
+        float aY, float aZ, ItemStack aTool) {
         if (setMainFacing(wrenchSide)) {
             GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer);
             GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
         }
-        return true;
+        return onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
     }
 
     public boolean onScrewdriverRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide,
-        float aX, float aY, float aZ) {
+        float aX, float aY, float aZ, ItemStack aTool) {
         if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 200, aPlayer)) {
             setCoverDataAtSide(
                 wrenchSide,
@@ -882,30 +883,66 @@ public abstract class MultiTileEntity extends CoverableTileEntity
             // TODO: Update connections!
             GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord);
         }
-        return true;
+        return onScrewdriverRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
     }
 
     public boolean onHammerRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
-        float aY, float aZ) {
+        float aY, float aZ, ItemStack aTool) {
 
-        return true;
+        return onHammerRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
     }
 
     public boolean onMalletRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
-        float aY, float aZ) {
+        float aY, float aZ, ItemStack aTool) {
 
+        return onMalletRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
+    }
+
+    public boolean onSolderingRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide,
+        float aX, float aY, float aZ, ItemStack aTool) {
+
+        return onSolderingRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
+    }
+
+    public boolean onWireCutterRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide,
+        float aX, float aY, float aZ, ItemStack aTool) {
+
+        return onWireCutterRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
+    }
+
+    @Deprecated
+    public boolean onHammerRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
+        float aY, float aZ) {
         return true;
     }
 
+    @Deprecated
     public boolean onSolderingRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide,
         float aX, float aY, float aZ) {
+        return true;
+    }
 
+    @Deprecated
+    public boolean onMalletRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
+        float aY, float aZ) {
         return true;
     }
 
+    @Deprecated
     public boolean onWireCutterRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide,
         float aX, float aY, float aZ) {
+        return true;
+    }
+
+    @Deprecated
+    public boolean onWrenchRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
+        float aY, float aZ) {
+        return true;
+    }
 
+    @Deprecated
+    public boolean onScrewdriverRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide,
+        float aX, float aY, float aZ) {
         return true;
     }
 
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
index 00201171a8..606d957fd6 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java
@@ -650,7 +650,7 @@ public abstract class Controller<T extends Controller<T>> extends MultiTileBasic
 
     @Override
     public boolean onWrenchRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
-        float aY, float aZ) {
+        float aY, float aZ, ItemStack aTool) {
         if (wrenchSide != getFrontFacing())
             return super.onWrenchRightClick(aPlayer, tCurrentItem, wrenchSide, aX, aY, aZ);
         if (aPlayer.isSneaking()) {
diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
index 1453502ea0..db9053b0d7 100644
--- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
+++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java
@@ -420,7 +420,7 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity
 
     @Override
     public boolean onMalletRightClick(EntityPlayer aPlayer, ItemStack tCurrentItem, ForgeDirection wrenchSide, float aX,
-        float aY, float aZ) {
+        float aY, float aZ, ItemStack aTool) {
         if (mAllowedModes == NOTHING) return true;
         if (mMode == NOTHING) {
             facing = wrenchSide;