+ 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.

3 files changed, 70 insertions, 21 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
index 6075261254..6915ea2112 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
@@ -2,9 +2,12 @@ package gtPlusPlus.xmod.gregtech.common.items;
 
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
+
 import cofh.core.render.IconRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.objects.GT_MultiTexture;
 import gregtech.api.objects.GT_RenderedTexture;
@@ -12,6 +15,9 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.client.renderer.CustomItemBlockRenderer;
 import gtPlusPlus.core.common.CommonProxy;
 import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
@@ -28,19 +34,22 @@ import net.minecraft.world.World;
 
 public class MetaCustomCoverItem extends Item {
 
-	private final IIcon[] icons;
+	protected final IIcon[] icons;
 	private final String mModID;
 	private final String mTextureSetName;
-	private final CustomIcon[] mTextures;
+	protected final IIconContainer[] mTextures;
+	private final short[][] mRGB;
 
-	public MetaCustomCoverItem(String aModId, int aTextureCount, String aTextureSetName, CustomIcon[] aTextures) {
+	public MetaCustomCoverItem(String aModId, int aTextureCount, String aTextureSetName, IIconContainer[] aTextures, short[][] aRGB) {
 		super();
 		icons = new IIcon[aTextureCount];
 		mModID = aModId;
-		mTextureSetName = aTextureSetName;
+		mTextureSetName = Utils.sanitizeString(aTextureSetName);
 		mTextures = aTextures;
+		mRGB = aRGB;
+		this.setTextureName(CORE.MODID + ":" + "itemPlate");
 		this.setHasSubtypes(true);
-		String unlocalizedName = "itemCustomMetaCover." + mModID + "." + mTextureSetName + "." + aTextureCount;
+		String unlocalizedName = "itemCustomMetaCover." + mModID + "." + mTextureSetName;
 		this.setUnlocalizedName(unlocalizedName);
 		this.setCreativeTab(AddToCreativeTab.tabMisc);
 		this.setMaxStackSize(1);
@@ -62,17 +71,13 @@ public class MetaCustomCoverItem extends Item {
 		}
 	}
 
-	@Override
-	public void registerIcons(IIconRegister reg) {
-		for (int i = 0; i < icons.length; i++) {
-			this.icons[i] = mTextures[i].getIcon();
-		}
-	}
-
-	@Override
-	public IIcon getIconFromDamage(int meta) {
-		return this.icons[meta];
-	}
+	/*
+	 * @Override public void registerIcons(IIconRegister reg) { for (int i = 0; i <
+	 * icons.length; i++) { this.icons[i] = mTextures[i].getIcon(); } }
+	 * 
+	 * @Override public IIcon getIconFromDamage(int meta) { return this.icons[meta];
+	 * }
+	 */
 
 	@Override
 	public void getSubItems(Item item, CreativeTabs tab, List list) {
@@ -88,7 +93,7 @@ public class MetaCustomCoverItem extends Item {
 
 	@Override
 	public String getItemStackDisplayName(final ItemStack tItem) {
-		return EnumChatFormatting.LIGHT_PURPLE + super.getItemStackDisplayName(tItem);
+		return EnumChatFormatting.LIGHT_PURPLE + StringUtils.capitalize(mTextureSetName) + " [" + tItem.getItemDamage() + "]"; //super.getItemStackDisplayName(tItem);
 	}
 
 	private static boolean createNBT(ItemStack rStack) {
@@ -168,9 +173,8 @@ public class MetaCustomCoverItem extends Item {
 			boolean con = getCoverConnections(stack);
 			if (con) {
 				setCoverConnections(stack, false);
-			}
-			else {
-				setCoverConnections(stack, true);				
+			} else {
+				setCoverConnections(stack, true);
 			}
 		}
 		return stack;
@@ -201,4 +205,13 @@ public class MetaCustomCoverItem extends Item {
 		return super.isFull3D();
 	}
 
+	@Override
+	public int getColorFromItemStack(final ItemStack stack, final int HEX_OxFFFFFF) {
+		if (this.mRGB == null){
+			return super.getColorFromItemStack(stack, HEX_OxFFFFFF);
+		}		
+		int aMeta = stack.getItemDamage();		
+		return Utils.rgbtoHexValue(mRGB[aMeta][0], mRGB[aMeta][1], mRGB[aMeta][2]);
+	}
+
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index d64fcfb6b2..8fc5996c6e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -333,7 +333,7 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
             }
             else {              
                 aTierName = GT_Values.VN[i];
-                mMachineCasingCovers[i].set(this.addItem(aFirstMachineCasingID++, aTierName+" Machine Plate Cover", "Change connection status with Shift+Rmb", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L)}));
+                mMachineCasingCovers[i].set(this.addItem(aFirstMachineCasingID++, aTierName+" Machine Plate Cover", "Deprecated - Shapeless Craft to new version", new Object[]{}));
                 GregTech_API.registerCover(mMachineCasingCovers[i].get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[i][0]}), new GTPP_Cover_ToggleVisual());
              }
         }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
new file mode 100644
index 0000000000..f9a3451106
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/covers/MetaItemCoverCasings.java
@@ -0,0 +1,36 @@
+package gtPlusPlus.xmod.gregtech.common.items.covers;
+
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Textures;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+
+public class MetaItemCoverCasings extends MetaCustomCoverItem {
+
+	public MetaItemCoverCasings() {
+		super(CORE.MODID, Textures.BlockIcons.MACHINECASINGS_SIDE.length, "Gt Machine Casings", Textures.BlockIcons.MACHINECASINGS_SIDE, null);
+	}
+
+	@Override
+	public void registerIcons(IIconRegister reg) {
+		for (int i = 0; i < icons.length; i++) {
+			this.icons[i] = reg.registerIcon(CORE.MODID+":"+"covers/"+i);
+		}
+	}
+
+	@Override
+	public IIcon getIconFromDamage(int meta) {
+		return this.icons[MathUtils.balance(meta, 0, 15)];
+	}
+
+	@Override
+	public String getItemStackDisplayName(final ItemStack tItem) {
+		return EnumChatFormatting.LIGHT_PURPLE + GT_Values.VOLTAGE_NAMES[MathUtils.balance(tItem.getItemDamage(), 0, GT_Values.VOLTAGE_NAMES.length-1)]+" Machine Plate Cover"; //super.getItemStackDisplayName(tItem);
+	}
+
+}