% Changed GT Casing handling

% Trying to fix texture overrides, but my array math is always bad. (Sorry)

6 files changed, 430 insertions, 416 deletions

diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
index 43b8f53cdb..bcdc2212b1 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java
@@ -80,8 +80,10 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM,
 	Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM, 
 	
-	//Blast Furnace Test
-	Machine_Electric_BlastFurnace;
+	//Unused Machine Casings
+	Casing_U1, Casing_U2, Casing_U3, Casing_U4, Casing_U5, Casing_U6, Casing_U7, 
+	//Unused Machine Coils
+	Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_U3, Casing_Coil_U4;
 
 	public static final GregtechItemList[]
 			DYE_ONLY_ITEMS = {
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index fe81a22c51..63ae816782 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -323,7 +323,7 @@ public abstract class GregtechMeta_MultiBlockBase extends MetaTileEntity {
     /**
      * Checks if this is a Correct Machine Part for this kind of Machine (Turbine Rotor for example)
      */
-    //public abstract boolean isCorrectMachinePart(ItemStack aStack);
+    public abstract boolean isCorrectMachinePart(ItemStack aStack);
 
     /**
      * Checks the Recipe
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index 20088c8ecd..192ca4faf1 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -17,71 +17,73 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class GregtechMetaCasingBlocks
 extends GregtechMetaCasingBlocksAbstract {
+
+	public final static int GTID = 57;
+
 	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[63 + i] = new GT_CopiedBlockTexture(this, 6, i);
+			Textures.BlockIcons.CASING_BLOCKS[GTID + i] = new GT_CopiedBlockTexture(this, 6, i);
 		}
 		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");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "IV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "LuV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "ZPM Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "MAX Machine Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Unused Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Unused Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Unused Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Unused Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Unused Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Unused Casing");
 		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Iron Plated Bricks");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cupronickel Coil Block");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Unused Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Unused Coil Block");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Unused Coil Block");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Unused Coil Block");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Unused Coil 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));
 		GregtechItemList.Casing_CokeOven_Coil2.set(new ItemStack(this, 1, 3));
-        /*ItemList.Casing_EV.set(new ItemStack(this, 1, 4));
-        ItemList.Casing_IV.set(new ItemStack(this, 1, 5));
-        ItemList.Casing_LuV.set(new ItemStack(this, 1, 6));
-        ItemList.Casing_ZPM.set(new ItemStack(this, 1, 7));
-        ItemList.Casing_UV.set(new ItemStack(this, 1, 8));
-        ItemList.Casing_MAX.set(new ItemStack(this, 1, 9));*/
+		GregtechItemList.Casing_U1.set(new ItemStack(this, 1, 4));
+		GregtechItemList.Casing_U2.set(new ItemStack(this, 1, 5));
+		GregtechItemList.Casing_U3.set(new ItemStack(this, 1, 6));
+		GregtechItemList.Casing_U4.set(new ItemStack(this, 1, 7));
+		GregtechItemList.Casing_U5.set(new ItemStack(this, 1, 8));
+		GregtechItemList.Casing_U6.set(new ItemStack(this, 1, 9));
 		GregtechItemList.Casing_IronPlatedBricks.set(new ItemStack(this, 1, 10));
-       /*ItemList.Casing_HeatProof.set(new ItemStack(this, 1, 11));
-        ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 12));
-        ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 13));
-        ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 14));
-        ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));*/
+		GregtechItemList.Casing_U7.set(new ItemStack(this, 1, 11));
+		GregtechItemList.Casing_Coil_U1.set(new ItemStack(this, 1, 12));
+		GregtechItemList.Casing_Coil_U2.set(new ItemStack(this, 1, 13));
+		GregtechItemList.Casing_Coil_U3.set(new ItemStack(this, 1, 14));
+		GregtechItemList.Casing_Coil_U4.set(new ItemStack(this, 1, 15));
 	}
 
 	@Override
 	public IIcon getIcon(int aSide, int aMeta) { //Texture ID's. case 0 == ID[56]
 		if ((aMeta >= 0) && (aMeta < 16)) {
 			switch (aMeta) {
-            case 0: //Centrifuge 
-                return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
-            case 1: //Coke Oven Frame
-                return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
-            case 2: //Coke Oven Casing Tier 1
-                return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
-            case 3: //Coke Oven Casing Tier 2
-                return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon();
+			//Centrifuge 
+			case 0: 
+				return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
+				//Coke Oven Frame
+			case 1:
+				return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
+				//Coke Oven Casing Tier 1
+			case 2: 
+				return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
+				//Coke Oven Casing Tier 2
+			case 3:
+				return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon();
+				//Iron Blast Fuance Textures
 			case 10:
-				return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
-			case 11:
-				return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
-			case 12:
-				return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
-			case 13:
-				return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon();
-			case 14:
-				return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon();
-			case 15:
-				return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
-			}
-			return Textures.BlockIcons.MACHINECASINGS_SIDE[aMeta].getIcon();
+				return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();			
+
+			default:
+				return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
+
+			}
+			//return Textures.BlockIcons.MACHINECASINGS_SIDE[aMeta].getIcon();
 		}
 		return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
 	}
@@ -90,368 +92,368 @@ extends GregtechMetaCasingBlocksAbstract {
 	public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) {
 		return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2];
 	}
-	*/
+	 */
 
 	@Override
 	@SideOnly(Side.CLIENT)
-    public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) {
-        int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
-        if (((tMeta != 6) && (tMeta != 8) && (tMeta != 0))/* || (!mConnectedMachineTextures)*/) {
-            return getIcon(aSide, tMeta);
-        }
-        int tStartIndex = tMeta == 6 ? 1 : 13;
-        if (tMeta == 0) {
-            if ((aSide == 2) || (aSide == 3)) {
-                TileEntity tTileEntity;
-                IMetaTileEntity tMetaTileEntity;
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[0].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[3].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[6].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[1].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[7].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[8].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[5].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[2].getIcon();
-                }
-            } else if ((aSide == 4) || (aSide == 5)) {
-                TileEntity tTileEntity;
-                Object tMetaTileEntity;
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[0].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[3].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[6].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[1].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[7].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[8].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[5].getIcon();
-                }
-                if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
-                    if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
-                    }
-                    return Textures.BlockIcons.TURBINE[2].getIcon();
-                }
-            }
-            return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
-        }
-        boolean[] tConnectedSides = {(aWorld.getBlock(xCoord, yCoord - 1, zCoord) == this) && (aWorld.getBlockMetadata(xCoord, yCoord - 1, zCoord) == tMeta), (aWorld.getBlock(xCoord, yCoord + 1, zCoord) == this) && (aWorld.getBlockMetadata(xCoord, yCoord + 1, zCoord) == tMeta), (aWorld.getBlock(xCoord + 1, yCoord, zCoord) == this) && (aWorld.getBlockMetadata(xCoord + 1, yCoord, zCoord) == tMeta), (aWorld.getBlock(xCoord, yCoord, zCoord + 1) == this) && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord + 1) == tMeta), (aWorld.getBlock(xCoord - 1, yCoord, zCoord) == this) && (aWorld.getBlockMetadata(xCoord - 1, yCoord, zCoord) == tMeta), (aWorld.getBlock(xCoord, yCoord, zCoord - 1) == this) && (aWorld.getBlockMetadata(xCoord, yCoord, zCoord - 1) == tMeta)};
-        switch (aSide) {
-            case 0:
-                if (tConnectedSides[0]) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon();
-                }
-                if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon();
-                }
-                if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon();
-                }
-                if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon();
-                }
-                if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((!tConnectedSides[4]) && (!tConnectedSides[2])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon();
-                }
-                if ((!tConnectedSides[5]) && (!tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon();
-                }
-            case 1:
-                if (tConnectedSides[1]) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon();
-                }
-                if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon();
-                }
-                if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon();
-                }
-                if ((tConnectedSides[4]) && (tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon();
-                }
-                if ((!tConnectedSides[4]) && (tConnectedSides[5]) && (tConnectedSides[2]) && (!tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon();
-                }
-                if ((!tConnectedSides[4]) && (!tConnectedSides[5]) && (!tConnectedSides[2]) && (!tConnectedSides[3])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (!tConnectedSides[4])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon();
-                }
-                if ((!tConnectedSides[3]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon();
-                }
-            case 2:
-                if (tConnectedSides[5]) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (!tConnectedSides[4])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon();
-                }
-            case 3:
-                if (tConnectedSides[3]) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon();
-                }
-                if ((tConnectedSides[2]) && (tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (tConnectedSides[0]) && (tConnectedSides[4]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (!tConnectedSides[0]) && (!tConnectedSides[4]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((!tConnectedSides[2]) && (!tConnectedSides[4])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon();
-                }
-            case 4:
-                if (tConnectedSides[4]) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon();
-                }
-                if ((!tConnectedSides[3]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon();
-                }
-            case 5:
-                if (tConnectedSides[2]) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 6)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 5)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 2)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 3)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 4)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 11)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 8)].getIcon();
-                }
-                if ((tConnectedSides[0]) && (tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 9)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (tConnectedSides[3]) && (tConnectedSides[1]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 10)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (!tConnectedSides[3]) && (!tConnectedSides[1]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-                }
-                if ((!tConnectedSides[0]) && (!tConnectedSides[1])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 0)].getIcon();
-                }
-                if ((!tConnectedSides[3]) && (!tConnectedSides[5])) {
-                    return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 1)].getIcon();
-                }
-                break;
-        }
-        return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
-    }
-	
-	
+	public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) {
+		int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
+		if (((tMeta != 6) && (tMeta != 8) && (tMeta != 0))/* || (!mConnectedMachineTextures)*/) {
+			return getIcon(aSide, tMeta);
+		}
+		int tStartIndex = tMeta == 6 ? 1 : 13;
+		if (tMeta == 0) {
+			if ((aSide == 2) || (aSide == 3)) {
+				TileEntity tTileEntity;
+				IMetaTileEntity tMetaTileEntity;
+				if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaTileEntityIndustrialCentrifuge))) {
+					if (((IGregTechTileEntity) tTileEntity).isActive()) {
+						return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
+					}
+					return Textures.BlockIcons.TURBINE[0].getIcon();