ForgeDirection (#608)

* ForgeDirection WIP

* Fix GTPP_Render_MachineBlock

Fix handling of getTexture with facing mask for pipes
Kill a bunch of magic numbers

* spotlessApply (#612)

Co-authored-by: GitHub GTNH Actions <>

* Bump bw/tt deps

---------

Co-authored-by: Léa Gris <lea.gris@noiraude.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

5 files changed, 23 insertions, 16 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
index 9d27818686..a7c23c69fc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java
@@ -5,6 +5,7 @@ import java.util.List;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.util.GT_LanguageManager;
@@ -32,7 +33,7 @@ public class Behaviour_Choocher extends Behaviour_None {
 
     @Override
     public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
-            final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX,
+            final World aWorld, final int aX, final int aY, final int aZ, final ForgeDirection side, final float hitX,
             final float hitY, final float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -53,11 +54,10 @@ public class Behaviour_Choocher extends Behaviour_None {
             return true;
         } else {
             if (inWrenchMode) {
-                return this.wrench
-                        .onItemUseFirst(aItem, aStack, aPlayer, aWorld, aSide, aSide, aSide, aSide, hitZ, hitZ, hitZ);
+                return this.wrench.onItemUseFirst(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, side, hitZ, hitZ, hitZ);
             } else {
                 return this.prospecting
-                        .onItemUseFirst(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ);
+                        .onItemUseFirst(aItem, aStack, aPlayer, aWorld, aX, aY, aZ, side, hitX, hitY, hitZ);
             }
         }
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
index ce393beccb..a5d09bcbd9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -38,6 +38,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
 
     public Behaviour_Electric_Lighter() {}
 
+    @Override
     public boolean onLeftClickEntity(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) {
         if (!aPlayer.worldObj.isRemote && aStack != null && aStack.stackSize == 1) {
             boolean rOutput = false;
@@ -61,8 +62,9 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
         }
     }
 
+    @Override
     public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
-            int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+            int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
         if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {
             if (aPlayer.isSneaking()) {
                 Logger.INFO("Changing Mode");
@@ -91,11 +93,12 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                     // Lights Fires Mode
                     Logger.WARNING("Preparing Lighter a");
                     boolean rOutput = false;
-                    ForgeDirection tDirection = ForgeDirection.getOrientation(aSide);
+                    ForgeDirection tDirection = ForgeDirection.getOrientation(ordinalSide);
                     aX += tDirection.offsetX;
                     aY += tDirection.offsetY;
                     aZ += tDirection.offsetZ;
-                    if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) && aPlayer.canPlayerEdit(aX, aY, aZ, aSide, aStack)) {
+                    if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ)
+                            && aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) {
                         Logger.WARNING("Preparing Lighter b");
                         if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
                             Logger.WARNING("Preparing Lighter c");
@@ -121,7 +124,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
     }
 
     public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX,
-            int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
+            int aY, int aZ, int ordinalSide, float hitX, float hitY, float hitZ) {
         if (!aWorld.isRemote && aStack != null && aStack.stackSize == 1) {
             if (aPlayer.isSneaking()) {
                 Logger.INFO("Changing Mode");
@@ -150,11 +153,12 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
                     // Lights Fires Mode
                     Logger.WARNING("Preparing Lighter a");
                     boolean rOutput = false;
-                    ForgeDirection tDirection = ForgeDirection.getOrientation(aSide);
+                    ForgeDirection tDirection = ForgeDirection.getOrientation(ordinalSide);
                     aX += tDirection.offsetX;
                     aY += tDirection.offsetY;
                     aZ += tDirection.offsetZ;
-                    if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) && aPlayer.canPlayerEdit(aX, aY, aZ, aSide, aStack)) {
+                    if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ)
+                            && aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)) {
                         Logger.WARNING("Preparing Lighter b");
                         if (this.prepare(aStack) || aPlayer.capabilities.isCreativeMode) {
                             Logger.WARNING("Preparing Lighter c");
@@ -206,6 +210,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
 
     private void useUp(ItemStack aStack) {}
 
+    @Override
     public List<String> getAdditionalToolTips(GT_MetaBase_Item aItem, List<String> aList, ItemStack aStack) {
         aList.add(this.mTooltip);
         int aUses = 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java
index cb892da129..94a18c8f07 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Grinder.java
@@ -9,6 +9,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.SubTag;
 import gregtech.api.interfaces.IItemBehaviour;
@@ -31,7 +32,7 @@ public class Behaviour_Grinder implements IItemBehaviour<GT_MetaBase_Item> {
 
     @Override
     public boolean onItemUseFirst(GT_MetaBase_Item var1, ItemStack var2, EntityPlayer var3, World var4, int var5,
-            int var6, int var7, int var8, float var9, float var10, float var11) {
+            int var6, int var7, ForgeDirection side, float var9, float var10, float var11) {
         // TODO Auto-generated method stub
         return false;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
index 307cde3233..78f77a7b33 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Prospecting_Ex.java
@@ -36,7 +36,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
 
     @Override
     public boolean onItemUseFirst(final GT_MetaBase_Item aItem, final ItemStack aStack, final EntityPlayer aPlayer,
-            final World aWorld, final int aX, final int aY, final int aZ, final int aSide, final float hitX,
+            final World aWorld, final int aX, final int aY, final int aZ, final ForgeDirection side, final float hitX,
             final float hitY, final float hitZ) {
         if (aWorld.isRemote) {
             return false;
@@ -87,9 +87,9 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
 
                 int i = 0;
                 for (final int j = 6 + tQuality; i < j; i++) {
-                    tX -= ForgeDirection.getOrientation(aSide).offsetX;
-                    tY -= ForgeDirection.getOrientation(aSide).offsetY;
-                    tZ -= ForgeDirection.getOrientation(aSide).offsetZ;
+                    tX -= side.offsetX;
+                    tY -= side.offsetY;
+                    tZ -= side.offsetZ;
 
                     final Block tBlock = aWorld.getBlock(tX, tY, tZ);
                     if ((tBlock == Blocks.lava) || (tBlock == Blocks.flowing_lava)) {
@@ -113,7 +113,7 @@ public class Behaviour_Prospecting_Ex extends Behaviour_Prospecting {
                         break;
                     }
                 }
-                final Random tRandom = new Random(aX ^ aY ^ aZ ^ aSide);
+                final Random tRandom = new Random(aX ^ aY ^ aZ ^ side.ordinal());
                 i = 0;
                 for (final int j = 9 + (2 * tQuality); i < j; i++) {
                     tX = (aX - 4 - tQuality) + tRandom.nextInt(j);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
index e96a064128..a660362461 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
@@ -31,6 +31,7 @@ public class MetaItemCoverCasings extends MetaCustomCoverItem {
         }
     }
 
+    @Override
     public boolean hide() {
         return false;
     }