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

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java

@@ -33,10 +33,9 @@ private void replaceSearchTrees(CallbackInfo ci) {
             return;
         ModernFix.LOGGER.info("Replacing search trees with '{}' provider", provider.getName());
         mfix$runItemFillingQuirk();
-        var mainTree = provider.getSearchTree(false);
-        this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, mainTree);
+        this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, provider.getSearchTree(false));
         this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, provider.getSearchTree(true));
-        this.searchRegistry.register(SearchRegistry.RECIPE_COLLECTIONS, new RecipeBookSearchTree(mainTree));
+        this.searchRegistry.register(SearchRegistry.RECIPE_COLLECTIONS, new RecipeBookSearchTree(provider.getSearchTree(false)));
         // 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