R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.19.4 into 1.20

Browse Source
This commit is contained in:
embeddedt 2023-07-23 18:33:34 -04:00
commit 90f6f6d68d
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java
View File

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

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

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

2
forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java
View File

@ -69,6 +69,8 @@ public class ModernFixPlatformHooksImpl {
} }
public static boolean isLoadingNormally() { public static boolean isLoadingNormally() {
if(!LoadingModList.get().getErrors().isEmpty())
return false;
return ModLoader.isLoadingStateValid(); return ModLoader.isLoadingStateValid();
} }