Merge pull request #52 from TheNextLvl-net/renovate/net.thenextlvl.core-i18n-3.x

fix(deps): update dependency net.thenextlvl.core:i18n to v3

Author: NonSwag

build.gradle.kts

@@ -31,7 +31,7 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")
     compileOnly("net.thenextlvl.services:service-io:2.2.0")
 
-    implementation("net.thenextlvl.core:i18n:1.0.21")
+    implementation("net.thenextlvl.core:i18n:3.2.0")
     implementation("net.thenextlvl.core:files:3.0.0")
     implementation("net.thenextlvl.core:paper:2.1.1")
     implementation("org.bstats:bstats-bukkit:3.1.0")

src/main/java/net/thenextlvl/economist/EconomistPlugin.java

@@ -4,6 +4,7 @@
 import core.i18n.file.ComponentBundle;
 import core.io.IO;
 import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
+import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -30,6 +31,7 @@
 import org.jspecify.annotations.NullMarked;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Locale;
@@ -44,21 +46,20 @@ public class EconomistPlugin extends JavaPlugin {
             new PluginConfig()
     ).validate().save().getRoot();
 
-    private final File translations = new File(getDataFolder(), "translations");
-
-    private final ComponentBundle bundle = new ComponentBundle(translations,
-            audience -> audience instanceof Player player ? player.locale() : Locale.US)
-            .register("economist", Locale.US)
-            .register("economist_german", Locale.GERMANY)
-            .miniMessage(bundle -> MiniMessage.builder().tags(TagResolver.resolver(
-                    TagResolver.standard(),
-                    Placeholder.component("prefix", bundle.component(Locale.US, "prefix"))
-            )).build());
-
-    private final ComponentBundle abbreviations = new ComponentBundle(translations,
-            audience -> audience instanceof Player player ? player.locale() : Locale.US)
-            .register("abbreviations", Locale.US)
-            .register("abbreviations_german", Locale.GERMANY);
+    private final Key abbreviationsKey = Key.key("economist", "translations");
+    private final Key translationsKey = Key.key("economist", "translations");
+    private final Path translations = getDataPath().resolve("translations");
+
+    private final ComponentBundle bundle = ComponentBundle.builder(translationsKey, translations)
+            .placeholder("prefix", "prefix")
+            .resource("economist", Locale.US)
+            .resource("economist_german", Locale.GERMANY)
+            .build();
+
+    private final ComponentBundle abbreviations = ComponentBundle.builder(abbreviationsKey, translations)
+            .resource("abbreviations", Locale.US)
+            .resource("abbreviations_german", Locale.GERMANY)
+            .build();
 
     private final EconomistBankController bankController = new EconomistBankController(this);
     private final EconomistEconomyController economyController = new EconomistEconomyController(this);

src/main/java/net/thenextlvl/economist/controller/Abbreviation.java

@@ -1,5 +1,6 @@
 package net.thenextlvl.economist.controller;
 
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import net.thenextlvl.economist.EconomistPlugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jspecify.annotations.NullMarked;
@@ -155,8 +156,9 @@ static String format(double amount, NumberFormat format, Locale locale) {
                 .max((entry, other) -> entry.getKey().compareTo(other.getKey()))
                 .map(entry -> {
                     var prefix = negative ? "-" : "";
-                    var abbreviation = plugin.abbreviations().format(locale, entry.getValue());
+                    var translation = plugin.abbreviations().component(entry.getValue(), locale);
                     var formatted = format.format(positive / entry.getKey().doubleValue());
+                    var abbreviation = PlainTextComponentSerializer.plainText().serialize(translation);
                     return prefix + formatted + abbreviation;
                 }).orElseGet(() -> format.format(amount));
     }

src/main/java/net/thenextlvl/economist/controller/EconomistEconomyController.java

@@ -1,5 +1,6 @@
 package net.thenextlvl.economist.controller;
 
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import net.thenextlvl.economist.EconomistPlugin;
 import net.thenextlvl.economist.api.Account;
 import net.thenextlvl.economist.api.EconomyController;
@@ -75,14 +76,14 @@ private DataController dataController() {
 
     @Override
     public String getCurrencyNamePlural(Locale locale) {
-        var format = plugin.bundle().format(locale, "currency.name.plural");
-        return format != null ? format : "currency.name.plural";
+        var translation = plugin.bundle().component("currency.name.plural", locale);
+        return PlainTextComponentSerializer.plainText().serialize(translation);
     }
 
     @Override
     public String getCurrencyNameSingular(Locale locale) {
-        var format = plugin.bundle().format(locale, "currency.name.singular");
-        return format != null ? format : "currency.name.singular";
+        var translation = plugin.bundle().component("currency.name.singular", locale);
+        return PlainTextComponentSerializer.plainText().serialize(translation);
     }
 
     @Override