R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.18 into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2024-05-12 16:59:12 -04:00
commit fdac36df9f
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
View File

@ -164,6 +164,7 @@ public class ModernFixEarlyConfig {
.put("mixin.perf.dynamic_resources", false) .put("mixin.perf.dynamic_resources", false)
.put("mixin.feature.direct_stack_trace", false) .put("mixin.feature.direct_stack_trace", false)
.put("mixin.feature.stalled_chunk_load_detection", 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.clear_mixin_classinfo", false)
.put("mixin.perf.deduplicate_climate_parameters", false) .put("mixin.perf.deduplicate_climate_parameters", false)
.put("mixin.bugfix.packet_leak", false) .put("mixin.bugfix.packet_leak", false)

4
common/src/main/java/org/embeddedt/modernfix/searchtree/SearchTreeProviderRegistry.java
View File

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