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

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

* :spotlessapply

25 files changed, 156 insertions, 229 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
index a31e728e23..29609f7edc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.api.enums;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gtPlusPlus.core.lib.CORE;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
@@ -16,7 +16,7 @@ public class CustomGtTextures {
         PUMP,
         SKOOKUMCHOOCHER;
 
-        public static final ITexture[] ERROR_RENDERING = new ITexture[] {new GT_RenderedTexture(RENDERING_ERROR)};
+        public static final ITexture[] ERROR_RENDERING = new ITexture[] {TextureFactory.of(RENDERING_ERROR)};
 
         protected IIcon mIcon, mOverlay;
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java
index f6cf2391b3..f7aab7d450 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_BasicMachine.java
@@ -11,7 +11,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -991,42 +991,42 @@ public abstract class GTPP_MTE_BasicMachine extends GTPP_MTE_BasicTank {
     public ITexture[] getBottomFacingPipeActive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getBottomFacingPipeInactive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getTopFacingPipeActive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getTopFacingPipeInactive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getSideFacingPipeActive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getSideFacingPipeInactive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java
index 02f0a3ff40..b5dc81b542 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Dehydrator.java
@@ -9,7 +9,6 @@ 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_GT_Recipe;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GTPP_Recipe;
 import gregtech.api.util.GT_Recipe;
@@ -152,56 +151,56 @@ public class GT_MetaTileEntity_Dehydrator extends GT_MetaTileEntity_BasicMachine
     @Override
     public ITexture[] getFrontFacingInactive(final byte aColor) {
         return new ITexture[] {
-            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[0])
+            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[0])
         };
     }
 
     @Override
     public ITexture[] getBottomFacingInactive(final byte aColor) {
         return new ITexture[] {
-            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[2])
+            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[2])
         };
     }
 
     @Override
     public ITexture[] getTopFacingInactive(final byte aColor) {
         return new ITexture[] {
-            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[3])
+            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[3])
         };
     }
 
     @Override
     public ITexture[] getSideFacingInactive(final byte aColor) {
         return new ITexture[] {
-            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[4])
+            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[4])
         };
     }
 
     @Override
     public ITexture[] getFrontFacingActive(final byte aColor) {
         return new ITexture[] {
-            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[5])
+            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[5])
         };
     }
 
     @Override
     public ITexture[] getBottomFacingActive(final byte aColor) {
         return new ITexture[] {
-            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[7])
+            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[7])
         };
     }
 
     @Override
     public ITexture[] getTopFacingActive(final byte aColor) {
         return new ITexture[] {
-            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[8])
+            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[8])
         };
     }
 
     @Override
     public ITexture[] getSideFacingActive(final byte aColor) {
         return new ITexture[] {
-            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], new GT_RenderedTexture(sDehydratorOverlays[9])
+            Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], TextureFactory.of(sDehydratorOverlays[9])
         };
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
index 007e6a1761..bd70d916c8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_DeluxeMachine.java
@@ -10,7 +10,7 @@ import gregtech.api.gui.GT_GUIContainer_BasicMachine;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -974,42 +974,42 @@ public abstract class GT_MetaTileEntity_DeluxeMachine extends GT_MetaTileEntity_
     public ITexture[] getBottomFacingPipeActive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getBottomFacingPipeInactive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getTopFacingPipeActive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getTopFacingPipeInactive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getSideFacingPipeActive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getSideFacingPipeInactive(byte aColor) {
         return new ITexture[] {
             Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1],
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
index b2ea5a62ec..81a61e98b4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.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_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
@@ -50,12 +50,12 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Control_Core)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Control_Core)};
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Control_Core)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Control_Core)};
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
index 500f1945bc..a3847dfa50 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.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_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.api.objects.Logger;
@@ -43,12 +43,12 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Data_Orb)};
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
index b11b3bc78e..950ddbffbb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.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_Hatch_Input;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.core.lib.CORE;
@@ -89,15 +89,11 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile
     }
 
     public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
-        return new ITexture[] {
-            aBaseTexture, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)
-        };
+        return new ITexture[] {aBaseTexture, TextureFactory.of((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)};
     }
 
     public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
-        return new ITexture[] {
-            aBaseTexture, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)
-        };
+        return new ITexture[] {aBaseTexture, TextureFactory.of((IIconContainer) Textures.BlockIcons.OVERLAY_MUFFLER)};
     }
 
     public boolean isSimpleMachine() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
index d56a95d60f..b20c463538 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java
@@ -7,7 +7,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.api.util.GT_Utility;
@@ -75,12 +75,12 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Charger)};
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Charger)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Charger)};
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
index 94b927c80d..a908ea75f7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.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_Hatch_Muffler;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Config;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.general.ItemAirFilter;
@@ -80,11 +80,11 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
     }
 
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
     }
 
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Muffler_Adv)};
     }
 
     public boolean isValidSlot(int aIndex) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
index 350b7a788a..1f3260c861 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
@@ -1,14 +1,12 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.Textures;
 import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -56,16 +54,11 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
     }
 
     public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
-        return new ITexture[] {
-            aBaseTexture,
-            new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)
-        };
+        return new ITexture[] {aBaseTexture, TextureFactory.of(BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE)};
     }
 
     public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
-        return new ITexture[] {
-            aBaseTexture, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)
-        };
+        return new ITexture[] {aBaseTexture, TextureFactory.of(BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE)};
     }
 
     public boolean allowPutStack(
@@ -98,7 +91,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
     }
 
     public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
-        return (MetaTileEntity) new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescription, this.mTextures);
     }
 
     @Override
@@ -201,9 +194,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
                     ? StaticFields59.getCasingTexturePages(a2, texturePointer)
                     : BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1];
 
-            return new ITexture[] {
-                g, new GT_RenderedTexture((IIconContainer) Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE)
-            };
+            return new ITexture[] {g, TextureFactory.of(BlockIcons.NAQUADAH_REACTOR_FLUID_TOP_ACTIVE)};
         }
 
         return aSide != aFacing
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
index d6b0a570ac..b644aa9cd6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.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_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
@@ -66,12 +66,12 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Discharger)};
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Hatch_Discharger)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Hatch_Discharger)};
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
index 0a2ccdb8e5..0fdb0cee78 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
@@ -4,7 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.block.Block;
@@ -117,10 +117,10 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
     public void generateParticles(World aWorld, String name) {}
 
     public ITexture[] getTexturesActive(final ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Water)};
     }
 
     public ITexture[] getTexturesInactive(final ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Water)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Water)};
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
index d50d55b721..6a0fcfe8d4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java
@@ -11,7 +11,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
@@ -198,7 +197,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
 
     public ITexture[] getSideFacingActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -207,7 +206,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
 
     public ITexture[] getSideFacingInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -216,7 +215,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
 
     public ITexture[] getFrontFacingActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -225,7 +224,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
 
     public ITexture[] getFrontFacingInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -234,21 +233,21 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
 
     public ITexture[] getTopFacingActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
         };
     }
 
     public ITexture[] getTopFacingInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
         };
     }
 
     public ITexture[] getBottomFacingActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
                             : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
@@ -257,7 +256,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
 
     public ITexture[] getBottomFacingInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
                             : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
@@ -266,57 +265,57 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha
 
     public ITexture[] getBottomFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
                             : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getBottomFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
                             : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getTopFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getTopFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getSideFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getSideFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
index ab721cd605..f166d7f3bc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusOutput.java
@@ -11,7 +11,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.render.TextureFactory;
 import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
@@ -128,7 +127,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
 
     public ITexture[] getSideFacingActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -137,7 +136,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
 
     public ITexture[] getSideFacingInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -146,7 +145,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
 
     public ITexture[] getFrontFacingActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -155,7 +154,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
 
     public ITexture[] getFrontFacingInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE)
@@ -164,21 +163,21 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
 
     public ITexture[] getTopFacingActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
         };
     }
 
     public ITexture[] getTopFacingInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP)
         };
     }
 
     public ITexture[] getBottomFacingActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
                             : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
@@ -187,7 +186,7 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
 
     public ITexture[] getBottomFacingInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
                             : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM)
@@ -196,57 +195,57 @@ public class GT_MetaTileEntity_Hatch_Steam_BusOutput extends GT_MetaTileEntity_H
 
     public ITexture[] getBottomFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
                             : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getBottomFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM
                             : Textures.BlockIcons.MACHINE_BRONZE_BOTTOM),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getTopFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getTopFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1 ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP : Textures.BlockIcons.MACHINE_BRONZE_TOP),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getSideFacingPipeActive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 
     public ITexture[] getSideFacingPipeInactive(byte aColor) {
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     mTier == 1
                             ? Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE
                             : Textures.BlockIcons.MACHINE_BRONZE_SIDE),
-            new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE_OUT)
+            TextureFactory.of(Textures.BlockIcons.OVERLAY_PIPE_OUT)
         };
     }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
index 5973d21fc5..41433e50f9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
@@ -8,7 +8,7 @@ import gregtech.api.items.GT_MetaGenerated_Tool;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
@@ -276,8 +276,8 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
     private ITexture getFrontFacingTurbineTexture() {
         if (!mHasController) {
             return this.getBaseMetaTileEntity().isActive()
-                    ? new GT_RenderedTexture(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE_ACTIVE[4])
-                    : new GT_RenderedTexture(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE[4]);
+                    ? TextureFactory.of(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE_ACTIVE[4])
+                    : TextureFactory.of(LargeTurbineTextureHandler.OVERLAY_LP_TURBINE[4]);
         } else {
             if (usingAnimations()) {
                 if (isControllerActive()) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index eff2413102..6d285a7f91 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -8,7 +8,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 
 public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implements IMetaTileEntityCable {
@@ -147,60 +147,60 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
 
         if (!mInsulated)
             return new ITexture[] {
-                new GT_RenderedTexture(
+                TextureFactory.of(
                         wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], Dyes.getModulation(aColorIndex, vRGB))
             };
         if (aConnected) {
             float tThickNess = getThickNess();
             if (tThickNess < 0.124F)
                 return new ITexture[] {
-                    new GT_RenderedTexture(
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_FULL,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.374F) // 0.375 x1
             return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_TINY,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.499F) // 0.500 x2
             return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_SMALL,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.624F) // 0.625 x4
             return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_MEDIUM,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.749F) // 0.750 x8
             return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    TextureFactory.of(
                             INSULATION_MEDIUM_PLUS, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.874F) // 0.825 x12
             return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_LARGE,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             return new ITexture[] {
-                new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
-                new GT_RenderedTexture(
+                TextureFactory.of(wireMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], vRGB),
+                TextureFactory.of(
                         Textures.BlockIcons.INSULATION_HUGE,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
             };
         }
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
         };
     }
@@ -235,60 +235,60 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
 
         if (!(this.mInsulated))
             return new ITexture[] {
-                new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], Dyes.getModulation(aColorIndex, this.vRGB))
+                TextureFactory.of(wireMaterial.mIconSet.mTextures[69], Dyes.getModulation(aColorIndex, this.vRGB))
             };
         if (aConnected) {
             float tThickNess = getThickNess();
             if (tThickNess < 0.124F)
                 return new ITexture[] {
-                    new GT_RenderedTexture(
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_FULL,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.374F)
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_TINY,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.499F)
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_SMALL,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.624F)
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_MEDIUM,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.749F)
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_LARGE,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             if (tThickNess < 0.874F)
                 return new ITexture[] {
-                    new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_HUGE,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             return new ITexture[] {
-                new GT_RenderedTexture(wireMaterial.mIconSet.mTextures[69], this.vRGB),
-                new GT_RenderedTexture(
+                TextureFactory.of(wireMaterial.mIconSet.mTextures[69], this.vRGB),
+                TextureFactory.of(
                         Textures.BlockIcons.INSULATION_FULL,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
             };
         }
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
         };
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java
index 14399e525d..d0b8fc6cf6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.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.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines.GregtechMetaTreeFarmerBase;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -47,7 +47,7 @@ public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase
 
     @Override
     public ITexture getOverlayIcon() {
-        return new GT_RenderedTexture(Textures.BlockIcons.VOID);
+        return TextureFactory.of(Textures.BlockIcons.VOID);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
index efc2d008bb..b6b588342b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaPipeEntityBase_Cable.java
@@ -16,7 +16,7 @@ import gregtech.api.interfaces.tileentity.IEnergyConnected;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Proxy;
 import gtPlusPlus.api.objects.Logger;
@@ -142,56 +142,52 @@ public class GregtechMetaPipeEntityBase_Cable extends MetaPipeEntity implements
             final boolean aRedstone) {
         if (!this.mInsulated) {
             return new ITexture[] {
-                new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa)
+                TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa)
             };
         }
         if (aConnected) {
             final float tThickNess = this.getThickNess();
             if (tThickNess < 0.37F) {
                 return new ITexture[] {
-                    new GT_RenderedTexture(
-                            this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_TINY,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             }
             if (tThickNess < 0.49F) {
                 return new ITexture[] {
-                    new GT_RenderedTexture(
-                            this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_SMALL,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             }
             if (tThickNess < 0.74F) {
                 return new ITexture[] {
-                    new GT_RenderedTexture(
-                            this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_MEDIUM,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             }
             if (tThickNess < 0.99F) {
                 return new ITexture[] {
-                    new GT_RenderedTexture(
-                            this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
-                    new GT_RenderedTexture(
+                    TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+                    TextureFactory.of(
                             Textures.BlockIcons.INSULATION_LARGE,
                             Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
                 };
             }
             return new ITexture[] {
-                new GT_RenderedTexture(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
-                new GT_RenderedTexture(
+                TextureFactory.of(this.mMaterial.mIconSet.mTextures[TextureSet.INDEX_wire], this.mMaterial.mRGBa),
+                TextureFactory.of(
                         Textures.BlockIcons.INSULATION_HUGE,
                         Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
             };
         }
         return new ITexture[] {
-            new GT_RenderedTexture(
+            TextureFactory.of(
                     Textures.BlockIcons.INSULATION_FULL, Dyes.getModulation(aColorIndex, Dyes.CABLE_INSULATION.mRGBa))
         };
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
index 294bee0b05..458f53a8e7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
@@ -10,7 +10,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.*;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gtPlusPlus.api.objects.data.*;
@@ -65,9 +64,9 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
         return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(getCasingTextureIndex())};
     }
 
-    protected abstract GT_RenderedTexture getFrontOverlay();
+    protected abstract ITexture getFrontOverlay();
 
-    protected abstract GT_RenderedTexture getFrontOverlayActive();
+    protected abstract ITexture getFrontOverlayActive();
 
     private int getCasingTextureIndex() {
         return 10;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
index a76ed88a17..9f93f31251 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.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.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
@@ -46,8 +46,8 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
     public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
         final ITexture[][][] rTextures = new ITexture[6][17][];
         final ITexture tIcon = this.getOverlayIcon(),
-                tOut = new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QCHEST),
-                tUp = new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_VENT);
+                tOut = TextureFactory.of(Textures.BlockIcons.OVERLAY_QCHEST),
+                tUp = TextureFactory.of(Textures.BlockIcons.MACHINE_CASING_VENT);
         for (byte i = -1; i < 16; i++) {
             rTextures[0][i + 1] =
                     new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][i + 1], tUp, tIcon}; // Back
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
index 39d61acebc..b457387aa3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaTreeFarmerBase.java
@@ -3,7 +3,7 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machine
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.entity.player.EntityPlayer;
@@ -158,23 +158,23 @@ public abstract class GregtechMetaTreeFarmerBase extends GT_MetaTileEntity_Tiere
     }
 
     public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
+        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Farm_Manager)};
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
+        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Farm_Manager)};
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Acacia_Log)};
+        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Acacia_Log)};
     }
 
     public ITexture[] getTop(final byte aColor) {
-        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Podzol)};
+        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Podzol)};
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Farm_Manager)};
+        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Farm_Manager)};
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
index 46666114c1..cd12ef5869 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
 
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -24,12 +24,12 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Bus_Catalyst)};
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Catalyst)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Bus_Catalyst)};
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
index 265088a9e0..bdab90d15c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
@@ -1,7 +1,7 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
 
 import gregtech.api.interfaces.ITexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -24,12 +24,12 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] {aBaseTexture, new GT_RenderedTexture(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
+        return new ITexture[] {aBaseTexture, TextureFactory.of(TexturesGtBlock.Overlay_Bus_Milling_Balls)};
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
deleted file mode 100644
index 5336b60fc7..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_CopiedBlockTexture.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.objects;
-
-import gregtech.api.enums.Dyes;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import net.minecraft.block.Block;
-
-/**
- * Made this to get rid of deprecation warnings <i>everywhere</i>.
- * @author Alkalus
- *
- */
-@SuppressWarnings("deprecation")
-public class GTPP_CopiedBlockTexture extends GT_CopiedBlockTexture {
-
-    public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa, boolean aAllowAlpha) {
-        super(aBlock, aMeta, aMeta, aRGBa, aAllowAlpha);
-    }
-
-    public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta, short[] aRGBa) {
-        this(aBlock, aSide, aMeta, aRGBa, true);
-    }
-
-    public GTPP_CopiedBlockTexture(Block aBlock, int aSide, int aMeta) {
-        this(aBlock, aSide, aMeta, Dyes._NULL.mRGBa);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
deleted file mode 100644
index 6764a1e206..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GTPP_RenderedTexture.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.objects;
-
-import gregtech.api.enums.Dyes;
-import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.objects.GT_RenderedTexture;
-
-/**
- * Made this to get rid of deprecation warnings <i>everywhere</i>.
- * @author Alkalus
- *
- */
-@SuppressWarnings("deprecation")
-public class GTPP_RenderedTexture extends GT_RenderedTexture {
-
-    public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
-        super(aIcon, aRGBa, aAllowAlpha);
-    }
-
-    public GTPP_RenderedTexture(IIconContainer aIcon, short[] aRGBa) {
-        this(aIcon, aRGBa, true);
-    }
-
-    public GTPP_RenderedTexture(IIconContainer aIcon) {
-        this(aIcon, Dyes._NULL.mRGBa);
-    }
-}