Fix Accept Folowing for custom recipe handlers (#570)

Co-authored-by: slprime <[email protected]> Co-authored-by: Martin Robertz <[email protected]>
GTNewHorizons · Dec 22, 2024 · 4be7a30 · 4be7a30
1 parent 7ac3e32
commit 4be7a30
Showing 1 changed file with 29 additions and 23 deletions.
diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java
@@ -29,6 +29,7 @@
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.Button;
 import codechicken.nei.GuiNEIButton;
+import codechicken.nei.ItemStackSet;
 import codechicken.nei.ItemsTooltipLineHandler;
 import codechicken.nei.LayoutManager;
 import codechicken.nei.NEICPH;
@@ -135,7 +136,13 @@ public static PermutationTooltipLineHandler getInstance(PositionedStack pStack)
                 items = Arrays.asList(pStack.items);
             }
 
-            return new PermutationTooltipLineHandler(pStack, items);
+            items = new ItemStackSet().addAll(items).keys();
+
+            if (items.size() > 1) {
+                return new PermutationTooltipLineHandler(pStack, items);
+            }
+
+            return null;
         }
 
     }
@@ -869,41 +876,40 @@ && new Rectangle(searchField.x + searchField.w, 15, 44, 16)
     public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
             List<String> currenttip) {
 
-        try (CompatibilityHacks compatibilityHacks = new CompatibilityHacks()) {
-            List<Integer> indices = getRecipeIndices();
+        List<Integer> indices = getRecipeIndices();
 
+        try (CompatibilityHacks compatibilityHacks = new CompatibilityHacks()) {
             for (int recipeIndex : indices) {
                 currenttip = handler.original.handleItemTooltip(this, itemstack, currenttip, recipeIndex);
             }
+        }
 
-            if (NEIClientConfig.showCycledIngredientsTooltip()) {
-                PositionedStack focused = null;
+        if (NEIClientConfig.showCycledIngredientsTooltip()) {
+            PositionedStack focused = null;
 
-                for (int refIndex = 0; refIndex < indices.size(); refIndex++) {
-                    final int recipeIndex = indices.get(refIndex);
+            for (int refIndex = 0; refIndex < indices.size(); refIndex++) {
+                final int recipeIndex = indices.get(refIndex);
 
-                    if (itemstack != null && focused == null) {
-                        final List<PositionedStack> stacks = handler.original.getIngredientStacks(recipeIndex);
+                if (itemstack != null && focused == null) {
+                    final List<PositionedStack> stacks = handler.original.getIngredientStacks(recipeIndex);
 
-                        for (PositionedStack pStack : stacks) {
-                            if (isMouseOver(pStack, refIndex)) {
-                                focused = pStack;
-                                break;
-                            }
+                    for (PositionedStack pStack : stacks) {
+                        if (isMouseOver(pStack, refIndex)) {
+                            focused = pStack;
+                            break;
                         }
                     }
                 }
-
-                if (focused == null || focused.items.length <= 1) {
-                    this.permutationTooltipLineHandler = null;
-                } else if (this.permutationTooltipLineHandler == null
-                        || this.permutationTooltipLineHandler.pStack != focused) {
-                            this.permutationTooltipLineHandler = PermutationTooltipLineHandler.getInstance(focused);
-                        }
-            } else if (this.permutationTooltipLineHandler != null) {
-                this.permutationTooltipLineHandler = null;
             }
 
+            if (focused == null || focused.items.length <= 1) {
+                this.permutationTooltipLineHandler = null;
+            } else if (this.permutationTooltipLineHandler == null
+                    || this.permutationTooltipLineHandler.pStack != focused) {
+                        this.permutationTooltipLineHandler = PermutationTooltipLineHandler.getInstance(focused);
+                    }
+        } else if (this.permutationTooltipLineHandler != null) {
+            this.permutationTooltipLineHandler = null;
         }
 
         if (this.permutationTooltipLineHandler != null) {