Merge remote-tracking branch 'shedaniel/9.x-1.19' into 10.x-1.19.3

2 files changed, 5 insertions, 0 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
index 73f54172f..cf9c5b865 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/AbstractEntryStack.java
@@ -231,6 +231,7 @@ public abstract class AbstractEntryStack<A> implements EntryStack<A>, Renderer {
             }
             return tooltip.getValue();
         } catch (Throwable throwable) {
+            if (context.isSearch()) throw throwable;
             CrashReport report = CrashReportUtils.essential(throwable, "Getting tooltips");
             CrashReportUtils.renderer(report, this);
             throw CrashReportUtils.throwReport(report);
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
index a9d476878..942e61ad8 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java
@@ -120,6 +120,10 @@ public class EntryRegistryImpl implements EntryRegistry {
         return Collections.unmodifiableList(filteredList.getComplexList());
     }
     
+    public List<HashedEntryStackWrapper> getComplexList() {
+        return Collections.unmodifiableList(registryList.collectHashed());
+    }
+    
     @Override
     public void refilter() {
         List<HashedEntryStackWrapper> stacks = registryList.collectHashed();