From 583174e207f58fe97d2b159f32fc6dd2f3f306ad Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 15 Aug 2024 16:19:56 +0200 Subject: [PATCH] yet another batch of RA1 calls removed (#914) * migrate radio hatch recipes * migrate incubation recipes * finish migrating bw recipes * migrate forgotten recipes * spotless apply * bump dep * fix merge conflict derp --------- Co-authored-by: Martin Robertz --- dependencies.gradle | 2 +- .../bartworksHandler/BW_RadHatchMaterial.java | 40 +- .../bartworksHandler/BacteriaRegistry.java | 533 +++++++----------- .../bartworksHandler/BioItemLoader.java | 102 ++-- 4 files changed, 284 insertions(+), 393 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 78d5ff0ec..8940c0907 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.150:dev") + api("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.151:dev") api("com.github.GTNewHorizons:Yamcl:0.6.0:dev") api("com.github.GTNewHorizons:Baubles:1.0.4:dev") implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.3:dev') { transitive = false } diff --git a/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java b/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java index 17ec9d96a..94c407021 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BW_RadHatchMaterial.java @@ -1,33 +1,41 @@ package com.dreammaster.bartworksHandler; +import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.radioHatchRecipes; +import static com.github.bartimaeusnek.bartworks.util.BWRecipes.calcDecayTicks; import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.util.GT_RecipeConstants.DECAY_TICKS; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.util.BWRecipes; - +import gregtech.api.enums.GT_Values; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.minecraft.ItemUtils; public class BW_RadHatchMaterial { public static void runRadHatchAdder() { + if (!GTPlusPlus.isModLoaded()) { + return; + } + + ItemStack err = ItemUtils.getErrorStack(1); + + for (Material material : Material.mMaterialMap) { + if (material == null || material.vRadiationLevel <= 0) { + continue; + } - if (GTPlusPlus.isModLoaded()) { - ItemStack err = ItemUtils.getErrorStack(1); - - for (Material material : Material.mMaterialMap) { - if (material != null && material.vRadiationLevel > 0) { - int level = (int) material.getProtons(); - short[] rgba = material.getRGBA(); - if (material.getRod(1) != null && !material.getRod(1).isItemEqual(err)) { - BWRecipes.instance.addRadHatch(material.getRod(1), level, 1, rgba); - } - if (material.getLongRod(1) != null && !material.getLongRod(1).isItemEqual(err)) { - BWRecipes.instance.addRadHatch(material.getLongRod(1), level, 2, rgba); - } - } + int level = (int) material.getProtons(); + if (material.getRod(1) != null && !material.getRod(1).isItemEqual(err)) { + GT_Values.RA.stdBuilder().itemInputs(material.getRod(1)).duration(1).eut(level) + .metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes); + } + if (material.getLongRod(1) != null && !material.getLongRod(1).isItemEqual(err)) { + GT_Values.RA.stdBuilder().itemInputs(material.getLongRod(1)).duration(2).eut(level) + .metadata(DECAY_TICKS, (int) calcDecayTicks(level)).noOptimize().addTo(radioHatchRecipes); } + } + } } diff --git a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java index 4bc7699fc..a26ea16ab 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BacteriaRegistry.java @@ -2,7 +2,9 @@ import static com.dreammaster.gthandler.GT_CoreModSupport.*; import static com.github.bartimaeusnek.bartworks.API.BioObjectAdder.*; -import static com.github.bartimaeusnek.bartworks.API.BioRecipeAdder.*; +import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes; +import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes; +import static com.github.bartimaeusnek.bartworks.util.BWRecipes.computeSieverts; import static gregtech.api.enums.Materials.*; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.Genetics; @@ -19,6 +21,7 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD; +import static gregtech.api.util.GT_RecipeConstants.SIEVERTS; import java.awt.Color; import java.util.LinkedHashMap; @@ -27,12 +30,12 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import com.dreammaster.fluids.FluidList; import com.dreammaster.gthandler.CustomItemList; import com.dreammaster.gthandler.GT_CoreModSupport; +import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; import com.github.bartimaeusnek.bartworks.util.BioCulture; import com.github.bartimaeusnek.bartworks.util.BioDNA; import com.github.bartimaeusnek.bartworks.util.BioData; @@ -262,345 +265,225 @@ private void runGTRecipes() { runAdditionalFuelRecipes(); } - private void runBWRecipes() { - addBioLabRecipeIncubation( - GT_ModHandler.getModItem(GalaxySpace.ID, "barnardaClog", 1L), - CultureSet.get("BarnadaCBac"), - new int[] { 250 }, - FluidRegistry.getFluidStack("unknowwater", 8000), - 500, - (int) TierEU.RECIPE_UV, - 0); - - for (int i = 0; i < OreDictionary.getOres("cropTcetiESeaweed").size(); i++) { - addBioLabRecipeIncubation( - OreDictionary.getOres("cropTcetiESeaweed").get(i), - CultureSet.get("TcetiEBac"), - new int[] { 250 }, - FluidRegistry.getFluidStack("unknowwater", 8000), - 500, - (int) TierEU.RECIPE_UV, - 0); - } - addBacterialVatRecipe( - new ItemStack[] { AntimonyTrioxide.getDust(16), Osmium.getDust(16) }, - CultureSet.get("CombinedBac"), - new FluidStack[] { Oil.getFluid(20) }, - new FluidStack[] { Xenoxene.getFluid(20) }, - 3600, - (int) TierEU.RECIPE_UEV, - Materials.NaquadahEnriched, - 8, - 0, - false); + private void bacterialVatRecipes() { + GT_Values.RA.stdBuilder().itemInputs(AntimonyTrioxide.getDust(16), Osmium.getDust(16)) + .special(BioItemList.getPetriDish(CultureSet.get("CombinedBac"))).fluidInputs(Oil.getFluid(20)) + .fluidOutputs(Xenoxene.getFluid(20)).duration(3 * MINUTES).eut(TierEU.RECIPE_UEV) + .metadata(SIEVERTS, computeSieverts(Materials.NaquadahEnriched, 8, false, false, false)).noOptimize() + .addTo(bacterialVatRecipes); - addBioLabRecipeIncubation( - new ItemStack(Items.egg, 1, 0), - CultureSet.get("OvumBac"), - new int[] { 1500 }, - FluidRegistry.getFluidStack("binnie.bacteria", 1000), - 1200, - (int) TierEU.RECIPE_IV, - CLEANROOM); - - addBacterialVatRecipe( - new ItemStack[] { ItemList.Circuit_Chip_Stemcell.get(64L), + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Circuit_Chip_Stemcell.get(64L), GT_ModHandler.getModItem(GalaxySpace.ID, "item.UnknowCrystal", 16L), - CustomItemList.TCetiESeaweedExtract.get(4L), Tritanium.getDust(4) }, - CultureSet.get("StemCellBac"), - new FluidStack[] { GrowthMediumRaw.getFluid(8) }, - new FluidStack[] { BioMediumRaw.getFluid(2) }, - 3600, - (int) TierEU.RECIPE_LuV, - Plutonium, - 6, - CLEANROOM, - true); + CustomItemList.TCetiESeaweedExtract.get(4L), + Tritanium.getDust(4)) + .special(BioItemList.getPetriDish(CultureSet.get("StemCellBac"))) + .fluidInputs(GrowthMediumRaw.getFluid(8)).fluidOutputs(BioMediumRaw.getFluid(2)).duration(3 * MINUTES) + .eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, true, true, false)) + .requiresCleanRoom().noOptimize().addTo(bacterialVatRecipes); - addBacterialVatRecipe( - new ItemStack[] { ItemList.Circuit_Chip_Stemcell.get(16L), + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Circuit_Chip_Stemcell.get(16L), GT_ModHandler.getModItem(GalaxySpace.ID, "item.UnknowCrystal", 16L), - CustomItemList.TCetiESeaweedExtract.get(8L), InfinityCatalyst.getDustTiny(4) }, - CultureSet.get("BioCellBac"), - new FluidStack[] { GrowthMediumRaw.getFluid(5) }, - new FluidStack[] { BioMediumRaw.getFluid(5) }, - 3600, - (int) TierEU.RECIPE_ZPM, - NaquadahEnriched, - 7, - CLEANROOM, - true); - - addBacterialVatRecipe( - new ItemStack[] { ItemList.Circuit_Chip_Biocell.get(8L), CustomItemList.TCetiESeaweedExtract.get(16L), - InfinityCatalyst.getDust(4) }, - CultureSet.get("BioCellBac"), - new FluidStack[] { GrowthMediumRaw.getFluid(5) }, - new FluidStack[] { BioMediumRaw.getFluid(10) }, - 3600, - (int) TierEU.RECIPE_UV, - Naquadria, - 8, - CLEANROOM, - true); + CustomItemList.TCetiESeaweedExtract.get(8L), + InfinityCatalyst.getDustTiny(4)) + .special(BioItemList.getPetriDish(CultureSet.get("BioCellBac"))) + .fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(5)).duration(3 * MINUTES) + .eut(TierEU.RECIPE_ZPM).metadata(SIEVERTS, computeSieverts(NaquadahEnriched, 7, true, true, false)) + .requiresCleanRoom().noOptimize().addTo(bacterialVatRecipes); - addBioLabRecipeIncubation( - ItemList.Circuit_Chip_Stemcell.get(1L), - CultureSet.get("StemCellBac"), - new int[] { 750 }, - GrowthMediumRaw.getFluid(1000), - 2400, - (int) TierEU.RECIPE_ZPM, - CLEANROOM); - - addBioLabRecipeIncubation( - ItemList.Circuit_Chip_Biocell.get(1L), - CultureSet.get("BioCellBac"), - new int[] { 750 }, - Materials.BioMediumRaw.getFluid(1000), - 3600, - (int) TierEU.RECIPE_UV, - CLEANROOM); - - addBacterialVatRecipe( - new ItemStack[] { GT_ModHandler.getModItem(Genetics.ID, "misc", 2L, 4) }, - CultureSet.get("BinniGrowthMedium"), - new FluidStack[] { GT_ModHandler.getDistilledWater(4L) }, - new FluidStack[] { FluidRegistry.getFluidStack("binnie.growthmedium", 2) }, - 150, - (int) TierEU.RECIPE_HV, - 0, - 4, - 0, - false); + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Circuit_Chip_Biocell.get(8L), + CustomItemList.TCetiESeaweedExtract.get(16L), + InfinityCatalyst.getDust(4)) + .special(BioItemList.getPetriDish(CultureSet.get("BioCellBac"))) + .fluidInputs(GrowthMediumRaw.getFluid(5)).fluidOutputs(BioMediumRaw.getFluid(10)).duration(3 * MINUTES) + .eut(TierEU.RECIPE_UV).metadata(SIEVERTS, computeSieverts(Naquadria, 8, true, true, false)).noOptimize() + .requiresCleanRoom().addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Genetics.ID, "misc", 2L, 4)) + .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) + .fluidInputs(GT_ModHandler.getDistilledWater(4L)) + .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 2)).duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV).metadata(SIEVERTS, computeSieverts(0, 4, false, false, false)).noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1)) + .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) + .fluidInputs(GT_ModHandler.getDistilledWater(8L)) + .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 4)).duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV).metadata(SIEVERTS, computeSieverts(Bismuth, 5, false, false, false)).noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) + .special(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) + .fluidInputs(GT_ModHandler.getDistilledWater(16L)) + .fluidOutputs(FluidRegistry.getFluidStack("binnie.growthmedium", 8)).duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 4L, 0)) + .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) + .fluidInputs(GT_ModHandler.getDistilledWater(4L)) + .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 2)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV).metadata(SIEVERTS, computeSieverts(Bismuth, 4, false, false, false)).noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1)) + .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) + .fluidInputs(GT_ModHandler.getDistilledWater(8L)) + .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 4)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_EV).metadata(SIEVERTS, computeSieverts(Uranium, 5, false, false, false)).noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) + .special(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) + .fluidInputs(GT_ModHandler.getDistilledWater(16L)) + .fluidOutputs(FluidRegistry.getFluidStack("binnie.bacteria", 8)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Plutonium, 6, false, true, false)) + .noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(CustomItemList.MarsStoneDust.get(16L)) + .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) + .fluidInputs(GT_ModHandler.getDistilledWater(4L)) + .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 1)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV).metadata(SIEVERTS, computeSieverts(Bismuth, 5, false, false, false)).noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(1)) + .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) + .fluidInputs(GT_ModHandler.getDistilledWater(8L)) + .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 2)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_IV).metadata(SIEVERTS, computeSieverts(Uranium, 6, false, true, false)).noOptimize() + .requiresCleanRoom().addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) + .special(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))) + .fluidInputs(GT_ModHandler.getDistilledWater(16L)) + .fluidOutputs(FluidRegistry.getFluidStack("bacterialsludge", 4)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_LuV).metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false)) + .noOptimize().requiresCleanRoom().addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(MysteriousCrystal.getDust(4)) + .special(BioItemList.getPetriDish(CultureSet.get("Mutagen"))) + .fluidInputs(GT_ModHandler.getDistilledWater(4L)) + .fluidOutputs(FluidRegistry.getFluidStack("mutagen", 1)).duration(1 * MINUTES).eut(TierEU.RECIPE_IV) + .metadata(SIEVERTS, computeSieverts(Uranium, 6, false, true, false)).noOptimize().requiresCleanRoom() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder().itemInputs(InfinityCatalyst.getDustTiny(1)) + .special(BioItemList.getPetriDish(CultureSet.get("Mutagen"))) + .fluidInputs(GT_ModHandler.getDistilledWater(8L)) + .fluidOutputs(FluidRegistry.getFluidStack("mutagen", 2)).duration(1 * MINUTES).eut(TierEU.RECIPE_LuV) + .metadata(SIEVERTS, computeSieverts(Plutonium, 7, true, true, false)).noOptimize().requiresCleanRoom() + .addTo(bacterialVatRecipes); + } - addBacterialVatRecipe( - new ItemStack[] { MysteriousCrystal.getDust(1) }, - CultureSet.get("BinniGrowthMedium"), - new FluidStack[] { GT_ModHandler.getDistilledWater(8L) }, - new FluidStack[] { FluidRegistry.getFluidStack("binnie.growthmedium", 4) }, - 150, - (int) TierEU.RECIPE_EV, - Bismuth, - 5, - 0, - false); + private void bioLabRecipes() { + GT_Values.RA.stdBuilder() + .itemInputs( + BioItemList.getPetriDish(null), + GT_ModHandler.getModItem(GalaxySpace.ID, "barnardaClog", 1L)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BarnadaCBac"))).outputChances(2_50) + .fluidInputs(FluidRegistry.getFluidStack("unknowwater", 8000)).duration(25 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(bioLabRecipes); - addBacterialVatRecipe( - new ItemStack[] { InfinityCatalyst.getDustTiny(1) }, - CultureSet.get("BinniGrowthMedium"), - new FluidStack[] { GT_ModHandler.getDistilledWater(16L) }, - new FluidStack[] { FluidRegistry.getFluidStack("binnie.growthmedium", 8) }, - 150, - (int) TierEU.RECIPE_IV, - Uranium, - 5, - 0, - false); + for (int i = 0; i < OreDictionary.getOres("cropTcetiESeaweed").size(); i++) { + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), OreDictionary.getOres("cropTcetiESeaweed").get(i)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("TcetiEBac"))).outputChances(2_50) + .fluidInputs(FluidRegistry.getFluidStack("unknowwater", 8000)).duration(25 * SECONDS) + .eut(TierEU.RECIPE_UV).addTo(bioLabRecipes); + } - addBioLabRecipeIncubation( - GT_ModHandler.getModItem(Genetics.ID, "misc", 1L, 4), - CultureSet.get("BinniGrowthMedium"), - new int[] { 5000 }, - Water.getFluid(4000), - 150, - (int) TierEU.RECIPE_HV, - 0); - - addBioLabRecipeIncubation( - GT_ModHandler.getModItem(Genetics.ID, "misc", 1L, 4), - CultureSet.get("BinniGrowthMedium"), - new int[] { 7500 }, - GT_ModHandler.getDistilledWater(2000L), - 150, - (int) TierEU.RECIPE_HV, - 0); - - addBioLabRecipeIncubation( - GT_ModHandler.getModItem(Genetics.ID, "misc", 1L, 4), - CultureSet.get("BinniGrowthMedium"), - new int[] { 9000 }, - FluidRegistry.getFluidStack("binnie.growthmedium", 1000), - 150, - (int) TierEU.RECIPE_HV, - 0); - - addBioLabRecipeIncubation( - MysteriousCrystal.getDust(4), - CultureSet.get("BinniGrowthMedium"), - new int[] { 10000 }, - FluidRegistry.getFluidStack("binnie.growthmedium", 500), - 150, - (int) TierEU.RECIPE_EV, - 0); - - addBacterialVatRecipe( - new ItemStack[] { GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 4L, 0) }, - CultureSet.get("BinniBacteria"), - new FluidStack[] { GT_ModHandler.getDistilledWater(4L) }, - new FluidStack[] { FluidRegistry.getFluidStack("binnie.bacteria", 2) }, - 300, - (int) TierEU.RECIPE_HV, - Bismuth, - 4, - 0, - false); + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), new ItemStack(Items.egg, 1, 0)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("OvumBac"))).outputChances(15_00) + .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 1000)).duration(1 * MINUTES) + .eut(TierEU.RECIPE_IV).requiresCleanRoom().addTo(bioLabRecipes); - addBacterialVatRecipe( - new ItemStack[] { MysteriousCrystal.getDust(1) }, - CultureSet.get("BinniBacteria"), - new FluidStack[] { GT_ModHandler.getDistilledWater(8L) }, - new FluidStack[] { FluidRegistry.getFluidStack("binnie.bacteria", 4) }, - 300, - (int) TierEU.RECIPE_EV, - Uranium, - 5, - 0, - false); + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), ItemList.Circuit_Chip_Stemcell.get(1L)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("StemCellBac"))).outputChances(7_50) + .fluidInputs(GrowthMediumRaw.getFluid(1000)).duration(2 * MINUTES).eut(TierEU.RECIPE_ZPM) + .requiresCleanRoom().addTo(bioLabRecipes); - addBacterialVatRecipe( - new ItemStack[] { InfinityCatalyst.getDustTiny(1) }, - CultureSet.get("BinniBacteria"), - new FluidStack[] { GT_ModHandler.getDistilledWater(16L) }, - new FluidStack[] { FluidRegistry.getFluidStack("binnie.bacteria", 8) }, - 300, - (int) TierEU.RECIPE_IV, - Plutonium, - 6, - CLEANROOM, - false); + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), ItemList.Circuit_Chip_Biocell.get(1L)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BioCellBac"))).outputChances(7_50) + .fluidInputs(Materials.BioMediumRaw.getFluid(1000)).duration(3 * MINUTES).eut(TierEU.RECIPE_UV) + .requiresCleanRoom().addTo(bioLabRecipes); - addBioLabRecipeIncubation( - GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 16L, 0), - CultureSet.get("BinniBacteria"), - new int[] { 6000 }, - FluidRegistry.getFluidStack("binnie.bacteria", 1000), - 300, - (int) TierEU.RECIPE_HV, - 0); - - addBioLabRecipeIncubation( - MysteriousCrystal.getDust(4), - CultureSet.get("BinniBacteria"), - new int[] { 8000 }, - FluidRegistry.getFluidStack("binnie.bacteria", 500), - 300, - (int) TierEU.RECIPE_IV, - CLEANROOM); - - addBioLabRecipeIncubation( - InfinityCatalyst.getDustTiny(1), - CultureSet.get("BinniBacteria"), - new int[] { 10000 }, - FluidRegistry.getFluidStack("binnie.bacteria", 250), - 300, - (int) TierEU.RECIPE_LuV, - CLEANROOM); - - addBacterialVatRecipe( - new ItemStack[] { CustomItemList.MarsStoneDust.get(16L) }, - CultureSet.get("BacterialSludgeBac"), - new FluidStack[] { GT_ModHandler.getDistilledWater(4L) }, - new FluidStack[] { FluidRegistry.getFluidStack("bacterialsludge", 1) }, - 600, - (int) TierEU.RECIPE_EV, - Bismuth, - 5, - 0, - false); + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), GT_ModHandler.getModItem(Genetics.ID, "misc", 1L, 4)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))).outputChances(50_00) + .fluidInputs(Water.getFluid(4000)).duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV) + .addTo(bioLabRecipes); - addBacterialVatRecipe( - new ItemStack[] { MysteriousCrystal.getDust(1) }, - CultureSet.get("BacterialSludgeBac"), - new FluidStack[] { GT_ModHandler.getDistilledWater(8L) }, - new FluidStack[] { FluidRegistry.getFluidStack("bacterialsludge", 2) }, - 600, - (int) TierEU.RECIPE_IV, - Uranium, - 6, - CLEANROOM, - false); + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), GT_ModHandler.getModItem(Genetics.ID, "misc", 1L, 4)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))).outputChances(75_00) + .fluidInputs(GT_ModHandler.getDistilledWater(2000L)).duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV).addTo(bioLabRecipes); - addBacterialVatRecipe( - new ItemStack[] { InfinityCatalyst.getDustTiny(1) }, - CultureSet.get("BacterialSludgeBac"), - new FluidStack[] { GT_ModHandler.getDistilledWater(16L) }, - new FluidStack[] { FluidRegistry.getFluidStack("bacterialsludge", 4) }, - 600, - (int) TierEU.RECIPE_LuV, - Plutonium, - 7, - CLEANROOM, - true); + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), GT_ModHandler.getModItem(Genetics.ID, "misc", 1L, 4)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))).outputChances(90_00) + .fluidInputs(FluidRegistry.getFluidStack("binnie.growthmedium", 1000)) + .duration(7 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_HV).addTo(bioLabRecipes); - addBioLabRecipeIncubation( - CustomItemList.MarsStoneDust.get(64L), - CultureSet.get("BacterialSludgeBac"), - new int[] { 3000 }, - FluidRegistry.getFluidStack("bacterialsludge", 1000), - 600, - (int) TierEU.RECIPE_EV, - 0); - - addBioLabRecipeIncubation( - MysteriousCrystal.getDust(16), - CultureSet.get("BacterialSludgeBac"), - new int[] { 5000 }, - FluidRegistry.getFluidStack("bacterialsludge", 500), - 600, - (int) TierEU.RECIPE_IV, - CLEANROOM); - - addBioLabRecipeIncubation( - InfinityCatalyst.getDustTiny(4), - CultureSet.get("BacterialSludgeBac"), - new int[] { 7500 }, - FluidRegistry.getFluidStack("bacterialsludge", 250), - 600, - (int) TierEU.RECIPE_LuV, - CLEANROOM); - - addBacterialVatRecipe( - new ItemStack[] { MysteriousCrystal.getDust(4) }, - CultureSet.get("Mutagen"), - new FluidStack[] { GT_ModHandler.getDistilledWater(4L) }, - new FluidStack[] { FluidRegistry.getFluidStack("mutagen", 1) }, - 1200, - (int) TierEU.RECIPE_IV, - Uranium, - 6, - CLEANROOM, - false); + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), MysteriousCrystal.getDust(4)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniGrowthMedium"))) + .fluidInputs(FluidRegistry.getFluidStack("binnie.growthmedium", 500)).duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV).addTo(bioLabRecipes); - addBacterialVatRecipe( - new ItemStack[] { InfinityCatalyst.getDustTiny(1) }, - CultureSet.get("Mutagen"), - new FluidStack[] { GT_ModHandler.getDistilledWater(8L) }, - new FluidStack[] { FluidRegistry.getFluidStack("mutagen", 2) }, - 1200, - (int) TierEU.RECIPE_LuV, - Plutonium, - 7, - CLEANROOM, - true); + GT_Values.RA.stdBuilder() + .itemInputs( + BioItemList.getPetriDish(null), + GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemBiochaff", 16L, 0)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))).outputChances(60_00) + .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 1000)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), MysteriousCrystal.getDust(4)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))).outputChances(80_00) + .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 500)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_IV).requiresCleanRoom().addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), InfinityCatalyst.getDustTiny(1)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BinniBacteria"))) + .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 250)).duration(15 * SECONDS) + .eut(TierEU.RECIPE_LuV).requiresCleanRoom().addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), CustomItemList.MarsStoneDust.get(64L)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))).outputChances(30_00) + .fluidInputs(FluidRegistry.getFluidStack("bacterialsludge", 1000)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV).addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), MysteriousCrystal.getDust(16)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))).outputChances(50_00) + .fluidInputs(FluidRegistry.getFluidStack("bacterialsludge", 500)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_IV).requiresCleanRoom().addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), InfinityCatalyst.getDustTiny(4)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("BacterialSludgeBac"))).outputChances(75_00) + .fluidInputs(FluidRegistry.getFluidStack("bacterialsludge", 250)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_LuV).requiresCleanRoom().addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), MysteriousCrystal.getDust(16)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("Mutagen"))).outputChances(15_00) + .fluidInputs(FluidRegistry.getFluidStack("mutagen", 1000)).duration(1 * MINUTES).eut(TierEU.RECIPE_LuV) + .requiresCleanRoom().addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder().itemInputs(BioItemList.getPetriDish(null), InfinityCatalyst.getDustTiny(4)) + .itemOutputs(BioItemList.getPetriDish(CultureSet.get("Mutagen"))).outputChances(30_00) + .fluidInputs(FluidRegistry.getFluidStack("mutagen", 500)).duration(1 * MINUTES).eut(TierEU.RECIPE_ZPM) + .requiresCleanRoom().addTo(bioLabRecipes); + } - addBioLabRecipeIncubation( - MysteriousCrystal.getDust(16), - CultureSet.get("Mutagen"), - new int[] { 1500 }, - FluidRegistry.getFluidStack("mutagen", 1000), - 1200, - (int) TierEU.RECIPE_LuV, - CLEANROOM); - - addBioLabRecipeIncubation( - InfinityCatalyst.getDustTiny(4), - CultureSet.get("Mutagen"), - new int[] { 3000 }, - FluidRegistry.getFluidStack("mutagen", 500), - 1200, - (int) TierEU.RECIPE_ZPM, - CLEANROOM); + private void runBWRecipes() { + bioLabRecipes(); + bacterialVatRecipes(); BioItemLoader.registerRecipes(); } diff --git a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java index 7ba0fec81..ac8d25d5f 100644 --- a/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java +++ b/src/main/java/com/dreammaster/bartworksHandler/BioItemLoader.java @@ -1,8 +1,8 @@ package com.dreammaster.bartworksHandler; import static com.dreammaster.bartworksHandler.BacteriaRegistry.CultureSet; -import static com.github.bartimaeusnek.bartworks.API.BioRecipeAdder.CLEANROOM; -import static com.github.bartimaeusnek.bartworks.API.BioRecipeAdder.addBacterialVatRecipe; +import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes; +import static com.github.bartimaeusnek.bartworks.util.BWRecipes.computeSieverts; import static gregtech.api.enums.GT_Values.*; import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.PamsHarvestCraft; @@ -12,6 +12,7 @@ import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeConstants.SIEVERTS; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import net.minecraft.init.Items; @@ -24,6 +25,7 @@ import com.dreammaster.main.MainRegistry; import com.github.bartimaeusnek.bartworks.MainMod; import com.github.bartimaeusnek.bartworks.common.items.SimpleSubItemClass; +import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; @@ -38,7 +40,6 @@ public class BioItemLoader { private static Item BIOTEMS; private static GT_Fluid[] BIOFLUIDS; - private static ItemStack[] BIOTEMSSTACKS; public static boolean preInit() { try { @@ -111,59 +112,58 @@ public static void registerRecipes() { .fluidOutputs(new FluidStack(BIOFLUIDS[2], 8000)).duration(60 * SECONDS).eut(TierEU.RECIPE_UV) .addTo(multiblockChemicalReactorRecipes); - addBacterialVatRecipe( - new ItemStack[] { ItemList.IC2_Energium_Dust.get(8), Materials.Mytryl.getDust(1), - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 64) }, - CultureSet.get("TcetiEBac"), - new FluidStack[] { new FluidStack(BIOFLUIDS[2], 50) }, - new FluidStack[] { new FluidStack(BIOFLUIDS[3], 50) }, - 1200, - (int) TierEU.RECIPE_UV, - 100, - 8, - 0, - false); + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.IC2_Energium_Dust.get(8), + Materials.Mytryl.getDust(1), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "seaweedItem", 64)) + .special(BioItemList.getPetriDish(CultureSet.get("TcetiEBac"))) + .fluidInputs(new FluidStack(BIOFLUIDS[2], 50)).fluidOutputs(new FluidStack(BIOFLUIDS[3], 50)) + .duration(1 * MINUTES).eut(TierEU.RECIPE_UV) + .metadata(SIEVERTS, computeSieverts(100, 8, false, false, false)).noOptimize() + .addTo(bacterialVatRecipes); + for (int i = 0; i < OreDictionary.getOres("cropTcetiESeaweed").size(); i++) { GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(i + 1)) .itemOutputs(OreDictionary.getOres("cropTcetiESeaweed").get(i).copy().splitStack(64)) .fluidInputs(new FluidStack(BIOFLUIDS[3], 1000)).duration(2 * SECONDS).eut(TierEU.RECIPE_UV) .noOptimize().addTo(centrifugeRecipes); } - addBacterialVatRecipe( - new ItemStack[] { Materials.MeatRaw.getDust(4), Materials.Salt.getDust(4), Materials.Calcium.getDust(4), - new ItemStack(BIOTEMS, 4, 2), }, - CultureSet.get("OvumBac"), - new FluidStack[] { FluidRegistry.getFluidStack("binnie.bacteria", 4) }, - new FluidStack[] { Materials.GrowthMediumRaw.getFluid(1) }, - 1200, - 7680, - Materials.Uranium, - 5, - CLEANROOM, - false); - addBacterialVatRecipe( - new ItemStack[] { Materials.MeatRaw.getDust(8), Materials.Salt.getDust(8), Materials.Calcium.getDust(8), - new ItemStack(BIOTEMS, 4, 2), }, - CultureSet.get("OvumBac"), - new FluidStack[] { FluidRegistry.getFluidStack("bacterialsludge", 4) }, - new FluidStack[] { Materials.GrowthMediumRaw.getFluid(2) }, - 1200, - 30720, - Materials.Plutonium, - 6, - CLEANROOM, - false); - addBacterialVatRecipe( - new ItemStack[] { Materials.MeatRaw.getDust(12), Materials.Salt.getDust(12), - Materials.Calcium.getDust(12), new ItemStack(BIOTEMS, 4, 2), }, - CultureSet.get("OvumBac"), - new FluidStack[] { FluidRegistry.getFluidStack("mutagen", 4) }, - new FluidStack[] { Materials.GrowthMediumRaw.getFluid(4) }, - 1200, - 122880, - Materials.NaquadahEnriched, - 7, - CLEANROOM, - true); + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.MeatRaw.getDust(4), + Materials.Salt.getDust(4), + Materials.Calcium.getDust(4), + new ItemStack(BIOTEMS, 4, 2)) + .special(BioItemList.getPetriDish(CultureSet.get("OvumBac"))) + .fluidInputs(FluidRegistry.getFluidStack("binnie.bacteria", 4)) + .fluidOutputs(Materials.GrowthMediumRaw.getFluid(1)).duration(1 * MINUTES).eut(TierEU.RECIPE_IV) + .metadata(SIEVERTS, computeSieverts(Materials.Uranium, 5, false, true, false)).noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.MeatRaw.getDust(8), + Materials.Salt.getDust(8), + Materials.Calcium.getDust(8), + new ItemStack(BIOTEMS, 4, 2)) + .special(BioItemList.getPetriDish(CultureSet.get("OvumBac"))) + .fluidInputs(FluidRegistry.getFluidStack("bacterialsludge", 4)) + .fluidOutputs(Materials.GrowthMediumRaw.getFluid(2)).duration(1 * MINUTES).eut(TierEU.RECIPE_LuV) + .metadata(SIEVERTS, computeSieverts(Materials.Plutonium, 6, false, true, false)).noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.MeatRaw.getDust(12), + Materials.Salt.getDust(12), + Materials.Calcium.getDust(12), + new ItemStack(BIOTEMS, 4, 2)) + .special(BioItemList.getPetriDish(CultureSet.get("OvumBac"))) + .fluidInputs(FluidRegistry.getFluidStack("mutagen", 4)) + .fluidOutputs(Materials.GrowthMediumRaw.getFluid(4)).duration(1 * MINUTES).eut(TierEU.RECIPE_ZPM) + .metadata(SIEVERTS, computeSieverts(Materials.NaquadahEnriched, 7, true, true, false)).noOptimize() + .addTo(bacterialVatRecipes); } }