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

This reverts commit 0121112e5ea9c72050957af2c2ad4aecd9d70270.

60 files changed, 521 insertions, 484 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
index 6cdd391c49..79400b68e6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java
@@ -9,7 +9,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
@@ -836,13 +836,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
-            Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], TextureFactory.of(BlockIcons.OVERLAY_PIPE)
+            Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE)
         };
     }
 
@@ -855,14 +855,14 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java
index be4eb1d4b8..ebce1fcec6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java
@@ -7,7 +7,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.gui.automation.GT_Container_ElectricInventoryManager;
@@ -520,84 +520,84 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red)
         };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Green)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green)
         };
     }
 
     public ITexture[] getNegativeZ(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Blue)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue)
         };
     }
 
     public ITexture[] getPositiveZ(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Cyan)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan)
         };
     }
 
     public ITexture[] getNegativeX(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Purple)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple)
         };
     }
 
     public ITexture[] getPositiveX(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Yellow)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow)
         };
     }
 
     public ITexture[] getBottomRedstone(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
         };
     }
 
     public ITexture[] getTopRedstone(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone)
         };
     }
 
     public ITexture[] getNegativeZRedstone(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone)
         };
     }
 
     public ITexture[] getPositiveZRedstone(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone)
         };
     }
 
     public ITexture[] getNegativeXRedstone(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone)
         };
     }
 
     public ITexture[] getPositiveXRedstone(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Yellow_Redstone)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow_Redstone)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
index 53886c1cac..b990e3c55e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java
@@ -9,7 +9,7 @@ import gregtech.api.interfaces.tileentity.IGregTechDeviceInformation;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
@@ -683,12 +683,12 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi
             final boolean aRedstone) {
         return aSide == aFacing
                 ? new ITexture[] {
-                    TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
-                    TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_Frequency)
+                    new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                    new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency)
                 }
                 : new ITexture[] {
-                    TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
-                    TextureFactory.of(Textures.BlockIcons.VOID)
+                    new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                    new GT_RenderedTexture(Textures.BlockIcons.VOID)
                 };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
index cd4379b488..5d2a9ae009 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java
@@ -5,7 +5,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Config;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
@@ -551,12 +551,12 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic
             final boolean aRedstone) {
         return aSide == aFacing
                 ? new ITexture[] {
-                    TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
-                    TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_Frequency)
+                    new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                    new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency)
                 }
                 : new ITexture[] {
-                    TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
-                    TextureFactory.of(Textures.BlockIcons.VOID)
+                    new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                    new GT_RenderedTexture(Textures.BlockIcons.VOID)
                 };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
index 9f8d56c42d..5bd16c7fb2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
@@ -55,7 +55,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
     }
 
     public ITexture getOverlayIcon() {
-        return TextureFactory.of(Textures.BlockIcons.BOILER_FRONT);
+        return new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT);
     }
 
     @Override
@@ -76,13 +76,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
         return rTextures;
     }
 
-    protected ITexture getCasingTexture() {
+    protected GT_RenderedTexture getCasingTexture() {
         if (this.tier == 1) {
-            return TextureFactory.of(Textures.BlockIcons.MACHINE_LV_SIDE);
+            return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
         } else if (this.tier == 2) {
-            return TextureFactory.of(Textures.BlockIcons.MACHINE_MV_SIDE);
+            return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
         } else {
-            return TextureFactory.of(Textures.BlockIcons.MACHINE_HV_SIDE);
+            return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
         }
         // return new
         // GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
index ebaf1cbab4..867623f692 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base {
@@ -23,14 +23,14 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base {
     }
 
     @Override
-    protected ITexture getCasingTexture() {
-        return TextureFactory.of(Textures.BlockIcons.MACHINE_HV_SIDE);
+    protected GT_RenderedTexture getCasingTexture() {
+        return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
     }
 
     @Override
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
-            super.getFront(aColor)[0], this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.BOILER_FRONT)
+            super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)
         };
     }
 
@@ -39,7 +39,7 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base {
         return new ITexture[] {
             super.getTop(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(TexturesGtBlock.Casing_Material_Talonite)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Talonite)
         };
     }
 
@@ -48,7 +48,7 @@ public class GT_MetaTileEntity_Boiler_HV extends GT_MetaTileEntity_Boiler_Base {
         return new ITexture[] {
             super.getFrontActive(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
+            new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
index 7c6e725c4e..6aeedaa6f3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base {
@@ -23,21 +23,23 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base {
     }
 
     @Override
-    protected ITexture getCasingTexture() {
-        return TextureFactory.of(Textures.BlockIcons.MACHINE_LV_SIDE);
+    protected GT_RenderedTexture getCasingTexture() {
+        return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
     }
 
     @Override
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
-            super.getFront(aColor)[0], this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.BOILER_FRONT)
+            super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)
         };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
-            super.getTop(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Casing_Material_Potin)
+            super.getTop(aColor)[0],
+            this.getCasingTexture(),
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Potin)
         };
     }
 
@@ -46,7 +48,7 @@ public class GT_MetaTileEntity_Boiler_LV extends GT_MetaTileEntity_Boiler_Base {
         return new ITexture[] {
             super.getFrontActive(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
+            new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
index 46bb0fb9b1..9f329f92da 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base {
@@ -23,21 +23,23 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base {
     }
 
     @Override
-    protected ITexture getCasingTexture() {
-        return TextureFactory.of(Textures.BlockIcons.MACHINE_MV_SIDE);
+    protected GT_RenderedTexture getCasingTexture() {
+        return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
     }
 
     @Override
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
-            super.getFront(aColor)[0], this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.BOILER_FRONT)
+            super.getFront(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)
         };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
-            super.getTop(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Casing_Material_Tumbaga)
+            super.getTop(aColor)[0],
+            this.getCasingTexture(),
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Tumbaga)
         };
     }
 
@@ -46,7 +48,7 @@ public class GT_MetaTileEntity_Boiler_MV extends GT_MetaTileEntity_Boiler_Base {
         return new ITexture[] {
             super.getFrontActive(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
+            new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
index c602d3172b..ba6b037d76 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java
@@ -5,7 +5,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
 import gtPlusPlus.core.lib.CORE;
@@ -39,25 +39,25 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
         final ITexture[][][] rTextures = new ITexture[4][17][];
         for (byte i = -1; i < 16; i = (byte) (i + 1)) {
             final ITexture[] tmp0 = {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))
             };
             rTextures[0][(i + 1)] = tmp0;
             final ITexture[] tmp1 = {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)),
-                TextureFactory.of(Textures.BlockIcons.BOILER_SOLAR)
+                new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR)
             };
             rTextures[1][(i + 1)] = tmp1;
             final ITexture[] tmp2 = {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))
             };
             rTextures[2][(i + 1)] = tmp2;
             final ITexture[] tmp3 = {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)),
-                TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE)
+                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
             };
             rTextures[3][(i + 1)] = tmp3;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java
index 09410c5747..340a97fccf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java
@@ -14,7 +14,7 @@ import gregtech.api.enums.Textures;
 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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -70,7 +70,7 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl
     @Override
     public ITexture[][][] getTextureSet(ITexture[] aTextures) {
         ITexture[][][] rTextures = new ITexture[12][17][];
-        ITexture aTex = TextureFactory.of(TexturesGtBlock.Casing_Material_ZirconiumCarbide);
+        GT_RenderedTexture aTex = new GT_RenderedTexture(TexturesGtBlock.Casing_Material_ZirconiumCarbide);
         for (byte i = -1; i < 16; i++) {
             rTextures[0][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]};
             rTextures[1][i + 1] = new ITexture[] {aTex, Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier]};
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
index 76613a0a72..7d9ecebf2c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java
@@ -10,7 +10,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
@@ -113,38 +113,44 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
     public ITexture[] getFront(byte aColor) {
         return new ITexture[] {
             super.getFront(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_FRONT),
+            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
         };
     }
 
     @Override
     public ITexture[] getBack(byte aColor) {
-        return new ITexture[] {super.getBack(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP)};
+        return new ITexture[] {
+            super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP)
+        };
     }
 
     @Override
     public ITexture[] getBottom(byte aColor) {
         return new ITexture[] {
-            super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
+            super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
         };
     }
 
     @Override
     public ITexture[] getTop(byte aColor) {
-        return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE)};
+        return new ITexture[] {
+            super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE)
+        };
     }
 
     @Override
     public ITexture[] getSides(byte aColor) {
-        return new ITexture[] {super.getSides(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP)};
+        return new ITexture[] {
+            super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP)
+        };
     }
 
     @Override
     public ITexture[] getFrontActive(byte aColor) {
         return new ITexture[] {
             super.getFrontActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE),
+            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_FRONT_ACTIVE),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
         };
     }
@@ -152,28 +158,28 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi
     @Override
     public ITexture[] getBackActive(byte aColor) {
         return new ITexture[] {
-            super.getBackActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
+            super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
         };
     }
 
     @Override
     public ITexture[] getBottomActive(byte aColor) {
         return new ITexture[] {
-            super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
+            super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
         };
     }
 
     @Override
     public ITexture[] getTopActive(byte aColor) {
         return new ITexture[] {
-            super.getTopActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE)
+            super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE)
         };
     }
 
     @Override
     public ITexture[] getSidesActive(byte aColor) {
         return new ITexture[] {
-            super.getSidesActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
+            super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_TOP_ACTIVE)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
index 93e21db944..2897f621d6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.lib.CORE;
@@ -88,17 +88,17 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
         return rValue;
     }
 
-    private ITexture getCasingTexture() {
+    private GT_RenderedTexture getCasingTexture() {
         if (this.mTier <= 4) {
-            return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
+            return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
         } else if (this.mTier == 5) {
 
-            return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced);
+            return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
         } else {
 
-            return TextureFactory.of(TexturesGtBlock.Casing_Machine_Ultra);
+            return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
         }
-        // return  TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
+        // return  new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
     }
 
     @Override
@@ -113,20 +113,24 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
     @Override
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
-            super.getBack(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent)
+            super.getBack(aColor)[0],
+            this.getCasingTexture(),
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent)
         };
     }
 
     @Override
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
-            super.getBottom(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_Off)};
+        return new ITexture[] {
+            super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
+        };
     }
 
     @Override
@@ -134,7 +138,7 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
         return new ITexture[] {
             super.getSides(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
         };
     }
 
@@ -152,21 +156,21 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
         return new ITexture[] {
             super.getBackActive(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent_Fast)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast)
         };
     }
 
     @Override
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
-            super.getBottomActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     @Override
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
-            super.getTopActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_On)
+            super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
         };
     }
 
@@ -175,7 +179,7 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke
         return new ITexture[] {
             super.getSidesActive(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
index fcf3ac37cc..ba63952baf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java
@@ -9,7 +9,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.core.lib.CORE;
@@ -94,7 +94,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             super.getFront(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
         };
     }
@@ -103,15 +103,15 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             super.getBack(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BACK),
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Vertical)
+            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK),
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical)
         };
     }
 
     @Override
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
-            super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
+            super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM)
         };
     }
 
@@ -119,21 +119,22 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             super.getTop(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
-            TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER)
+            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER)
         };
     }
 
     @Override
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {super.getSides(aColor)[0], TextureFactory.of(Textures.BlockIcons.BOILER_LAVA_FRONT)};
+        return new ITexture[] {super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT)
+        };
     }
 
     @Override
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] {
             super.getFrontActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE),
+            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
         };
     }
@@ -142,15 +143,15 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] {
             super.getBackActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE),
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active)
+            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BACK_ACTIVE),
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Vertical_Active)
         };
     }
 
     @Override
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
-            super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
+            super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_BOTTOM_ACTIVE)
         };
     }
 
@@ -158,15 +159,15 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
             super.getTopActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
-            TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE)
+            new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE),
+            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE)
         };
     }
 
     @Override
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
-            super.getSidesActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE)
+            super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
index 08e100f61c..b6c2f27ce6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
@@ -75,17 +75,17 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
         return rValue;
     }
 
-    private ITexture getCasingTexture() {
+    private GT_RenderedTexture getCasingTexture() {
         if (this.mTier <= 4) {
-            return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
+            return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
         } else if (this.mTier == 5) {
 
-            return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced);
+            return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
         } else {
 
-            return TextureFactory.of(TexturesGtBlock.Casing_Machine_Ultra);
+            return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Ultra);
         }
-        // return  TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
+        // return  new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
     }
 
     @Override
@@ -100,20 +100,24 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
     @Override
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
-            super.getBack(aColor)[0], this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent)
+            super.getBack(aColor)[0],
+            this.getCasingTexture(),
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent)
         };
     }
 
     @Override
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
-            super.getBottom(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            super.getBottom(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_Off)};
+        return new ITexture[] {
+            super.getTop(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
+        };
     }
 
     @Override
@@ -121,7 +125,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
         return new ITexture[] {
             super.getSides(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal)
         };
     }
 
@@ -139,21 +143,21 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
         return new ITexture[] {
             super.getBackActive(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent_Fast)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast)
         };
     }
 
     @Override
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
-            super.getBottomActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            super.getBottomActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     @Override
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
-            super.getTopActive(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_On)
+            super.getTopActive(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
         };
     }
 
@@ -162,7 +166,7 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue
         return new ITexture[] {
             super.getSidesActive(aColor)[0],
             this.getCasingTexture(),
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Diesel_Horizontal_Active)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
index 8b1c0c7ee1..660fdb50b6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java
@@ -8,7 +8,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SolarGenerator;
@@ -142,52 +142,58 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
     }
 
     ITexture SolarArray[] = {
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL_8V),
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LV),
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL_MV),
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL_HV),
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL_EV),
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV),
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LuV),
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL_ZPM),
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL_UV),
-        TextureFactory.of(Textures.BlockIcons.SOLARPANEL)
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_8V),
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LV),
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_MV),
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_HV),
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_EV),
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV),
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV),
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_ZPM),
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_UV),
+        new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)
     };
 
     @Override
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             super.getFront(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT),
+            new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mTier]
         };
     }
 
     @Override
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] {super.getBack(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
+        return new ITexture[] {
+            super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
+        };
     }
 
     @Override
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] {super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
+        return new ITexture[] {
+            super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
+        };
     }
 
     @Override
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {super.getTop(aColor)[0], TextureFactory.of(Textures.BlockIcons.SOLARPANEL)};
+        return new ITexture[] {super.getTop(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)};
     }
 
     @Override
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {super.getSides(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC)};
+        return new ITexture[] {
+            super.getSides(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC)
+        };
     }
 
     @Override
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] {
             super.getFrontActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE),
+            new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT_ACTIVE),
             Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mTier]
         };
     }
@@ -195,26 +201,26 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener
     @Override
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] {
-            super.getBackActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
+            super.getBackActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
         };
     }
 
     @Override
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
-            super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
+            super.getBottomActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
         };
     }
 
     @Override
     public ITexture[] getTopActive(final byte aColor) {
-        return new ITexture[] {super.getTopActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.SOLARPANEL)};
+        return new ITexture[] {super.getTopActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL)};
     }
 
     @Override
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
-            super.getSidesActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
+            super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_MAGIC_ACTIVE)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
index d18db633fd..5e8907073f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java
@@ -5,7 +5,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
@@ -228,22 +228,22 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
     public ITexture[] getFront(byte aColor) {
         return new ITexture[] {
             super.getFront(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
-            TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB)
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
+            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB)
         };
     }
 
     @Override
     public ITexture[] getBack(byte aColor) {
         return new ITexture[] {
-            super.getBack(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP)
+            super.getBack(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP)
         };
     }
 
     @Override
     public ITexture[] getBottom(byte aColor) {
         return new ITexture[] {
-            super.getBottom(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP)
+            super.getBottom(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP)
         };
     }
 
@@ -251,8 +251,8 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
     public ITexture[] getTop(byte aColor) {
         return new ITexture[] {
             super.getTop(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)
         };
     }
 
@@ -260,7 +260,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
     public ITexture[] getSides(byte aColor) {
         return new ITexture[] {
             gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
             gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()]
         };
     }
@@ -269,22 +269,24 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
     public ITexture[] getFrontActive(byte aColor) {
         return new ITexture[] {
             super.getFrontActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
-            TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE)
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE)
         };
     }
 
     @Override
     public ITexture[] getBackActive(byte aColor) {
         return new ITexture[] {
-            super.getBackActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
+            super.getBackActive(aColor)[0],
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
         };
     }
 
     @Override
     public ITexture[] getBottomActive(byte aColor) {
         return new ITexture[] {
-            super.getBottomActive(aColor)[0], TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
+            super.getBottomActive(aColor)[0],
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE)
         };
     }
 
@@ -292,8 +294,8 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
     public ITexture[] getTopActive(byte aColor) {
         return new ITexture[] {
             super.getTopActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)
         };
     }
 
@@ -301,7 +303,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator
     public ITexture[] getSidesActive(byte aColor) {
         return new ITexture[] {
             gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
+            new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
             gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()]
         };
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java
index 58f8249a19..b8f8004dad 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -56,7 +56,7 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             super.getSidesActive(aColor)[0],
-            TextureFactory.of((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)
+            new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java
index a92b28cb50..09e3e3201c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -56,7 +56,7 @@ public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamT
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             super.getSidesActive(aColor)[0],
-            TextureFactory.of((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)
+            new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
index 922d8ae37e..fb2af1cd44 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
@@ -7,7 +7,7 @@ import gregtech.api.enums.Textures;
 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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -80,9 +80,9 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
         final ITexture[][][] rTextures = new ITexture[2][17][];
         k = j ? g : h;
         for (byte i = -1; i < 16; i++) {
-            rTextures[0][i + 1] = new ITexture[] {TextureFactory.of(k)};
+            rTextures[0][i + 1] = new ITexture[] {new GT_RenderedTexture(k)};
             rTextures[1][i + 1] = new ITexture[] {
-                TextureFactory.of(k),
+                new GT_RenderedTexture(k),
                 this.mInventory.length > 4
                         ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[this.mVoltageTier]
                         : Textures.BlockIcons.OVERLAYS_ENERGY_OUT[this.mVoltageTier]
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
index 363e6b1c95..417833a2ef 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java
@@ -6,8 +6,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.*;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -611,35 +610,35 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Cutter)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter)
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Cutter)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Boxes)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes)
         };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Boxes)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Boxes)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_CropHarvester_Cutter)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_CropHarvester_Cutter)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
index 3a55f81f9f..6ba1e373eb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java
@@ -10,7 +10,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import java.util.ArrayList;
@@ -102,12 +102,16 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered
                 Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1],
                 (pSide < 2)
                         ? null
-                        : pActive ? TextureFactory.of(_mGTIco_Norm_Active) : TextureFactory.of(_mGTIco_Norm_Idle)
+                        : pActive
+                                ? new GT_RenderedTexture(_mGTIco_Norm_Active)
+                                : new GT_RenderedTexture(_mGTIco_Norm_Idle)
             };
         else
             return new ITexture[] {
                 Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1],
-                (pSide < 2) ? null : pActive ? TextureFactory.of(_mGTIco_TE_Active) : TextureFactory.of(_mGTIco_TE_Idle)
+                (pSide < 2)
+                        ? null
+                        : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle)
             };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
index 9c6f252208..23263bd9fd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java
@@ -11,7 +11,7 @@ import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
@@ -59,14 +59,14 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi
                 "Recycler.png",
                 "",
                 new ITexture[] {
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB),
-                    TextureFactory.of(TexturesGtBlock.Overlay_MatterFab_Active),
-                    TextureFactory.of(TexturesGtBlock.Overlay_MatterFab),
-                    TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent_Fast),
-                    TextureFactory.of(TexturesGtBlock.Overlay_Machine_Vent),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB)
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_MASSFAB),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent_Fast),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Vent),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_MASSFAB)
                 });
         mPollutionEnabled = PollutionUtils.isPollutionEnabled();
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java
index 3e7fddb792..531c7c5694 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java
@@ -5,7 +5,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
@@ -44,28 +44,28 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase {
         final ITexture[][][] rTextures = new ITexture[5][17][];
         for (byte i = -1; i < 16; i++) {
             rTextures[0][(i + 1)] = new ITexture[] {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa))
             };
             rTextures[1][(i + 1)] = new ITexture[] {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
-                TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE)
+                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
             };
             rTextures[2][(i + 1)] = new ITexture[] {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
-                TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE)
+                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)
             };
             rTextures[3][(i + 1)] = new ITexture[] {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
-                TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER)
+                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER)
             };
             rTextures[4][(i + 1)] = new ITexture[] {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_CASING_VENT, Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)),
-                TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE)
+                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE)
             };
         }
         return rTextures;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java
index 1c939f88b3..f1e0cc7161 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
@@ -81,70 +81,70 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity {
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
         };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redox_3)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3)
         };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
         };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)
         };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
         };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_Grisium)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Grisium)
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redox_3)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redox_3)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
index b81430156f..ce04d50fab 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
@@ -88,70 +88,70 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity {
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
         };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier + 3][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
index 7476739285..9ba3db911a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -67,12 +67,12 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
             final boolean aRedstone) {
         return aSide == aFacing
                 ? new ITexture[] {
-                    TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
-                    TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_Frequency)
+                    new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                    new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency)
                 }
                 : new ITexture[] {
-                    TextureFactory.of(TexturesGtBlock.Casing_Machine_Dimensional),
-                    TextureFactory.of(Textures.BlockIcons.VOID)
+                    new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional),
+                    new GT_RenderedTexture(Textures.BlockIcons.VOID)
                 };
     }
 
@@ -102,70 +102,70 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity {
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
         };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
index 832f9165de..9b60732f62 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java
@@ -9,7 +9,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.chunkloading.GTPP_ChunkManager;
@@ -125,80 +125,80 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
         };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier])
         };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
         };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
         };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
         };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Material_MaragingSteel),
-            TextureFactory.of(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel),
+            new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1])
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java
index c960b07767..ea2f47ab8e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic;
 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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -74,11 +74,13 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
     }
 
     public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] {getSides(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Metal_Grate_A)};
+        return new ITexture[] {getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_A)
+        };
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] {getSides(aColor)[0], TextureFactory.of(TexturesGtBlock.Casing_Machine_Metal_Grate_B)};
+        return new ITexture[] {getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Metal_Grate_B)
+        };
     }
 
     public ITexture[] getBottom(final byte aColor) {
@@ -86,12 +88,13 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {getSides(aColor)[0], TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
+        return new ITexture[] {
+            getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Material_RedSteel)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Material_RedSteel)};
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
@@ -108,7 +111,7 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
-            getSides(aColor)[0], TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+            getSides(aColor)[0], new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
index d31dbc6f88..ae8be6a161 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java
@@ -5,7 +5,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -32,14 +32,14 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa
                 "Compressor.png",
                 "",
                 new ITexture[] {
-                    TextureFactory.of(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
-                    TextureFactory.of(BlockIcons.OVERLAY_SIDE_MASSFAB),
-                    TextureFactory.of(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
-                    TextureFactory.of(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
-                    TextureFactory.of(TexturesGtBlock.Overlay_MatterFab_Active),
-                    TextureFactory.of(TexturesGtBlock.Overlay_MatterFab),
-                    TextureFactory.of(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
-                    TextureFactory.of(BlockIcons.OVERLAY_BOTTOM_MASSFAB)
+                    new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB_ACTIVE),
+                    new GT_RenderedTexture(BlockIcons.OVERLAY_SIDE_MASSFAB),
+                    new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER_ACTIVE),
+                    new GT_RenderedTexture(BlockIcons.OVERLAY_FRONT_MULTI_SMELTER),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab),
+                    new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB_ACTIVE),
+                    new GT_RenderedTexture(BlockIcons.OVERLAY_BOTTOM_MASSFAB)
                 });
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
index 3a82df61e2..268863ffd2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java
@@ -5,7 +5,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.lib.CORE;
@@ -27,14 +27,14 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM
                 "PotionBrewer.png",
                 "",
                 new ITexture[] {
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE),
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE),
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER)
                 });
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
index a29d589c07..2ae5e1e54a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
@@ -45,14 +45,14 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
                 "ChemicalReactor.png",
                 "",
                 new ITexture[] {
-                    TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Side_Active),
-                    TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Side),
-                    TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Front_Active),
-                    TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Front),
-                    TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
-                    TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Top),
-                    TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
-                    TextureFactory.of(TexturesGtBlock.Overlay_FluidReactor_Top)
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Side_Active),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Side),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Front_Active),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Front),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top_Active),
+                    new GT_RenderedTexture(TexturesGtBlock.Overlay_FluidReactor_Top)
                 });
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
index b79daae514..eb52042b9b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java
@@ -6,7 +6,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
@@ -73,8 +73,8 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
         return this.mTier == 6 ? 0 : this.mTier == 7 ? 1 : 2;
     }
 
-    private ITexture getCasingTexture() {
-        return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced);
+    private GT_RenderedTexture getCasingTexture() {
+        return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
     }
 
     @Override
@@ -382,46 +382,47 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti
     }
 
     public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] {this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_MatterFab)};
+        return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab)};
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] {this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+        return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+        return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+        return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
-            this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+            this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
         };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
-        return new ITexture[] {this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_MatterFab_Active)};
+        return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active)
+        };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
-        return new ITexture[] {this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+        return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+        return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
     }
 
     public ITexture[] getTopActive(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+        return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
-            this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
+            this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
index 3986a90871..08c9934db8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java
@@ -6,7 +6,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
@@ -75,8 +75,8 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
         return this.mTier == 6 ? 0 : this.mTier == 7 ? 1 : 2;
     }
 
-    private ITexture getCasingTexture() {
-        return TextureFactory.of(TexturesGtBlock.Casing_Machine_Advanced);
+    private GT_RenderedTexture getCasingTexture() {
+        return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Advanced);
     }
 
     @Override
@@ -386,46 +386,47 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux
     }
 
     public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] {this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_MatterFab)};
+        return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab)};
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] {this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+        return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+        return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+        return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
-            this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+            this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
         };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
-        return new ITexture[] {this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_MatterFab_Active)};
+        return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_MatterFab_Active)
+        };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
-        return new ITexture[] {this.getCasingTexture(), TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
+        return new ITexture[] {this.getCasingTexture(), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)};
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+        return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
     }
 
     public ITexture[] getTopActive(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
+        return new ITexture[] {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW)};
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
-            this.getCasingTexture(), TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
+            this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Blue)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
index ecb11646fe..f9ecc4be18 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.lib.CORE;
@@ -16,14 +16,14 @@ public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_Ba
 
     public GregtechMetaTileEntity_ReactorColdTrap(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, "Just like the Arctic", 2, 9, "Dehydrator.png", "", new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE),
-            TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE),
-            TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE),
-            TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT),
-            TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
-            TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP),
-            TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
-            TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP)
+            new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE_ACTIVE),
+            new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_SIDE),
+            new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT_ACTIVE),
+            new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_FRONT),
+            new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
+            new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP),
+            new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP_ACTIVE),
+            new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_COLDTRAP_TOP)
         });
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
index 21228465e5..8f8711a7fe 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.lib.CORE;
@@ -27,14 +27,14 @@ public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEnt
                 "Dehydrator.png",
                 "",
                 new ITexture[] {
-                    TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE),
-                    TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE),
-                    TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE),
-                    TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT),
-                    TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
-                    TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP),
-                    TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
-                    TextureFactory.of(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP)
+                    new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE_ACTIVE),
+                    new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_SIDE),
+                    new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT_ACTIVE),
+                    new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_FRONT),
+                    new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
+                    new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP),
+                    new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP_ACTIVE),
+                    new GT_RenderedTexture(TexturesGtBlock.OVERLAY_REACTOR_PROCESSINGUNIT_TOP)
                 });
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index 90a514a126..db74a46f1b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.lib.CORE;
@@ -124,70 +124,70 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_2)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_2)
         };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
index 47a14750e5..439ab234cf 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IronBlastFurnace.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.block.ModBlocks;
@@ -25,9 +25,11 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
 public class GregtechMetaTileEntity_IronBlastFurnace extends MetaTileEntity {
-    private static final ITexture[] FACING_SIDE = {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top)};
-    private static final ITexture[] FACING_FRONT = {TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_Off)};
-    private static final ITexture[] FACING_ACTIVE = {TextureFactory.of(TexturesGtBlock.Casing_Machine_Redstone_On)};
+    private static final ITexture[] FACING_SIDE = {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
+    private static final ITexture[] FACING_FRONT = {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_Off)
+    };
+    private static final ITexture[] FACING_ACTIVE = {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Redstone_On)
+    };
     public int mMaxProgresstime = 0;
     public int mUpdate = 30;
     public int mProgresstime = 0;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
index c9406df111..8df07d8990 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java
@@ -11,6 +11,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer;
@@ -111,7 +112,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
             final boolean aRedstone) {
         if (aSide == aFacing) {
             return new ITexture[] {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)),
                 TextureFactory.builder()
                         .addIcon(this.getIconOverlay())
@@ -120,12 +121,12 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
             };
         } else if (!aActive) {
             return new ITexture[] {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa))
             };
         } else {
             return new ITexture[] {
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA, Dyes.getModulation(-1, Dyes._NULL.mRGBa))
             };
         }
@@ -133,7 +134,7 @@ public class GregtechMetaTileEntity_Adv_Fusion_MK4 extends GT_MetaTileEntity_Fus
 
     @Override
     public ITexture getTextureOverlay() {
-        return TextureFactory.of(
+        return new GT_RenderedTexture(
                 this.mMaxProgresstime > 0
                         ? TexturesGtBlock.Casing_Machine_Screen_3
                         : TexturesGtBlock.Casing_Machine_Screen_1);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
index cc16341236..b030d58993 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
@@ -12,10 +12,9 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.enums.Textures;
-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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.lib.CORE;
@@ -43,13 +42,13 @@ public class GregtechMetaTileEntity_SteamCompressor
     }
 
     @Override
-    protected ITexture getFrontOverlay() {
-        return TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR);
+    protected GT_RenderedTexture getFrontOverlay() {
+        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR);
     }
 
     @Override
-    protected ITexture getFrontOverlayActive() {
-        return TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE);
+    protected GT_RenderedTexture getFrontOverlayActive() {
+        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_STEAM_COMPRESSOR_ACTIVE);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
index 2c55fc7419..b41ccfe2c8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
@@ -11,10 +11,10 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
-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.metatileentity.implementations.*;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
 import gtPlusPlus.core.lib.CORE;
@@ -42,13 +42,13 @@ public class GregtechMetaTileEntity_SteamMacerator
     }
 
     @Override
-    protected ITexture getFrontOverlay() {
-        return TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR);
+    protected GT_RenderedTexture getFrontOverlay() {
+        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR);
     }
 
     @Override
-    protected ITexture getFrontOverlayActive() {
-        return TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE);
+    protected GT_RenderedTexture getFrontOverlayActive() {
+        return new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_STEAM_MACERATOR_ACTIVE);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
index dde4c1127e..d0a7ba9da9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java
@@ -5,7 +5,7 @@ import static gtPlusPlus.core.lib.CORE.RANDOM;
 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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
@@ -161,11 +161,11 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin
 
     @Override
     protected ITexture getTextureFrontFace() {
-        return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS5);
+        return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS5);
     }
 
     @Override
     protected ITexture getTextureFrontFaceActive() {
-        return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5);
+        return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_SS_ACTIVE5);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
index c41af18a23..aad8b0c368 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java
@@ -4,7 +4,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.items.GT_MetaGenerated_Tool;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
@@ -268,11 +268,11 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur
 
     @Override
     protected ITexture getTextureFrontFace() {
-        return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU5);
+        return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU5);
     }
 
     @Override
     protected ITexture getTextureFrontFaceActive() {
-        return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE5);
+        return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TU_ACTIVE5);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
index 0702552aee..f2de4a2e81 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java
@@ -4,7 +4,7 @@ import gregtech.GT_Mod;
 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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
@@ -188,11 +188,11 @@ public class GT_MTE_LargeTurbine_SHSteam extends GregtechMetaTileEntity_LargerTu
 
     @Override
     protected ITexture getTextureFrontFace() {
-        return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI5);
+        return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI5);
     }
 
     @Override
     protected ITexture getTextureFrontFaceActive() {
-        return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI_ACTIVE5);
+        return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_TI_ACTIVE5);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
index 6cc3d57eba..7ceda9c9eb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java
@@ -6,7 +6,7 @@ import gregtech.GT_Mod;
 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.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -196,11 +196,11 @@ public class GT_MTE_LargeTurbine_Steam extends GregtechMetaTileEntity_LargerTurb
 
     @Override
     protected ITexture getTextureFrontFace() {
-        return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST5);
+        return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST5);
     }
 
     @Override
     protected ITexture getTextureFrontFaceActive() {
-        return TextureFactory.of(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5);
+        return new GT_RenderedTexture(gregtech.api.enums.Textures.BlockIcons.LARGETURBINE_ST_ACTIVE5);
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 6a06c91c1d..5b1b85b31a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -24,7 +24,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
@@ -123,7 +123,7 @@ public class GregtechMetaTileEntity_PowerSubStationController
         if (aSide == aFacing) {
             return new ITexture[] {
                 Textures.BlockIcons.getCasingTextureForId(TAE.GTPP_INDEX(24)),
-                TextureFactory.of(
+                new GT_RenderedTexture(
                         aActive
                                 ? Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE
                                 : Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER)
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
index afc2289982..4a24de7c5a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
@@ -11,9 +11,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.ItemData;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.*;
 import gregtech.api.util.*;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
@@ -897,11 +895,11 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank {
     }
 
     public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_3)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_3)};
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Computer_Cube)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Computer_Cube)};
     }
 
     protected static final int DID_NOT_FIND_RECIPE = 0,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
index 90f33691d5..5360ba612a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -85,59 +85,59 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
 
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LuV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
         };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
         };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LuV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV)
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
index 220d30fd55..3cf868a998 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
@@ -200,7 +200,7 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
         if (aSide == aFacing) {
             return new ITexture[] {
                 Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
-                TextureFactory.of(sIconList[mType * 16 + mRedstoneStrength])
+                new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength])
             };
         }
         return this.mTextures[
@@ -220,42 +220,42 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_Main_Off)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_Off)
         };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_Main_On)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Main_On)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_Off)
         };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_Main_On)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Main_On)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Main_Off)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_Off)
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Main_On)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Main_On)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
index 5b76811b1a..caba805f65 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.*;
 import gtPlusPlus.xmod.gregtech.api.gui.computer.GT_Container_RedstoneCircuitBlock;
 import gtPlusPlus.xmod.gregtech.api.gui.computer.GT_GUIContainer_RedstoneCircuitBlock;
@@ -456,47 +456,47 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
                 aColorIndex + 1];
     }
 
-    private ITexture getBase() {
-        return TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top);
+    private GT_RenderedTexture getBase() {
+        return new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_Off)};
+        return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off)};
     }
 
     public ITexture[] getTopActive(final byte aColor) {
-        return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_On)};
+        return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On)};
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             getBase(),
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Off),
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off),
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red)
         };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] {
             getBase(),
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_On),
-            TextureFactory.of(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On),
+            new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_Off)};
+        return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off)};
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
-        return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_On)};
+        return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On)};
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Off)};
+        return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off)};
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
-        return new ITexture[] {getBase(), TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_On)};
+        return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On)};
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
index c992b71ae7..dfb844654b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneLamp.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.redstone;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 import net.minecraft.nbt.NBTTagCompound;
@@ -67,10 +67,10 @@ public class GT_MetaTileEntity_RedstoneLamp extends GT_MetaTileEntity_RedstoneBa
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(sIconList[0])};
+        return new ITexture[] {new GT_RenderedTexture(sIconList[0])};
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(sIconList[1])};
+        return new ITexture[] {new GT_RenderedTexture(sIconList[1])};
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
index ef97f17d19..3b07f8b3ff 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthDisplay.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
@@ -115,7 +115,7 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
         if (aSide == aFacing) {
             return new ITexture[] {
                 Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
-                TextureFactory.of(sIconList[mType * 16 + mRedstoneStrength])
+                new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength])
             };
         }
         return this.mTextures[
@@ -135,42 +135,42 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends GT_MetaTileEntity
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_Off)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_Off)
         };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Top_On)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Top_On)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_Off)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_Off)
         };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Bottom_On)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Bottom_On)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_Off)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_Off)
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Casing_Redstone_Side_On)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
index 48e63b6ad3..8945f3f7b5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneStrengthScale.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
@@ -50,7 +50,7 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R
         if (aSide == aFacing) {
             return new ITexture[] {
                 Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex + 1],
-                TextureFactory.of(sIconList[mType * 16 + mRedstoneStrength])
+                new GT_RenderedTexture(sIconList[mType * 16 + mRedstoneStrength])
             };
         }
         return this.mTextures[
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
index 584d0754e6..bb9865c8e5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java
@@ -5,7 +5,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
@@ -525,37 +525,37 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
             isAdvanced()
-                    ? TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Side)
-                    : TextureFactory.of(TexturesGtBlock.Casing_Workbench_Side)
+                    ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
+                    : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side)
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             isAdvanced()
-                    ? TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Side)
-                    : TextureFactory.of(TexturesGtBlock.Casing_Workbench_Side)
+                    ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
+                    : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             isAdvanced()
-                    ? TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Bottom)
-                    : TextureFactory.of(TexturesGtBlock.Casing_Workbench_Bottom)
+                    ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Bottom)
+                    : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Bottom)
         };
     }
 
     public ITexture[] getTop(final byte aColor) {
         if (isAdvanced()) {
             return new ITexture[] {
-                TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Top),
-                TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
+                new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Top),
+                new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay)
             };
         } else {
             return new ITexture[] {
-                TextureFactory.of(TexturesGtBlock.Casing_Workbench_Top),
-                TextureFactory.of(TexturesGtBlock.Casing_Workbench_Crafting_Overlay)
+                new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Top),
+                new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Crafting_Overlay)
             };
         }
     }
@@ -563,8 +563,8 @@ public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_B
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             isAdvanced()
-                    ? TextureFactory.of(TexturesGtBlock.Casing_Adv_Workbench_Side)
-                    : TextureFactory.of(TexturesGtBlock.Casing_Workbench_Side)
+                    ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side)
+                    : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
index 1614883150..1c0e682b62 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java
@@ -7,7 +7,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
@@ -534,15 +534,15 @@ public class GT_MetaTileEntity_ConnectableCrate extends GT_MetaTileEntity_Tiered
             boolean aRedstone) {
         return aBaseMetaTileEntity.getFrontFacing() == 0 && aSide == 4
                 ? new ITexture[] {
-                    TextureFactory.of(TexturesGtBlock.TEXTURE_CASING_AMAZON),
-                    TextureFactory.of(BlockIcons.OVERLAY_QCHEST)
+                    new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON),
+                    new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
                 }
                 : (aSide == aBaseMetaTileEntity.getFrontFacing()
                         ? new ITexture[] {
-                            TextureFactory.of(TexturesGtBlock.TEXTURE_CASING_AMAZON),
-                            TextureFactory.of(BlockIcons.OVERLAY_QCHEST)
+                            new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON),
+                            new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
                         }
-                        : new ITexture[] {TextureFactory.of(TexturesGtBlock.TEXTURE_CASING_AMAZON)});
+                        : new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.TEXTURE_CASING_AMAZON)});
     }
 
     public ITexture[][][] getTextureSet(ITexture[] aTextures) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
index 80d2ab8a50..b5dcd8cd73 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredChest.java
@@ -5,7 +5,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SuperChest;
@@ -206,12 +206,12 @@ public class GT_MetaTileEntity_TieredChest extends GT_MetaTileEntity_TieredMachi
         return aBaseMetaTileEntity.getFrontFacing() == 0 && aSide == 4
                 ? new ITexture[] {
                     BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
-                    TextureFactory.of(BlockIcons.OVERLAY_QCHEST)
+                    new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
                 }
                 : (aSide == aBaseMetaTileEntity.getFrontFacing()
                         ? new ITexture[] {
                             BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
-                            TextureFactory.of(BlockIcons.OVERLAY_QCHEST)
+                            new GT_RenderedTexture(BlockIcons.OVERLAY_QCHEST)
                         }
                         : new ITexture[] {BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1]});
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
index a936156de8..f46ba27204 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
@@ -59,11 +59,11 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
         return aSide == 1
                 ? new ITexture[] {
                     Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE)
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER_ACTIVE)
                 }
                 : new ITexture[] {
                     Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1],
-                    TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER)
+                    new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_POTIONBREWER)
                 };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
index de7baf7a8a..04c75f52f8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaEnergyBuffer.java
@@ -9,7 +9,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
@@ -114,28 +114,28 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
     public ITexture[] getBack(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
         };
     }
 
     public ITexture[] getBottom(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
         };
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Screen_Logo)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
         };
     }
 
@@ -149,28 +149,28 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
     public ITexture[] getBackActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
         };
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
         };
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Screen_Logo)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Screen_Logo)
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1],
-            TextureFactory.of(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
+            new GT_RenderedTexture(TexturesGtBlock.Overlay_Machine_Dimensional_Orange)
         };
     }
 
@@ -178,10 +178,10 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
     public ITexture[][][] getTextureSet(ITexture[] aTextures) {
     	ITexture[][][] rTextures = new ITexture[2][17][];
     	for (byte i = -1; i < 16; i++) {
-    		rTextures[0][i + 1] = new ITexture[] { TextureFactory.of(
+    		rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture(
     				Textures.BlockIcons.MACHINE_HEATPROOFCASING) };
     		rTextures[1][i + 1] = new ITexture[] {
-    				TextureFactory.of(
+    				new GT_RenderedTexture(
     						Textures.BlockIcons.MACHINE_HEATPROOFCASING),
     						mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]
     								: Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
@@ -192,21 +192,21 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
     /*
      * @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) {
      * ITexture[][][] rTextures = new ITexture[5][17][]; for (byte i = -1; i <
-     * 16; i = (byte) (i + 1)) { ITexture[] tmp0 = { TextureFactory.of(
+     * 16; i = (byte) (i + 1)) { ITexture[] tmp0 = { new GT_RenderedTexture(
      * Textures.BlockIcons.MACHINE_STEEL_BOTTOM, Dyes.getModulation(i,
      * Dyes._NULL.mRGBa)) }; rTextures[0][(i + 1)] = tmp0; ITexture[] tmp1 = {
-     * TextureFactory.of( Textures.BlockIcons.MACHINE_STEEL_TOP) };
-     * rTextures[1][(i + 1)] = tmp1; ITexture[] tmp2 = { TextureFactory.of(
+     * new GT_RenderedTexture( Textures.BlockIcons.MACHINE_STEEL_TOP) };
+     * rTextures[1][(i + 1)] = tmp1; ITexture[] tmp2 = { new GT_RenderedTexture(
      * Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
      * Dyes._NULL.mRGBa)), new
      * GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; rTextures[2][(i +
-     * 1)] = tmp2; ITexture[] tmp4 = { TextureFactory.of(
+     * 1)] = tmp2; ITexture[] tmp4 = { new GT_RenderedTexture(
      * Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
      * Dyes._NULL.mRGBa)), new
      * GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) }; rTextures[3][(i +
-     * 1)] = tmp4; ITexture[] tmp5 = { TextureFactory.of(
+     * 1)] = tmp4; ITexture[] tmp5 = { new GT_RenderedTexture(
      * Textures.BlockIcons.MACHINE_STEEL_SIDE, Dyes.getModulation(i,
-     * Dyes._NULL.mRGBa)), TextureFactory.of(
+     * Dyes._NULL.mRGBa)), new GT_RenderedTexture(
      * Textures.BlockIcons.BOILER_FRONT_ACTIVE) }; rTextures[4][(i + 1)] = tmp5;
      * } return rTextures; }
      */
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
index db7e9d049e..064312fae2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.Textures;
 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.objects.GT_RenderedTexture;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_SafeBlock;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_SafeBlock;
@@ -49,7 +49,7 @@ public class GregtechMetaSafeBlock extends GregtechMetaSafeBlockBase {
 
     @Override
     public ITexture getOverlayIcon() {
-        return TextureFactory.of(Textures.BlockIcons.VOID);
+        return new GT_RenderedTexture(Textures.BlockIcons.VOID);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
index 494b32931a..18e95861b3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull_NonElectric;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.core.util.Utils;
@@ -25,10 +25,12 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
     public String mOldDesc = "";
     public boolean mLocked = false;
     protected byte mIndex = (byte) MathUtils.randInt(1, 3);
-    public static ITexture texBottom = TextureFactory.of(new CustomIcon("TileEntities/gt4/machine_bottom"));
-    public static ITexture texTop = TextureFactory.of(new CustomIcon("TileEntities/gt4/machine_top"));
-    public static ITexture texSide = TextureFactory.of(new CustomIcon("TileEntities/gt4/machine_side"));
-    public static ITexture texSideCabinet = TextureFactory.of(new CustomIcon("TileEntities/gt4/machine_side_cabinet"));
+    public static GT_RenderedTexture texBottom =
+            new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_bottom"));
+    public static GT_RenderedTexture texTop = new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_top"));
+    public static GT_RenderedTexture texSide = new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_side"));
+    public static GT_RenderedTexture texSideCabinet =
+            new GT_RenderedTexture(new CustomIcon("TileEntities/gt4/machine_side_cabinet"));
 
     public GT4Entity_Shelf(final int aID, final String aName, final String aNameRegional, final String aDescription) {
         super(aID, aName, aNameRegional, 0, aDescription);
@@ -280,9 +282,9 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
         return tmp;
     }
 
-    private static ITexture x1 = TextureFactory.of(TexturesGtBlock.OVERLAY_WOODEN_SHELF_FRONT);
-    private static ITexture x2 = TextureFactory.of(TexturesGtBlock.OVERLAY_WOODEN_SHELF_PAPER_FRONT);
-    private static ITexture x3 = TextureFactory.of(TexturesGtBlock.OVERLAY_WOODEN_SHELF_CANS_FRONT);
+    private static GT_RenderedTexture x1 = new GT_RenderedTexture(TexturesGtBlock.OVERLAY_WOODEN_SHELF_FRONT);
+    private static GT_RenderedTexture x2 = new GT_RenderedTexture(TexturesGtBlock.OVERLAY_WOODEN_SHELF_PAPER_FRONT);
+    private static GT_RenderedTexture x3 = new GT_RenderedTexture(TexturesGtBlock.OVERLAY_WOODEN_SHELF_CANS_FRONT);
 
     public ITexture[] getFrontNormal() {
         return new ITexture[] {x1};
@@ -297,19 +299,19 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric {
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Acacia_Log)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log)};
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
index ac4f37cbf1..c9472e157c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.storage.shelving;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf {
@@ -28,18 +28,18 @@ public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf {
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.VanillaIcon_OakPlanks)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.VanillaIcon_OakPlanks)};
     }
 }