diff options
| author | boubou19 <miisterunknown@gmail.com> | 2024-08-15 15:38:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-15 15:38:58 +0200 |
| commit | 0f990a7cfd78c3ede4db09a893e1e6edff164a2a (patch) | |
| tree | 5ab69d203be91a1c15313f61d9172f9bbdd4ba82 /src/main/java/com | |
| parent | 33c8d91bbe289651270378316fdadab730aa386f (diff) | |
| download | GT5-Unofficial-0f990a7cfd78c3ede4db09a893e1e6edff164a2a.tar.gz GT5-Unofficial-0f990a7cfd78c3ede4db09a893e1e6edff164a2a.tar.bz2 GT5-Unofficial-0f990a7cfd78c3ede4db09a893e1e6edff164a2a.zip | |
Cleanup (#2803)
* remove dead code
* use proper materials for tiered circuits
* remove yet another RA1 call
* remove deprecated usage
* small step toward Research station assline recipes migration
* remove dead code
* remove dead code
* remove dead code
* migrate BW recipes
* remove some more RA1 code
* remove bad search and replace + spotlessapply
* yeet deprecated code and change how sieverts for recipes are computed
* fix loading
* fix bad replacements
* spotless apply
Diffstat (limited to 'src/main/java/com')
16 files changed, 591 insertions, 784 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java index 8ffdc0b5a1..ddbaa84d6e 100644 --- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -69,36 +69,13 @@ public class GTNHLanthanides { BeamlineRecipeLoader.load(); BotRecipes.addGTRecipe(); - // RecipeLoader.loadZylonRecipes(); proxy.postInit(e); - // GT_Log.out.print(FluidRegistry.getFluid("Sodium Tungstate").getName()); - // GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray())); - // GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray())); - - /* - * GT_Log.out.print("HMMM " + Arrays.toString(OreDictionary.getOreIDs( - * WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1)))); - */ } @EventHandler public static void onModLoadingComplete(FMLLoadCompleteEvent e) { - // GT_Log.out.print("AAAAAAAAAAAAAA " + new - // ItemStack(LanthItemList.maskMap.get(MaskList.CPU)).getUnlocalizedName()); - // - // GT_Log.out.print("We are done loading"); BotRecipes.removeRecipes(); RecipeLoader.removeCeriumSources(); - - /* - * for (GT_ItemStack stack : BeamlineRecipeAdder.instance.TargetChamberRecipes.mRecipeItemMap.keySet()) { - * GT_Log.out.print(" Recipes for: " + stack.mItem.getUnlocalizedName() + ": "); for (GT_Recipe recipe : - * BeamlineRecipeAdder.instance.TargetChamberRecipes.mRecipeItemMap.get(stack)) { - * GT_Log.out.print(Arrays.toString(recipe.mOutputs)); } } - */ - - // GT_Log.out.print("blah blah " + - // WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot)); } } diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index 4aed254be0..a6e806ca86 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -1502,24 +1502,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID4 + 30, TextureSet.SET_FLUID); - // enum Lanthanides { - // Lanthanum, - // Praseodymium, - // Cerium, - // Neodymium, - // Promethium, - // Samarium, - // Europium, - // Gadolinium, - // Terbium, - // Dysprosium, - // Holmium, - // Erbium, - // Thulium, - // Ytterbium, - // Lutetium - // } - // Lanthanides Chloride Concentrate // Lanthanum public static final Werkstoff LanthanumChlorideConcentrate = new Werkstoff( @@ -1739,17 +1721,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID4 + 50, TextureSet.SET_DULL); - // Samarium - // public static final Werkstoff SamariumOreConcentrate = new Werkstoff( - // new short[] { 255, 200, 230 }, - // "Samarium Ore Concentrate", - // subscriptNumbers("??Sm??"), - // new Werkstoff.Stats(), - // Werkstoff.Types.MIXTURE, - // new Werkstoff.GenerationFeatures().disable().onlyDust(), - // offsetID2 + 28, - // TextureSet.SET_DULL); - // Europium public static final Werkstoff EuropiumOreConcentrate = new Werkstoff( new short[] { 240, 200, 240 }, @@ -1882,30 +1853,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID5 + 39, TextureSet.SET_GEM_VERTICAL); - // public static final Werkstoff RawCeriumDopedLutetiumAluminiumGarnetPart = new Werkstoff( - // new short[] { 63, 255, 63 }, - // "Raw Cerium Doped Lutetium Aluminium Garnet Part", - // subscriptNumbers("(Ce)Lu3Al5O12"), - // new Werkstoff.Stats(), - // Werkstoff.Types.MATERIAL, - // new Werkstoff.GenerationFeatures().disable().addGems(), - // offsetID4 + 33, - // TextureSet.SET_GEM_VERTICAL); - - // public static final Werkstoff C272 = new Werkstoff( - // new short[] { 0x29, 0xc2, 0x2a }, - // "C-272", - // subscriptNumbers("(C8H17)2PO2H"), - // new Werkstoff.Stats().setElektrolysis(true), - // Werkstoff.Types.COMPOUND, - // new Werkstoff.GenerationFeatures().disable().addCells(), - // offsetID4 + 59, - // TextureSet.SET_FLUID, - // new Pair<>(Carbon, 16), - // new Pair<>(Phosphorus, 1), - // new Pair<>(Oxygen, 3), - // new Pair<>(Hydrogen, 35)); - public static final Werkstoff Permalloy = new Werkstoff( new short[] { 195, 230, 225 }, "Permalloy", diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java index 479569c7f6..239be6a3ea 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java @@ -73,9 +73,6 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel)) .build(); - // private int mHeat; - // private int mNeededHeat; - public Digester(String name) { super(name); } diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java index f515024365..e6a714fd00 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java @@ -146,19 +146,12 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di FluidStack majorGenericFluid = tRecipe.mFluidInputs[0]; FluidStack minorGenericFluid = tRecipe.mFluidInputs[1]; - // FluidStack majorInput = null; - // FluidStack minorInput = null; - int majorAmount; int minorAmount; FluidStack fluidInputOne = tFluidInputs.get(0); FluidStack fluidInputTwo = tFluidInputs.get(1); - // majorInput = ((fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) - // ? fluidInputOne - // : fluidInputTwo); - // GT_Log.out.print(majorInput.getLocalizedName()); if (fluidInputOne.getUnlocalizedName() .equals(majorGenericFluid.getUnlocalizedName())) { if (fluidInputTwo.getUnlocalizedName() @@ -183,12 +176,6 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di } else return false; - // GT_Log.out.print("out of switch weirdness"); - - // GT_Log.out.print("major " + majorInput.getLocalizedName()); - // GT_Log.out.print("minor " + minorInput.getLocalizedName()); - - // GT_Log.out.print("mjrinputamt " + majorInput.amount); return majorAmount / tRecipe.mSpecialValue == minorAmount; } diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java index 6649d0a232..0626118a25 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java @@ -203,8 +203,6 @@ public class SourceChamber extends GT_MetaTileEntity_EnhancedMultiBlockBase<Sour // when produced by this // multiblock float maxMaterialEnergy = tRecipe.maxEnergy; // The maximum energy for the recipe processed - // outputEnergy = (float) ((-maxEnergy) * Math.pow(1.001, -(tRecipe.energyRatio)*(tVoltage-tRecipe.mEUt))) + - // maxEnergy; outputEnergy = (float) Math.min( (-maxMaterialEnergy) * Math.pow(1.001, -(tRecipe.energyRatio) * (tVoltageMaxTier - tRecipe.mEUt)) + maxMaterialEnergy, diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java deleted file mode 100644 index 6ab854c308..0000000000 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following - * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -package com.github.bartimaeusnek.bartworks.API; - -import javax.annotation.Nonnegative; -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -import com.github.bartimaeusnek.bartworks.util.BWRecipes; -import com.github.bartimaeusnek.bartworks.util.BioCulture; - -import gregtech.api.enums.Materials; - -public final class BioRecipeAdder { - - public static final int STANDART = 0; - public static final int LOWGRAVITY = -100; - public static final int CLEANROOM = -200; - - public static boolean addBioLabRecipe(ItemStack[] aInputs, ItemStack aOutput, ItemStack aSpecialItems, - int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, - int aSpecialValue) { - return BWRecipes.instance.addBioLabRecipe( - aInputs, - aOutput, - aSpecialItems, - aChances, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - aSpecialValue); - } - - /** - * Adds a Incubation Recipe for the BioLab. - * - * @param aInput any item that will be added with a petri dish - * @param aOutput must be a BioCulture - * @param aChances - * @param aFluidInputs - * @param aDuration - * @param aEUt use BW_Util.getMachineVoltageFromTier(tier) to get optimal EU/t - * @param aSpecialValue 0 = STANDART, -100 = LowGravity, -200 = Cleanroom - * @return if the recipe was added. - */ - public static boolean addBioLabRecipeIncubation(ItemStack aInput, BioCulture aOutput, int[] aChances, - FluidStack aFluidInputs, int aDuration, int aEUt, int aSpecialValue) { - return BWRecipes.instance - .addBioLabRecipeIncubation(aInput, aOutput, aChances, aFluidInputs, aDuration, aEUt, aSpecialValue); - } - - /** - * @param aInputs Item Inputs, DO NOT PUT INTEGRATED CIRCUITS IN HERE! THEY WILL GET ADDED AUTOMATICALLY!, can - * be null - * @param aCulture the bio culture - * @param aFluidInputs may not be null - * @param aFluidOutputs may not be null - * @param aDuration - * @param aEUt - * @param Sv Manual Sv entry i.e. for custom items - * @param glasTier the glass tier - * @param aSpecialValue Space or Cleanroom, Not yet implemented - * @param exactSv if the recipe needs EXACTLY the Sv or can use less... - * @return - */ - public static boolean addBacterialVatRecipe(ItemStack[] aInputs, @Nonnull BioCulture aCulture, - @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, - @Nonnegative int aEUt, int Sv, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { - return BWRecipes.instance.addBacterialVatRecipe( - aInputs, - aCulture, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - Sv, - glasTier, - aSpecialValue, - exactSv); - } - - /** - * @param aInputs Item Inputs, DO NOT PUT INTEGRATED CIRCUITS IN HERE! THEY WILL GET ADDED AUTOMATICALLY!, can - * be null - * @param aCulture the bio culture - * @param aFluidInputs may not be null - * @param aFluidOutputs may not be null - * @param aDuration - * @param aEUt - * @param material may be null. used for auto Sv calculation - * @param glasTier the glass tier - * @param aSpecialValue Space or Cleanroom, Not yet implemented - * @param exactSv if the recipe needs EXACTLY the Sv or can use less... - * @return - */ - @Deprecated - public static boolean addBacterialVatRecipe(ItemStack[] aInputs, @Nonnull BioCulture aCulture, - @Nonnull FluidStack[] aFluidInputs, @Nonnull FluidStack[] aFluidOutputs, @Nonnegative int aDuration, - @Nonnegative int aEUt, Materials material, @Nonnegative int glasTier, int aSpecialValue, boolean exactSv) { - return BWRecipes.instance.addBacterialVatRecipe( - aInputs, - aCulture, - aFluidInputs, - aFluidOutputs, - aDuration, - aEUt, - material, - glasTier, - aSpecialValue, - exactSv); - } -} diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java index 6268342cce..ef3ac62349 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java @@ -5,14 +5,12 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; +import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import com.github.bartimaeusnek.bartworks.system.material.BW_GT_MaterialReference; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; @@ -21,9 +19,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.recipe.RecipeMaps; import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; public class ArtificialMicaLine { @@ -170,18 +166,15 @@ public class ArtificialMicaLine { .addTo(blastFurnaceRecipes); // 144Fluorophlogopite(l) = Fluorophlogopite - RecipeMaps.vacuumFreezerRecipes.addRecipe( - new GT_Recipe( - false, - new ItemStack[] { ItemList.Shape_Mold_Plate.get(0) }, - new ItemStack[] { WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1) }, - null, - null, - new FluidStack[] { WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(144) }, - null, - 10, - 120, - 0)); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Shape_Mold_Plate.get(0)) + .itemOutputs(WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1)) + .fluidOutputs(WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(144)) + .duration(10 * TICKS) + .eut(TierEU.RECIPE_MV) + .noOptimize() + .addTo(vacuumFreezerRecipes); + // Fluorophlogopite = 4Insulator Foil if (NewHorizonsCoreMod.isModLoaded()) { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java index f93d328042..e922f76b8f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java @@ -13,7 +13,13 @@ package com.github.bartimaeusnek.bartworks.common.loaders; +import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bacterialVatRecipes; +import static com.github.bartimaeusnek.bartworks.API.recipe.BartWorksRecipeMaps.bioLabRecipes; import static gregtech.api.enums.Mods.CropsPlusPlus; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GT_RecipeConstants.SIEVERTS; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -21,9 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.util.BWRecipes; -import com.github.bartimaeusnek.bartworks.util.BW_Util; - +import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -44,77 +48,77 @@ public class BioRecipeLoader { FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; for (FluidStack fluidStack : easyFluids) { - BWRecipes.instance.addBioLabRecipeIncubation( - new ItemStack(Items.rotten_flesh), - BioCultureLoader.rottenFleshBacteria, - new int[] { 3300 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); - - BWRecipes.instance.addBioLabRecipeIncubation( - new ItemStack(Items.fermented_spider_eye), - BioCultureLoader.eColi, - new int[] { 4500 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); - - BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Food_Dough.get(1L), - BioCultureLoader.CommonYeast, - new int[] { 7500 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); - - BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Food_Dough_Sugar.get(1L), - BioCultureLoader.WhineYeast, - new int[] { 2500 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); - - BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Bottle_Wine.get(1L), - BioCultureLoader.WhineYeast, - new int[] { 3300 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); - - BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Bottle_Beer.get(1L), - BioCultureLoader.BeerYeast, - new int[] { 2500 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); - - BWRecipes.instance.addBioLabRecipeIncubation( - ItemList.Bottle_Dark_Beer.get(1L), - BioCultureLoader.BeerYeast, - new int[] { 3300 }, - new FluidStack[] { fluidStack }, - 500, - (int) TierEU.RECIPE_HV, - BW_Util.STANDART); - - BWRecipes.instance.addBioLabRecipeIncubation( - new ItemStack(Blocks.dirt), - BioCultureLoader.anaerobicOil, - new int[] { 100 }, - new FluidStack[] { fluidStack }, - 1500, - (int) TierEU.RECIPE_EV, - BW_Util.STANDART); + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), new ItemStack(Items.rotten_flesh)) + .itemOutputs(BioItemList.getPetriDish(BioCultureLoader.rottenFleshBacteria)) + .outputChances(33_00) + .fluidInputs(fluidStack) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), new ItemStack(Items.fermented_spider_eye)) + .itemOutputs(BioItemList.getPetriDish(BioCultureLoader.eColi)) + .outputChances(45_00) + .fluidInputs(fluidStack) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), ItemList.Food_Dough.get(1L)) + .itemOutputs(BioItemList.getPetriDish(BioCultureLoader.CommonYeast)) + .outputChances(75_00) + .fluidInputs(fluidStack) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), ItemList.Food_Dough_Sugar.get(1L)) + .itemOutputs(BioItemList.getPetriDish(BioCultureLoader.WhineYeast)) + .outputChances(25_00) + .fluidInputs(fluidStack) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), ItemList.Bottle_Wine.get(1L)) + .itemOutputs(BioItemList.getPetriDish(BioCultureLoader.WhineYeast)) + .outputChances(33_00) + .fluidInputs(fluidStack) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), ItemList.Bottle_Beer.get(1L)) + .itemOutputs(BioItemList.getPetriDish(BioCultureLoader.BeerYeast)) + .outputChances(25_00) + .fluidInputs(fluidStack) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), ItemList.Bottle_Dark_Beer.get(1L)) + .itemOutputs(BioItemList.getPetriDish(BioCultureLoader.BeerYeast)) + .outputChances(33_00) + .fluidInputs(fluidStack) + .duration(25 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(bioLabRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(BioItemList.getPetriDish(null), new ItemStack(Blocks.dirt)) + .itemOutputs(BioItemList.getPetriDish(BioCultureLoader.anaerobicOil)) + .outputChances(100) + .fluidInputs(fluidStack) + .duration(1 * MINUTES + 15 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(bioLabRecipes); } } @@ -123,72 +127,87 @@ public class BioRecipeLoader { FluidRegistry.getFluidStack("ic2distilledwater", 1000) }; for (FluidStack fluidStack : easyFluids) { if (CropsPlusPlus.isModLoaded()) { - BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(2), new ItemStack(Items.sugar, 64) }, - new FluidStack[] { new FluidStack(fluidStack, 100) }, - BioCultureLoader.CommonYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.ghp", 1) }, - 350, - (int) TierEU.RECIPE_EV); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2), new ItemStack(Items.sugar, 64)) + .special(BioItemList.getPetriDish(BioCultureLoader.CommonYeast)) + .fluidInputs(new FluidStack(fluidStack, 100)) + .fluidOutputs(FluidRegistry.getFluidStack("potion.ghp", 1)) + .duration(17 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .noOptimize() + .addTo(bacterialVatRecipes); } - BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { ItemList.Crop_Drop_Grapes.get(16) }, - new FluidStack[] { new FluidStack(fluidStack, 100) }, - BioCultureLoader.WhineYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.wine", 12) }, - 200, - (int) TierEU.RECIPE_MV); - - BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { new ItemStack(Items.sugar, 4), ItemList.IC2_Hops.get(16L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 8L) }, - new FluidStack[] { new FluidStack(fluidStack, 100) }, - BioCultureLoader.BeerYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.beer", 5) }, - 600, - (int) TierEU.RECIPE_LV); - BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { ItemList.IC2_Hops.get(32L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 16L) }, - new FluidStack[] { new FluidStack(fluidStack, 100) }, - BioCultureLoader.BeerYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.darkbeer", 10) }, - 600, - (int) TierEU.RECIPE_LV); + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Grapes.get(16)) + .special(BioItemList.getPetriDish(BioCultureLoader.WhineYeast)) + .fluidInputs(new FluidStack(fluidStack, 100)) + .fluidOutputs(FluidRegistry.getFluidStack("potion.wine", 12)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(Items.sugar, 4), + ItemList.IC2_Hops.get(16L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 8L)) + .special(BioItemList.getPetriDish(BioCultureLoader.BeerYeast)) + .fluidInputs(new FluidStack(fluidStack, 100)) + .fluidOutputs(FluidRegistry.getFluidStack("potion.beer", 5)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.IC2_Hops.get(32L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 16L)) + .special(BioItemList.getPetriDish(BioCultureLoader.BeerYeast)) + .fluidInputs(new FluidStack(fluidStack, 100)) + .fluidOutputs(FluidRegistry.getFluidStack("potion.darkbeer", 10)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_LV) + .noOptimize() + .addTo(bacterialVatRecipes); } } public static void registerBacterialVatRecipes() { registerWaterBasedBacterialVatRecipes(); - BWRecipes.instance.addBacterialVatRecipe( - null, - new FluidStack[] { FluidRegistry.getFluidStack("potion.grapejuice", 100) }, - BioCultureLoader.WhineYeast, - new FluidStack[] { FluidRegistry.getFluidStack("potion.wine", 12) }, - 400, - (int) TierEU.RECIPE_LV); - - BWRecipes.instance.addBacterialVatRecipe( - null, - new FluidStack[] { Materials.FermentedBiomass.getFluid(10000) }, - BioCultureLoader.anaerobicOil, - new FluidStack[] { new FluidStack(FluidLoader.fulvicAcid, 1000) }, - 2748, - (int) TierEU.RECIPE_HV); + GT_Values.RA.stdBuilder() + .special(BioItemList.getPetriDish(BioCultureLoader.WhineYeast)) + .fluidInputs(FluidRegistry.getFluidStack("potion.grapejuice", 100)) + .fluidOutputs(FluidRegistry.getFluidStack("potion.wine", 12)) + .duration(20 * SECONDS) + .eut(TierEU.RECIPE_LV) + .noOptimize() + .addTo(bacterialVatRecipes); + + GT_Values.RA.stdBuilder() + .special(BioItemList.getPetriDish(BioCultureLoader.anaerobicOil)) + .fluidInputs(Materials.FermentedBiomass.getFluid(10000)) + .fluidOutputs(new FluidStack(FluidLoader.fulvicAcid, 1000)) + .duration(2 * MINUTES + 17 * SECONDS + 8 * TICKS) + .eut(TierEU.RECIPE_LV) + .noOptimize() + .addTo(bacterialVatRecipes); } public static void runOnServerStarted() { RecipeMaps.fermentingRecipes.getAllRecipes() .forEach( - recipe -> BWRecipes.instance.addBacterialVatRecipe( - new ItemStack[] { null }, - BioCultureLoader.generalPurposeFermentingBacteria, - recipe.mFluidInputs, - recipe.mFluidOutputs, - recipe.mDuration, - recipe.mEUt, - GT_Utility.getTier(recipe.mEUt))); + recipe -> GT_Values.RA.stdBuilder() + .special(BioItemList.getPetriDish(BioCultureLoader.generalPurposeFermentingBacteria)) + .fluidInputs(recipe.mFluidInputs) + .fluidOutputs(recipe.mFluidOutputs) + .duration(recipe.mDuration) + .eut(recipe.mEUt) + .metadata(SIEVERTS, (int) GT_Utility.getTier(recipe.mEUt)) + .addTo(bacterialVatRecipes)); + } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java index d141fe8b65..3a5cd2c9cc 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RadioHatchMaterialLoader.java |
