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

This reverts commit 0121112e5ea9c72050957af2c2ad4aecd9d70270.

2 files changed, 20 insertions, 22 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
index afc2289982..4a24de7c5a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java
@@ -11,9 +11,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.ItemData;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.*;
 import gregtech.api.util.*;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 import gregtech.common.items.behaviors.Behaviour_DataOrb;
@@ -897,11 +895,11 @@ public class GT_TileEntity_ComputerCube extends GT_MetaTileEntity_BasicTank {
     }
 
     public ITexture[] getFront(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Screen_3)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_3)};
     }
 
     public ITexture[] getSides(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Computer_Cube)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Computer_Cube)};
     }
 
     protected static final int DID_NOT_FIND_RECIPE = 0,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
index 90f33691d5..5360ba612a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java
@@ -6,7 +6,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.render.TextureFactory;
+import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -85,59 +85,59 @@ public class TileEntitySolarHeater extends GT_MetaTileEntity_TieredMachineBlock
 
     public ITexture[] getFront(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
         };
     }
 
     public ITexture[] getBack(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
     }
 
     public ITexture[] getBottom(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
     }
 
     public ITexture[] getTop(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LuV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV)
         };
     }
 
     public ITexture[] getSides(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
         };
     }
 
     public ITexture[] getFrontActive(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
         };
     }
 
     public ITexture[] getBackActive(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top)};
     }
 
     public ITexture[] getBottomActive(final byte aColor) {
-        return new ITexture[] {TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
+        return new ITexture[] {new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Bottom)};
     }
 
     public ITexture[] getTopActive(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_LuV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_LuV)
         };
     }
 
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {
-            TextureFactory.of(TexturesGtBlock.Casing_Machine_Simple_Top),
-            TextureFactory.of(Textures.BlockIcons.SOLARPANEL_IV)
+            new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top),
+            new GT_RenderedTexture(Textures.BlockIcons.SOLARPANEL_IV)
         };
     }