Merge pull request #1 from GTNewHorizons/experimental

5/24

18 files changed, 1744 insertions, 1681 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
index 77668caaaa..eb7c399eb0 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
@@ -29,7 +29,7 @@ public class GT_Block_Casings1
     public GT_Block_Casings1() {
         super(GT_Item_Casings1.class, "gt.blockcasings", GT_Material_Casings.INSTANCE);
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-            Textures.BlockIcons.CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i);
+            Textures.BlockIcons.casingTexturePages[0][i] = new GT_CopiedBlockTexture(this, 6, i);
         }
 
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "ULV Machine Casing");
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 04c422e39d..6da2195921 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java
@@ -1,103 +1,103 @@
-package gregtech.common.blocks;

-

-import gregtech.api.enums.Dyes;

-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.block.Block;

-import net.minecraft.entity.Entity;

-import net.minecraft.init.Blocks;

-import net.minecraft.item.ItemStack;

-import net.minecraft.util.IIcon;

-import net.minecraft.world.World;

-

-public class GT_Block_Casings2

-        extends GT_Block_Casings_Abstract {

-    public GT_Block_Casings2() {

-        super(GT_Item_Casings2.class, "gt.blockcasings2", GT_Material_Casings.INSTANCE);

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

-        	if (i != 6){

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

-        	}

-         }

-        

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Solid Steel Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Frost Proof Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Bronze Gear Box Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Steel Gear Box Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Titanium Gear Box Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembling Line Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Processor Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Data Drive Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Containment Field Machine Casing");

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

-        ItemList.Casing_Gearbox_Steel.set(new ItemStack(this, 1, 3));

-        ItemList.Casing_Gearbox_Titanium.set(new ItemStack(this, 1, 4));

-        ItemList.Casing_Gearbox_TungstenSteel.set(new ItemStack(this, 1, 5));

-        ItemList.Casing_Processor.set(new ItemStack(this, 1, 6));

-        ItemList.Casing_DataDrive.set(new ItemStack(this, 1, 7));

-        ItemList.Casing_ContainmentField.set(new ItemStack(this, 1, 8));

-        ItemList.Casing_Assembler.set(new ItemStack(this, 1, 9));

-        ItemList.Casing_Pump.set(new ItemStack(this, 1, 10));

-        ItemList.Casing_Motor.set(new ItemStack(this, 1, 11));

-        ItemList.Casing_Pipe_Bronze.set(new ItemStack(this, 1, 12));

-        ItemList.Casing_Pipe_Steel.set(new ItemStack(this, 1, 13));

-        ItemList.Casing_Pipe_Titanium.set(new ItemStack(this, 1, 14));

-        ItemList.Casing_Pipe_TungstenSteel.set(new ItemStack(this, 1, 15));

-        

-        //Special handler for Pyrolyse Oven Casing

-        Textures.BlockIcons.CASING_BLOCKS[22] = new GT_CopiedBlockTexture(Block.getBlockFromItem(ItemList.Casing_ULV.get(1).getItem()), 6, 0,Dyes.MACHINE_METAL.mRGBa);

-}

-

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

-        switch (aMeta) {

-            case 0:

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

-            case 1:

-                return Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon();

-            case 2:

-                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_BRONZE.getIcon();

-            case 3:

-                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_STEEL.getIcon();

-            case 4:

-                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TITANIUM.getIcon();

-            case 5:

-                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon();

-            case 6:

-                return Textures.BlockIcons.MACHINE_CASING_PROCESSOR.getIcon();

-            case 7:

-                return Textures.BlockIcons.MACHINE_CASING_DATA_DRIVE.getIcon();

-            case 8:

-                return Textures.BlockIcons.MACHINE_CASING_CONTAINMENT_FIELD.getIcon();

-            case 9:

-                return Textures.BlockIcons.MACHINE_CASING_ASSEMBLER.getIcon();

-            case 10:

-                return Textures.BlockIcons.MACHINE_CASING_PUMP.getIcon();

-            case 11:

-                return Textures.BlockIcons.MACHINE_CASING_MOTOR.getIcon();

-            case 12:

-                return Textures.BlockIcons.MACHINE_CASING_PIPE_BRONZE.getIcon();

-            case 13:

-                return Textures.BlockIcons.MACHINE_CASING_PIPE_STEEL.getIcon();

-            case 14:

-                return Textures.BlockIcons.MACHINE_CASING_PIPE_TITANIUM.getIcon();

-            case 15:

-                return Textures.BlockIcons.MACHINE_CASING_PIPE_TUNGSTENSTEEL.getIcon();

-        }

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

-    }

-

-    public float getExplosionResistance(Entity aTNT, World aWorld, int aX, int aY, int aZ, double eX, double eY, double eZ) {

-        return aWorld.getBlockMetadata(aX, aY, aZ) == 8 ? Blocks.bedrock.getExplosionResistance(aTNT) : super.getExplosionResistance(aTNT, aWorld, aX, aY, aZ, eX, eY, eZ);

-    }

-}

+package gregtech.common.blocks;
+
+import gregtech.api.enums.Dyes;
+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.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class GT_Block_Casings2
+        extends GT_Block_Casings_Abstract {
+    public GT_Block_Casings2() {
+        super(GT_Item_Casings2.class, "gt.blockcasings2", GT_Material_Casings.INSTANCE);
+        for (byte i = 0; i < 16; i = (byte) (i + 1)) {
+        	if (i != 6){
+        		Textures.BlockIcons.casingTexturePages[0][(i + 16)] = new GT_CopiedBlockTexture(this, 6, i);
+        	}
+         }
+        //Special handler for Pyrolyse Oven Casing on hatches...
+        Textures.BlockIcons.casingTexturePages[0][22] = new GT_CopiedBlockTexture(Block.getBlockFromItem(ItemList.Casing_ULV.get(1).getItem()), 6, 0,Dyes.MACHINE_METAL.mRGBa);
+
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Solid Steel Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Frost Proof Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Bronze Gear Box Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Steel Gear Box Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Titanium Gear Box Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Assembling Line Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Processor Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Data Drive Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Containment Field Machine Casing");
+        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 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));
+        ItemList.Casing_Gearbox_Steel.set(new ItemStack(this, 1, 3));
+        ItemList.Casing_Gearbox_Titanium.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_Gearbox_TungstenSteel.set(new ItemStack(this, 1, 5));
+        ItemList.Casing_Processor.set(new ItemStack(this, 1, 6));
+        ItemList.Casing_DataDrive.set(new ItemStack(this, 1, 7));
+        ItemList.Casing_ContainmentField.set(new ItemStack(this, 1, 8));
+        ItemList.Casing_Assembler.set(new ItemStack(this, 1, 9));
+        ItemList.Casing_Pump.set(new ItemStack(this, 1, 10));
+        ItemList.Casing_Motor.set(new ItemStack(this, 1, 11));
+        ItemList.Casing_Pipe_Bronze.set(new ItemStack(this, 1, 12));
+        ItemList.Casing_Pipe_Steel.set(new ItemStack(this, 1, 13));
+        ItemList.Casing_Pipe_Titanium.set(new ItemStack(this, 1, 14));
+        ItemList.Casing_Pipe_TungstenSteel.set(new ItemStack(this, 1, 15));
+        
+}
+
+    public IIcon getIcon(int aSide, int aMeta) {
+        switch (aMeta) {
+            case 0:
+                return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+            case 1:
+                return Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon();
+            case 2:
+                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_BRONZE.getIcon();
+            case 3:
+                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_STEEL.getIcon();
+            case 4:
+                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TITANIUM.getIcon();
+            case 5:
+                return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon();
+            case 6:
+                return Textures.BlockIcons.MACHINE_CASING_PROCESSOR.getIcon();
+            case 7:
+                return Textures.BlockIcons.MACHINE_CASING_DATA_DRIVE.getIcon();
+            case 8:
+                return Textures.BlockIcons.MACHINE_CASING_CONTAINMENT_FIELD.getIcon();
+            case 9:
+                return Textures.BlockIcons.MACHINE_CASING_ASSEMBLER.getIcon();
+            case 10:
+                return Textures.BlockIcons.MACHINE_CASING_PUMP.getIcon();
+            case 11:
+                return Textures.BlockIcons.MACHINE_CASING_MOTOR.getIcon();
+            case 12:
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_BRONZE.getIcon();
+            case 13:
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_STEEL.getIcon();
+            case 14:
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_TITANIUM.getIcon();
+            case 15:
+                return Textures.BlockIcons.MACHINE_CASING_PIPE_TUNGSTENSTEEL.getIcon();
+        }
+        return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+    }
+
+    public float getExplosionResistance(Entity aTNT, World aWorld, int aX, int aY, int aZ, double eX, double eY, double eZ) {
+        return aWorld.getBlockMetadata(aX, aY, aZ) == 8 ? Blocks.bedrock.getExplosionResistance(aTNT) : super.getExplosionResistance(aTNT, aWorld, aX, aY, aZ, eX, eY, eZ);
+    }
+}
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 428369e569..fde793522a 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 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();

-    }

-}

+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.casingTexturePages[0][(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 02940414b3..0dbf5e9f54 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
@@ -21,7 +21,7 @@ public class GT_Block_Casings4
     public GT_Block_Casings4() {
         super(GT_Item_Casings4.class, "gt.blockcasings4", GT_Material_Casings.INSTANCE);
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-            Textures.BlockIcons.CASING_BLOCKS[(i + 48)] = new GT_CopiedBlockTexture(this, 6, i);
+            Textures.BlockIcons.casingTexturePages[0][(i + 48)] = new GT_CopiedBlockTexture(this, 6, i);
         }
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Robust Tungstensteel Machine Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Clean Stainless Steel Machine Casing");
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
index 14b0ecd019..55492c961c 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
@@ -14,7 +14,6 @@ public class GT_Block_Casings5
         extends GT_Block_Casings_Abstract {
     public GT_Block_Casings5() {
         super(GT_Item_Casings5.class, "gt.blockcasings5", GT_Material_Casings.INSTANCE);
-        GT_Utility.addTexturePage((byte) 1);
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
             Textures.BlockIcons.casingTexturePages[1][i] = new GT_CopiedBlockTexture(this, 6, i);
         }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
index 093373bde4..8d2c976b1b 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
@@ -1,39 +1,47 @@
-package gregtech.common.blocks;

-

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

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

-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_Casings8

-        extends GT_Block_Casings_Abstract {

-

-    //WATCH OUT FOR TEXTURE ID's

-    public GT_Block_Casings8() {

-        super(GT_Item_Casings8.class, "gt.blockcasings8", GT_Material_Casings.INSTANCE);

-        for (int i = 0; i < 1; i = (i + 1)) {

-            Textures.BlockIcons.casingTexturePages[1][i+48] = new GT_CopiedBlockTexture(this, 6, i);

-        }

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemically Inert Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "PTFE Pipe Casing");

-

-        ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 0));

-        ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 1));

-    }

-

-    @Override

-    @SideOnly(Side.CLIENT)

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

-        switch (aMeta) {

-        case 0:

-            return Textures.BlockIcons.MACHINE_CASING_CHEMICALLY_INERT.getIcon();

-        case 1:

-            return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.getIcon();

-        }

-        return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();

-    }

-}

+package gregtech.common.blocks;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+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_Casings8
+        extends GT_Block_Casings_Abstract {
+
+    //WATCH OUT FOR TEXTURE ID's
+    public GT_Block_Casings8() {
+        super(GT_Item_Casings8.class, "gt.blockcasings8", GT_Material_Casings.INSTANCE);
+        for (int i = 0; i < 4; i = (i + 1)) {
+            Textures.BlockIcons.casingTexturePages[1][i+48] = new GT_CopiedBlockTexture(this, 6, i);
+        }
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemically Inert Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "PTFE Pipe Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mining Neutronium Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Mining Black Plutonium Casing");
+
+        ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 0));
+        ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 1));
+        ItemList.Casing_MiningNeutronium.set(new ItemStack(this, 1, 2));
+        ItemList.Casing_MiningBlackPlutonium.set(new ItemStack(this, 1, 3));
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int aSide, int aMeta) {
+        switch (aMeta) {
+        case 0:
+            return Textures.BlockIcons.MACHINE_CASING_CHEMICALLY_INERT.getIcon();
+        case 1:
+            return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.getIcon();
+        case 2:
+            return Textures.BlockIcons.MACHINE_CASING_MINING_NEUTRONIUM.getIcon();
+        case 3:
+            return Textures.BlockIcons.MACHINE_CASING_MINING_BLACKPLUTONIUM.getIcon();
+        }
+        return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.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 8b03a10b29..830a407777 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,122 +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() {

-        retu