From ae82f4f644fc969ee2d7df370e0b053664ff4b8c Mon Sep 17 00:00:00 2001 From: Daniel Mendes <70096037+Steelux8@users.noreply.github.com> Date: Wed, 14 Jun 2023 12:01:46 +0100 Subject: Make the New Plasma Powergen Chains Viable (#669) * Buff Celestial Tungsten Plasma fuel value to 720M * Change mk1 chain values * Change mk2 chain values * Change mk3 chain values * Correct krypton plasma output * spotlessApply (#670) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../xmod/gregtech/loaders/RecipeGen_Plasma.java | 2 +- .../loaders/recipe/RecipeLoader_Nuclear.java | 55 +++++++++++----------- 2 files changed, 29 insertions(+), 28 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java index 1ce0a0524f..22d3e689da 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java @@ -46,7 +46,7 @@ public class RecipeGen_Plasma extends RecipeGen_Base { case "Runite": GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aPlasmaCell), aContainerItem, 350_000, 4); case "CelestialTungsten": - GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aPlasmaCell), aContainerItem, 600_000, 4); + GT_Values.RA.addFuel(GT_Utility.copyAmount(1L, aPlasmaCell), aContainerItem, 720_000, 4); default: GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aPlasmaCell), 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 7814d3998c..9de15dc65e 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 @@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFusionRecipes; 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 net.minecraft.item.ItemStack; @@ -483,58 +484,58 @@ public class RecipeLoader_Nuclear { private static void fusionChainRecipes() { // Mk1 GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Boron.getPlasma(100), Materials.Calcium.getPlasma(100)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 100)).duration(3 * SECONDS) - .eut(TierEU.RECIPE_LuV).metadata(FUSION_THRESHOLD, 100000000).addTo(sFusionRecipes); + .fluidInputs(Materials.Boron.getPlasma(144), Materials.Calcium.getPlasma(16)) + .fluidOutputs(new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 1000)) + .duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LuV).metadata(FUSION_THRESHOLD, 100000000) + .addTo(sFusionRecipes); GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() .fluidInputs( - new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 100), - Materials.Bedrockium.getMolten(1000)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 100)).duration(3 * SECONDS) - .eut(TierEU.RECIPE_LuV).metadata(FUSION_THRESHOLD, 100000000).addTo(sFusionRecipes); + new FluidStack(ELEMENT.getInstance().NEON.getPlasma(), 144), + Materials.Bedrockium.getMolten(144)) + .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 1000)) + .duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LuV).metadata(FUSION_THRESHOLD, 100000000) + .addTo(sFusionRecipes); // Mk2 GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(Materials.Niobium.getPlasma(100), Materials.Zinc.getPlasma(100)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().KRYPTON.getPlasma(), 100)).duration(3 * SECONDS) + .fluidInputs(Materials.Niobium.getPlasma(144), Materials.Zinc.getPlasma(144)) + .fluidOutputs(new FluidStack(ELEMENT.getInstance().KRYPTON.getPlasma(), 144)).duration(32 * TICKS) .eut(TierEU.RECIPE_ZPM).metadata(FUSION_THRESHOLD, 300000000).addTo(sFusionRecipes); GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() .fluidInputs( - new FluidStack(ELEMENT.getInstance().KRYPTON.getPlasma(), 100), - new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 100)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 100)).duration(3 * SECONDS) + new FluidStack(ELEMENT.getInstance().KRYPTON.getPlasma(), 144), + new FluidStack(ELEMENT.STANDALONE.FORCE.getPlasma(), 1000)) + .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 1000)).duration(32 * TICKS) .eut(TierEU.RECIPE_ZPM).metadata(FUSION_THRESHOLD, 300000000).addTo(sFusionRecipes); GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() .fluidInputs( - new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 100), - new FluidStack(ALLOY.TITANSTEEL.getFluid(), 1000)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.RUNITE.getPlasma(), 100)).duration(3 * SECONDS) + new FluidStack(ELEMENT.STANDALONE.ASTRAL_TITANIUM.getPlasma(), 144), + new FluidStack(ALLOY.TITANSTEEL.getFluid(), 8)) + .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.RUNITE.getPlasma(), 1000)).duration(32 * TICKS) .eut(TierEU.RECIPE_ZPM).metadata(FUSION_THRESHOLD, 300000000).addTo(sFusionRecipes); // Mk3 GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() - .fluidInputs(ELEMENT.getInstance().CURIUM.getFluidStack(100), Materials.Americium.getPlasma(100)) - .fluidOutputs(new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 100)).duration(3 * SECONDS) + .fluidInputs(ELEMENT.getInstance().CURIUM.getFluidStack(144), Materials.Americium.getPlasma(144)) + .fluidOutputs(new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 144)).duration(16 * TICKS) .eut(TierEU.RECIPE_UV).metadata(FUSION_THRESHOLD, 500000000).addTo(sFusionRecipes); GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() .fluidInputs( - new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 100), - new FluidStack(ELEMENT.STANDALONE.RUNITE.getPlasma(), 100)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 100)) - .duration(3 * SECONDS).eut(TierEU.RECIPE_UV).metadata(FUSION_THRESHOLD, 500000000) - .addTo(sFusionRecipes); + new FluidStack(ELEMENT.getInstance().XENON.getPlasma(), 144), + new FluidStack(ELEMENT.STANDALONE.RUNITE.getPlasma(), 1000)) + .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 1000)) + .duration(16 * TICKS).eut(TierEU.RECIPE_UV).metadata(FUSION_THRESHOLD, 500000000).addTo(sFusionRecipes); GT_Values.RA.stdBuilder().noItemInputs().noItemOutputs() .fluidInputs( - new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 100), - Materials.Tartarite.getMolten(1000)) - .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 100)) - .duration(3 * SECONDS).eut(TierEU.RECIPE_UV).metadata(FUSION_THRESHOLD, 500000000) - .addTo(sFusionRecipes); + new FluidStack(ELEMENT.STANDALONE.ADVANCED_NITINOL.getPlasma(), 144), + Materials.Tartarite.getMolten(8)) + .fluidOutputs(new FluidStack(ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getPlasma(), 1000)) + .duration(16 * TICKS).eut(TierEU.RECIPE_UV).metadata(FUSION_THRESHOLD, 500000000).addTo(sFusionRecipes); } private static void macerator() { -- cgit