Skip to content

Commit 6ae1992

Browse files
committed
Merge 1.16 into 1.18
2 parents 5338cca + 7f44701 commit 6ae1992

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public ModernFixMixinPlugin() {
3232
throw new RuntimeException("Could not load configuration file for ModernFix", e);
3333
}
3434

35-
this.logger.info("Loaded configuration file for ModernFix: {} options available, {} override(s) found",
36-
config.getOptionCount(), config.getOptionOverrideCount());
35+
this.logger.info("Loaded configuration file for ModernFix {}: {} options available, {} override(s) found",
36+
ModernFixPlatformHooks.getVersionString(), config.getOptionCount(), config.getOptionOverrideCount());
3737

3838
config.getOptionMap().values().forEach(option -> {
3939
if (option.isOverridden()) {

forge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public void accept(IConfigEvent modConfigEvent) {
5050
this.actualHandler.accept(modConfigEvent);
5151
}
5252
} else {
53-
if(modConfigEvent.getConfig().getConfigData() != null)
54-
ModernFix.LOGGER.warn("Unable to sync on a {} config object", modConfigEvent.getConfig().getConfigData().getClass().getName());
5553
this.actualHandler.accept(modConfigEvent);
5654
}
5755
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.lang.reflect.Field;
4040
import java.nio.file.Path;
4141
import java.util.Map;
42+
import java.util.Objects;
4243
import java.util.function.Consumer;
4344

4445
public class ModernFixPlatformHooksImpl {
@@ -54,7 +55,12 @@ public static boolean isDedicatedServer() {
5455

5556
public static String getVersionString() {
5657
if(verString == null) {
57-
verString = LoadingModList.get().getModFileById("modernfix").getMods().get(0).getVersion().toString();
58+
try {
59+
verString = ModernFixMixinPlugin.class.getPackage().getImplementationVersion();
60+
Objects.requireNonNull(verString);
61+
} catch(Throwable e) {
62+
verString = "[unknown]";
63+
}
5864
}
5965
return verString;
6066
}

0 commit comments

Comments
 (0)