From a8b46c11f5a02608101ef33ed39f103736ba5920 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sun, 21 Jul 2024 16:36:34 +0200 Subject: full RA1 removal (#2713) * remove addExtractionRecipes * remove addPulverisationRecipe * remove thermalcraft fake compat * deprecate addAlloySmelterRecipe * remove fake compat * remove RA1 fusion recipe usage * remove RA1 centrifuge recipe usage * remove RA1 compressor recipe usage * remove RA1 electrolyzer recipe usage * remove RA1 chemical reactor recipe usage * deprecate GT based recipes adders * obliterate RA1 entries in interfaces (1/?) * remove RA1 blast furnace recipe usage * remove RA1 canner recipe usage * remove RA1 alloy smelter recipe usage * remove RA1 circuit assembler recipe usage * obliterate RA1 entries in interfaces (2/?) * remove RA1 bender recipe usage * clean class * remove RA1 cutter recipe usage * remove RA1 fuels recipe usage * remove RA1 implosion compressor recipe usage * remove RA1 thermal centrifuge recipe usage * clean GT_ModHandler * obliterate RA1 entries in interfaces (3/?) * remove RA1 packager recipe usage * remove RA1 lathe recipe usage * remove RA1 vacuum freezer recipe usage * remove RA1 fluid heater recipe usage * remove RA1 nano forge recipe usage * remove RA1 autoclave recipe usage * obliterate RA1 entries in interfaces (4/?) * remove RA1 cracker recipe usage * remove RA1 pyrolyse recipe usage * remove RA1 pulveriser recipe usage * remove RA1 fluid extractor recipe usage * remove RA1 assembly line recipe usage * remove RA1 alloy blast smelter recipe usage * remove RA1 coke oven recipe usage * obliterate RA1 entries in interfaces (5/?) * remove RA1 dehydrator recipe usage * remove deprecated usages * obliterate RA1 entries in interfaces (6/?) * remove RA1 assembler recipe usage * obliterate RA1 entries in interfaces (7/?) * remove RA1 mixer recipe usage * remove RA1 forge hammer recipe usage * remove RA1 wiremill recipe usage * remove RA1 extruder recipe usage * remove RA1 fluid soldifier recipe usage * remove RA1 chemical bath recipe usage * remove RA1 electromagnetic separator recipe usage * remove RA1 sifter recipe usage * remove distillery recipe usage * remove distillation tower usage * remove extractor usage * obliterate RA1 entries in interfaces (8/?) * remove QFT usage * cleaning * remove packager usage * remove fluid heater usage * remove vacuum freezer usage * remove distillery usage * fix QFT chances arrays * remove fission fuel usage * remove cyclotron usage * remove molecular transformer usage * remove chemplant usage * remove coldtrap and reactor processing unit usage * obliterate RA1 entries in interfaces (9/?) * spotlessApply * fixes * remove addRecipe calls * migrate forge of gods recipes * yeet special value calls (1 / 2) * yeet special value calls (2 / 2) * migrate GG Fuel recipes * migrate all GG maps except EHE * CORE.RA is no more * clear GT_RecipeAdder * remove dead code * clean RecipeMap a bit * spotless apply * fix output chances * Update RecipeLoader.java * fix * remove buggy recipe * migrate to enum for IDs * sort enum * move to enum * fix recipes * spotless apply * fix recipe * remove useless recipes * spotless apply * remove unused blocks * fix GT++ recipe * Update RecipeLoader.java * Update RecipeLoader.java * fix imports * Spotless apply for branch remove_RA1_calls for #2713 (#2742) spotlessApply Co-authored-by: GitHub GTNH Actions <> * fix recipe (cherry picked from commit a25d3b62997f080e064369e940eaf53a96a300e6) * fix (cherry picked from commit d9af01140f3ee77de2be18be70f04f8fbe4b547f) * temporarily remove panic mode * fix recipes * Revert "temporarily remove panic mode" This reverts commit 483cfcf74371b91e7d545f058f9d25ff4fcec95a. * fix recipes --------- Co-authored-by: Dream Master Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../com/elisis/gtnhlanth/loader/BotRecipes.java | 270 +- .../com/elisis/gtnhlanth/loader/RecipeLoader.java | 1896 ++++---- .../ElectricImplosionCompressorRecipes.java | 222 +- .../common/loaders/StaticRecipeChangeLoaders.java | 27 +- .../common/loaders/recipes/Assembler.java | 22 +- .../common/loaders/recipes/PyrolyseOven.java | 20 +- .../GT_Enhancement/PlatinumSludgeOverHaul.java | 132 +- .../processingLoaders/AdditionalRecipes.java | 820 ++-- .../werkstoff_loaders/recipe/CellLoader.java | 25 +- .../werkstoff_loaders/recipe/CrushedLoader.java | 83 +- .../werkstoff_loaders/recipe/OreLoader.java | 24 +- .../werkstoff_loaders/recipe/RawOreLoader.java | 24 +- .../bartimaeusnek/bartworks/util/BW_Util.java | 3 + .../technus/tectech/loader/recipe/Assembler.java | 5092 +++++++++++--------- .../tectech/loader/recipe/AssemblyLine.java | 193 +- .../tectech/loader/recipe/CircuitAssembler.java | 45 +- .../technus/tectech/loader/recipe/Extractor.java | 81 +- .../technus/tectech/loader/recipe/Godforge.java | 179 +- .../loader/recipe/ResearchStationAssemblyLine.java | 3 +- .../tectech/recipe/EyeOfHarmonyRecipeStorage.java | 26 +- .../technus/tectech/recipe/TT_recipeAdder.java | 79 +- src/main/java/common/TileEntities.java | 20 +- .../items/nuclear/IsotopeMaterial.java | 60 - .../items/nuclear/IsotopeMaterialLoader.java | 177 - .../items/nuclear/NuclearMetaItemGenerator.java | 110 - .../items/nuclear/NuclearTextures.java | 31 - .../loader/ComponentAssemblyLineRecipeLoader.java | 60 +- .../goodgenerator/loader/FuelRecipeLoader.java | 245 +- .../loader/NaquadahReworkRecipeLoader.java | 216 +- .../loader/NeutronActivatorLoader.java | 63 +- .../java/goodgenerator/loader/RecipeLoader.java | 61 +- .../java/goodgenerator/loader/RecipeLoader_02.java | 351 +- .../java/goodgenerator/util/MyRecipeAdder.java | 50 +- .../java/gregtech/api/enums/MetaTileEntityIDs.java | 7 +- .../api/interfaces/internal/IGT_RecipeAdder.java | 1061 ---- .../gregtech/api/items/GT_BreederCell_Item.java | 20 +- .../api/items/GT_RadioactiveCellIC_Item.java | 37 +- src/main/java/gregtech/api/recipe/RecipeMap.java | 107 +- src/main/java/gregtech/api/recipe/RecipeMaps.java | 5 - .../java/gregtech/api/util/FishPondFakeRecipe.java | 32 +- .../java/gregtech/api/util/GT_Forestry_Compat.java | 247 +- src/main/java/gregtech/api/util/GT_ModHandler.java | 385 +- .../java/gregtech/api/util/GT_RecipeBuilder.java | 8 - .../java/gregtech/api/util/GT_RecipeConstants.java | 96 + .../java/gregtech/api/util/GasSpargingRecipe.java | 4 +- src/main/java/gregtech/api/util/HotFuel.java | 40 - .../gregtech/api/util/SemiFluidFuelHandler.java | 114 +- src/main/java/gregtech/common/GT_RecipeAdder.java | 3231 ------------- .../common/items/GT_MetaGenerated_Item_01.java | 225 +- .../common/items/GT_MetaGenerated_Item_02.java | 207 +- .../java/gregtech/loaders/load/GT_FuelLoader.java | 186 +- .../gregtech/loaders/load/GT_ItemIterator.java | 4 - .../loaders/oreprocessing/ProcessingCell.java | 23 +- .../loaders/oreprocessing/ProcessingDust.java | 16 +- .../loaders/oreprocessing/ProcessingDye.java | 31 +- .../loaders/oreprocessing/ProcessingLog.java | 8 - .../loaders/oreprocessing/ProcessingPlate.java | 28 +- .../loaders/postload/GT_FakeRecipeLoader.java | 19 +- .../loaders/postload/chains/GT_NaniteChain.java | 238 +- .../loaders/postload/recipes/PrinterRecipes.java | 6 +- src/main/java/gtPlusPlus/core/block/ModBlocks.java | 6 - .../java/gtPlusPlus/core/common/CommonProxy.java | 3 - .../core/item/base/ore/BaseItemMilledOre.java | 52 +- .../core/item/chemistry/AgriculturalChem.java | 62 +- .../gtPlusPlus/core/item/chemistry/CoalTar.java | 229 +- .../core/item/chemistry/GenericChem.java | 480 +- .../core/item/chemistry/MilledOreProcessing.java | 526 +- .../core/item/chemistry/RocketFuels.java | 219 +- src/main/java/gtPlusPlus/core/lib/CORE.java | 6 - .../core/material/MaterialGenerator.java | 21 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 1201 ++--- .../gtPlusPlus/core/recipe/RECIPES_General.java | 3 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 2198 +++++---- .../core/recipe/RECIPES_SeleniumProcessing.java | 213 +- .../java/gtPlusPlus/core/recipe/common/CI.java | 10 +- .../core/slots/SlotIntegratedCircuit.java | 7 +- .../general/TileEntityCircuitProgrammer.java | 3 +- .../gtPlusPlus/core/util/minecraft/ItemUtils.java | 22 +- .../core/util/minecraft/MaterialUtils.java | 1 + .../core/util/reflect/AddGregtechRecipe.java | 42 +- .../gtPlusPlus/plugin/agrichem/BioRecipes.java | 691 +-- .../gtPlusPlus/recipes/CokeAndPyrolyseOven.java | 62 +- .../xmod/forestry/bees/items/output/GTPP_Comb.java | 22 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 380 -- .../common/items/MetaGeneratedGregtechItems.java | 43 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 6 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 3 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 5 +- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 7 +- .../GregtechMetaTileEntity_MassFabricator.java | 4 +- .../gregtech/loaders/RecipeGen_AlloySmelter.java | 50 +- .../xmod/gregtech/loaders/RecipeGen_Assembler.java | 52 +- .../gregtech/loaders/RecipeGen_BlastSmelter.java | 480 +- .../loaders/RecipeGen_BlastSmelterGT_GTNH.java | 4 +- .../gregtech/loaders/RecipeGen_DustGeneration.java | 531 +- .../xmod/gregtech/loaders/RecipeGen_Extruder.java | 158 +- .../xmod/gregtech/loaders/RecipeGen_Fluids.java | 215 +- .../xmod/gregtech/loaders/RecipeGen_Fluorite.java | 202 +- .../loaders/RecipeGen_MaterialProcessing.java | 127 +- .../gregtech/loaders/RecipeGen_MetalRecipe.java | 147 +- .../xmod/gregtech/loaders/RecipeGen_Ore.java | 392 +- .../xmod/gregtech/loaders/RecipeGen_Plasma.java | 46 +- .../xmod/gregtech/loaders/RecipeGen_Plates.java | 269 +- .../xmod/gregtech/loaders/RecipeGen_Recycling.java | 177 +- .../loaders/recipe/RecipeLoader_ChemicalSkips.java | 913 ++-- .../gregtech/loaders/recipe/RecipeLoader_GTNH.java | 65 +- .../loaders/recipe/RecipeLoader_GlueLine.java | 600 +-- .../gregtech/loaders/recipe/RecipeLoader_LFTR.java | 82 +- .../recipe/RecipeLoader_MolecularTransformer.java | 90 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 750 +-- .../recipe/RecipeLoader_NuclearFuelProcessing.java | 355 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 1220 ----- .../registration/gregtech/Gregtech4Content.java | 126 +- .../gregtech/GregtechAdvancedBoilers.java | 53 +- .../gregtech/GregtechAlgaeContent.java | 35 +- .../gregtech/GregtechAmazonWarehouse.java | 8 +- .../gregtech/GregtechBufferDynamos.java | 52 +- .../registration/gregtech/GregtechConduits.java | 424 +- .../gregtech/GregtechCustomHatches.java | 59 +- .../registration/gregtech/GregtechCyclotron.java | 9 +- .../registration/gregtech/GregtechDehydrator.java | 25 +- .../gregtech/GregtechEnergyBuffer.java | 148 +- .../GregtechFactoryGradeReplacementMultis.java | 34 +- .../GregtechGeothermalThermalGenerator.java | 38 +- .../gregtech/GregtechHiAmpTransformer.java | 98 +- .../gregtech/GregtechIndustrialAlloySmelter.java | 4 +- .../gregtech/GregtechIndustrialArcFurnace.java | 4 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 7 +- .../gregtech/GregtechIndustrialCentrifuge.java | 4 +- .../gregtech/GregtechIndustrialChisel.java | 15 +- .../gregtech/GregtechIndustrialCokeOven.java | 4 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 4 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 4 +- .../GregtechIndustrialElementDuplicator.java | 11 +- .../gregtech/GregtechIndustrialExtruder.java | 4 +- .../gregtech/GregtechIndustrialFishPond.java | 4 +- .../gregtech/GregtechIndustrialFluidHeater.java | 4 +- .../gregtech/GregtechIndustrialForgeHammer.java | 4 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 4 +- .../gregtech/GregtechIndustrialMacerator.java | 4 +- .../gregtech/GregtechIndustrialMassFabricator.java | 146 +- .../gregtech/GregtechIndustrialMixer.java | 4 +- .../gregtech/GregtechIndustrialMultiMachine.java | 4 +- .../gregtech/GregtechIndustrialPlatePress.java | 4 +- .../gregtech/GregtechIndustrialRockBreaker.java | 4 +- .../gregtech/GregtechIndustrialSifter.java | 4 +- .../GregtechIndustrialThermalCentrifuge.java | 4 +- .../gregtech/GregtechIndustrialTreeFarm.java | 8 +- .../gregtech/GregtechIndustrialWashPlant.java | 4 +- .../gregtech/GregtechIndustrialWiremill.java | 4 +- .../registration/gregtech/GregtechIsaMill.java | 21 +- .../registration/gregtech/GregtechLFTR.java | 24 +- .../GregtechLargeTurbinesAndHeatExchanger.java | 39 +- .../gregtech/GregtechMolecularTransformer.java | 4 +- .../GregtechNuclearSaltProcessingPlant.java | 4 +- .../gregtech/GregtechPollutionDevices.java | 39 +- .../gregtech/GregtechPowerSubStation.java | 44 +- .../gregtech/GregtechQuantumForceTransformer.java | 4 +- .../registration/gregtech/GregtechRTG.java | 4 +- .../gregtech/GregtechRocketFuelGenerator.java | 41 +- .../gregtech/GregtechSemiFluidgenerators.java | 19 +- .../gregtech/GregtechSimpleWasher.java | 87 +- .../registration/gregtech/GregtechSolarTower.java | 30 +- .../registration/gregtech/GregtechSteamMultis.java | 47 +- .../registration/gregtech/GregtechSuperChests.java | 43 +- .../gregtech/GregtechThaumcraftDevices.java | 3 +- .../gregtech/GregtechThreadedBuffers.java | 9 +- .../gregtech/GregtechTieredFluidTanks.java | 21 +- .../gregtech/GregtechTreeFarmerTE.java | 7 +- .../gregtech/GregtechWirelessChargers.java | 34 +- .../registration/gregtech/MetaTileEntityIDs.java | 216 + .../gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java | 290 +- .../xmod/railcraft/HANDLER_Railcraft.java | 101 +- .../xmod/tinkers/util/TinkersDryingRecipe.java | 19 +- src/main/java/kubatech/loaders/DEFCRecipes.java | 23 +- src/main/java/kubatech/loaders/RecipeLoader.java | 119 +- .../net/glease/ggfab/ComponentRecipeLoader.java | 56 +- 177 files changed, 14544 insertions(+), 18727 deletions(-) delete mode 100644 src/main/java/goodgenerator/items/nuclear/IsotopeMaterial.java delete mode 100644 src/main/java/goodgenerator/items/nuclear/IsotopeMaterialLoader.java delete mode 100644 src/main/java/goodgenerator/items/nuclear/NuclearMetaItemGenerator.java delete mode 100644 src/main/java/goodgenerator/items/nuclear/NuclearTextures.java delete mode 100644 src/main/java/gregtech/api/util/HotFuel.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java create mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/MetaTileEntityIDs.java (limited to 'src/main/java') diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java index 0851914f1e..f61b1889ba 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java @@ -1,20 +1,18 @@ package com.elisis.gtnhlanth.loader; -import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.AmmoniumNitrate; -import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.Nitromethane; -import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.OXylene; -import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.Phosgene; -import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.SodiumTungstate; -import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.TungstenTrioxide; -import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.TungsticAcid; -import static gregtech.api.enums.OrePrefixes.cell; -import static gregtech.api.enums.OrePrefixes.dust; -import static gregtech.api.enums.OrePrefixes.ingotHot; -import static gregtech.api.enums.OrePrefixes.item; +import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.*; +import static gregtech.api.enums.OrePrefixes.*; +import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; +import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes; +import static gregtech.api.recipe.RecipeMaps.crackingRecipes; +import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; +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_RecipeBuilder.TICKS; +import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import java.util.HashSet; @@ -46,101 +44,100 @@ public class BotRecipes { ItemStack C24 = GT_Utility.getIntegratedCircuit(24); // CaCO3 + 2HCl = H2O + CO2 + CaCl2 - GT_Values.RA.addChemicalRecipe( - Materials.Calcite.getDust(5), - Materials.Empty.getCells(1), - Materials.HydrochloricAcid.getFluid(2000), - Materials.Water.getFluid(1000), - Materials.CarbonDioxide.getCells(1), - WerkstoffLoader.CalciumChloride.get(dust, 3), - 80, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Calcite.getDust(5), Materials.Empty.getCells(1)) + .itemOutputs(Materials.CarbonDioxide.getCells(1), WerkstoffLoader.CalciumChloride.get(dust, 3)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(4 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(UniversalChemical); // tungsten chain FluidStack sodiumTungsten = SodiumTungstate.getFluidOrGas(1000); ItemStack scheelite = Materials.Scheelite.getDust(6); // Li2WO4 + 2Na = Na2WO4 + 2Li - GT_Values.RA.addAutoclaveRecipe( - Materials.Tungstate.getDust(7), - Materials.Sodium.getDust(2), - Materials.Water.getFluid(4000), - sodiumTungsten, - Materials.Lithium.getDust(2), - 10000, - 100, - 1920, - false); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Tungstate.getDust(7), Materials.Sodium.getDust(2)) + .itemOutputs(Materials.Lithium.getDust(2)) + .fluidInputs(Materials.Water.getFluid(4000)) + .fluidOutputs(sodiumTungsten) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(autoclaveRecipes); // MnWO4 + 2Na = Na2WO4 + Mn - GT_Values.RA.addAutoclaveRecipe( - WerkstoffLoader.Huebnerit.get(dust, 6), - Materials.Sodium.getDust(2), - Materials.Water.getFluid(4000), - sodiumTungsten, - Materials.Manganese.getDust(1), - 10000, - 100, - 1920, - false); + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.Huebnerit.get(dust, 6), Materials.Sodium.getDust(2)) + .itemOutputs(Materials.Manganese.getDust(1)) + .fluidInputs(Materials.Water.getFluid(4000)) + .fluidOutputs(sodiumTungsten) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(autoclaveRecipes); // FeWO4 + 2Na = Na2WO4 + Fe - GT_Values.RA.addAutoclaveRecipe( - WerkstoffLoader.Ferberite.get(dust, 6), - Materials.Sodium.getDust(2), - Materials.Water.getFluid(4000), - sodiumTungsten, - Materials.Iron.getDust(1), - 10000, - 100, - 1920, - false); + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffLoader.Ferberite.get(dust, 6), Materials.Sodium.getDust(2)) + .itemOutputs(Materials.Iron.getDust(1)) + .fluidInputs(Materials.Water.getFluid(4000)) + .fluidOutputs(sodiumTungsten) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(autoclaveRecipes); // CaCl2 + Na2WO4 = 2NaCl + CaWO4 ItemStack Ca2Cl = WerkstoffLoader.CalciumChloride.get(dust, 3); - GT_Values.RA - .addChemicalRecipe(Ca2Cl, null, sodiumTungsten, null, scheelite, Materials.Salt.getDust(4), 100, 480); + GT_Values.RA.stdBuilder() + .itemInputs(Ca2Cl) + .itemOutputs(scheelite, Materials.Salt.getDust(4)) + .fluidInputs(sodiumTungsten) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(UniversalChemical); ItemStack H2WO4 = TungsticAcid.get(dust, 7); // CaWO4 + 2HCl = H2WO4 + CaCl2 - GT_Values.RA.addChemicalRecipe( - scheelite, - null, - Materials.HydrochloricAcid.getFluid(2000), - null, - H2WO4, - Ca2Cl, - 50, - 1920); + GT_Values.RA.stdBuilder() + .itemInputs(scheelite) + .itemOutputs(H2WO4, Ca2Cl) + .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_EV) + .addTo(UniversalChemical); ItemStack WO3 = TungstenTrioxide.get(dust, 4); // H2WO4 = WO3 + H2O - GT_Values.RA.addBlastRecipe(H2WO4, null, null, null, WO3, null, 200, 480, 1200); + GT_Values.RA.stdBuilder() + .itemInputs(H2WO4) + .itemOutputs(WO3) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 1200) + .addTo(blastFurnaceRecipes); // WO3 + 6H = W + 3H2O - GT_Values.RA.addBlastRecipe( - WO3, - C2, - Materials.Hydrogen.getGas(6000), - GT_ModHandler.getSteam(3000), - Materials.Tungsten.getDust(1), - null, - 100, - 1920, - 1000); + GT_Values.RA.stdBuilder() + .itemInputs(WO3, C2) + .itemOutputs(Materials.Tungsten.getDust(1)) + .fluidInputs(Materials.Hydrogen.getGas(6000)) + .fluidOutputs(GT_ModHandler.getSteam(3000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 1000) + .addTo(blastFurnaceRecipes); WO3.stackSize = 8; // 2WO3 + 3C = 2W + 3CO2 - GT_Values.RA.addBlastRecipe( - WO3, - Materials.Carbon.getDust(3), - null, - Materials.CarbonDioxide.getGas(3000), - GT_OreDictUnificator.get(ingotHot, Materials.Tungsten, 2L), - null, - 8000, - 1920, - 3000); + GT_Values.RA.stdBuilder() + .itemInputs(WO3, Materials.Carbon.getDust(3)) + .itemOutputs(GT_OreDictUnificator.get(ingotHot, Materials.Tungsten, 2L)) + .fluidOutputs(Materials.CarbonDioxide.getGas(3000)) + .duration(6 * MINUTES + 40 * SECONDS) + .eut(TierEU.RECIPE_EV) + .metadata(COIL_HEAT, 3000) + .addTo(blastFurnaceRecipes); // rocket fuels // LMP103S @@ -176,75 +173,76 @@ public class BotRecipes { .addTo(UniversalChemical); // H3PO4 = P + H2O - GT_Values.RA.addDistilleryRecipe( - C2, - Materials.PhosphoricAcid.getFluid(1000), - Materials.Water.getFluid(500), - Materials.Phosphorus.getDust(1), - 20, - 480, - false); + GT_Values.RA.stdBuilder() + .itemInputs(C2) + .itemOutputs(Materials.Phosphorus.getDust(1)) + .fluidInputs(Materials.PhosphoricAcid.getFluid(1000)) + .fluidOutputs(Materials.Water.getFluid(500)) + .eut(TierEU.RECIPE_HV) + .duration(1 * SECONDS) + .addTo(distilleryRecipes); ItemStack cells = Ic2Items.cell.copy(); cells.stackSize = 1; // NH4Cl = HCl + NH3 - GT_Values.RA.addDistilleryRecipe( - cells, - WerkstoffLoader.AmmoniumChloride.getFluidOrGas(1000), - Materials.HydrochloricAcid.getFluid(1000), - Materials.Ammonia.getCells(1), - 50, - 120, - false); + GT_Values.RA.stdBuilder() + .itemInputs(cells) + .itemOutputs(Materials.Ammonia.getCells(1)) + .fluidInputs(WerkstoffLoader.AmmoniumChloride.getFluidOrGas(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .eut(TierEU.RECIPE_MV) + .duration(2 * SECONDS + 10 * TICKS) + .addTo(distilleryRecipes); // N2H4O3 + NaOH = NaNO3 + NH3 + H2O - GT_Values.RA.addChemicalRecipeForBasicMachineOnly( - AmmoniumNitrate.get(dust, 9), - Materials.SodiumHydroxide.getDust(3), - null, - Materials.Ammonia.getGas(1000), - WerkstoffLoader.SodiumNitrate.get(dust, 5), - null, - 100, - 480); + GT_Values.RA.stdBuilder() + .itemInputs(AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3)) + .itemOutputs(WerkstoffLoader.SodiumNitrate.get(dust, 5)) + .fluidOutputs(Materials.Ammonia.getGas(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(chemicalReactorRecipes); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3), C2 }, - null, - new FluidStack[] { Materials.Ammonia.getGas(1000), Materials.Water.getFluid(1000) }, - new ItemStack[] { WerkstoffLoader.SodiumNitrate.get(dust, 5) }, - 100, - 480); + GT_Values.RA.stdBuilder() + .itemInputs(AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3), C2) + .itemOutputs(WerkstoffLoader.SodiumNitrate.get(dust, 5)) + .fluidOutputs(Materials.Ammonia.getGas(1000), Materials.Water.getFluid(1000)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); // N2H4O3 + NaOH + H =H2SO4= NH3 + HNO3 + Na + H2O - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { C24, AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3) }, - new FluidStack[] { Materials.SulfuricAcid.getFluid(1000), Materials.Hydrogen.getGas(1000) }, - new FluidStack[] { Materials.Ammonia.getGas(1000), Materials.NitricAcid.getFluid(1000), - Materials.DilutedSulfuricAcid.getFluid(1000) }, - new ItemStack[] { Materials.Sodium.getDust(1) }, - 300, - 480); + GT_Values.RA.stdBuilder() + .itemInputs(C24, AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3)) + .itemOutputs(Materials.Sodium.getDust(1)) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000), Materials.Hydrogen.getGas(1000)) + .fluidOutputs( + Materials.Ammonia.getGas(1000), + Materials.NitricAcid.getFluid(1000), + Materials.DilutedSulfuricAcid.getFluid(1000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); // Monomethylhydrazine cells.stackSize = 1; // C7H8 + CH4O = C8H10 + H2O - GT_Values.RA.addCrackingRecipe( - 1, - Materials.Toluene.getFluid(1000), - Materials.Methanol.getFluid(1000), - OXylene.getFluidOrGas(1000), - 600, - 4096); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .fluidInputs(Materials.Toluene.getFluid(1000), Materials.Methanol.getFluid(1000)) + .fluidOutputs(OXylene.getFluidOrGas(1000)) + .duration(30 * SECONDS) + .eut(4096) + .addTo(crackingRecipes); // 2HNO3 + C3H8 = 2CH3NO2 + 2H2O + C - GT_Values.RA.addCrackingRecipe( - 2, - Materials.Propane.getGas(1000), - Materials.NitricAcid.getFluid(2000), - Nitromethane.getFluidOrGas(2000), - 300, - 1920); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(2)) + .fluidInputs(Materials.Propane.getGas(1000), Materials.NitricAcid.getFluid(2000)) + .fluidOutputs(Nitromethane.getFluidOrGas(2000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(crackingRecipes); } public static void removeRecipes() { diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 1aaa945f93..14194af8f7 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -69,6 +69,7 @@ import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.Samariu import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.SamariumExtractingNanoResin; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.SamariumOreConcentrate; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.SamariumOxalate; +import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.SamariumOxide; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.SamariumRareEarthMud; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.TerbiumChlorideConcentrate; import static com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool.TerbiumExtractingNanoResin; @@ -87,7 +88,10 @@ import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeNonCellRecipes; import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.chemicalBathRecipes; +import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes; +import static gregtech.api.recipe.RecipeMaps.crackingRecipes; import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; +import static gregtech.api.recipe.RecipeMaps.electroMagneticSeparatorRecipes; import static gregtech.api.recipe.RecipeMaps.electrolyzerNonCellRecipes; import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; @@ -102,8 +106,12 @@ import static gregtech.api.recipe.RecipeMaps.oreWasherRecipes; import static gregtech.api.recipe.RecipeMaps.sifterRecipes; import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; +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.AssemblyLine; +import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GT_RecipeConstants.DISSOLUTION_TANK_RATIO; import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes; @@ -793,147 +801,158 @@ public class RecipeLoader { /* ZIRCONIUM */ // ZrCl4 // ZrO2 + 4HCl = ZrCl4 + 2H2O - GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.Zirconia.get(OrePrefixes.dust, 3), - Materials.HydrochloricAcid.getFluid(4000), - Materials.Water.getFluid(2000), - WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 5), - 300); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1), WerkstoffMaterialPool.Zirconia.get(OrePrefixes.dust, 3)) + .itemOutputs(WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 5)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(4000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // ZrCl4-H2O - GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 5), - Materials.Water.getFluid(1000), - WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000), - null, - 200); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + WerkstoffMaterialPool.ZirconiumTetrachloride.get(OrePrefixes.dust, 5)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Zr - // ZrCl4�H2O + 2Mg = Zr + 2MgCl2 - GT_Values.RA.addBlastRecipe( - GT_Utility.getIntegratedCircuit(2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2), - WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000), - null, // No fluid output - WerkstoffMaterialPool.Zirconium.get(OrePrefixes.ingotHot, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6), - 600, - 1920, - 4500); + // ZrCl4·H2O + 2Mg = Zr + 2MgCl2 + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) + .itemOutputs( + WerkstoffMaterialPool.Zirconium.get(OrePrefixes.ingotHot, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6)) + .fluidInputs(WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .metadata(COIL_HEAT, 4500) + .addTo(blastFurnaceRecipes); /* HAFNIUM */ // HfCl4 // HfO2 + 4HCl = HfCl4 + 2H2O - GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.Hafnia.get(OrePrefixes.dust, 3), - Materials.HydrochloricAcid.getFluid(4000), - Materials.Water.getFluid(2000), - WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 5), - 300); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1), WerkstoffMaterialPool.Hafnia.get(OrePrefixes.dust, 3)) + .itemOutputs(WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 5)) + .fluidInputs(Materials.HydrochloricAcid.getFluid(4000)) + .fluidOutputs(Materials.Water.getFluid(2000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // HfCl4-H2O - GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 5), - Materials.Water.getFluid(1000), - WerkstoffMaterialPool.HafniumTetrachlorideSolution.getFluidOrGas(1000), - null, - 200); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + WerkstoffMaterialPool.HafniumTetrachloride.get(OrePrefixes.dust, 5)) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(WerkstoffMaterialPool.HafniumTetrachlorideSolution.getFluidOrGas(1000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // LP-Hf // HfCl4 + 2Mg = ??Hf?? + 2MgCl2 - GT_Values.RA.addBlastRecipe( - GT_Utility.getIntegratedCircuit(2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2), - WerkstoffMaterialPool.HafniumTetrachlorideSolution.getFluidOrGas(1000), - null, // No fluid output - WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6), - 600, - 1920, - 2700); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(2), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) + .itemOutputs( + WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6)) + .fluidInputs(WerkstoffMaterialPool.HafniumTetrachlorideSolution.getFluidOrGas(1000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV) + .metadata(COIL_HEAT, 2700) + .addTo(blastFurnaceRecipes); // HfI4 // ??Hf?? + 4I = HfI4 - GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.Iodine.getFluidOrGas(4000), - null, - WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5), - 300); - GT_Values.RA.addChemicalRecipe( - WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.Iodine.get(OrePrefixes.dust, 4), - null, - null, - WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5), - 300); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1)) + .itemOutputs(WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5)) + .fluidInputs(WerkstoffMaterialPool.Iodine.getFluidOrGas(4000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs( + WerkstoffMaterialPool.LowPurityHafnium.get(OrePrefixes.dust, 1), + WerkstoffMaterialPool.Iodine.get(OrePrefixes.dust, 4)) + .itemOutputs(WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // Hf // HfI4 = Hf + 4I - GT_Values.RA.addBlastRecipe( - GT_Utility.getIntegratedCircuit(12), - WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5), - null, - WerkstoffMaterialPool.Iodine.getFluidOrGas(4000), - WerkstoffMaterialPool.Hafnium.get(OrePrefixes.ingotHot, 1), - WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dustTiny, 1), - 600, - 1920, - 3400); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(12), + WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 5)) + .itemOutputs( + WerkstoffMaterialPool.Hafnium.get(OrePrefixes.ingotHot, 1), + WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dustTiny, 1)) + .fluidOutputs(WerkstoffMaterialPool.Iodine.getFluidOrGas(4000)) + .duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 3400) + .addTo(blastFurnaceRecipes); // Hf * 9 - GT_Values.RA.addBlastRecipe( - GT_Utility.getIntegratedCircuit(13), - WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 45), - null, - WerkstoffMaterialPool.Iodine.getFluidOrGas(36000), - WerkstoffMaterialPool.Hafnium.get(OrePrefixes.ingotHot, 9), - WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dust, 1), - 5400, - 1920, - 3400); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(13), + WerkstoffMaterialPool.HafniumIodide.get(OrePrefixes.dust, 45)) + .itemOutputs( + WerkstoffMaterialPool.Hafnium.get(OrePrefixes.ingotHot, 9), + WerkstoffMaterialPool.HafniumRunoff.get(OrePrefixes.dust, 1)) + .fluidOutputs(WerkstoffMaterialPool.Iodine.getFluidOrGas(36000)) + .duration(4 * MINUTES + 30 * TICKS) + .eut(TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 3400) + .addTo(blastFurnaceRecipes); // Zirconia-Hafnia // ??HfZr?? = HfO2 + ZrO2 - GT_Values.RA.addCentrifugeRecipe( - WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 1), - null, - null, - null, - WerkstoffMaterialPool.Hafnia.get(OrePrefixes.dust, 3), - WerkstoffMaterialPool.Zirconia.get(OrePrefixes.dust, 3), - null, - null, - null, - null, - new int[] { 10000, 10000 }, - 600, - 1920); + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 1)) + .itemOutputs( + WerkstoffMaterialPool.Hafnia.get(OrePrefixes.dust, 3), + WerkstoffMaterialPool.Zirconia.get(OrePrefixes.dust, 3)) + .eut(TierEU.RECIPE_EV) + .duration(30 * SECONDS) + .addTo(centrifugeRecipes); // Ammonium Nitrate // HNO3 + NH3 = NH4NO3 - GT_Values.RA.addChemicalRecipeForBasicMachineOnly( - GT_Utility.getIntegratedCircuit(12), - Materials.NitricAcid.getCells(1), - Materials.Ammonia.getGas(1000), - WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000), - Materials.Empty.getCells(1), - null, - 30, - 400); - - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(12) }, - new FluidStack[] { Materials.NitricAcid.getFluid(1000), Materials.Ammonia.getGas(1000) }, - new FluidStack[] { WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000) }, - new ItemStack[] {}, - 30, - 400); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(12), Materials.NitricAcid.getCells(1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Ammonia.getGas(1000)) + .fluidOutputs(WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(400) + .addTo(chemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(12)) + .fluidInputs(Materials.NitricAcid.getFluid(1000), Materials.Ammonia.getGas(1000)) + .fluidOutputs(WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000)) + .duration(1 * SECONDS + 10 * TICKS) + .eut(400) + .addTo(multiblockChemicalReactorRecipes); // IODINE-START // SeaweedAsh @@ -942,99 +961,83 @@ public class RecipeLoader { WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dustSmall, 1)); // SeaweedConcentrate - GT_Values.RA.addMixerRecipe( - WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 2), - null, - null, - null, - Materials.DilutedSulfuricAcid.getFluid(1200), - WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(1200), - Materials.Calcite.getDust(1), - 600, - 240); - + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 2)) + .itemOutputs(Materials.Calcite.getDust(1)) + .fluidInputs(Materials.DilutedSulfuricAcid.getFluid(1200)) + .fluidOutputs(WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(1200)) + .duration(30 * SECONDS) + .eut(240) + .addTo(mixerRecipes); // SeaweedConcentrate * 4 - GT_Values.RA.addMixerRecipe( - WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 4), - null, - null, - null, - Materials.DilutedSulfuricAcid.getFluid(2400), - WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(2400), - Materials.Calcite.getDust(2), - 1200, - 240); + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffMaterialPool.SeaweedAsh.get(OrePrefixes.dust, 4)) + .itemOutputs(Materials.Calcite.getDust(2)) + .fluidInputs(Materials.DilutedSulfuricAcid.getFluid(2400)) + .fluidOutputs(WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(2400)) + .duration(60 * SECONDS) + .eut(240) + .addTo(mixerRecipes); // Iodine - GT_Values.RA.addCentrifugeRecipe( - Materials.Benzene.getCells(1), - null, - WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(2000), - WerkstoffMaterialPool.SeaweedByproducts.getFluidOrGas(200), - Materials.Empty.getCells(1), - WerkstoffMaterialPool.Iodine.get(OrePrefixes.dust, 1), - null, - null, - null, - null, - new int[] { 10000, 10000 }, - 760, - 480); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Benzene.getCells(1)) + .fluidInputs(WerkstoffMaterialPool.SeaweedConcentrate.getFluidOrGas(2000)) + .fluidOutputs(WerkstoffMaterialPool.SeaweedByproducts.getFluidOrGas(200)) + .eut(TierEU.RECIPE_HV) + .duration(38 * SECONDS) + .addTo(centrifugeRecipes); // IODINE-END // 2MnO2 + 2KOH + KClO3 = 2KMnO4 + H2O + KCl - GT_Values.RA.addBlastRecipe( - Materials.Pyrolusite.getDust(6), - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 6), - WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5), - null, - null, - Materials.Water.getFluid(1000), - WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12), - Materials.RockSalt.getDust(2), - null, - null, - 150, - 480, - 1200); + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.Pyrolusite.getDust(6), + GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 6), + WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5)) + .itemOutputs( + WerkstoffMaterialPool.PotassiumPermanganate.get(OrePrefixes.dust, 12), + Materials.RockSalt.getDust(2)) + .fluidOutputs(Materials.Water.getFluid(1000)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .metadata(COIL_HEAT, 1200) + .addTo(blastFurnaceRecipes); // Mn + 2O = MnO2 - GT_Values.RA.addChemicalRecipe( - Materials.Manganese.getDust(1), - GT_Utility.getIntegratedCircuit(1), - Materials.Oxygen.getGas(2000), - null, - Materials.Pyrolusite.getDust(3), - 40, - 30); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Manganese.getDust(1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(Materials.Pyrolusite.getDust(3)) + .fluidInputs(Materials.Oxygen.getGas(2000)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); // 6KOH + 6Cl = KClO3 + 5KCl + 3H2O - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 18), - GT_Utility.getIntegratedCircuit(3), - Materials.Chlorine.getGas(6000), - Materials.Water.getFluid(3000), - Materials.RockSalt.getDust(10), - WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5), - 40, - 30); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem("dreamcraft", "item.PotassiumHydroxideDust", 18), + GT_Utility.getIntegratedCircuit(3)) + .itemOutputs( + Materials.RockSalt.getDust(10), + WerkstoffMaterialPool.PotassiumChlorate.get(OrePrefixes.dust, 5)) + .fluidInputs(Materials.Chlorine.getGas(6000)) + .fluidOutputs(Materials.Water.getFluid(3000)) + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); - /* - * //Fluorosilicic Acid GT_Values.RA.addChemicalRecipe( GT_Utility.getIntegratedCircuit(1), - * Materials.SiliconDioxide.getDust(1), Materials.HydrofluoricAcid.getFluid(6000), - * WerkstoffMaterialPool.FluorosilicicAcid.getFluidOrGas(1000), null, 300, 600 ); - */ // Sodium Fluorosilicate // 2NaCl + H2SiF6 = 2HCl + Na2SiF6 - GT_Values.RA.addChemicalRecipe( - Materials.Empty.getCells(2), - Materials.Salt.getDust(4), - WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000), - WerkstoffMaterialPool.SodiumFluorosilicate.getFluidOrGas(1000), - Materials.HydrochloricAcid.getCells(2), - 600, - 450); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Empty.getCells(2), Materials.Salt.getDust(4)) + .itemOutputs(Materials.HydrochloricAcid.getCells(2)) + .fluidInputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000)) + .fluidOutputs(WerkstoffMaterialPool.SodiumFluorosilicate.getFluidOrGas(1000)) + .duration(30 * SECONDS) + .eut(450) + .addTo(UniversalChemical); // Lanthanum Oxide GT_Values.RA.stdBuilder() @@ -1079,78 +1082,69 @@ public class RecipeLoader { public static void loadLanthanideRecipes() { // Methanol // CH4O + CO + 3O =V2O5= H2C2O4 + H2O - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1) }, - new FluidStack[] { Materials.Methanol.getFluid(1000), Materials.CarbonMonoxide.getGas(1000), - Materials.Oxygen.getGas(3000) }, - new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(1000) }, - null, - 450, - 240); - - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(9), - MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1) }, - new FluidStack[] { Materials.Methanol.getFluid(9000), Materials.CarbonMonoxide.getGas(9000), - Materials.Oxygen.getGas(27000) }, - new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(9000) }, - null, - 4050, - 240); + GT_Values.RA.stdBuilder() + .itemInputs(MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)) + .fluidInputs( + Materials.Methanol.getFluid(1000), + Materials.CarbonMonoxide.getGas(1000), + Materials.Oxygen.getGas(3000)) + .fluidOutputs(MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(1000)) + .duration(22 * SECONDS + 10 * TICKS) + .eut(240) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9), MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1)) + .fluidInputs( + Materials.Methanol.getFluid(9000), + Materials.CarbonMonoxide.getGas(9000), + Materials.Oxygen.getGas(27000)) + .fluidOutputs(MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(9000)) + .duration(3 * MINUTES + 22 * SECONDS + 10 * TICKS) + .eut(240) + .addTo(multiblockChemicalReactorRecipes); // Ethanol // C2H6O + 5O =V2O5= H2C2O4 + 2H2O - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1) }, - new FluidStack[] { Materials.Ethanol.getFluid(1000), Materials.Oxygen.getGas(5000) }, - new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(2000) }, - null, - 450, - 240); - - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(9), - MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1) }, - new FluidStack[] { Materials.Ethanol.getFluid(9000), Materials.Oxygen.getGas(45000) }, - new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(18000) }, - null, - 4050, - 240); - - // GT_Values.RA.addChemicalRecipe( - // GT_Utility.getIntegratedCircuit(2), - // WerkstoffMaterialPool.CeriumDioxide - // - // ) + GT_Values.RA.stdBuilder() + .itemInputs(MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)) + .itemOutputs() + .fluidInputs(Materials.Ethanol.getFluid(1000), Materials.Oxygen.getGas(5000)) + .fluidOutputs(MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(2000)) + .duration(22 * SECONDS + 10 * TICKS) + .eut(240) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(9), MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1)) + .fluidInputs(Materials.Ethanol.getFluid(9000), Materials.Oxygen.getGas(45000)) + .fluidOutputs(MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(18000)) + .duration(3 * MINUTES + 22 * SECONDS + 10 * TICKS) + .eut(240) + .addTo(multiblockChemicalReactorRecipes); // Cerium Oxalate // 2CeCl3 + 3H2C2O4 = 6HCl + Ce2(C2O4)3 - GT_Values.RA.addChemicalRecipe( - GT_Utility.getIntegratedCircuit(1), - WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 8), - MyMaterial.oxalate.getFluidOrGas(3000), - Materials.HydrochloricAcid.getFluid(6000), - WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 5), - null, - 300, - 450); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_Utility.getIntegratedCircuit(1), + WerkstoffMaterialPool.CeriumChloride.get(OrePrefixes.dust, 8)) + .itemOutputs(WerkstoffMaterialPool.CeriumOxalate.get(OrePrefixes.dust, 5)) + .fluidInputs(MyMaterial.oxalate.getFluidOrGas(3000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(6000)) + .duration(15 * SECONDS) + .eut(450) + .addTo(UniversalChemical); // Cerium // Ce2O3 = 2Ce + 3O - GT_Values.RA.addElectrolyzerRecipe( - WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust, 5), - null, - null, - Materials.Oxygen.getFluid(3000), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cerium, 2), - null, - null, - null, - null, - null, - new int[] { 10000 }, - 150, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffMaterialPool.CeriumIIIOxide.get(OrePrefixes.dust, 5)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cerium, 2)) + .fluidOutputs(Materials.Oxygen.getGas(3000)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(electrolyzerRecipes); // CHAIN BEGIN // MONAZITE @@ -1161,7 +1155,7 @@ public class RecipeLoader { .itemOutputs(Materials.SiliconDioxide.getDust(1)) .eut(1920) .duration(400) - .specialValue(800) + .metadata(COIL_HEAT, 800) .addTo(digesterRecipes); GT_Values.RA.stdBuilder() @@ -1176,7 +1170,7 @@ public class RecipeLoader { Materials.Monazite.getDustTiny(2)) .eut(480) .duration(900) - .specialValue(10) + .metadata(DISSOLUTION_TANK_RATIO, 10) .noOptimize() .addTo(dissolutionTankRecipes); @@ -1192,339 +1186,283 @@ public class RecipeLoader { Materials.Monazite.getDust(2)) .eut(480) .duration(8100) - .specialValue(10) + .metadata(DISSOLUTION_TANK_RATIO, 10) .noOptimize() .addTo(dissolutionTankRecipes); - sifterRecipes.addRecipe( - false, - null, - new ItemStack[] { WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1), - Materials.SiliconDioxide.getDust(1), Materials.Rutile.getDust(1), - WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), Materials.Ilmenite.getDust(1) }, - null, - new int[] { 9000, 7500, 2000, 500, 2000 }, - new FluidStack[] { WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(1000) }, - null, - 400, - 240, - 0); - - GT_Values.RA.addMixerRecipe( - WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1), - null, - null, - null, - null, - null, - Materials.Water.getFluid(6000), - WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(7000), - null, - 480, - 400); - - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(13) }, - new FluidStack[] { WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(1000), - WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(200) }, - null, - new ItemStack[] { WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3), }, - 480, - 480); - - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { GT_Utility.getIntegratedCircuit(14) }, - new FluidStack[] { WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(9000), - WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1800) }, - null, - new ItemStack[] { WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 3), }, - 4320, - 480); - - GT_Values.RA.addSifterRecipe( - WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 1), - new ItemStack[] { WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1) }, - new int[] { 9000, 7000 }, - 600, - 256); - - GT_Values.RA.addBlastRecipe( - WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1), - null, - null, - null, - WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust, 1), - null, - 300, - 128, - 1500); - - GT_Values.RA.addThermalCentrifugeRecipe( - WerkstoffMaterialPool.ThoriumPhosphateConcentrate.get(OrePrefixes.dust), - Materials.Thorium.getDust(1), - Materials.Phosphate.getDust(1), - null, - new int[] { 10000, 10000 }, - 200, - 480); - - GT_Values.RA.addChemicalBathRecipe( - WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), - WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(320), - WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), - null, - null, - new int[] { 10000 }, - 120, - 240); - - GT_Values.RA.addSifterRecipe( - WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1), - new ItemStack[] { WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1), + + GT_Values.RA.stdBuilder() + .fluidInputs(WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(1000)) + .itemOutputs( + WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1), + Materials.SiliconDioxide.getDust(1), + Materials.Rutile.getDust(1), + WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), + Materials.Ilmenite.getDust(1)) + .outputChances(90_00, 75_00, 20_00, 5_00, 20_00) + .duration(20 * SECONDS) + .eut(240) + .noOptimize() + .addTo(sifterRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1)) + .fluidInputs(Materials.Water.getFluid(6000)) + .fluidOutputs(WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(7000)) + .duration(24 * SECONDS) + .eut(400) + .addTo(mixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(13)) + .itemOutputs(WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3)) + .fluidInputs( + WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(1000), + WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(200)) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(multiblockChemicalReactorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(14)) + .itemOutputs(WerkstoffMaterialPool.Acid