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

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/searchtree/SearchTreeProviderRegistry.java

@@ -3,6 +3,7 @@
 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;
@@ -15,7 +16,8 @@ public static synchronized Provider getSearchTreeProvider() {
             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;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java

@@ -28,9 +28,6 @@ private static void doModernFixBootstrap(CallbackInfo ci) {
     /* 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();
     }
 }