Skip to content

Commit b24f82d

Browse files
committed
Merge 1.19.2 into 1.19.4
2 parents b43e790 + bbcc58f commit b24f82d

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public ModernFixMixinPlugin() {
4141

4242
if (option.isUserDefined()) {
4343
source = "user configuration";
44+
} else if (!ModernFixPlatformHooks.isLoadingNormally()) {
45+
source = "load error";
4446
} else if (option.isModDefined()) {
4547
source = "mods [" + String.join(", ", option.getDefiningMods()) + "]";
4648
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ private ModernFixEarlyConfig(File file) {
242242

243243
private void disableIfModPresent(String configName, String... ids) {
244244
for(String id : ids) {
245-
if(modPresent(id)) {
245+
if(!ModernFixPlatformHooks.isLoadingNormally() || modPresent(id)) {
246246
Option option = this.options.get(configName);
247247
if(option != null)
248248
option.addModOverride(false, id);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ public static MinecraftServer getCurrentServer() {
6969
}
7070

7171
public static boolean isLoadingNormally() {
72+
if(!LoadingModList.get().getErrors().isEmpty())
73+
return false;
7274
return ModLoader.isLoadingStateValid();
7375
}
7476

0 commit comments

Comments
 (0)