From b6c4e107f3b616e2bab8afa1e24409086fbe7119 Mon Sep 17 00:00:00 2001 From: StaffiX Date: Tue, 8 Oct 2024 16:09:08 +0200 Subject: [PATCH 1/3] first half of bio circuit removal --- .../recipe/RecipesRareEarthProcessing.java | 2 +- .../plugin/agrichem/BioRecipes.java | 77 ++++++++++--------- 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java index e8597a9f481..a7ca66f0312 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java @@ -80,7 +80,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) diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index f6d95952c68..c33c94df336 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -46,6 +46,7 @@ import gregtech.api.util.GTModHandler; import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.ModItems; @@ -100,19 +101,19 @@ public class BioRecipes { private static Fluid mAcetone; private static ItemStack getGreenAlgaeRecipeChip() { - return getBioChip(4); + return GTUtility.getIntegratedCircuit(4); } private static ItemStack getBrownAlgaeRecipeChip() { - return getBioChip(8); + return GTUtility.getIntegratedCircuit(8); } private static ItemStack getGoldenBrownAlgaeRecipeChip() { - return getBioChip(12); + return GTUtility.getIntegratedCircuit(12); } private static ItemStack getRedAlgaeRecipeChip() { - return getBioChip(16); + return GTUtility.getIntegratedCircuit(16); } private static ItemStack getBioChip(int aID) { @@ -364,7 +365,7 @@ private static void recipeCelluloseFibre() { // Craft into Wood Pellets GTValues.RA.stdBuilder() - .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) + .itemInputs(GTUtility.getIntegratedCircuit(2), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 24)) .duration(2 * SECONDS + 8 * TICKS) .eut(8) @@ -388,7 +389,7 @@ private static void recipeCelluloseFibre() { // Plastic GTValues.RA.stdBuilder() - .itemInputs(getBioChip(16), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) + .itemInputs(GTUtility.getIntegratedCircuit(16), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) .fluidInputs( FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 500), FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 500)) @@ -425,7 +426,7 @@ private static void recipeWoodPellets() { // Assembly Recipe GTValues.RA.stdBuilder() - .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 8)) + .itemInputs(GTUtility.getIntegratedCircuit(2), ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 8)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 2)) .duration(5 * SECONDS) .eut(8) @@ -450,7 +451,7 @@ private static void recipeWoodPellets() { 1200); } GTValues.RA.stdBuilder() - .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 2), getBioChip(3)) + .itemInputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 2), GTUtility.getIntegratedCircuit(3)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("gemCharcoal", 3)) .eut(16) .duration(6 * SECONDS) @@ -461,7 +462,7 @@ private static void recipeWoodBricks() { // Assembler Recipe GTValues.RA.stdBuilder() - .itemInputs(getBioChip(3), ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50)) + .itemInputs(GTUtility.getIntegratedCircuit(3), ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1)) .duration(1 * MINUTES + 40 * SECONDS) .eut(16) @@ -472,7 +473,7 @@ private static void recipeCellulosePulp() { // Assembler Recipe GTValues.RA.stdBuilder() - .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) + .itemInputs(GTUtility.getIntegratedCircuit(2), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) .itemOutputs(ItemUtils.getSimpleStack(Items.paper, 4)) .duration(2 * SECONDS) .eut(16) @@ -497,7 +498,7 @@ private static void recipeAluminiumSilverCatalyst() { // Assembler Recipe GTValues.RA.stdBuilder() .itemInputs( - getBioChip(4), + GTUtility.getIntegratedCircuit(4), CI.getEmptyCatalyst(10), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Silver, 4L)) @@ -522,7 +523,7 @@ private static void recipeAceticAcid() { .addTo(chemicalPlantRecipes); GTValues.RA.stdBuilder() - .itemInputs(CI.getNumberedBioCircuit(14)) + .itemInputs(GTUtility.getIntegratedCircuit(14)) .fluidInputs(FluidUtils.getFluidStack(mFermentationBase, 1000)) .fluidOutputs(FluidUtils.getFluidStack(mAceticAcid, 1000)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 2)) @@ -593,7 +594,7 @@ private static void recipeFermentationBase() { } if (ItemUtils.checkForInvalidItems(a)) { GTValues.RA.stdBuilder() - .itemInputs(getBioChip(2), ItemUtils.getSimpleStack(a, 10)) + .itemInputs(GTUtility.getIntegratedCircuit(2), ItemUtils.getSimpleStack(a, 10)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) .duration(30 * SECONDS) @@ -606,7 +607,7 @@ private static void recipeFermentationBase() { for (ItemStack a : aSeeds) { if (ItemUtils.checkForInvalidItems(a)) { GTValues.RA.stdBuilder() - .itemInputs(getBioChip(3), ItemUtils.getSimpleStack(a, 20)) + .itemInputs(GTUtility.getIntegratedCircuit(3), ItemUtils.getSimpleStack(a, 20)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) .duration(30 * SECONDS) @@ -619,7 +620,7 @@ private static void recipeFermentationBase() { // Sugar Cane GTValues.RA.stdBuilder() - .itemInputs(getBioChip(4), ItemUtils.getSimpleStack(Items.reeds, 32)) + .itemInputs(GTUtility.getIntegratedCircuit(4), ItemUtils.getSimpleStack(Items.reeds, 32)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) .duration(30 * SECONDS) @@ -628,7 +629,7 @@ private static void recipeFermentationBase() { .addTo(chemicalPlantRecipes); GTValues.RA.stdBuilder() .itemInputs( - getBioChip(5), + GTUtility.getIntegratedCircuit(5), ItemUtils.getSimpleStack(Items.reeds, 32), ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000)) @@ -642,7 +643,7 @@ private static void recipeFermentationBase() { if (OreDictUtils.containsValidEntries("cropSugarbeet")) { GTValues.RA.stdBuilder() - .itemInputs(getBioChip(4), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4)) + .itemInputs(GTUtility.getIntegratedCircuit(4), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) .duration(30 * SECONDS) @@ -651,7 +652,7 @@ private static void recipeFermentationBase() { .addTo(chemicalPlantRecipes); GTValues.RA.stdBuilder() .itemInputs( - getBioChip(5), + GTUtility.getIntegratedCircuit(5), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4), ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 2)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mThermalWater, 2000)) @@ -666,7 +667,7 @@ private static void recipeFermentationBase() { // Produce Acetone, Butanol and Ethanol GTValues.RA.stdBuilder() .itemInputs( - getBioChip(5), + GTUtility.getIntegratedCircuit(5), ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6), ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 16)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 48000)) @@ -700,7 +701,7 @@ private static void recipePropionicAcid() { private static void recipeEthanol() { GTValues.RA.stdBuilder() - .itemInputs(BioRecipes.getBioChip(2)) + .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mEthanol, 100)) .duration(20 * SECONDS) @@ -729,7 +730,7 @@ private static void recipeRedCelluloseFiber() { private static void recipeSodiumHydroxide() { // NaCl·H2O = NaOH + Cl + H GTValues.RA.stdBuilder() - .itemInputs(getBioChip(4)) + .itemInputs(GTUtility.getIntegratedCircuit(4)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 3)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mSalineWater, 1000)) .fluidOutputs( @@ -741,7 +742,7 @@ private static void recipeSodiumHydroxide() { .addTo(chemicalPlantRecipes); // Na + H2O = NaOH + H GTValues.RA.stdBuilder() - .itemInputs(getBioChip(5), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 5)) + .itemInputs(GTUtility.getIntegratedCircuit(5), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 5)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mSodiumHydroxide, 15)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mHydrogen, 5000)) @@ -758,7 +759,7 @@ private static void recipeSodiumCarbonate() { // Na2CO3 + Al2O3 =C= 2NaAlO2 + CO2 GTValues.RA.stdBuilder() .itemInputs( - getBioChip(18), + GTUtility.getIntegratedCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 1), ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5)) @@ -773,7 +774,7 @@ private static void recipeSodiumCarbonate() { GTValues.RA.stdBuilder() .itemInputs( - getBioChip(18), + GTUtility.getIntegratedCircuit(18), ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 2), ItemUtils.getSimpleStack(AgriculturalChem.mSodiumCarbonate, 6), ItemUtils.getSimpleStack(AgriculturalChem.mAluminiumPellet, 5)) @@ -859,7 +860,7 @@ private static void recipeAluminiumPellet() { for (String aOreName : aOreNames) { GTValues.RA.stdBuilder() .itemInputs( - CI.getNumberedBioCircuit(14), + GTUtility.getIntegratedCircuit(14), ItemUtils.getSimpleStack(aOreCache.get(aOreName), aOreData2.get(aOreName))) .itemOutputs( ItemUtils.getSimpleStack( @@ -958,7 +959,7 @@ private static void recipeSulfuricAcid() { GTValues.RA.stdBuilder() .itemInputs( - getBioChip(7), + GTUtility.getIntegratedCircuit(7), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 10), ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 6)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000)) @@ -969,7 +970,7 @@ private static void recipeSulfuricAcid() { .addTo(chemicalPlantRecipes); GTValues.RA.stdBuilder() .itemInputs( - getBioChip(7), + GTUtility.getIntegratedCircuit(7), ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 2), ItemUtils.getSimpleStack(AgriculturalChem.mBrownAlgaeBiosmass, 10)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 5000)) @@ -985,7 +986,7 @@ private static void recipeUrea() { // 2NH3 + CO2 = CH4N2O + H2O GTValues.RA.stdBuilder() - .itemInputs(getBioChip(9)) + .itemInputs(GTUtility.getIntegratedCircuit(9)) .fluidInputs( FluidUtils.getFluidStack(BioRecipes.mAmmonia, 600), FluidUtils.getFluidStack(BioRecipes.mCarbonDioxide, 300)) @@ -997,7 +998,7 @@ private static void recipeUrea() { .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); GTValues.RA.stdBuilder() - .itemInputs(getBioChip(9)) + .itemInputs(GTUtility.getIntegratedCircuit(9)) .fluidInputs( FluidUtils.getFluidStack(BioRecipes.mUrea, 200), FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 200)) @@ -1013,7 +1014,7 @@ private static void recipeRawBioResin() { GTValues.RA.stdBuilder() .itemInputs( - getBioChip(3), + GTUtility.getIntegratedCircuit(3), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 5), ItemUtils.getSimpleStack(Blocks.dirt, 1)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1)) @@ -1028,7 +1029,7 @@ private static void recipeRawBioResin() { private static void recipeLiquidResin() { GTValues.RA.stdBuilder() - .itemInputs(getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1)) + .itemInputs(GTUtility.getIntegratedCircuit(3), ItemUtils.getSimpleStack(AgriculturalChem.mRawBioResin, 1)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mEthanol, 200)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 500)) .duration(5 * SECONDS) @@ -1036,7 +1037,7 @@ private static void recipeLiquidResin() { .metadata(CHEMPLANT_CASING_TIER, 1) .addTo(chemicalPlantRecipes); GTValues.RA.stdBuilder() - .itemInputs(getBioChip(3), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 8)) + .itemInputs(GTUtility.getIntegratedCircuit(3), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 8)) .itemOutputs(ItemUtils.getSimpleStack(Ic2Items.resin, 32)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mLiquidResin, 144)) .duration(60 * SECONDS) @@ -1052,7 +1053,7 @@ private static void recipeCompost() { aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertForestry, 32); GTValues.RA.stdBuilder() .itemInputs( - getBioChip(11), + GTUtility.getIntegratedCircuit(11), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16), ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8)) .itemOutputs(aFert) @@ -1067,7 +1068,7 @@ private static void recipeCompost() { aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertIC2, 32); GTValues.RA.stdBuilder() .itemInputs( - getBioChip(12), + GTUtility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(AgriculturalChem.mGreenAlgaeBiosmass, 16), ItemUtils.getSimpleStack(AgriculturalChem.mCompost, 8)) .itemOutputs(aFert) @@ -1082,7 +1083,7 @@ private static void recipeCompost() { private static void recipeMethane() { GTValues.RA.stdBuilder() - .itemInputs(getBioChip(12), ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 10)) + .itemInputs(GTUtility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 10)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 500)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mMethane, 500)) .duration(5 * SECONDS) @@ -1091,7 +1092,7 @@ private static void recipeMethane() { .addTo(chemicalPlantRecipes); GTValues.RA.stdBuilder() .itemInputs( - getBioChip(13), + GTUtility.getIntegratedCircuit(13), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 8), ItemUtils.getSimpleStack(AgriculturalChem.mGoldenBrownCelluloseFiber, 6), ItemUtils.getSimpleStack(AgriculturalChem.mRedCelluloseFiber, 4)) @@ -1108,7 +1109,7 @@ private static void recipeBenzene() { // 6CH4 = C6H6 + 18H GTValues.RA.stdBuilder() - .itemInputs(getBioChip(19), CI.getGreenCatalyst(0)) + .itemInputs(GTUtility.getIntegratedCircuit(19), CI.getGreenCatalyst(0)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mMethane, 6000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mBenzene, 1000), Materials.Hydrogen.getGas(18000)) .duration(8 * SECONDS) @@ -1122,7 +1123,7 @@ private static void recipeStyrene() { // C8H10 = C8H8 + 2H GTValues.RA.stdBuilder() - .itemInputs(getBioChip(20), CI.getGreenCatalyst(0)) + .itemInputs(GTUtility.getIntegratedCircuit(20), CI.getGreenCatalyst(0)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mEthylbenzene, 100)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mStyrene, 100), Materials.Hydrogen.getGas(200)) .duration(16 * SECONDS) From f91dd87c44a4f79b1c65d13c52d5892caa35097d Mon Sep 17 00:00:00 2001 From: StaffiX Date: Tue, 8 Oct 2024 16:14:07 +0200 Subject: [PATCH 2/3] spotless --- .../recipe/RecipesRareEarthProcessing.java | 1 - .../plugin/agrichem/BioRecipes.java | 20 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java b/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java index a7ca66f0312..c8753e68d90 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesRareEarthProcessing.java +++ b/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; diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index c33c94df336..d36f748d845 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -365,7 +365,9 @@ private static void recipeCelluloseFibre() { // Craft into Wood Pellets GTValues.RA.stdBuilder() - .itemInputs(GTUtility.getIntegratedCircuit(2), ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) + .itemInputs( + GTUtility.getIntegratedCircuit(2), + ItemUtils.getSimpleStack(AgriculturalChem.mCelluloseFiber, 12)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 24)) .duration(2 * SECONDS + 8 * TICKS) .eut(8) @@ -389,7 +391,9 @@ private static void recipeCelluloseFibre() { // Plastic GTValues.RA.stdBuilder() - .itemInputs(GTUtility.getIntegratedCircuit(16), ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) + .itemInputs( + GTUtility.getIntegratedCircuit(16), + ItemUtils.getSimpleStack(AgriculturalChem.mCellulosePulp, 4)) .fluidInputs( FluidUtils.getFluidStack(BioRecipes.mAceticAcid, 500), FluidUtils.getFluidStack(BioRecipes.mPropionicAcid, 500)) @@ -462,7 +466,9 @@ private static void recipeWoodBricks() { // Assembler Recipe GTValues.RA.stdBuilder() - .itemInputs(GTUtility.getIntegratedCircuit(3), ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50)) + .itemInputs( + GTUtility.getIntegratedCircuit(3), + ItemUtils.getOrePrefixStack(OrePrefixes.dust, Materials.Wood, 50)) .itemOutputs(ItemUtils.getSimpleStack(AgriculturalChem.mWoodBrick, 1)) .duration(1 * MINUTES + 40 * SECONDS) .eut(16) @@ -643,7 +649,9 @@ private static void recipeFermentationBase() { if (OreDictUtils.containsValidEntries("cropSugarbeet")) { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.getIntegratedCircuit(4), ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4)) + .itemInputs( + GTUtility.getIntegratedCircuit(4), + ItemUtils.getItemStackOfAmountFromOreDict("cropSugarbeet", 4)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 1000)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mFermentationBase, 1000)) .duration(30 * SECONDS) @@ -1083,7 +1091,9 @@ private static void recipeCompost() { private static void recipeMethane() { GTValues.RA.stdBuilder() - .itemInputs(GTUtility.getIntegratedCircuit(12), ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 10)) + .itemInputs( + GTUtility.getIntegratedCircuit(12), + ItemUtils.getSimpleStack(AgriculturalChem.mAlgaeBiosmass, 10)) .fluidInputs(FluidUtils.getFluidStack(BioRecipes.mDistilledWater, 500)) .fluidOutputs(FluidUtils.getFluidStack(BioRecipes.mMethane, 500)) .duration(5 * SECONDS) From 67bfef44ff32690fd82c5ab439753fc3fdf6852a Mon Sep 17 00:00:00 2001 From: StaffiX Date: Wed, 16 Oct 2024 16:22:06 +0200 Subject: [PATCH 3/3] second half of bio --- .../core/item/chemistry/AgriculturalChem.java | 3 +-- .../core/item/chemistry/CoalTar.java | 11 +++++--- .../core/recipe/RecipesGregTech.java | 8 +++--- .../core/recipe/RecipesMachines.java | 26 +++++++++---------- .../plugin/agrichem/BioRecipes.java | 6 +---- .../loaders/recipe/RecipeLoaderNuclear.java | 8 +++--- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 5c587bc4c56..6ba6f72a083 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/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), diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index ac745f5ae68..e9277e15d5c 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/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) diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java index 4e8071829eb..bf8507a3366 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java +++ b/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) @@ -628,7 +628,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) @@ -889,7 +889,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) @@ -898,7 +898,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), diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index 265cd60f973..000465db593 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/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), @@ -866,7 +866,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)) @@ -891,7 +891,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), @@ -1562,7 +1562,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), @@ -1577,7 +1577,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), @@ -1592,7 +1592,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), @@ -1607,7 +1607,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), @@ -1622,7 +1622,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), @@ -3236,7 +3236,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), @@ -3252,7 +3252,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), @@ -3265,7 +3265,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), diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index fa8a114783b..9dc839c2229 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -111,10 +111,6 @@ private static ItemStack getRedAlgaeRecipeChip() { return GTUtility.getIntegratedCircuit(16); } - private static ItemStack getBioChip(int aID) { - return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, aID, 0); - } - public static void init() { Logger.INFO("[Bio] Setting Variables"); initRecipeVars(); @@ -483,7 +479,7 @@ private static void recipeCatalystCarrier() { // Assembler Recipe GTValues.RA.stdBuilder() .itemInputs( - getBioChip(20), + GTUtility.getIntegratedCircuit(2), GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8L), GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 4L), GTOreDictUnificator.get(OrePrefixes.screw, Materials.Tin, 6L)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderNuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderNuclear.java index 4f67c7160be..4368292fe2b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderNuclear.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderNuclear.java @@ -291,7 +291,7 @@ private static void chemicalReactorRecipes() { // Sodium Fluoride GTValues.RA.stdBuilder() .itemInputs( - CI.getNumberedBioCircuit(15), + GTUtility.getIntegratedCircuit(15), ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3)) .itemOutputs(MaterialsFluorides.SODIUM_FLUORIDE.getDust(2)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 500)) @@ -302,7 +302,7 @@ private static void chemicalReactorRecipes() { GTValues.RA.stdBuilder() .itemInputs( - CI.getNumberedBioCircuit(15), + GTUtility.getIntegratedCircuit(15), ItemUtils.getItemStackOfAmountFromOreDict("dustSodiumHydroxide", 3)) .itemOutputs(MaterialsFluorides.SODIUM_FLUORIDE.getDust(2)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 1000)) @@ -347,7 +347,9 @@ private static void dehydratorRecipes() { if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { // CaO + H2O = Ca(OH)2 GTValues.RA.stdBuilder() - .itemInputs(CI.getNumberedBioCircuit(20), ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 2)) + .itemInputs( + GTUtility.getIntegratedCircuit(20), + ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 2)) .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5)) .fluidInputs(FluidUtils.getFluidStack("water", 1000)) .eut(TierEU.RECIPE_MV)