From 6498c5af2cae79a36d52c72fb2b304ba6d547f81 Mon Sep 17 00:00:00 2001
From: Vankka <vankka.main@gmail.com>
Date: Sat, 28 Dec 2024 01:00:51 +0200
Subject: [PATCH] Translation config in json instead of yaml

---
 .github/workflows/crowdin-download.yaml                     | 2 +-
 .github/workflows/crowdin-upload.yaml                       | 2 +-
 common/build.gradle                                         | 1 +
 .../manager/abstraction/ConfigurateConfigManager.java       | 2 +-
 .../manager/abstraction/TranslatedConfigManager.java        | 4 ++--
 i18n/build.gradle                                           | 1 +
 .../java/com/discordsrv/config/DiscordSRVTranslation.java   | 6 +++---
 settings.gradle                                             | 3 ++-
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/crowdin-download.yaml b/.github/workflows/crowdin-download.yaml
index e73cfeab..4d81ae0e 100644
--- a/.github/workflows/crowdin-download.yaml
+++ b/.github/workflows/crowdin-download.yaml
@@ -40,7 +40,7 @@ jobs:
 
           project_id: ${{ secrets.CROWDIN_PROJECT_ID }}
           token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-          source: "i18n/build/source.yaml"
+          source: "i18n/build/source.json"
           translation: "/i18n/src/main/resources/translations/%two_letters_code%.%file_extension%"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/crowdin-upload.yaml b/.github/workflows/crowdin-upload.yaml
index 333db749..774f9cab 100644
--- a/.github/workflows/crowdin-upload.yaml
+++ b/.github/workflows/crowdin-upload.yaml
@@ -32,7 +32,7 @@ jobs:
 
           project_id: ${{ secrets.CROWDIN_PROJECT_ID }}
           token: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-          source: "i18n/build/source.yaml"
+          source: "i18n/build/source.json"
           translation: "/i18n/src/main/resources/translations/%two_letters_code%.%file_extension%"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/common/build.gradle b/common/build.gradle
index 54d67710..da4162a3 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -79,6 +79,7 @@ dependencies {
 
     // Config
     runtimeDownloadApi(libs.configurate.yaml)
+    runtimeDownloadApi(libs.configurate.jackson)
 
     // Logging
     compileOnly(libs.log4j.core)
diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java b/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java
index a6eec74a..53cb859c 100644
--- a/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java
+++ b/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/ConfigurateConfigManager.java
@@ -300,7 +300,7 @@ public abstract class ConfigurateConfigManager<T, LT extends AbstractConfigurati
 
                     return (value, destination) -> {
                         processor.process(value, destination);
-                        if (destination instanceof CommentedConfigurationNode) {
+                        if (commentSubstitutions && destination instanceof CommentedConfigurationNode) {
                             String comment = ((CommentedConfigurationNode) destination).comment();
                             if (comment != null) {
                                 // Yaml doesn't render empty lines correctly, so we add a space when there are double line breaks
diff --git a/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/TranslatedConfigManager.java b/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/TranslatedConfigManager.java
index f931a7ff..fe471176 100644
--- a/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/TranslatedConfigManager.java
+++ b/common/src/main/java/com/discordsrv/common/config/configurate/manager/abstraction/TranslatedConfigManager.java
@@ -25,9 +25,9 @@ import org.jetbrains.annotations.Nullable;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.jackson.JacksonConfigurationLoader;
 import org.spongepowered.configurate.loader.AbstractConfigurationLoader;
 import org.spongepowered.configurate.serialize.SerializationException;
-import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
 import java.net.URL;
 import java.nio.file.Path;
@@ -127,7 +127,7 @@ public abstract class TranslatedConfigManager<T extends Config, LT extends Abstr
             return null;
         }
 
-        return YamlConfigurationLoader.builder().url(resourceURL).build().load();
+        return JacksonConfigurationLoader.builder().url(resourceURL).build().load();
     }
 
     private void translateNode(
diff --git a/i18n/build.gradle b/i18n/build.gradle
index f083ee85..a1dbd483 100644
--- a/i18n/build.gradle
+++ b/i18n/build.gradle
@@ -20,6 +20,7 @@ dependencies {
     implementation(project(':velocity')) { transitive = false }
 
     api(libs.configurate.yaml)
+    api(libs.configurate.jackson)
 }
 
 application {
diff --git a/i18n/src/main/java/com/discordsrv/config/DiscordSRVTranslation.java b/i18n/src/main/java/com/discordsrv/config/DiscordSRVTranslation.java
index 50ca5ca9..0d3fa3b3 100644
--- a/i18n/src/main/java/com/discordsrv/config/DiscordSRVTranslation.java
+++ b/i18n/src/main/java/com/discordsrv/config/DiscordSRVTranslation.java
@@ -28,10 +28,10 @@ import com.discordsrv.common.core.logging.backend.impl.JavaLoggerImpl;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.jackson.JacksonConfigurationLoader;
 import org.spongepowered.configurate.objectmapping.ObjectMapper;
 import org.spongepowered.configurate.objectmapping.meta.Processor;
 import org.spongepowered.configurate.serialize.SerializationException;
-import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -103,8 +103,8 @@ public final class DiscordSRVTranslation {
             section.set(configSection);
         }
 
-        YamlConfigurationLoader.builder()
-                .path(Paths.get("i18n", "build", "source.yaml"))
+        JacksonConfigurationLoader.builder()
+                .path(Paths.get("i18n", "build", "source.json"))
                 .build()
                 .save(node);
     }
diff --git a/settings.gradle b/settings.gradle
index f8c2a975..ed2ce75f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -83,8 +83,9 @@ dependencyResolutionManagement {
             library('jackson-databind', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.16.1')
 
             // Config(urate)
-            version('configurate', '4.2.0-yamlbranch-4')
+            version('configurate', '4.2.0-yamlbranch-5')
             library('configurate-yaml', 'org.spongepowered', 'configurate-yaml').versionRef('configurate')
+            library('configurate-jackson', 'org.spongepowered', 'configurate-jackson').versionRef('configurate')
 
             // DB
             library('hikaricp', 'com.zaxxer', 'HikariCP').version {