Refactor RecipeMap (#2345)

* Remove deprecated and unused things

* Move recipemap subclasses

* Move GT_Recipe_Map to outside and rename to RecipeMap

* Move recipemap instances to separated class & remove prepending s

* Remove useless GT_Recipe constructors

* Always use ModularUI

* Rename IGT_RecipeMap -> IRecipeMap

* Add RecipeMapBuilder

* Remove more deprecated and unused things

* Fix RecipeMap type parameters

* Use multimap for recipe index

* Fix bending recipe error in dev env

* Remove mUniqueIdentifier

* Update AE2FC

* Less edgy texture for NEI recipe background

* Add replicator fluid output slot for NEI and machine GUI

* Fix fluid fuels not having fuel value in large boilers

* Remove GT_RectHandler and NEI_TransferRectHost

* Remove RecipeMapHandler

* Move NEI energy description from RecipeMapFrontend to Power

* Refactor the way to filter fusion recipes

* Check restriction for some properties

* Remove showVoltageAmperage

* Make Power accept GT_Recipe

* Fix NPE

* Move NEI duration description to Power from Frontend

* Directly implement IRecipeProcessingAwareHatch for GT_MetaTileEntity_Hatch_InputBus_ME

* Make Power integrated with GT_OverclockCalculator

* Rename Power -> OverclockDescriber

* Don't modify recipe find logic until postload finishes

* Reformat reserved MTE ids

* Fix check for too few inputs on recipe addition

* Move replicator logic to backend

* Stop un-hiding assline recipes

* Allow setting custom recipe comparator & implement for fusion

* Update AE2FC

* Rename getRecipeList and getRecipes -> getRecipeMap

* Automatically register recipe catalysts

* Cleanup the way to detect recipe collision

* Make use of BasicUIProperties for basic machines

* Make use of BasicUIProperties for UIHelper

* Rename specialHandler -> recipeTransformer

* Add way to automatically register handler info

* Add recipe category

* Add some APIs for addons

* Rename blastRecipes ->
blastFurnaceRecipes

* Remove GT_MetaTileEntity_BasicMachine_GT_Recipe#mSharedTank and #mRequiresFluidForFiltering

* Don't require setting duration and EU/t for fuel recipes

* Don't require setting EU/t for primitive blast furnace recipes

* Revert change to addMultiblockChemicalRecipe

* Fix large boiler general desc recipe not being added

* Hide duration and EU/t from large boiler

* Cleanup recipe stacktrace draw

* Extend metadata usage of recipe builder to recipe itself

* Implement metadata handling & NEI comparator for PCB factory

* Some rename around NEIRecipeInfo

* Some toString implementations

* Add more APIs for addons & some rename

* Infer handler icon from recipe catalyst if one is not set

* Also shrink recipe title when OC is not used

* Remove rare earth centrifuge recipe

* Use metadata for replicator backend

* Adjust geothermal generator output slot

* Allow having multiple transferrects

* Store recipemap reference in backend

* Rename vacuumRecipes -> vacuumFreezerRecipes

* Add config to tweak visibility of recipe categories

* Remove mHideRecyclingRecipes in favor of recipe category config

* Fix typo fluidSolidfierRecipes -> fluidSolidifierRecipes

* Refactor findRecipe and ProcessingLogic to use Stream

* Fix BBF handler icon & remove bronze blast furnace

* Add fluent API for findRecipe

* Add way to stop adding progressbar

* Change arg order for special texture

* Avoid overwriting interesting failure with NO_RECIPE

* Some changes for FuelBackend

* Set space project icon

* Remove localization from TT

* Remove CNC recipe adder

* Move recipe extractor from AE2FC

* Minor internal change for ProcessingLogic#applyRecipe

* More javadoc on #getAvailableRecipeMaps

* Better implementation of #ofSupplier

* Move replicator exponent config to GT_Proxy

* Remove RC & IC2 macerator handling

* Rename StreamUtil -> GT_StreamUtil

* Refactor code around RecipeMetadataStorage

* Revise #compileRecipe javadoc

* Switch extreme diesel recipe loader to downstream recipe map

* Optimize #reMap

* Rename reload -> reloadNEICache

* Minor tweak for drawEnergyInfo

* a bit more doc

* Adjust recipe catalysts

* Add toString implementation for GT_Fluid for debug

* Minor revision for OilCrackerBackend

* Index replicator recipes by material

---------

Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>

3 files changed, 309 insertions, 232 deletions

diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java
index d5d1537a49..aaf25812e4 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java
@@ -1,10 +1,10 @@
 package gregtech.loaders.postload.chains;
 
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCrackingRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes;
+import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
+import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes;
+import static gregtech.api.recipe.RecipeMaps.crackingRecipes;
+import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
+import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeBuilder.TICKS;
 
@@ -34,7 +34,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sMixerRecipes);
+            .addTo(mixerRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(
@@ -46,7 +46,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sMixerRecipes);
+            .addTo(mixerRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_Utility.getIntegratedCircuit(1))
@@ -54,7 +54,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(32000))
             .duration(8 * SECONDS)
             .eut(400)
-            .addTo(sCrackingRecipes);
+            .addTo(crackingRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(Materials.Aluminiumhydroxide.getDust(1))
@@ -68,7 +68,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(5000))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_HV)
-            .addTo(sMultiblockChemicalRecipes);
+            .addTo(multiblockChemicalReactorRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(MaterialsOreAlum.BauxiteSlag.getDust(1))
@@ -81,7 +81,7 @@ public class GT_BauxiteRefineChain {
             .outputChances(10000, 3000, 2000, 9000, 8000)
             .duration(2 * SECONDS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Ilmenite, 1))
@@ -91,7 +91,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(new FluidStack(ItemList.sGreenVitriol, 2000))
             .duration(21 * SECONDS)
             .eut(1000)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Ilmenite, 1))
@@ -101,7 +101,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(new FluidStack(ItemList.sGreenVitriol, 2000))
             .duration(21 * SECONDS)
             .eut(1000)
-            .addTo(sChemicalBathRecipes);
+            .addTo(chemicalBathRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(MaterialsOreAlum.IlmeniteSlag.getDust(1))
@@ -114,7 +114,7 @@ public class GT_BauxiteRefineChain {
             .outputChances(8000, 500, 2000, 5000, 6000)
             .duration(2 * SECONDS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         OrePrefixes[] washable = new OrePrefixes[] { OrePrefixes.crushed, OrePrefixes.crushedPurified,
             OrePrefixes.dustImpure, OrePrefixes.dustPure };
@@ -129,7 +129,7 @@ public class GT_BauxiteRefineChain {
                 .fluidOutputs(MaterialsOreAlum.SapphireJuice.getFluid(1000))
                 .duration(2 * SECONDS)
                 .eut(100)
-                .addTo(sMixerRecipes);
+                .addTo(mixerRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -140,7 +140,7 @@ public class GT_BauxiteRefineChain {
                 .fluidOutputs(MaterialsOreAlum.GreenSapphireJuice.getFluid(1000))
                 .duration(2 * SECONDS)
                 .eut(100)
-                .addTo(sMixerRecipes);
+                .addTo(mixerRecipes);
 
             GT_Values.RA.stdBuilder()
                 .itemInputs(
@@ -151,7 +151,7 @@ public class GT_BauxiteRefineChain {
                 .fluidOutputs(MaterialsOreAlum.RubyJuice.getFluid(1000))
                 .duration(2 * SECONDS)
                 .eut(100)
-                .addTo(sMixerRecipes);
+                .addTo(mixerRecipes);
         }
 
         GT_Values.RA.stdBuilder()
@@ -166,7 +166,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
             .duration(2 * SECONDS + 5 * TICKS)
             .eut(100)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_Utility.getIntegratedCircuit(1))
@@ -181,7 +181,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
             .duration(2 * SECONDS + 5 * TICKS)
             .eut(100)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(GT_Utility.getIntegratedCircuit(1))
@@ -196,7 +196,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000))
             .duration(2 * SECONDS + 5 * TICKS)
             .eut(100)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(Materials.Pyrope.getDust(1))
@@ -212,7 +212,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10))
             .duration(2 * SECONDS + 5 * TICKS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(Materials.Almandine.getDust(1))
@@ -228,7 +228,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10))
             .duration(2 * SECONDS + 5 * TICKS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(Materials.Spessartine.getDust(1))
@@ -244,7 +244,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10))
             .duration(2 * SECONDS + 5 * TICKS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(Materials.Andradite.getDust(1))
@@ -260,7 +260,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10))
             .duration(2 * SECONDS + 5 * TICKS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(Materials.Uvarovite.getDust(1))
@@ -276,7 +276,7 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10))
             .duration(2 * SECONDS + 5 * TICKS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
 
         GT_Values.RA.stdBuilder()
             .itemInputs(Materials.Grossular.getDust(1))
@@ -292,6 +292,6 @@ public class GT_BauxiteRefineChain {
             .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10))
             .duration(2 * SECONDS + 5 * TICKS)
             .eut(TierEU.RECIPE_MV)
-            .addTo(sCentrifugeRecipes);
+            .addTo(centrifugeRecipes);
     }
 }
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 a72fe0acc9..dabcd93a8d 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
@@ -23,8 +23,8 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
+import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_RecipeBuilder;
 
 public class GT_NaniteChain {
@@ -234,7 +234,7 @@ public class GT_NaniteChain {
             .duration(750 * GT_RecipeBuilder.SECONDS)
             .eut(TierEU.RECIPE_MAX)
             .specialValue(3)
-            .addTo(GT_Recipe.GT_Recipe_Map.sNanoForge);
+            .addTo(RecipeMaps.nanoForgeRecipes);
 
     }
 }
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 7e7e4ec496..392e6fa154 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
@@ -2,7 +2,8 @@ package gregtech.loaders.postload.chains;
 
 import static gregtech.api.enums.Mods.BartWorks;
 import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
+import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
+import static gregtech.api.recipe.metadata.PCBFactoryUpgrade.BIO;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
@@ -23,6 +24,9 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
+import gregtech.api.recipe.RecipeMaps;
+import gregtech.api.recipe.metadata.PCBFactoryTierKey;
+import gregtech.api.recipe.metadata.PCBFactoryUpgradeKey;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_PCBFactoryManager;
@@ -31,12 +35,10 @@ import gregtech.api.util.GT_Utility;
 @SuppressWarnings("SpellCheckingInspection")
 public class GT_PCBFactoryRecipes {
 
-    public static void load() {
-        final int mBioUpgradeBitMap = 0b1000;
-        final int mTier3BitMap = 0b100;
-        final int mTier2BitMap = 0b10;
-        final int mTier1BitMap = 0b1;
+    private static final PCBFactoryTierKey TIER = PCBFactoryTierKey.INSTANCE;
+    private static final PCBFactoryUpgradeKey UPGRADE = PCBFactoryUpgradeKey.INSTANCE;
 
+    public static void load() {
         final Fluid solderLuV = FluidRegistry.getFluid("molten.indalloy140") != null
             ? FluidRegistry.getFluid("molten.indalloy140")
             : FluidRegistry.getFluid("molten.solderingalloy");
@@ -65,7 +67,7 @@ public class GT_PCBFactoryRecipes {
                 .itemOutputs(ItemList.BasicPhotolithographicFrameworkCasing.get(1))
                 .duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_ZPM)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1),
@@ -73,7 +75,7 @@ public class GT_PCBFactoryRecipes {
                 .itemOutputs(ItemList.ReinforcedPhotolithographicFrameworkCasing.get(1))
                 .duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_UHV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1),
@@ -82,7 +84,7 @@ public class GT_PCBFactoryRecipes {
                 .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1))
                 .duration(30 * SECONDS)
                 .eut(TierEU.RECIPE_UIV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
             GT_Values.RA.stdBuilder()
                 .itemInputs(
                     GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1),
@@ -92,7 +94,7 @@ public class GT_PCBFactoryRecipes {
                 .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(8 * 144))
                 .duration(10 * SECONDS)
                 .eut(TierEU.RECIPE_UMV)
-                .addTo(sAssemblerRecipes);
+                .addTo(assemblerRecipes);
         }
 
         // Load CircuitBoard Recipes
@@ -106,19 +108,22 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(amountOfBoards));
-            GT_Values.RA.addPCBFactoryRecipe(
-                new ItemStack[] { GT_Utility.getIntegratedCircuit(1),
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
-                    Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 1.5))),
-                (int) GT_Values.VP[tier] * 3 / 4,
-                mTier1BitMap | mTier2BitMap | mTier3BitMap);
+                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
+                    Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 1.5))))
+                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .metadata(TIER, 1)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 0.5))));
@@ -128,19 +133,23 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
-                    Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 1.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier2BitMap | mTier3BitMap);
+                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
+                    Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 1.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 2)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier))));
@@ -150,19 +159,23 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
-                    Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 1.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier3BitMap);
+                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, (long) (16 * (Math.sqrt(tier)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier)))),
+                    Materials.IronIIIChloride.getFluid((long) (250 * (Math.sqrt(tier)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 1.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 3)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Advanced Circuit Board
@@ -174,19 +187,21 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(amountOfBoards));
-            GT_Values.RA.addPCBFactoryRecipe(
-                new ItemStack[] { GT_Utility.getIntegratedCircuit(1),
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
-                    Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 2.5))),
-                (int) GT_Values.VP[tier] * 3 / 4,
-                mTier1BitMap | mTier2BitMap | mTier3BitMap);
+                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
+                    Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 2.5))))
+                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .metadata(TIER, 1)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1.5))));
@@ -196,19 +211,22 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
-                    Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 2.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier2BitMap | mTier3BitMap);
+                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
+                    Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 2.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 2)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1))));
@@ -218,19 +236,22 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
-                    Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 2.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier3BitMap);
+                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, (long) (16 * (Math.sqrt(tier - 1)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 1)))),
+                    Materials.IronIIIChloride.getFluid((long) (500 * (Math.sqrt(tier - 1)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 2.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 3)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // More Advanced Circuit Board
@@ -242,20 +263,23 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(amountOfBoards));
-            GT_Values.RA.addPCBFactoryRecipe(
-                new ItemStack[] { GT_Utility.getIntegratedCircuit(1),
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
-                    Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 3.5))),
-                (int) GT_Values.VP[tier] * 3 / 4,
-                mTier1BitMap | mTier2BitMap | mTier3BitMap);
+                        .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
+                    Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 3.5))))
+                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .metadata(TIER, 1)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2.5))));
@@ -265,20 +289,24 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
-                    Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 3.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier2BitMap | mTier3BitMap);
+                        .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
+                    Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 3.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 2)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2))));
@@ -288,20 +316,24 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
-                    Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 3.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier3BitMap);
+                        .get(OrePrefixes.foil, Materials.EnergeticAlloy, (long) (16 * (Math.sqrt(tier - 2)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 2)))),
+                    Materials.IronIIIChloride.getFluid((long) (1000 * (Math.sqrt(tier - 2)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 3.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 3)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Elite Circuit Board
@@ -313,20 +345,22 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(amountOfBoards));
-            GT_Values.RA.addPCBFactoryRecipe(
-                new ItemStack[] { GT_Utility.getIntegratedCircuit(1),
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
-                    Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 4.5))),
-                (int) GT_Values.VP[tier] * 3 / 4,
-                mTier1BitMap | mTier2BitMap | mTier3BitMap);
+                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
+                    Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 4.5))))
+                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .metadata(TIER, 1)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3.5))));
@@ -336,20 +370,23 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
-                    Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 4.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier2BitMap | mTier3BitMap);
+                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
+                    Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 4.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 2)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3))));
@@ -359,20 +396,23 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
-                    Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 4.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier3BitMap);
+                    GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, (long) (16 * (Math.sqrt(tier - 3)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 3)))),
+                    Materials.IronIIIChloride.getFluid((long) (2000 * (Math.sqrt(tier - 3)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 4.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 3)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Wetware Circuit Board
@@ -384,21 +424,25 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(amountOfBoards));
-            GT_Values.RA.addPCBFactoryRecipe(
-                new ItemStack[] { GT_Utility.getIntegratedCircuit(1),
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
+                        .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
                     Materials.IronIIIChloride.getFluid((long) (5000 * (Math.sqrt(tier - 4)))),
-                    Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))),
-                (int) GT_Values.VP[tier] * 3 / 4,
-                mTier1BitMap | mTier2BitMap | mTier3BitMap | mBioUpgradeBitMap);
+                    Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
+                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .metadata(TIER, 1)
+                .metadata(UPGRADE, BIO)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4.5))));
@@ -408,21 +452,26 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
+                        .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
                     Materials.IronIIIChloride.getFluid((long) (5000 * (Math.sqrt(tier - 4)))),
-                    Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 5.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier2BitMap | mTier3BitMap | mBioUpgradeBitMap);
+                    Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 2)
+                .metadata(UPGRADE, BIO)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4))));
@@ -432,21 +481,26 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    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)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
+                        .get(OrePrefixes.foil, Materials.NiobiumTitanium, (long) (16 * (Math.sqrt(tier - 4)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 4)))),
                     Materials.IronIIIChloride.getFluid((long) (5000 * (Math.sqrt(tier - 4)))),
-                    Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 5.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier3BitMap | mBioUpgradeBitMap);
+                    Materials.GrowthMediumSterilized.getFluid((long) (2000 * (Math.sqrt(tier - 4)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 3)
+                .metadata(UPGRADE, BIO)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         // Bioware Circuit Board
@@ -458,8 +512,9 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(amountOfBoards));
-            GT_Values.RA.addPCBFactoryRecipe(
-                new ItemStack[] { GT_Utility.getIntegratedCircuit(1),
+            GT_Values.RA.stdBuilder()
+                .itemInputs(
+                    GT_Utility.getIntegratedCircuit(1),
                     GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
                     GT_OreDictUnificator.get(
@@ -467,14 +522,17 @@ public class GT_PCBFactoryRecipes {
                         Materials.Longasssuperconductornameforuvwire,
                         (long) (16 * (Math.sqrt(tier - 5)))),
                     GT_OreDictUnificator
-                        .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
+                        .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
                     Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))),
-                    Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))),
-                (int) GT_Values.VP[tier] * 3 / 4,
-                mTier1BitMap | mTier2BitMap | mTier3BitMap | mBioUpgradeBitMap);
+                    Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
+                .eut((int) GT_Values.VP[tier] * 3 / 4)
+                .metadata(TIER, 1)
+                .metadata(UPGRADE, BIO)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5.5))));
@@ -484,8 +542,10 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    GT_Utility.getIntegratedCircuit(2),
+                    GT_Utility.getNaniteAsCatalyst(Materials.Silver),
                     GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
                     GT_OreDictUnificator.get(
@@ -493,14 +553,17 @@ public class GT_PCBFactoryRecipes {
                         Materials.Longasssuperconductornameforuvwire,
                         (long) (16 * (Math.sqrt(tier - 5)))),
                     GT_OreDictUnificator
-                        .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
+                        .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
                     Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))),
-                    Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier2BitMap | mTier3BitMap | mBioUpgradeBitMap);
+                    Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 2)
+                .metadata(UPGRADE, BIO)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
         for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
             int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5))));
@@ -510,8 +573,10 @@ public class GT_PCBFactoryRecipes {
                 amountOfBoards -= 64;
             }
             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_Values.RA.stdBuilder()
+                .itemInputs(
+                    GT_Utility.getIntegratedCircuit(3),
+                    GT_Utility.getNaniteAsCatalyst(Materials.Gold),
                     GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
                         .getPlates(1),
                     GT_OreDictUnificator.get(
@@ -519,14 +584,17 @@ public class GT_PCBFactoryRecipes {
                         Materials.Longasssuperconductornameforuvwire,
                         (long) (16 * (Math.sqrt(tier - 5)))),
                     GT_OreDictUnificator
-                        .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))) },
-                new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
+                        .get(OrePrefixes.foil, Materials.Neutronium, (long) (16 * (Math.sqrt(tier - 5)))))
+                .fluidInputs(
+                    Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 5)))),
                     Materials.IronIIIChloride.getFluid((long) (7500 * (Math.sqrt(tier - 5)))),
-                    Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))) },
-                aBoards.toArray(new ItemStack[0]),
-                (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))),
-                (int) GT_Values.VP[tier + 1] * 3 / 4,
-                mTier3BitMap | mBioUpgradeBitMap);
+                    Materials.BioMediumSterilized.getFluid((long) (4000 * (Math.sqrt(tier - 5)))))
+                .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
+                .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                .metadata(TIER, 3)
+                .metadata(UPGRADE, BIO)
+                .addTo(RecipeMaps.pcbFactoryRecipes);
         }
 
         if (GTPlusPlus.isModLoaded()) {
@@ -539,8 +607,9 @@ public class GT_PCBFactoryRecipes {
                     amountOfBoards -= 64;
                 }
                 aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
-                GT_Values.RA.addPCBFactoryRecipe(
-                    new ItemStack[] { GT_Utility.getIntegratedCircuit(1),
+                GT_Values.RA.stdBuilder()
+                    .itemInputs(
+                        GT_Utility.getIntegratedCircuit(1),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
                             .getPlates(1),
                         GT_ModHandler.getModItem(
@@ -551,14 +620,16 @@ public class GT_PCBFactoryRecipes {
                         GT_OreDictUnificator
                             .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
                         GT_ModHandler
-                            .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))) },
-                    new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
+                            .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
+                    .fluidInputs(
+                        Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
                         Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
-                        Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))) },
-                    aBoards.toArray(new ItemStack[0]),
-                    (int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))),
-                    (int) GT_Values.VP[tier] * 3 / 4,
-                    mTier1BitMap | mTier2BitMap | mTier3BitMap);
+                        Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
+                    .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                    .duration((int) Math.ceil(600 / Math.sqrt(Math.pow(1.5, tier - 5.5))))
+                    .eut((int) GT_Values.VP[tier] * 3 / 4)
+                    .metadata(TIER, 1)
+                    .addTo(RecipeMaps.pcbFactoryRecipes);
             }
             for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
                 int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5))));
@@ -568,8 +639,9 @@ public class GT_PCBFactoryRecipes {
                     amountOfBoards -= 64;
                 }
                 aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
-                GT_Values.RA.addPCBFactoryRecipe(
-                    new ItemStack[] { GT_Utility.getIntegratedCircuit(2),
+                GT_Values.RA.stdBuilder()
+                    .itemInputs(
+                        GT_Utility.getIntegratedCircuit(2),
                         GT_Utility.getNaniteAsCatalyst(Materials.Silver),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
                             .getPlates(1),
@@ -581,14 +653,16 @@ public class GT_PCBFactoryRecipes {
                         GT_OreDictUnificator
                             .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
                         GT_ModHandler
-                            .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))) },
-                    new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
+                            .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
+                    .fluidInputs(
+                        Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
                         Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
-                        Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))) },
-                    aBoards.toArray(new ItemStack[0]),
-                    (int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))),
-                    (int) GT_Values.VP[tier + 1] * 3 / 4,
-                    mTier2BitMap | mTier3BitMap);
+                        Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
+                    .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                    .duration((int) Math.ceil(500 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
+                    .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                    .metadata(TIER, 2)
+                    .addTo(RecipeMaps.pcbFactoryRecipes);
             }
             for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) {
                 int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6))));
@@ -598,8 +672,9 @@ public class GT_PCBFactoryRecipes {
                     amountOfBoards -= 64;
                 }
                 aBoards.add(ItemList.Circuit_Board_Optical.get(amountOfBoards));
-                GT_Values.RA.addPCBFactoryRecipe(
-                    new ItemStack[] { GT_Utility.getIntegratedCircuit(3),
+                GT_Values.RA.stdBuilder()
+                    .itemInputs(
+                        GT_Utility.getIntegratedCircuit(3),
                         GT_Utility.getNaniteAsCatalyst(Materials.Gold),
                         GT_PCBFactoryManager.getPlasticMaterialFromTier(tier)
                             .getPlates(1),
@@ -611,14 +686,16 @@ public class GT_PCBFactoryRecipes {
                         GT_OreDictUnificator
                             .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))),
                         GT_ModHandler
-                            .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))) },
-                    new FluidStack[] { Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
+                            .getModItem("miscutils", "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6)))))
+                    .fluidInputs(
+                        Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))),
                         Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))),
-                        Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))) },
-                    aBoards.toArray(new ItemStack[0]),
-                    (int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))),
-                    (int) GT_Values.VP[tier + 1] * 3 / 4,
-                    mTier3BitMap);
+                        Materials.MysteriousCrystal.getMolten((long) (2880 * (Math.sqrt(tier - 6)))))
+                    .itemOutputs(aBoards.toArray(new ItemStack[0]))
+                    .duration((int) Math.ceil(400 / Math.sqrt(Math.pow(1.5, tier - 6.5))))
+                    .eut((int) GT_Values.VP[tier + 1] * 3 / 4)
+                    .metadata(TIER, 3)
+                    .addTo(RecipeMaps.pcbFactoryRecipes);
             }
         }
     }