From 8457cc5eff21a14b0896ad59f63fa51a6c049dd3 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 11 Mar 2023 20:48:59 -0500 Subject: [PATCH] Avoid crashing if REI creative search fails --- .../modernfix/searchtree/REIBackedSearchTree.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java b/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java index 73c7c054..7bb9f954 100644 --- a/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java +++ b/src/main/java/org/embeddedt/modernfix/searchtree/REIBackedSearchTree.java @@ -5,8 +5,10 @@ import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; import me.shedaniel.rei.impl.client.search.AsyncSearchManager; import net.minecraft.world.item.ItemStack; +import org.embeddedt.modernfix.ModernFix; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class REIBackedSearchTree extends DummySearchTree { @@ -35,7 +37,13 @@ public class REIBackedSearchTree extends DummySearchTree { if(!pSearchText.equals(lastSearchText)) { listCache.clear(); this.searchManager.updateFilter(pSearchText); - List> stacks = this.searchManager.getNow(); + List> stacks; + try { + stacks = this.searchManager.getNow(); + } catch(RuntimeException e) { + ModernFix.LOGGER.error("Couldn't search for '" + pSearchText + "'", e); + stacks = Collections.emptyList(); + } for(EntryStack stack : stacks) { if(stack.getType() == VanillaEntryTypes.ITEM) { listCache.add(stack.cheatsAs().getValue());