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

Make REI search tree higher priority than JEI one

Browse Source 
Fixes issues with REI compat plugin
This commit is contained in:
embeddedt 2023-03-11 20:12:01 -05:00
parent 3380c3c70e
commit a9605a6888
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/embeddedt/modernfix/mixin/perf/blast_search_trees/MinecraftMixin.java
View File

@ -25,12 +25,12 @@ public class MinecraftMixin {
private void replaceSearchTrees(CallbackInfo ci) { private void replaceSearchTrees(CallbackInfo ci) {
ci.cancel(); ci.cancel();
Optional<? extends ModContainer> jeiContainer = ModList.get().getModContainerById("jei"); Optional<? extends ModContainer> jeiContainer = ModList.get().getModContainerById("jei");
if(jeiContainer.isPresent() && jeiContainer.get().getModInfo().getVersion().getMajorVersion() >= 10) { if(ModList.get().isLoaded("roughlyenoughitems")) {
this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, new JEIBackedSearchTree(false));
this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, new JEIBackedSearchTree(true));
} else if(ModList.get().isLoaded("roughlyenoughitems")) {
this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, new REIBackedSearchTree(false)); this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, new REIBackedSearchTree(false));
this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, new REIBackedSearchTree(true)); this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, new REIBackedSearchTree(true));
} else if(jeiContainer.isPresent() && jeiContainer.get().getModInfo().getVersion().getMajorVersion() >= 10) {
this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, new JEIBackedSearchTree(false));
this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, new JEIBackedSearchTree(true));
} else { } else {
this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, new DummySearchTree<>()); this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, new DummySearchTree<>());
this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, new DummySearchTree<>()); this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, new DummySearchTree<>());