From b25234e431795eaf031394b8c0cf7e53f218e1c0 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 16 May 2023 10:16:32 -0400 Subject: [PATCH 1/2] Fix search tree provider crash --- .../modernfix/searchtree/SearchTreeProviderRegistry.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/searchtree/SearchTreeProviderRegistry.java b/common/src/main/java/org/embeddedt/modernfix/searchtree/SearchTreeProviderRegistry.java index 7b335c3d..f051e48c 100644 --- a/common/src/main/java/org/embeddedt/modernfix/searchtree/SearchTreeProviderRegistry.java +++ b/common/src/main/java/org/embeddedt/modernfix/searchtree/SearchTreeProviderRegistry.java @@ -3,6 +3,7 @@ package org.embeddedt.modernfix.searchtree; import net.minecraft.client.searchtree.ReloadableIdSearchTree; 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; @@ -15,7 +16,8 @@ public class SearchTreeProviderRegistry { if(p.canUse()) return p; } - if(ModernFixMixinPlugin.instance.config.getEffectiveOptionForMixin("mixin.perf.blast_search_trees.Registry").isOverridden()) + Option option = ModernFixMixinPlugin.instance.config.getEffectiveOptionForMixin("perf.blast_search_trees.Registry"); + if(option != null && option.isOverridden()) return DummySearchTree.PROVIDER; else return null; From dba6e1210ee08e22d1e3d92db807ff045786d95a Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 16 May 2023 10:17:12 -0400 Subject: [PATCH 2/2] Fix classloading hack not working anymore --- .../embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java index f41ccb15..af3c25bd 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java @@ -28,9 +28,6 @@ public class BootstrapMixin { /* for https://github.com/MinecraftForge/MinecraftForge/issues/9505 */ @Inject(method = "bootStrap", at = @At("RETURN")) private static void doClassloadHack(CallbackInfo ci) { - if(!isBootstrapped) { - NetworkConstants.init(); - LOGGER.info("Worked around Forge issue #9505"); - } + NetworkConstants.init(); } }