Fix language files not being created

eldoriarpg · Aug 19, 2024 · 6d16508 · 6d16508
1 parent 7b6b961
commit 6d16508
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,7 +17,7 @@ plugins {
 publishData {
     addRepo(Repo.main("", "", false))
     addRepo(Repo.snapshot("SNAPSHOT", "", false))
-    publishingVersion = "2.1.4"
+    publishingVersion = "2.1.5"
 }
 version = publishData.getVersion()
 

diff --git a/core/src/main/java/de/eldoria/eldoutilities/localization/ILocalizer.java b/core/src/main/java/de/eldoria/eldoutilities/localization/ILocalizer.java
@@ -10,9 +10,11 @@
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ResourceBundle;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 /**
@@ -69,6 +71,13 @@ static boolean isLocaleCode(String message) {
      */
     String[] getIncludedLocales();
 
+    /**
+     * Returns all available locales.
+     *
+     * @return set of registered locales.
+     */
+    Set<String> includedLocales();
+
     /**
      * Add requested locale codes in runtime.
      * <p>
@@ -141,6 +150,11 @@ public String[] getIncludedLocales() {
             return new String[0];
         }
 
+        @Override
+        public Set<String> includedLocales() {
+            return Collections.emptySet();
+        }
+
         @Override
         public void addLocaleCodes(Map<String, String> runtimeLocaleCodes) {
         }

diff --git a/localization/src/main/java/de/eldoria/eldoutilities/localization/Localizer.java b/localization/src/main/java/de/eldoria/eldoutilities/localization/Localizer.java
@@ -59,7 +59,7 @@ public class Localizer implements ILocalizer {
     private final Plugin plugin;
     private final String localesPath;
     private final String localesPrefix;
-    private final String[] includedLocales;
+    private final Set<String> includedLocales;
     private final Pattern localePattern = Pattern.compile("_(([a-zA-Z]{2})(_[a-zA-Z]{2})?)\\.properties");
     private final Map<String, String> runtimeLocaleCodes = new HashMap<>();
     private final Map<String, ResourceBundle> languages = new HashMap<>();
@@ -85,7 +85,7 @@ public class Localizer implements ILocalizer {
      * @param includedLocales internal provided locales
      */
     Localizer(Plugin plugin, String localesPath,
-              String localesPrefix, String fallbackLocale, Function<Player, String> userLocale, String... includedLocales) {
+              String localesPrefix, String fallbackLocale, Function<Player, String> userLocale, Set<String> includedLocales) {
         this.plugin = plugin;
         this.localesPath = localesPath;
         this.localesPrefix = localesPrefix;
@@ -547,8 +547,13 @@ public String localize(CommandSender sender, String message) {
      * @return array of available locales.
      */
     @Override
+    @Deprecated(forRemoval = true)
     public String[] getIncludedLocales() {
-        return includedLocales;
+        return includedLocales.toArray(new String[0]);
+    }
+
+    public Set<String> includedLocales() {
+        return Collections.unmodifiableSet(includedLocales);
     }
 
     @Override

diff --git a/localization/src/main/java/de/eldoria/eldoutilities/localization/LocalizerBuilder.java b/localization/src/main/java/de/eldoria/eldoutilities/localization/LocalizerBuilder.java
@@ -9,19 +9,23 @@
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.function.Function;
 
 public class LocalizerBuilder {
     private final Plugin plugin;
     private final String fallbackLocale;
+    private final Set<String> includedLocales = new HashSet<>();
     private String localesPath = "messages";
     private String localesPrefix = "messages";
     private Function<Player, String> userLocale;
-    private String[] includedLocales = new String[0];
 
     LocalizerBuilder(Plugin plugin, String fallbackLocale) {
         this.plugin = plugin;
         this.fallbackLocale = fallbackLocale;
+        includedLocales.add(fallbackLocale);
         userLocale = p -> fallbackLocale;
     }
 
@@ -41,7 +45,7 @@ public LocalizerBuilder setUserLocale(Function<Player, String> userLocale) {
     }
 
     public LocalizerBuilder setIncludedLocales(String... includedLocales) {
-        this.includedLocales = includedLocales;
+        this.includedLocales.addAll(Arrays.stream(includedLocales).toList());
         return this;
     }