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>

3 files changed, 28 insertions, 28 deletions

diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java
index 205ff05dc1..f121926005 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java
@@ -4,6 +4,7 @@ import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.IDescribable;
 import gregtech.api.interfaces.tileentity.IBasicEnergyContainer;
@@ -41,7 +42,7 @@ public abstract interface IGregtechPower
     public boolean increaseStoredEnergyUnits(long p0, boolean p1);
 
     @Override
-    public boolean drainEnergyUnits(byte p0, long p1, long p2);
+    public boolean drainEnergyUnits(ForgeDirection side, long p1, long p2);
 
     @Override
     public long getAverageElectricInput();
@@ -65,10 +66,10 @@ public abstract interface IGregtechPower
     public boolean increaseStoredSteam(long p0, boolean p1);
 
     @Override
-    public Block getBlockAtSide(byte p0);
+    public Block getBlockAtSide(ForgeDirection side);
 
     @Override
-    public Block getBlockAtSideAndDistance(byte p0, int p1);
+    public Block getBlockAtSideAndDistance(ForgeDirection side, int p1);
 
     @Override
     public Block getBlockOffset(int p0, int p1, int p2);
@@ -77,10 +78,10 @@ public abstract interface IGregtechPower
     public TileEntity getTileEntity(int p0, int p1, int p2);
 
     @Override
-    public TileEntity getTileEntityAtSide(byte p0);
+    public TileEntity getTileEntityAtSide(ForgeDirection side);
 
     @Override
-    public TileEntity getTileEntityAtSideAndDistance(byte p0, int p1);
+    public TileEntity getTileEntityAtSideAndDistance(ForgeDirection side, int p1);
 
     @Override
     public TileEntity getTileEntityOffset(int p0, int p1, int p2);
@@ -116,19 +117,19 @@ public abstract interface IGregtechPower
     public void writeToNBT(NBTTagCompound p0);
 
     @Override
-    public boolean acceptsRotationalEnergy(byte p0);
+    public boolean acceptsRotationalEnergy(ForgeDirection side);
 
     @Override
-    public boolean injectRotationalEnergy(byte p0, long p1, long p2);
+    public boolean injectRotationalEnergy(ForgeDirection side, long p1, long p2);
 
     @Override
-    public long injectEnergyUnits(byte p0, long p1, long p2);
+    public long injectEnergyUnits(ForgeDirection side, long p1, long p2);
 
     @Override
-    public boolean inputEnergyFrom(byte p0);
+    public boolean inputEnergyFrom(ForgeDirection side);
 
     @Override
-    public boolean outputsEnergyTo(byte p0);
+    public boolean outputsEnergyTo(ForgeDirection side);
 
     @Override
     public String[] getInfoData();
@@ -138,9 +139,4 @@ public abstract interface IGregtechPower
         return true;
     }
 
-    /*
-     * boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2); boolean onTick(TilePoweredGT
-     * iGregTechTileEntity, long mTickTimer2); boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2);
-     */
-
 }
diff --git a/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java b/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java
index a643c86292..d2a1e34f99 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/ILazyCoverable.java
@@ -1,5 +1,7 @@
 package gtPlusPlus.api.interfaces;
 
+import net.minecraftforge.common.util.ForgeDirection;
+
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
@@ -16,7 +18,7 @@ public interface ILazyCoverable extends ICoverable {
     }
 
     @Override
-    default byte getInputRedstoneSignal(byte arg0) {
+    default byte getInputRedstoneSignal(ForgeDirection side) {
         return 0;
     }
 
@@ -32,7 +34,7 @@ public interface ILazyCoverable extends ICoverable {
     }
 
     @Override
-    default boolean getRedstone(byte arg0) {
+    default boolean getRedstone(ForgeDirection side) {
         return false;
     }
 
@@ -67,23 +69,23 @@ public interface ILazyCoverable extends ICoverable {
     }
 
     @Override
-    default byte getOutputRedstoneSignal(byte arg0) {
+    default byte getOutputRedstoneSignal(ForgeDirection side) {
         return 0;
     }
 
     @Override
-    default void setOutputRedstoneSignal(byte arg0, byte arg1) {}
+    default void setOutputRedstoneSignal(ForgeDirection side, byte strength) {}
 
     @Override
-    default byte getStrongOutputRedstoneSignal(byte arg0) {
+    default byte getStrongOutputRedstoneSignal(ForgeDirection side) {
         return 0;
     }
 
     @Override
-    default void setStrongOutputRedstoneSignal(byte arg0, byte arg1) {}
+    default void setStrongOutputRedstoneSignal(ForgeDirection side, byte arg1) {}
 
     @Override
-    default byte getComparatorValue(byte arg0) {
+    default byte getComparatorValue(ForgeDirection side) {
         return 0;
     }
 
@@ -98,12 +100,12 @@ public interface ILazyCoverable extends ICoverable {
     }
 
     @Override
-    default IGregTechTileEntity getIGregTechTileEntityAtSide(byte arg0) {
+    default IGregTechTileEntity getIGregTechTileEntityAtSide(ForgeDirection side) {
         return null;
     }
 
     @Override
-    default IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(byte arg0, int arg1) {
+    default IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(ForgeDirection side, int arg1) {
         return null;
     }
 
@@ -118,12 +120,12 @@ public interface ILazyCoverable extends ICoverable {
     }
 
     @Override
-    default byte getMetaIDAtSide(byte arg0) {
+    default byte getMetaIDAtSide(ForgeDirection side) {
         return 0;
     }
 
     @Override
-    default byte getMetaIDAtSideAndDistance(byte arg0, int arg1) {
+    default byte getMetaIDAtSideAndDistance(ForgeDirection side, int arg1) {
         return 0;
     }
 
diff --git a/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java
index 5f45964ca8..a6179ce2bf 100644
--- a/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java
+++ b/src/main/java/gtPlusPlus/api/interfaces/ITexturedBlock.java
@@ -1,13 +1,15 @@
 package gtPlusPlus.api.interfaces;
 
 import net.minecraft.block.Block;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
 
 public interface ITexturedBlock extends ITexturedTileEntity {
 
-    ITexture[] getTexture(byte side);
+    ITexture[] getTexture(ForgeDirection side);
 
-    ITexture[] getTexture(Block block, byte side);
+    @Override
+    ITexture[] getTexture(Block block, ForgeDirection side);
 }