Merge branch 'mergeGTNH' into experimental

18 files changed, 1217 insertions, 1159 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
index 6cb65158c6..2285d3f2af 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
@@ -29,10 +29,10 @@ public class GT_Block_Casings2
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Assembler Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Pump Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Motor Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Bronze Pipe Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Steel Pipe Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Titanium Pipe Machine Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Pipe Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Bronze Pipe Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Steel Pipe Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Titanium Pipe Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Pipe Casing");
         ItemList.Casing_SolidSteel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_FrostProof.set(new ItemStack(this, 1, 1));
         ItemList.Casing_Gearbox_Bronze.set(new ItemStack(this, 1, 2));
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
index 5cc1067e4c..428369e569 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
@@ -1,88 +1,88 @@
-package gregtech.common.blocks;
-
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Textures;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import gregtech.api.util.GT_LanguageManager;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
-public class GT_Block_Casings3
-        extends GT_Block_Casings_Abstract {
-    public GT_Block_Casings3() {
-        super(GT_Item_Casings3.class, "gt.blockcasings3", GT_Material_Casings.INSTANCE);
-        for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-            Textures.BlockIcons.CASING_BLOCKS[(i + 32)] = new GT_CopiedBlockTexture(this, 6, i);
-        }
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Yellow Stripes Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Yellow Stripes Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Radioactive Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Bio Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Explosion Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fire Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Acid Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Frost Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Noise Hazard Sign Block");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Grate Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Vent Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Radiation Proof Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Bronze Firebox Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Steel Firebox Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Firebox Casing");
-        ItemList.Casing_Stripes_A.set(new ItemStack(this, 1, 0));
-        ItemList.Casing_Stripes_B.set(new ItemStack(this, 1, 1));
-        ItemList.Casing_RadioactiveHazard.set(new ItemStack(this, 1, 2));
-        ItemList.Casing_BioHazard.set(new ItemStack(this, 1, 3));
-        ItemList.Casing_ExplosionHazard.set(new ItemStack(this, 1, 4));
-        ItemList.Casing_FireHazard.set(new ItemStack(this, 1, 5));
-        ItemList.Casing_AcidHazard.set(new ItemStack(this, 1, 6));
-        ItemList.Casing_MagicHazard.set(new ItemStack(this, 1, 7));
-        ItemList.Casing_FrostHazard.set(new ItemStack(this, 1, 8));
-        ItemList.Casing_NoiseHazard.set(new ItemStack(this, 1, 9));
-        ItemList.Casing_Grate.set(new ItemStack(this, 1, 10));
-        ItemList.Casing_Vent.set(new ItemStack(this, 1, 11));
-        ItemList.Casing_RadiationProof.set(new ItemStack(this, 1, 12));
-        ItemList.Casing_Firebox_Bronze.set(new ItemStack(this, 1, 13));
-        ItemList.Casing_Firebox_Steel.set(new ItemStack(this, 1, 14));
-        ItemList.Casing_Firebox_TungstenSteel.set(new ItemStack(this, 1, 15));
-    }
-
-    public IIcon getIcon(int aSide, int aMeta) {
-        switch (aMeta) {
-            case 0:
-                return Textures.BlockIcons.MACHINE_CASING_STRIPES_A.getIcon();
-            case 1:
-                return Textures.BlockIcons.MACHINE_CASING_STRIPES_B.getIcon();
-            case 2:
-                return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
-            case 3:
-                return Textures.BlockIcons.MACHINE_CASING_BIOHAZARD.getIcon();
-            case 4:
-                return Textures.BlockIcons.MACHINE_CASING_EXPLOSIONHAZARD.getIcon();
-            case 5:
-                return Textures.BlockIcons.MACHINE_CASING_FIREHAZARD.getIcon();
-            case 6:
-                return Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD.getIcon();
-            case 7:
-                return Textures.BlockIcons.MACHINE_CASING_MAGICHAZARD.getIcon();
-            case 8:
-                return Textures.BlockIcons.MACHINE_CASING_FROSTHAZARD.getIcon();
-            case 9:
-                return Textures.BlockIcons.MACHINE_CASING_NOISEHAZARD.getIcon();
-            case 10:
-                return Textures.BlockIcons.MACHINE_CASING_GRATE.getIcon();
-            case 11:
-                return Textures.BlockIcons.MACHINE_CASING_VENT.getIcon();
-            case 12:
-                return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
-            case 13:
-                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon() : Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();
-            case 14:
-                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon() : Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
-            case 15:
-                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TUNGSTENSTEEL.getIcon() : Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
-        }
-        return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
-    }
-}
+package gregtech.common.blocks;

+

+import gregtech.api.enums.ItemList;

+import gregtech.api.enums.Textures;

+import gregtech.api.objects.GT_CopiedBlockTexture;

+import gregtech.api.util.GT_LanguageManager;

+import net.minecraft.item.ItemStack;

+import net.minecraft.util.IIcon;

+

+public class GT_Block_Casings3

+        extends GT_Block_Casings_Abstract {

+    public GT_Block_Casings3() {

+        super(GT_Item_Casings3.class, "gt.blockcasings3", GT_Material_Casings.INSTANCE);

+        for (byte i = 0; i < 16; i = (byte) (i + 1)) {

+            Textures.BlockIcons.CASING_BLOCKS[(i + 32)] = new GT_CopiedBlockTexture(this, 6, i);

+        }

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Yellow Stripes Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Yellow Stripes Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Radioactive Hazard Sign Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Bio Hazard Sign Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Explosion Hazard Sign Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fire Hazard Sign Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Acid Hazard Sign Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Hazard Sign Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Frost Hazard Sign Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Noise Hazard Sign Block");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Grate Machine Casing");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Filter Machine Casing");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Radiation Proof Machine Casing");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Bronze Firebox Casing");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Steel Firebox Casing");

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Firebox Casing");

+        ItemList.Casing_Stripes_A.set(new ItemStack(this, 1, 0));

+        ItemList.Casing_Stripes_B.set(new ItemStack(this, 1, 1));

+        ItemList.Casing_RadioactiveHazard.set(new ItemStack(this, 1, 2));

+        ItemList.Casing_BioHazard.set(new ItemStack(this, 1, 3));

+        ItemList.Casing_ExplosionHazard.set(new ItemStack(this, 1, 4));

+        ItemList.Casing_FireHazard.set(new ItemStack(this, 1, 5));

+        ItemList.Casing_AcidHazard.set(new ItemStack(this, 1, 6));

+        ItemList.Casing_MagicHazard.set(new ItemStack(this, 1, 7));

+        ItemList.Casing_FrostHazard.set(new ItemStack(this, 1, 8));

+        ItemList.Casing_NoiseHazard.set(new ItemStack(this, 1, 9));

+        ItemList.Casing_Grate.set(new ItemStack(this, 1, 10));

+        ItemList.Casing_Vent.set(new ItemStack(this, 1, 11));

+        ItemList.Casing_RadiationProof.set(new ItemStack(this, 1, 12));

+        ItemList.Casing_Firebox_Bronze.set(new ItemStack(this, 1, 13));

+        ItemList.Casing_Firebox_Steel.set(new ItemStack(this, 1, 14));

+        ItemList.Casing_Firebox_TungstenSteel.set(new ItemStack(this, 1, 15));

+    }

+

+    public IIcon getIcon(int aSide, int aMeta) {

+        switch (aMeta) {

+            case 0:

+                return Textures.BlockIcons.MACHINE_CASING_STRIPES_A.getIcon();

+            case 1:

+                return Textures.BlockIcons.MACHINE_CASING_STRIPES_B.getIcon();

+            case 2:

+                return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();

+            case 3:

+                return Textures.BlockIcons.MACHINE_CASING_BIOHAZARD.getIcon();

+            case 4:

+                return Textures.BlockIcons.MACHINE_CASING_EXPLOSIONHAZARD.getIcon();

+            case 5:

+                return Textures.BlockIcons.MACHINE_CASING_FIREHAZARD.getIcon();

+            case 6:

+                return Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD.getIcon();

+            case 7:

+                return Textures.BlockIcons.MACHINE_CASING_MAGICHAZARD.getIcon();

+            case 8:

+                return Textures.BlockIcons.MACHINE_CASING_FROSTHAZARD.getIcon();

+            case 9:

+                return Textures.BlockIcons.MACHINE_CASING_NOISEHAZARD.getIcon();

+            case 10:

+                return Textures.BlockIcons.MACHINE_CASING_GRATE.getIcon();

+            case 11:

+                return Textures.BlockIcons.MACHINE_CASING_VENT.getIcon();

+            case 12:

+                return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();

+            case 13:

+                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon() : Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();

+            case 14:

+                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon() : Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();

+            case 15:

+                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TUNGSTENSTEEL.getIcon() : Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();

+        }

+        return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();

+    }

+}

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
index 3c3535e4da..639cbf5d6f 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
@@ -23,20 +23,22 @@ public class GT_Block_Casings4
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             Textures.BlockIcons.CASING_BLOCKS[(i + 48)] = new GT_CopiedBlockTexture(this, 6, i);
         }
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Robust Tungstensteel Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Clean Stainless Steel Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Stable Titanium Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Robust Tungstensteel Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Clean Stainless Steel Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Stable Titanium Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Titanium Firebox Casing");
 //    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Fusion Casing");
 //    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fusion Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fusion Casing");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Casing MK II");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Fusion Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Fusion Coil Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Fusion Machine Casing MK II");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Turbine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Stainless Steel Turbine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chemically Inert Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "PTFE Pipe Machine Casing");
 
         ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1));
@@ -50,6 +52,8 @@ public class GT_Block_Casings4
         ItemList.Casing_Turbine2.set(new ItemStack(this, 1, 11));
         ItemList.Casing_Turbine3.set(new ItemStack(this, 1, 12));
         ItemList.Casing_EngineIntake.set(new ItemStack(this, 1, 13));
+        ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 14));
+        ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 15));
     }
 
     public IIcon getIcon(int aSide, int aMeta) {
@@ -83,9 +87,9 @@ public class GT_Block_Casings4
             case 13:
                 return Textures.BlockIcons.MACHINE_CASING_ENGINE_INTAKE.getIcon();
             case 14:
-                return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+                return Textures.BlockIcons.MACHINE_CASING_CHEMICALLY_INERT.getIcon();
             case 15:
-                return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.getIcon();
         }
         return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
     }
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 1909651c89..8b03a10b29 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
@@ -1,121 +1,122 @@
-package gregtech.common.blocks;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.util.GT_LanguageManager;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.init.Blocks;
-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 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) {
-        super(aItemClass, aName, aMaterial);
-        setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
-        GregTech_API.registerMachineBlock(this, -1);
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");
-    }
-
-    public String getHarvestTool(int aMeta) {
-        return "wrench";
-    }
-
-    public int getHarvestLevel(int aMeta) {
-        return 2;
-    }
-
-    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
-        return Blocks.iron_block.getBlockHardness(aWorld, aX, aY, aZ);
-    }
-
-    public float getExplosionResistance(Entity aTNT) {
-        return Blocks.iron_block.getExplosionResistance(aTNT);
-    }
-
-    protected boolean canSilkHarvest() {
-        return false;
-    }
-
-    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);
-        }
-    }
-
-    public String getUnlocalizedName() {
-        return this.mUnlocalizedName;
-    }
-
-    public String getLocalizedName() {
-        return StatCollector.translateToLocal(this.mUnlocalizedName + ".name");
-    }
-
-    public boolean canBeReplacedByLeaves(IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return false;
-    }
-
-    public boolean isNormalCube(IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return true;
-    }
-
-    public boolean renderAsNormalBlock() {
-        return true;
-    }
-
-    public boolean isOpaqueCube() {
-        return true;
-    }
-
-    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);
-        }
-    }
-
-    public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
-        return false;
-    }
-
-    public int damageDropped(int par1) {
-        return par1;
-    }
-
-    public int getDamageValue(World par1World, int par2, int par3, int par4) {
-        return par1World.getBlockMetadata(par2, par3, par4);
-    }
-
-    public int quantityDropped(Random par1Random) {
-        return 1;
-    }
-
-    public Item getItemDropped(int par1, Random par2Random, int par3) {
-        return Item.getItemFromBlock(this);
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons(IIconRegister aIconRegister) {
-    }
-
-    @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));
-        }
-    }
-}
+package gregtech.common.blocks;

+

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

+import gregtech.api.GregTech_API;

+import gregtech.api.items.GT_Generic_Block;

+import gregtech.api.util.GT_LanguageManager;

+import net.minecraft.block.Block;

+import net.minecraft.block.material.Material;

+import net.minecraft.client.renderer.texture.IIconRegister;

+import net.minecraft.creativetab.CreativeTabs;

+import net.minecraft.entity.Entity;

+import net.minecraft.entity.EnumCreatureType;

+import net.minecraft.init.Blocks;

+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 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) {

+        super(aItemClass, aName, aMaterial);

+        setStepSound(soundTypeMetal);

+        setCreativeTab(GregTech_API.TAB_GREGTECH);

+        GregTech_API.registerMachineBlock(this, -1);

+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + 32767 + ".name", "Any Sub Block of this");

+    }

+

+    public String getHarvestTool(int aMeta) {

+        return "wrench";

+    }

+

+    public int getHarvestLevel(int aMeta) {

+        return 2;

+    }

+

+    public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {

+        return Blocks.iron_block.getBlockHardness(aWorld, aX, aY, aZ);

+    }

+

+    public float getExplosionResistance(Entity aTNT) {

+        return Blocks.iron_block.getExplosionResistance(aTNT);

+    }

+

+    protected boolean canSilkHarvest() {

+        return false;

+    }

+

+    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);

+        }

+    }

+

+    public String getUnlocalizedName() {

+        return this.mUnlocalizedName;

+    }

+

+    public String getLocalizedName() {

+        return StatCollector.translateToLocal(this.mUnlocalizedName + ".name");

+    }

+

+    public boolean canBeReplacedByLeaves(IBlockAccess aWorld, int aX, int aY, int aZ) {

+        return false;

+    }

+

+    public boolean isNormalCube(IBlockAccess aWorld, int aX, int aY, int aZ) {

+        return true;

+    }

+

+    public boolean renderAsNormalBlock() {

+        return true;

+    }

+

+    public boolean isOpaqueCube() {

+        return true;

+    }

+

+    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);

+        }

+    }

+

+    public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {

+        return false;

+    }

+

+    public int damageDropped(int par1) {

+        return par1;

+    }

+

+    public int getDamageValue(World par1World, int par2, int par3, int par4) {

+        return par1World.getBlockMetadata(par2, par3, par4);

+    }

+

+    public int quantityDropped(Random par1Random) {

+        return 1;

+    }

+

+    public Item getItemDropped(int par1, Random par2Random, int par3) {

+        return Item.getItemFromBlock(this);

+    }

+

+    @SideOnly(Side.CLIENT)

+    public void registerBlockIcons(IIconRegister aIconRegister) {

+    }

+

+    @SideOnly(Side.CLIENT)

+    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, 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 419a7ed596..9472374a7c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -1,531 +1,531 @@
-package gregtech.common.blocks;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IDebugableBlock;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_Generic_Block;
-import gregtech.api.metatileentity.BaseMetaPipeEntity;
-import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.metatileentity.BaseTileEntity;
-import gregtech.api.objects.XSTR;
-import gregtech.api.util.GT_BaseCrop;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.render.GT_Renderer_Block;
-import net.minecraft.block.Block;
-import net.minecraft.block.ITileEntityProvider;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.Explosion;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-public class GT_Block_Machines
-        extends GT_Generic_Block
-        implements IDebugableBlock, ITileEntityProvider {
-    public static ThreadLocal<IGregTechTileEntity> mTemporaryTileEntity = new ThreadLocal();
-
-    public GT_Block_Machines() {
-        super(GT_Item_Machines.class, "gt.blockmachines", new GT_Material_Machines());
-        GregTech_API.registerMachineBlock(this, -1);
-        setHardness(1.0F);
-        setResistance(10.0F);
-        setStepSound(soundTypeMetal);
-        setCreativeTab(GregTech_API.TAB_GREGTECH);
-        this.isBlockContainer = true;
-    }
-
-    public String getHarvestTool(int aMeta) {
-        switch (aMeta / 4) {
-            case 0:
-                return "wrench";
-            case 1:
-                return "wrench";
-            case 2:
-                return "cutter";
-            case 3:
-                return "axe";
-        }
-        return "wrench";
-    }
-
-    public int getHarvestLevel(int aMeta) {
-        return aMeta % 4;
-    }
-
-    protected boolean canSilkHarvest() {
-        return false;
-    }
-
-    public void onNeighborChange(IBlockAccess aWorld, int aX, int aY, int aZ, int aTileX, int aTileY, int aTileZ) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity instanceof BaseTileEntity)) {
-            ((BaseTileEntity) tTileEntity).onAdjacentBlockChange(aTileX, aTileY, aTileZ);
-        }
-    }
-
-    public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
-        super.onBlockAdded(aWorld, aX, aY, aZ);
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
-        }
-    }
-
-    public String getUnlocalizedName() {
-        return "gt.blockmachines";
-    }
-
-    public String getLocalizedName() {
-        return StatCollector.translateToLocal(getUnlocalizedName() + ".name");
-    }
-
-    public int getFlammability(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return 0;
-    }
-
-    public int getFireSpreadSpeed(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return (GregTech_API.sMachineFlammable) && (aWorld.getBlockMetadata(aX, aY, aZ) == 0) ? 100 : 0;
-    }
-
-    public int getRenderType() {
-        if (GT_Renderer_Block.INSTANCE == null) {
-            return super.getRenderType();
-        }
-        return GT_Renderer_Block.INSTANCE.mRenderID;
-    }
-
-    public boolean isFireSource(World aWorld, int aX, int aY, int aZ, ForgeDirection side) {
-        return (GregTech_API.sMachineFlammable) && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
-    }
-
-    public boolean isFlammable(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection face) {
-        return (GregTech_API.sMachineFlammable) && (aWorld.getBlockMetadata(aX, aY, aZ) == 0);
-    }
-
-    public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return false;
-    }
-
-    public boolean canConnectRedstone(IBlockAccess var1, int var2, int var3, int var4, int var5) {
-        return true;
-    }
-
-    public boolean canBeReplacedByLeaves(IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return false;
-    }
-
-    public boolean isNormalCube(IBlockAccess aWorld, int aX, int aY, int aZ) {
-        return false;
-    }
-
-    public boolean hasTileEntity(int aMeta) {
-        return true;
-    }
-
-    public boolean hasComparatorInputOverride() {
-        return true;
-    }
-
-    public boolean renderAsNormalBlock() {
-        return false;
-    }
-
-    public boolean canProvidePower() {
-        return true;
-    }
-
-    public boolean isOpaqueCube() {
-        return false;
-    }
-
-    public TileEntity createNewTileEntity(World aWorld, int aMeta) {
-        return createTileEntity(aWorld, aMeta);
-    }
-
-    public IIcon getIcon(IBlockAccess aIBlockAccess, int aX, int aY, int aZ, int aSide) {
-        return Textures.BlockIcons.MACHINE_LV_SIDE.getIcon();
-    }
-
-    public IIcon getIcon(int aSide, int aMeta) {
-        return Textures.BlockIcons.MACHINE_LV_SIDE.getIcon();
-    }