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

5.0.0.3

Author: Ghost-chu

pom.xml

@@ -25,7 +25,7 @@
     <artifactId>QuickShop</artifactId>
 
     <properties>
-        <pluginver>5.0.0.2</pluginver>
+        <pluginver>5.0.0.3</pluginver>
         <package>org.maxgamer.quickshop</package>
         <developer>Ghost-chu</developer>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -837,9 +837,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.simplix-softworks</groupId>
+            <groupId>org.maxgamer.storage</groupId>
             <artifactId>simplixstorage</artifactId>
-            <version>3.2.3</version>
+            <version>3.2.3.3</version>
         </dependency>
         <dependency>
             <groupId>de.tr7zw</groupId>

src/main/java/org/maxgamer/quickshop/localization/game/game/distributions/MojangDistribution.java

@@ -132,7 +132,8 @@ public boolean grabIntoCaches(String url) {
             }
             requestCachePool.put(url, data);
         } catch (IOException e) {
-            plugin.getLogger().log(Level.WARNING, "Failed to download manifest.json, multi-language system won't work");
+            e.printStackTrace();
+            plugin.getLogger().log(Level.WARNING, "Failed to download mojang manifest.json, multi-language system won't work");
             return false;
         }
         return true;

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

@@ -95,6 +95,7 @@ public String getManifestJson() {
             }
             requestCachePool.put(url, data);
         } catch (IOException e) {
+            e.printStackTrace();
             plugin.getLogger().log(Level.WARNING, "Failed to download manifest.json, multi-language system won't work");
             return null;
         }
@@ -208,9 +209,10 @@ public String getFile(String fileCrowdinPath, String crowdinLocale, boolean forc
                     throw new OTAException(response.code(), data);
                 }
                 // save to local cache file
-                Files.write(cachedDataFile.toPath(), data.getBytes(StandardCharsets.UTF_8), StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+                Files.write(cachedDataFile.toPath(), data.getBytes(StandardCharsets.UTF_8));
             } catch (IOException e) {
                 plugin.getLogger().log(Level.WARNING, "Failed to download manifest.json, multi-language system may won't work");
+                e.printStackTrace();
                 return "";
             }
             // update cache index

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

@@ -32,23 +32,23 @@ public class HttpUtil {
     protected static final com.google.common.cache.Cache<String, String> requestCachePool = CacheBuilder.newBuilder()
             .expireAfterWrite(7, TimeUnit.DAYS)
             .build();
-    private final OkHttpClient client = new OkHttpClient.Builder()
+    private static final OkHttpClient client = new OkHttpClient.Builder()
             .cache(new Cache(getCacheFolder(), 50L * 1024L * 1024L)).build();
 
     public static HttpUtil create() {
         return new HttpUtil();
     }
 
     public static Response makeGet(@NotNull String url) throws IOException {
-        return HttpUtil.create().getClient().newCall(new Request.Builder().get().url(url).build()).execute();
+        return client.newCall(new Request.Builder().get().url(url).build()).execute();
     }
 
     public static String createGet(@NotNull String url) {
         String cache = requestCachePool.getIfPresent(url);
         if (cache != null) {
             return cache;
         }
-        try (Response response = HttpUtil.create().getClient().newCall(new Request.Builder().get().url(url).build()).execute()) {
+        try (Response response = client.newCall(new Request.Builder().get().url(url).build()).execute()) {
             val body = response.body();
             if (body == null) {
                 return null;
@@ -65,10 +65,10 @@ public static String createGet(@NotNull String url) {
     }
 
     public static Response makePost(@NotNull String url, @NotNull RequestBody body) throws IOException {
-        return HttpUtil.create().getClient().newCall(new Request.Builder().post(body).url(url).build()).execute();
+        return client.newCall(new Request.Builder().post(body).url(url).build()).execute();
     }
 
-    private File getCacheFolder() {
+    private static File getCacheFolder() {
         File file = new File(Util.getCacheFolder(), "okhttp_tmp");
         file.mkdirs();
         return file;

src/main/resources/config.yml

@@ -285,6 +285,7 @@ shop:
   #If nothing matches in this list, it falls back to the name of currency itself.
   alternate-currency-symbol-list:
     - USD;$
+    - CNY;￥
 
   #This should fix Vault or an economy plugin incorrectly processing the price and returning a "0" result.
   #If you enable this setting, then QS will force use the "alternate-currency-symbol".