From dbc10704fdbff100d1ae592aa0ddf1dc8b1aeca0 Mon Sep 17 00:00:00 2001
From: boubou19 <miisterunknown@gmail.com>
Date: Thu, 12 Sep 2024 22:30:04 +0200
Subject: Merge config categories (#3152)

Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 src/main/java/gregtech/nei/GTNEIDefaultHandler.java | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/main/java/gregtech/nei')

diff --git a/src/main/java/gregtech/nei/GTNEIDefaultHandler.java b/src/main/java/gregtech/nei/GTNEIDefaultHandler.java
index 3887ad321b..c3be2cd9f4 100644
--- a/src/main/java/gregtech/nei/GTNEIDefaultHandler.java
+++ b/src/main/java/gregtech/nei/GTNEIDefaultHandler.java
@@ -164,12 +164,10 @@ public class GTNEIDefaultHandler extends TemplateRecipeHandler {
                         .entrySet()
                         .stream()
                         .flatMap(entry -> {
-                            boolean merge = entry.getKey() != defaultCategory
-                                && GTMod.gregtechproxy.recipeCategorySettings
-                                    .getOrDefault(entry.getKey(), RecipeCategorySetting.getDefault())
-                                    == RecipeCategorySetting.MERGE;
-                            return merge ? entry.getValue()
-                                .stream() : Stream.empty();
+                            RecipeCategory recipeCategory = entry.getKey();
+                            Collection<GTRecipe> correspondingRecipes = entry.getValue();
+                            boolean merge = recipeCategory.settingSupplier.get() == RecipeCategorySetting.MERGE;
+                            return merge ? correspondingRecipes.stream() : Stream.empty();
                         });
                     recipes = Stream.concat(
                         recipesToMerge,
@@ -179,9 +177,7 @@ public class GTNEIDefaultHandler extends TemplateRecipeHandler {
                         .collect(Collectors.toList());
                 } else {
                     // This is "sub" category
-                    if (GTMod.gregtechproxy.recipeCategorySettings
-                        .getOrDefault(recipeCategory, RecipeCategorySetting.getDefault())
-                        == RecipeCategorySetting.ENABLE) {
+                    if (recipeCategory.settingSupplier.get() == RecipeCategorySetting.ENABLE) {
                         recipes = recipeMap.getBackend()
                             .getRecipesByCategory(recipeCategory);
                     } else {
-- 
cgit