Part 2

Boiler Chassi and Volumetric Flasks by @SABITRON
Hypervisor Matrix by bapy_ on discord
Moved dehydrator wires, particles to higher folder

src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java

@@ -145,7 +145,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool
     @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);
         }
     }
 

src/main/java/gtPlusPlus/core/item/general/ItemAirFilter.java

@@ -15,11 +15,10 @@
 
 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 ItemAirFilter() {
 
     @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 String getItemStackDisplayName(final ItemStack tItem) {
             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 String getItemStackDisplayName(final ItemStack tItem) {
         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 @@ private static boolean createNBT(ItemStack rStack) {
         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 static final long getFilterDamage(final ItemStack aStack) {
         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 double getDurabilityForDisplay(ItemStack stack) {
         }
         double currentDamage = getFilterDamage(stack);
         double meta = getFilterMaxDamage(stack);
-        double durabilitypercent = currentDamage / meta;
-        return durabilitypercent;
+        return currentDamage / meta;
     }
 
     @Override

src/main/java/gtPlusPlus/core/item/general/chassis/ItemBoilerChassis.java

@@ -13,11 +13,10 @@
 
 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 ItemBoilerChassis() {
 
     @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 String getUnlocalizedName(ItemStack stack) {
     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;
-    }
 }

src/main/java/gtPlusPlus/core/item/general/chassis/ItemDehydratorCoilWire.java

@@ -30,10 +30,10 @@ public ItemDehydratorCoilWire() {
 
     @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

src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java

@@ -310,10 +310,6 @@ public ResourceLocation getTextureFile() {
     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");