Remove 32x textures (#3276)

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

6 files changed, 39 insertions, 83 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; }
-     */
-
 }