Merge pull request Ghost-chu#1534 from Ghost-chu/master

5.0.0.2

Author: Ghost-chu

pom.xml

@@ -25,7 +25,7 @@
     <artifactId>QuickShop</artifactId>
 
     <properties>
-        <pluginver>5.0.0.1</pluginver>
+        <pluginver>5.0.0.2</pluginver>
         <package>org.maxgamer.quickshop</package>
         <developer>Ghost-chu</developer>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -1932,7 +1932,6 @@ private void updateConfig(int selectedVersion) throws IOException {
             getConfiguration().set("config-version", ++selectedVersion);
         }
         if (selectedVersion == 143) {
-            getConfiguration().set("language", null);
 //            if (getConfiguration().get("language") == null) {
 //                getConfiguration().set("language", "en-US");
 //            }
@@ -1943,7 +1942,6 @@ private void updateConfig(int selectedVersion) throws IOException {
             // 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 (selectedVersion == 145) {
@@ -1952,6 +1950,12 @@ private void updateConfig(int selectedVersion) throws IOException {
             getConfiguration().set("logger.location", 0);
             getConfiguration().set("config-version", ++selectedVersion);
         }
+        if (selectedVersion == 146) {
+            // Updater set it to true because plugin upgrading
+            // Default configuration disable it cause probably fresh install
+            getConfiguration().set("language", null);
+            getConfiguration().set("config-version", ++selectedVersion);
+        }
         if (getConfiguration().getInt("matcher.work-type") != 0 && GameVersion.get(ReflectFactory.getServerVersion()).name().contains("1_16")) {
             getLogger().warning("You are not using QS Matcher, it may meeting item comparing issue mentioned there: https://hub.spigotmc.org/jira/browse/SPIGOT-5063");
         }

src/main/java/org/maxgamer/quickshop/localization/text/SimpleTextManager.java

@@ -66,7 +66,6 @@ public SimpleTextManager(QuickShop plugin) {
         plugin.getLogger().info("Translation over-the-air platform selected: Crowdin");
         this.distribution = new CrowdinOTA(plugin);
         load();
-
     }
 
     /**
@@ -83,8 +82,10 @@ private File getOverrideFilesFolder(@NotNull String path) {
         File moduleFolder = new File(new File(plugin.getDataFolder(), "overrides"), module);
         moduleFolder.mkdirs();
         File fileFolder = new File(moduleFolder, file.getName());
-        fileFolder.mkdirs();
-        return file;
+        if (fileFolder.isDirectory())
+            fileFolder.delete();
+//        fileFolder.mkdirs();
+        return moduleFolder;
     }
 
     /**
@@ -227,8 +228,9 @@ private JsonConfiguration getDistributionConfiguration(@NotNull String distribut
      * @throws InvalidConfigurationException File invalid
      */
     private JsonConfiguration getOverrideConfiguration(@NotNull String overrideFile, @NotNull String locale) throws IOException, InvalidConfigurationException {
-        File localOverrideFile = new File(getOverrideFilesFolder(overrideFile.replace("%locale%", locale)), locale + ".json");
+        File localOverrideFile = new File(getOverrideFilesFolder(overrideFile.replace("%locale%", locale)), new File(overrideFile.replace("%locale%", locale)).getName());
         if (!localOverrideFile.exists()) {
+            Util.debugLog("Creating locale override file: " + localOverrideFile);
             localOverrideFile.getParentFile().mkdirs();
             localOverrideFile.createNewFile();
         }
@@ -389,14 +391,14 @@ private List<String> postProcess(@NotNull List<String> text) {
         public List<String> forLocale(@NotNull String locale) {
             JsonConfiguration index = mapping.get(locale);
             if (index == null) {
-                if ("en_us".equals(locale)) {
+                if (MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")).equals(locale)) {
                     List<String> str = fallbackLocal();
                     if (str.isEmpty()) {
                         return Collections.singletonList("Fallback Missing Language Key: " + path + ", report to QuickShop!");
                     }
                     return postProcess(str);
                 } else {
-                    return forLocale("en_us");
+                    return forLocale(MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")));
                 }
             } else {
                 List<String> str = index.getStringList(path);
@@ -420,7 +422,7 @@ public List<String> forLocale() {
             if (sender instanceof Player) {
                 return forLocale(((Player) sender).getLocale());
             } else {
-                return forLocale("en_us");
+                return forLocale(MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")));
             }
         }
 
@@ -506,14 +508,14 @@ private String postProcess(@NotNull String text) {
         public String forLocale(@NotNull String locale) {
             JsonConfiguration index = mapping.get(locale);
             if (index == null) {
-                if ("en_us".equals(locale)) {
+                if (MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")).equals(locale)) {
                     String str = fallbackLocal();
                     if (str == null) {
                         return "Fallback Missing Language Key: " + path + ", report to QuickShop!";
                     }
                     return postProcess(str);
                 } else {
-                    return forLocale("en_us");
+                    return forLocale(MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")));
                 }
             } else {
                 String str = index.getString(path);
@@ -535,7 +537,7 @@ public String forLocale() {
             if (sender instanceof Player) {
                 return forLocale(((Player) sender).getLocale());
             } else {
-                return forLocale("en_us");
+                return forLocale(MsgUtil.processGameLanguageCode(plugin.getConfiguration().getOrDefault("game-language", "default")));
             }
         }
 

src/main/java/org/maxgamer/quickshop/localization/text/TextMapper.java

@@ -1,3 +1,22 @@
+/*
+ * This file is a part of project QuickShop, the name is TextMapper.java
+ *  Copyright (C) PotatoCraft Studio and contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package org.maxgamer.quickshop.localization.text;
 
 import com.dumptruckman.bukkit.configuration.json.JsonConfiguration;
@@ -7,10 +26,11 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class TextMapper {
-    private final Map<String, Map<String, JsonConfiguration>> locale2ContentMapping = new HashMap<>();
-    private final Map<String, JsonConfiguration> bundledFile2ContentMapping = new HashMap<>();
+    private final Map<String, Map<String, JsonConfiguration>> locale2ContentMapping = new ConcurrentHashMap<>();
+    private final Map<String, JsonConfiguration> bundledFile2ContentMapping = new ConcurrentHashMap<>();
 
     /**
      * Reset TextMapper

src/main/java/org/maxgamer/quickshop/localization/text/distributions/crowdin/CrowdinOTA.java

@@ -1,3 +1,22 @@
+/*
+ * This file is a part of project QuickShop, the name is CrowdinOTA.java
+ *  Copyright (C) PotatoCraft Studio and contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package org.maxgamer.quickshop.localization.text.distributions.crowdin;
 
 import com.google.common.cache.Cache;
@@ -177,7 +196,8 @@ public String getFile(String fileCrowdinPath, String crowdinLocale, boolean forc
         // force flush required OR local cache not exists OR outdated
         if (forceFlush || data == null || localeTimestamp != manifest.getTimestamp()) {
             String url = CROWDIN_OTA_HOST + "content" + fileCrowdinPath.replace("%locale%", crowdinLocale);
-            Util.debugLog("Reading data from remote server: " + url);
+            //Util.debugLog("Reading data from remote server: " + url);
+            plugin.getLogger().info("Downloading translation " + crowdinLocale + " from: " + url);
             try (Response response = HttpUtil.create().getClient().newCall(new Request.Builder().get().url(url).build()).execute()) {
                 val body = response.body();
                 if (body == null) {

src/main/resources/config.yml

@@ -1,7 +1,7 @@
 # QuickShop-Reremake Plugin Configuration
 
 #Do not touch this if you don't know what you're doing!
-config-version: 146
+config-version: 147
 
 #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.
@@ -284,7 +284,6 @@ shop:
   #This setting is for multi-currency setups.
   #If nothing matches in this list, it falls back to the name of currency itself.
   alternate-currency-symbol-list:
-    - CNY;¥
     - USD;$
 
   #This should fix Vault or an economy plugin incorrectly processing the price and returning a "0" result.