Merge remote-tracking branch 'origin/master'

Former-commit-id: 29c94aa

Author: sandtechnology

src/main/java/org/maxgamer/quickshop/Shop/ShopManager.java

@@ -20,26 +20,7 @@
 package org.maxgamer.quickshop.Shop;
 
 import com.google.common.collect.Sets;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.NoSuchElementException;
-import java.util.Objects;
-import java.util.Set;
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
@@ -59,24 +40,38 @@
 import org.maxgamer.quickshop.Util.MsgUtil;
 import org.maxgamer.quickshop.Util.Util;
 
-/** Manage a lot of shops. */
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+/**
+ * Manage a lot of shops.
+ */
 public class ShopManager {
 
-  private final HashMap<String, HashMap<ShopChunk, HashMap<Location, Shop>>> shops =
-      new HashMap<>();
-  private final Set<Shop> loadedShops = QuickShop.instance.isEnabledAsyncDisplayDespawn() ?
-      Sets.newConcurrentHashSet() : Sets.newHashSet();
+  private final HashMap<String, HashMap<ShopChunk, HashMap<Location, Shop>>> shops = new HashMap<>();
+
+  private final Set<Shop> loadedShops = QuickShop.instance.isEnabledAsyncDisplayDespawn() ? Sets.newConcurrentHashSet() : Sets.newHashSet();
+
   private HashMap<UUID, Info> actions = new HashMap<>();
+
   private QuickShop plugin;
+
   private boolean useFastShopSearchAlgorithm = false;
 
+  private UUID cacheTaxAccount;
+
   public ShopManager(@NotNull QuickShop plugin) {
     this.plugin = plugin;
-    this.useFastShopSearchAlgorithm =
-        plugin.getConfig().getBoolean("shop.use-fast-shop-search-algorithm", false);
+    this.useFastShopSearchAlgorithm = plugin.getConfig().getBoolean("shop.use-fast-shop-search-algorithm", false);
+    String taxAccount = plugin.getConfig().getString("tax-account");
+    //noinspection ConstantConditions
+    this.cacheTaxAccount = Bukkit.getOfflinePlayer(taxAccount).getUniqueId();
   }
 
-  @SuppressWarnings("deprecation")
   private void actionBuy(
       @NotNull Player p,
       @NotNull Economy eco,
@@ -185,9 +180,8 @@ private void actionBuy(
     }
     // Purchase successfully
     if (tax != 0) {
-      String taxAccount = plugin.getConfig().getString("tax-account");
-      if (taxAccount != null) {
-        eco.deposit(Bukkit.getOfflinePlayer(taxAccount).getUniqueId(), total * tax);
+      if (cacheTaxAccount != null) {
+        eco.deposit(cacheTaxAccount, total * tax);
       }
     }
     // Notify the owner of the purchase.
@@ -392,11 +386,8 @@ private void actionCreate(
           return;
         }
         try {
-          String taxAccount = plugin.getConfig().getString("tax-account");
-          if (taxAccount != null) {
-            plugin
-                .getEconomy()
-                .deposit(Bukkit.getOfflinePlayer(taxAccount).getUniqueId(), createCost);
+          if (cacheTaxAccount != null) {
+            plugin.getEconomy().deposit(cacheTaxAccount, createCost);
           }
         } catch (Exception e2) {
           e2.printStackTrace();

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

@@ -321,14 +321,25 @@ public static void loadCfgMessages() throws InvalidConfigurationException {
       Util.debugLog("Loading language file from exist file...");
       if (!new File(plugin.getDataFolder(), "messages.json").exists()) {
         plugin.getLanguage().saveFile(languageCode, "messages", "messages.json");
-        nJson.loadFromString(
-            Util.readToString(new File(plugin.getDataFolder(), "messages.json").getAbsolutePath()));
+        nJson.loadFromString(Util.readToString(new File(plugin.getDataFolder(), "messages.json").getAbsolutePath()));
       }
     }
     messagei18n = nJson;
     /* Set default language vesion and update messages.yml */
-    if (messagei18n.getInt("language-version") == 0) {
+    Optional<String> ver = messagei18n.getString("language-version");
+    int versi = 0;
+    if (ver.isPresent()) {
+      String vers = ver.get();
+      try {
+        versi = Integer.parseInt(vers);
+      } catch (NumberFormatException ignore) {
+
+      }
+    }
+    if (messagei18n.getInt("language-version") == 0 && versi == 0) {
       messagei18n.set("language-version", 1);
+    } else {
+      messagei18n.set("language-version", versi);
     }
     updateMessages(messagei18n.getInt("language-version"));
     messagei18n.loadFromString(Util.parseColours(messagei18n.saveToString()));

src/main/resources/messages/en.json

@@ -225,10 +225,10 @@
             "github": "[Github]",
             "spigotmc": "[SpigotMC]",
             "bukkitdev": "[BukkitDev]",
-            "master": "[Master]"
+            "master": "[master]"
         }
     },
     "shop-removed-cause-ongoing-fee": "&cKauppasi ({0}) poistettiin, sill\u00e4 sinulla ei ollut varaa yll\u00e4pit\u00e4\u00e4 sit\u00e4!",
     "digits-reach-the-limit": "&cOlet saavuttanut desimaalirajan.",
-    "complete": "&aComplete!"
+    "complete": "&aValmis!"
 }