Fix recipe logic with Undyed Hatches and Distinctness Bypassing (GregTechCEu#3629)

Author: jurrejelle

src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeHelper.java

@@ -353,10 +353,11 @@ public static void addToRecipeHandlerMap(RecipeHandlerGroup key, RecipeHandlerLi
             map.computeIfAbsent(RecipeHandlerGroupDistinctness.BYPASS_DISTINCT, $ -> new ArrayList<>()).add(handler);
             return;
         }
-        // Add undyed RHL's to every group that's not distinct, and also the undyed group itself.
+        // Add undyed RHL's to every group that's not distinct, bypass, and also the undyed group itself.
         if (key.equals(RecipeHandlerGroupColor.UNDYED)) {
             for (var entry : map.entrySet()) {
                 if (entry.getKey().equals(RecipeHandlerGroupDistinctness.BUS_DISTINCT) ||
+                        entry.getKey().equals(RecipeHandlerGroupDistinctness.BYPASS_DISTINCT) ||
                         entry.getKey().equals(RecipeHandlerGroupColor.UNDYED)) {
                     continue;
                 }

src/main/java/com/gregtechceu/gtceu/api/recipe/RecipeRunner.java

@@ -4,7 +4,6 @@
 import com.gregtechceu.gtceu.api.capability.recipe.IRecipeCapabilityHolder;
 import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability;
 import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroup;
-import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroupDistinctness;
 import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList;
 import com.gregtechceu.gtceu.api.recipe.chance.boost.ChanceBoostFunction;
 import com.gregtechceu.gtceu.api.recipe.chance.logic.ChanceLogic;
@@ -20,6 +19,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroupDistinctness.BUS_DISTINCT;
+import static com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerGroupDistinctness.BYPASS_DISTINCT;
 import static com.gregtechceu.gtceu.api.recipe.RecipeHelper.addToRecipeHandlerMap;
 
 public class RecipeRunner {
@@ -121,21 +122,18 @@ private ActionResult handleContents() {
             addToRecipeHandlerMap(handler.getGroup(), handler, handlerGroups);
         }
         // Specifically check distinct handlers first
-        for (RecipeHandlerList handler : handlerGroups.getOrDefault(RecipeHandlerGroupDistinctness.BUS_DISTINCT,
-                Collections.emptyList())) {
+        for (RecipeHandlerList handler : handlerGroups.getOrDefault(BUS_DISTINCT, Collections.emptyList())) {
             // Handle the contents of this handler and also all the bypassed handlers
             var res = handler.handleRecipe(io, recipe, searchRecipeContents, true);
-            for (RecipeHandlerList bypassHandler : handlerGroups.getOrDefault(
-                    RecipeHandlerGroupDistinctness.BYPASS_DISTINCT,
+            for (RecipeHandlerList bypassHandler : handlerGroups.getOrDefault(BYPASS_DISTINCT,
                     Collections.emptyList())) {
                 res = bypassHandler.handleRecipe(io, recipe, res, true);
             }
             if (res.isEmpty()) {
                 if (!simulated) {
                     // Actually consume the contents of this handler and also all the bypassed handlers
                     recipeContents = handler.handleRecipe(io, recipe, recipeContents, false);
-                    for (RecipeHandlerList bypassHandler : handlerGroups.getOrDefault(
-                            RecipeHandlerGroupDistinctness.BYPASS_DISTINCT,
+                    for (RecipeHandlerList bypassHandler : handlerGroups.getOrDefault(BYPASS_DISTINCT,
                             Collections.emptyList())) {
                         recipeContents = bypassHandler.handleRecipe(io, recipe, recipeContents, false);
                     }
@@ -148,7 +146,7 @@ private ActionResult handleContents() {
         // Check the other groups. For every group, try consuming the ingredients,
         // see if it succeeds.
         for (Map.Entry<RecipeHandlerGroup, List<RecipeHandlerList>> handlerListEntry : handlerGroups.entrySet()) {
-            if (handlerListEntry.getKey() == RecipeHandlerGroupDistinctness.BUS_DISTINCT) continue;
+            if (handlerListEntry.getKey().equals(BUS_DISTINCT)) continue;
 
             // List to keep track of the remaining items for this RecipeHandlerGroup
             Map<RecipeCapability<?>, List<Object>> copiedRecipeContents = searchRecipeContents;
@@ -162,9 +160,8 @@ private ActionResult handleContents() {
                 }
             }
             // If we're already in the bypass_distinct group, don't check it twice.
-            if (handlerListEntry.getKey() != RecipeHandlerGroupDistinctness.BYPASS_DISTINCT) {
-                for (RecipeHandlerList bypassHandler : handlerGroups.getOrDefault(
-                        RecipeHandlerGroupDistinctness.BYPASS_DISTINCT,
+            if (!handlerListEntry.getKey().equals(BYPASS_DISTINCT)) {
+                for (RecipeHandlerList bypassHandler : handlerGroups.getOrDefault(BYPASS_DISTINCT,
                         Collections.emptyList())) {
                     copiedRecipeContents = bypassHandler.handleRecipe(io, recipe, copiedRecipeContents, true);
                     if (copiedRecipeContents.isEmpty()) {
@@ -189,9 +186,8 @@ private ActionResult handleContents() {
             }
             // Then go through the handlers that bypass the distinctness system and empty those
             // If we're already in the bypass_distinct group, don't check it twice.
-            if (handlerListEntry.getKey() != RecipeHandlerGroupDistinctness.BYPASS_DISTINCT) {
-                for (RecipeHandlerList bypassHandler : handlerGroups.getOrDefault(
-                        RecipeHandlerGroupDistinctness.BYPASS_DISTINCT,
+            if (!handlerListEntry.getKey().equals(BYPASS_DISTINCT)) {
+                for (RecipeHandlerList bypassHandler : handlerGroups.getOrDefault(BYPASS_DISTINCT,
                         Collections.emptyList())) {
                     copiedRecipeContents = bypassHandler.handleRecipe(io, recipe, copiedRecipeContents, false);
                     if (copiedRecipeContents.isEmpty()) {