improved circuit recipe generation

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

Former-commit-id: 915e3e018f1b929bdd5ca03cbb668a85ade12e02

8 files changed, 395 insertions, 26 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java
new file mode 100644
index 0000000000..a59fb87635
--- /dev/null
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_GT_ItemRenderer.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2019 bartimaeusnek
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.github.bartimaeusnek.bartworks.client.renderer;
+
+import com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration.BW_Meta_Items;
+import com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration.CircuitImprintLoader;
+import com.github.bartimaeusnek.bartworks.util.BW_Util;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.render.GT_RenderUtil;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.ItemRenderer;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraftforge.client.IItemRenderer;
+import net.minecraftforge.client.MinecraftForgeClient;
+import org.lwjgl.opengl.GL11;
+
+@SideOnly(Side.CLIENT)
+public class BW_GT_ItemRenderer implements IItemRenderer {
+    public BW_GT_ItemRenderer() {
+        for (BW_Meta_Items.BW_GT_MetaGen_Item_Hook tItem : BW_Meta_Items.BW_GT_MetaGen_Item_Hook.sInstances) {
+            MinecraftForgeClient.registerItemRenderer(tItem, this);
+        }
+
+    }
+
+    @Override
+    public boolean handleRenderType(ItemStack aStack, IItemRenderer.ItemRenderType aType) {
+        if (!GT_Utility.isStackInvalid(aStack) && aStack.getItemDamage() >= 0) {
+            return aType == IItemRenderer.ItemRenderType.EQUIPPED_FIRST_PERSON || aType == IItemRenderer.ItemRenderType.INVENTORY || aType == IItemRenderer.ItemRenderType.EQUIPPED || aType == IItemRenderer.ItemRenderType.ENTITY;
+        } else {
+            return false;
+        }
+    }
+    @Override
+    public boolean shouldUseRenderHelper(IItemRenderer.ItemRenderType aType, ItemStack aStack, IItemRenderer.ItemRendererHelper aHelper) {
+        if (GT_Utility.isStackInvalid(aStack)) {
+            return false;
+        } else {
+            return aType == IItemRenderer.ItemRenderType.ENTITY;
+        }
+    }
+    @Override
+    public void renderItem(IItemRenderer.ItemRenderType type, ItemStack aStack, Object... data) {
+        if (!GT_Utility.isStackInvalid(aStack)) {
+            short aMetaData = (short) aStack.getItemDamage();
+            if (aMetaData >= 0) {
+                BW_Meta_Items.BW_GT_MetaGen_Item_Hook aItem = (BW_Meta_Items.BW_GT_MetaGen_Item_Hook) aStack.getItem();
+                GL11.glEnable(3042);
+                if (type == IItemRenderer.ItemRenderType.ENTITY) {
+                    if (RenderItem.renderInFrame) {
+                        GL11.glScalef(0.85F, 0.85F, 0.85F);
+                        GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
+                        GL11.glTranslated(-0.5D, -0.42D, 0.0D);
+                    } else {
+                        GL11.glTranslated(-0.5D, -0.42D, 0.0D);
+                    }
+                }
+
+                GL11.glColor3f(1.0F, 1.0F, 1.0F);
+                IIcon tIcon = (IIcon) BW_Util.get2DCoordFrom1DArray(aMetaData, 0, 2, aItem.mIconList);
+
+                Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
+                GL11.glBlendFunc(770, 771);
+                if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) {
+                    if (aMetaData < CircuitImprintLoader.reverseIDs)
+                        GT_RenderUtil.renderItemIcon(tIcon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
+                    else {
+                        for (int i = 0; i < 4; i++) {
+                            GT_RenderUtil.renderItemIcon(tIcon, 0.0D+i*2D,0.0D+i*2D,10.0D+i*2D,10.0D+i*2D, 0.001D, 0.0F, 0.0F, -1.0F);
+                        }
+                    }
+                } else {
+                    if (aMetaData < CircuitImprintLoader.reverseIDs)
+                        ItemRenderer.renderItemIn2D(Tessellator.instance,tIcon.getMaxU(), tIcon.getMinV(), tIcon.getMinU(), tIcon.getMaxV(), tIcon.getIconWidth(), tIcon.getIconHeight(), 0.0625F);
+//                    else {
+//                        for (int i = 0; i < 4; i++) {
+//                            ItemRenderer.renderItemIn2D(Tessellator.instance, 0.0F+i*2F,0.0F+i*2F,10.0F+i*2F,10.0F+i*2F, tIcon.getIconWidth(), tIcon.getIconHeight(),0.0625F);
+//                        }
+//                    }
+//                    ItemRenderer.renderItemIn2D(Tessellator.instance, tIcon.getMaxU(), tIcon.getMinV(), tIcon.getMinU(), tIcon.getMaxV(), tIcon.getIconWidth(), tIcon.getIconHeight(), 0.0625F);
+                }
+
+                IIcon tOverlay = (IIcon) BW_Util.get2DCoordFrom1DArray(aMetaData, 1, 2, aItem.mIconList);
+                GL11.glColor3f(1.0F, 1.0F, 1.0F);
+                if (tOverlay != null) {
+                    Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
+                    GL11.glBlendFunc(770, 771);
+                    if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) {
+                        GT_RenderUtil.renderItemIcon(tOverlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F);
+                    } else {
+                        ItemRenderer.renderItemIn2D(Tessellator.instance, tOverlay.getMaxU(), tOverlay.getMinV(), tOverlay.getMinU(), tOverlay.getMaxV(), tOverlay.getIconWidth(), tOverlay.getIconHeight(), 0.0625F);
+                    }
+                }
+            }
+
+            GL11.glDisable(3042);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java
index c8e1ba1335..0048353a3e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java
@@ -22,17 +22,40 @@
 
 package com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration;
 
+import com.github.bartimaeusnek.bartworks.MainMod;
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
+import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
 import com.github.bartimaeusnek.bartworks.system.oredict.OreDictAdder;
 import com.github.bartimaeusnek.bartworks.util.BW_Util;
+import com.github.bartimaeusnek.bartworks.util.ChatColorHelper;
 import com.github.bartimaeusnek.bartworks.util.Pair;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
-import gregtech.api.items.GT_MetaGenerated_Item;
+import gregtech.api.enums.TC_Aspects;
+import gregtech.api.interfaces.IItemBehaviour;
+import gregtech.api.interfaces.IItemContainer;
+import gregtech.api.items.GT_MetaBase_Item;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_Config;
+import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+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.util.IIcon;
+import net.minecraft.util.StatCollector;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.HashSet;
+import java.util.List;
 
 
 public class BW_Meta_Items {
@@ -75,7 +98,7 @@ public class BW_Meta_Items {
 
 
         public BW_GT_MetaGenCircuits() {
-            super("bwMetaGeneratedItem0", (short) 0, (short) 32766);
+            super("bwMetaGeneratedItem0");
         }
 
         public final ItemStack addCircuit(int aID, String aEnglish, String aToolTip, int tier){
@@ -83,10 +106,6 @@ public class BW_Meta_Items {
             return this.addItem(aID, aEnglish, aToolTip,SubTag.NO_UNIFICATION);
         }
 
-        public final void modifyIIconIndex(int aID, IIcon icon){
-            this.mIconList[aID][0] = icon;
-        }
-
         public final ItemStack getStack(int... meta_amount){
             ItemStack ret = new ItemStack(this);
             if (meta_amount.length <= 0 || meta_amount.length > 2)
@@ -101,9 +120,162 @@ public class BW_Meta_Items {
         }
     }
 
-    private static class BW_GT_MetaGen_Item_Hook extends GT_MetaGenerated_Item{
-        private BW_GT_MetaGen_Item_Hook(String aUnlocalized, short aOffset, short aItemAmount) {
-            super(aUnlocalized, aOffset, aItemAmount);
+    public static class BW_GT_MetaGen_Item_Hook extends GT_MetaBase_Item {
+        public static final HashSet<BW_Meta_Items.BW_GT_MetaGen_Item_Hook> sInstances = new HashSet<>();
+        public final IIcon[] mIconList;
+        public final BitSet mEnabledItems;
+        {
+            this.mIconList = new IIcon[Short.MAX_VALUE*2];
+            this.mEnabledItems = new BitSet(Short.MAX_VALUE);
+        }
+
+        private BW_GT_MetaGen_Item_Hook(String aUnlocalized) {
+            super(aUnlocalized);
+
+            this.setCreativeTab(new CreativeTabs("bw.MetaItems.0") {
+                @Override
+                public Item getTabIconItem() {
+                    return ItemRegistry.TAB;
+                }
+            });
+            this.setHasSubtypes(true);
+            this.setMaxDamage(0);
+            BW_Meta_Items.BW_GT_MetaGen_Item_Hook.sInstances.add(this);
+        }
+
+        @Override
+        public Long[] getElectricStats(ItemStack itemStack) {
+            return null;
+        }
+
+        @Override
+        public Long[] getFluidContainerStats(ItemStack itemStack) {
+            return null;
+        }
+
+        public final ItemStack addItem(int aID, String aEnglish, String aToolTip, Object... aRandomData) {
+            if (aToolTip == null) {
+                aToolTip = "";
+            }
+                ItemStack rStack = new ItemStack(this, 1, aID);
+                GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".name", aEnglish);
+                GT_LanguageManager.addStringLocalization(this.getUnlocalizedName(rStack) + ".tooltip", aToolTip);
+                List<TC_Aspects.TC_AspectStack> tAspects = new ArrayList<>();
+                this.mEnabledItems.set(aID);
+                Object[] var7 = aRandomData;
+                int var8 = aRandomData.length;
+
+                int var9;
+                Object tRandomData;
+                for(var9 = 0; var9 < var8; ++var9) {
+                    tRandomData = var7[var9];
+                    if (tRandomData instanceof SubTag) {
+                        if (tRandomData == SubTag.NO_UNIFICATION) {
+                            GT_OreDictUnificator.addToBlacklist(rStack);
+                        }
+                    }
+                }
+
+                var7 = aRandomData;
+                var8 = aRandomData.length;
+
+                for(var9 = 0; var9 < var8; ++var9) {
+                    tRandomData = var7[var9];
+                    if (tRandomData != null) {
+                        boolean tUseOreDict = true;
+
+                        if (tRandomData instanceof IItemBehaviour) {
+                            this.addItemBehavior(aID, (IItemBehaviour) tRandomData);
+                            tUseOreDict = false;
+                        }
+
+                        if (tRandomData instanceof IItemContainer) {
+                            ((IItemContainer)tRandomData).set(rStack);
+                            tUseOreDict = false;
+                        }
+
+                        if (!(tRandomData instanceof SubTag)) {
+                            if (tRandomData instanceof TC_Aspects.TC_AspectStack) {
+                                ((TC_Aspects.TC_AspectStack)tRandomData).addToAspectList(tAspects);
+                            } else if (tRandomData instanceof ItemData) {
+                                if (GT_Utility.isStringValid(tRandomData)) {
+                                    GT_OreDictUnificator.registerOre(tRandomData, rStack);
+                                } else {
+                                    GT_OreDictUnificator.addItemData(rStack, (ItemData)tRandomData);
+                                }
+                            } else if (tUseOreDict) {
+                                GT_OreDictUnificator.registerOre(tRandomData, rStack);
+                            }
+                        }
+                    }
+                }
+
+                if (GregTech_API.sThaumcraftCompat != null) {
+                    GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(rStack, tAspects, false);
+                }
+
+             return rStack;
+        }
+
+        @SideOnly(Side.CLIENT)
+        public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+            int j = this.mEnabledItems.length();
+
+            for(int i = 0; i < j; ++i) {
+                if (this.mEnabledItems.get(i)) {
+                    ItemStack tStack = new ItemStack(this, 1, i);
+                    this.isItemStackUsable(tStack);
+                    aList.add(tStack);
+                }
+            }
+
+        }
+
+        @SideOnly(Side.CLIENT)
+        public final void registerIcons(IIconRegister aIconRegister) {
+
+            for(short i = 0; i < CircuitImprintLoader.reverseIDs; ++i) {
+                if (this.mEnabledItems.get(i)) {
+                    BW_Util.set2DCoordTo1DArray(i,0,2,aIconRegister.registerIcon("gregtech:" + (GT_Config.troll ? "troll" : this.getUnlocalizedName() + "/" + i)),this.mIconList);
+                }
+            }
+
+            for (short i = CircuitImprintLoader.reverseIDs; i < Short.MAX_VALUE; i++) {
+                if (this.mEnabledItems.get(i)) {
+                    BW_Util.set2DCoordTo1DArray(i,0,2,CircuitImprintLoader.circuitIIconRefs.get(i).get(1).getIconIndex(),this.mIconList);
+                    BW_Util.set2DCoordTo1DArray(i,1,2,aIconRegister.registerIcon(MainMod.MOD_ID+":WrapOverlay"),this.mIconList);
+                     //aIconRegister.registerIcon("gregtech:" + (GT_Config.troll ? "troll" : this.getUnlocalizedName() + "/" + i));
+                }
+            }
+
+        }
+
+        @Override
+        protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
+            super.addAdditionalToolTips(aList, aStack, aPlayer);
+            aList.add(StatCollector.translateToLocal("tooltip.bw.0.name") + ChatColorHelper.DARKGREEN + " BartWorks");
+        }
+
+        @Override
+        public String getUnlocalizedName(ItemStack aStack) {
+            return this.getUnlocalizedName() + "." + aStack.getItemDamage();
+        }
+
+        @Override
+        public IIcon getIconFromDamage(int i) {
+            if (this.mEnabledItems.get(i))
+                return (IIcon) BW_Util.get2DCoordFrom1DArray(i,0,2,this.mIconList);
+            return null;
+        }
+
+        @Override
+        public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
+            return getIconFromDamage(stack.getItemDamage());
+        }
+
+        @Override
+        public IIcon getIcon(ItemStack stack, int pass) {
+            return getIconFromDamage(stack.getItemDamage());
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
index d3af29e6b7..bd49c3e64f 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
@@ -23,32 +23,33 @@
 package com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration;
 
 import com.github.bartimaeusnek.bartworks.util.BWRecipes;
-import com.github.bartimaeusnek.bartworks.util.BW_Util;
-import com.github.bartimaeusnek.bartworks.util.Pair;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
-import gregtech.api.items.GT_MetaGenerated_Item;
-import gregtech.api.items.GT_MetaGenerated_Item_X32;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.IIcon;
 import net.minecraftforge.oredict.OreDictionary;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import static gregtech.api.enums.ItemList.*;
 
 public class CircuitImprintLoader implements Runnable {
 
     static final ArrayListMultimap<NBTTagCompound,GT_Recipe> recipeTagMap = ArrayListMultimap.create();
     static final HashBiMap<CircuitData,NBTTagCompound> bwCircuitTagMap = HashBiMap.create(20);
     static final HashSet<NBTTagCompound> refs = new HashSet<>();
-    private static short reverseIDs = 32766;
+    public static short reverseIDs = Short.MAX_VALUE-1;
+    public static HashBiMap<Short, ItemList> circuitIIconRefs = HashBiMap.create(20);
 
     public static NBTTagCompound getTagFromStack(ItemStack stack){
         if (GT_Utility.isStackValid(stack))
@@ -61,10 +62,33 @@ public class CircuitImprintLoader implements Runnable {
     }
 
     public static void makeCircuitParts() {
-        ItemList[] itemLists = ItemList.values();
+        ItemList[] itemLists = values();
         for (ItemList single : itemLists) {
             if (!single.hasBeenSet())
                 continue;
+            if (
+                    single.toString().contains("Wafer") ||
+                    single.toString().contains("Circuit_Silicon_Ingot") ||
+                    single.toString().contains("Raw") ||
+                    single.toString().contains("raw") ||
+                    single.toString().contains("Glass_Tube") ||
+                    single == Circuit_Parts_GlassFiber ||
+                    single == Circuit_Parts_Advanced ||
+                    single == Circuit_Parts_Wiring_Advanced ||
+                    single == Circuit_Parts_Wiring_Elite ||
+                    single == Circuit_Parts_Wiring_Basic ||
+                    single == Circuit_Integrated ||
+                    single == Circuit_Parts_PetriDish ||
+                    single == Circuit_Parts_Vacuum_Tube ||
+                    single == Circuit_Integrated_Good ||
+                    single == Circuit_Parts_Capacitor ||
+                    single == Circuit_Parts_Diode ||
+                    single == Circuit_Parts_Resistor ||
+                    single == Circuit_Parts_Transistor
+
+            ){
+                continue;
+            }
             ItemStack itemStack = single.get(1);
             if (!GT_Utility.isStackValid(itemStack))
                 continue;
@@ -74,12 +98,15 @@ public class CircuitImprintLoader implements Runnable {
             String name = null;
             if (oreIDS.length == 1)
                 name = OreDictionary.getOreName(oreIDS[0]);
-            if ((name == null || name.isEmpty()) && (single.toString().contains("Circuit") || single.toString().contains("circuit")) && single.getBlock() == Blocks.air) {
+            if ((name == null || name.isEmpty()) && (single.toString().contains("Circuit") || single.toString().contains("circuit") || single.toString().contains("board")) && single.getBlock() == Blocks.air) {
                 ArrayList<String> toolTip = new ArrayList<>();
                 single.getItem().addInformation(single.get(1).copy(), null, toolTip, true);
+                String tt = (toolTip.size() > 0 ? toolTip.get(0) : "");
+              //  tt += "Internal Name = "+single;
                 String localised = GT_LanguageManager.getTranslation(GT_LanguageManager.getTranslateableItemStackName(itemStack));
-                BW_Meta_Items.getNEWCIRCUITS().addItem(CircuitImprintLoader.reverseIDs, "Wrap of " + localised, toolTip.size() > 0 ? toolTip.get(0) : "");
+                BW_Meta_Items.getNEWCIRCUITS().addItem(CircuitImprintLoader.reverseIDs, "Wrap of " + localised+"s", tt);
                 GT_Values.RA.addAssemblerRecipe(new ItemStack[]{single.get(16).copy()},Materials.Plastic.getMolten(576),BW_Meta_Items.getNEWCIRCUITS().getStack(CircuitImprintLoader.reverseIDs),600,30);
+                CircuitImprintLoader.circuitIIconRefs.put(CircuitImprintLoader.reverseIDs,single);
                 CircuitImprintLoader.reverseIDs--;
             }
         }
@@ -105,14 +132,41 @@ public class CircuitImprintLoader implements Runnable {
                     if (circuitRecipe.mFluidInputs[0].isFluidEqual(Materials.SolderingAlloy.getMolten(0)))
                         CircuitImprintLoader.refs.add(CircuitImprintLoader.getTagFromStack(s.copy().splitStack(1)));
                 }
-//              if (circuitRecipe.mEUt > BW_Util.getTierVoltage(5))
-                if (circuitRecipe.mFluidInputs[0].isFluidEqual(Materials.SolderingAlloy.getMolten(0))) {
-                    torem.add(circuitRecipe);
-                    BWRecipes.instance.getMappingsFor(BWRecipes.CIRCUITASSEMBLYLINE).addRecipe(circuitRecipe);
-                }
+                if (circuitRecipe.mFluidInputs[0].isFluidEqual(Materials.SolderingAlloy.getMolten(0)))
+                    BWRecipes.instance.getMappingsFor(BWRecipes.CIRCUITASSEMBLYLINE).addRecipe(CircuitImprintLoader.reBuildRecipe(circuitRecipe));
+//                if (circuitRecipe.mEUt > BW_Util.getTierVoltage(5)) {
+//                    torem.add(circuitRecipe);
+//                }
             }
         }
         GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes.mRecipeList.removeAll(torem);
     }
 
+    public static GT_Recipe reBuildRecipe(GT_Recipe original){
+       ItemStack out = original.copy().getOutput(0);
+       out.stackSize = 16;
+       ItemStack[] in = new  ItemStack[6];
+       BiMap<ItemList, Short> inversed = CircuitImprintLoader.circuitIIconRefs.inverse();
+       for (int i = 0; i < 6; i++) {
+           try {
+           for (ItemList il : inversed.keySet()){
+                   if (GT_Utility.areStacksEqual(il.get(1), original.mInputs[i])) {
+                       in[i] = BW_Meta_Items.getNEWCIRCUITS().getStack(inversed.get(il), original.mInputs[i].stackSize);
+                   }
+
+           }
+           if (original.mInputs[i] != null && in[i] == null){
+               in[i] = original.mInputs[i].copy();
+               in[i].stackSize *= 16;
+//               if (in[i].stackSize > 64)
+//                   return null;
+           }
+           } catch (ArrayIndexOutOfBoundsException e){
+               break;
+           } catch (NullPointerException e){
+           }
+       }
+       return new BWRecipes.DynamicGTRecipe(false,in,new ItemStack[]{out},null,null, original.mFluidInputs,null,original.mDuration,original.mEUt,original.mSpecialValue);
+    }
+
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java
index 24f581d208..b25bd5d1b6 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java
@@ -22,9 +22,14 @@
 
 package com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration;
 
+import com.github.bartimaeusnek.bartworks.client.renderer.BW_GT_ItemRenderer;
+import cpw.mods.fml.common.FMLCommonHandler;
+
 public class CircuitPartLoader implements Runnable {
     @Override
     public void run() {
         CircuitImprintLoader.makeCircuitParts();
+        if (FMLCommonHandler.instance().getEffectiveSide().isClient())
+            new BW_GT_ItemRenderer();
     }
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index 8c9164538a..1c9a8f4fc1 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -24,6 +24,7 @@ package com.github.bartimaeusnek.bartworks.system.material;
 
 import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
 import com.github.bartimaeusnek.bartworks.MainMod;
+import com.github.bartimaeusnek.bartworks.client.renderer.BW_GT_ItemRenderer;
 import com.github.bartimaeusnek.bartworks.client.renderer.BW_Renderer_Block_Ores;
 import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
 import com.github.bartimaeusnek.bartworks.system.log.DebugLog;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java
index 5802387794..261ab49c77 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java
@@ -53,6 +53,16 @@ public class BW_Util {
     public static final int CLEANROOM = -100;
     public static final int LOWGRAVITY = -200;
 
+    public static void set2DCoordTo1DArray(int indexX, int indexY, int sizeY, Object value, Object[] array) {
+        int index = indexX * sizeY + indexY;
+        array[index] = value;
+    }
+
+    public static Object get2DCoordFrom1DArray(int indexX, int indexY, int sizeY, Object[] array){
+        int index = indexX * sizeY + indexY;
+        return array[index];
+    }
+
     public static String subscriptNumbers(String b){
         char[] chars = b.toCharArray();
         char[] nu = new char[chars.length];
diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang
index 0aac211cdf..b0b3c9b7b6 100644
--- a/src/main/resources/assets/bartworks/lang/en_US.lang
+++ b/src/main/resources/assets/bartworks/lang/en_US.lang
@@ -159,4 +159,6 @@ tooltip.tile.eic.0.name=Controller Block for the Electric Implosion Compressor;S
 planet.Ross128b=Ross128b
 moon.Ross128ba=Ross128ba
 star.Ross128=Ross128
-solarsystem.Ross128System=Ross128-System
\ No newline at end of file
+solarsystem.Ross128System=Ross128-System
+
+itemGroup.bw.MetaItems.0=BartWorks Circuit Overhaul Items
\ No newline at end of file
diff --git a/src/main/resources/assets/bartworks/textures/items/WrapOverlay.png b/src/main/resources/assets/bartworks/textures/items/WrapOverlay.png
new file mode 100644
index 0000000000..f6d80e292e
--- /dev/null
+++ b/src/main/resources/assets/bartworks/textures/items/WrapOverlay.png