Merge remote-tracking branch 'origin/1.18' into 1.19.2

embeddedt · embeddedt · commit d89f8da5a2f7 · 2023-05-28T22:21:08.000-04:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java b/common/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java
@@ -98,7 +98,7 @@ public RefreshableSearchTree<ItemStack> getSearchTree(boolean tag) {
 
         @Override
         public boolean canUse() {
-            return ModernFixPlatformHooks.modPresent("jei") && getIngredientListUncached != null && filterField != null;
+            return ModernFixPlatformHooks.modPresent("jei") && !ModernFixPlatformHooks.modPresent("emi") && getIngredientListUncached != null && filterField != null;
         }
 
         @Override

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public RefreshableSearchTree<ItemStack> getSearchTree(boolean tag) {`
`98`	`98`
`99`	`99`	`@Override`
`100`	`100`	`public boolean canUse() {`
`101`		`- return ModernFixPlatformHooks.modPresent("jei") && getIngredientListUncached != null && filterField != null;`
	`101`	`+ return ModernFixPlatformHooks.modPresent("jei") && !ModernFixPlatformHooks.modPresent("emi") && getIngredientListUncached != null && filterField != null;`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`@Override`