Remove 32x textures (#3276)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

21 files changed, 148 insertions, 315 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
index c7738751c2..95213c2930 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java
@@ -15,7 +15,6 @@ import net.minecraft.util.IIcon;
 
 import gregtech.api.enums.Materials;
 import gtPlusPlus.core.item.base.misc.BaseItemParticle;
-import gtPlusPlus.core.material.MaterialsElements;
 import gtPlusPlus.core.util.Utils;
 
 public class IonParticles extends BaseItemParticle {
@@ -24,16 +23,17 @@ public class IonParticles extends BaseItemParticle {
     public static HashMap<Integer, String> MetaToNameMap = new HashMap<>();
 
     public IonParticles() {
-        super("Ion", MaterialsElements.NAMES.length, EnumRarity.rare);
+        super("Ion", ions.length, EnumRarity.rare);
     }
 
-    public static IIcon[] overlays = new IIcon[MaterialsElements.NAMES.length];
-    public static IIcon baseTexture;
+    public static final String[] ions = new String[] { "Hydrogen", "Helium" };
+
+    public IIcon[] texture = new IIcon[ions.length];
 
     static {
         // Generate Ions
         int key = 0;
-        for (String s : MaterialsElements.NAMES) {
+        for (String s : ions) {
             // Map names to Meta
             NameToMetaMap.put(Utils.sanitizeString(s.toLowerCase()), key);
             MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
@@ -60,7 +60,7 @@ public class IonParticles extends BaseItemParticle {
 
     @Override
     public String getUnlocalizedName(final ItemStack itemStack) {
-        return "item.particle.ion" + "." + MaterialsElements.NAMES[itemStack.getItemDamage()];
+        return "item.particle.ion." + ions[itemStack.getItemDamage()];
     }
 
     private static boolean createNBT(ItemStack rStack) {
@@ -72,7 +72,7 @@ public class IonParticles extends BaseItemParticle {
         return true;
     }
 
-    public static final long getChargeState(final ItemStack aStack) {
+    public static long getChargeState(final ItemStack aStack) {
         NBTTagCompound aNBT = aStack.getTagCompound();
         if (aNBT != null) {
             aNBT = aNBT.getCompoundTag("Ion");
@@ -85,7 +85,7 @@ public class IonParticles extends BaseItemParticle {
         return 0L;
     }
 
-    public static final boolean setChargeState(final ItemStack aStack, final long aCharge) {
+    public static boolean setChargeState(final ItemStack aStack, final long aCharge) {
         NBTTagCompound aNBT = aStack.getTagCompound();
         if (aNBT != null) {
             aNBT = aNBT.getCompoundTag("Ion");
@@ -102,8 +102,7 @@ public class IonParticles extends BaseItemParticle {
         if (stack.getTagCompound() == null) {
             createNBT(stack);
         }
-        double chargeState = getChargeState(stack);
-        return chargeState;
+        return (double) getChargeState(stack);
     }
 
     @Override
@@ -131,23 +130,21 @@ public class IonParticles extends BaseItemParticle {
                     + " Ion with a "
                     + aState
                     + " charge state of "
-                    + aCharge
-                    + "");
+                    + aCharge);
         }
         super.addInformation(stack, player, list, bool);
     }
 
     @Override
     public void registerIcons(IIconRegister reg) {
-        for (int i = 0; i < IonParticles.overlays.length; i++) {
-            IonParticles.overlays[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/" + i);
+        for (int i = 0; i < this.texture.length; i++) {
+            this.texture[i] = reg.registerIcon(GTPlusPlus.ID + ":ion" + i);
         }
-        IonParticles.baseTexture = reg.registerIcon(GTPlusPlus.ID + ":" + "ion/IonBase");
     }
 
     @Override
     public IIcon getIconFromDamage(int meta) {
-        return IonParticles.overlays[meta];
+        return this.texture[meta];
     }
 
     @Override
@@ -157,11 +154,7 @@ public class IonParticles extends BaseItemParticle {
 
     @Override
     public IIcon getIconFromDamageForRenderPass(int aMeta, int aPass) {
-        if (aPass == 0) {
-            return IonParticles.baseTexture;
-        } else {
-            return IonParticles.overlays[aMeta];
-        }
+        return this.texture[aMeta];
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
index 0c3d481fd7..7e6f57eecd 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java
@@ -43,8 +43,7 @@ public class StandardBaseParticles extends BaseItemParticle {
             MetaToNameMap.put(key, Utils.sanitizeString(s.toLowerCase()));
             for (Particle o : Particle.aMap) {
                 int aColour = 0;
-                if (o.mParticleName.toLowerCase()
-                    .equals(s.toLowerCase())) {
+                if (o.mParticleName.equalsIgnoreCase(s)) {
                     if (o.mParticleType == ElementaryGroup.BARYON) {
                         aColour = Utils.rgbtoHexValue(174, 226, 156);
                         aColourMap.put(key++, aColour);
@@ -109,7 +108,6 @@ public class StandardBaseParticles extends BaseItemParticle {
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
         Particle aCharge = getParticle(stack);
         EnumChatFormatting aColour = EnumChatFormatting.GRAY;
-        String aState = aColour + "Unknown" + EnumChatFormatting.RESET;
         if (aCharge != null) {
             String aGroup = aCharge.mParticleType.name()
                 .toLowerCase();
@@ -130,13 +128,11 @@ public class StandardBaseParticles extends BaseItemParticle {
                         } else if (aGroup.toLowerCase()
                             .contains("meson")) {
                                 aColour = EnumChatFormatting.WHITE;
-                            } else {
-                                aColour = EnumChatFormatting.GRAY;
                             }
             String aFirstLet = aGroup.substring(0, 1)
                 .toUpperCase();
             aGroup = aGroup.replaceFirst(aGroup.substring(0, 1), aFirstLet);
-            aState = aColour + aGroup + EnumChatFormatting.RESET;
+            String aState = aColour + aGroup + EnumChatFormatting.RESET;
             list.add(EnumChatFormatting.GRAY + "Type: " + aState);
         }
         super.addInformation(stack, player, list, bool);
@@ -145,7 +141,7 @@ public class StandardBaseParticles extends BaseItemParticle {
     @Override
     public void registerIcons(IIconRegister reg) {
         for (int i = 0; i < this.icons.length; i++) {
-            this.icons[i] = reg.registerIcon(GTPlusPlus.ID + ":" + "particle/new/" + i);
+            this.icons[i] = reg.registerIcon(GTPlusPlus.ID + ":particle/" + i);
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java
index e82e6f1b44..84cb087e1c 100644
--- a/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java
+++ b/src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java
@@ -15,11 +15,10 @@ import net.minecraft.util.IIcon;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.util.Utils;
 
 public class ItemAirFilter extends Item {
 
-    public IIcon[] icons = new IIcon[1];
+    public IIcon[] icons = new IIcon[2];
 
     public ItemAirFilter() {
         super();
@@ -33,12 +32,13 @@ public class ItemAirFilter extends Item {
 
     @Override
     public void registerIcons(IIconRegister reg) {
-        this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemAirFilter");
+        this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemAirFilter1");
+        this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemAirFilter2");
     }
 
     @Override
     public IIcon getIconFromDamage(int meta) {
-        return this.icons[0];
+        return this.icons[meta];
     }
 
     @Override
@@ -60,7 +60,7 @@ public class ItemAirFilter extends Item {
             return "Air Filter";
         }
 
-        String itemName = tItem == null ? "Air Filter" : super.getItemStackDisplayName(tItem);
+        String itemName = "Air Filter";
         String suffixName = "";
         if (tItem.getItemDamage() == 0) {
             suffixName = " [Tier 1]";
@@ -70,15 +70,6 @@ public class ItemAirFilter extends Item {
         return (itemName + suffixName);
     }
 
-    @Override
-    public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
-        int meta = stack.getItemDamage();
-        if (meta == 1) {
-            HEX_OxFFFFFF = Utils.rgbtoHexValue(150, 180, 35);
-        }
-        return HEX_OxFFFFFF;
-    }
-
     private static boolean createNBT(ItemStack rStack) {
         final NBTTagCompound tagMain = new NBTTagCompound();
         final NBTTagCompound tagNBT = new NBTTagCompound();
@@ -88,11 +79,11 @@ public class ItemAirFilter extends Item {
         return true;
     }
 
-    public static final long getFilterMaxDamage(final ItemStack aStack) {
+    public static long getFilterMaxDamage(final ItemStack aStack) {
         return aStack.getItemDamage() == 0 ? 50 : 2500;
     }
 
-    public static final long getFilterDamage(final ItemStack aStack) {
+    public static long getFilterDamage(final ItemStack aStack) {
         NBTTagCompound aNBT = aStack.getTagCompound();
         if (aNBT != null) {
             aNBT = aNBT.getCompoundTag("AirFilter");
@@ -105,7 +96,7 @@ public class ItemAirFilter extends Item {
         return 0L;
     }
 
-    public static final boolean setFilterDamage(final ItemStack aStack, final long aDamage) {
+    public static boolean setFilterDamage(final ItemStack aStack, final long aDamage) {
         NBTTagCompound aNBT = aStack.getTagCompound();
         if (aNBT != null) {
             aNBT = aNBT.getCompoundTag("AirFilter");
@@ -124,8 +115,7 @@ public class ItemAirFilter extends Item {
         }
         double currentDamage = getFilterDamage(stack);
         double meta = getFilterMaxDamage(stack);
-        double durabilitypercent = currentDamage / meta;
-        return durabilitypercent;
+        return currentDamage / meta;
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
index 8efcfe6912..abba629e27 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java
@@ -13,11 +13,10 @@ import net.minecraft.util.StatCollector;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.util.Utils;
 
 public class ItemBoilerChassis extends Item {
 
-    public IIcon[] icons = new IIcon[1];
+    public IIcon[] icons = new IIcon[3];
 
     public ItemBoilerChassis() {
         super();
@@ -30,12 +29,14 @@ public class ItemBoilerChassis extends Item {
 
     @Override
     public void registerIcons(IIconRegister reg) {
-        this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "itemBoilerChassis");
+        this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemBoilerChassis1");
+        this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemBoilerChassis2");
+        this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":itemBoilerChassis3");
     }
 
     @Override
     public IIcon getIconFromDamage(int meta) {
-        return this.icons[0];
+        return this.icons[meta];
     }
 
     @Override
@@ -54,19 +55,4 @@ public class ItemBoilerChassis extends Item {
     public String getItemStackDisplayName(final ItemStack tItem) {
         return StatCollector.translateToLocalFormatted("item.itemBoilerChassis.name", tItem.getItemDamage());
     }
-
-    @Override // TODO
-    public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) {
-        int meta = stack.getItemDamage();
-        if (meta == 0) {
-            HEX_OxFFFFFF = Utils.rgbtoHexValue(10, 110, 30);
-        } else if (meta == 1) {
-            HEX_OxFFFFFF = Utils.rgbtoHexValue(150, 180, 35);
-        } else if (meta == 2) {
-            HEX_OxFFFFFF = Utils.rgbtoHexValue(200, 85, 40);
-        } else if (meta == 3) {
-            HEX_OxFFFFFF = Utils.rgbtoHexValue(255, 100, 50);
-        }
-        return HEX_OxFFFFFF;
-    }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
index f23f4c8dce..9f0370d993 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoil.java
@@ -30,10 +30,10 @@ public class ItemDehydratorCoil extends Item {
 
     @Override
     public void registerIcons(IIconRegister reg) {
-        this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_0");
-        this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_1");
-        this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_2");
-        this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoil_3");
+        this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_0");
+        this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_1");
+        this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_2");
+        this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoil_3");
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
index 820486b742..6d22766c87 100644
--- a/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
+++ b/src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java
@@ -30,10 +30,10 @@ public class ItemDehydratorCoilWire extends Item {
 
     @Override
     public void registerIcons(IIconRegister reg) {
-        this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_0");
-        this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_1");
-        this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_2");
-        this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":" + "dehydrator/itemDehydratorCoilWire_3");
+        this.icons[0] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoilWire_0");
+        this.icons[1] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoilWire_1");
+        this.icons[2] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoilWire_2");
+        this.icons[3] = reg.registerIcon(GTPlusPlus.ID + ":itemDehydratorCoilWire_3");
     }
 
     @Override
@@ -58,13 +58,4 @@ public class ItemDehydratorCoilWire extends Item {
         return StatCollector
             .translateToLocalFormatted("item.itemDehydratorCoilWire.name", GTValues.VN[tItem.getItemDamage() + 4]);
     }
-
-    /*
-     * @Override public int getColorFromItemStack(final ItemStack stack, int HEX_OxFFFFFF) { int meta =
-     * stack.getItemDamage(); if (meta == 0){ HEX_OxFFFFFF = Utils.rgbtoHexValue(10,110,30); } else if (meta == 1){
-     * HEX_OxFFFFFF = Utils.rgbtoHexValue(150,180,35); } else if (meta == 2){ HEX_OxFFFFFF =
-     * Utils.rgbtoHexValue(200,85,40); } else if (meta == 3){ HEX_OxFFFFFF = Utils.rgbtoHexValue(255,150,50); } return
-     * HEX_OxFFFFFF; }
-     */
-
 }
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
index d1fcf3f5c5..e8cc6ee8f7 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialsElements.java
@@ -10,8 +10,6 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
 
 public final class MaterialsElements {
 
-    public static final String[] NAMES = new String[] { "Hydrogen", "Helium" };
-
     // First 50 Elements
     public final Material HYDROGEN = MaterialUtils.generateMaterialFromGtENUM(Materials.Hydrogen);
     public final Material HELIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.Helium);
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
index 213ee6b47e..29c88ca5f4 100644
--- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
+++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java
@@ -17,6 +17,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.util.GTLog;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.plugin.agrichem.AlgaeDefinition;
 import gtPlusPlus.plugin.agrichem.IAlgalItem;
@@ -25,7 +26,6 @@ import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData;
 public class ItemAlgaeBase extends Item implements IAlgalItem {
 
     protected IIcon base;
-    protected IIcon overlay;
 
     public ItemAlgaeBase() {
         this.setHasSubtypes(true);
@@ -89,8 +89,8 @@ public class ItemAlgaeBase extends Item implements IAlgalItem {
                 aList.add("Lifespan in days: " + mLifespan);
                 aList.add("Generation: " + mGeneration);
             }
-        } catch (Throwable t) {
-            t.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace(GTLog.err);
         }
         super.addInformation(aStack, p_77624_2_, aList, p_77624_4_);
     }
@@ -149,16 +149,12 @@ public class ItemAlgaeBase extends Item implements IAlgalItem {
 
     @Override
     public IIcon getIconFromDamageForRenderPass(final int damage, final int pass) {
-        if (pass == 0) {
-            return this.base;
-        }
-        return this.overlay;
+        return this.base;
     }
 
     @Override
     public void registerIcons(final IIconRegister i) {
-        this.base = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae");
-        this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae_Overlay");
+        this.base = i.registerIcon(GTPlusPlus.ID + ":bioscience/BasicAlgae");
     }
 
     public static ItemStack initNBT(ItemStack aFreshAlgae) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java
index dc0b4a5dd6..e3f264ee84 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/MTETreeFarmerBase.java
@@ -147,7 +147,7 @@ public abstract class MTETreeFarmerBase extends MTETieredMachineBlock {
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log) };
+        return new ITexture[] { new GTRenderedTexture(TexturesGtBlock.Sterile_Casing) };
     }
 
     public ITexture[] getTop(final byte aColor) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
index 7c65de73bd..96fad17286 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
@@ -4,7 +4,6 @@ import java.util.List;
 
 import net.minecraft.block.Block;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
@@ -31,15 +30,6 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA
         public SpecialCasingItemBlock(Block par1) {
             super(par1);
         }
-
-        @Override
-        public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
-            int aMeta = aStack.getItemDamage();
-            if (aMeta < 10) {
-                // aList.add("Tier: "+GT_Values.VN[aMeta]);
-            }
-            super.addInformation(aStack, aPlayer, aList, aF3_H);
-        }
     }
 
     public GregtechMetaSpecialMachineCasings() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
index dba95455c8..d383809972 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -30,10 +30,6 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
 
         @Override
         public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
-            int aMeta = aStack.getItemDamage();
-            if (aMeta < 10) {
-                // aList.add("Tier: "+GT_Values.VN[aMeta]);
-            }
             super.addInformation(aStack, aPlayer, aList, aF3_H);
         }
     }
@@ -97,9 +93,9 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
         return switch (aMeta) {
             case 0 -> TexturesGtBlock.Casing_Redox_1.getIcon();
             case 1 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
-            case 2 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
-            case 3 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
-            case 4 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+            case 2 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TITANIUM.getIcon();
+            case 3 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_STAINLESSSTEEL.getIcon();
+            case 4 -> Textures.BlockIcons.MACHINE_CASING_TURBINE_TUNGSTENSTEEL.getIcon();
             case 5 -> TexturesGtBlock.Casing_Material_RedSteel.getIcon();
             case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
             case 7 -> TexturesGtBlock.Casing_Material_Stellite.getIcon();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
index 50780c5809..100b7833d6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
@@ -71,14 +71,6 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs
         if (aMeta < 10) {
             return TexturesGtBlock.TIERED_MACHINE_HULLS[aMeta].getIcon();
         }
-        return switch (aMeta) {
-            case 10 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
-            case 11 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
-            case 12 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
-            case 13 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
-            case 14 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
-            case 15 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
-            default -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
-        };
+        return Textures.BlockIcons.RENDERING_ERROR.getIcon();
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
index 1da572fb35..dd205136bf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
@@ -59,7 +59,7 @@ public class CasingTextureHandler2 {
                     return Textures.BlockIcons.RENDERING_ERROR.getIcon();
                 }
                 case 15 -> {
-                    return TexturesGtBlock.Casing_Machine_Acacia_Log.getIcon();
+                    return TexturesGtBlock.Sterile_Casing.getIcon();
                 }
                 default -> {
                     return TexturesGtBlock.Overlay_UU_Matter.getIcon();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
index f4d3d22aba..0defa80e6c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java
@@ -8,56 +8,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCentrifuge;
 
 public class TexturesCentrifugeMultiblock {
 
-    private static CustomIcon GT8_1_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE1");
-    private static CustomIcon GT8_1 = new CustomIcon("iconsets/LARGECENTRIFUGE1");
-    private static CustomIcon GT8_2_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE2");
-    private static CustomIcon GT8_2 = new CustomIcon("iconsets/LARGECENTRIFUGE2");
-    private static CustomIcon GT8_3_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE3");
-    private static CustomIcon GT8_3 = new CustomIcon("iconsets/LARGECENTRIFUGE3");
-    private static CustomIcon GT8_4_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE4");
-    private static CustomIcon GT8_4 = new CustomIcon("iconsets/LARGECENTRIFUGE4");
-    private static CustomIcon GT8_5_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5");
-    private static CustomIcon GT8_5 = new CustomIcon("iconsets/LARGECENTRIFUGE5");
-    private static CustomIcon GT8_6_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE6");
-    private static CustomIcon GT8_6 = new CustomIcon("iconsets/LARGECENTRIFUGE6");
-    private static CustomIcon GT8_7_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE7");
-    private static CustomIcon GT8_7 = new CustomIcon("iconsets/LARGECENTRIFUGE7");
-    private static CustomIcon GT8_8_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE8");
-    private static CustomIcon GT8_8 = new CustomIcon("iconsets/LARGECENTRIFUGE8");
-    private static CustomIcon GT8_9_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE9");
-    private static CustomIcon GT8_9 = new CustomIcon("iconsets/LARGECENTRIFUGE9");
-
-    private static CustomIcon frontFace_0 = (GT8_1);
-    private static CustomIcon frontFaceActive_0 = (GT8_1_Active);
-    private static CustomIcon frontFace_1 = (GT8_2);
-    private static CustomIcon frontFaceActive_1 = (GT8_2_Active);
-    private static CustomIcon frontFace_2 = (GT8_3);
-    private static CustomIcon frontFaceActive_2 = (GT8_3_Active);
-    private static CustomIcon frontFace_3 = (GT8_4);
-    private static CustomIcon frontFaceActive_3 = (GT8_4_Active);
-    private static CustomIcon frontFace_4 = (GT8_5);
-    private static CustomIcon frontFaceActive_4 = (GT8_5_Active);
-    private static CustomIcon frontFace_5 = (GT8_6);
-    private static CustomIcon frontFaceActive_5 = (GT8_6_Active);
-    private static CustomIcon frontFace_6 = (GT8_7);
-    private static CustomIcon frontFaceActive_6 = (GT8_7_Active);
-    private static CustomIcon frontFace_7 = (GT8_8);
-    private static CustomIcon frontFaceActive_7 = (GT8_8_Active);
-    private static CustomIcon frontFace_8 = (GT8_9);
-    private static CustomIcon frontFaceActive_8 = (GT8_9_Active);
-
-    CustomIcon[] CENTRIFUGE = new CustomIcon[] { frontFace_0, frontFace_1, frontFace_2, frontFace_3, frontFace_4,
-        frontFace_5, frontFace_6, frontFace_7, frontFace_8 };
-
-    CustomIcon[] CENTRIFUGE_ACTIVE = new CustomIcon[] { frontFaceActive_0, frontFaceActive_1, frontFaceActive_2,
-        frontFaceActive_3, frontFaceActive_4, frontFaceActive_5, frontFaceActive_6, frontFaceActive_7,
-        frontFaceActive_8 };
-
     public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord,
         final ForgeDirection side, final GregtechMetaCasingBlocks thisBlock) {
         return this.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, side, thisBlock);
@@ -143,9 +97,9 @@ public class TexturesCentrifugeMultiblock {
     public IIcon getIconByIndex(IMetaTileEntity aMetaTileEntity, int aIndex) {
         if (isUsingAnimatedTexture(aMetaTileEntity)) {
             if (isCentrifugeRunning(aMetaTileEntity)) {
-                return this.CENTRIFUGE_ACTIVE[aIndex].getIcon();
+                return TexturesGtBlock.CENTRIFUGEACTIVE[aIndex].getIcon();
             }
         }
-        return this.CENTRIFUGE[aIndex].getIcon();
+        return TexturesGtBlock.CENTRIFUGE[aIndex].getIcon();
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index a0ee2891a2..2f87a3b6fb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -157,33 +157,33 @@ public class TexturesGtBlock {
     // spotless:off
     public static final CustomIcon Casing_Coil_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL");
     public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon(
-        "NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic");
+        "qft/NeutronPulseManipulator") : new CustomIcon("qft/NeutronPulseManipulatorStatic");
     public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon(
-        "CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic");
+        "qft/CosmicFabricManipulator") : new CustomIcon("qft/CosmicFabricManipulatorStatic");
     public static final CustomIcon InfinityInfusedManipulator = mAnimated ? new CustomIcon(
-        "InfinityInfusedManipulator") : new CustomIcon("InfinityInfusedManipulatorStatic");
+        "qft/InfinityInfusedManipulator") : new CustomIcon("qft/InfinityInfusedManipulatorStatic");
     public static final CustomIcon SpaceTimeContinuumRipper = mAnimated ? new CustomIcon(
-        "SpaceTimeContinuumRipper") : new CustomIcon("SpaceTimeContinuumRipperStatic");
-    public static final CustomIcon Manipulator_Top = new CustomIcon("Manipulator_Top");
+        "qft/SpaceTimeContinuumRipper") : new CustomIcon("qft/SpaceTimeContinuumRipperStatic");
+    public static final CustomIcon Manipulator_Top = new CustomIcon("qft/Manipulator_Top");
     public static final CustomIcon NeutronShieldingCore = mAnimated ? new CustomIcon(
-        "NeutronShieldingCore") : new CustomIcon("NeutronShieldingCoreStatic");
+        "qft/NeutronShieldingCore") : new CustomIcon("qft/NeutronShieldingCoreStatic");
     public static final CustomIcon CosmicFabricShieldingCore = mAnimated ? new CustomIcon(
-        "CosmicFabricShieldingCore") : new CustomIcon("CosmicFabricShieldingCoreStatic");
+        "qft/CosmicFabricShieldingCore") : new CustomIcon("qft/CosmicFabricShieldingCoreStatic");
     public static final CustomIcon InfinityInfusedShieldingCore = mAnimated ? new CustomIcon(
-        "InfinityInfusedShieldingCore") : new CustomIcon("InfinityInfusedShieldingCoreStatic");
+        "qft/InfinityInfusedShieldingCore") : new CustomIcon("qft/InfinityInfusedShieldingCoreStatic");
     public static final CustomIcon SpaceTimeBendingCore = mAnimated ? new CustomIcon(
-        "SpaceTimeBendingCore") : new CustomIcon("SpaceTimeBendingCoreStatic");
-    public static final CustomIcon ForceFieldGlass = new CustomIcon("ForceFieldGlass");
-    public static final CustomIcon ForceField = new CustomIcon("rendering/ForceField");
-    public static final CustomIcon Blank = new CustomIcon("Blank");
+        "qft/SpaceTimeBendingCore") : new CustomIcon("qft/SpaceTimeBendingCoreStatic");
+    public static final CustomIcon ForceFieldGlass = new CustomIcon("qft/ForceFieldGlass");
+    public static final CustomIcon ForceField = new CustomIcon("qft/ForceField");
+    public static final CustomIcon Blank = new CustomIcon("qft/blank");
     //spotless:on
 
     // MACHINE_CASING_FARM_MANAGER_STRUCTURAL
     // Farm Manager Casings
     public static final CustomIcon Casing_Machine_Farm_Manager = new CustomIcon(
         "TileEntities/MACHINE_CASING_FARM_MANAGER_STRUCTURAL");
-    // Acacia_Log
-    public static final CustomIcon Casing_Machine_Acacia_Log = new CustomIcon("TileEntities/log_acacia_top");
+    // Sterile Casing
+    public static final CustomIcon Sterile_Casing = new CustomIcon("TileEntities/sterileCasing");
     // Podzol Top
     public static final CustomIcon Casing_Machine_Podzol = new CustomIcon("TileEntities/dirt_podzol_top");
 
@@ -310,10 +310,6 @@ public class TexturesGtBlock {
     public static final CustomIcon Overlay_Machine_Screen_Logo = new CustomIcon("TileEntities/adv_machine_screen_logo");
 
     // Machine Controller Overlays
-    // public static final CustomIcon Overlay_Machine_Controller_Default = new CustomIcon(
-    // "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED");
-    // public static final CustomIcon Overlay_Machine_Controller_Default_Active = new CustomIcon(
-    // "iconsets/OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ANIMATED_ACTIVE");
 
     // oMCD = Overlay_Machine_Controller_Default
     public static final CustomIcon oMCDSolarTower = new CustomIcon("iconsets/controllerFaces/solarTower");
@@ -562,6 +558,25 @@ public class TexturesGtBlock {
     public static final CustomIcon TEXTURE_TECH_B = new CustomIcon("metro/TEXTURE_TECH_B");
     public static final CustomIcon TEXTURE_TECH_C = new CustomIcon("metro/TEXTURE_TECH_C");
 
+    private static final CustomIcon GT8_1_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE1");
+    private static final CustomIcon GT8_1 = new CustomIcon("iconsets/LARGECENTRIFUGE1");
+    private static final CustomIcon GT8_2_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE2");
+    private static final CustomIcon GT8_2 = new CustomIcon("iconsets/LARGECENTRIFUGE2");
+    private static final CustomIcon GT8_3_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE3");
+    private static final CustomIcon GT8_3 = new CustomIcon("iconsets/LARGECENTRIFUGE3");
+    private static final CustomIcon GT8_4_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE4");
+    private static final CustomIcon GT8_4 = new CustomIcon("iconsets/LARGECENTRIFUGE4");
+    private static final CustomIcon GT8_5_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE5");
+    private static final CustomIcon GT8_5 = new CustomIcon("iconsets/LARGECENTRIFUGE5");
+    private static final CustomIcon GT8_6_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE6");
+    private static final CustomIcon GT8_6 = new CustomIcon("iconsets/LARGECENTRIFUGE6");
+    private static final CustomIcon GT8_7_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE7");
+    private static final CustomIcon GT8_7 = new CustomIcon("iconsets/LARGECENTRIFUGE7");
+    private static final CustomIcon GT8_8_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE8");
+    private static final CustomIcon GT8_8 = new CustomIcon("iconsets/LARGECENTRIFUGE8");
+    private static final CustomIcon GT8_9_Active = new CustomIcon("iconsets/LARGECENTRIFUGE_ACTIVE9");
+    private static final CustomIcon GT8_9 = new CustomIcon("iconsets/LARGECENTRIFUGE9");
+
     public static final CustomIcon TEXTURE_TECH_PANEL_D = new CustomIcon("metro/TEXTURE_TECH_PANEL_D");
     public static final CustomIcon TEXTURE_TECH_PANEL_H = new CustomIcon("metro/TEXTURE_TECH_PANEL_H");
 
@@ -593,4 +608,10 @@ public class TexturesGtBlock {
         TEXTURE_CASING_TIERED_LV, TEXTURE_CASING_TIERED_MV, TEXTURE_CASING_TIERED_HV, TEXTURE_CASING_TIERED_EV,
         TEXTURE_CASING_TIERED_IV, TEXTURE_CASING_TIERED_LuV, TEXTURE_CASING_TIERED_ZPM, TEXTURE_CASING_TIERED_UV,
         TEXTURE_CASING_TIERED_MAX };
+
+    public static IIconContainer[] CENTRIFUGE = new IIconContainer[] { GT8_1, GT8_2, GT8_3, GT8_4, GT8_5, GT8_6, GT8_7,
+        GT8_8, GT8_9 };
+
+    public static IIconContainer[] CENTRIFUGEACTIVE = new IIconContainer[] { GT8_1_Active, GT8_2_Active, GT8_3_Active,
+        GT8_4_Active, GT8_5_Active, GT8_6_Active, GT8_7_Active, GT8_8_Active, GT8_9_Active };
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java
index 31450cc303..93ec17e6ea 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineGas.java
@@ -14,10 +14,8 @@ import net.minecraftforge.fluids.FluidStack;
 import org.jetbrains.annotations.NotNull;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
@@ -26,7 +24,6 @@ import gregtech.api.recipe.maps.FuelBackend;
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.TurbineStatCalculator;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("deprecation")
 public class MTELargeTurbineGas extends MTELargerTurbineBase {
@@ -200,14 +197,4 @@ public class MTELargeTurbineGas extends MTELargerTurbineBase {
     protected String getCasingName() {
         return "Reinforced Gas Turbine Casing";
     }
-
-    @Override
-    protected ITexture getTextureFrontFace() {
-        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
-    }
-
-    @Override
-    protected ITexture getTextureFrontFaceActive() {
-        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java
index a608cbfc07..fddacc5662 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSCSteam.java
@@ -7,16 +7,13 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.TurbineStatCalculator;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class MTELargeTurbineSCSteam extends MTELargerTurbineBase {
 
@@ -160,14 +157,4 @@ public class MTELargeTurbineSCSteam extends MTELargerTurbineBase {
     protected String getCasingName() {
         return "Reinforced SC Turbine Casing";
     }
-
-    @Override
-    protected ITexture getTextureFrontFace() {
-        return TextureFactory.of(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
-    }
-
-    @Override
-    protected ITexture getTextureFrontFaceActive() {
-        return TextureFactory.of(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java
index afa13de0be..25650fad08 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSHSteam.java
@@ -7,15 +7,12 @@ import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.GTMod;
 import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.TurbineStatCalculator;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("deprecation")
 public class MTELargeTurbineSHSteam extends MTELargerTurbineBase {
@@ -176,14 +173,4 @@ public class MTELargeTurbineSHSteam extends MTELargerTurbineBase {
     protected String getCasingName() {
         return "Reinforced HP Steam Turbine Casing";
     }
-
-    @Override
-    protected ITexture getTextureFrontFace() {
-        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
-    }
-
-    @Override
-    protected ITexture getTextureFrontFaceActive() {
-        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java
index 72a50cacf3..0de134950c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargeTurbineSteam.java
@@ -8,14 +8,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 import gregtech.GTMod;
-import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.TurbineStatCalculator;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("deprecation")
 public class MTELargeTurbineSteam extends MTELargerTurbineBase {
@@ -187,14 +184,4 @@ public class MTELargeTurbineSteam extends MTELargerTurbineBase {
     protected String getCasingName() {
         return "Reinforced Steam Turbine Casing";
     }
-
-    @Override
-    protected ITexture getTextureFrontFace() {
-        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
-    }
-
-    @Override
-    protected ITexture getTextureFrontFaceActive() {
-        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
index 6e471c2829..dc2f105bbb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
@@ -57,10 +57,64 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
+import gtPlusPlus.xmod.gregtech.api.objects.GTPPRenderedTexture;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerTurbineBase>
     implements ISurvivalConstructable {
 
+    private static final String STRUCTURE_PIECE_MAIN = "main";
+    private static final ClassValue<IStructureDefinition<MTELargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
+
+        @Override
+        @SuppressWarnings("SpellCheckingInspection")
+        protected IStructureDefinition<MTELargerTurbineBase> computeValue(Class<?> type) {
+            return StructureDefinition.<MTELargerTurbineBase>builder()
+                // c = turbine casing
+                // s = turbine shaft
+                // t = turbine housing
+                // h = dynamo/maint
+                // m = muffler
+                .addShape(
+                    STRUCTURE_PIECE_MAIN,
+                    (new String[][] { { "ccchccc", "ccccccc", "ccmmmcc", "ccm~mcc", "ccmmmcc", "ccccccc", "ccchccc" },
+                        { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
+                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+                        { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
+                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
+                        { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
+                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, }))
+                .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta())))
+                .addElement('s', lazy(t -> ofBlock(t.getShaftBlock(), t.getTurbineShaftMeta())))
+                .addElement(
+                    't',
+                    lazy(
+                        t -> buildHatchAdder(MTELargerTurbineBase.class).adder(MTELargerTurbineBase::addTurbineHatch)
+                            .hatchClass(MTEHatchTurbine.class)
+                            .casingIndex(t.getCasingTextureIndex())
+                            .dot(1)
+                            .build()))
+                .addElement(
+                    'h',
+                    lazy(
+                        t -> buildHatchAdder(MTELargerTurbineBase.class)
+                            .atLeast(InputBus, InputHatch, OutputHatch, Dynamo.or(TTDynamo), Maintenance)
+                            .casingIndex(t.getCasingTextureIndex())
+                            .dot(4)
+                            .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
+                .addElement(
+                    'm',
+                    lazy(
+                        t -> buildHatchAdder(MTELargerTurbineBase.class).atLeast(Muffler)
+                            .casingIndex(t.getCasingTextureIndex())
+                            .dot(7)
+                            .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
+                .build();
+        }
+    };
+
     protected int baseEff = 0;
     protected long optFlow = 0;
     protected long euPerTurbine = 0;
@@ -71,27 +125,20 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
     protected double mufflerReduction = 1;
     protected float[] flowMultipliers = new float[] { 1, 1, 1 };
 
-    public ITexture frontFace;
-    public ITexture frontFaceActive;
+    public ITexture frontFace = new GTPPRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
+    public ITexture frontFaceActive = new GTPPRenderedTexture(
+        TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
 
     public ArrayList<MTEHatchTurbine> mTurbineRotorHatches = new ArrayList<>();
 
     public MTELargerTurbineBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
-        frontFace = getTextureFrontFace();
-        frontFaceActive = getTextureFrontFaceActive();
     }
 
     public MTELargerTurbineBase(String aName) {
         super(aName);
-        frontFace = getTextureFrontFace();
-        frontFaceActive = getTextureFrontFaceActive();
     }
 
-    protected abstract ITexture getTextureFrontFace();
-
-    protected abstract ITexture getTextureFrontFaceActive();
-
     protected abstract String getTurbineType();
 
     protected abstract String getCasingName();
@@ -135,58 +182,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
         return tt;
     }
 
-    private static final String STRUCTURE_PIECE_MAIN = "main";
-    private static final ClassValue<IStructureDefinition<MTELargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() {
-
-        @Override
-        @SuppressWarnings("SpellCheckingInspection")
-        protected IStructureDefinition<MTELargerTurbineBase> computeValue(Class<?> type) {
-            return StructureDefinition.<MTELargerTurbineBase>builder()
-                // c = turbine casing
-                // s = turbine shaft
-                // t = turbine housing
-                // h = dynamo/maint
-                // m = muffler
-                .addShape(
-                    STRUCTURE_PIECE_MAIN,
-                    (new String[][] { { "ccchccc", "ccccccc", "ccmmmcc", "ccm~mcc", "ccmmmcc", "ccccccc", "ccchccc" },
-                        { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
-                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
-                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
-                        { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
-                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
-                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" },
-                        { "ctchctc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "cscccsc", "ctchctc" },
-                        { "ccchccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccccccc", "ccchccc" }, }))
-                .addElement('c', lazy(t -> ofBlock(t.getCasingBlock(), t.getCasingMeta())))
-                .addElement('s', lazy(t -> ofBlock(t.getShaftBlock(), t.getTurbineShaftMeta())))
-                .addElement(
-                    't',
-                    lazy(
-                        t -> buildHatchAdder(MTELargerTurbineBase.class).adder(MTELargerTurbineBase::addTurbineHatch)
-                            .hatchClass(MTEHatchTurbine.class)
-                            .casingIndex(t.getCasingTextureIndex())
-                            .dot(1)
-                            .build()))
-                .addElement(
-                    'h',
-                    lazy(
-                        t -> buildHatchAdder(MTELargerTurbineBase.class)
-                            .atLeast(InputBus, InputHatch, OutputHatch, Dynamo.or(TTDynamo), Maintenance)
-                            .casingIndex(t.getCasingTextureIndex())
-                            .dot(4)
-                            .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
-                .addElement(
-                    'm',
-                    lazy(
-                        t -> buildHatchAdder(MTELargerTurbineBase.class).atLeast(Muffler)
-                            .casingIndex(t.getCasingTextureIndex())
-                            .dot(7)
-                            .buildAndChain(t.getCasingBlock(), t.getCasingMeta())))
-                .build();
-        }
-    };
-
     @Override
     public IStructureDefinition<MTELargerTurbineBase> getStructureDefinition() {
         return STRUCTURE_DEFINITION.get(getClass());
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java
index 2fa2c1aed9..3385125bb7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java
@@ -8,11 +8,9 @@ import net.minecraftforge.fluids.FluidStack;
 
 import org.jetbrains.annotations.NotNull;
 
-import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.MetaGeneratedTool;
-import gregtech.api.objects.GTRenderedTexture;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
@@ -24,7 +22,6 @@ import gregtech.api.util.TurbineStatCalculator;
 import gregtech.api.util.shutdown.ShutDownReasonRegistry;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine;
-import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 @SuppressWarnings("deprecation")
 public class MTELargerTurbinePlasma extends MTELargerTurbineBase {
@@ -295,14 +292,4 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase {
     protected String getCasingName() {
         return "Reinforced Plasma Turbine Casing";
     }
-
-    @Override
-    protected ITexture getTextureFrontFace() {
-        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced);
-    }
-
-    @Override
-    protected ITexture getTextureFrontFaceActive() {
-        return new GTRenderedTexture(TexturesGtBlock.Overlay_Machine_Controller_Advanced_Active);
-    }
 }