From 1dec8d130c7fe453bfe1e9da5dda237caaf1c3e5 Mon Sep 17 00:00:00 2001 From: HypherionSA Date: Sun, 2 Apr 2023 17:01:02 +0200 Subject: [PATCH] Fix config files not retaining comments --- Common/build.gradle | 2 +- .../me/hypherionmc/craterlib/common/config/ModuleConfig.java | 5 ++++- gradle.properties | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Common/build.gradle b/Common/build.gradle index a44da83..2a30002 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -40,7 +40,7 @@ shadowJar { include(dependency("me.hypherionmc.moon-config:core:${moon_config}")) include(dependency("me.hypherionmc.moon-config:toml:${moon_config}")) - //relocate 'me.hypherionmc.nightconfig', 'shadow.hypherionmc.nightconfig' + relocate 'me.hypherionmc.moonconfig', 'shadow.hypherionmc.moonconfig' } classifier '' } diff --git a/Common/src/main/java/me/hypherionmc/craterlib/common/config/ModuleConfig.java b/Common/src/main/java/me/hypherionmc/craterlib/common/config/ModuleConfig.java index 9c8a03d..717897e 100644 --- a/Common/src/main/java/me/hypherionmc/craterlib/common/config/ModuleConfig.java +++ b/Common/src/main/java/me/hypherionmc/craterlib/common/config/ModuleConfig.java @@ -108,8 +108,11 @@ public class ModuleConfig { /* Upgrade the config */ new ObjectConverter().toConfig(conf, newConfig); - updateConfigValues(config, newConfig, CommentedConfig.copy(newConfig), ""); + updateConfigValues(config, newConfig, newConfig, ""); newConfig.save(); + + config.close(); + newConfig.close(); } private void updateConfigValues(CommentedConfig oldConfig, CommentedConfig newConfig, CommentedConfig outputConfig, String subKey) { diff --git a/gradle.properties b/gradle.properties index 6591ebb..45f2dc2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Project version_major=0 version_minor=0 -version_patch=6d +version_patch=8d group=me.hypherionmc.craterlib # Common