Merge 1.16 into 1.18

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java

@@ -41,7 +41,7 @@ public ModernFixMixinPlugin() {
 
                     if (option.isUserDefined()) {
                         source = "user configuration";
-                    } else if (!ModernFixPlatformHooks.isLoadingNormally()) {
+                    } else if (!ModernFixPlatformHooks.isEarlyLoadingNormally()) {
                         source = "load error";
                     } else if (option.isModDefined()) {
                         source = "mods [" + String.join(", ", option.getDefiningMods()) + "]";

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

@@ -242,7 +242,7 @@ private ModernFixEarlyConfig(File file) {
 
     private void disableIfModPresent(String configName, String... ids) {
         for(String id : ids) {
-            if(!ModernFixPlatformHooks.isLoadingNormally() || modPresent(id)) {
+            if(!ModernFixPlatformHooks.isEarlyLoadingNormally() || modPresent(id)) {
                 Option option = this.options.get(configName);
                 if(option != null)
                     option.addModOverride(false, id);

common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java

@@ -57,6 +57,11 @@ public static MinecraftServer getCurrentServer() {
         throw new AssertionError();
     }
 
+    @ExpectPlatform
+    public static boolean isEarlyLoadingNormally() {
+        throw new AssertionError();
+    }
+
     @ExpectPlatform
     public static boolean isLoadingNormally() {
         throw new AssertionError();

fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java

@@ -59,6 +59,10 @@ public static MinecraftServer getCurrentServer() {
         return ModernFixFabric.theServer.get();
     }
 
+    public static boolean isEarlyLoadingNormally() {
+        return true;
+    }
+
     public static boolean isLoadingNormally() {
         return true;
     }

forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java

@@ -71,10 +71,12 @@ public static MinecraftServer getCurrentServer() {
         return ServerLifecycleHooks.getCurrentServer();
     }
 
+    public static boolean isEarlyLoadingNormally() {
+        return LoadingModList.get().getErrors().isEmpty();
+    }
+
     public static boolean isLoadingNormally() {
-        if(!LoadingModList.get().getErrors().isEmpty())
-            return false;
-        return ModLoader.isLoadingStateValid();
+        return isEarlyLoadingNormally() && ModLoader.isLoadingStateValid();
     }