Implemented the groundwork for some custom textures.

Not using them currently though, as they cause the client to crash.
Will debug more & use default turbine textures for now.

1 files changed, 33 insertions, 34 deletions

diff --git a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index ec4541499f..ac3449299a 100644
--- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -7,7 +7,6 @@ import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
 import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.enums.GregtechTextures;
 import miscutil.gregtech.common.machines.multi.GregtechMetaLargeIndustrialCentrifuge;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -21,7 +20,7 @@ extends GregtechMetaCasingBlocksAbstract {
 	public GregtechMetaCasingBlocks() {
 		super(GregtechMetaCasingItems.class, "miscutils.blockcasings", GT_Material_Casings.INSTANCE);
 		for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-			GregtechTextures.BlockIcons.GT_CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i);
+			Textures.BlockIcons.CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i);
 		}
 		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Centrifuge Casing");
 		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Centrifuge Top Blocks");
@@ -101,102 +100,102 @@ extends GregtechMetaCasingBlocksAbstract {
                 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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[0].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[0].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[3].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[3].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[6].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[6].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[1].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[1].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[7].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[7].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[8].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[8].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[5].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[5].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[2].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[2].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[0].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[0].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[3].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[3].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[6].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[6].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[1].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[1].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[7].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[7].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[8].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[8].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[5].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[5].getIcon();
+                    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 GregtechMetaLargeIndustrialCentrifuge))) {
                     if (((IGregTechTileEntity) tTileEntity).isActive()) {
-                        return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[2].getIcon();
+                        return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon();
                     }
-                    GregtechTextures.BlockIcons.CENTRIFUGE[2].getIcon();
+                    Textures.BlockIcons.TURBINE[2].getIcon();
                 }
             }
             return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();