Properly port recipe book tree to 1.19.2

embeddedt · Mar 30, 2024 · e9c266c · e9c266c
1 parent 099c626
commit e9c266c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/...ain/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java b/...ain/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java
@@ -29,7 +29,7 @@ private void replaceSearchTrees(CallbackInfo ci) {
         ModernFix.LOGGER.info("Replacing search trees with '{}' provider", provider.getName());
         this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, list -> provider.getSearchTree(false));
         this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, list -> provider.getSearchTree(true));
-        this.searchRegistry.register(SearchRegistry.RECIPE_COLLECTIONS, list -> new RecipeBookSearchTree(provider.getSearchTree(false)));
+        this.searchRegistry.register(SearchRegistry.RECIPE_COLLECTIONS, list -> new RecipeBookSearchTree(provider.getSearchTree(false), list));
         // grab components for all key mappings in order to prevent them from being loaded off-thread later
         // this populates the LazyLoadedValues
         // we also need to suppress GLFW errors to prevent crashes if a key is missing

diff --git a/common/src/main/java/org/embeddedt/modernfix/searchtree/RecipeBookSearchTree.java b/common/src/main/java/org/embeddedt/modernfix/searchtree/RecipeBookSearchTree.java
@@ -15,10 +15,11 @@
 public class RecipeBookSearchTree extends DummySearchTree<RecipeCollection> {
     private final SearchTree<ItemStack> stackCollector;
     private Map<Item, List<RecipeCollection>> collectionsByItem = null;
-    private final List<RecipeCollection> allCollections = new ArrayList<>();
+    private final List<RecipeCollection> allCollections;
 
-    public RecipeBookSearchTree(SearchTree<ItemStack> stackCollector) {
+    public RecipeBookSearchTree(SearchTree<ItemStack> stackCollector, List<RecipeCollection> allCollections) {
         this.stackCollector = stackCollector;
+        this.allCollections = allCollections;
     }
 
     private Map<Item, List<RecipeCollection>> populateCollectionMap() {
@@ -36,16 +37,6 @@ private Map<Item, List<RecipeCollection>> populateCollectionMap() {
         return collections;
     }
 
-    @Override
-    public void add(RecipeCollection pObj) {
-        this.allCollections.add(pObj);
-    }
-
-    @Override
-    public void clear() {
-        this.allCollections.clear();
-    }
-
     @Override
     public void refresh() {
         this.collectionsByItem = null;