+ Attempted to add custom covers for Ztones blocks. Should close #521.

12 files changed, 544 insertions, 83 deletions

diff --git a/src/Java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java b/src/Java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java
new file mode 100644
index 0000000000..f40357495a
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java
@@ -0,0 +1,85 @@
+package gtPlusPlus.core.client.renderer;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.client.IItemRenderer;
+
+import org.lwjgl.opengl.GL11;
+
+
+/**
+ * Easy way of rendering an item which should look like a block.
+ * Borrowed.
+ * 
+ * @author King Lemming
+ * 
+ */
+public class CustomItemBlockRenderer implements IItemRenderer {
+
+	public static CustomItemBlockRenderer instance = new CustomItemBlockRenderer();
+
+	@Override
+	public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+		return true;
+	}
+
+	@Override
+	public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+		return true;
+	}
+
+	@Override
+	public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
+
+		double offset = -0.5;
+		if (type == ItemRenderType.EQUIPPED || type == ItemRenderType.EQUIPPED_FIRST_PERSON) {
+			offset = 0;
+		} else if (type == ItemRenderType.ENTITY) {
+			GL11.glScalef(0.5F, 0.5F, 0.5F);
+		}
+		renderItemAsBlock((RenderBlocks) data[0], item, offset, offset, offset);
+	}
+	
+	public static void renderItemAsBlock(RenderBlocks renderer, ItemStack item, double translateX, double translateY, double translateZ) {
+
+		renderTextureAsBlock(renderer, item.getIconIndex(), translateX, translateY, translateZ);
+	}
+
+	public static void renderTextureAsBlock(RenderBlocks renderer, IIcon texture, double translateX, double translateY, double translateZ) {
+
+		Tessellator tessellator = Tessellator.instance;
+		Block block = Blocks.stone;
+
+		if (texture == null) {
+			return;
+		}
+		renderer.setRenderBoundsFromBlock(block);
+		GL11.glTranslated(translateX, translateY, translateZ);
+		tessellator.startDrawingQuads();
+
+		tessellator.setNormal(0.0F, -1.0F, 0.0F);
+		renderer.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(0.0F, 1.0F, 0.0F);
+		renderer.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(0.0F, 0.0F, -1.0F);
+		renderer.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(0.0F, 0.0F, 1.0F);
+		renderer.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(-1.0F, 0.0F, 0.0F);
+		renderer.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.setNormal(1.0F, 0.0F, 0.0F);
+		renderer.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, texture);
+
+		tessellator.draw();
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 03b0f944b7..23bd46d5b0 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -12,6 +12,8 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.OrePrefixes;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.api.objects.minecraft.ChunkManager;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.creative.AddToCreativeTab;
@@ -51,12 +53,13 @@ import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner;
 import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO;
 import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.monster.EntityBlaze;
 import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.IItemRenderer;
 import net.minecraftforge.common.ForgeChunkManager;
 
 public class CommonProxy {
@@ -258,7 +261,7 @@ public class CommonProxy {
 		
 		//Special mobs Support
 		if (ReflectionUtils.doesClassExist("toast.specialMobs.entity.zombie.EntityBrutishZombie")) {
-			Class aBrutishZombie = ReflectionUtils.getClass("toast.specialMobs.entity.zombie.EntityBrutishZombie");
+			Class<?> aBrutishZombie = ReflectionUtils.getClass("toast.specialMobs.entity.zombie.EntityBrutishZombie");
 			ItemStack aFortune1 = ItemUtils.getEnchantedBook(Enchantment.fortune, 1);
 			ItemStack aFortune2 = ItemUtils.getEnchantedBook(Enchantment.fortune, 1);
 			ItemStack aFortune3 = ItemUtils.getEnchantedBook(Enchantment.fortune, 1);
@@ -271,5 +274,21 @@ public class CommonProxy {
 		
 		
 	}
+	
+	protected final AutoMap<Pair<Item, IItemRenderer>> mItemRenderMappings = new AutoMap<Pair<Item, IItemRenderer>>();
+	
+
+	public static void registerItemRendererGlobal(Item aItem, IItemRenderer aRenderer) {
+		GTplusplus.proxy.registerItemRenderer(aItem, aRenderer);
+	}
+	
+	public void registerItemRenderer(Item aItem, IItemRenderer aRenderer) {
+		if (Utils.isServer()) {
+			return;
+		}
+		else {
+			mItemRenderMappings.add(new Pair<Item, IItemRenderer>(aItem, aRenderer));
+		}		
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
index 3c7ea9d2c9..93a5a969f7 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java
@@ -37,7 +37,11 @@ public class FireProtectionBauble extends BaseBauble {
 	}
 	
 	public static boolean setEntityImmuneToFire(Entity aEntity, boolean aImmune) {
-		return ReflectionUtils.setField(aEntity, isImmuneToFire, aImmune);
+		try {
+			return ReflectionUtils.setField(aEntity, isImmuneToFire, aImmune);
+		}
+		catch (Throwable t) {}
+		return false;
 	}	
 	
 	public FireProtectionBauble() {		
diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
index 71befe0a37..2372762e0d 100644
--- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -1,9 +1,5 @@
 package gtPlusPlus.core.proxy;
 
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Scanner;
-
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.Optional;
@@ -17,6 +13,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.australia.entity.model.ModelBoar;
 import gtPlusPlus.australia.entity.model.ModelDingo;
 import gtPlusPlus.australia.entity.model.ModelOctopus;
@@ -29,6 +26,7 @@ import gtPlusPlus.australia.entity.type.EntityBoar;
 import gtPlusPlus.australia.entity.type.EntityDingo;
 import gtPlusPlus.australia.entity.type.EntityOctopus;
 import gtPlusPlus.core.client.model.ModelGiantChicken;
+import gtPlusPlus.core.client.renderer.CustomItemBlockRenderer;
 import gtPlusPlus.core.client.renderer.CustomOreBlockRenderer;
 import gtPlusPlus.core.client.renderer.RenderBatKing;
 import gtPlusPlus.core.client.renderer.RenderDecayChest;
@@ -61,11 +59,13 @@ import gtPlusPlus.core.util.minecraft.particles.EntityParticleFXMysterious;
 import gtPlusPlus.xmod.gregtech.common.render.GTPP_CapeRenderer;
 import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.model.ModelBat;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.entity.RenderFireball;
 import net.minecraft.client.renderer.entity.RenderSnowball;
 import net.minecraft.entity.Entity;
+import net.minecraft.item.Item;
+import net.minecraftforge.client.IItemRenderer;
+import net.minecraftforge.client.MinecraftForgeClient;
 
 public class ClientProxy extends CommonProxy implements Runnable{
 
@@ -113,6 +113,7 @@ public class ClientProxy extends CommonProxy implements Runnable{
 		 * Custom Block Renderers
 		 */
 		new CustomOreBlockRenderer();
+		new CustomItemBlockRenderer();
 		new GTPP_Render_MachineBlock();	
 
 		super.init(e);
@@ -164,6 +165,20 @@ public class ClientProxy extends CommonProxy implements Runnable{
 		RenderingRegistry.registerEntityRenderingHandler(EntityBoar.class, new RenderBoar(new ModelBoar(), new ModelBoar(0.5F), 0.7F));
 		RenderingRegistry.registerEntityRenderingHandler(EntityDingo.class, new RenderDingo(new ModelDingo(), new ModelDingo(), 0.5F));
 		RenderingRegistry.registerEntityRenderingHandler(EntityOctopus.class, new RenderOctopus(new ModelOctopus(), 0.7F));
+		
+		
+		
+		
+		
+		
+		
+		/**
+		 * Items
+		 */		
+		for (Pair<Item, IItemRenderer> sItemRenderMappings : mItemRenderMappings) {
+			MinecraftForgeClient.registerItemRenderer(sItemRenderMappings.getKey(), sItemRenderMappings.getValue());			
+		}
+		
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 61c563d7c7..629c584f70 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -38,6 +38,7 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.BaseCustomTileEntity;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.custom.power.BaseCustomPower_MTE;
+import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -106,6 +107,7 @@ public class Meta_GT_Proxy {
         GT_Log.out.println("GT++ Mod: Registering the BaseMetaTileEntity.");
         GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity_GTPP");
         GameRegistry.registerTileEntity(tBaseMetaTileEntity2.getClass(), "BaseMetaTileEntity_GTPP2");
+        CoverManager.generateCustomCovers();
 	}
 	
 	public void init() {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index aaacbcd3a0..aed50ebae8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -30,9 +30,15 @@ public class TexturesGtBlock {
 	public static class CustomIcon implements IIconContainer, Runnable {
 		protected IIcon mIcon;
 		protected String mIconName;
+		protected String mModID;
 
 		public CustomIcon(final String aIconName) {
+			this(CORE.MODID, aIconName);
+		}
+		
+		public CustomIcon(final String aModID, final String aIconName) {
 			this.mIconName = aIconName;
+			this.mModID = aModID;
 			mCustomiconMap.put(this);
 			Logger.WARNING("Constructing a Custom Texture. " + this.mIconName);
 			GregTech_API.sGTBlockIconload.add(this);
@@ -50,7 +56,7 @@ public class TexturesGtBlock {
 
 		@Override
 		public void run() {
-			this.mIcon = GregTech_API.sBlockIcons.registerIcon(CORE.MODID + ":"  + this.mIconName);
+			this.mIcon = GregTech_API.sBlockIcons.registerIcon(this.mModID + ":"  + this.mIconName);
 			Logger.WARNING("FIND ME _ Processing texture: "+this.getTextureFile().getResourcePath());
 		}
 
@@ -555,10 +561,7 @@ public class TexturesGtBlock {
 
 
 
-	public static Object Casing_Material_Turbine;
-
-
-
+	public static Object Casing_Material_Turbine;	
 
 	
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java
new file mode 100644
index 0000000000..cc5cf3d55e
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java
@@ -0,0 +1,32 @@
+package gtPlusPlus.xmod.gregtech.common.blocks.textures;
+
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
+
+public class TexturesGtCutomCovers {
+
+	public static final CustomIcon[] TEXTURE_ZTONES_AGON = new CustomIcon[16];
+	public static final CustomIcon[] TEXTURE_ZTONES_ISZM = new CustomIcon[16];
+	public static final CustomIcon[] TEXTURE_ZTONES_KORP = new CustomIcon[16];
+	public static final CustomIcon[] TEXTURE_ZTONES_JELT = new CustomIcon[16];
+	public static final CustomIcon[] TEXTURE_ZTONES_BITT = new CustomIcon[16];
+	
+	public static void init() {
+		generateZTones();
+	}
+
+	private static void generateZTones() {
+		// ZTONES
+		String[] aZtoneCoverTextureNames = new String[] { "agon", "iszm", "korp", "jelt", "bitt" };
+		int aArrayIndex = 0;
+		CustomIcon[][] aArrays = new CustomIcon[][] { TEXTURE_ZTONES_AGON, TEXTURE_ZTONES_ISZM, TEXTURE_ZTONES_KORP,
+				TEXTURE_ZTONES_JELT, TEXTURE_ZTONES_BITT };
+
+		for (CustomIcon[] t : aArrays) {
+			for (int s = 0; s < 16; s++) {
+				t[s] = new CustomIcon("Ztones", "sets/" + aZtoneCoverTextureNames[aArrayIndex] + "/"+aZtoneCoverTextureNames[aArrayIndex]+"_ (" + s + ")");
+			}
+			aArrayIndex++;
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java
new file mode 100644
index 0000000000..b412e0fe60
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/CoverManager.java
@@ -0,0 +1,41 @@
+package gtPlusPlus.xmod.gregtech.common.covers;
+
+import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_AGON;
+import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_BITT;
+import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_ISZM;
+import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_JELT;
+import static gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers.TEXTURE_ZTONES_KORP;
+
+import cpw.mods.fml.common.Loader;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtCutomCovers;
+import gtPlusPlus.xmod.gregtech.common.items.MetaCustomCoverItem;
+
+public class CoverManager {
+	
+	//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;
+	
+
+	public static void generateCustomCovers() {
+
+		// init textures
+		TexturesGtCutomCovers.init();
+		
+		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]);
+			}			
+		}
+		
+	}
+	
+	
+}
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
new file mode 100644
index 0000000000..f5e27c05d5
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java
@@ -0,0 +1,123 @@
+package gtPlusPlus.xmod.gregtech.common.covers;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.util.GT_CoverBehavior;
+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.minecraftforge.common.util.ForgeDirection;
+import net.minecraftforge.fluids.Fluid;
+
+public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior {
+
+	private static final Map<String, Boolean> sConnectionStateForEntityMap = new ConcurrentHashMap<String, Boolean>();
+	private static final Map<String, String> sPrefixMap = new ConcurrentHashMap<String, String>();
+		
+	public static String generateUniqueKey(byte aSide, ICoverable aEntity) {
+		try {
+			BlockPos aPos = new BlockPos(aEntity.getIGregTechTileEntity(aEntity.getXCoord(), aEntity.getYCoord(), aEntity.getZCoord()));
+			ForgeDirection aDir = ForgeDirection.getOrientation(aSide);
+			String s = aEntity.getInventoryName()+"."+aPos.getUniqueIdentifier()+aDir.name();
+			return s;
+		}
+		catch (Throwable t) {}		
+		XSTR x = new XSTR();
+		return "ERROR."+x.getSeed()+x.hashCode()+x.nextDouble()+".ID";
+	}
+
+	public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+			EntityPlayer aPlayer, float aX, float aY, float aZ) {
+		return true;
+	}
+
+	public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+			EntityPlayer aPlayer, float aX, float aY, float aZ) {		
+		return aCoverVariable;
+	}
+
+	public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+		return getConnectionState(aSide, aTileEntity);
+	}
+
+	public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+		return getConnectionState(aSide, aTileEntity);
+	}
+
+	public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
+		return getConnectionState(aSide, aTileEntity);
+	}
+
+	public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
+		return getConnectionState(aSide, aTileEntity);
+	}
+
+	public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
+		return getConnectionState(aSide, aTileEntity);
+	}
+
+	public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
+		return getConnectionState(aSide, aTileEntity);
+	}
+
+	public String getDescription(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+		return this.trans("756", "Connectable: ") + getConnectionState(aSide, aTileEntity);
+	}
+
+	public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+		return 0;
+	}
+
+	@Override
+	public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+			long aTimer) {
+		return aCoverVariable;
+	}
+
+	@Override
+	public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+		return getConnectionState(aSide, aTileEntity);
+	}
+
+	@Override
+	public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+		return getConnectionState(aSide, aTileEntity);
+	}
+
+	@Override
+	public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+		return super.alwaysLookConnected(aSide, aCoverID, aCoverVariable, aTileEntity);
+	}
+
+	@Override
+	public byte getRedstoneInput(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable,
+			ICoverable aTileEntity) {
+		if (!getConnectionState(aSide, aTileEntity)) {
+			return 0;
+		}
+		return super.getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity);
+	}
+
+	@Override
+	public void placeCover(byte aSide, ItemStack aCover, ICoverable aTileEntity) {
+		String aKey = generateUniqueKey(aSide, aTileEntity);
+		sPrefixMap.put(aKey, aCover.getUnlocalizedName());
+		sConnectionStateForEntityMap.put(aKey, MetaCustomCoverItem.getCoverConnections(aCover));
+		super.placeCover(aSide, aCover, aTileEntity);
+	}
+
+	@Override
+	public boolean onCoverRemoval(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
+			boolean aForced) {
+		sConnectionStateForEntityMap.remove(generateUniqueKey(aSide, aTileEntity));
+		return true;
+	}
+	
+	public static boolean getConnectionState(byte aSide, ICoverable aTile) {
+		return sConnectionStateForEntityMap.get(generateUniqueKey(aSide, aTile));
+	}
+}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_VisualPlate.java b/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_VisualPlate.java
deleted file mode 100644
index 7d2ed2c21a..0000000000
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_VisualPlate.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package gtPlusPlus.xmod.gregtech.common.covers;
-
-import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.util.GT_CoverBehavior;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.fluids.Fluid;
-
-public class GTPP_Cover_VisualPlate extends GT_CoverBehavior {
-
-    public GTPP_Cover_VisualPlate() {
-    }
-
-    public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
-            long aTimer) {
-        return aCoverVariable;
-    }
-
-    public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
-            EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        return aCoverVariable;
-    }
-
-    public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity,
-            EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        return true;
-    }
-
-    public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return false;
-    }
-
-    public boolean letsRedstoneGoOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return false;
-    }
-
-    public boolean letsEnergyIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return false;
-    }
-
-    public boolean letsEnergyOut(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return false;
-    }
-
-    public boolean letsFluidIn(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
-        return false;
-    }
-
-    public boolean letsFluidOut(byte aSide, int aCoverID, int aCoverVariable, Fluid aFluid, ICoverable aTileEntity) {
-        return false;
-    }
-
-    public boolean letsItemsIn(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
-        return false;
-    }
-
-    public boolean letsItemsOut(byte aSide, int aCoverID, int aCoverVariable, int aSlot, ICoverable aTileEntity) {
-        return false;
-    }
-
-    public boolean alwaysLookConnected(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return false;
-    }
-
-    public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
-        return 0;
-    }
-}
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
new file mode 100644
index 0000000000..6075261254
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java
@@ -0,0 +1,204 @@
+package gtPlusPlus.xmod.gregtech.common.items;
+
+import java.util.List;
+
+import cofh.core.render.IconRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.objects.GT_MultiTexture;
+import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.client.renderer.CustomItemBlockRenderer;
+import gtPlusPlus.core.common.CommonProxy;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
+import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class MetaCustomCoverItem extends Item {
+
+	private final IIcon[] icons;
+	private final String mModID;
+	private final String mTextureSetName;
+	private final CustomIcon[] mTextures;
+
+	public MetaCustomCoverItem(String aModId, int aTextureCount, String aTextureSetName, CustomIcon[] aTextures) {
+		super();
+		icons = new IIcon[aTextureCount];
+		mModID = aModId;
+		mTextureSetName = aTextureSetName;
+		mTextures = aTextures;
+		this.setHasSubtypes(true);
+		String unlocalizedName = "itemCustomMetaCover." + mModID + "." + mTextureSetName + "." + aTextureCount;
+		this.setUnlocalizedName(unlocalizedName);
+		this.setCreativeTab(AddToCreativeTab.tabMisc);
+		this.setMaxStackSize(1);
+		GameRegistry.registerItem(this, unlocalizedName);
+		registerCover();
+		Logger.INFO("[Covers] Generated Custom covers for "+mModID+" using "+aTextureCount+" textures from "+mTextureSetName+".");
+	}
+
+	private final void registerCover() {		
+		//CommonProxy.registerItemRendererGlobal(this, new CustomItemBlockRenderer());		
+		for (int i=0;i<icons.length;i++) {
+			GregTech_API.registerCover(
+					ItemUtils.simpleMetaStack(this, i, 1),
+					new GT_MultiTexture(
+							new ITexture[]{
+									new GT_RenderedTexture(mTextures[i])
+							}),
+					new GTPP_Cover_ToggleVisual());
+		}
+	}
+
+	@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) {
+		for (int i = 0; i < icons.length; i++) {
+			list.add(new ItemStack(item, 1, i));
+		}
+	}
+
+	@Override
+	public String getUnlocalizedName(ItemStack stack) {
+		return this.getUnlocalizedName() + "_" + stack.getItemDamage();
+	}
+
+	@Override
+	public String getItemStackDisplayName(final ItemStack tItem) {
+		return EnumChatFormatting.LIGHT_PURPLE + super.getItemStackDisplayName(tItem);
+	}
+
+	private static boolean createNBT(ItemStack rStack) {
+		final NBTTagCompound tagMain = new NBTTagCompound();
+		final NBTTagCompound tagNBT = new NBTTagCompound();
+		tagNBT.setLong("Damage", 0);
+		tagNBT.setBoolean("AllowConnections", false);
+		tagMain.setTag("CustomCoverMeta", tagNBT);
+		rStack.setTagCompound(tagMain);
+		return true;
+	}
+
+	public static final long getCoverDamage(final ItemStack aStack) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("CustomCoverMeta");
+			if (aNBT != null) {
+				return aNBT.getLong("Damage");
+			}
+		} else {
+			createNBT(aStack);
+		}
+		return 0L;
+	}
+
+	public static final boolean setCoverDamage(final ItemStack aStack, final long aDamage) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("CustomCoverMeta");
+			if (aNBT != null) {
+				aNBT.setLong("Damage", aDamage);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	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");
+			}
+		} else {
+			createNBT(aStack);
+		}
+		return false;
+	}
+
+	public static final boolean setCoverConnections(final ItemStack aStack, final boolean aConnections) {
+		NBTTagCompound aNBT = aStack.getTagCompound();
+		if (aNBT != null) {
+			aNBT = aNBT.getCompoundTag("CustomCoverMeta");
+			if (aNBT != null) {
+				aNBT.setBoolean("AllowConnections", aConnections);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public double getDurabilityForDisplay(ItemStack stack) {
+		if (stack.getTagCompound() == null) {
+			createNBT(stack);
+		}
+		double currentDamage = getCoverDamage(stack);
+		double meta = stack.getItemDamage() == 0 ? 50 : 2500;
+		double durabilitypercent = currentDamage / meta;
+		return durabilitypercent;
+	}
+
+	@Override
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		if (KeyboardUtils.isShiftKeyDown()) {
+			boolean con = getCoverConnections(stack);
+			if (con) {
+				setCoverConnections(stack, false);
+			}
+			else {
+				setCoverConnections(stack, true);				
+			}
+		}
+		return stack;
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
+		boolean cons = getCoverConnections(stack);
+		list.add(EnumChatFormatting.GRAY + "Allows Connections: "+cons);
+		list.add(EnumChatFormatting.GRAY + "Shift Rmb to change state before applying");
+		super.addInformation(stack, player, list, bool);
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
+	@Override
+	public Item setFull3D() {
+		// TODO Auto-generated method stub
+		return super.setFull3D();
+	}
+
+	@Override
+	public boolean isFull3D() {
+		// TODO Auto-generated method stub
+		return super.isFull3D();
+	}
+
+}
\ 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 c9f4dd9ae2..d64fcfb6b2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -29,7 +29,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.items.Gregtech_MetaItem_X32;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_Overflow;
-import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_VisualPlate;
+import gtPlusPlus.xmod.gregtech.common.covers.GTPP_Cover_ToggleVisual;
 
 public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
 
@@ -333,8 +333,8 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
             }
             else {              
                 aTierName = GT_Values.VN[i];
-                mMachineCasingCovers[i].set(this.addItem(aFirstMachineCasingID++, aTierName+" Machine Plate Cover", "Looks visually like an "+aTierName+" machine casing, apply to pipe/cable as cover", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.MACHINA, 1L)}));
-                GregTech_API.registerCover(mMachineCasingCovers[i].get(1L, new Object[0]), new GT_MultiTexture(new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[i][0]}), new GTPP_Cover_VisualPlate());
+                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)}));
+                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());
              }
         }