R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix searching in latest JEI

Browse Source
This commit is contained in:
embeddedt 2024-07-16 18:58:21 -04:00
parent bc7aa5539c
commit edddba6991
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/build.gradle
View File

@ -6,7 +6,7 @@ architectury {
common(rootProject.enabled_platforms.split(",")) common(rootProject.enabled_platforms.split(","))
} }
ext.jei_minecraft_version = "1.19.4" /* temporary, till 1.20 releases */ ext.jei_minecraft_version = "1.20.1" /* temporary, till 1.20 releases */
dependencies { dependencies {
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies

12
common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java
View File

@ -1,6 +1,5 @@
package org.embeddedt.modernfix.searchtree; package org.embeddedt.modernfix.searchtree;
import com.google.common.collect.ImmutableList;
import mezz.jei.api.ingredients.ITypedIngredient; import mezz.jei.api.ingredients.ITypedIngredient;
import mezz.jei.gui.ingredients.IngredientFilter; import mezz.jei.gui.ingredients.IngredientFilter;
import mezz.jei.gui.ingredients.IngredientFilterApi; import mezz.jei.gui.ingredients.IngredientFilterApi;
@ -18,6 +17,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream;
/** /**
* Uses JEI to handle search tree lookups. * 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) { private List<ItemStack> searchJEI(IngredientFilter filter, String pSearchText) {
if(!pSearchText.equals(lastSearchText)) { if(!pSearchText.equals(lastSearchText)) {
listCache.clear(); listCache.clear();
List<ITypedIngredient<?>> ingredients; Stream<ITypedIngredient<?>> ingredients;
String finalSearchTerm = filteringByTag ? ("$" + pSearchText) : pSearchText; String finalSearchTerm = filteringByTag ? ("$" + pSearchText) : pSearchText;
try { try {
ingredients = (List<ITypedIngredient<?>>)getIngredientListUncached.invokeExact(filter, finalSearchTerm); ingredients = (Stream<ITypedIngredient<?>>)getIngredientListUncached.invokeExact(filter, finalSearchTerm);
} catch(Throwable e) { } catch(Throwable e) {
ModernFix.LOGGER.error("Error searching", 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) { if(ingredient.getIngredient() instanceof ItemStack) {
listCache.add((ItemStack)ingredient.getIngredient()); listCache.add((ItemStack)ingredient.getIngredient());
} }
} });
lastSearchText = pSearchText; lastSearchText = pSearchText;
} }
return listCache; return listCache;

2
forge/src/main/resources/META-INF/mods.toml
View File

@ -57,6 +57,6 @@ side = "BOTH"
modId = "jei" modId = "jei"
mandatory = false mandatory = false
# This version range declares a minimum of the current minecraft version up to but not including the next major version # This version range declares a minimum of the current minecraft version up to but not including the next major version
versionRange = "[13,)" versionRange = "[15.8.0.11,)"
ordering = "BEFORE" ordering = "BEFORE"
side = "CLIENT" side = "CLIENT"

2
gradle.properties
View File

@ -10,7 +10,7 @@ enabled_platforms=fabric,forge
forge_version=1.20.1-47.1.3 forge_version=1.20.1-47.1.3
parchment_version=2023.07.09 parchment_version=2023.07.09
refined_storage_version=4392788 refined_storage_version=4392788
jei_version=13.1.0.2 jei_version=15.8.0.11
rei_version=11.0.597 rei_version=11.0.597
ctm_version=1.20.1-1.1.8+4 ctm_version=1.20.1-1.1.8+4
kubejs_version=1902.6.0-build.142 kubejs_version=1902.6.0-build.142