ForgeDirection (#158)

* ForgeDirection

* update dep

---------

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

3 files changed, 20 insertions, 20 deletions

diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
index fb98b6adc8..fae196a64b 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/ITextureBlock.java
@@ -2,16 +2,17 @@ package goodgenerator.blocks.regularBlock;
 
 import net.minecraft.block.Block;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.ITexture;
 
 public interface ITextureBlock {
 
-    default ITexture[] getTexture(Block aBlock, byte aSide) {
-        return getTexture(aBlock, 0, aSide);
+    default ITexture[] getTexture(Block aBlock, ForgeDirection side) {
+        return getTexture(aBlock, 0, side);
     }
 
-    ITexture[] getTexture(Block aBlock, byte aSide, IBlockAccess aWorld, int xCoord, int yCoord, int zCoord);
+    ITexture[] getTexture(Block aBlock, ForgeDirection side, IBlockAccess aWorld, int xCoord, int yCoord, int zCoord);
 
-    ITexture[] getTexture(Block aBlock, int aMeta, byte aSide);
+    ITexture[] getTexture(Block aBlock, int aMeta, ForgeDirection side);
 }
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
index afaca2e834..0c7b2caf10 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
@@ -18,8 +18,6 @@ import net.minecraft.util.StatCollector;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.IEssentiaContainerItem;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import goodgenerator.blocks.tileEntity.EssentiaHatch;
@@ -28,6 +26,8 @@ import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME;
 import goodgenerator.main.GoodGenerator;
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_Utility;
+import thaumcraft.api.aspects.Aspect;
+import thaumcraft.api.aspects.IEssentiaContainerItem;
 
 public class TEBlock extends BlockContainer {
 
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
index 95358505f6..19cf4bb10f 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
@@ -3,6 +3,7 @@ package goodgenerator.blocks.regularBlock;
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase;
 import goodgenerator.client.render.BlockRenderHandler;
@@ -28,12 +29,11 @@ public class TurbineCasing extends Casing implements ITextureBlock {
         base = new Textures.BlockIcons.CustomIcon("icons/" + texture);
     }
 
-    private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
+    private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection side) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (!(tTileEntity instanceof IGregTechTileEntity)) return 0;
         IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity;
-        if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase
-                && tTile.getFrontFacing() == aSide) {
+        if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase && tTile.getFrontFacing() == side) {
             if (tTile.isActive()) return 1;
             return ((GT_MetaTileEntity_LargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3;
         }
@@ -46,16 +46,17 @@ public class TurbineCasing extends Casing implements ITextureBlock {
     }
 
     @Override
-    public ITexture[] getTexture(Block aBlock, byte aSide, IBlockAccess aWorld, int xCoord, int yCoord, int zCoord) {
-        int tInvertLeftRightMod = aSide % 2 * 2 - 1;
-        switch (aSide / 2) {
+    public ITexture[] getTexture(Block aBlock, ForgeDirection side, IBlockAccess aWorld, int xCoord, int yCoord,
+            int zCoord) {
+        final int ordinalSide = side.ordinal();
+        int tInvertLeftRightMod = ordinalSide % 2 * 2 - 1;
+        switch (ordinalSide / 2) {
             case 0:
                 for (int i = -1; i < 2; i++) {
                     for (int j = -1; j < 2; j++) {
                         if (i == 0 && j == 0) continue;
                         int tState;
-                        if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, aSide))
-                                != 0) {
+                        if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord, zCoord + i, side)) != 0) {
                             return getTurbineCasing(4 - i * 3 - j, tState == 1, tState == 2);
                         }
                     }
@@ -66,8 +67,7 @@ public class TurbineCasing extends Casing implements ITextureBlock {
                     for (int j = -1; j < 2; j++) {
                         if (i == 0 && j == 0) continue;
                         int tState;
-                        if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, aSide))
-                                != 0) {
+                        if ((tState = isTurbineControllerWithSide(aWorld, xCoord + j, yCoord + i, zCoord, side)) != 0) {
                             return getTurbineCasing(4 + i * 3 - j * tInvertLeftRightMod, tState == 1, tState == 2);
                         }
                     }
@@ -78,19 +78,18 @@ public class TurbineCasing extends Casing implements ITextureBlock {
                     for (int j = -1; j < 2; j++) {
                         if (i == 0 && j == 0) continue;
                         int tState;
-                        if ((tState = isTurbineControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, aSide))
-                                != 0) {
+                        if ((tState = isTurbineControllerWithSide(aWorld, xCoord, yCoord + i, zCoord + j, side)) != 0) {
                             return getTurbineCasing(4 + i * 3 + j * tInvertLeftRightMod, tState == 1, tState == 2);
                         }
                     }
                 }
                 break;
         }
-        return getTexture(aBlock, aSide);
+        return getTexture(aBlock, side);
     }
 
     @Override
-    public ITexture[] getTexture(Block aBlock, int aMeta, byte aSide) {
+    public ITexture[] getTexture(Block aBlock, int aMeta, ForgeDirection side) {
         return new ITexture[] { TextureFactory.of(base) };
     }