tried to fix GTTexture, removed more deprecated code

4 files changed, 13 insertions, 115 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);
     }
 }
diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java
index 2f9d2e20d6..963dd81e9f 100644
--- a/src/main/java/common/TileEntities.java
+++ b/src/main/java/common/TileEntities.java
@@ -36,9 +36,9 @@ public class TileEntities {
         lsc = new GTMTE_LapotronicSuperCapacitor(13106, "multimachine.supercapacitor", "Lapotronic Supercapacitor");
         //se = new GTMTE_SpaceElevator(13107, "multimachine.spaceelevator", "Space Elevator");
         // Singleblocks
-        mhHV = new GTMTE_TFFTMultiHatch(13108, "machine.multihatch", "T.F.F.T Multi I/O Hatch [HV]", 3);
-        mhIV = new GTMTE_TFFTMultiHatch(13109, "machine.multihatch", "T.F.F.T Multi I/O Hatch [IV]", 5);
-        mhZPM = new GTMTE_TFFTMultiHatch(13110, "machine.multihatch", "T.F.F.T Multi I/O Hatch [ZPM]", 7);
+        mhHV = new GTMTE_TFFTMultiHatch(13108, "machine.multihatch.0", "T.F.F.T Multi I/O Hatch [HV]", 3);
+        mhIV = new GTMTE_TFFTMultiHatch(13109, "machine.multihatch.1", "T.F.F.T Multi I/O Hatch [IV]", 5);
+        mhZPM = new GTMTE_TFFTMultiHatch(13110, "machine.multihatch.2", "T.F.F.T Multi I/O Hatch [ZPM]", 7);
     }
 
 }
diff --git a/src/main/java/common/blocks/Block_TFFTMultiHatch.java b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
index 37f9e47bcc..564113efe5 100644
--- a/src/main/java/common/blocks/Block_TFFTMultiHatch.java
+++ b/src/main/java/common/blocks/Block_TFFTMultiHatch.java
@@ -26,8 +26,6 @@ public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock {
 	private static final Block_TFFTMultiHatch INSTANCE = new Block_TFFTMultiHatch();
 
 	private IIcon casing;
-	private final IIcon[] overlayOff = new IIcon[3];
-	private final IIcon[] overlayOn = new IIcon[3];
 
 	private Block_TFFTMultiHatch() {
 		super(Material.iron);
@@ -47,48 +45,11 @@ public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock {
 	@Override
 	public void registerBlockIcons(IIconRegister ir) {
 		casing = ir.registerIcon("kekztech:TFFTCasing");
-		for(int i = 0; i < overlayOff.length; i++) {
-			overlayOff[i] = ir.registerIcon("kekztech:TFFTMultiHatch" + i + "_off");
-			overlayOn[i] = ir.registerIcon("kekztech:TFFTMultiHatch" + i + "_on");
-		}
-	}
-
-	@Override
-	@SuppressWarnings({"unchecked" })
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
-		// HV, IV, ZPM
-		par3List.add(new ItemStack(par1, 1, 0));
-		par3List.add(new ItemStack(par1, 1, 1));
-		par3List.add(new ItemStack(par1, 1, 2));
 	}
 
 	@Override
 	public IIcon getIcon(int side, int meta) {
-		if(side != 3) {
-			return casing;
-		} else {
-			return overlayOff[meta];
-		}
-	}
-
-	@Override
-	public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) {
-		final TileEntity te = blockAccess.getTileEntity(x, y, z);
-		if(te instanceof TE_TFFTMultiHatch) {
-			final TE_TFFTMultiHatch hatchTE = (TE_TFFTMultiHatch) te;
-			if(hatchTE.hasFacingOnSide((byte) side)) {
-				final int meta = blockAccess.getBlockMetadata(x, y, z);
-				if(hatchTE.isOutputting()) {
-					return overlayOn[meta];
-				} else {
-					return overlayOff[meta];
-				}
-			} else {
-				return casing;
-			}
-		} else {
-			return casing;
-		}
+		return casing;
 	}
 
 	@Override
@@ -100,33 +61,5 @@ public class Block_TFFTMultiHatch extends BaseGTUpdateableBlock {
 	public boolean hasTileEntity(int meta) {
 		return true;
 	}
-	
-	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float p_149727_7_, float p_149727_8_, float p_149727_9_) {
-		// Code block taken from GregTech's api.metatileentity.BaseMetaTileEntity.class
-		if (GT_Utility.isStackInList(player.getHeldItem(), GregTech_API.sScrewdriverList)) {
-			if (GT_ModHandler.damageOrDechargeItem(player.getHeldItem(), 1, 200, player)) {
-				final TileEntity te = world.getTileEntity(x, y, z);
-				if(te instanceof TE_TFFTMultiHatch) {
-					((TE_TFFTMultiHatch) te).toggleAutoOutput();
-					GT_Utility.sendSoundToPlayers(world, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, x, y, z);
-					// Give chat feedback
-					GT_Utility.sendChatToPlayer(player, ((TE_TFFTMultiHatch) te).isOutputting() ? "Auto-output enabled" : "Auto-output disabled");
-					
-				}
-			}
-			return true;
-		} else if (GT_Utility.isStackInList(player.getHeldItem(), GregTech_API.sWrenchList)) {
-			if (GT_ModHandler.damageOrDechargeItem(player.getHeldItem(), 1, 200, player)) {
-				final TileEntity te = world.getTileEntity(x, y, z);
-				if(te instanceof TE_TFFTMultiHatch) {
-					((TE_TFFTMultiHatch) te).setFacingToSide((byte) side);
-					GT_Utility.sendSoundToPlayers(world, GregTech_API.sSoundList.get(100), 1.0F, -1.0F, x, y, z);
-				}
-			}
-			return true;
-		}
-		return false;
-	}
 
 }
diff --git a/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java b/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java
index 5d0b8c20a0..ba523ab090 100644
--- a/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java
+++ b/src/main/java/common/tileentities/GTMTE_TFFTMultiHatch.java
@@ -1,5 +1,6 @@
 package common.tileentities;
 
+import client.GTTexture;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -65,14 +66,12 @@ public class GTMTE_TFFTMultiHatch extends GT_MetaTileEntity_Hatch {
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        // 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)};
+        return new ITexture[]{aBaseTexture, new GT_RenderedTexture(GTTexture.MULTI_HATCH_ON)};
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        // 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)};
+        return new ITexture[]{aBaseTexture, new GT_RenderedTexture(GTTexture.MULTI_HATCH_OFF)};
     }
 
     @Override