diff --git a/common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java b/common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java index ba391df8..f68fb052 100644 --- a/common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java +++ b/common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java @@ -41,7 +41,7 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin { 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()) + "]"; diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java index d463c345..dcb90800 100644 --- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java +++ b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java @@ -245,7 +245,7 @@ public class ModernFixEarlyConfig { 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); diff --git a/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java b/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java index 215ee888..1c18021e 100644 --- a/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java +++ b/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java @@ -57,6 +57,11 @@ public class ModernFixPlatformHooks { throw new AssertionError(); } + @ExpectPlatform + public static boolean isEarlyLoadingNormally() { + throw new AssertionError(); + } + @ExpectPlatform public static boolean isLoadingNormally() { throw new AssertionError(); diff --git a/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java b/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java index bf3bd4df..d0e0f149 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java +++ b/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java @@ -59,6 +59,10 @@ public class ModernFixPlatformHooksImpl { return ModernFixFabric.theServer.get(); } + public static boolean isEarlyLoadingNormally() { + return true; + } + public static boolean isLoadingNormally() { return true; } diff --git a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java index b03b6029..e63bfbfa 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java +++ b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java @@ -85,10 +85,12 @@ public class ModernFixPlatformHooksImpl { 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(); }