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

Merge 1.19.2 into 1.19.4

Browse Source
This commit is contained in:
embeddedt 2023-07-24 16:05:00 -04:00
commit 512ed02db2
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,8 +32,8 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
throw new RuntimeException("Could not load configuration file for ModernFix", e); throw new RuntimeException("Could not load configuration file for ModernFix", e);
} }
this.logger.info("Loaded configuration file for ModernFix: {} options available, {} override(s) found", this.logger.info("Loaded configuration file for ModernFix {}: {} options available, {} override(s) found",
config.getOptionCount(), config.getOptionOverrideCount()); ModernFixPlatformHooks.getVersionString(), config.getOptionCount(), config.getOptionOverrideCount());
config.getOptionMap().values().forEach(option -> { config.getOptionMap().values().forEach(option -> {
if (option.isOverridden()) { if (option.isOverridden()) {

2
forge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java
View File

@ -50,8 +50,6 @@ public class ConfigFixer {
this.actualHandler.accept(modConfigEvent); this.actualHandler.accept(modConfigEvent);
} }
} else { } else {
if(modConfigEvent.getConfig().getConfigData() != null)
ModernFix.LOGGER.warn("Unable to sync on a {} config object", modConfigEvent.getConfig().getConfigData().getClass().getName());
this.actualHandler.accept(modConfigEvent); this.actualHandler.accept(modConfigEvent);
} }
} }

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

@ -35,6 +35,7 @@ import java.lang.reflect.Field;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
@ -51,7 +52,12 @@ public class ModernFixPlatformHooksImpl {
public static String getVersionString() { public static String getVersionString() {
if(verString == null) { if(verString == null) {
verString = LoadingModList.get().getModFileById("modernfix").getMods().get(0).getVersion().toString(); try {
verString = ModernFixMixinPlugin.class.getPackage().getImplementationVersion();
Objects.requireNonNull(verString);
} catch(Throwable e) {
verString = "[unknown]";
}
} }
return verString; return verString;
} }