From de0452c4d800d671bc38757c85966850cfd4b8b2 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:37:02 +0100 Subject: Fix full amp recipes (#2930) * round 1 * RS-AL recipes * round 3 with a bit of cleanup * round 4 --------- Co-authored-by: Martin Robertz --- .../loaders/recipe/RecipeLoader_GlueLine.java | 8 +++--- .../recipe/RecipeLoader_MolecularTransformer.java | 2 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 30 +++++++++++----------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java index 40cf569df6..da4a68d7f5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java @@ -62,7 +62,7 @@ public class RecipeLoader_GlueLine { FluidUtils.getFluidStack("methylacetate", 1000)) .fluidOutputs(MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000)) .duration(10 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); GT_Values.RA.stdBuilder() @@ -129,7 +129,7 @@ public class RecipeLoader_GlueLine { FluidUtils.getFluidStack(BioRecipes.mFormaldehyde, 100)) .fluidOutputs(MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100), FluidUtils.getWater(1000)) .duration(10 * SECONDS) - .eut(8000) + .eut(TierEU.RECIPE_IV) .metadata(CHEMPLANT_CASING_TIER, 5) .addTo(chemicalPlantRecipes); // CH4 + NH3 + 3O = HCN + 3H2O @@ -141,7 +141,7 @@ public class RecipeLoader_GlueLine { FluidUtils.getFluidStack("oxygen", 6000)) .fluidOutputs(MISC_MATERIALS.HYDROGEN_CYANIDE.getFluidStack(2000), FluidUtils.getWater(6000)) .duration(10 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .metadata(CHEMPLANT_CASING_TIER, 3) .addTo(chemicalPlantRecipes); @@ -234,7 +234,7 @@ public class RecipeLoader_GlueLine { .fluidInputs(MISC_MATERIALS.CYANOACRYLATE_POLYMER.getFluidStack(100)) .fluidOutputs(MISC_MATERIALS.ETHYL_CYANOACRYLATE.getFluidStack(100)) .duration(45 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(fluidHeaterRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java index df9ef3b1b3..b1d71ca120 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java @@ -80,7 +80,7 @@ public class RecipeLoader_MolecularTransformer { .itemInputs(GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 4)) .itemOutputs(GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9)) .duration(1 * TICKS) - .eut(1996080) + .eut(TierEU.RECIPE_UHV) .addTo(molecularTransformerRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java index e6e529ff3a..d8faac834d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java @@ -82,7 +82,7 @@ public class RecipeLoader_Nuclear { .itemInputs(FLUORIDES.LITHIUM_FLUORIDE.getDust(4), FLUORIDES.BERYLLIUM_FLUORIDE.getDust(3)) .itemOutputs(NUCLIDE.Li2BeF4.getDust(7)) .duration(2 * MINUTES + 20 * SECONDS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .metadata(COIL_HEAT, 3000) .addTo(blastFurnaceRecipes); @@ -389,7 +389,7 @@ public class RecipeLoader_Nuclear { .itemOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 400)) .fluidOutputs(aHydrogenChloride) - .eut(500) + .eut(TierEU.RECIPE_HV) .duration(15 * SECONDS) .addTo(chemicalDehydratorRecipes); @@ -401,7 +401,7 @@ public class RecipeLoader_Nuclear { .itemOutputs(FLUORIDES.ZIRCONIUM_TETRAFLUORIDE.getDust(1)) .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid_gt5u", 800)) .fluidOutputs(aHydrogenChloride) - .eut(500) + .eut(TierEU.RECIPE_HV) .duration(30 * SECONDS) .addTo(chemicalDehydratorRecipes); @@ -497,7 +497,7 @@ public class RecipeLoader_Nuclear { .itemInputs(NUCLIDE.Li2BeF4.getDust(1)) .fluidOutputs(NUCLIDE.Li2BeF4.getFluidStack(144)) .duration(5 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(fluidExtractionRecipes); // Lithium Fluoride @@ -505,7 +505,7 @@ public class RecipeLoader_Nuclear { .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 1)) .fluidOutputs(FLUORIDES.LITHIUM_FLUORIDE.getFluidStack(144)) .duration(5 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(fluidExtractionRecipes); // LFTR Fuel 1 @@ -527,7 +527,7 @@ public class RecipeLoader_Nuclear { .itemInputs(NUCLIDE.LiFBeF2ThF4UF4.getDust(1)) .fluidOutputs(NUCLIDE.LiFBeF2ThF4UF4.getFluidStack(144)) .duration(7 * SECONDS + 10 * TICKS) - .eut(2000) + .eut(TierEU.RECIPE_EV) .addTo(fluidExtractionRecipes); // ZIRCONIUM_TETRAFLUORIDE @@ -640,7 +640,7 @@ public class RecipeLoader_Nuclear { .fluidInputs(FluidUtils.getFluidStack("hydrofluoricacid", 10000)) .fluidOutputs(FLUORIDES.URANIUM_TETRAFLUORIDE.getFluidStack(3600)) .duration(2 * MINUTES + 30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); } @@ -658,7 +658,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustHafnium", 1)) .outputChances(5000, 278, 1000, 1000, 300, 300) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedTin", 1)) @@ -671,7 +671,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)) .outputChances(10000, 556, 1500, 1000, 500, 500) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedCassiterite", 1)) @@ -684,7 +684,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1)) .outputChances(10000, 556, 1500, 1000, 500, 500) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); // Radium GT_Values.RA.stdBuilder() @@ -698,7 +698,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)) .outputChances(10000, 500, 300, 200, 100, 100) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUranium", 1)) @@ -711,7 +711,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)) .outputChances(10000, 556, 1000, 500, 500, 500) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUraninite", 1)) @@ -724,7 +724,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)) .outputChances(10000, 556, 500, 250, 250, 250) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); GT_Values.RA.stdBuilder() .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPitchblende", 1)) @@ -737,7 +737,7 @@ public class RecipeLoader_Nuclear { ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1)) .outputChances(10000, 556, 500, 250, 250, 250) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(sifterRecipes); } @@ -747,7 +747,7 @@ public class RecipeLoader_Nuclear { .itemInputs(FLUORIDES.SODIUM_FLUORIDE.getDust(1)) .fluidOutputs(FLUORIDES.SODIUM_FLUORIDE.getFluidStack(144)) .duration(30 * SECONDS) - .eut(500) + .eut(TierEU.RECIPE_HV) .addTo(fluidHeaterRecipes); } } -- cgit