+ Re-added Tiered Machine Covers. (Old ones will be deprecated) Closes #516.

+ Added extra tiered covers. (For use in GTNH mostly)
+ Added textures and colour coding for Ztones covers.
+ Localized some cover names.

2 files changed, 99 insertions, 18 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java
index b412e0fe60..2fba1b0448 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java
@@ -7,35 +7,96 @@ import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCov
 import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_KORP;
 
 import cpw.mods.fml.common.Loader;
+import gtPlusPlus.core.lib.VanillaColours;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers;
 import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
+import gtPlusPlus.xmod.gregtech.common.items.covers.MetaItemCoverCasings;
 
 public class CoverManager {
-	
-	//ZTones
+
+	// ZTones
 	public static MetaCustomCoverItem Cover_Agon;
 	public static MetaCustomCoverItem Cover_Iszm;
 	public static MetaCustomCoverItem Cover_Korp;
 	public static MetaCustomCoverItem Cover_Jelt;
 	public static MetaCustomCoverItem Cover_Bitt;
-	
+
+	// GT
+	public static MetaItemCoverCasings Cover_Gt_Machine_Casing;
 
 	public static void generateCustomCovers() {
 
 		// init textures
 		TexturesGtCutomCovers.init();
-		
+
+		// GT Machine Casings
+		Cover_Gt_Machine_Casing = new MetaItemCoverCasings();
+
 		if (Loader.isModLoaded("Ztones")) {
 			String[] aZtoneCoverTextureNames = new String[] { "agon", "iszm", "korp", "jelt", "bitt" };
-			MetaCustomCoverItem[] aZtoneCoverItems = new MetaCustomCoverItem[] { Cover_Agon, Cover_Iszm, Cover_Korp, Cover_Jelt, Cover_Bitt};
-			CustomIcon[][] aArrays = new CustomIcon[][] { TEXTURE_ZTONES_AGON, TEXTURE_ZTONES_ISZM, TEXTURE_ZTONES_KORP, TEXTURE_ZTONES_JELT, TEXTURE_ZTONES_BITT };			
-			for (int y=0;y<aZtoneCoverTextureNames.length;y++) {
-				aZtoneCoverItems[y] = new MetaCustomCoverItem("Ztones", 16, aZtoneCoverTextureNames[y], aArrays[y]);
-			}			
+			MetaCustomCoverItem[] aZtoneCoverItems = new MetaCustomCoverItem[] { Cover_Agon, Cover_Iszm, Cover_Korp,
+					Cover_Jelt, Cover_Bitt };
+			CustomIcon[][] aArrays = new CustomIcon[][] { TEXTURE_ZTONES_AGON, TEXTURE_ZTONES_ISZM, TEXTURE_ZTONES_KORP,
+					TEXTURE_ZTONES_JELT, TEXTURE_ZTONES_BITT };
+			short[][][] aRGB = new short[][][] { ZTONES.RGB_AGON, ZTONES.RGB_ISZM, ZTONES.RGB_KORP, ZTONES.RGB_JELT,
+					ZTONES.RGB_BITT };
+			for (int y = 0; y < aZtoneCoverTextureNames.length; y++) {
+				aZtoneCoverItems[y] = new MetaCustomCoverItem("Ztones", 16, aZtoneCoverTextureNames[y], aArrays[y],
+						aRGB[y]);
+			}
 		}
-		
+
 	}
-	
-	
+
+	final static class ZTONES {
+
+		private static final short[][] RGB_AGON = new short[][] { VanillaColours.DYE_WHITE.getAsShort(),
+				VanillaColours.DYE_YELLOW.getAsShort(), VanillaColours.DYE_LIME.getAsShort(),
+				VanillaColours.DYE_GREEN.getAsShort(), VanillaColours.DYE_CYAN.getAsShort(),
+				VanillaColours.DYE_LIGHT_BLUE.getAsShort(), VanillaColours.DYE_DARK_BLUE.getAsShort(),
+				VanillaColours.DYE_DARK_PURPLE.getAsShort(), VanillaColours.DYE_LIGHT_PURPLE.getAsShort(),
+				VanillaColours.DYE_PINK.getAsShort(), VanillaColours.DYE_RED.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_BROWN.getAsShort(),
+				VanillaColours.DYE_BLACK.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+				VanillaColours.DYE_LIGHT_GRAY.getAsShort(), };
+		private static final short[][] RGB_ISZM = new short[][] { VanillaColours.DYE_LIGHT_GRAY.getAsShort(),
+				VanillaColours.DYE_WHITE.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+				VanillaColours.DYE_DARK_BLUE.getAsShort(), VanillaColours.DYE_YELLOW.getAsShort(),
+				VanillaColours.DYE_DARK_BLUE.getAsShort(), VanillaColours.DYE_RED.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_CYAN.getAsShort(),
+				VanillaColours.DYE_YELLOW.getAsShort(), VanillaColours.DYE_RED.getAsShort(),
+				VanillaColours.DYE_CYAN.getAsShort(), VanillaColours.DYE_GREEN.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_LIGHT_BLUE.getAsShort(),
+				VanillaColours.DYE_DARK_PURPLE.getAsShort(),
+		};
+		private static final short[][] RGB_KORP = new short[][] { new short[] { 125, 125, 125 },
+				VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+				VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+				VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+				VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+				VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(),
+				VanillaColours.DYE_DARK_GRAY.getAsShort(), new short[] { 22, 156, 156 }, new short[] { 22, 156, 156 },
+				VanillaColours.DYE_DARK_GRAY.getAsShort(), VanillaColours.DYE_DARK_GRAY.getAsShort(), };
+		private static final short[][] RGB_JELT = new short[][] { VanillaColours.DYE_ORANGE.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+				VanillaColours.DYE_ORANGE.getAsShort(), };
+		private static final short[][] RGB_BITT = new short[][] { VanillaColours.DYE_BLACK.getAsShort(),
+				VanillaColours.DYE_WHITE.getAsShort(), VanillaColours.DYE_YELLOW.getAsShort(),
+				VanillaColours.DYE_LIME.getAsShort(), VanillaColours.DYE_GREEN.getAsShort(),
+				VanillaColours.DYE_CYAN.getAsShort(), VanillaColours.DYE_LIGHT_BLUE.getAsShort(),
+				VanillaColours.DYE_LIGHT_BLUE.getAsShort(), VanillaColours.DYE_DARK_BLUE.getAsShort(),
+				VanillaColours.DYE_DARK_PURPLE.getAsShort(), VanillaColours.DYE_LIGHT_PURPLE.getAsShort(),
+				VanillaColours.DYE_PINK.getAsShort(), VanillaColours.DYE_RED.getAsShort(),
+				VanillaColours.DYE_RED.getAsShort(), VanillaColours.DYE_ORANGE.getAsShort(),
+				VanillaColours.DYE_BROWN.getAsShort(), };
+
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
index f5e27c05d5..7e5b07916e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
@@ -5,11 +5,13 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.util.GT_CoverBehavior;
+import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.api.objects.random.XSTR;
 import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
@@ -32,12 +34,12 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
 
 	public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
 			EntityPlayer aPlayer, float aX, float aY, float aZ) {
-		return true;
+		return super.onCoverRightclick(aSide, aCoverID, aCoverVariable, aTileEntity, aPlayer, aX, aY, aZ);
 	}
 
 	public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
 			EntityPlayer aPlayer, float aX, float aY, float aZ) {		
-		return aCoverVariable;
+		return super.onCoverScrewdriverclick(aSide, aCoverID, aCoverVariable, aTileEntity, aPlayer, aX, aY, aZ);
 	}
 
 	public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
@@ -69,7 +71,7 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
 	}
 
 	public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-		return 0;
+		return 1;
 	}
 
 	@Override
@@ -105,19 +107,37 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
 	@Override
 	public void placeCover(byte aSide, ItemStack aCover, ICoverable aTileEntity) {
 		String aKey = generateUniqueKey(aSide, aTileEntity);
+		boolean state = getCoverConnections(aCover);
 		sPrefixMap.put(aKey, aCover.getUnlocalizedName());
-		sConnectionStateForEntityMap.put(aKey, MetaCustomCoverItem.getCoverConnections(aCover));
+		//Logger.INFO("Mapping key "+aKey+" to "+state);
+		sConnectionStateForEntityMap.put(aKey, state);
 		super.placeCover(aSide, aCover, aTileEntity);
 	}
 
 	@Override
 	public boolean onCoverRemoval(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
 			boolean aForced) {
-		sConnectionStateForEntityMap.remove(generateUniqueKey(aSide, aTileEntity));
+		String aKey = generateUniqueKey(aSide, aTileEntity);
+		sConnectionStateForEntityMap.remove(aKey);
+		//Logger.INFO("Unmapping key "+aKey+".");
 		return true;
 	}
 	
 	public static boolean getConnectionState(byte aSide, ICoverable aTile) {
-		return sConnectionStateForEntityMap.get(generateUniqueKey(aSide, aTile));
+		String aKey = generateUniqueKey(aSide, aTile);
+		boolean b = sConnectionStateForEntityMap.get(aKey);
+		//Logger.INFO("Get State: "+b+" | "+aKey);
+		return b;
+	}
+	
+	public static final boolean getCoverConnections(final ItemStack aStack) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("CustomCoverMeta");
+			if (aNBT != null) {
+				return aNBT.getBoolean("AllowConnections");
+			}
+		}
+		return false;
 	}
 }
\ No newline at end of file