Merge 1.18 into 1.19.2

embeddedt · May 12, 2024 · fdac36d · fdac36d
2 parents d9a44ee + ad9ce12
commit fdac36d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
@@ -164,6 +164,7 @@ public DefaultSettingMapBuilder put(String key, Boolean value) {
             .put("mixin.perf.dynamic_resources", false)
             .put("mixin.feature.direct_stack_trace", false)
             .put("mixin.feature.stalled_chunk_load_detection", false)
+            .put("mixin.perf.blast_search_trees.force", false)
             .put("mixin.perf.clear_mixin_classinfo", false)
             .put("mixin.perf.deduplicate_climate_parameters", false)
             .put("mixin.bugfix.packet_leak", false)

diff --git a/common/src/main/java/org/embeddedt/modernfix/searchtree/SearchTreeProviderRegistry.java b/common/src/main/java/org/embeddedt/modernfix/searchtree/SearchTreeProviderRegistry.java
@@ -3,7 +3,6 @@
 import net.minecraft.client.searchtree.RefreshableSearchTree;
 import net.minecraft.world.item.ItemStack;
 import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
-import org.embeddedt.modernfix.core.config.Option;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,8 +15,7 @@ public static synchronized Provider getSearchTreeProvider() {
             if(p.canUse())
                 return p;
         }
-        Option option = ModernFixMixinPlugin.instance.config.getEffectiveOptionForMixin("perf.blast_search_trees.Registry");
-        if(option != null && option.isOverridden())
+        if(ModernFixMixinPlugin.instance.isOptionEnabled("perf.blast_search_trees.force.Registry"))
             return DummySearchTree.PROVIDER;
         else
             return null;