Remove Bio and Breakthrough circuits from the modpack

src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java

@@ -35,7 +35,6 @@
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
 import gtPlusPlus.core.item.circuit.GTPPIntegratedCircuitItem;
-import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -610,7 +609,7 @@ private static void addMiscRecipes() {
 
         // Red Slurry / Tailings Processing
         GTValues.RA.stdBuilder()
-            .itemInputs(CI.getNumberedBioCircuit(10))
+            .itemInputs(GTUtility.getIntegratedCircuit(10))
             .itemOutputs(
                 GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Iron, 1L),
                 GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Copper, 1L),

src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java

@@ -24,7 +24,6 @@
 import gregtech.api.util.GTRecipeConstants;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.minecraft.ItemPackage;
-import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -50,7 +49,9 @@ public static void recipeCreateEthylene() {
         // C2H6O = C2H4 + H2O
         if (bioEth1 != null) {
             GTValues.RA.stdBuilder()
-                .itemInputs(CI.getNumberedBioCircuit(17), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
+                .itemInputs(
+                    GTUtility.getIntegratedCircuit(17),
+                    ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
                 .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1))
                 .fluidInputs(bioEth1)
                 .fluidOutputs(FluidUtils.getWater(1000))
@@ -61,7 +62,9 @@ public static void recipeCreateEthylene() {
 
         if (bioEth2 != null) {
             GTValues.RA.stdBuilder()
-                .itemInputs(CI.getNumberedBioCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
+                .itemInputs(
+                    GTUtility.getIntegratedCircuit(18),
+                    ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1))
                 .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 1))
                 .fluidInputs(bioEth2)
                 .fluidOutputs(FluidUtils.getWater(1000))
@@ -207,7 +210,7 @@ private static void recipeNaphthaleneToPhthalicAcid() {
 
     private static void recipePhthalicAcidToPhthalicAnhydride() {
         GTValues.RA.stdBuilder()
-            .itemInputs(CI.getNumberedBioCircuit(15))
+            .itemInputs(GTUtility.getIntegratedCircuit(15))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustPhthalicAnhydride", 15))
             .fluidInputs(Materials.PhthalicAcid.getFluid(1000))
             .eut(TierEU.RECIPE_MV)

src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java

@@ -226,7 +226,7 @@ private static void chemplantRecipes() {
 
         // Modify Sapling into Pine Sapling
         GTValues.RA.stdBuilder()
-            .itemInputs(CI.getNumberedBioCircuit(6), ItemUtils.getSimpleStack(Blocks.sapling, 32))
+            .itemInputs(GTUtility.getIntegratedCircuit(6), ItemUtils.getSimpleStack(Blocks.sapling, 32))
             .itemOutputs(ItemUtils.getSimpleStack(BOPBlockRegistrator.sapling_Pine, 16))
             .fluidInputs(FluidUtils.getFluidStack("fluid.geneticmutagen", 2000), FluidUtils.getDistilledWater(8000))
             .duration(120 * SECONDS)
@@ -626,7 +626,7 @@ private static void laserEngraverRecipes() {
         RA.stdBuilder()
             .itemInputs(
                 GregtechItemList.Laser_Lens_WoodsGlass.get(0),
-                ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, 20, 1))
+                GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 1L))
             .itemOutputs(GregtechItemList.Distillus_Upgrade_Chip.get(1))
             .duration(5 * MINUTES)
             .eut(TierEU.RECIPE_IV)
@@ -902,7 +902,7 @@ private static void dehydratorRecipes() {
 
         if (cropGrape != null && foodRaisins != null) {
             GTValues.RA.stdBuilder()
-                .itemInputs(CI.getNumberedBioCircuit(20), cropGrape)
+                .itemInputs(GTUtility.getIntegratedCircuit(20), cropGrape)
                 .itemOutputs(foodRaisins)
                 .eut(2)
                 .duration(10 * TICKS)
@@ -911,7 +911,7 @@ private static void dehydratorRecipes() {
 
         // Process Waste Water
         GTValues.RA.stdBuilder()
-            .itemInputs(CI.getNumberedBioCircuit(21))
+            .itemInputs(GTUtility.getIntegratedCircuit(21))
             .itemOutputs(
                 ItemUtils.getSimpleStack(Blocks.dirt),
                 GTOreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1),

src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java

@@ -784,7 +784,7 @@ private static void chemPlant() {
 
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(19),
+                GTUtility.getIntegratedCircuit(19),
                 CI.getTieredGTPPMachineCasing(2, 4),
                 CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.gearGt, 4),
                 CI.getTieredComponentOfMaterial(Materials.AnnealedCopper, OrePrefixes.plate, 16),
@@ -797,7 +797,7 @@ private static void chemPlant() {
             .addTo(assemblerRecipes);
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(15),
+                GTUtility.getIntegratedCircuit(15),
                 CI.getTieredGTPPMachineCasing(1, 2),
                 ItemList.Hatch_Input_Bus_MV.get(1),
                 CI.getTieredComponentOfMaterial(Materials.Bronze, OrePrefixes.gearGt, 8),
@@ -823,7 +823,7 @@ private static void algaeFarm() {
 
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(21),
+                GTUtility.getIntegratedCircuit(21),
                 CI.getTieredGTPPMachineCasing(0, 4),
                 CI.getTieredComponentOfMaterial(Materials.Aluminium, OrePrefixes.rod, 12),
                 CI.getTieredComponentOfMaterial(Materials.Wood, OrePrefixes.plate, 32),
@@ -865,7 +865,7 @@ private static void overflowValveCovers() {
         for (int tier = 1; tier < aOutputs.length + 1; tier++) {
             GTValues.RA.stdBuilder()
                 .itemInputs(
-                    CI.getNumberedBioCircuit(19),
+                    GTUtility.getIntegratedCircuit(19),
                     CI.getElectricPump(tier, 2),
                     CI.getElectricMotor(tier, 2),
                     CI.getPlate(tier, 4))
@@ -890,7 +890,7 @@ private static void tieredMachineHulls() {
         for (int i = 0; i < 10; i++) {
             GTValues.RA.stdBuilder()
                 .itemInputs(
-                    CI.getNumberedBioCircuit(20),
+                    GTUtility.getIntegratedCircuit(20),
                     CI.getTieredMachineCasing(i),
                     CI.getPlate(i, 8),
                     CI.getGear(i, 2),
@@ -1572,7 +1572,7 @@ private static void runModRecipes() {
         // Semi-Fluid Generators
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(14),
+                GTUtility.getIntegratedCircuit(14),
                 CI.getTieredMachineHull(1, 1),
                 CI.getElectricMotor(1, 2),
                 CI.getElectricPiston(1, 2),
@@ -1587,7 +1587,7 @@ private static void runModRecipes() {
 
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(14),
+                GTUtility.getIntegratedCircuit(14),
                 CI.getTieredMachineHull(2, 1),
                 CI.getElectricMotor(2, 2),
                 CI.getElectricPiston(2, 2),
@@ -1602,7 +1602,7 @@ private static void runModRecipes() {
 
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(14),
+                GTUtility.getIntegratedCircuit(14),
                 CI.getTieredMachineHull(3, 1),
                 CI.getElectricMotor(3, 2),
                 CI.getElectricPiston(3, 2),
@@ -1617,7 +1617,7 @@ private static void runModRecipes() {
 
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(14),
+                GTUtility.getIntegratedCircuit(14),
                 CI.getTieredMachineHull(4, 1),
                 CI.getElectricMotor(4, 2),
                 CI.getElectricPiston(4, 2),
@@ -1632,7 +1632,7 @@ private static void runModRecipes() {
 
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(14),
+                GTUtility.getIntegratedCircuit(14),
                 CI.getTieredMachineHull(5, 1),
                 CI.getElectricMotor(5, 2),
                 CI.getElectricPiston(5, 2),
@@ -3242,7 +3242,7 @@ private static void chisels() {
         for (int i = 1; i < 4; i++) {
             GTValues.RA.stdBuilder()
                 .itemInputs(
-                    CI.getNumberedBioCircuit(10 + i),
+                    GTUtility.getIntegratedCircuit(10 + i),
                     CI.getTieredMachineCasing(i),
                     CI.getPlate(i, 4),
                     CI.getElectricMotor(i, 2),
@@ -3258,7 +3258,7 @@ private static void chisels() {
 
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(14),
+                GTUtility.getIntegratedCircuit(14),
                 aChisels[2],
                 CI.getPlate(4, 8),
                 CI.getElectricMotor(4, 8),
@@ -3271,7 +3271,7 @@ private static void chisels() {
             .addTo(assemblerRecipes);
         GTValues.RA.stdBuilder()
             .itemInputs(
-                CI.getNumberedBioCircuit(14),
+                GTUtility.getIntegratedCircuit(14),
                 ItemList.Casing_SolidSteel.get(2),
                 CI.getPlate(4, 2),
                 CI.getTieredComponent(OrePrefixes.plate, 3, 4),

src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java

@@ -26,7 +26,6 @@
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialsOres;
-import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -80,7 +79,7 @@ public static void init() {
             .itemInputs(
                 GTOreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L),
                 GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L),
-                CI.getNumberedBioCircuit(2))
+                GTUtility.getIntegratedCircuit(2))
             .itemOutputs(ItemUtils.getSimpleStack(ModItems.cellHydrogenChlorideMix, 2))
             .duration(10 * SECONDS)
             .eut(TierEU.RECIPE_HV)