diff --git a/YamlConfig b/YamlConfig index 9230f1a..67552e7 160000 --- a/YamlConfig +++ b/YamlConfig @@ -1 +1 @@ -Subproject commit 9230f1af4950114cd6e1c19b48066336a97c7177 +Subproject commit 67552e770799734372260ffde9ea33aa10d291c8 diff --git a/gradle.properties b/gradle.properties index fcff2dd..815c8ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.16.5 neoforge_version=21.1.79 snakeyaml_version=2.3 concurrentutil_version=0.0.2-SNAPSHOT -yamlconfig_version=1.0.1-SNAPSHOT +yamlconfig_version=1.0.2-SNAPSHOT cloth_version=15.0.128 # version ids from modrinth fabric_lithium_version=frXUdgvL diff --git a/src/main/java/ca/spottedleaf/moonrise/common/util/ConfigHolder.java b/src/main/java/ca/spottedleaf/moonrise/common/util/ConfigHolder.java index 94e7bff..27558a6 100644 --- a/src/main/java/ca/spottedleaf/moonrise/common/util/ConfigHolder.java +++ b/src/main/java/ca/spottedleaf/moonrise/common/util/ConfigHolder.java @@ -47,14 +47,6 @@ public final class ConfigHolder { } public static boolean reloadConfig() { - final boolean ret = reloadConfig0(); - - CONFIG.callInitialisers(); - - return ret; - } - - private static boolean reloadConfig0() { synchronized (CONFIG) { if (CONFIG_FILE.exists()) { try { @@ -65,6 +57,8 @@ public final class ConfigHolder { } } + CONFIG.callInitialisers(); + // write back any changes, or create if needed return saveConfig(); } diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/command/MoonriseCommand.java b/src/main/java/ca/spottedleaf/moonrise/patches/command/MoonriseCommand.java index 29f2f92..0ce81ec 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/command/MoonriseCommand.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/command/MoonriseCommand.java @@ -237,7 +237,7 @@ public final class MoonriseCommand { return Command.SINGLE_SUCCESS; } else { ctx.getSource().sendFailure( - Component.literal("Reloaded Moonrise config.") + Component.literal("Failed to reload Moonrise config, see logs.") .withStyle(ChatFormatting.RED) ); return 0;