From 98663fa416df6a8955332c0cd9a374a3e0079e34 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Fri, 7 Jul 2023 12:39:26 -0400
Subject: [PATCH 1/2] Never replace search tree on 1.16 with REI present

---
 .../forge/mixin/perf/blast_search_trees/MinecraftMixin.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/MinecraftMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/MinecraftMixin.java
index b16ac7cc..aff19be1 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/MinecraftMixin.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/MinecraftMixin.java
@@ -21,7 +21,7 @@ public class MinecraftMixin {
     @Inject(method = "createSearchTrees", at = @At("HEAD"), cancellable = true)
     private void replaceSearchTrees(CallbackInfo ci) {
         ci.cancel();
-        if(ModList.get().getModFileById("jei") != null) {
+        if(ModList.get().getModFileById("jei") != null && ModList.get().getModFileById("roughlyenoughitems") == null) {
             this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, new JEIBackedSearchTree(false));
             this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, new JEIBackedSearchTree(true));
         } else {

From 1c0fca8f068f45d24a2b51e27a0b749188045d9b Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Fri, 7 Jul 2023 12:40:46 -0400
Subject: [PATCH 2/2] Spotless

---
 .../embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
index fe7cf0d6..d8162c4e 100644
--- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
+++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java
@@ -30,7 +30,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;