From d78ae2c7541143fcec1a045261fc7e0659e918c0 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Fri, 11 Oct 2024 14:12:20 -0400
Subject: [PATCH] Fix searching in latest JEI

---
 .../modernfix/searchtree/JEIBackedSearchTree.java    | 12 ++++++------
 forge/src/main/resources/META-INF/mods.toml          |  2 +-
 gradle.properties                                    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java b/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java
index 1c7ecd41..43a044ed 100644
--- a/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java
+++ b/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java
@@ -1,6 +1,5 @@
 package org.embeddedt.modernfix.searchtree;
 
-import com.google.common.collect.ImmutableList;
 import mezz.jei.api.ingredients.ITypedIngredient;
 import mezz.jei.gui.ingredients.IngredientFilter;
 import mezz.jei.gui.ingredients.IngredientFilterApi;
@@ -18,6 +17,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 /**
  * Uses JEI to handle search tree lookups.
@@ -72,19 +72,19 @@ public class JEIBackedSearchTree extends DummySearchTree<ItemStack> {
     private List<ItemStack> searchJEI(IngredientFilter filter, String pSearchText) {
         if(!pSearchText.equals(lastSearchText)) {
             listCache.clear();
-            List<ITypedIngredient<?>> ingredients;
+            Stream<ITypedIngredient<?>> ingredients;
             String finalSearchTerm = filteringByTag ? ("$" + pSearchText) : pSearchText;
             try {
-                ingredients = (List<ITypedIngredient<?>>)getIngredientListUncached.invokeExact(filter, finalSearchTerm);
+                ingredients = (Stream<ITypedIngredient<?>>)getIngredientListUncached.invokeExact(filter, finalSearchTerm);
             } catch(Throwable e) {
                 ModernFix.LOGGER.error("Error searching", e);
-                ingredients = ImmutableList.of();
+                ingredients = Stream.empty();
             }
-            for(ITypedIngredient<?> ingredient : ingredients) {
+            ingredients.forEach(ingredient -> {
                 if(ingredient.getIngredient() instanceof ItemStack) {
                     listCache.add((ItemStack)ingredient.getIngredient());
                 }
-            }
+            });
             lastSearchText = pSearchText;
         }
         return listCache;
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 884e95c0..6370bc76 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -57,6 +57,6 @@ side = "BOTH"
 modId = "jei"
 mandatory = false
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange = "[11,)"
+versionRange = "[11.8.1.1033,)"
 ordering = "BEFORE"
 side = "CLIENT"
diff --git a/gradle.properties b/gradle.properties
index 1f4deddc..21f8b1b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ enabled_platforms=fabric,forge
 forge_version=1.19.2-43.2.0
 parchment_version=2022.11.27
 refined_storage_version=4392788
-jei_version=11.6.0.1011
+jei_version=11.8.1.1033
 rei_version=9.1.591
 ctm_version=1.19.2-1.1.7+11
 kubejs_version=1902.6.0-build.142