log recipes edited/removed by BW platinum overhaul (#3121)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

1 files changed, 102 insertions, 36 deletions

diff --git a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
index 5b5037ba08..f69a8c3f7d 100644
--- a/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
+++ b/src/main/java/bartworks/system/material/gtenhancement/PlatinumSludgeOverHaul.java
@@ -78,8 +78,11 @@ import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeBuilder.TICKS;
 import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
 import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes;
 import static gtPlusPlus.core.material.MaterialsAlloy.HELICOPTER;
 import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.WHITE_METAL;
+import static tectech.recipe.TecTechRecipeMaps.eyeOfHarmonyRecipes;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -93,6 +96,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.item.crafting.IRecipe;
+import net.minecraftforge.fluids.FluidStack;
 
 import bartworks.MainMod;
 import bartworks.system.material.BWMetaGeneratedItems;
@@ -112,6 +116,7 @@ import gregtech.api.items.GTGenericItem;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.MaterialStack;
 import gregtech.api.recipe.RecipeMap;
+import gregtech.api.util.GTLog;
 import gregtech.api.util.GTModHandler;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTRecipe;
@@ -732,6 +737,49 @@ public class PlatinumSludgeOverHaul {
         return false;
     }
 
+    public static boolean isMapIgnored(RecipeMap<?> map) {
+        return map == fusionRecipes || map == unpackagerRecipes
+            || map == packagerRecipes
+            || map == replicatorRecipes
+            || map == eyeOfHarmonyRecipes
+            || map == quantumForceTransformerRecipes
+            || map == fluidExtractionRecipes
+            || map == alloyBlastSmelterRecipes;
+    }
+
+    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(", ");
+        }
+
+        // item outputs
+        result.append(" Item outputs: ");
+        for (ItemStack itemstack : recipe.mOutputs) {
+            result.append(itemstack.getUnlocalizedName());
+            result.append(", ");
+        }
+
+        // fluid outputs
+        result.append(" Fluid outputs: ");
+        for (FluidStack fluidStack : recipe.mFluidOutputs) {
+            result.append(fluidStack.getUnlocalizedName());
+            result.append(", ");
+        }
+
+        return result.toString();
+    }
+
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static void replacePureElements() {
         // furnace
@@ -739,28 +787,28 @@ public class PlatinumSludgeOverHaul {
             .getSmeltingList()
             .entrySet()) {
             Map.Entry realEntry = (Map.Entry) entry;
-            if (GTUtility.isStackValid(realEntry.getKey())
-                && BWUtil.checkStackAndPrefix((ItemStack) realEntry.getKey())) {
-                ItemData association = GTOreDictUnificator.getAssociation((ItemStack) realEntry.getKey());
-                if (!dust.equals(association.mPrefix) && !dustTiny.equals(association.mPrefix)
-                    || !association.mMaterial.mMaterial.equals(Materials.Platinum))
-                    if (GTUtility.isStackValid(realEntry.getValue())
-                        && BWUtil.checkStackAndPrefix((ItemStack) realEntry.getValue())) {
-                            ItemData ass = GTOreDictUnificator.getAssociation((ItemStack) realEntry.getValue());
-                            if (ass.mMaterial.mMaterial.equals(Materials.Platinum))
-                                if (!PlatinumSludgeOverHaul.isInBlackList((ItemStack) realEntry.getKey()))
-                                    realEntry.setValue(
-                                        PTMetallicPowder.get(
-                                            ass.mPrefix == nugget ? dustTiny : dust,
-                                            ((ItemStack) realEntry.getValue()).stackSize * 2));
-                            else if (ass.mMaterial.mMaterial.equals(Materials.Palladium))
-                                if (!PlatinumSludgeOverHaul.isInBlackList((ItemStack) realEntry.getKey()))
-                                    realEntry.setValue(
-                                        PDMetallicPowder.get(
-                                            ass.mPrefix == nugget ? dustTiny : dust,
-                                            ((ItemStack) realEntry.getValue()).stackSize * 2));
-                        }
-            }
+            if (!GTUtility.isStackValid(realEntry.getKey())) continue;
+            if (!BWUtil.checkStackAndPrefix((ItemStack) realEntry.getKey())) continue;
+
+            ItemData association = GTOreDictUnificator.getAssociation((ItemStack) realEntry.getKey());
+            boolean isDust = dust.equals(association.mPrefix) || dustTiny.equals(association.mPrefix);
+            ItemStack stack = (ItemStack) realEntry.getValue();
+            if (isDust && association.mMaterial.mMaterial.equals(Materials.Platinum)) continue;
+
+            if (!GTUtility.isStackValid(stack)) continue;
+            if (!BWUtil.checkStackAndPrefix(stack)) continue;
+
+            ItemData ass = GTOreDictUnificator.getAssociation(stack);
+            OrePrefixes prefix = ass.mPrefix == nugget ? dustTiny : dust;
+            boolean isPlatinumOrPalladium = ass.mMaterial.mMaterial.equals(Materials.Platinum)
+                || ass.mMaterial.mMaterial.equals(Materials.Palladium);
+
+            if (!isPlatinumOrPalladium) continue;
+
+            Werkstoff mat = (ass.mMaterial.mMaterial.equals(Materials.Platinum)) ? PTMetallicPowder : PDMetallicPowder;
+
+            if (PlatinumSludgeOverHaul.isInBlackList((ItemStack) realEntry.getKey())) continue;
+            realEntry.setValue(mat.get(prefix, stack.stackSize * 2));
         }
         // vanilla crafting
         CraftingManager.getInstance()
@@ -770,42 +818,44 @@ public class PlatinumSludgeOverHaul {
         GTModHandler.sBufferRecipeList.forEach(PlatinumSludgeOverHaul::setnewMaterialInRecipe);
         // gt machines
         maploop: for (RecipeMap<?> map : RecipeMap.ALL_RECIPE_MAPS.values()) {
-            if (map == fusionRecipes || map == unpackagerRecipes
-                || map == packagerRecipes
-                || map == replicatorRecipes
-                || "gt.recipe.eyeofharmony".equals(map.unlocalizedName)
-                || "gtpp.recipe.quantumforcesmelter".equals(map.unlocalizedName)) continue;
+            GTLog.err.println("Processing recipmap: " + map.unlocalizedName);
+            if (isMapIgnored(map)) continue;
+
             HashSet<GTRecipe> toDel = new HashSet<>();
+
             recipeloop: for (GTRecipe recipe : map.getAllRecipes()) {
                 if (recipe.mFakeRecipe) continue maploop;
-
                 for (int i = 0; i < recipe.mFluidOutputs.length; i++) {
-                    if (map.equals(fluidExtractionRecipes)) continue maploop;
-                    if ("gtpp.recipe.alloyblastsmelter".equals(map.unlocalizedName)) continue maploop;
                     if (map.equals(multiblockChemicalReactorRecipes) || map.equals(chemicalReactorRecipes)) {
                         if (GTUtility.areFluidsEqual(Ruthenium.getMolten(1), recipe.mFluidOutputs[i])
-                            || GTUtility.areFluidsEqual(Rhodium.getMolten(1), recipe.mFluidOutputs[i]))
+                            || GTUtility.areFluidsEqual(Rhodium.getMolten(1), recipe.mFluidOutputs[i])) {
                             toDel.add(recipe);
-                        else if (GTUtility.areFluidsEqual(Materials.Iridium.getMolten(1), recipe.mFluidOutputs[i])) {
+                            GTLog.err.println("Recipe marked for deletion: " + displayRecipe(recipe));
+                        } else if (GTUtility.areFluidsEqual(Materials.Iridium.getMolten(1), recipe.mFluidOutputs[i])) {
                             recipe.mFluidOutputs[i] = AcidicIridiumSolution.getFluidOrGas(1000);
                             recipe.reloadOwner();
+                            GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                         } else if (GTUtility.areFluidsEqual(Materials.Platinum.getMolten(1), recipe.mFluidOutputs[i])) {
                             recipe.mFluidOutputs[i] = PTConcentrate.getFluidOrGas(1000);
                             recipe.reloadOwner();
+                            GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                         } else if (GTUtility.areFluidsEqual(Materials.Osmium.getMolten(1), recipe.mFluidOutputs[i])) {
                             recipe.mFluidOutputs[i] = AcidicOsmiumSolution.getFluidOrGas(1000);
                             recipe.reloadOwner();
+                            GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                         }
                     } else if (GTUtility.areFluidsEqual(Ruthenium.getMolten(1), recipe.mFluidOutputs[i])
                         || GTUtility.areFluidsEqual(Rhodium.getMolten(1), recipe.mFluidOutputs[i])
                         || GTUtility.areFluidsEqual(Materials.Iridium.getMolten(1), recipe.mFluidOutputs[i])
-                        || GTUtility.areFluidsEqual(Materials.Platinum.getMolten(1), recipe.mFluidOutputs[i]))
-                        toDel.add(recipe);
-                    else if (GTUtility.areFluidsEqual(Materials.Osmium.getMolten(1), recipe.mFluidOutputs[i]))
-                        toDel.add(recipe);
+                        || GTUtility.areFluidsEqual(Materials.Platinum.getMolten(1), recipe.mFluidOutputs[i])
+                        || GTUtility.areFluidsEqual(Materials.Osmium.getMolten(1), recipe.mFluidOutputs[i])) {
+                            GTLog.err.println("Recipe marked for deletion: " + displayRecipe(recipe));
+                            toDel.add(recipe);
+                        }
                 }
                 for (int i = 0; i < recipe.mOutputs.length; i++) {
                     if (!GTUtility.isStackValid(recipe.mOutputs[i])) continue;
+
                     if ((BWUtil.areStacksEqualOrNull(Ruthenium.get(dust), recipe.mOutputs[i])
                         || BWUtil.areStacksEqualOrNull(Ruthenium.get(dustImpure), recipe.mOutputs[i])
                         || BWUtil.areStacksEqualOrNull(Ruthenium.get(dustPure), recipe.mOutputs[i]))
@@ -813,6 +863,7 @@ public class PlatinumSludgeOverHaul {
                         for (ItemStack mInput : recipe.mInputs)
                             if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop;
                         int amount = recipe.mOutputs[i].stackSize * 2;
+                        GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                         recipe.mOutputs[i] = LeachResidue.get(dust, amount);
                         recipe.reloadOwner();
                     }
@@ -823,6 +874,7 @@ public class PlatinumSludgeOverHaul {
                         for (ItemStack mInput : recipe.mInputs)
                             if (PlatinumSludgeOverHaul.isInBlackList(mInput)) continue recipeloop;
                         int amount = recipe.mOutputs[i].stackSize * 2;
+                        GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                         recipe.mOutputs[i] = CrudeRhMetall.get(dust, amount);
                         recipe.reloadOwner();
                     }
@@ -837,14 +889,17 @@ public class PlatinumSludgeOverHaul {
                             || dustImpure.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)
                             || dustPure.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                             int amount = recipe.mOutputs[i].stackSize;
+                            GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                             recipe.mOutputs[i] = BWUtil.setStackSize(PTMetallicPowder.get(dust), amount * 2);
                             recipe.reloadOwner();
                         } else if (dustSmall.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                             int amount = recipe.mOutputs[i].stackSize;
+                            GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                             recipe.mOutputs[i] = BWUtil.setStackSize(PTMetallicPowder.get(dustSmall), amount * 2);
                             recipe.reloadOwner();
                         } else if (dustTiny.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                             int amount = recipe.mOutputs[i].stackSize;
+                            GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                             recipe.mOutputs[i] = BWUtil.setStackSize(PTMetallicPowder.get(dustTiny), amount * 2);
                             recipe.reloadOwner();
                         }
@@ -857,17 +912,20 @@ public class PlatinumSludgeOverHaul {
                                 || dustImpure.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)
                                 || dustPure.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                                 int amount = recipe.mOutputs[i].stackSize;
+                                GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                                 recipe.mOutputs[i] = BWUtil.setStackSize(PDMetallicPowder.get(dust), amount * 4);
                                 recipe.reloadOwner();
                             } else
                                 if (dustSmall.equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                                     int amount = recipe.mOutputs[i].stackSize;
+                                    GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                                     recipe.mOutputs[i] = BWUtil
                                         .setStackSize(PDMetallicPowder.get(dustSmall), amount * 4);
                                     recipe.reloadOwner();
                                 } else if (dustTiny
                                     .equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                                         int amount = recipe.mOutputs[i].stackSize;
+                                        GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                                         recipe.mOutputs[i] = BWUtil
                                             .setStackSize(PDMetallicPowder.get(dustTiny), amount * 4);
                                         recipe.reloadOwner();
@@ -882,16 +940,19 @@ public class PlatinumSludgeOverHaul {
                                     || dustPure
                                         .equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                                     int amount = recipe.mOutputs[i].stackSize;
+                                    GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                                     recipe.mOutputs[i] = BWUtil.setStackSize(IrOsLeachResidue.get(dust), amount);
                                     recipe.reloadOwner();
                                 } else if (dustSmall
                                     .equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                                         int amount = recipe.mOutputs[i].stackSize;
+                                        GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                                         recipe.mOutputs[i] = BWUtil
                                             .setStackSize(IrOsLeachResidue.get(dustSmall), amount);
                                         recipe.reloadOwner();
                                     } else if (dustTiny
                                         .equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
+                                            GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                                             int amount = recipe.mOutputs[i].stackSize;
                                             recipe.mOutputs[i] = BWUtil
                                                 .setStackSize(IrOsLeachResidue.get(dustTiny), amount);
@@ -909,18 +970,21 @@ public class PlatinumSludgeOverHaul {
                                             .equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                                         int amount = recipe.mOutputs[i].stackSize;
                                         recipe.mOutputs[i] = BWUtil.setStackSize(IrLeachResidue.get(dust), amount);
+                                        GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                                         recipe.reloadOwner();
                                     } else if (dustSmall
                                         .equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                                             int amount = recipe.mOutputs[i].stackSize;
                                             recipe.mOutputs[i] = BWUtil
                                                 .setStackSize(IrLeachResidue.get(dustSmall), amount);
+                                            GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                                             recipe.reloadOwner();
                                         } else if (dustTiny
                                             .equals(GTOreDictUnificator.getAssociation(recipe.mOutputs[i]).mPrefix)) {
                                                 int amount = recipe.mOutputs[i].stackSize;
                                                 recipe.mOutputs[i] = BWUtil
                                                     .setStackSize(IrLeachResidue.get(dustTiny), amount);
+                                                GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                                                 recipe.reloadOwner();
                                             }
                                 }
@@ -946,6 +1010,7 @@ public class PlatinumSludgeOverHaul {
             .eut(TierEU.RECIPE_MV)
             .addTo(mixerRecipes);
 
+        GTLog.err.println("Processing hv circuit materials (circuit assembler map)");
         for (GTRecipe recipe : circuitAssemblerRecipes.getAllRecipes()) {
             if (recipe.mEUt > 512) continue;
             if (BWUtil.checkStackAndPrefix(recipe.mOutputs[0])) {
@@ -954,6 +1019,7 @@ public class PlatinumSludgeOverHaul {
                     ItemData ass = GTOreDictUnificator.getAssociation(stack);
                     if (BWUtil.checkStackAndPrefix(stack) && ass.mMaterial.mMaterial.equals(Materials.Platinum)) {
                         recipe.mInputs[i] = GTOreDictUnificator.get(ass.mPrefix, Materials.BlueAlloy, stack.stackSize);
+                        GTLog.err.println("Recipe edited: " + displayRecipe(recipe));
                         recipe.reloadOwner();
                     }
                 }