Par, var, begone! (#1104)

* Renamed parameters of ItemBlock subclasses

* Renamed damageDropped and getDamageValue method parameters of Block subclasses

* Removed trivially superfluous overrides of Block::quantityDropped, Block::isOpaqueCube and Block::renderAsNormalBlock

* Removed trivially superfluous overrides of Block::getItemDropped

* Cleaned up a few more block subclass method parameters

* Cleaned up obsolete Javadoc

* par1 -> block in ItemBlock Constructors

* Renamed arguments to drawGuiContainerForegroundLayer

* Cleaned up redundant casts

* Renamed arguments to drawGuiContainerBackgroundLayer

* Renamed arguments to Slot subclass constructors

* Renamed arguments to World subclass GT_DummyWorld

* Renamed parameters of updateProgressBar

* Renamed the rest of the par* parameters outside of GT_MinableOreGenerator which should be deleted

* Renamed most var1-var10 and a few more in generally non-dead code

* Renamed last varSomething variables

* Removed 3 fully dead classes used nowhere in the codebase, with obsolete unused code

52 files changed, 266 insertions, 438 deletions

diff --git a/src/main/java/gregtech/common/GT_DummyWorld.java b/src/main/java/gregtech/common/GT_DummyWorld.java
index baab96510a..756e35863f 100644
--- a/src/main/java/gregtech/common/GT_DummyWorld.java
+++ b/src/main/java/gregtech/common/GT_DummyWorld.java
@@ -22,19 +22,19 @@ public class GT_DummyWorld extends World {
     public GT_IteratorRandom mRandom = new GT_IteratorRandom();
     public ItemStack mLastSetBlock = null;
 
-    public GT_DummyWorld(ISaveHandler par1iSaveHandler, String par2Str, WorldProvider par3WorldProvider, WorldSettings par4WorldSettings, Profiler par5Profiler) {
-        super(par1iSaveHandler, par2Str, par4WorldSettings, par3WorldProvider, par5Profiler);
+    public GT_DummyWorld(ISaveHandler saveHandler, String name, WorldProvider worldProvider, WorldSettings worldSettings, Profiler profiler) {
+        super(saveHandler, name, worldSettings, worldProvider, profiler);
         this.rand = this.mRandom;
     }
 
     public GT_DummyWorld() {
         this(new ISaveHandler() {
                  @Override
-                 public void saveWorldInfoWithPlayer(WorldInfo var1, NBTTagCompound var2) {
+                 public void saveWorldInfoWithPlayer(WorldInfo worldInfo, NBTTagCompound nbtTagCompound) {
                  }
 
                  @Override
-                 public void saveWorldInfo(WorldInfo var1) {
+                 public void saveWorldInfo(WorldInfo worldInfo) {
                  }
 
                  @Override
@@ -48,12 +48,12 @@ public class GT_DummyWorld extends World {
                  }
 
                  @Override
-                 public File getMapFileFromName(String var1) {
+                 public File getMapFileFromName(String mapName) {
                      return null;
                  }
 
                  @Override
-                 public IChunkLoader getChunkLoader(WorldProvider var1) {
+                 public IChunkLoader getChunkLoader(WorldProvider worldProvider) {
                      return null;
                  }
 
diff --git a/src/main/java/gregtech/common/GT_MinableOreGenerator.java b/src/main/java/gregtech/common/GT_MinableOreGenerator.java
deleted file mode 100644
index 2a1191b07e..0000000000
--- a/src/main/java/gregtech/common/GT_MinableOreGenerator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package gregtech.common;
-
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenerator;
-
-import java.util.Random;
-
-public class GT_MinableOreGenerator extends WorldGenerator {
-    private Block minableBlockId;
-    private Block mBlock;
-    private int minableBlockMeta = 0;
-    private int numberOfBlocks;
-    private boolean allowVoid = false;
-
-    public GT_MinableOreGenerator(Block par1, int par2) {
-        this.minableBlockId = par1;
-        this.numberOfBlocks = par2;
-    }
-
-    public GT_MinableOreGenerator(Block id, int meta, int number, boolean aAllowVoid, Block aBlock) {
-        this(id, number);
-        this.minableBlockMeta = meta;
-        this.allowVoid = aAllowVoid;
-        this.mBlock = aBlock;
-    }
-
-    @Override
-    public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) {
-        float math_pi = 3.141593F;//FB: CNT - CNT_ROUGH_CONSTANT_VALUE
-        float var6 = par2Random.nextFloat() * math_pi;
-        float var1s = this.numberOfBlocks / 8.0F;
-        int var4s = par4 - 2;int var5s = par3 + 8;int var6s = par5 + 8;
-        float var7s = this.numberOfBlocks / 16.0F;
-        float var8s = math_pi / this.numberOfBlocks;
-        float mh_s_0 = MathHelper.sin(var6) * var1s;float mh_c_0 = MathHelper.cos(var6) * var1s;
-        float var7 = var5s + mh_s_0;
-        float var11 = var6s + mh_c_0;
-        int var15r = par2Random.nextInt(3);int var17r = par2Random.nextInt(3);
-        int mh_n_4=var17r - var15r;
-        int var15 = var4s + var15r;
-        float mh_n_0 = -2*mh_s_0;float mh_n_1 = -2*mh_c_0;
-        for (int var19 = 0; var19 <= this.numberOfBlocks; var19++) {
-            float mh_n_2 = var19 / this.numberOfBlocks;
-            float var20 = var7 + mh_n_0 * mh_n_2;
-            float var22 = var15 + mh_n_4 * mh_n_2;
-            float var24 = var11 + mh_n_1 * mh_n_2;
-            float var26 = par2Random.nextFloat() * var7s;
-            float var1c = var19 * var8s;
-            float var28 = ((MathHelper.sin(var1c) + 1.0F) * var26 + 1.0F) / 2.0F;
-            int var32 = MathHelper.floor_float(var20 - var28);
-            int var33 = MathHelper.floor_float(var22 - var28);
-            int var34 = MathHelper.floor_float(var24 - var28);
-            int var35 = MathHelper.floor_float(var20 + var28);
-            int var36 = MathHelper.floor_float(var22 + var28);
-            int var37 = MathHelper.floor_float(var24 + var28);
-            for (int var38 = var32; var38 <= var35; var38++) {
-                float var39 = (var38 + 0.5F - var20) / (var28);
-                float var5c = var39 * var39;
-                if (var5c < 1.0F) {
-                    for (int var41 = var33; var41 <= var36; var41++) {
-                        float var42 = (var41 + 0.5F - var22) / (var28);
-                        float var7c = var5c + var42 * var42;
-                        if (var7c < 1.0F) {
-                            for (int var44 = var34; var44 <= var37; var44++) {
-                                float var45 = (var44 + 0.5F - var24) / (var28);
-                                Block block = par1World.getBlock(var38, var41, var44);
-                                if ((var7c + var45 * var45 < 1.0F) && (((this.allowVoid) && (par1World.getBlock(var38, var41, var44) == Blocks.air)) || ((block != null) && (block.isReplaceableOreGen(par1World, var38, var41, var44, this.mBlock))))) {
-                                    par1World.setBlock(var38, var41, var44, this.minableBlockId, this.minableBlockMeta, 0);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java
index 0911f257b4..aa6dfa2a41 100644
--- a/src/main/java/gregtech/common/GT_Worldgenerator.java
+++ b/src/main/java/gregtech/common/GT_Worldgenerator.java
@@ -61,9 +61,9 @@ public class GT_Worldgenerator implements IWorldGenerator {
             mList.add(new WorldGenContainer(new XSTR(Math.abs(aRandom.nextInt()) +1), aX, aZ, aWorld.provider.dimensionId, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName));
             if (debugWorldGen) GT_Log.out.println(
                 "ADD WorldSeed:"+aWorld.getSeed() +
-                " DimId" + aWorld.provider.dimensionId + 
-                " chunk x:" + aX + 
-                " z:" + aZ + 
+                " DimId" + aWorld.provider.dimensionId +
+                " chunk x:" + aX +
+                " z:" + aZ +
                 " SIZE: " + mList.size()
             );
         }
@@ -76,11 +76,11 @@ public class GT_Worldgenerator implements IWorldGenerator {
                 WorldGenContainer toRun = (WorldGenContainer) mList.get(0);
                 if (debugWorldGen) GT_Log.out.println(
                     "RUN WorldSeed:"+aWorld.getSeed()+
-                    " DimId" + aWorld.provider.dimensionId + 
-                    " chunk x:" + toRun.mX + 
-                    " z:" + toRun.mZ + 
-                    " SIZE: " + mList.size() + 
-                    " i: " + i 
+                    " DimId" + aWorld.provider.dimensionId +
+                    " chunk x:" + toRun.mX +
+                    " z:" + toRun.mZ +
+                    " SIZE: " + mList.size() +
+                    " i: " + i
                 );
                 synchronized (listLock)
                 {
@@ -379,7 +379,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
             for( ; seedList.size() != 0; seedList.remove(0) ) {
                 if (debugWorldGen) GT_Log.out.println(
                     "Processing seed x="+seedList.get(0).mX+
-                    " z="+seedList.get(0).mZ 
+                    " z="+seedList.get(0).mZ
                 );
                 worldGenFindVein( seedList.get(0).mX, seedList.get(0).mZ );
             }
@@ -431,35 +431,35 @@ public class GT_Worldgenerator implements IWorldGenerator {
                     //    mSize = aRandom.nextInt((int) (gcMaxSize - gcMinSize));
                 }
                 if ((mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) {
-                    float var6 = aRandom.nextFloat() * 3.141593F;
-                    double var7 = tX + 8 + MathHelper.sin(var6) * mSize / 8.0F;
-                    double var9 = tX + 8 - MathHelper.sin(var6) * mSize / 8.0F;
-                    double var11 = tZ + 8 + MathHelper.cos(var6) * mSize / 8.0F;
-                    double var13 = tZ + 8 - MathHelper.cos(var6) * mSize / 8.0F;
-                    double var15 = tY + aRandom.nextInt(3) - 2;
-                    double var17 = tY + aRandom.nextInt(3) - 2;
-                    for (int var19 = 0; var19 <= mSize; var19++) {
-                        double var20 = var7 + (var9 - var7) * var19 / mSize;
-                        double var22 = var15 + (var17 - var15) * var19 / mSize;
-                        double var24 = var11 + (var13 - var11) * var19 / mSize;
-                        double var26 = aRandom.nextDouble() * mSize / 16.0D;
-                        double var28 = (MathHelper.sin(var19 * 3.141593F / mSize) + 1.0F) * var26 + 1.0D;
-                        double var30 = (MathHelper.sin(var19 * 3.141593F / mSize) + 1.0F) * var26 + 1.0D;
-                        int tMinX = MathHelper.floor_double(var20 - var28 / 2.0D);
-                        int tMinY = MathHelper.floor_double(var22 - var30 / 2.0D);
-                        int tMinZ = MathHelper.floor_double(var24 - var28 / 2.0D);
-                        int tMaxX = MathHelper.floor_double(var20 + var28 / 2.0D);
-                        int tMaxY = MathHelper.floor_double(var22 + var30 / 2.0D);
-                        int tMaxZ = MathHelper.floor_double(var24 + var28 / 2.0D);
+                    float randomRadian = aRandom.nextFloat() * 3.141593F;
+                    double xBase = tX + 8 + MathHelper.sin(randomRadian) * mSize / 8.0F;
+                    double xFactor = tX + 8 - MathHelper.sin(randomRadian) * mSize / 8.0F;
+                    double zBase = tZ + 8 + MathHelper.cos(randomRadian) * mSize / 8.0F;
+                    double zFactor = tZ + 8 - MathHelper.cos(randomRadian) * mSize / 8.0F;
+                    double yBase = tY + aRandom.nextInt(3) - 2;
+                    double yFactor = tY + aRandom.nextInt(3) - 2;
+                    for (int i = 0; i <= mSize; i++) {
+                        double xCenter = xBase + (xFactor - xBase) * i / mSize;
+                        double yCenter = yBase + (yFactor - yBase) * i / mSize;
+                        double zCenter = zBase + (zFactor - zBase) * i / mSize;
+                        double randomDistance = aRandom.nextDouble() * mSize / 16.0D;
+                        double halfLength = (MathHelper.sin(i * 3.141593F / mSize) + 1.0F) * randomDistance + 1.0D;
+                        double halfHeight = (MathHelper.sin(i * 3.141593F / mSize) + 1.0F) * randomDistance + 1.0D;
+                        int tMinX = MathHelper.floor_double(xCenter - halfLength / 2.0D);
+                        int tMinY = MathHelper.floor_double(yCenter - halfHeight / 2.0D);
+                        int tMinZ = MathHelper.floor_double(zCenter - halfLength / 2.0D);
+                        int tMaxX = MathHelper.floor_double(xCenter + halfLength / 2.0D);
+                        int tMaxY = MathHelper.floor_double(yCenter + halfHeight / 2.0D);
+                        int tMaxZ = MathHelper.floor_double(zCenter + halfLength / 2.0D);
                         for (int eX = tMinX; eX <= tMaxX; eX++) {
-                            double var39 = (eX + 0.5D - var20) / (var28 / 2.0D);
-                            if (var39 * var39 < 1.0D) {
+                            double xChance = (eX + 0.5D - xCenter) / (halfLength / 2.0D);
+                            if (xChance * xChance < 1.0D) {
                                 for (int eY = tMinY; eY <= tMaxY; eY++) {
-                                    double var42 = (eY + 0.5D - var22) / (var30 / 2.0D);
-                                    if (var39 * var39 + var42 * var42 < 1.0D) {
+                                    double yChance = (eY + 0.5D - yCenter) / (halfHeight / 2.0D);
+                                    if (xChance * xChance + yChance * yChance < 1.0D) {
                                         for (int eZ = tMinZ; eZ <= tMaxZ; eZ++) {
-                                            double var45 = (eZ + 0.5D - var24) / (var28 / 2.0D);
-                                            if ((var39 * var39 + var42 * var42 + var45 * var45 < 1.0D) && (mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) {
+                                            double zChance = (eZ + 0.5D - zCenter) / (halfLength / 2.0D);
+                                            if ((xChance * xChance + yChance * yChance + zChance * zChance < 1.0D) && (mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) {
                                                 int ranOre = aRandom.nextInt(50);
                                                 if (ranOre < 3) {
                                                     GT_TileEntity_Ores.setOreBlock(mWorld, eX, eY, eZ, primaryMeta, false);
@@ -494,7 +494,7 @@ public class GT_Worldgenerator implements IWorldGenerator {
                 GT_Log.out.println(
                     " Oregen took " + (oregenTime-leftOverTime)+
                     " Leftover gen took " + (leftOverTime - startTime) +
-                    " Worldgen took " + duration + 
+                    " Worldgen took " + duration +
                     " nanoseconds"
                     );
             }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
index 49f15e328c..072259f2ee 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java
@@ -20,7 +20,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import java.util.List;
-import java.util.Random;
 
 public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block {
     public GT_Block_Casings_Abstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
@@ -84,16 +83,6 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block {
     }
 
     @Override
-    public boolean renderAsNormalBlock() {
-        return true;
-    }
-
-    @Override
-    public boolean isOpaqueCube() {
-        return true;
-    }
-
-    @Override
     public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
         if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
             GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
@@ -106,23 +95,13 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block {
     }
 
     @Override
-    public int damageDropped(int par1) {
-        return par1;
-    }
-
-    @Override
-    public int getDamageValue(World par1World, int par2, int par3, int par4) {
-        return par1World.getBlockMetadata(par2, par3, par4);
-    }
-
-    @Override
-    public int quantityDropped(Random par1Random) {
-        return 1;
+    public int damageDropped(int metadata) {
+        return metadata;
     }
 
     @Override
-    public Item getItemDropped(int par1, Random par2Random, int par3) {
-        return Item.getItemFromBlock(this);
+    public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
+        return aWorld.getBlockMetadata(aX, aY, aZ);
     }
 
     @Override
@@ -132,7 +111,7 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block {
 
     @Override
     @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
+    public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) {
         for (int i = 0; i < 16; i++) {
             ItemStack aStack = new ItemStack(aItem, 1, i);
             if (!aStack.getDisplayName().contains(".name")) aList.add(aStack);
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
index 851b84b5c3..24b8635c86 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -156,7 +156,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     }
 
     @Override
-    public boolean canConnectRedstone(IBlockAccess var1, int var2, int var3, int var4, int var5) {
+    public boolean canConnectRedstone(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) {
         return true;
     }
 
@@ -339,7 +339,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     }
 
     @Override
-    public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) {
+    public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float aOffsetX, float aOffsetY, float aOffsetZ) {
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity == null) {
             return false;
@@ -361,7 +361,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
             if ((!aWorld.isRemote) && !((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer)) {
                 return true;
             }
-            return ((IGregTechTileEntity) tTileEntity).onRightclick(aPlayer, (byte) aSide, par1, par2, par3);
+            return ((IGregTechTileEntity) tTileEntity).onRightclick(aPlayer, (byte) aSide, aOffsetX, aOffsetY, aOffsetZ);
         }
         return false;
     }
@@ -394,7 +394,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     }
 
     @Override
-    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) {
+    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) {
         GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity instanceof IGregTechTileEntity) {
@@ -423,7 +423,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
                 }
             }
         }
-        super.breakBlock(aWorld, aX, aY, aZ, par5, par6);
+        super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata);
         aWorld.removeTileEntity(aX, aY, aZ);
     }
 
@@ -490,7 +490,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     }
 
     @Override
-    public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int par5, float chance, int par7) {
+    public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int aMetadata, float chance, int aFortune) {
         if (!aWorld.isRemote) {
             final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
             if (tTileEntity != null && (chance < 1.0F)) {
@@ -500,7 +500,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
                     ((BaseMetaTileEntity) tTileEntity).doEnergyExplosion();
                 }
             } else {
-                super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, par5, chance, par7);
+                super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, aMetadata, chance, aFortune);
             }
         }
     }
@@ -568,7 +568,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
 
     @Override
     public float getExplosionResistance(
-            Entity par1Entity, World aWorld, int aX, int aY, int aZ,
+            Entity entity, World aWorld, int aX, int aY, int aZ,
             double explosionX, double explosionY, double explosionZ) {
         final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
         if (tTileEntity instanceof IGregTechTileEntity) {
@@ -580,10 +580,10 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo
     @SideOnly(Side.CLIENT)
     @Override
     @SuppressWarnings("unchecked") // Old API uses raw List type
-    public void getSubBlocks(Item par1Item, CreativeTabs par2CreativeTabs, List par3List) {
+    public void getSubBlocks(Item item, CreativeTabs aCreativeTab, List outputSubBlocks) {
         for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) {
             if (GregTech_API.METATILEENTITIES[i] != null) {
-