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

Ghost-chu · web-flow · commit 344c4f2bd471 · 2021-11-05T21:45:46.000+08:00
5.0.0.7
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -17,4 +17,4 @@ name = "java"
 enabled = true
 
   [analyzers.meta]
-  runtime_version = "16"
+  runtime_version = "15"
diff --git a/crowdin/lang/cs-CZ/messages.json b/crowdin/lang/cs-CZ/messages.json
@@ -3,7 +3,7 @@
   "file-test": "Toto je zkušební textový soubor. Používáme jej k testování, pokud jde o zprávy .json je rozbitý. Můžete jej vyplnit jakýmkoliv východním vejci, které se vám zde líbí :)",
   "translation-author": "Translator: Ghost_chu, Andre_601, LixCisCZ",
   "translation-version": "Verze: Reremake",
-  "translation-contributors": "Contributors: Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken and Andre_601",
+  "translation-contributors": "Přispěli: Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken and Andre_601",
   "translation-country": "Jazyková Zóna: Czech (cs_CZ)",
   "language-version": "61",
   "not-looking-at-shop": "&cNelze najít QuickShop. Musíš se na něj podívat.",
@@ -52,7 +52,7 @@
   "shop-not-exist": "&cNení žádný obchod.",
   "nearby-shop-this-way": "&aShop je od vás {0} bloků.",
   "nearby-shop-header": "&aNejbližší obchod odpovídající &b{0}&a:",
-  "nearby-shop-entry": "&a- Info:{0} &aPrice:&b{1} &ax:&b{2} &ay:&b{3} &az:&b{4} &adistance: &b{5} &ablock(s)",
+  "nearby-shop-entry": "&a - Info: {0}&aCena:&b{1} &ax:&b{3} &az:&b{4} &avzdálenost: &b{5} &ablok(y)",
   "no-nearby-shop": "&cŽádný blízký obchod odpovídající {0}.",
   "buying-more-than-selling": "&cVAROVÁNÍ: Kupujete předměty za více, než je prodáváte!",
   "not-enough-space": "&cObchod má pouze místo pro {0} více!",
@@ -93,8 +93,8 @@
     "stored-enchants": "&5Uložené enchanty",
     "shop-information": "&aInformace o obchodě:",
     "owner": "&aVlastník: {0}",
-    "item": "&aItem: &e{0}",
-    "item-holochat-error": "&c[Error]",
+    "item": "&aItem: &e{0}\n",
+    "item-holochat-error": "&c[Error]\n",
     "preview": "&b[Náhled itemu]",
     "space": "&aMezera: &e{0}",
     "stock": "&aSkladem &e{0}",
@@ -155,7 +155,7 @@
       "reload": "&eZnovu načte config.yml QuickShopu",
       "refill": "&ePřidá zadaný počet položek do obchodu",
       "empty": "&eOdstraní všechny položky z obchodu",
-      "debug": "&eEnables Developer mode",
+      "debug": "&eZapnut Vývojářský mód",
       "create": "&eVytvoří nový obchod z cílené truhly",
       "fetchmessage": "&eZobrazit zprávy o nepřečtených obchodech",
       "info": "&eZobrazit statistiky v QuickShopu",
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>QuickShop</artifactId>
 
     <properties>
-        <pluginver>5.0.0.6</pluginver>
+        <pluginver>5.0.0.7</pluginver>
         <package>org.maxgamer.quickshop</package>
         <developer>Ghost-chu</developer>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/org/maxgamer/quickshop/BuiltInSolution.java b/src/main/java/org/maxgamer/quickshop/BuiltInSolution.java
@@ -66,4 +66,15 @@ public static BootError econError() {
                 "compatible economy plugin installed to get Vault working.");
     }
 
+    /**
+     * Call îf economy system failed to load. This checks the failure reason.
+     *
+     * @return The error reason.
+     */
+    public static BootError econHandlerMissingError() {
+        // Check if Vault is installed
+        return new BootError(QuickShop.getInstance().getLogger(),
+                "The selected economy handler not installed", "Please check the configuration.");
+    }
+
 }
diff --git a/src/main/java/org/maxgamer/quickshop/QuickShop.java b/src/main/java/org/maxgamer/quickshop/QuickShop.java
diff --git a/src/main/java/org/maxgamer/quickshop/api/economy/EconomyTransaction.java b/src/main/java/org/maxgamer/quickshop/api/economy/EconomyTransaction.java
@@ -48,6 +48,7 @@ public class EconomyTransaction {
     private final EconomyCore core;
     private final double actualAmount;
     private final double tax;
+    @Nullable
     private final Trader taxer;
     private final boolean allowLoan;
     private final boolean tryingFixBalanceInsufficient;
@@ -266,7 +267,7 @@ default boolean onCommit(@NotNull EconomyTransaction economyTransaction) {
          */
         default void onSuccess(@NotNull EconomyTransaction economyTransaction) {
             Util.debugLog("Transaction succeed.");
-            QuickShop.getInstance().logEvent(new EconomyTransactionLog(true, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
+            QuickShop.getInstance().logEvent(new EconomyTransactionLog(true, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer() == null ? Util.getNilUniqueId() : economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
         }
 
         /**
@@ -278,7 +279,7 @@ default void onSuccess(@NotNull EconomyTransaction economyTransaction) {
          */
         default void onFailed(@NotNull EconomyTransaction economyTransaction) {
             Util.debugLog("Transaction failed: " + economyTransaction.getLastError() + ".");
-            QuickShop.getInstance().logEvent(new EconomyTransactionLog(false, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
+            QuickShop.getInstance().logEvent(new EconomyTransactionLog(false, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer() == null ? Util.getNilUniqueId() : economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
         }
 
         /**
@@ -290,7 +291,7 @@ default void onFailed(@NotNull EconomyTransaction economyTransaction) {
          */
         default void onTaxFailed(@NotNull EconomyTransaction economyTransaction) {
             Util.debugLog("Tax Transaction failed: " + economyTransaction.getLastError() + ".");
-            QuickShop.getInstance().logEvent(new EconomyTransactionLog(false, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
+            QuickShop.getInstance().logEvent(new EconomyTransactionLog(false, economyTransaction.getFrom(), economyTransaction.getTo(), economyTransaction.getCurrency(), economyTransaction.getTax(), economyTransaction.getTaxer() == null ? Util.getNilUniqueId() : economyTransaction.getTaxer().getUniqueId(), economyTransaction.getAmount(), economyTransaction.getLastError()));
         }
 
     }
diff --git a/src/main/java/org/maxgamer/quickshop/economy/EconomyProviderNotFoundException.java b/src/main/java/org/maxgamer/quickshop/economy/EconomyProviderNotFoundException.java
@@ -0,0 +1,39 @@
+/*
+ * This file is a part of project QuickShop, the name is EconomyProviderNotFoundException.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.economy;
+
+public class EconomyProviderNotFoundException extends IllegalStateException {
+    public EconomyProviderNotFoundException() {
+        super();
+    }
+
+    public EconomyProviderNotFoundException(String s) {
+        super(s);
+    }
+
+    public EconomyProviderNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public EconomyProviderNotFoundException(Throwable cause) {
+        super(cause);
+    }
+
+}
diff --git a/src/main/java/org/maxgamer/quickshop/economy/Economy_GemsEconomy.java b/src/main/java/org/maxgamer/quickshop/economy/Economy_GemsEconomy.java
@@ -24,6 +24,7 @@
 import lombok.ToString;
 import me.xanium.gemseconomy.api.GemsEconomyAPI;
 import me.xanium.gemseconomy.currency.Currency;
+import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.plugin.Plugin;
@@ -47,7 +48,7 @@ public class Economy_GemsEconomy extends AbstractEconomy {
     @Setter
     private GemsEconomyAPI api;
 
-    public Economy_GemsEconomy(@NotNull QuickShop plugin) {
+    public Economy_GemsEconomy(@NotNull QuickShop plugin) throws EconomyProviderNotFoundException {
         super();
         this.plugin = plugin;
         this.formatter = new BuiltInEconomyFormatter(plugin);
@@ -61,7 +62,10 @@ private void init() {
         this.allowLoan = plugin.getConfiguration().getBoolean("shop.allow-economy-loan");
     }
 
-    private void setupEconomy() {
+    private void setupEconomy() throws EconomyProviderNotFoundException {
+        if (Bukkit.getPluginManager().getPlugin("GemsEconomy") == null) {
+            throw new EconomyProviderNotFoundException("Configuration set economy to GemsEconomy but GemsEconomy not installed");
+        }
         this.api = new GemsEconomyAPI();
     }
 
diff --git a/src/main/java/org/maxgamer/quickshop/economy/Economy_Reserve.java b/src/main/java/org/maxgamer/quickshop/economy/Economy_Reserve.java
@@ -62,7 +62,7 @@ public class Economy_Reserve extends AbstractEconomy {
      * @deprecated Reserve no-longer active after Minecraft 1.14.
      */
     @Deprecated
-    public Economy_Reserve(@NotNull QuickShop plugin) {
+    public Economy_Reserve(@NotNull QuickShop plugin) throws EconomyProviderNotFoundException {
         this.plugin = plugin;
         this.formatter = new BuiltInEconomyFormatter(plugin);
         plugin.getReloadManager().register(this);
@@ -71,14 +71,19 @@ public Economy_Reserve(@NotNull QuickShop plugin) {
     }
 
     @SuppressWarnings("ConstantConditions")
-    private void setup() {
+    private void setup() throws EconomyProviderNotFoundException {
         try {
+            Plugin pl = plugin.getServer().getPluginManager().getPlugin("Reserve");
+            if (pl == null) {
+                throw new EconomyProviderNotFoundException("Configuration set economy to Reserve but Reserve not installed");
+            }
             Reserve re = ((Reserve) plugin.getServer().getPluginManager().getPlugin("Reserve"));
             if (re.economyProvided()) {
                 reserve = re.economy();
             }
         } catch (Exception throwable) {
             reserve = null;
+            plugin.getLogger().log(Level.SEVERE, "Failed to load up Reserve", throwable);
         }
     }
 
diff --git a/src/main/java/org/maxgamer/quickshop/economy/Economy_TNE.java b/src/main/java/org/maxgamer/quickshop/economy/Economy_TNE.java
@@ -49,7 +49,7 @@ public class Economy_TNE extends AbstractEconomy {
     @Setter
     private TNEAPI api;
 
-    public Economy_TNE(@NotNull QuickShop plugin) {
+    public Economy_TNE(@NotNull QuickShop plugin) throws EconomyProviderNotFoundException {
         super();
         this.plugin = plugin;
         plugin.getReloadManager().register(this);
@@ -61,7 +61,12 @@ private void init() {
         this.allowLoan = plugin.getConfiguration().getBoolean("shop.allow-economy-loan");
     }
 
-    private void setupEconomy() {
+    private void setupEconomy() throws EconomyProviderNotFoundException {
+        if (Bukkit.getPluginManager().getPlugin("TNE") == null
+                && Bukkit.getPluginManager().getPlugin("TNE-Bukkit") == null
+                && Bukkit.getPluginManager().getPlugin("TheNewEconomy") == null) {
+            throw new EconomyProviderNotFoundException("Configuration set economy to TheNewEconomy but TheNewEconomy not installed");
+        }
         this.api = TNE.instance().api();
     }
 
diff --git a/src/main/java/org/maxgamer/quickshop/economy/Economy_Vault.java b/src/main/java/org/maxgamer/quickshop/economy/Economy_Vault.java
@@ -58,7 +58,7 @@ public class Economy_Vault extends AbstractEconomy implements Listener {
     private net.milkbowl.vault.economy.Economy vault;
 
 
-    public Economy_Vault(@NotNull QuickShop plugin) {
+    public Economy_Vault(@NotNull QuickShop plugin) throws EconomyProviderNotFoundException {
         super();
         this.plugin = plugin;
         this.formatter = new BuiltInEconomyFormatter(plugin);
@@ -71,15 +71,16 @@ private void init() {
         this.allowLoan = plugin.getConfiguration().getBoolean("shop.allow-economy-loan");
     }
 
-    private boolean setupEconomy() {
+    private boolean setupEconomy() throws EconomyProviderNotFoundException {
         if (!Util.isClassAvailable("net.milkbowl.vault.economy.Economy")) {
-            return false; // QUICKSHOP-YS I can't believe it broken almost a year and nobody found it, my sentry exploded.
+            throw new EconomyProviderNotFoundException("Configuration set economy to Vault but Vault not installed");
         }
         RegisteredServiceProvider<net.milkbowl.vault.economy.Economy> economyProvider;
         try {
             economyProvider = plugin.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
         } catch (Exception e) {
-            return false;
+            plugin.getLogger().log(Level.SEVERE, "Failed to getting vault registration", e);
+            throw new EconomyProviderNotFoundException();
         }
 
         if (economyProvider != null) {
diff --git a/src/main/java/org/maxgamer/quickshop/localization/text/SimpleTextManager.java b/src/main/java/org/maxgamer/quickshop/localization/text/SimpleTextManager.java
@@ -24,6 +24,7 @@
 import org.apache.commons.io.IOUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -194,6 +195,9 @@ private void applyOverrideConfiguration(@NotNull JsonConfiguration distributionC
                 continue;
             }
             Object content = overrideConfiguration.get(key);
+            if (content instanceof ConfigurationSection) {
+                continue;
+            }
             Util.debugLog("Override key " + key + " with content: " + content);
             distributionConfiguration.set(key, content);
         }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -68,6 +68,10 @@ softdepend:
   - IridiumSkyblock
   - FabledSkyblock
   - NBTAPI
+  - TNE
+  - TNE-Bukkit
+  - TheNewEconomy
+  - GemsEconomy
 
 api-version: 1.15
 
