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