Revert "$ Cleaned up the entire project."

This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747.

# Conflicts:
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java
#	src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java

Revert "% Cleaned up Imports."

This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966.

14 files changed, 1801 insertions, 2120 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index 71026d46c5..c7d6dcbbba 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.xmod.gregtech.common.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
 import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.util.GT_LanguageManager;
@@ -11,38 +9,37 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
-public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
-
-	public final static int	GTID			= 57;
+public class GregtechMetaCasingBlocks
+extends GregtechMetaCasingBlocksAbstract {
 
-	CasingTextureHandler	TextureHandler	= new CasingTextureHandler();
+	public final static int GTID = 57;
+	
+	CasingTextureHandler TextureHandler = new CasingTextureHandler();	
 
 	public GregtechMetaCasingBlocks() {
 		super(GregtechMetaCasingItems.class, "miscutils.blockcasings", GT_Material_Casings.INSTANCE);
 		for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-			Textures.BlockIcons.CASING_BLOCKS[GregtechMetaCasingBlocks.GTID + i] = new GT_CopiedBlockTexture(this, 6,
-					i);
+			Textures.BlockIcons.CASING_BLOCKS[GTID + i] = new GT_CopiedBlockTexture(this, 6, i);
 		}
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Centrifuge Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name",
-				"Heat Resistant Coke Oven Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); // 60
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name",
-				"Material Press Machine Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Electrolyzer Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Wire Factory Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Maceration Stack Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Matter Generation Coil"); // 65
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Matter Fabricator Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Iron Plated Bricks");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Multitank Exterior Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Hastelloy-N Reactor Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Zeron-100 Reactor Shielding");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name",
-				"Blast Smelter Heat Containment Coil ");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Blast Smelter Casing Block");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Centrifuge Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Heat Resistant Coke Oven Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); //60
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Material Press Machine Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Electrolyzer Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Wire Factory Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Maceration Stack Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Matter Generation Coil"); //65
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Matter Fabricator Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Iron Plated Bricks");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Multitank Exterior Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hastelloy-N Reactor Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Zeron-100 Reactor Shielding");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Blast Smelter Heat Containment Coil ");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Blast Smelter Casing Block");
 		GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0));
 		GregtechItemList.Casing_CokeOven.set(new ItemStack(this, 1, 1));
 		GregtechItemList.Casing_CokeOven_Coil1.set(new ItemStack(this, 1, 2));
@@ -58,22 +55,22 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
 		GregtechItemList.Casing_Reactor_I.set(new ItemStack(this, 1, 12));
 		GregtechItemList.Casing_Reactor_II.set(new ItemStack(this, 1, 13));
 		GregtechItemList.Casing_Coil_BlastSmelter.set(new ItemStack(this, 1, 14));
-		GregtechItemList.Casing_BlastSmelter.set(new ItemStack(this, 1, 15));
+		GregtechItemList.Casing_BlastSmelter.set(new ItemStack(this, 1, 15));		
 	}
 
 	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
-			final int aSide) {
-		final GregtechMetaCasingBlocks i = this;
-		return CasingTextureHandler.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, i);
+	public IIcon getIcon(int aSide, int aMeta) { //Texture ID's. case 0 == ID[57]
+		return TextureHandler.getIcon(aSide, aMeta);
 	}
 
+	
+
 	@Override
-	public IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's.
-																// case 0 ==
-																// ID[57]
-		return CasingTextureHandler.getIcon(aSide, aMeta);
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) {
+		GregtechMetaCasingBlocks i = this;
+		return TextureHandler.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, i);
 	}
 
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
index 5527a0315f..3adc9c9022 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
@@ -5,38 +5,42 @@ import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler2;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
-public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract {
+public class GregtechMetaCasingBlocks2
+extends GregtechMetaCasingBlocksAbstract {
 
-	public final static int	GTID			= 73;
-
-	CasingTextureHandler2	TextureHandler	= new CasingTextureHandler2();
+	public final static int GTID = 73;
+	
+	CasingTextureHandler2 TextureHandler = new CasingTextureHandler2();	
 
 	public GregtechMetaCasingBlocks2() {
 		super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.2", GT_Material_Casings.INSTANCE);
 		for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-			Textures.BlockIcons.CASING_BLOCKS[GregtechMetaCasingBlocks2.GTID + i] = new GT_CopiedBlockTexture(this, 6,
-					i);
+			Textures.BlockIcons.CASING_BLOCKS[GTID + i] = new GT_CopiedBlockTexture(this, 6, i);
 		}
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Strctural Glass Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Placeholder Casing"); // 60
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Incoloy Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Incoloy Casing"); // 65
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Placeholder Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".14.name", "Placeholder Casing ");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", "Placeholder Casing ");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Strctural Glass Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Placeholder Casing"); //60
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Incoloy Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Incoloy Casing"); //65
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Placeholder Casing ");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Placeholder Casing ");
 		GregtechItemList.Casing_StructuralGlass.set(new ItemStack(this, 1, 0));
 		GregtechItemList.Casing_PlaceHolder1.set(new ItemStack(this, 1, 1));
 		GregtechItemList.Casing_PlaceHolder2.set(new ItemStack(this, 1, 2));
@@ -52,13 +56,11 @@ public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract
 		GregtechItemList.Casing_PlaceHolder12.set(new ItemStack(this, 1, 12));
 		GregtechItemList.Casing_PlaceHolder13.set(new ItemStack(this, 1, 13));
 		GregtechItemList.Casing_PlaceHolder14.set(new ItemStack(this, 1, 14));
-		GregtechItemList.Casing_PlaceHolder15.set(new ItemStack(this, 1, 15));
+		GregtechItemList.Casing_PlaceHolder15.set(new ItemStack(this, 1, 15));		
 	}
 
 	@Override
-	public IIcon getIcon(final int aSide, final int aMeta) { // Texture ID's.
-																// case 0 ==
-																// ID[57]
-		return CasingTextureHandler2.getIcon(aSide, aMeta);
+	public IIcon getIcon(int aSide, int aMeta) { //Texture ID's. case 0 == ID[57]
+		return TextureHandler.getIcon(aSide, aMeta);
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
index 09fa9d2f5f..14ce2afc93 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksAbstract.java
@@ -1,14 +1,13 @@
 package gtPlusPlus.xmod.gregtech.common.blocks;
 
-import java.util.List;
-import java.util.Random;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Block_Casings_Abstract;
 import gtPlusPlus.core.creative.AddToCreativeTab;
+
+import java.util.List;
+import java.util.Random;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -16,128 +15,129 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.init.Blocks;
-import net.minecraft.item.*;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
-public abstract class GregtechMetaCasingBlocksAbstract extends GT_Block_Casings_Abstract {
-	public GregtechMetaCasingBlocksAbstract(final Class<? extends ItemBlock> aItemClass, final String aName,
-			final Material aMaterial) {
-		super(aItemClass, aName, aMaterial);
-		this.setStepSound(Block.soundTypeMetal);
-		this.setCreativeTab(AddToCreativeTab.tabMachines);
-		GregTech_API.registerMachineBlock(this, -1);
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + "." + 32767 + ".name",
-				"Any Sub Block of this");
-	}
-
-	@Override
-	public void breakBlock(final World aWorld, final int aX, final int aY, final int aZ, final Block aBlock,
-			final int aMetaData) {
-		if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-			GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
-		}
-	}
-
-	@Override
-	public boolean canBeReplacedByLeaves(final IBlockAccess aWorld, final int aX, final int aY, final int aZ) {
-		return false;
-	}
-
-	@Override
-	public boolean canCreatureSpawn(final EnumCreatureType type, final IBlockAccess world, final int x, final int y,
-			final int z) {
-		return false;
-	}
-
-	@Override
+public abstract class GregtechMetaCasingBlocksAbstract
+        extends GT_Block_Casings_Abstract {
+    public GregtechMetaCasingBlocksAbstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) {
+        super(aItemClass, aName, aMaterial);
+        setStepSound(soundTypeMetal);
+        setCreativeTab(AddToCreativeTab.tabMachines);
+        GregTech_API.registerMachineBlock(this, -1);
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
+    }
+
+    @Override
+	public String getHarvestTool(int aMeta) {
+        return "wrench";
+    }
+
+    @Override
+	public int getHarvestLevel(int aMeta) {
+        return 2;
+    }
+
+    @Override
+	public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
+        return Blocks.iron_block.getBlockHardness(aWorld, aX, aY, aZ);
+    }
+
+    @Override
+	public float getExplosionResistance(Entity aTNT) {
+        return Blocks.iron_block.getExplosionResistance(aTNT);
+    }
+
+    @Override
 	protected boolean canSilkHarvest() {
-		return false;
-	}
-
-	@Override
-	public int damageDropped(final int par1) {
-		return par1;
-	}
-
-	@Override
-	public float getBlockHardness(final World aWorld, final int aX, final int aY, final int aZ) {
-		return Blocks.iron_block.getBlockHardness(aWorld, aX, aY, aZ);
-	}
-
-	@Override
-	public int getDamageValue(final World par1World, final int par2, final int par3, final int par4) {
-		return par1World.getBlockMetadata(par2, par3, par4);
-	}
-
-	@Override
-	public float getExplosionResistance(final Entity aTNT) {
-		return Blocks.iron_block.getExplosionResistance(aTNT);
-	}
-
-	@Override
-	public int getHarvestLevel(final int aMeta) {
-		return 2;
-	}
-
-	@Override
-	public String getHarvestTool(final int aMeta) {
-		return "wrench";
-	}
-
-	@Override
-	public Item getItemDropped(final int par1, final Random par2Random, final int par3) {
-		return Item.getItemFromBlock(this);
-	}
-
-	@Override
-	public String getLocalizedName() {
-		return StatCollector.translateToLocal(this.mUnlocalizedName + ".name");
-	}
+        return false;
+    }
 
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(final Item aItem, final CreativeTabs par2CreativeTabs, final List aList) {
-		for (int i = 0; i < 16; i++) {
-			aList.add(new ItemStack(aItem, 1, i));
-		}
-	}
+    @Override
+	public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
+        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+        }
+    }
 
-	@Override
+    @Override
 	public String getUnlocalizedName() {
-		return this.mUnlocalizedName;
-	}
+        return this.mUnlocalizedName;
+    }
+
+    @Override
+	public String getLocalizedName() {
+        return StatCollector.translateToLocal(this.mUnlocalizedName + ".name");
+    }
 
-	@Override
-	public boolean isNormalCube(final IBlockAccess aWorld, final int aX, final int aY, final int aZ) {
-		return true;
-	}
+    @Override
+	public boolean canBeReplacedByLeaves(IBlockAccess aWorld, int aX, int aY, int aZ) {
+        return false;
+    }
 
-	@Override
+    @Override
+	public boolean isNormalCube(IBlockAccess aWorld, int aX, int aY, int aZ) {
+        return true;
+    }
+
+    @Override
+	public boolean renderAsNormalBlock() {
+        return true;
+    }
+
+    @Override
 	public boolean isOpaqueCube() {
-		return true;
-	}
-
-	@Override
-	public void onBlockAdded(final World aWorld, final int aX, final int aY, final int aZ) {
-		if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-			GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
-		}
-	}
-
-	@Override
-	public int quantityDropped(final Random par1Random) {
-		return 1;
-	}
-
-	@Override
+        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);
+        }
+    }
+
+    @Override
+	public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
+        return false;
+    }
+
+    @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;
+    }
+
+    @Override
+	public Item getItemDropped(int par1, Random par2Random, int par3) {
+        return Item.getItemFromBlock(this);
+    }
+
+    @Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(final IIconRegister aIconRegister) {
-	}
+    public void registerBlockIcons(IIconRegister aIconRegister) {
+    }
 
-	@Override
-	public boolean renderAsNormalBlock() {
-		return true;
-	}
+    @Override
+	@SideOnly(Side.CLIENT)
+    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
+        for (int i = 0; i < 16; i++) {
+            aList.add(new ItemStack(aItem, 1, i));
+        }
+    }
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
index 5ac4086a61..957a12bc14 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingItems.java
@@ -2,8 +2,9 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import net.minecraft.block.Block;
 
-public class GregtechMetaCasingItems extends GregtechMetaItemCasingsAbstract {
-	public GregtechMetaCasingItems(final Block par1) {
-		super(par1);
-	}
+public class GregtechMetaCasingItems
+        extends GregtechMetaItemCasingsAbstract {
+    public GregtechMetaCasingItems(Block par1) {
+        super(par1);
+    }
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
index e160459c55..02ef1b9ca6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasings1.java
@@ -6,31 +6,31 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-public class GregtechMetaItemCasings1 extends GregtechMetaItemCasingsAbstract {
-	public GregtechMetaItemCasings1(final Block par1) {
+public class GregtechMetaItemCasings1
+extends GregtechMetaItemCasingsAbstract {
+	public GregtechMetaItemCasings1(Block par1) {
 		super(par1);
 	}
 
 	@Override
-	public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList,
-			final boolean aF3_H) {
+	public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
 		super.addInformation(aStack, aPlayer, aList, aF3_H);
-		switch (this.getDamage(aStack)) {
-			case 0:
-				aList.add(this.mCasing_Centrifuge);
-				break;
-			case 1:
-				aList.add(this.mCasing_CokeOven);
-				break;
-			case 2:
-				aList.add(this.mCasing_CokeCoil1);
-				break;
-			case 3:
-				aList.add(this.mCasing_CokeCoil2);
-				break;
-			default:
-				aList.add(this.mCasing_CokeCoil2);
-				break;
+		switch (getDamage(aStack)) {
+		case 0:
+			aList.add(this.mCasing_Centrifuge);
+			break;
+		case 1:
+			aList.add(this.mCasing_CokeOven);
+			break;
+		case 2:
+			aList.add(this.mCasing_CokeCoil1);
+			break;
+		case 3:
+			aList.add(this.mCasing_CokeCoil2);
+			break;
+		default:
+			aList.add(this.mCasing_CokeCoil2);
+			break;      
 		}
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
index a4c4faeb6c..ca0dee0692 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaItemCasingsAbstract.java
@@ -1,66 +1,61 @@
 package gtPlusPlus.xmod.gregtech.common.blocks;
 
+import gregtech.api.util.GT_LanguageManager;
+
 import java.util.List;
 
-import gregtech.api.util.GT_LanguageManager;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-public abstract class GregtechMetaItemCasingsAbstract extends ItemBlock {
+public abstract class GregtechMetaItemCasingsAbstract
+extends ItemBlock {
 
-	protected final String	mCasing_Centrifuge		= GT_LanguageManager.addStringLocalization("mu.centrifugecasing",
-			"Warning! Standing in the Centrifuge not recommended");
-	protected final String	mCasing_CokeOven		= GT_LanguageManager.addStringLocalization("mu.cokeoven",
-			"Sturdy and Strong");
-	protected final String	mCasing_CokeCoil1		= GT_LanguageManager.addStringLocalization("mu.coil01tooltip",
-			"Base Heating Capacity = 1350 Kelvin");
-	protected final String	mCasing_CokeCoil2		= GT_LanguageManager.addStringLocalization("mu.coil02tooltip",
-			"Base Heating Capacity = 2275 Kelvin");
-	protected final String	mNoMobsToolTip			= GT_LanguageManager
-			.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
-	protected final String	mNoTileEntityToolTip	= GT_LanguageManager
-			.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!");
+	protected final String mCasing_Centrifuge = GT_LanguageManager.addStringLocalization("mu.centrifugecasing", "Warning! Standing in the Centrifuge not recommended");
+	protected final String mCasing_CokeOven = GT_LanguageManager.addStringLocalization("mu.cokeoven", "Sturdy and Strong");
+	protected final String mCasing_CokeCoil1 = GT_LanguageManager.addStringLocalization("mu.coil01tooltip", "Base Heating Capacity = 1350 Kelvin");
+	protected final String mCasing_CokeCoil2 = GT_LanguageManager.addStringLocalization("mu.coil02tooltip", "Base Heating Capacity = 2275 Kelvin");
+	protected final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");
+	protected final String mNoTileEntityToolTip = GT_LanguageManager.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!");
 
-	public GregtechMetaItemCasingsAbstract(final Block par1) {
+	public GregtechMetaItemCasingsAbstract(Block par1) {
 		super(par1);
-		this.setMaxDamage(0);
-		this.setHasSubtypes(true);
-		// setCreativeTab(AddToCreativeTab.tabMachines);
+		setMaxDamage(0);
+		setHasSubtypes(true);
+		//setCreativeTab(AddToCreativeTab.tabMachines);
 	}
 
 	@Override
-	public void addInformation(final ItemStack aStack, final EntityPlayer aPlayer, final List aList,
-			final boolean aF3_H) {
-		super.addInformation(aStack, aPlayer, aList, aF3_H);
-		switch (this.getDamage(aStack)) {
-			case 0:
-				aList.add(this.mCasing_Centrifuge);
-				break;
-			case 1:
-				aList.add(this.mCasing_CokeOven);
-				break;
-			case 2:
-				aList.add(this.mCasing_CokeCoil1);
-				break;
-			case 3:
-				aList.add(this.mCasing_CokeCoil2);
-				break;
-			default:
-				break;
-		}
-		aList.add(this.mNoMobsToolTip);
-		aList.add(this.mNoTileEntityToolTip);
+	public int getMetadata(int aMeta) {
+		return aMeta;
 	}
 
 	@Override
-	public int getMetadata(final int aMeta) {
-		return aMeta;
+	public String getUnlocalizedName(ItemStack aStack) {
+		return this.field_150939_a.getUnlocalizedName() + "." + getDamage(aStack);
 	}
 
 	@Override
-	public String getUnlocalizedName(final ItemStack aStack) {
-		return this.field_150939_a.getUnlocalizedName() + "." + this.getDamage(aStack);
+	public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
+		super.addInformation(aStack, aPlayer, aList, aF3_H);       
+		switch (getDamage(aStack)) {
+		case 0:
+			aList.add(this.mCasing_Centrifuge);
+			break;
+		case 1:
+			aList.add(this.mCasing_CokeOven);
+			break;
+		case 2:
+			aList.add(this.mCasing_CokeCoil1);
+			break;
+		case 3:
+			aList.add(this.mCasing_CokeCoil2);
+			break;
+		default:
+			break;      
+		}
+		aList.add(this.mNoMobsToolTip);
+		aList.add(this.mNoTileEntityToolTip);
 	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index 29012b8b98..4ed8c6caae 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -1,6 +1,8 @@
 package gtPlusPlus.xmod.gregtech.common.blocks.fluid;
 
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.Utils;
@@ -13,219 +15,180 @@ public class GregtechFluidHandler {
 
 	protected static int cellID = 0;
 
-	private static void generateIC2FluidCell(final String fluidNameWithCaps) {
-		Utils.LOG_INFO("Adding a Cell for " + fluidNameWithCaps);
-		if (LoadedMods.IndustrialCraft2) {
-			Utils.createInternalNameAndFluidCell(fluidNameWithCaps);
-		}
-	}
-
-	public static void run() {
-		GregtechFluidHandler.start();
+	public static void run(){
+		start();
 	}
 
-	private static void start() {
-
-		/*
-		 * Meta_GT_Proxy.addFluid("lubricant", "Lubricant", Materials.Lubricant,
-		 * 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell,
-		 * Materials.Lubricant, 1L), ItemList.Cell_Empty.get(1L, new Object[0]),
-		 * 1000); Meta_GT_Proxy.addFluid("creosote", "Creosote Oil",
-		 * Materials.Creosote, 1, 295,
-		 * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L),
-		 * ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("seedoil", "Seed Oil", Materials.SeedOil, 1,
-		 * 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil,
-		 * 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("fishoil", "Fish Oil", Materials.FishOil, 1,
-		 * 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil,
-		 * 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("oil", "Oil", Materials.Oil, 1, 295,
-		 * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L),
-		 * ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("fuel", "Diesel", Materials.Fuel, 1, 295,
-		 * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L),
-		 * ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("for.honey", "Honey", Materials.Honey, 1, 295,
-		 * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L),
-		 * ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("biomass", "Biomass", Materials.Biomass, 1,
-		 * 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass,
-		 * 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("bioethanol", "Bio Ethanol",
-		 * Materials.Ethanol, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell,
-		 * Materials.Ethanol, 1L), ItemList.Cell_Empty.get(1L, new Object[0]),
-		 * 1000); Meta_GT_Proxy.addFluid("sulfuricacid", "Sulfuric Acid",
-		 * Materials.SulfuricAcid, 1, 295,
-		 * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid,
-		 * 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("milk", "Milk", Materials.Milk, 1, 290,
-		 * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L),
-		 * ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("mcguffium", "Mc Guffium 239",
-		 * Materials.McGuffium239, 1, 295,
-		 * GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239,
-		 * 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
-		 * Meta_GT_Proxy.addFluid("glue", "Glue", Materials.G