From 1d2b10a41722ff9e0340061879f069792936b13c Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Sun, 11 Aug 2024 04:10:55 +0200 Subject: Fix QFT recipes (#2862) * fix qft chances in recipes * fix qft frontend * remove cry about it catch --- .../loader/NaquadahReworkRecipeLoader.java | 184 ++++++++++----------- 1 file changed, 88 insertions(+), 96 deletions(-) (limited to 'src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java') diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 46521fcaa1..292c972edf 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -92,102 +92,94 @@ public class NaquadahReworkRecipeLoader { if (!EnableNaquadahRework) return; - try { - // Naquadah (UEV) - GT_Values.RA.stdBuilder() - .itemInputs( - naquadahEarth.get(OrePrefixes.dust, 32), - Materials.Sodium.getDust(64), - Materials.Carbon.getDust(1), - GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) - .itemOutputs( - inertNaquadah.get(OrePrefixes.dust, 1), - Materials.Titanium.getDust(64), - Materials.Adamantium.getDust(64), - Materials.Gallium.getDust(64)) - .outputChances(2500, 2500, 2500, 2500) - .fluidInputs( - Materials.Hydrogen.getGas(64000L), - Materials.Fluorine.getGas(64000L), - Materials.Oxygen.getGas(100L)) - .duration(10 * SECONDS) - .eut(GT_Values.VP[10]) - .metadata(QFT_FOCUS_TIER, 2) - .addTo(quantumForceTransformerRecipes); - // Enriched Naquadah (UIV) - GT_Values.RA.stdBuilder() - .itemInputs( - enrichedNaquadahEarth.get(OrePrefixes.dust, 32), - Materials.Zinc.getDust(64), - Materials.Carbon.getDust(1), - GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) - .itemOutputs(inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64)) - .outputChances(3300, 3300, 3300) - .fluidInputs(Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L)) - .fluidOutputs(wasteLiquid.getFluidOrGas(32000)) - .duration(10 * SECONDS) - .eut(GT_Values.VP[11]) - .metadata(QFT_FOCUS_TIER, 2) - .addTo(quantumForceTransformerRecipes); - // Naquadria (UMV) - GT_Values.RA.stdBuilder() - .itemInputs( - naquadriaEarth.get(OrePrefixes.dust, 32), - Materials.Magnesium.getDust(64), - GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)) - .itemOutputs( - inertNaquadria.get(OrePrefixes.dust, 1), - Materials.Barium.getDust(64), - Materials.Indium.getDust(64), - ItemList.NaquadriaSupersolid.get(1)) - .outputChances(2500, 2500, 2500, 2500) - .fluidInputs( - Materials.PhosphoricAcid.getFluid(16000), - Materials.SulfuricAcid.getFluid(16000), - Materials.Oxygen.getGas(100L)) - .duration(5 * SECONDS) - .eut(GT_Values.VP[12]) - .metadata(QFT_FOCUS_TIER, 3) - .addTo(quantumForceTransformerRecipes); - - // Activate Them - - GT_Values.RA.stdBuilder() - .itemInputs(inertNaquadah.get(OrePrefixes.dust, 64), inertNaquadah.get(OrePrefixes.dust, 32)) - .itemOutputs(Materials.Nickel.getDust(16)) - .fluidInputs(Materials.Nickel.getPlasma(144 * 16)) - .fluidOutputs(Materials.Naquadah.getMolten(144 * 9216)) - .duration(1 * MINUTES + 40 * SECONDS) - .eut(0) - .metadata(NKE_RANGE, computeRangeNKE(600, 500)) - .noOptimize() - .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - inertEnrichedNaquadah.get(OrePrefixes.dust, 64), - inertEnrichedNaquadah.get(OrePrefixes.dust, 32)) - .itemOutputs(Materials.Titanium.getDust(16)) - .fluidInputs(Materials.Titanium.getPlasma(16 * 144)) - .fluidOutputs(Materials.NaquadahEnriched.getMolten(144 * 9216)) - .duration(1 * MINUTES + 40 * SECONDS) - .eut(0) - .metadata(NKE_RANGE, computeRangeNKE(900, 850)) - .noOptimize() - .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(inertNaquadria.get(OrePrefixes.dust, 64), inertNaquadria.get(OrePrefixes.dust, 32)) - .itemOutputs(Materials.Americium.getDust(16)) - .fluidInputs(Materials.Americium.getPlasma(144 * 16)) - .fluidOutputs(Materials.Naquadria.getMolten(144 * 9216)) - .duration(1 * MINUTES + 40 * SECONDS) - .eut(0) - .metadata(NKE_RANGE, computeRangeNKE(1100, 1080)) - .noOptimize() - .addTo(neutronActivatorRecipes); - - } catch (Throwable t) { - // Cry about it - } + // Naquadah (UEV) + GT_Values.RA.stdBuilder() + .itemInputs( + naquadahEarth.get(OrePrefixes.dust, 32), + Materials.Sodium.getDust(64), + Materials.Carbon.getDust(1), + GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) + .itemOutputs( + inertNaquadah.get(OrePrefixes.dust, 1), + Materials.Titanium.getDust(64), + Materials.Adamantium.getDust(64), + Materials.Gallium.getDust(64)) + .fluidInputs( + Materials.Hydrogen.getGas(64000L), + Materials.Fluorine.getGas(64000L), + Materials.Oxygen.getGas(100L)) + .duration(10 * SECONDS) + .eut(GT_Values.VP[10]) + .metadata(QFT_FOCUS_TIER, 2) + .addTo(quantumForceTransformerRecipes); + // Enriched Naquadah (UIV) + GT_Values.RA.stdBuilder() + .itemInputs( + enrichedNaquadahEarth.get(OrePrefixes.dust, 32), + Materials.Zinc.getDust(64), + Materials.Carbon.getDust(1), + GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) + .itemOutputs(inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64)) + .fluidInputs(Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L)) + .fluidOutputs(wasteLiquid.getFluidOrGas(32000)) + .duration(10 * SECONDS) + .eut(GT_Values.VP[11]) + .metadata(QFT_FOCUS_TIER, 2) + .addTo(quantumForceTransformerRecipes); + // Naquadria (UMV) + GT_Values.RA.stdBuilder() + .itemInputs( + naquadriaEarth.get(OrePrefixes.dust, 32), + Materials.Magnesium.getDust(64), + GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)) + .itemOutputs( + inertNaquadria.get(OrePrefixes.dust, 1), + Materials.Barium.getDust(64), + Materials.Indium.getDust(64), + ItemList.NaquadriaSupersolid.get(1)) + .fluidInputs( + Materials.PhosphoricAcid.getFluid(16000), + Materials.SulfuricAcid.getFluid(16000), + Materials.Oxygen.getGas(100L)) + .duration(5 * SECONDS) + .eut(GT_Values.VP[12]) + .metadata(QFT_FOCUS_TIER, 3) + .addTo(quantumForceTransformerRecipes); + + // Activate Them + + GT_Values.RA.stdBuilder() + .itemInputs(inertNaquadah.get(OrePrefixes.dust, 64), inertNaquadah.get(OrePrefixes.dust, 32)) + .itemOutputs(Materials.Nickel.getDust(16)) + .fluidInputs(Materials.Nickel.getPlasma(144 * 16)) + .fluidOutputs(Materials.Naquadah.getMolten(144 * 9216)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(0) + .metadata(NKE_RANGE, computeRangeNKE(600, 500)) + .noOptimize() + .addTo(neutronActivatorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + inertEnrichedNaquadah.get(OrePrefixes.dust, 64), + inertEnrichedNaquadah.get(OrePrefixes.dust, 32)) + .itemOutputs(Materials.Titanium.getDust(16)) + .fluidInputs(Materials.Titanium.getPlasma(16 * 144)) + .fluidOutputs(Materials.NaquadahEnriched.getMolten(144 * 9216)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(0) + .metadata(NKE_RANGE, computeRangeNKE(900, 850)) + .noOptimize() + .addTo(neutronActivatorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(inertNaquadria.get(OrePrefixes.dust, 64), inertNaquadria.get(OrePrefixes.dust, 32)) + .itemOutputs(Materials.Americium.getDust(16)) + .fluidInputs(Materials.Americium.getPlasma(144 * 16)) + .fluidOutputs(Materials.Naquadria.getMolten(144 * 9216)) + .duration(1 * MINUTES + 40 * SECONDS) + .eut(0) + .metadata(NKE_RANGE, computeRangeNKE(1100, 1080)) + .noOptimize() + .addTo(neutronActivatorRecipes); // Fix shit GT_Values.RA.stdBuilder() -- cgit