1 files changed, 6 insertions, 40 deletions
diff --git a/src/main/java/client/GTTexture.java b/src/main/java/client/GTTexture.java
index 76539adaab..a449dc257b 100644
--- a/src/main/java/client/GTTexture.java
+++ b/src/main/java/client/GTTexture.java
@@ -2,6 +2,7 @@ package client;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.objects.GT_CopiedBlockTexture;
 import kekztech.KekzCore;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
@@ -11,48 +12,18 @@ import java.util.HashMap;
 
 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/";
-
-    static {
-        registerTexture(TFFT_CASING);
-        registerTexture(MULTI_HATCH_OFF);
-        registerTexture(MULTI_HATCH_ON);
-    }
+    public static final GTTexture TFFT_CASING = new GTTexture("textures/blocks/TFFTCasing");
+    public static final GTTexture MULTI_HATCH_OFF = new GTTexture("textures/blocks/multi_hatch_off");
+    public static final GTTexture MULTI_HATCH_ON = new GTTexture("textures/blocks/multi_hatch_on");
 
     private IIcon icon;
-    private IIcon iconOverlay;
     private final String iconName;
-    private final String iconOverlayName;
 
     private GTTexture(String iconName) {
         this.iconName = iconName;
-        this.iconOverlayName = "";
-        GregTech_API.sGTBlockIconload.add(this);
-    }
-
-    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 iconOverlayName) {
-        icons.put(iconName, new GTTexture(iconName, iconOverlayName));
-    }
-
-    public static IIconContainer getIconContainer(String iconName) {
-        return icons.get(iconName);
-    }
-
     @Override
     public IIcon getIcon() {
         return icon;
@@ -60,7 +31,7 @@ public class GTTexture implements IIconContainer, Runnable {
 
     @Override
     public IIcon getOverlayIcon() {
-        return iconOverlay;
+        return null;
     }
 
     @Override
@@ -70,11 +41,6 @@ public class GTTexture implements IIconContainer, Runnable {
 
     @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.");
-        }
+        icon = GregTech_API.sBlockIcons.registerIcon(KekzCore.MODID + ":" + iconName);
     }
 }