ref(texture_api): update to the texture api (#386)

* ref(textures): replace deprecated texture objects with api

* :spotlessapply

8 files changed, 79 insertions, 75 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index 026d3d471f..fda6ef9653 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -3,10 +3,10 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.TAE;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
@@ -22,7 +22,7 @@ public class GregtechMetaCasingBlocks extends GregtechMetaCasingBlocksAbstract {
             if (i == 2 || i == 3 || i == 4) {
                 continue;
             }
-            TAE.registerTexture(0, i, new GTPP_CopiedBlockTexture(this, 6, i));
+            TAE.registerTexture(0, i, TextureFactory.of(this, i));
         }
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Centrifuge Casing");
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
index f71805784b..3efd94582c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
@@ -1,11 +1,11 @@
 package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import gregtech.api.enums.TAE;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.blocks.GT_Material_Casings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler2;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController;
 import java.util.List;
@@ -42,7 +42,7 @@ public class GregtechMetaCasingBlocks2 extends GregtechMetaCasingBlocksAbstract
             if (i == 4 || i == 10 || i == 11 || i == 12 || i == 14) {
                 continue;
             }
-            TAE.registerTexture(1, i, new GTPP_CopiedBlockTexture(this, 6, i));
+            TAE.registerTexture(1, i, TextureFactory.of(this, i));
         }
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Thermal Processing Casing");
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Hastelloy-N Sealant Block");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index 59bcfa5347..8adf468731 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -3,11 +3,11 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.TAE;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.blocks.GT_Material_Casings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler3;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController;
@@ -48,7 +48,7 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract
             if (i >= 4 && i <= 8) {
                 continue;
             }
-            TAE.registerTexture(2, i, new GTPP_CopiedBlockTexture(this, 6, i));
+            TAE.registerTexture(2, i, TextureFactory.of(this, i));
         }
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Aquatic Casing");
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel Reinforced Casing");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
index 5456aa27a2..89ef238eab 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
@@ -2,10 +2,10 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
@@ -18,7 +18,7 @@ public class GregtechMetaCasingBlocks4 extends GregtechMetaCasingBlocksAbstract
             if (i == 2 || i == 4 || i == 5 || i == 6 || i == 7 || i == 8 || i == 12 || i == 13 || i == 14 || i == 15) {
                 continue;
             }
-            TAE.registerTexture(3, i, new GTPP_CopiedBlockTexture(this, 6, i));
+            TAE.registerTexture(3, i, TextureFactory.of(this, i));
         }
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".0.name", "Naquadah Reactor Base"); // 48
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Reactor Piping");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
index 834fb2c186..8f54ff8e57 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
@@ -4,10 +4,10 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGrinderMultiblock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.item.ItemStack;
@@ -25,23 +25,23 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract
         super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.5", GT_Material_Casings.INSTANCE);
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".0.name", "IsaMill Exterior Casing"); // IsaMill Casing
-        TAE.registerTexture(0, 2, new GTPP_CopiedBlockTexture(this, 6, 0));
+        TAE.registerTexture(0, 2, TextureFactory.of(this, 0));
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".1.name", "IsaMill Piping"); // IsaMill Pipe
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".2.name", "IsaMill Gearbox"); // IsaMill Gearbox
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".3.name", "Elemental Confinement Shell"); // Duplicator Casing
-        TAE.registerTexture(0, 3, new GTPP_CopiedBlockTexture(this, 6, 3));
+        TAE.registerTexture(0, 3, TextureFactory.of(this, 3));
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".4.name", "Sparge Tower Exterior Casing"); // Sparge Tower Casing
-        TAE.registerTexture(0, 4, new GTPP_CopiedBlockTexture(this, 6, 4));
+        TAE.registerTexture(0, 4, TextureFactory.of(this, 4));
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".5.name", "Sturdy Printer Casing"); // Unused
-        TAE.registerTexture(1, 10, new GTPP_CopiedBlockTexture(this, 6, 5));
+        TAE.registerTexture(1, 10, TextureFactory.of(this, 5));
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".6.name", "Forge Casing"); // Forge Hammer Casing
-        TAE.registerTexture(1, 11, new GTPP_CopiedBlockTexture(this, 6, 6));
+        TAE.registerTexture(1, 11, TextureFactory.of(this, 6));
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", ""); // Unused
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", ""); // Unused
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", ""); // Unused
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 f0a69e49d3..9a375296d6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
@@ -2,10 +2,10 @@ package gtPlusPlus.xmod.gregtech.common.blocks;
 
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import java.util.List;
 import net.minecraft.block.Block;
@@ -42,7 +42,7 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA
                 this.getUnlocalizedName() + ".1.name", "Sturdy Aluminium Machine Casing");
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".2.name", "Vigorous Laurenium Machine Casing");
-        TAE.registerTexture(84, new GTPP_CopiedBlockTexture(this, 6, 2));
+        TAE.registerTexture(84, TextureFactory.of(this, 2));
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".3.name", "Rugged Botmium Machine Casing");
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "");
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 96a4e6da82..a0a8a3bf34 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -4,10 +4,10 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Material_Casings;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.api.objects.GTPP_CopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.turbine.LargeTurbineTextureHandler;
 import java.util.List;
@@ -59,7 +59,7 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".13.name", "Particle Containment Casing");
         GT_LanguageManager.addStringLocalization(
                 this.getUnlocalizedName() + ".14.name", "Reinforced Heat Exchanger Casing");
-        TAE.registerTexture(1, 12, new GTPP_CopiedBlockTexture(this, 6, 14));
+        TAE.registerTexture(1, 12, TextureFactory.of(this, 14));
         GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".15.name", ""); // Unused
 
         GregtechItemList.Casing_Turbine_Shaft.set(new ItemStack(this, 1, 0));
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 a0e7fd0875..67b2eef707 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
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
@@ -96,8 +96,8 @@ public class TexturesGtBlock {
         }
     }
 
-    public static GT_RenderedTexture getTextureFromIcon(CustomIcon aIcon, short[] aRGB) {
-        return new GT_RenderedTexture(aIcon, aRGB);
+    public static ITexture getTextureFromIcon(CustomIcon aIcon, short[] aRGB) {
+        return TextureFactory.of(aIcon, aRGB);
     }
 
     /*
@@ -744,68 +744,72 @@ public class TexturesGtBlock {
 
     // Overlay Arrays
     public static ITexture[] OVERLAYS_ENERGY_OUT_BUFFER = new ITexture[] {
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 100, 0, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 255, 30, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {128, 128, 128, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0})
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {220, 220, 220, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 100, 0, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {255, 255, 30, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {128, 128, 128, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_BUFFER, new short[] {240, 240, 245, 0})
     };
 
     public static ITexture[] OVERLAYS_ENERGY_OUT_MULTI_BUFFER = new ITexture[] {
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 100, 0, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 255, 30, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {128, 128, 128, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0})
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {220, 220, 220, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 100, 0, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {255, 255, 30, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {128, 128, 128, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0}),
+        TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI_BUFFER, new short[] {240, 240, 245, 0})
     };
 
     public static ITexture[] OVERLAYS_CABINET_FRONT = new ITexture[] {
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_1, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_2, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_3, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_4, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_5, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_6, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_7, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_8, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_9, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_10, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_11, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_12, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_13, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_14, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_15, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_CABINET_16, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_1, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_2, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_3, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_4, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_5, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_6, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_7, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_8, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_9, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_10, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_11, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_12, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_13, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_14, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_15, new short[] {255, 255, 255, 0}),
+        TextureFactory.of(OVERLAY_CABINET_16, new short[] {255, 255, 255, 0}),
     };
 
-    public static ITexture[] OVERLAYS_COMPARTMENT_FRONT = new ITexture[] {
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_1, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_2, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_3, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_4, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_5, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_6, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_7, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_8, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_9, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_10, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_11, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_12, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_13, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_14, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_15, new short[] {255, 255, 255, 0}),
-        new GT_RenderedTexture((IIconContainer) OVERLAY_COMPARTMENT_16, new short[] {255, 255, 255, 0}),
-    };
+    public static ITexture[] OVERLAYS_COMPARTMENT_FRONT;
+
+    static {
+        OVERLAYS_COMPARTMENT_FRONT = new ITexture[] {
+            TextureFactory.of(OVERLAY_COMPARTMENT_1, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_2, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_3, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_4, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_5, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_6, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_7, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_8, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_9, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_10, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_11, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_12, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_13, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_14, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_15, new short[] {255, 255, 255, 0}),
+            TextureFactory.of(OVERLAY_COMPARTMENT_16, new short[] {255, 255, 255, 0}),
+        };
+    }
 
     public static IIconContainer[] CONNECTED_FUSION_HULLS = new IIconContainer[] {
         TEXTURE_CASING_FUSION_COIL_II_1, TEXTURE_CASING_FUSION_COIL_II_2, TEXTURE_CASING_FUSION_COIL_II_3,