Remove 32x textures (#3276)

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

6 files changed, 46 insertions, 93 deletions

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