Refactors

30 files changed, 829 insertions, 1044 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index 1dc0e34d53..2bc560f8e7 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -116,22 +116,22 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity
     public BaseMetaPipeEntity() {}
 
     @Override
-    public void writeToNBT(NBTTagCompound aNBT) {
+    public void writeToNBT(NBTTagCompound nbt) {
         try {
-            super.writeToNBT(aNBT);
+            super.writeToNBT(nbt);
         } catch (Throwable e) {
             GT_FML_LOGGER.error("Encountered CRITICAL ERROR while saving MetaTileEntity", e);
         }
         try {
-            aNBT.setInteger("mID", mID);
-            writeCoverNBT(aNBT, false);
-            aNBT.setByte("mConnections", mConnections);
-            aNBT.setByte("mColor", mColor);
-            aNBT.setBoolean("mWorks", !mWorks);
+            nbt.setInteger("mID", mID);
+            writeCoverNBT(nbt, false);
+            nbt.setByte("mConnections", mConnections);
+            nbt.setByte("mColor", mColor);
+            nbt.setBoolean("mWorks", !mWorks);
         } catch (Throwable e) {
             GT_FML_LOGGER.error("Encountered CRITICAL ERROR while saving MetaTileEntity", e);
         }
-        saveMetaTileNBT(aNBT);
+        saveMetaTileNBT(nbt);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 386975dd6d..eb26cd7883 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -132,36 +132,36 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity
     public BaseMetaTileEntity() {}
 
     @Override
-    public void writeToNBT(NBTTagCompound aNBT) {
+    public void writeToNBT(NBTTagCompound nbt) {
         try {
-            super.writeToNBT(aNBT);
+            super.writeToNBT(nbt);
         } catch (Throwable e) {
             GT_FML_LOGGER.error("Encountered CRITICAL ERROR while saving MetaTileEntity.", e);
         }
         try {
-            aNBT.setInteger("mID", mID);
-            aNBT.setLong("mStoredSteam", mStoredSteam);
-            aNBT.setLong("mStoredEnergy", mStoredEnergy);
-            writeCoverNBT(aNBT, false);
-            aNBT.setByte("mColor", mColor);
-            aNBT.setByte("mLightValue", mLightValue);
-            aNBT.setByte("mOtherUpgrades", mOtherUpgrades);
-            aNBT.setByte("mWorkData", mWorkData);
-            aNBT.setShort("mFacing", (short) mFacing.ordinal());
-            aNBT.setString("mOwnerName", mOwnerName);
-            aNBT.setString("mOwnerUuid", mOwnerUuid == null ? "" : mOwnerUuid.toString());
-            aNBT.setBoolean("mLockUpgrade", mLockUpgrade);
-            aNBT.setBoolean("mMuffler", mMuffler);
-            aNBT.setBoolean("mSteamConverter", mSteamConverter);
-            aNBT.setBoolean("mActive", mActive);
-            aNBT.setBoolean("mWorks", !mWorks);
-            aNBT.setBoolean("mInputDisabled", mInputDisabled);
-            aNBT.setBoolean("mOutputDisabled", mOutputDisabled);
-            aNBT.setTag("GT.CraftingComponents", mRecipeStuff);
+            nbt.setInteger("mID", mID);
+            nbt.setLong("mStoredSteam", mStoredSteam);
+            nbt.setLong("mStoredEnergy", mStoredEnergy);
+            writeCoverNBT(nbt, false);
+            nbt.setByte("mColor", mColor);
+            nbt.setByte("mLightValue", mLightValue);
+            nbt.setByte("mOtherUpgrades", mOtherUpgrades);
+            nbt.setByte("mWorkData", mWorkData);
+            nbt.setShort("mFacing", (short) mFacing.ordinal());
+            nbt.setString("mOwnerName", mOwnerName);
+            nbt.setString("mOwnerUuid", mOwnerUuid == null ? "" : mOwnerUuid.toString());
+            nbt.setBoolean("mLockUpgrade", mLockUpgrade);
+            nbt.setBoolean("mMuffler", mMuffler);
+            nbt.setBoolean("mSteamConverter", mSteamConverter);
+            nbt.setBoolean("mActive", mActive);
+            nbt.setBoolean("mWorks", !mWorks);
+            nbt.setBoolean("mInputDisabled", mInputDisabled);
+            nbt.setBoolean("mOutputDisabled", mOutputDisabled);
+            nbt.setTag("GT.CraftingComponents", mRecipeStuff);
         } catch (Throwable e) {
             GT_FML_LOGGER.error("Encountered CRITICAL ERROR while saving MetaTileEntity.", e);
         }
-        saveMetaTileNBT(aNBT);
+        saveMetaTileNBT(nbt);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
index d8b0086f0f..ac523eb82c 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
@@ -106,15 +106,13 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
 
     private final ChunkCoordinates mReturnedCoordinates = new ChunkCoordinates();
 
-    public static ForgeDirection getSideForPlayerPlacing(Entity aPlayer, ForgeDirection defaultFacing,
+    public static ForgeDirection getSideForPlayerPlacing(Entity player, ForgeDirection defaultFacing,
         boolean[] aAllowedFacings) {
-        if (aPlayer != null) {
-            if (aPlayer.rotationPitch >= 65 && aAllowedFacings[SIDE_UP]) return ForgeDirection.UP;
-            if (aPlayer.rotationPitch <= -65 && aAllowedFacings[SIDE_DOWN]) return ForgeDirection.DOWN;
-            final byte rFacing = COMPASS_DIRECTIONS[MathHelper.floor_double(0.5D + 4.0F * aPlayer.rotationYaw / 360.0F)
-                & 0x3];
-            if (aAllowedFacings[rFacing]) return ForgeDirection.getOrientation(rFacing);
-        }
+
+        final ForgeDirection facingFromPlayer = GT_Utility.getSideFromPlayerFacing(player);
+        if (facingFromPlayer != ForgeDirection.UNKNOWN && aAllowedFacings[facingFromPlayer.ordinal()])
+            return facingFromPlayer;
+
         for (final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) if (aAllowedFacings[dir.ordinal()]) return dir;
         return defaultFacing;
     }
@@ -160,18 +158,18 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final int getOffsetX(ForgeDirection side, int aMultiplier) {
-        return xCoord + side.offsetX * aMultiplier;
+    public final int getOffsetX(ForgeDirection side, int multiplier) {
+        return xCoord + side.offsetX * multiplier;
     }
 
     @Override
-    public final short getOffsetY(ForgeDirection side, int aMultiplier) {
-        return (short) (yCoord + side.offsetY * aMultiplier);
+    public final short getOffsetY(ForgeDirection side, int multiplier) {
+        return (short) (yCoord + side.offsetY * multiplier);
     }
 
     @Override
-    public final int getOffsetZ(ForgeDirection side, int aMultiplier) {
-        return zCoord + side.offsetZ * aMultiplier;
+    public final int getOffsetZ(ForgeDirection side, int multiplier) {
+        return zCoord + side.offsetZ * multiplier;
     }
 
     @Override
@@ -194,15 +192,15 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
 
     @Override
     @Deprecated
-    public final boolean openGUI(EntityPlayer aPlayer) {
-        return openGUI(aPlayer, 0);
+    public final boolean openGUI(EntityPlayer player) {
+        return openGUI(player, 0);
     }
 
     @Override
     @Deprecated
-    public final boolean openGUI(EntityPlayer aPlayer, int aID) {
-        if (aPlayer == null) return false;
-        aPlayer.openGui(GT, aID, worldObj, xCoord, yCoord, zCoord);
+    public final boolean openGUI(EntityPlayer player, int aID) {
+        if (player == null) return false;
+        player.openGui(GT, aID, worldObj, xCoord, yCoord, zCoord);
         return true;
     }
 
@@ -218,8 +216,8 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final BiomeGenBase getBiome(int aX, int aZ) {
-        return worldObj.getBiomeGenForCoords(aX, aZ);
+    public final BiomeGenBase getBiome(int x, int z) {
+        return worldObj.getBiomeGenForCoords(x, z);
     }
 
     @Override
@@ -228,8 +226,8 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final Block getBlockOffset(int aX, int aY, int aZ) {
-        return getBlock(xCoord + aX, yCoord + aY, zCoord + aZ);
+    public final Block getBlockOffset(int x, int y, int z) {
+        return getBlock(xCoord + x, yCoord + y, zCoord + z);
     }
 
     @Override
@@ -238,13 +236,13 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final Block getBlockAtSideAndDistance(ForgeDirection side, int aDistance) {
-        return getBlock(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance));
+    public final Block getBlockAtSideAndDistance(ForgeDirection side, int distance) {
+        return getBlock(getOffsetX(side, distance), getOffsetY(side, distance), getOffsetZ(side, distance));
     }
 
     @Override
-    public final byte getMetaIDOffset(int aX, int aY, int aZ) {
-        return getMetaID(xCoord + aX, yCoord + aY, zCoord + aZ);
+    public final byte getMetaIDOffset(int x, int y, int z) {
+        return getMetaID(xCoord + x, yCoord + y, zCoord + z);
     }
 
     @Override
@@ -253,13 +251,13 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final byte getMetaIDAtSideAndDistance(ForgeDirection side, int aDistance) {
-        return getMetaID(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance));
+    public final byte getMetaIDAtSideAndDistance(ForgeDirection side, int distance) {
+        return getMetaID(getOffsetX(side, distance), getOffsetY(side, distance), getOffsetZ(side, distance));
     }
 
     @Override
-    public final byte getLightLevelOffset(int aX, int aY, int aZ) {
-        return getLightLevel(xCoord + aX, yCoord + aY, zCoord + aZ);
+    public final byte getLightLevelOffset(int x, int y, int z) {
+        return getLightLevel(xCoord + x, yCoord + y, zCoord + z);
     }
 
     @Override
@@ -268,13 +266,13 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final byte getLightLevelAtSideAndDistance(ForgeDirection side, int aDistance) {
-        return getLightLevel(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance));
+    public final byte getLightLevelAtSideAndDistance(ForgeDirection side, int distance) {
+        return getLightLevel(getOffsetX(side, distance), getOffsetY(side, distance), getOffsetZ(side, distance));
     }
 
     @Override
-    public final boolean getOpacityOffset(int aX, int aY, int aZ) {
-        return getOpacity(xCoord + aX, yCoord + aY, zCoord + aZ);
+    public final boolean getOpacityOffset(int x, int y, int z) {
+        return getOpacity(xCoord + x, yCoord + y, zCoord + z);
     }
 
     @Override
@@ -283,13 +281,13 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final boolean getOpacityAtSideAndDistance(ForgeDirection side, int aDistance) {
-        return getOpacity(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance));
+    public final boolean getOpacityAtSideAndDistance(ForgeDirection side, int distance) {
+        return getOpacity(getOffsetX(side, distance), getOffsetY(side, distance), getOffsetZ(side, distance));
     }
 
     @Override
-    public final boolean getSkyOffset(int aX, int aY, int aZ) {
-        return getSky(xCoord + aX, yCoord + aY, zCoord + aZ);
+    public final boolean getSkyOffset(int x, int y, int z) {
+        return getSky(xCoord + x, yCoord + y, zCoord + z);
     }
 
     @Override
@@ -298,13 +296,13 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final boolean getSkyAtSideAndDistance(ForgeDirection side, int aDistance) {
-        return getSky(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance));
+    public final boolean getSkyAtSideAndDistance(ForgeDirection side, int distance) {
+        return getSky(getOffsetX(side, distance), getOffsetY(side, distance), getOffsetZ(side, distance));
     }
 
     @Override
-    public final boolean getAirOffset(int aX, int aY, int aZ) {
-        return getAir(xCoord + aX, yCoord + aY, zCoord + aZ);
+    public final boolean getAirOffset(int x, int y, int z) {
+        return getAir(xCoord + x, yCoord + y, zCoord + z);
     }
 
     @Override
@@ -313,31 +311,31 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final boolean getAirAtSideAndDistance(ForgeDirection side, int aDistance) {
-        return getAir(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance));
+    public final boolean getAirAtSideAndDistance(ForgeDirection side, int distance) {
+        return getAir(getOffsetX(side, distance), getOffsetY(side, distance), getOffsetZ(side, distance));
     }
 
     @Override
-    public final TileEntity getTileEntityOffset(int aX, int aY, int aZ) {
-        return getTileEntity(xCoord + aX, yCoord + aY, zCoord + aZ);
+    public final TileEntity getTileEntityOffset(int x, int y, int z) {
+        return getTileEntity(xCoord + x, yCoord + y, zCoord + z);
     }
 
     @Override
-    public final TileEntity getTileEntityAtSideAndDistance(ForgeDirection side, int aDistance) {
-        if (aDistance == 1) return getTileEntityAtSide(side);
-        return getTileEntity(getOffsetX(side, aDistance), getOffsetY(side, aDistance), getOffsetZ(side, aDistance));
+    public final TileEntity getTileEntityAtSideAndDistance(ForgeDirection side, int distance) {
+        if (distance == 1) return getTileEntityAtSide(side);
+        return getTileEntity(getOffsetX(side, distance), getOffsetY(side, distance), getOffsetZ(side, distance));
     }
 
     @Override
-    public final IInventory getIInventory(int aX, int aY, int aZ) {
-        final TileEntity tTileEntity = getTileEntity(aX, aY, aZ);
+    public final IInventory getIInventory(int x, int y, int z) {
+        final TileEntity tTileEntity = getTileEntity(x, y, z);
         if (tTileEntity instanceof IInventory) return (IInventory) tTileEntity;
         return null;
     }
 
     @Override
-    public final IInventory getIInventoryOffset(int aX, int aY, int aZ) {
-        final TileEntity tTileEntity = getTileEntityOffset(aX, aY, aZ);
+    public final IInventory getIInventoryOffset(int x, int y, int z) {
+        final TileEntity tTileEntity = getTileEntityOffset(x, y, z);
         if (tTileEntity instanceof IInventory) return (IInventory) tTileEntity;
         return null;
     }
@@ -350,22 +348,22 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final IInventory getIInventoryAtSideAndDistance(ForgeDirection side, int aDistance) {
-        final TileEntity tTileEntity = getTileEntityAtSideAndDistance(side, aDistance);
+    public final IInventory getIInventoryAtSideAndDistance(ForgeDirection side, int distance) {
+        final TileEntity tTileEntity = getTileEntityAtSideAndDistance(side, distance);
         if (tTileEntity instanceof IInventory) return (IInventory) tTileEntity;
         return null;
     }
 
     @Override
-    public final IFluidHandler getITankContainer(int aX, int aY, int aZ) {
-        final TileEntity tTileEntity = getTileEntity(aX, aY, aZ);
+    public final IFluidHandler getITankContainer(int x, int y, int z) {
+        final TileEntity tTileEntity = getTileEntity(x, y, z);
         if (tTileEntity instanceof IFluidHandler) return (IFluidHandler) tTileEntity;
         return null;
     }
 
     @Override
-    public final IFluidHandler getITankContainerOffset(int aX, int aY, int aZ) {
-        final TileEntity tTileEntity = getTileEntityOffset(aX, aY, aZ);
+    public final IFluidHandler getITankContainerOffset(int x, int y, int z) {
+        final TileEntity tTileEntity = getTileEntityOffset(x, y, z);
         if (tTileEntity instanceof IFluidHandler) return (IFluidHandler) tTileEntity;
         return null;
     }
@@ -378,22 +376,22 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final IFluidHandler getITankContainerAtSideAndDistance(ForgeDirection side, int aDistance) {
-        final TileEntity tTileEntity = getTileEntityAtSideAndDistance(side, aDistance);
+    public final IFluidHandler getITankContainerAtSideAndDistance(ForgeDirection side, int distance) {
+        final TileEntity tTileEntity = getTileEntityAtSideAndDistance(side, distance);
         if (tTileEntity instanceof IFluidHandler) return (IFluidHandler) tTileEntity;
         return null;
     }
 
     @Override
-    public final IGregTechTileEntity getIGregTechTileEntity(int aX, int aY, int aZ) {
-        final TileEntity tTileEntity = getTileEntity(aX, aY, aZ);
+    public final IGregTechTileEntity getIGregTechTileEntity(int x, int y, int z) {
+        final TileEntity tTileEntity = getTileEntity(x, y, z);
         if (tTileEntity instanceof IGregTechTileEntity) return (IGregTechTileEntity) tTileEntity;
         return null;
     }
 
     @Override
-    public final IGregTechTileEntity getIGregTechTileEntityOffset(int aX, int aY, int aZ) {
-        final TileEntity tTileEntity = getTileEntityOffset(aX, aY, aZ);
+    public final IGregTechTileEntity getIGregTechTileEntityOffset(int x, int y, int z) {
+        final TileEntity tTileEntity = getTileEntityOffset(x, y, z);
         if (tTileEntity instanceof IGregTechTileEntity) return (IGregTechTileEntity) tTileEntity;
         return null;
     }
@@ -406,16 +404,16 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(ForgeDirection side, int aDistance) {
-        final TileEntity tTileEntity = getTileEntityAtSideAndDistance(side, aDistance);
+    public final IGregTechTileEntity getIGregTechTileEntityAtSideAndDistance(ForgeDirection side, int distance) {
+        final TileEntity tTileEntity = getTileEntityAtSideAndDistance(side, distance);
         if (tTileEntity instanceof IGregTechTileEntity) return (IGregTechTileEntity) tTileEntity;
         return null;
     }
 
     @Override
-    public final Block getBlock(int aX, int aY, int aZ) {
-        if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return Blocks.air;
-        return worldObj.getBlock(aX, aY, aZ);
+    public final Block getBlock(int x, int y, int z) {
+        if (ignoreUnloadedChunks && crossedChunkBorder(x, z) && !worldObj.blockExists(x, y, z)) return Blocks.air;
+        return worldObj.getBlock(x, y, z);
     }
 
     public Block getBlock(ChunkCoordinates aCoords) {
@@ -426,39 +424,39 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public final byte getMetaID(int aX, int aY, int aZ) {
-        if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return 0;
-        return (byte) worldObj.getBlockMetadata(aX, aY, aZ);
+    public final byte getMetaID(int x, int y, int z) {
+        if (ignoreUnloadedChunks && crossedChunkBorder(x, z) && !worldObj.blockExists(x, y, z)) return 0;
+        return (byte) worldObj.getBlockMetadata(x, y, z);
     }
 
     @Override
-    public final byte getLightLevel(int aX, int aY, int aZ) {
-        if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return 0;
-        return (byte) (worldObj.getLightBrightness(aX, aY, aZ) * 15);
+    public final byte getLightLevel(int x, int y, int z) {
+        if (ignoreUnloadedChunks && crossedChunkBorder(x, z) && !worldObj.blockExists(x, y, z)) return 0;
+        return (byte) (worldObj.getLightBrightness(x, y, z) * 15);
     }
 
     @Override
-    public final boolean getSky(int aX, int aY, int aZ) {
-        if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return true;
-        return worldObj.canBlockSeeTheSky(aX, aY, aZ);
+    public final boolean getSky(int x, int y, int z) {
+        if (ignoreUnloadedChunks && crossedChunkBorder(x, z) && !worldObj.blockExists(x, y, z)) return true;
+        return worldObj.canBlockSeeTheSky(x, y, z);
     }
 
     @Override
-    public final boolean getOpacity(int aX, int aY, int aZ) {
-        if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return false;
-        return GT_Utility.isOpaqueBlock(worldObj, aX, aY, aZ);
+    public final boolean getOpacity(int x, int y, int z) {
+        if (ignoreUnloadedChunks && crossedChunkBorder(x, z) && !worldObj.blockExists(x, y, z)) return false;
+        return GT_Utility.isOpaqueBlock(worldObj, x, y, z);
     }
 
     @Override
-    public final boolean getAir(int aX, int aY, int aZ) {
-        if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return true;
-        return GT_Utility.isBlockAir(worldObj, aX, aY, aZ);
+    public final boolean getAir(int x, int y, int z) {
+        if (ignoreUnloadedChunks && crossedChunkBorder(x, z) && !worldObj.blockExists(x, y, z)) return true;
+        return GT_Utility.isBlockAir(worldObj, x, y, z);
     }
 
     @Override
-    public TileEntity getTileEntity(int aX, int aY, int aZ) {
-        if (ignoreUnloadedChunks && crossedChunkBorder(aX, aZ) && !worldObj.blockExists(aX, aY, aZ)) return null;
-        return worldObj.getTileEntity(aX, aY, aZ);
+    public TileEntity getTileEntity(int x, int y, int z) {
+        if (ignoreUnloadedChunks && crossedChunkBorder(x, z) && !worldObj.blockExists(x, y, z)) return null;
+        return worldObj.getTileEntity(x, y, z);
     }
 
     @Override
@@ -492,8 +490,8 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
     }
 
     @Override
-    public void writeToNBT(NBTTagCompound aNBT) {
-        super.writeToNBT(aNBT);
+    public void writeToNBT(NBTTagCompound nbt) {
+        super.writeToNBT(nbt);
     }
 
     @Override
@@ -567,12 +565,12 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje
             zCoord);
     }
 
-    protected boolean crossedChunkBorder(int aX, int aZ) {
-        return aX >> 4 != xCoord >> 4 || aZ >> 4 != zCoord >> 4;
+    protected boolean crossedChunkBorder(int x, int z) {
+        return x >> 4 != xCoord >> 4 || z >> 4 != zCoord >> 4;
     }
 
-    public final boolean crossedChunkBorder(ChunkCoordinates aCoords) {
-        return aCoords.posX >> 4 != xCoord >> 4 || aCoords.posZ >> 4 != zCoord >> 4;
+    public final boolean crossedChunkBorder(ChunkCoordinates coords) {
+        return coords.posX >> 4 != xCoord >> 4 || coords.posZ >> 4 != zCoord >> 4;
     }
 
     public final void setOnFire() {
diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
index 6ee760553e..800e9af20a 100644
--- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
+++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
@@ -8,9 +8,7 @@ import static gregtech.api.util.GT_Util.getTileEntity;
 import static gregtech.api.util.GT_Util.setTileEntity;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -54,15 +52,6 @@ import gregtech.api.interfaces.tileentity.IDebugableTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import gregtech.api.metatileentity.CoverableTileEntity;
 import gregtech.api.multitileentity.interfaces.IMultiTileEntity;
-import gregtech.api.multitileentity.interfaces.IMultiTileEntity.IMTE_BreakBlock;
-import gregtech.api.multitileentity.interfaces.IMultiTileEntity.IMTE_GetBlockHardness;
-import gregtech.api.multitileentity.interfaces.IMultiTileEntity.IMTE_GetComparatorInputOverride;
-import gregtech.api.multitileentity.interfaces.IMultiTileEntity.IMTE_GetWeakChanges;
-import gregtech.api.multitileentity.interfaces.IMultiTileEntity.IMTE_HasMultiBlockMachineRelevantData;
-import gregtech.api.multitileentity.interfaces.IMultiTileEntity.IMTE_IsProvidingStrongPower;
-import gregtech.api.multitileentity.interfaces.IMultiTileEntity.IMTE_IsProvidingWeakPower;
-import gregtech.api.multitileentity.interfaces.IMultiTileEntity.IMTE_OnNeighborBlockChange;
-import gregtech.api.multitileentity.interfaces.IMultiTileEntity.IMTE_ShouldCheckWeakPower;
 import gregtech.api.objects.XSTR;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Util;
@@ -75,142 +64,95 @@ import gregtech.common.render.GT_MultiTile_Renderer;
 @Optional.Interface(iface = "com.cricketcraft.chisel.api.IFacade", modid = "ChiselAPI")
 public class MultiTileEntityBlock extends Block implements IDebugableBlock, ITileEntityProvider, IFacade {
 
-    protected static final Map<String, MultiTileEntityBlock> MULTI_BLOCK_MAP = new HashMap<>();
     private static boolean LOCK = false;
 
-    protected final String mNameInternal, mTool;
-    protected final int mHarvestLevelOffset, mHarvestLevelMinimum, mHarvestLevelMaximum;
-    protected final boolean mOpaque, mNormalCube;
-
-    public static String getName(String aMaterialName, SoundType aSoundType, String aTool, int aHarvestLevelOffset,
-        int aHarvestLevelMinimum, int aHarvestLevelMaximum, boolean aOpaque, boolean aNormalCube) {
-        return "gt.block.multiblock." + aMaterialName
-            + "."
-            + aSoundType.soundName
-            + "."
-            + aTool
-            + "."
-            + aHarvestLevelOffset
-            + "."
-            + aHarvestLevelMinimum
-            + "."
-            + aHarvestLevelMaximum
-            + "."
-            + aOpaque
-            + "."
-            + aNormalCube;
-    }
-
-    /**
-     * @param aMaterialName        the Name of the vanilla Material Field. In case this is not a vanilla Material,
-     *                             insert the Name you want to give your own Material instead.
-     * @param aMaterial            the Material used to determine the Block.
-     * @param aSoundType           the Sound Type of the Block.
-     * @param aTool                the Tool used to harvest this Block.
-     * @param aHarvestLevelOffset  obvious
-     * @param aHarvestLevelMinimum obvious
-     * @param aHarvestLevelMaximum obvious
-     * @param aOpaque              if this Block is Opaque.
-     * @param aNormalCube          if this Block is a normal Cube (for Redstone Stuff).
-     */
-    public static MultiTileEntityBlock getOrCreate(String aModID, String aMaterialName, Material aMaterial,
-        SoundType aSoundType, String aTool, int aHarvestLevelOffset, int aHarvestLevelMinimum, int aHarvestLevelMaximum,
-        boolean aOpaque, boolean aNormalCube) {
-        final MultiTileEntityBlock rBlock = MULTI_BLOCK_MAP.get(
-            aModID + ":"
-                + getName(
-                    aMaterialName,
-                    aSoundType,
-                    aTool = aTool.toLowerCase(),
-                    aHarvestLevelOffset,
-                    aHarvestLevelMinimum,
-                    aHarvestLevelMaximum,
-                    aOpaque,
-                    aNormalCube));
-        return rBlock == null
-            ? new MultiTileEntityBlock(
-                aModID,
-                aMaterialName,
-                aMaterial,
-                aSoundType,
-                aTool,
-                aHarvestLevelOffset,
-                aHarvestLevelMinimum,
-                aHarvestLevelMaximum,
-                aOpaque,
-                aNormalCube)
-            : rBlock;
-    }
-
-    protected MultiTileEntityBlock(String aModID, String aMaterialName, Material aMaterial, SoundType aSoundType,
-        String aTool, int aHarvestLevelOffset, int aHarvestLevelMinimum, int aHarvestLevelMaximum, boolean aOpaque,
-        boolean aNormalCube) {
-        super(aMaterial);
+    private boolean registered = false, normalCube;
+    protected String internalName, toolName, materialName, modID;</