Fix more things (#1550)

* fix recipes not working, fix scanner data, fix recipes

* add amps display, fix tier 1 being broken oops

4 files changed, 111 insertions, 48 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
index 9f311c09ab..991a03eb96 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java
@@ -1,10 +1,15 @@
 package gregtech.api.metatileentity.implementations;
 
+import static gregtech.api.enums.GT_Values.*;
+
 import gregtech.api.util.GT_ExoticEnergyInputHelper;
+import gregtech.api.util.GT_Utility;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 
 /**
  * Multiblock base class that allows machine to use power over int.
@@ -101,4 +106,59 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<
     public boolean drainEnergyInput(long aEU) {
         return GT_ExoticEnergyInputHelper.drainEnergy(aEU, getExoticAndNormalEnergyHatchList());
     }
+
+    @Override
+    public String[] getInfoData() {
+        int mPollutionReduction = 0;
+        for (GT_MetaTileEntity_Hatch_Muffler tHatch : mMufflerHatches) {
+            if (isValidMetaTileEntity(tHatch)) {
+                mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction);
+            }
+        }
+
+        long storedEnergy = 0;
+        long maxEnergy = 0;
+        for (GT_MetaTileEntity_Hatch tHatch : getExoticAndNormalEnergyHatchList()) {
+            if (isValidMetaTileEntity(tHatch)) {
+                storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU();
+                maxEnergy += tHatch.getBaseMetaTileEntity().getEUCapacity();
+            }
+        }
+        long voltage = getMaxInputVoltage();
+        long amps = getMaxInputAmps();
+
+        return new String[] {
+            /* 1*/ StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN
+                    + GT_Utility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / "
+                    + EnumChatFormatting.YELLOW
+                    + GT_Utility.formatNumbers(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s",
+            /* 2*/ StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN
+                    + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / "
+                    + EnumChatFormatting.YELLOW
+                    + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU",
+            /* 3*/ StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " + EnumChatFormatting.RED
+                    + GT_Utility.formatNumbers(getActualEnergyUsage()) + EnumChatFormatting.RESET + " EU/t",
+            /* 4*/ StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + EnumChatFormatting.YELLOW
+                    + GT_Utility.formatNumbers(voltage) + EnumChatFormatting.RESET + " EU/t(*" + amps + ")"
+                    + StatCollector.translateToLocal("GT5U.machines.tier")
+                    + ": " + EnumChatFormatting.YELLOW
+                    + VN[GT_Utility.getTier(voltage)] + EnumChatFormatting.RESET,
+            /* 5*/ StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " + EnumChatFormatting.RED
+                    + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " "
+                    + StatCollector.translateToLocal("GT5U.multiblock.efficiency")
+                    + ": " + EnumChatFormatting.YELLOW
+                    + Float.toString(mEfficiency / 100.0F) + EnumChatFormatting.RESET + " %",
+            /* 6*/ StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + EnumChatFormatting.GREEN
+                    + mPollutionReduction + EnumChatFormatting.RESET + " %"
+        };
+    }
+
+    @Override
+    public long getMaxInputVoltage() {
+        return GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList());
+    }
+
+    public long getMaxInputAmps() {
+        return GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList());
+    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
index 2f74adea64..bcb195b45c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
@@ -486,7 +486,7 @@ public class GT_MetaTileEntity_PCBFactory
     @Override
     public boolean checkRecipe(ItemStack aStack) {
         GT_Recipe.GT_Recipe_Map aMap = getRecipeMap();
-        FluidStack[] tFluidInputs = getCompactedFluids();
+        FluidStack[] tFluidInputs = getStoredFluids().toArray(new FluidStack[0]);
         if (mSeparate) {
             ArrayList<ItemStack> tInputList = new ArrayList<ItemStack>();
             for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) {
@@ -517,7 +517,8 @@ public class GT_MetaTileEntity_PCBFactory
         long amps = GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList());
         long tTotalEU = voltage * amps;
 
-        GT_Recipe tRecipe = aMap.findRecipe(getBaseMetaTileEntity(), true, true, voltage, aFluidInputs, tItemInputs);
+        GT_Recipe tRecipe =
+                aMap.findRecipe(getBaseMetaTileEntity(), null, true, false, voltage, aFluidInputs, aStack, tItemInputs);
 
         if (tRecipe == null) {
             return false;
@@ -527,7 +528,7 @@ public class GT_MetaTileEntity_PCBFactory
 
         int aNanitesOfRecipe = 0;
 
-        ItemStack aNanite = tRecipe.getRepresentativeInput(0);
+        ItemStack aNanite = tRecipe.getRepresentativeInput(1);
         if (GT_OreDictUnificator.getAssociation(aNanite).mPrefix.equals(OrePrefixes.nanite)) {
             for (ItemStack aItem : tItemInputs) {
                 if (aItem.isItemEqual(aNanite)) {
@@ -536,17 +537,19 @@ public class GT_MetaTileEntity_PCBFactory
             }
         }
 
-        int aMaxParallel = (int) Math.max(Math.ceil(Math.log(aNanitesOfRecipe) / Math.log(2)), 1);
+        int aMaxParallel = (int) Math.max(Math.ceil(Math.log(aNanitesOfRecipe) / Math.log(2) + 0.00001), 1);
         float aExtraPower = (float) Math.ceil(Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled));
 
         if (tRecipe.mEUt > voltage) {
             return false;
         }
 
-        if (((recipeBitMap & mTier1BitMap) == 1 && (mTier >= 1)
-                        || (recipeBitMap & mTier2BitMap) == 1 && (mTier >= 2)
-                        || (recipeBitMap & mTier3BitMap) == 1 && (mTier == 3))
-                && ((recipeBitMap & mBioBitMap) == 0 || (recipeBitMap & mBioBitMap) == 1 && mBioUpgrade)) {
+        boolean recipeAllowed = (((recipeBitMap & mTier1BitMap) == mTier1BitMap && (mTier >= 1))
+                        || ((recipeBitMap & mTier2BitMap) == mTier2BitMap && (mTier >= 2))
+                        || ((recipeBitMap & mTier3BitMap) == mTier3BitMap && (mTier >= 3)))
+                && ((recipeBitMap & mBioBitMap) == 0 || (recipeBitMap & mBioBitMap) == mBioBitMap && mBioUpgrade);
+
+        if (recipeAllowed) {
 
             int aCurrentParallel = 0;
             for (int i = 0; i < aMaxParallel; i++) {
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
index bf2b7ecebd..bfbfd3ffd8 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
@@ -90,7 +90,7 @@ public class GT_NaniteChain {
 
         // Silver Nanites - Used in Tier 2 PCB Factory to improve board production
         GT_Values.RA.addNanoForgeRecipe(
-                new ItemStack[] {aUHVTierLens, Materials.Silver.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16)},
+                new ItemStack[] {aUEVTierLens, Materials.Silver.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16)},
                 new FluidStack[] {Materials.UUMatter.getFluid(200000)},
                 new ItemStack[] {Materials.Silver.getNanite(1)},
                 null,
@@ -102,7 +102,7 @@ public class GT_NaniteChain {
         // Neutronium Nanites - Used to upgrade the Nano Forge to Tier 2
         GT_Values.RA.addNanoForgeRecipe(
                 new ItemStack[] {
-                    aUEVTierLens,
+                    aUHVTierLens,
                     Materials.Neutronium.getBlocks(8),
                     ItemList.Circuit_Chip_SoC2.get(64),
                     ItemList.Circuit_Chip_SoC2.get(32)
@@ -117,7 +117,7 @@ public class GT_NaniteChain {
 
         // Gold Nanites - Used in Tier 3 PCB Factory to improve board production
         GT_Values.RA.addNanoForgeRecipe(
-                new ItemStack[] {aUIVTierLens, Materials.Gold.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16)},
+                new ItemStack[] {aUMVTierLens, Materials.Gold.getBlocks(8), ItemList.Circuit_Chip_SoC.get(16)},
                 new FluidStack[] {Materials.UUMatter.getFluid(300000)},
                 new ItemStack[] {Materials.Gold.getNanite(1)},
                 null,
@@ -129,7 +129,7 @@ public class GT_NaniteChain {
         // Transcendent Metal Nanites - Used to upgrade the Nano Forge to Tier 3
         GT_Values.RA.addNanoForgeRecipe(
                 new ItemStack[] {
-                    aUMVTierLens,
+                    aUIVTierLens,
                     Materials.TranscendentMetal.getBlocks(8),
                     ItemList.Circuit_Chip_SoC2.get(64),
                     ItemList.Circuit_Chip_SoC2.get(64),
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
index 6c657c2676..7cf487b162 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
@@ -93,11 +93,11 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(1),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))),
-                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))),
-                        GT_Utility.getIntegratedCircuit(1)
+                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
@@ -118,12 +118,12 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(2),
                         GT_Utility.getNaniteAsCatalyst(Materials.Silver),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))),
-                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))),
-                        GT_Utility.getIntegratedCircuit(2)
+                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
@@ -144,12 +144,12 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(3),
                         GT_Utility.getNaniteAsCatalyst(Materials.Gold),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.AnnealedCopper, (long) (16 * (Math.sqrt(tier)))),
-                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))),
-                        GT_Utility.getIntegratedCircuit(3)
+                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
@@ -172,11 +172,11 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(1),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))),
-                        GT_Utility.getIntegratedCircuit(1)
+                                OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
@@ -197,12 +197,12 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(2),
                         GT_Utility.getNaniteAsCatalyst(Materials.Silver),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))),
-                        GT_Utility.getIntegratedCircuit(2)
+                                OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
@@ -223,12 +223,12 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(3),
                         GT_Utility.getNaniteAsCatalyst(Materials.Gold),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, (long) (16 * (Math.sqrt(tier - 1)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))),
-                        GT_Utility.getIntegratedCircuit(3)
+                                OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
@@ -251,12 +251,12 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(1),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))),
-                        GT_Utility.getIntegratedCircuit(1)
+                                OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
@@ -277,13 +277,13 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(2),
                         GT_Utility.getNaniteAsCatalyst(Materials.Silver),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))),
-                        GT_Utility.getIntegratedCircuit(2)
+                                OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
@@ -304,13 +304,13 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(3),
                         GT_Utility.getNaniteAsCatalyst(Materials.Gold),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.Aluminium, (long) (16 * (Math.sqrt(tier - 2)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))),
-                        GT_Utility.getIntegratedCircuit(3)
+                                OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
@@ -333,12 +333,12 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(1),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))),
-                        GT_Utility.getIntegratedCircuit(1)
+                                OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
@@ -359,13 +359,13 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(2),
                         GT_Utility.getNaniteAsCatalyst(Materials.Silver),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))),
-                        GT_Utility.getIntegratedCircuit(2)
+                                OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
@@ -386,13 +386,13 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(3),
                         GT_Utility.getNaniteAsCatalyst(Materials.Gold),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.Palladium, (long) (16 * (Math.sqrt(tier - 3)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))),
-                        GT_Utility.getIntegratedCircuit(3)
+                                OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
@@ -415,12 +415,12 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(1),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.EnrichedHolmium, (long) (16 * (Math.sqrt(tier - 4)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))),
-                        GT_Utility.getIntegratedCircuit(1)
+                                OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
@@ -442,13 +442,13 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(2),
                         GT_Utility.getNaniteAsCatalyst(Materials.Silver),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.EnrichedHolmium, (long) (16 * (Math.sqrt(tier - 4)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))),
-                        GT_Utility.getIntegratedCircuit(2)
+                                OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
@@ -470,13 +470,13 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(3),
                         GT_Utility.getNaniteAsCatalyst(Materials.Gold),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(
                                 OrePrefixes.foil, Materials.EnrichedHolmium, (long) (16 * (Math.sqrt(tier - 4)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))),
-                        GT_Utility.getIntegratedCircuit(3)
+                                OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
@@ -500,12 +500,12 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(1),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Longasssuperconductornameforuvwire, (long)
                                 (16 * (Math.sqrt(tier - 5)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))),
-                        GT_Utility.getIntegratedCircuit(1)
+                                OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
@@ -527,13 +527,13 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(2),
                         GT_Utility.getNaniteAsCatalyst(Materials.Silver),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Longasssuperconductornameforuvwire, (long)
                                 (16 * (Math.sqrt(tier - 5)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))),
-                        GT_Utility.getIntegratedCircuit(2)
+                                OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
@@ -555,13 +555,13 @@ public class GT_PCBFactoryRecipes {
             aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards));
             GT_Values.RA.addPCBFactoryRecipe(
                     new ItemStack[] {
+                        GT_Utility.getIntegratedCircuit(3),
                         GT_Utility.getNaniteAsCatalyst(Materials.Gold),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier).getPlates(1),
                         GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Longasssuperconductornameforuvwire, (long)
                                 (16 * (Math.sqrt(tier - 5)))),
                         GT_OreDictUnificator.get(
-                                OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))),
-                        GT_Utility.getIntegratedCircuit(3),
+                                OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5))))
                     },
                     new FluidStack[] {
                         Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),