From f4ed70933bb3130b528cde22e166f64f5eaa4c8d Mon Sep 17 00:00:00 2001
From: Steelux <70096037+Steelux8@users.noreply.github.com>
Date: Thu, 22 Dec 2022 16:03:23 +0000
Subject: Tweak QFT Recipe Inputs and Tiers (#115)

* Tweak QFT Recipe Inputs and Tiers

- Simplified Fluoroantimonic Acid and P507 to their components, to minimize the amount of LCRs needed for these skips;
- Changed the last naqline skip to not be tier 4;
- Halved recipe times because these energy tiers are higher than the ones on the QFT's PR, which will also be changed in a similar way.

* spotlessApply (#116)

Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>

* Requested Changes

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../loader/NaquadahReworkRecipeLoader.java         | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 08685d0b70..efd6fe7c4e 100644
--- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -46,10 +46,15 @@ public class NaquadahReworkRecipeLoader {
                 CORE.RA.addQuantumTransformerRecipe(
                         new ItemStack[] {
                             naquadahEarth.get(OrePrefixes.dust, 32),
-                            Materials.SodiumHydroxide.getDust(64),
+                            Materials.Sodium.getDust(64),
+                            Materials.Carbon.getDust(1),
                             GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)
                         },
-                        new FluidStack[] {fluoroantimonicAcid.getFluidOrGas(16000), P507.getFluidOrGas(10)},
+                        new FluidStack[] {
+                            Materials.Hydrogen.getGas(64000L),
+                            Materials.Fluorine.getGas(64000L),
+                            Materials.Oxygen.getGas(100L)
+                        },
                         new FluidStack[] {},
                         new ItemStack[] {
                             inertNaquadah.get(OrePrefixes.dust, 64),
@@ -58,17 +63,18 @@ public class NaquadahReworkRecipeLoader {
                             Materials.Gallium.getDust(64)
                         },
                         new int[] {2500, 2500, 2500, 2500},
-                        20 * 20,
-                        (int) GT_Values.VP[9],
+                        10 * 20,
+                        (int) GT_Values.VP[10],
                         2);
                 // Enriched Naquadah (UIV)
                 CORE.RA.addQuantumTransformerRecipe(
                         new ItemStack[] {
                             enrichedNaquadahEarth.get(OrePrefixes.dust, 32),
                             Materials.Zinc.getDust(64),
+                            Materials.Carbon.getDust(1),
                             GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)
                         },
-                        new FluidStack[] {Materials.SulfuricAcid.getFluid(16000), P507.getFluidOrGas(10)},
+                        new FluidStack[] {Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L)},
                         new FluidStack[] {wasteLiquid.getFluidOrGas(32000)},
                         new ItemStack[] {
                             inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
@@ -76,9 +82,9 @@ public class NaquadahReworkRecipeLoader {
                             ItemList.NaquadriaSupersolid.get(1)
                         },
                         new int[] {3300, 3300, 3300},
-                        20 * 20,
+                        10 * 20,
                         (int) GT_Values.VP[11],
-                        3);
+                        2);
                 // Naquadria (UMV)
                 CORE.RA.addQuantumTransformerRecipe(
                         new ItemStack[] {
@@ -89,7 +95,7 @@ public class NaquadahReworkRecipeLoader {
                         new FluidStack[] {
                             Materials.PhosphoricAcid.getFluid(16000),
                             Materials.SulfuricAcid.getFluid(16000),
-                            P507.getFluidOrGas(10)
+                            Materials.Oxygen.getGas(100L)
                         },
                         new FluidStack[] {},
                         new ItemStack[] {
@@ -98,9 +104,9 @@ public class NaquadahReworkRecipeLoader {
                             Materials.Indium.getDust(64)
                         },
                         new int[] {3300, 3300, 3300},
-                        20 * 20,
+                        5 * 20,
                         (int) GT_Values.VP[12],
-                        4);
+                        3);
                 // Activate Them
                 MyRecipeAdder.instance.addNeutronActivatorRecipe(
                         new FluidStack[] {Materials.Nickel.getPlasma(2880)},
-- 
cgit