add logs for Nq recipes being patched by GG for its naq changes (#3124)

3 files changed, 270 insertions, 410 deletions

diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 1e9d573252..55ed9296db 100644
--- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -34,7 +34,6 @@ import static goodgenerator.items.GGMaterial.titaniumTrifluoride;
 import static goodgenerator.items.GGMaterial.towEthyl1Hexanol;
 import static goodgenerator.items.GGMaterial.triniumSulphate;
 import static goodgenerator.items.GGMaterial.wasteLiquid;
-import static goodgenerator.main.GGConfigLoader.EnableNaquadahRework;
 import static goodgenerator.util.MyRecipeAdder.computeRangeNKE;
 import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes;
 import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
@@ -90,8 +89,6 @@ public class NaquadahReworkRecipeLoader {
 
     public static void RecipeLoad() {
 
-        if (!EnableNaquadahRework) return;
-
         // Naquadah (UEV)
         GTValues.RA.stdBuilder()
             .itemInputs(
@@ -580,71 +577,41 @@ public class NaquadahReworkRecipeLoader {
             .addTo(vacuumFreezerRecipes);
     }
 
-    public static void SmallRecipeChange() {
-
-        GTRecipe tRecipe;
-
-        tRecipe = RecipeMaps.chemicalReactorRecipes.findRecipe(
-            null,
-            false,
-            1 << 30,
-            new FluidStack[] { Materials.SulfuricAcid.getFluid(500) },
-            GTOreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16),
-            ItemList.Empty_Board_Elite.get(2));
-        if (tRecipe != null) {
-            RecipeMaps.chemicalReactorRecipes.getBackend()
-                .removeRecipe(tRecipe);
-            GTRecipe tRecipe2 = tRecipe.copy();
-            tRecipe2.mInputs = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8),
-                ItemList.Empty_Board_Elite.get(2) };
-            RecipeMaps.chemicalReactorRecipes.add(tRecipe2);
-            RecipeMaps.chemicalReactorRecipes.getBackend()
-                .reInit();
+    public static String displayRecipe(GTRecipe recipe) {
+        StringBuilder result = new StringBuilder();
+        // item inputs
+        result.append("Item inputs: ");
+        for (ItemStack itemstack : recipe.mInputs) {
+            result.append(itemstack.getUnlocalizedName());
+            result.append(", ");
+        }
+
+        // fluid inputs
+        result.append(" Fluid inputs: ");
+        for (FluidStack fluidStack : recipe.mFluidInputs) {
+            result.append(fluidStack.getUnlocalizedName());
+            result.append(", ");
         }
 
-        tRecipe = RecipeMaps.multiblockChemicalReactorRecipes.findRecipe(
-            null,
-            false,
-            1 << 30,
-            new FluidStack[] { Materials.SulfuricAcid.getFluid(500) },
-            GTOreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16),
-            ItemList.Empty_Board_Elite.get(2));
-        if (tRecipe != null) {
-            RecipeMaps.multiblockChemicalReactorRecipes.getBackend()
-                .removeRecipe(tRecipe);
-            GTRecipe tRecipe2 = tRecipe.copy();
-            tRecipe2.mInputs = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8),
-                ItemList.Empty_Board_Elite.get(2) };
-            RecipeMaps.multiblockChemicalReactorRecipes.add(tRecipe2);
-            RecipeMaps.multiblockChemicalReactorRecipes.getBackend()
-                .reInit();
+        // item outputs
+        result.append(" Item outputs: ");
+        for (ItemStack itemstack : recipe.mOutputs) {
+            result.append(itemstack.getUnlocalizedName());
+            result.append(", ");
         }
 
-        tRecipe = RecipeMaps.assemblerRecipes.findRecipe(
-            null,
-            false,
-            1 << 30,
-            new FluidStack[] { Materials.Polybenzimidazole.getMolten(36) },
-            GTOreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2),
-            GTOreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 1),
-            GTUtility.getIntegratedCircuit(1));
-        if (tRecipe != null) {
-            RecipeMaps.assemblerRecipes.getBackend()
-                .removeRecipe(tRecipe);
-            GTRecipe tRecipe2 = tRecipe.copy();
-            tRecipe2.mInputs = new ItemStack[] {
-                GTOreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2),
-                GTOreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahEnriched, 1) };
-            RecipeMaps.assemblerRecipes.add(tRecipe2);
-            RecipeMaps.assemblerRecipes.getBackend()
-                .reInit();
+        // fluid outputs
+        result.append(" Fluid outputs: ");
+        for (FluidStack fluidStack : recipe.mFluidOutputs) {
+            result.append(fluidStack.getUnlocalizedName());
+            result.append(", ");
         }
+
+        return result.toString();
     }
 
     public static void Remover() {
 
-        if (!EnableNaquadahRework) return;
-
         GTLog.out.print(GoodGenerator.MOD_ID + ": Begin to remove pure Naquadah, Enriched Naquadah and Naquadria.\n");
 
         HashSet<GTRecipe> remove = new HashSet<>(5000);
@@ -653,46 +620,20 @@ public class NaquadahReworkRecipeLoader {
         // For Crusher
         for (GTRecipe recipe : RecipeMaps.maceratorRecipes.getAllRecipes()) {
             ItemStack input = recipe.mInputs[0];
-            if (GTUtility.isStackValid(input)) {
-                int[] oreDict = OreDictionary.getOreIDs(input);
-                for (int oreDictID : oreDict) {
-                    if ((OreDictionary.getOreName(oreDictID)
-                        .startsWith("ore")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("rawOre")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("crushed"))
-                        && OreDictionary.getOreName(oreDictID)
-                            .contains("Naq")) {
-                        GTRecipe tRecipe = recipe.copy();
-                        boolean modified = false;
-                        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                            if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
-                            if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            }
-                        }
-                        if (modified) {
-                            reAdd.add(tRecipe);
-                            remove.add(recipe);
-                        }
-                        break;
-                    }
+            if (!GTUtility.isStackValid(input)) continue;
+
+            int[] oreDict = OreDictionary.getOreIDs(input);
+            for (int oreDictID : oreDict) {
+                String oreDictName = OreDictionary.getOreName(oreDictID);
+                if (!((oreDictName.startsWith("ore") || oreDictName.startsWith("rawOre")
+                    || oreDictName.startsWith("crushed")) && oreDictName.contains("Naq"))) {
+                    continue;
                 }
+
+                processRecipe(remove, reAdd, recipe);
+                break;
             }
+
         }
         RecipeMaps.maceratorRecipes.getBackend()
             .removeRecipes(remove);
@@ -710,42 +651,18 @@ public class NaquadahReworkRecipeLoader {
         // For Washer
         for (GTRecipe recipe : RecipeMaps.oreWasherRecipes.getAllRecipes()) {
             ItemStack input = recipe.mInputs[0];
-            if (GTUtility.isStackValid(input)) {
-                int[] oreDict = OreDictionary.getOreIDs(input);
-                for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("crushed")
-                        && OreDictionary.getOreName(oreDictID)
-                            .contains("Naq")) {
-                        GTRecipe tRecipe = recipe.copy();
-                        boolean modified = false;
-                        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                            if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
-                            if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            }
-                        }
-                        if (modified) {
-                            reAdd.add(tRecipe);
-                            remove.add(recipe);
-                        }
-                        break;
-                    }
-                }
+            if (!GTUtility.isStackValid(input)) continue;
+
+            int[] oreDict = OreDictionary.getOreIDs(input);
+            for (int oreDictID : oreDict) {
+                String oredictName = OreDictionary.getOreName(oreDictID);
+                if (!oredictName.startsWith("crushed") || !oredictName.contains("Naq")) continue;
+
+                processRecipe(remove, reAdd, recipe);
+                break;
+
             }
+
         }
         RecipeMaps.oreWasherRecipes.getBackend()
             .removeRecipes(remove);
@@ -763,43 +680,17 @@ public class NaquadahReworkRecipeLoader {
         // For Thermal Centrifuge
         for (GTRecipe recipe : RecipeMaps.thermalCentrifugeRecipes.getAllRecipes()) {
             ItemStack input = recipe.mInputs[0];
-            if (GTUtility.isStackValid(input)) {
-                int[] oreDict = OreDictionary.getOreIDs(input);
-                for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("crushed")
-                        && OreDictionary.getOreName(oreDictID)
-                            .contains("Naq")) {
-                        GTRecipe tRecipe = recipe.copy();
-                        boolean modified = false;
-                        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                            if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
-                            if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            }
-                        }
-                        if (modified) {
-                            reAdd.add(tRecipe);
-                            remove.add(recipe);
-                        }
-                        break;
-                    }
-                }
+            if (!GTUtility.isStackValid(input)) continue;
+
+            int[] oreDict = OreDictionary.getOreIDs(input);
+            for (int oreDictID : oreDict) {
+                String oredictName = OreDictionary.getOreName(oreDictID);
+                if (!oredictName.startsWith("crushed") || !oredictName.contains("Naq")) continue;
+
+                processRecipe(remove, reAdd, recipe);
             }
         }
+
         RecipeMaps.thermalCentrifugeRecipes.getBackend()
             .removeRecipes(remove);
         reAdd.forEach(RecipeMaps.thermalCentrifugeRecipes::add);
@@ -817,92 +708,85 @@ public class NaquadahReworkRecipeLoader {
         for (GTRecipe recipe : RecipeMaps.centrifugeRecipes.getAllRecipes()) {
             ItemStack input = null;
             if (recipe.mInputs.length > 0) input = recipe.mInputs[0];
-            if (GTUtility.isStackValid(input)) {
-                int[] oreDict = OreDictionary.getOreIDs(input);
-                if (checkCombs && input.isItemEqual(GTBees.combs.getStackForType(CombType.DOB))) {
-                    GTRecipe tRecipe = recipe.copy();
-                    boolean modified = false;
-                    for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                        if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
-                        if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) {
-                            tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                tRecipe.mOutputs[i].stackSize * 2L,
-                                naquadahEarth.get(OrePrefixes.dustTiny, 1));
-                            modified = true;
-                        }
+            if (!GTUtility.isStackValid(input)) continue;
+
+            int[] oreDict = OreDictionary.getOreIDs(input);
+            if (checkCombs && input.isItemEqual(GTBees.combs.getStackForType(CombType.DOB))) {
+                GTRecipe tRecipe = recipe.copy();
+                boolean modified = false;
+                for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+                    if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
+                    if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2L, naquadahEarth.get(OrePrefixes.dustTiny, 1));
+                        modified = true;
                     }
-                    if (modified) {
-                        reAdd.add(tRecipe);
-                        remove.add(recipe);
-                    }
-                } else for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("dustPureNaq")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustImpureNaq")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustSpace")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustNaq")) {
-                        GTRecipe tRecipe = recipe.copy();
-                        boolean modified = false;
-                        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                            if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
-                            if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dustTiny, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dustTiny, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dustSmall, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustSmall(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dustSmall, 1));
-                                modified = true;
-                            }
-                        }
-                        if (modified) {
-                            reAdd.add(tRecipe);
-                            remove.add(recipe);
-                        }
-                        break;
+                }
+                if (modified) {
+                    GTLog.err.println("recipe edited: " + displayRecipe(tRecipe));
+                    reAdd.add(tRecipe);
+                    remove.add(recipe);
+                }
+                continue;
+            }
+
+            for (int oreDictID : oreDict) {
+                String oredictName = OreDictionary.getOreName(oreDictID);
+                if (!oredictName.startsWith("dustPureNaq") && !oredictName.startsWith("dustImpureNaq")
+                    && !oredictName.startsWith("dustSpace")
+                    && !oredictName.startsWith("dustNaq")) {
+                    continue;
+                }
+                GTRecipe tRecipe = recipe.copy();
+                boolean modified = false;
+                for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+                    if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
+                    if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustTiny, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) {
+                        tRecipe.mOutputs[i] = GTUtility.copyAmount(
+                            tRecipe.mOutputs[i].stackSize * 2,
+                            enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustTiny, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
+                        tRecipe.mOutputs[i] = GTUtility.copyAmount(
+                            tRecipe.mOutputs[i].stackSize * 2,
+                            enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustSmall, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustSmall(1))) {
+                        tRecipe.mOutputs[i] = GTUtility.copyAmount(
+                            tRecipe.mOutputs[i].stackSize * 2,
+                            enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) {
+                        tRecipe.mOutputs[i] = GTUtility.copyAmount(
+                            tRecipe.mOutputs[i].stackSize * 2,
+                            naquadriaEarth.get(OrePrefixes.dustSmall, 1));
+                    } else {
+                        continue;
                     }
+
+                    modified = true;
                 }
+                if (modified) {
+                    GTLog.err.println("recipe edited: " + displayRecipe(tRecipe));
+                    reAdd.add(tRecipe);
+                    remove.add(recipe);
+                }
+                break;
+
             }
+
         }
         RecipeMaps.centrifugeRecipes.getBackend()
             .removeRecipes(remove);
@@ -921,92 +805,81 @@ public class NaquadahReworkRecipeLoader {
         for (GTRecipe recipe : RecipeMaps.centrifugeNonCellRecipes.getAllRecipes()) {
             ItemStack input = null;
             if (recipe.mInputs.length > 0) input = recipe.mInputs[0];
-            if (GTUtility.isStackValid(input)) {
-                int[] oreDict = OreDictionary.getOreIDs(input);
-                if (checkCombs && input.isItemEqual(GTBees.combs.getStackForType(CombType.DOB))) {
-                    GTRecipe tRecipe = recipe.copy();
-                    boolean modified = false;
-                    for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                        if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
-                        if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) {
-                            tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                tRecipe.mOutputs[i].stackSize * 2L,
-                                naquadahEarth.get(OrePrefixes.dustTiny, 1));
-                            modified = true;
-                        }
-                    }
-                    if (modified) {
-                        reAdd.add(tRecipe);
-                        remove.add(recipe);
+            if (!GTUtility.isStackValid(input)) continue;
+
+            int[] oreDict = OreDictionary.getOreIDs(input);
+            if (checkCombs && input.isItemEqual(GTBees.combs.getStackForType(CombType.DOB))) {
+                GTRecipe tRecipe = recipe.copy();
+                boolean modified = false;
+                for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+                    if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
+                    if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2L, naquadahEarth.get(OrePrefixes.dustTiny, 1));
+                        modified = true;
                     }
-                } else for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("dustPureNaq")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustImpureNaq")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustSpace")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustNaq")) {
-                        GTRecipe tRecipe = recipe.copy();
-                        boolean modified = false;
-                        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                            if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
-                            if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dustTiny, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dustTiny, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dustSmall, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustSmall(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dustSmall, 1));
-                                modified = true;
-                            }
-                        }
-                        if (modified) {
-                            reAdd.add(tRecipe);
-                            remove.add(recipe);
-                        }
-                        break;
+                }
+                if (modified) {
+                    GTLog.err.println("recipe edited: " + displayRecipe(tRecipe));
+                    reAdd.add(tRecipe);
+                    remove.add(recipe);
+                }
+            } else for (int oreDictID : oreDict) {
+                String oredictName = OreDictionary.getOreName(oreDictID);
+                if (!oredictName.startsWith("dustPureNaq") && !oredictName.startsWith("dustImpureNaq")
+                    && !oredictName.startsWith("dustSpace")
+                    && !oredictName.startsWith("dustNaq")) continue;
+
+                GTRecipe tRecipe = recipe.copy();
+                boolean modified = false;
+                for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+                    if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
+                    if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustTiny, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) {
+                        tRecipe.mOutputs[i] = GTUtility.copyAmount(
+                            tRecipe.mOutputs[i].stackSize * 2,
+                            enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustTiny, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
+                        tRecipe.mOutputs[i] = GTUtility.copyAmount(
+                            tRecipe.mOutputs[i].stackSize * 2,
+                            enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustSmall, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustSmall(1))) {
+                        tRecipe.mOutputs[i] = GTUtility.copyAmount(
+                            tRecipe.mOutputs[i].stackSize * 2,
+                            enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1));
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) {
+                        tRecipe.mOutputs[i] = GTUtility.copyAmount(
+                            tRecipe.mOutputs[i].stackSize * 2,
+                            naquadriaEarth.get(OrePrefixes.dustSmall, 1));
+
+                    } else {
+                        continue;
                     }
+                    modified = true;
+                }
+                if (modified) {
+                    GTLog.err.println("recipe edited: " + displayRecipe(tRecipe));
+                    reAdd.add(tRecipe);
+                    remove.add(recipe);
                 }
+                break;
+
             }
+
         }
         RecipeMaps.centrifugeNonCellRecipes.getBackend()
             .removeRecipes(remove);
@@ -1024,42 +897,15 @@ public class NaquadahReworkRecipeLoader {
         // For Hammer
         for (GTRecipe recipe : RecipeMaps.hammerRecipes.getAllRecipes()) {
             ItemStack input = recipe.mInputs[0];
-            if (GTUtility.isStackValid(input)) {
-                int[] oreDict = OreDictionary.getOreIDs(input);
-                for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("crushed")
-                        && OreDictionary.getOreName(oreDictID)
-                            .contains("Naq")) {
-                        GTRecipe tRecipe = recipe.copy();
-                        boolean modified = false;
-                        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                            if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
-                            if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize * 2,
-                                    naquadriaEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            }
-                        }
-                        if (modified) {
-                            reAdd.add(tRecipe);
-                            remove.add(recipe);
-                        }
-                        break;
-                    }
-                }
+            if (!GTUtility.isStackValid(input)) continue;
+
+            int[] oreDict = OreDictionary.getOreIDs(input);
+            for (int oreDictID : oreDict) {
+                String oredictName = OreDictionary.getOreName(oreDictID);
+                if (!oredictName.startsWith("crushed") || !oredictName.contains("Naq")) continue;
+                processRecipe(remove, reAdd, recipe);
             }
+
         }
         RecipeMaps.hammerRecipes.getBackend()
             .removeRecipes(remove);
@@ -1104,6 +950,7 @@ public class NaquadahReworkRecipeLoader {
                 }
             }
             if (modified) {
+                GTLog.err.println("recipe edited: " + displayRecipe(tRecipe));
                 reAdd.add(tRecipe);
                 remove.add(recipe);
             }
@@ -1151,6 +998,7 @@ public class NaquadahReworkRecipeLoader {
                 }
             }
             if (modified) {
+                GTLog.err.println("recipe edited: " + displayRecipe(tRecipe));
                 reAdd.add(tRecipe);
                 remove.add(recipe);
             }
@@ -1168,51 +1016,42 @@ public class NaquadahReworkRecipeLoader {
 
         GTLog.out.print("Multi Chemical Reactor done!\n");
 
-        // For Gt++ Multi Centrifuge
-        // Apparently NEI will break down if one modifies the hash list directly.
-        // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear();
-        // RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
-        // RecipeMaps.centrifugeRecipes,
-        // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT);
-        // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.reInit();
-
         // For Simple Washer
         for (GTRecipe recipe : GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes()) {
             ItemStack input = recipe.mInputs[0];
-            if (GTUtility.isStackValid(input)) {
-                int[] oreDict = OreDictionary.getOreIDs(input);
-                for (int oreDictID : oreDict) {
-                    if (OreDictionary.getOreName(oreDictID)
-                        .startsWith("dustImpureNaq")
-                        || OreDictionary.getOreName(oreDictID)
-                            .startsWith("dustPureNaq")) {
-                        GTRecipe tRecipe = recipe.copy();
-                        boolean modified = false;
-                        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
-                            if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
-                            if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility
-                                    .copyAmount(tRecipe.mOutputs[i].stackSize, naquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility.copyAmount(
-                                    tRecipe.mOutputs[i].stackSize,
-                                    enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
-                                tRecipe.mOutputs[i] = GTUtility
-                                    .copyAmount(tRecipe.mOutputs[i].stackSize, naquadriaEarth.get(OrePrefixes.dust, 1));
-                                modified = true;
-                            }
-                        }
-                        if (modified) {
-                            reAdd.add(tRecipe);
-                            remove.add(recipe);
-                        }
-                        break;
+            if (!GTUtility.isStackValid(input)) continue;
+            int[] oreDict = OreDictionary.getOreIDs(input);
+            for (int oreDictID : oreDict) {
+                String oredictName = OreDictionary.getOreName(oreDictID);
+                if (!oredictName.startsWith("dustImpureNaq") && !oredictName.startsWith("dustPureNaq")) continue;
+
+                GTRecipe tRecipe = recipe.copy();
+                boolean modified = false;
+                for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+                    if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
+                    if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize, naquadahEarth.get(OrePrefixes.dust, 1));
+                        modified = true;
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize, enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
+                        modified = true;
+                    } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
+                        tRecipe.mOutputs[i] = GTUtility
+                            .copyAmount(tRecipe.mOutputs[i].stackSize, naquadriaEarth.get(OrePrefixes.dust, 1));
+                        modified = true;
                     }
                 }
+                if (modified) {
+                    GTLog.err.println("recipe edited: " + displayRecipe(tRecipe));
+                    reAdd.add(tRecipe);
+                    remove.add(recipe);
+                }
+                break;
+
             }
+
         }
         GTPPRecipeMaps.simpleWasherRecipes.getBackend()
             .removeRecipes(remove);
@@ -1243,6 +1082,32 @@ public class NaquadahReworkRecipeLoader {
         GTLog.out.print("Crafting Table done!\n");
     }
 
+    private static void processRecipe(HashSet<GTRecipe> remove, HashSet<GTRecipe> reAdd, GTRecipe recipe) {
+        GTRecipe tRecipe = recipe.copy();
+        boolean modified = false;
+        for (int i = 0; i < tRecipe.mOutputs.length; i++) {
+            if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue;
+            if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) {
+                tRecipe.mOutputs[i] = GTUtility
+                    .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1));
+                modified = true;
+            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) {
+                tRecipe.mOutputs[i] = GTUtility
+                    .copyAmount(tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1));
+                modified = true;
+            } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) {
+                tRecipe.mOutputs[i] = GTUtility
+                    .copyAmount(tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1));
+                modified = true;
+            }
+        }
+        if (modified) {
+            GTLog.err.println("recipe edited: " + displayRecipe(tRecipe));
+            reAdd.add(tRecipe);
+            remove.add(recipe);
+        }
+    }
+
     public static void replaceInCraftTable(Object obj) {
         IRecipe recipe = (IRecipe) obj;
         ItemStack result = recipe.getRecipeOutput();
diff --git a/src/main/java/goodgenerator/main/GGConfigLoader.java b/src/main/java/goodgenerator/main/GGConfigLoader.java
index 497c55b9f8..fb7b840393 100644
--- a/src/main/java/goodgenerator/main/GGConfigLoader.java
+++ b/src/main/java/goodgenerator/main/GGConfigLoader.java
@@ -17,7 +17,6 @@ public class GGConfigLoader {
     public static int[] NaquadahFuelTime = new int[] { 100, 500, 150, 60, 70, 80, 100, 160, 240 };
     public static int[] CoolantEfficiency = new int[] { 500, 275, 150, 105 };
     public static int[] ExcitedLiquidCoe = new int[] { 64, 16, 4, 3, 2 };
-    public static boolean EnableNaquadahRework = true;
 
     public static void run() {
         loadCategory();
@@ -104,9 +103,6 @@ public class GGConfigLoader {
                 .getInt(),
             0);
 
-        EnableNaquadahRework = GG_Config.get("NaquadahRework", "Enable Naquadah Rework", EnableNaquadahRework)
-            .getBoolean();
-
         if (GG_Config.hasChanged()) GG_Config.save();
     }
 
diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java
index d4a12f2c5c..feadded3b2 100644
--- a/src/main/java/goodgenerator/main/GoodGenerator.java
+++ b/src/main/java/goodgenerator/main/GoodGenerator.java
@@ -72,7 +72,6 @@ public final class GoodGenerator {
 
     @Mod.EventHandler
     public void onLoadComplete(FMLLoadCompleteEvent event) {
-        // NaquadahReworkRecipeLoader.SmallRecipeChange();
         NaquadahReworkRecipeLoader.Remover();
         Loaders.completeLoad();
     }