From 4c74a019302777a48fcd9fd536f3e6b7c6f6f03c Mon Sep 17 00:00:00 2001 From: slprime <31038811+slprime@users.noreply.github.com> Date: Tue, 25 Aug 2026 09:09:53 +0300 Subject: [PATCH] Fix crash when recipe search results change mid-rebuild (#1012) --- .../nei/recipe/RecipePageManager.java | 5 +++-- .../nei/recipe/SearchRecipeHandler.java | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/main/java/codechicken/nei/recipe/RecipePageManager.java b/src/main/java/codechicken/nei/recipe/RecipePageManager.java index 22ed3584..9001ad57 100644 --- a/src/main/java/codechicken/nei/recipe/RecipePageManager.java +++ b/src/main/java/codechicken/nei/recipe/RecipePageManager.java @@ -50,12 +50,13 @@ public class RecipePageManager { final int heightAvailable = this.container.getVisibleHeight(); final int width = Math.max(166, this.handlerInfo.getWidth()); - final int numRecipes = getNumRecipes(); + final List searchRecipes = this.handler.getFilteredRecipes(); + final int numRecipes = searchRecipes.size(); List widgets = new ArrayList<>(); int shiftY = 0; for (int i = 0; i < numRecipes; i++) { - final int recipeIndex = this.handler.ref(i); + final int recipeIndex = searchRecipes.get(i); final NEIRecipeWidget widget = RecipeHandlerRef.of(this.handler.original, recipeIndex).getRecipeWidget(); widget.w = width; diff --git a/src/main/java/codechicken/nei/recipe/SearchRecipeHandler.java b/src/main/java/codechicken/nei/recipe/SearchRecipeHandler.java index b8369cd3..34f7c929 100644 --- a/src/main/java/codechicken/nei/recipe/SearchRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/SearchRecipeHandler.java @@ -97,6 +97,22 @@ class SearchRecipeHandler { this.searchRecipes = searchRecipes; } + public List getFilteredRecipes() { + + if (this.searchRecipes == null) { + return this.filteredRecipes; + } + + final List search = this.searchRecipes; + final List resolved = new ArrayList<>(search.size()); + + for (int idx : search) { + resolved.add(this.filteredRecipes.get(idx)); + } + + return resolved; + } + public int ref(int index) { if (searchRecipes != null) {