From d5f25a4be89525704fb7cdb571835b9fb6f31818 Mon Sep 17 00:00:00 2001 From: slprime <31038811+slprime@users.noreply.github.com> Date: Wed, 6 May 2026 19:43:50 +0300 Subject: [PATCH] Prevent ConcurrentModificationException while searching for fuels in ItemList (#926) --- src/main/java/codechicken/nei/ItemList.java | 4 +++- .../java/codechicken/nei/recipe/TemplateRecipeHandler.java | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/codechicken/nei/ItemList.java b/src/main/java/codechicken/nei/ItemList.java index 4d9a0170..1daab14a 100644 --- a/src/main/java/codechicken/nei/ItemList.java +++ b/src/main/java/codechicken/nei/ItemList.java @@ -251,7 +251,6 @@ public class ItemList { private void updateOrdering(List items) { final Map newOrdering = new HashMap<>(); - ItemSorter.sort(items); if (!CollapsibleItems.isEmpty()) { final HashMap groups = new HashMap<>(); @@ -424,6 +423,9 @@ public class ItemList { } } + if (interrupted()) return; + ItemSorter.sort(items); + if (interrupted()) return; ItemList.items = items; ItemList.itemMap = itemMap; diff --git a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java index 82650938..eae7e580 100644 --- a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java @@ -84,12 +84,13 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH efuels.add(Item.getItemFromBlock(Blocks.wooden_door)); efuels.add(Item.getItemFromBlock(Blocks.trapped_chest)); - Stopwatch stopwatch = Stopwatch.createStarted(); + final Stopwatch stopwatch = Stopwatch.createStarted(); + final List itemsSnapshot = new ArrayList<>(ItemList.items); if (parallel) { try { FurnaceRecipeHandler.afuels = ItemList.forkJoinPool .submit( - () -> ItemList.items.parallelStream().map(TemplateRecipeHandler::identifyFuel) + () -> itemsSnapshot.parallelStream().map(TemplateRecipeHandler::identifyFuel) .filter(Objects::nonNull).collect(Collectors.toCollection(ArrayList::new))) .get(); } catch (InterruptedException | ExecutionException e) { @@ -97,7 +98,7 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH e.printStackTrace(); } } else { - FurnaceRecipeHandler.afuels = ItemList.items.stream().map(TemplateRecipeHandler::identifyFuel) + FurnaceRecipeHandler.afuels = itemsSnapshot.stream().map(TemplateRecipeHandler::identifyFuel) .filter(Objects::nonNull).collect(Collectors.toCollection(ArrayList::new)); }