updates to translations

src/main/java/carpet/utils/LanguageUtils.java

@@ -1,106 +0,0 @@
-package carpet.utils;
-
-import com.google.common.collect.ImmutableList;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-import org.apache.commons.io.IOUtils;
-
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-public class LanguageUtils
-{
-    private static Map<String, String> translationMap;
-
-    public static String currentLanguage;
-
-    public static String translate(String translationKey)
-    {
-        if (translationMap == null)
-        {
-            return translationKey;
-        }
-        return translationMap.getOrDefault(translationKey, translationKey);
-    }
-
-    public static String translateOrDefault(String translationKey, String defaultValue)
-    {
-        if (translationMap == null)
-        {
-            return defaultValue;
-        }
-        return translationMap.getOrDefault(translationKey, defaultValue);
-    }
-
-    public static String translatePlusDefault(String translationKey, String defaultValue){
-        return translationMap.containsKey(translationKey) ? translateOrDefault(translationKey, defaultValue) + String.format(" (%s)", defaultValue): defaultValue;
-    }
-
-    public static String getRuleNameKey(String rule)
-    {
-        return String.format("carpet.rule.%s.name", rule);
-    }
-
-    public static String getRuleDescKey(String rule)
-    {
-        return String.format("carpet.rule.%s.desc", rule);
-    }
-
-    public static ImmutableList<String> getRuleExtras(String rule, ImmutableList<String> defaultList)
-    {
-        if (translationMap == null) return defaultList;
-        String keyBase = String.format("carpet.rule.%s.extra.", rule);
-        List<String> extras = new ArrayList<>();
-        int i = 0;
-        do {
-            String keyExtra = keyBase + i;
-            String value = translationMap.get(keyExtra);
-            System.out.println(keyExtra);
-            System.out.println(value);
-            if (value != null && !value.equals(""))
-            {
-                extras.add(value);
-            }
-            i++;
-        }
-        while (translationMap.containsKey(keyBase + (i - 1)));
-        return (extras.isEmpty()) ? defaultList : ImmutableList.copyOf(extras);
-    }
-
-    public static void setLanguage(String language)
-    {
-        if (language.equals("none"))
-        {
-            currentLanguage = language;
-            translationMap = null;
-            return;
-        }
-
-        String langJs;
-        try{
-            langJs = IOUtils.toString(
-                    Objects.requireNonNull(LanguageUtils.class.getClassLoader().getResourceAsStream(String.format("assets/carpet/lang/%s.json", language))),
-                    StandardCharsets.UTF_8);
-        } catch (NullPointerException | IOException e) {
-            return;
-        }
-        Gson gson = new GsonBuilder().enableComplexMapKeySerialization().create();
-        Type type = new TypeToken<Map<String, String>>() {}.getType();
-        Map<String, String> map1 = gson.fromJson(langJs, type);
-        currentLanguage = language;
-        translationMap = map1;
-    }
-
-    public static void loadConfiguration()
-    {
-
-    }
-
-
-}

src/main/java/carpet/utils/Translations.java

@@ -0,0 +1,68 @@
+package carpet.utils;
+
+import carpet.CarpetSettings;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import net.minecraft.server.command.ServerCommandSource;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Objects;
+
+public class Translations
+{
+    private static Map<String, String> translationMap;
+
+    public static String tr(String key)
+    {
+        return translationMap == null ? key : translationMap.getOrDefault(key, key);
+    }
+
+    public static String tr(String key, String str)
+    {
+        return translationMap == null ? str : translationMap.getOrDefault(key, str);
+    }
+
+    public static boolean hasTranslations()
+    {
+        return translationMap != null;
+    }
+
+    public static boolean hasTranslation(String key)
+    {
+        return translationMap != null && translationMap.containsKey(key);
+    }
+
+    public static void updateLanguage(ServerCommandSource source)
+    {
+        if (CarpetSettings.language.equalsIgnoreCase("none"))
+        {
+            translationMap = null;
+            return;
+        }
+        String langJs;
+        try
+        {
+            langJs = IOUtils.toString(
+                    Objects.requireNonNull(Translations.class.getClassLoader().getResourceAsStream(String.format("assets/carpet/lang/%s.json", CarpetSettings.language))),
+                    StandardCharsets.UTF_8);
+        } catch (NullPointerException | IOException e) {
+            Messenger.m(source, "r Failed to update language");
+            return;
+        }
+        Gson gson = new GsonBuilder().enableComplexMapKeySerialization().create();
+        Type type = new TypeToken<Map<String, String>>() {}.getType();
+        translationMap = gson.fromJson(langJs, type);
+    }
+
+
+    public static boolean isValidLanguage(String newValue)
+    {
+        // will put some validations for availble languages at some point
+        return true;
+    }
+}