changed multi hatch to use some default texture from GT so I can test the actual functionality

3 files changed, 38 insertions, 20 deletions

diff --git a/src/main/java/client/ClientProxy.java b/src/main/java/client/ClientProxy.java
index b4eb51f369..f608861c0d 100644
--- a/src/main/java/client/ClientProxy.java
+++ b/src/main/java/client/ClientProxy.java
@@ -18,8 +18,6 @@ public class ClientProxy extends CommonProxy {
         // Register TESR
         ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorTether.class, new TESR_SETether());
         ClientRegistry.bindTileEntitySpecialRenderer(TE_SpaceElevatorCapacitor.class, new TESR_SECapacitor());
-        // Register GTTextures
-        GTTexture.init();
     }
 
     @Override
diff --git a/src/main/java/client/GTTexture.java b/src/main/java/client/GTTexture.java
index 98795e6585..76539adaab 100644
--- a/src/main/java/client/GTTexture.java
+++ b/src/main/java/client/GTTexture.java
@@ -9,37 +9,44 @@ import net.minecraft.util.ResourceLocation;
 
 import java.util.HashMap;
 
-public class GTTexture implements IIconContainer {
+public class GTTexture implements IIconContainer, Runnable {
 
+    public static final String TFFT_CASING = "TFFTCasing";
     public static final String MULTI_HATCH_OFF = "multi_hatch_off";
     public static final String MULTI_HATCH_ON = "multi_hatch_on";
 
     private static final HashMap<String, IIconContainer> icons = new HashMap<>();
+    private static final String REL_PATH = "blocks/";
 
-    private final IIcon icon;
-    private final IIcon overlayIcon;
+    static {
+        registerTexture(TFFT_CASING);
+        registerTexture(MULTI_HATCH_OFF);
+        registerTexture(MULTI_HATCH_ON);
+    }
+
+    private IIcon icon;
+    private IIcon iconOverlay;
+    private final String iconName;
+    private final String iconOverlayName;
 
     private GTTexture(String iconName) {
-        icon = GregTech_API.sBlockIcons.registerIcon(KekzCore.MODID + ":" + iconName);
-        overlayIcon = null;
+        this.iconName = iconName;
+        this.iconOverlayName = "";
+        GregTech_API.sGTBlockIconload.add(this);
     }
 
-    private GTTexture(String iconName, String overlayIconName) {
-        icon = GregTech_API.sBlockIcons.registerIcon(KekzCore.MODID + ":" + iconName);
-        overlayIcon = GregTech_API.sBlockIcons.registerIcon(KekzCore.MODID + ":" + overlayIconName);
+    private GTTexture(String iconName, String iconOverlayName) {
+        this.iconName = iconName;
+        this.iconOverlayName = iconOverlayName;
+        GregTech_API.sGTBlockIconload.add(this);
     }
 
     public static void registerTexture(String iconName) {
         icons.put(iconName, new GTTexture(iconName));
     }
 
-    public static void registerTexture(String iconName, String overlayIconName) {
-        icons.put(iconName, new GTTexture(iconName, overlayIconName));
-    }
-
-    public static void init() {
-        registerTexture(MULTI_HATCH_ON);
-        registerTexture(MULTI_HATCH_OFF);
+    public static void registerTexture(String iconName, String iconOverlayName) {
+        icons.put(iconName, new GTTexture(iconName, iconOverlayName));
     }
 
     public static IIconContainer getIconContainer(String iconName) {
@@ -53,11 +60,21 @@ public class GTTexture implements IIconContainer {
 
     @Override
     public IIcon getOverlayIcon() {
-        return overlayIcon;
+        return iconOverlay;
     }
 
     @Override
     public ResourceLocation getTextureFile() {
         return TextureMap.locationBlocksTexture;
     }
+
+    @Override
+    public void run() {
+        icon = GregTech_API.sBlockIcons.registerIcon(KekzCore.MODID + ":" + REL_PATH + iconName);
+        if(!iconOverlayName.equals("")) {
+            iconOverlay = GregTech_API.sBlockIcons.registerIcon(KekzCore.MODID + ":" + REL_PATH + iconOverlayName);
+        } else {
+            KekzCore.LOGGER.info("No overlay texture specified for icon: " + iconName + "; This is fine.");
+        }
+    }
 }
diff --git a/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java b/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java
index 024ffdc135..0ad9e5c7a9 100644
--- a/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java
+++ b/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java
@@ -2,6 +2,7 @@ package common.tileentities;
 
 import client.GTTexture;
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -67,12 +68,14 @@ public class GTMTE_TFFTMultiHatch extends GT_MetaTileEntity_Hatch {
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[]{aBaseTexture, new GT_RenderedTexture(GTTexture.getIconContainer(GTTexture.MULTI_HATCH_ON))};
+        // TODO return new ITexture[]{aBaseTexture, new GT_RenderedTexture(GTTexture.getIconContainer(GTTexture.MULTI_HATCH_ON))};
+        return new ITexture[]{aBaseTexture, new GT_RenderedTexture(Textures.BlockIcons.ARROW_UP)};
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[]{aBaseTexture, new GT_RenderedTexture(GTTexture.getIconContainer(GTTexture.MULTI_HATCH_OFF))};
+        // TODO return new ITexture[]{aBaseTexture, new GT_RenderedTexture(GTTexture.getIconContainer(GTTexture.MULTI_HATCH_OFF))};
+        return new ITexture[]{aBaseTexture, new GT_RenderedTexture(Textures.BlockIcons.ARROW_DOWN)};
     }
 
     @Override