Remove language cause it useless, all option switch to game-language

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -1941,16 +1941,18 @@ private void updateConfig(int selectedVersion) throws IOException {
             getConfiguration().set("config-version", ++selectedVersion);
         }
         if (selectedVersion == 143) {
-            if (getConfiguration().get("language") == null) {
-                getConfiguration().set("language", "en-US");
-            }
+            getConfiguration().set("language", null);
+//            if (getConfiguration().get("language") == null) {
+//                getConfiguration().set("language", "en-US");
+//            }
             getConfiguration().set("config-version", ++selectedVersion);
         }
 
         if (selectedVersion == 144) {
             // Updater set it to true because plugin upgrading
             // Default configuration disable it cause probably fresh install
             getConfiguration().getOrDefault("legacy-updater.shop-sign", true);
+            getConfiguration().set("language", null);
             getConfiguration().set("config-version", ++selectedVersion);
         }
         if (getConfiguration().getInt("matcher.work-type") != 0 && GameVersion.get(ReflectFactory.getServerVersion()).name().contains("1_16")) {

src/main/java/org/maxgamer/quickshop/localization/game/game/MojangGameLanguageImpl.java

@@ -25,7 +25,6 @@
 import lombok.Getter;
 import lombok.SneakyThrows;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.enchantments.Enchantment;
@@ -47,7 +46,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.Locale;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
@@ -72,29 +70,7 @@ public class MojangGameLanguageImpl extends BukkitGameLanguageImpl implements Ga
     public MojangGameLanguageImpl(@NotNull QuickShop plugin, @NotNull String languageCode) {
         super(plugin);
         this.plugin = plugin;
-        if ("default".equalsIgnoreCase(languageCode)) {
-            Locale locale = Locale.getDefault();
-            String language = locale.getLanguage();
-            String country = locale.getCountry();
-            boolean isLanguageEmpty = StringUtils.isEmpty(language);
-            boolean isCountryEmpty = StringUtils.isEmpty(country);
-            if (isLanguageEmpty && isCountryEmpty) {
-                plugin.getLogger().warning("Unable to get language code, fallback to en_US, please change game-language option in config.yml.");
-                languageCode = "en_US";
-            } else {
-                if (isCountryEmpty || isLanguageEmpty) {
-                    languageCode = isLanguageEmpty ? country + '_' + country : language + '_' + language;
-                    if ("en_en".equals(languageCode)) {
-                        languageCode = "en_US";
-                    }
-                    plugin.getLogger().warning("Unable to get language code, guessing " + languageCode + " instead, If it's incorrect, please change game-language option in config.yml.");
-                } else {
-                    languageCode = language + '_' + country;
-                }
-            }
-        }
-        languageCode = languageCode.replace("-", "_").toLowerCase(Locale.ROOT);
-
+        languageCode = MsgUtil.processGameLanguageCode(languageCode);
         switch (plugin.getConfiguration().getOrDefault("mojangapi-mirror", 0)) {
             case 0:
                 mirror = new MojangApiOfficialMirror();

src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java

@@ -52,6 +52,7 @@
 import org.maxgamer.quickshop.api.chat.ComponentPackage;
 import org.maxgamer.quickshop.api.event.*;
 import org.maxgamer.quickshop.api.shop.*;
+import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.ReflectFactory;
 import org.maxgamer.quickshop.util.Util;
 import org.maxgamer.quickshop.util.logging.container.ShopRemoveLog;
@@ -819,7 +820,7 @@ public void setSignText() {
         if (!Util.isLoaded(this.location)) {
             return;
         }
-        this.setSignText(getSignText(plugin.getConfiguration().getOrDefault("language", "en-US")));
+        this.setSignText(getSignText(MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default"))));
         // this.setSignText(getSignText("en_us"));
     }
 

src/main/java/org/maxgamer/quickshop/util/MsgUtil.java

@@ -170,6 +170,33 @@ public static String fillArgs(@Nullable String raw, @Nullable String... args) {
         return raw;
     }
 
+    @Unstable
+    public static String processGameLanguageCode(String languageCode) {
+        if ("default".equalsIgnoreCase(languageCode)) {
+            Locale locale = Locale.getDefault();
+            String language = locale.getLanguage();
+            String country = locale.getCountry();
+            boolean isLanguageEmpty = StringUtils.isEmpty(language);
+            boolean isCountryEmpty = StringUtils.isEmpty(country);
+            if (isLanguageEmpty && isCountryEmpty) {
+                plugin.getLogger().warning("Unable to get language code, fallback to en_us, please change game-language option in config.yml.");
+                languageCode = "en_us";
+            } else {
+                if (isCountryEmpty || isLanguageEmpty) {
+                    languageCode = isLanguageEmpty ? country + '_' + country : language + '_' + language;
+                    if ("en_en".equals(languageCode)) {
+                        languageCode = "en_us";
+                    }
+                    plugin.getLogger().warning("Unable to get language code, guessing " + languageCode + " instead, If it's incorrect, please change game-language option in config.yml.");
+                } else {
+                    languageCode = language + '_' + country;
+                }
+            }
+        }
+        languageCode = languageCode.replace("-", "_").toLowerCase(Locale.ROOT);
+        return languageCode;
+    }
+
     @Unstable
     @Deprecated
     public static void loadGameLanguage(@NotNull String languageCode) {

src/main/resources/config.yml

@@ -3,10 +3,8 @@
 #Do not touch this if you don't know what you're doing!
 config-version: 145
 
-#This language will used by Shop signs and other texts that direct write on the block/entity.
-language: en-US
-
-#This language will used by Item Name, Enchantment Name and Potion Effect Name and other them related position.
+#This language will used by Item Name, Enchantment Name,
+#and Potion Effect Name or the text on the shop info sign (nbtapi not installed) and other them related position.
 #Use default will use your system language.
 game-language: default