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

This reverts commit 0121112e5ea9c72050957af2c2ad4aecd9d70270.

5 files changed, 34 insertions, 34 deletions

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[