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>

27 files changed, 133 insertions, 101 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
index d370940b41..7f0a504a79 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java
@@ -19,7 +19,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
+import appeng.core.CreativeTab;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -163,13 +165,13 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
 
     @Override
     @SideOnly(Side.CLIENT)
-    public final IIcon getIcon(final int aSide, final int aMeta) {
-        return mSidedTextureArray.get(aMeta).get(aSide).getIcon();
+    public final IIcon getIcon(final int ordinalSide, final int aMeta) {
+        return mSidedTextureArray.get(aMeta).get(ForgeDirection.getOrientation(ordinalSide)).getIcon();
     }
 
     @Override
-    public IIcon getIcon(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
-        return super.getIcon(aWorld, aX, aY, aZ, aSide);
+    public IIcon getIcon(IBlockAccess aWorld, int aX, int aY, int aZ, int ordinalSide) {
+        return super.getIcon(aWorld, aX, aY, aZ, ordinalSide);
     }
 
     @SideOnly(Side.CLIENT)
@@ -178,8 +180,8 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
         Logger.INFO("[TeTexture] Building Texture Maps for " + getTileEntityName() + ".");
 
         // Init on the Client side only, to prevent Field initialisers existing in the Server side bytecode.
-        mSidedTextureArray = new AutoMap<CubicObject<SafeTexture>>();
-        mSidedTexturePathArray = new AutoMap<CubicObject<String>>();
+        mSidedTextureArray = new AutoMap<>();
+        mSidedTexturePathArray = new AutoMap<>();
 
         // Store them in forge order
         // DOWN, UP, NORTH, SOUTH, WEST, EAST
@@ -325,10 +327,12 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement
         return l;
     }
 
+    @Override
     public Item getItemDropped(int meta, Random rand, int p_149650_3_) {
         return ItemUtils.getSimpleStack(this, 1).getItem();
     }
 
+    @Override
     public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
         ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
         drops.add(ItemUtils.simpleMetaStack(this, metadata, 1));
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
index a0cdd88193..e992d01d60 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java
@@ -66,8 +66,8 @@ public class BlockBaseFluid extends BlockFluidClassic {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(int side, int meta) {
-        return side <= 1 ? this.textureArray[0] : this.textureArray[1];
+    public IIcon getIcon(int ordinalSide, int meta) {
+        return ordinalSide <= 1 ? this.textureArray[0] : this.textureArray[1];
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java
index a3527059ab..08462c6c65 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseNBT.java
@@ -42,10 +42,10 @@ public abstract class BlockBaseNBT extends BlockContainer {
      */
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
-        return p_149691_1_ == 1 ? this.textureTop
-                : (p_149691_1_ == 0 ? this.textureBottom
-                        : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
+    public IIcon getIcon(final int ordinalSide, final int meta) {
+        return ordinalSide == 1 ? this.textureTop
+                : (ordinalSide == 0 ? this.textureBottom
+                        : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index 88ee9a8986..c7d8866ec5 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -8,6 +8,7 @@ import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.OrePrefixes;
@@ -80,12 +81,12 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
     }
 
     @Override
-    public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) {
+    public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int ordinalSide) {
         return Blocks.stone.getIcon(0, 0);
     }
 
     @Override
-    public IIcon getIcon(int aSide, int aMeta) {
+    public IIcon getIcon(int ordinalSide, int aMeta) {
         return Blocks.stone.getIcon(0, 0);
     }
 
@@ -96,11 +97,13 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
     // .08 compat
     public static IIconContainer[] hiddenTextureArray;
 
-    public ITexture[] getTexture(byte arg0) {
-        return getTexture(null, arg0);
+    @Override
+    public ITexture[] getTexture(ForgeDirection side) {
+        return getTexture(null, side);
     }
 
-    public ITexture[] getTexture(Block block, byte side) {
+    @Override
+    public ITexture[] getTexture(Block block, ForgeDirection side) {
         if (this.blockMaterial != null) {
             GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
                     blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
@@ -140,19 +143,6 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
             super(unlocalizedName, blockMaterial, vanillaMaterial, blockType, colour, miningLevel);
         }
 
-        /*
-         * @Override
-         * @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister iIcon) { this.blockIcon =
-         * iIcon.registerIcon(GTPlusPlus.ID + ":" + this.thisBlock.getTexture()); //this.base =
-         * iIcon.registerIcon(GTPlusPlus.ID + ":" + "blockStone"); //this.overlay = iIcon.registerIcon(GTPlusPlus.ID +
-         * ":" + "blockOre_Overlay"); }
-         * @Override public int colorMultiplier(final IBlockAccess par1IBlockAccess, final int par2, final int par3,
-         * final int par4){ if (this.blockColour == 0){ return MathUtils.generateSingularRandomHexValue(); } return
-         * this.blockColour; }
-         * @Override public int getRenderColor(final int aMeta) { if (this.blockColour == 0){ return
-         * MathUtils.generateSingularRandomHexValue(); } return this.blockColour; }
-         */
-
         @Override
         public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
                 final int z) {
@@ -168,12 +158,12 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
         }
 
         @Override
-        public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) {
+        public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int ordinalSide) {
             return Blocks.stone.getIcon(0, 0);
         }
 
         @Override
-        public IIcon getIcon(int aSide, int aMeta) {
+        public IIcon getIcon(int ordinalSide, int aMeta) {
             return Blocks.stone.getIcon(0, 0);
         }
 
@@ -184,11 +174,13 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
         // .08 compat
         IIconContainer[] hiddenTextureArray;
 
-        public ITexture[] getTexture(byte arg0) {
-            return getTexture(null, arg0);
+        @Override
+        public ITexture[] getTexture(ForgeDirection side) {
+            return getTexture(null, side);
         }
 
-        public ITexture[] getTexture(Block block, byte side) {
+        @Override
+        public ITexture[] getTexture(Block block, ForgeDirection side) {
             if (this.blockMaterial != null) {
                 GTPP_RenderedTexture aIconSet = new GTPP_RenderedTexture(
                         blockMaterial.getTextureSet().mTextures[OrePrefixes.ore.mTextureIndex],
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
index 2966404a67..d80c056d65 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockCompressedObsidian.java
@@ -67,7 +67,7 @@ public class BlockCompressedObsidian extends BlockObsidian {
      */
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(final int side, final int meta) {
+    public IIcon getIcon(final int ordinalSide, final int meta) {
         return this.textureArray[meta];
     }
 
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
index fee8176262..a9c309d5c7 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java
@@ -41,7 +41,7 @@ public class BlockSuperLight extends BlockContainer {
      */
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
+    public IIcon getIcon(final int ordinalSide, final int meta) {
         return this.blockIcon;
     }
 
@@ -54,6 +54,7 @@ public class BlockSuperLight extends BlockContainer {
     /**
      * Returns a new instance of a block's tile entity class. Called on placing the block.
      */
+    @Override
     public TileEntity createNewTileEntity(World aWorld, int p_149915_2_) {
         return new TileEntitySuperLight();
     }
@@ -75,6 +76,7 @@ public class BlockSuperLight extends BlockContainer {
             Logger.INFO("Created Super-Lamp");
         }
 
+        @Override
         public void readFromNBT(NBTTagCompound aNBT) {
             super.readFromNBT(aNBT);
             mCreated = aNBT.getLong("mCreated");
@@ -90,6 +92,7 @@ public class BlockSuperLight extends BlockContainer {
             }
         }
 
+        @Override
         public void writeToNBT(NBTTagCompound aNBT) {
             super.writeToNBT(aNBT);
             aNBT.setLong("mCreated", mCreated);
diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
index 61e6b71b57..79b24e2405 100644
--- a/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
+++ b/src/main/java/gtPlusPlus/core/block/general/BlockTankXpConverter.java
@@ -48,10 +48,10 @@ public class BlockTankXpConverter extends BlockContainer {
      */
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
-        return p_149691_1_ == 1 ? this.textureTop
-                : (p_149691_1_ == 0 ? this.textureBottom
-                        : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
+    public IIcon getIcon(final int ordinalSide, final int meta) {
+        return ordinalSide == 1 ? this.textureTop
+                : (ordinalSide == 0 ? this.textureBottom
+                        : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/FirePit.java b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
index 25210df133..e73c88bee0 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FirePit.java
+++ b/src/main/java/gtPlusPlus/core/block/general/FirePit.java
@@ -220,7 +220,7 @@ public class FirePit extends BasicBlock {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
+    public IIcon getIcon(final int ordinalSide, final int meta) {
         return FirePit.TEXTURE[0];
     }
 
diff --git a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
index 6f4b033b4b..dbcd3ed57c 100644
--- a/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
+++ b/src/main/java/gtPlusPlus/core/block/general/FluidTankInfinite.java
@@ -49,10 +49,10 @@ public class FluidTankInfinite extends BlockContainer {
      */
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
-        return p_149691_1_ == 1 ? this.textureTop
-                : (p_149691_1_ == 0 ? this.textureBottom
-                        : ((p_149691_1_ != 2) && (p_149691_1_ != 4) ? this.blockIcon : this.textureFront));
+    public IIcon getIcon(final int ordinalSide, final int meta) {
+        return ordinalSide == 1 ? this.textureTop
+                : (ordinalSide == 0 ? this.textureBottom
+                        : ((ordinalSide != 2) && (ordinalSide != 4) ? this.blockIcon : this.textureFront));
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/block/general/HellFire.java b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
index 4ebd9c832b..1e864a13c8 100644
--- a/src/main/java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/main/java/gtPlusPlus/core/block/general/HellFire.java
@@ -426,7 +426,7 @@ public class HellFire extends BlockFire {
      */
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
+    public IIcon getIcon(final int ordinalSide, final int meta) {
         return this.IIconArray[0];
     }
 
diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
index c7a0967042..6254201261 100644
--- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
+++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java
@@ -41,8 +41,8 @@ public class MiningExplosives extends BlockTNT {
      */
     @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(final int p_149691_1_, final int p_149691_2_) {
-        return p_149691_1_ == 0 ? this.textureBottom : (p_149691_1_ == 1 ? this.textureTop : this.blockIcon);
+    public IIcon getIcon(final int ordinalSide, final int meta) {
+        return ordinalSide == 0 ? this.textureBottom : (ordinalSide == 1 ? this.textureTop : this.blockIcon);
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java
index a5ffcf6763..d5cd3ef2fa 100644
--- a/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java
+++ b/src/main/java/gtPlusPlus/core/block/general/PlayerDoors.java
@@ -90,11 +90,13 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
     /**
      * Gets the block's texture. Args: side, meta
      */
+    @Override
     @SideOnly(Side.CLIENT)
-    public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
+    public IIcon getIcon(int ordinalSide, int meta) {
         return this.aTextureLower[0];
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public IIcon getIcon(IBlockAccess aAccess, int p_149673_2_, int p_149673_3_, int p_149673_4_, int p_149673_5_) {
         if (p_149673_5_ != 1 && p_149673_5_ != 0) {
@@ -136,6 +138,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
         }
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister p_149651_1_) {
         this.aTextureUpper = new IIcon[2];
@@ -146,6 +149,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
         this.aTextureLower[1] = new IconFlipped(this.aTextureLower[0], true, false);
     }
 
+    @Override
     public boolean getBlocksMovement(IBlockAccess aAccess, int aX, int aY, int aZ) {
         int l = this.getState(aAccess, aX, aY, aZ);
         return (l & 4) != 0;
@@ -154,6 +158,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
     /**
      * If this block doesn't render as an ordinary block it will return False (examples: signs, buttons, stairs, etc)
      */
+    @Override
     public boolean renderAsNormalBlock() {
         return false;
     }
@@ -161,6 +166,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
     /**
      * The type of render function that is called for this block
      */
+    @Override
     public int getRenderType() {
         return 7;
     }
@@ -168,6 +174,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
     /**
      * Returns the bounding box of the wired rectangular prism to render.
      */
+    @Override
     @SideOnly(Side.CLIENT)
     public AxisAlignedBB getSelectedBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
         this.setBlockBoundsBasedOnState(aWorld, aX, aY, aZ);
@@ -178,6 +185,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
      * Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
      * cleared to be reused)
      */
+    @Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool(World aWorld, int aX, int aY, int aZ) {
         this.setBlockBoundsBasedOnState(aWorld, aX, aY, aZ);
         return super.getCollisionBoundingBoxFromPool(aWorld, aX, aY, aZ);
@@ -186,14 +194,17 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
     /**
      * Updates the blocks bounds based on its current state. Args: world, x, y, z
      */
+    @Override
     public void setBlockBoundsBasedOnState(IBlockAccess aAccess, int aX, int aY, int aZ) {
         this.setBounds(this.getState(aAccess, aX, aY, aZ));
     }
 
+    @Override
     public int func_150013_e(IBlockAccess p_150013_1_, int p_150013_2_, int p_150013_3_, int p_150013_4_) {
         return this.getState(p_150013_1_, p_150013_2_, p_150013_3_, p_150013_4_) & 3;
     }
 
+    @Override
     public boolean func_150015_f(IBlockAccess p_150015_1_, int p_150015_2_, int p_150015_3_, int p_150015_4_) {
         return (this.getState(p_150015_1_, p_150015_2_, p_150015_3_, p_150015_4_) & 4) != 0;
     }
@@ -251,6 +262,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
     /**
      * Called upon block activation (right click on the block.)
      */
+    @Override
     public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int p_149727_6_,
             float p_149727_7_, float p_149727_8_, float p_149727_9_) {
         if (this.blockMaterial == Material.iron) {
@@ -273,6 +285,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
         }
     }
 
+    @Override
     public void func_150014_a(World aWorld, int aX, int aY, int aZ, boolean aFlag) {
         int l = this.getState(aWorld, aX, aY, aZ);
         boolean flag1 = (l & 4) != 0;
@@ -297,6 +310,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
      * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
      * their own) Args: x, y, z, neighbor Block
      */
+    @Override
     public void onNeighborBlockChange(World aWorld, int aX, int aY, int aZ, Block aNeighbour) {
         int l = aWorld.getBlockMetadata(aX, aY, aZ);
 
@@ -340,6 +354,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
         }
     }
 
+    @Override
     public Item getItemDropped(int p_149650_1_, Random aRand, int p_149650_3_) {
         if ((p_149650_1_ & 8) != 0) {
             return null;
@@ -356,6 +371,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
      * Ray traces through the blocks collision from start vector to end vector returning a ray trace hit. Args: world,
      * x, y, z, startVec, endVec
      */
+    @Override
     public MovingObjectPosition collisionRayTrace(World p_149731_1_, int p_149731_2_, int p_149731_3_, int p_149731_4_,
             Vec3 p_149731_5_, Vec3 p_149731_6_) {
         this.setBlockBoundsBasedOnState(p_149731_1_, p_149731_2_, p_149731_3_, p_149731_4_);
@@ -365,6 +381,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
     /**
      * Checks to see if its valid to put this block at the specified coordinates. Args: world, x, y, z
      */
+    @Override
     public boolean canPlaceBlockAt(World aWorld, int aX, int aY, int aZ) {
         boolean aHeight = (aY < aWorld.getHeight() - 1);
         boolean aSolidTopSurface = World.doesBlockHaveSolidTopSurface(aWorld, aX, aY - 1, aZ);
@@ -383,6 +400,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
      * Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility
      * and stop pistons
      */
+    @Override
     public int getMobilityFlag() {
         return 1;
     }
@@ -408,6 +426,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
     /**
      * Gets an item for the block being called on. Args: world, x, y, z
      */
+    @Override
     @SideOnly(Side.CLIENT)
     public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) {
         Block b = mDoorMap.get(this.blockMaterial);
@@ -422,6 +441,7 @@ public class PlayerDoors extends BlockDoor implements ITileEntityProvider {
     /**
      * Called when the block is attempted to be harvested
      */
+    @Override
     public void onBlockHarvested(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_,
             EntityPlayer p_149681_6_) {
         if (p_149681_6_.capabilities.isCreativeMode && (p_149681_5_ & 8) != 0
diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
index 679d82677e..58fbced6c3 100644
--- a/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
+++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java
@@ -174,26 +174,26 @@ public class TowerDevice extends Block {
 
     public void sparkle(final World world, final int x, final int y, final int z, final Random rand) {
         final double offset = 0.0625D;
-        for (int side = 0; side < 6; side++) {
+        for (int ordinalSide = 0; ordinalSide < 6; ordinalSide++) {
             double rx = x + rand.nextFloat();
             double ry = y + rand.nextFloat();
             double rz = z + rand.nextFloat();
-            if ((side == 0) && (!world.getBlock(x, y + 1, z).isOpaqueCube())) {
+            if ((ordinalSide == 0) && (!world.getBlock(x, y + 1, z).isOpaqueCube())) {
                 ry = y + 1 + offset;
             }
-            if ((side == 1) && (!world.getBlock(x, y - 1, z).isOpaqueCube())) {
+            if ((ordinalSide == 1) && (!world.getBlock(x, y - 1, z).isOpaqueCube())) {
                 ry = (y + 0) - offset;
             }
-            if ((side == 2) && (!world.getBlock(x, y, z + 1).isOpaqueCube())) {
+            if ((ordinalSide == 2) && (!world.getBlock(x, y, z + 1).isOpaqueCube())) {
                 rz = z + 1 + offset;
             }
-            if ((side == 3) && (!world.getBlock(x, y, z - 1).isOpaqueCube())) {
+            if ((ordinalSide == 3) && (!world.getBlock(x, y, z - 1).isOpaqueCube())) {
                 rz = (z + 0) - offset;
             }
-            if ((side == 4) && (!world.getBlock(x + 1, y, z).isOpaqueCube())) {
+            if ((ordinalSide == 4) && (!world.getBlock(x + 1, y, z).isOpaqueCube())) {
                 rx = x + 1 + offset;
             }
-            if ((side == 5) && (!world.getBlock(x - 1, y, z).isOpaqueCube())) {
+            if ((ordinalSide == 5) && (!world.getBlock(x - 1, y, z).isOpaqueCube())) {
                 rx = (x + 0) - offset;
             }
             if ((rx < x) || (rx > (x + 1)) || (ry < 0.0D) || (ry > (y + 1)) || (rz < z) || (rz > (z + 1))) {
diff --git a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
index 00d542143c..804a09ee45 100644
--- a/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
+++ b/src/main/java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
@@ -29,8 +29,8 @@ public class BlockFluidSludge extends BlockFluidClassic {
     }
 
     @Override
-    public IIcon getIcon(final int side, final int meta) {
-        return ((side == 0) || (side == 1)) ? this.stillIcon : this.flowingIcon;
+    public IIcon getIcon(final int ordinalSide, final int meta) {
+        return ((ordinalSide == 0) || (ordinalSide == 1)) ? this.stillIcon : this.flowingIcon;
     }
 
     @SideOnly(Side.CLIENT)
diff --git a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
index b18e6bcb29..4d974b9a61 100644
--- a/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
+++ b/src/main/java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
@@ -270,7 +270,7 @@ public abstract class BlockGenericRedstone extends BlockContainer {
      */
     @Override
     @SideOnly(Side.CLIENT)
-    public abstract IIcon getIcon(final int side, final int meta);
+    public abstract IIcon getIcon(final int ordinalSide, final int meta);
 
     @Override
     public int damageDropped(final int damage) {
@@ -283,6 +283,7 @@ public abstract class BlockGenericRedstone extends BlockContainer {
     /**
      * Called whenever the block is added into the world. Args: world, x, y, z
      */
+    @Override
     public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
         TileEntityRedstoneHandler aThis = getTileEntity(aWorld, aX, aY, aZ);
 
@@ -299,6 +300,7 @@ public abstract class BlockGenericRedstone extends BlockContainer {
      * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are
      * their own) Args: x, y, z, neighbor Block
      */
+    @Override
     public void onNeighborBlockChange(World aWorld, int aX, int aY, int aZ, Block p_149695_5_) {
 
         TileEntityRedstoneHandler aThis = getTileEntity(aWorld, aX, aY, aZ);
@@ -315,6 +317,7 @@ public abstract class BlockGenericRedstone extends BlockContainer {
     /**
      * Ticks the block if it's b