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>

2 files changed, 7 insertions, 10 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
index a9dc1d1323..ced9b46c3e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/GT_MethodHelper.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.common.helpers;
 
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.enums.Textures.BlockIcons;
 import gregtech.api.interfaces.ITexture;
@@ -9,9 +10,9 @@ import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
 
 public class GT_MethodHelper {
 
-    public static ITexture[] getTexture(TileEntity tTileEntity, Block aBlock, byte aSide) {
+    public static ITexture[] getTexture(TileEntity tTileEntity, Block aBlock, ForgeDirection side) {
         if (tTileEntity instanceof ITexturedTileEntity) {
-            return ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, aSide);
+            return ((ITexturedTileEntity) tTileEntity).getTexture(aBlock, side);
         }
         return BlockIcons.ERROR_RENDERING;
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index 3083dee782..bb88429645 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -182,10 +182,8 @@ public class TreeFarmHelper {
     public static boolean cleanUp(final IGregTechTileEntity aBaseMetaTileEntity) {
         Logger.MACHINE_INFO("called cleanUp()");
         int cleanedUp = 0;
-        final int xDir = net.minecraftforge.common.util.ForgeDirection
-                .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 11;
-        final int zDir = net.minecraftforge.common.util.ForgeDirection
-                .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 11;
+        final int xDir = aBaseMetaTileEntity.getBackFacing().offsetX * 11;
+        final int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ * 11;
 
         for (int h = 1; h < 175; h++) {
             for (int i = -11; i <= 11; i++) {
@@ -450,10 +448,8 @@ public class TreeFarmHelper {
      */
 
     public static BlockPos checkForLogsInGrowArea(final IGregTechTileEntity aBaseMetaTileEntity) {
-        final int xDir = net.minecraftforge.common.util.ForgeDirection
-                .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 7;
-        final int zDir = net.minecraftforge.common.util.ForgeDirection
-                .getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 7;
+        final int xDir = aBaseMetaTileEntity.getBackFacing().offsetX * 7;
+        final int zDir = aBaseMetaTileEntity.getBackFacing().offsetZ * 7;
         for (int i = -7; i <= 7; i++) {
             for (int j = -7; j <= 7; j++) {
                 for (int h = 0; h <= 1; h++) {