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

Ghost-chu · web-flow · commit 839766f3f4a7 · 2021-11-05T23:06:46.000+08:00
5.0.0.8
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -3,7 +3,7 @@ description: 'Report a bug with QuickShop to us.'
 
 title: '[BUG] '
 labels:
-  - 'bug'
+  - 'Bug'
 
 body:
   - type: 'markdown'
@@ -62,7 +62,7 @@ body:
         If you can't create a paste, should you upload other files such as the `latest.log` file to https://paste.helpch.at and share the URL.
 
         If QuickShop is unable to generate a Paste will it create a file under `plugins/QuickShop/`
-      placeholder: 'https://paste.ubuntu.com/p/abc123/'
+      placeholder: 'https://paste.helpch.at/...'
     validations:
       required: true
   - type: 'textarea'
diff --git a/.github/ISSUE_TEMPLATE/performance.yml b/.github/ISSUE_TEMPLATE/performance.yml
@@ -3,7 +3,7 @@ description: 'Report performance issues with QuickShop.'
 
 title: '[PERFORMANCE] '
 labels:
-  - 'performance'
+  - 'Performance Issue'
 
 body:
   - type: 'markdown'
@@ -66,7 +66,7 @@ body:
         If you can't create a paste, should you upload other files such as the `latest.log` file to https://paste.helpch.at and share the URL.
 
         If QuickShop is unable to generate a Paste will it create a file under `plugins/QuickShop/`
-      placeholder: 'https://paste.ubuntu.com/p/abc123/'
+      placeholder: 'https://paste.helpch.at/...'
     validations:
       required: true
   - type: 'input'
diff --git a/.github/ISSUE_TEMPLATE/wiki_contribution.yml b/.github/ISSUE_TEMPLATE/wiki_contribution.yml
@@ -3,7 +3,7 @@ description: 'Inform about a Contribution that you want to make towards the wiki
 
 title: '[WIKI] '
 labels:
-  - 'wiki'
+  - 'Wiki'
 
 body:
   - type: 'markdown'
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>QuickShop</artifactId>
 
     <properties>
-        <pluginver>5.0.0.7</pluginver>
+        <pluginver>5.0.0.8</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,15 +66,4 @@ 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
@@ -62,7 +62,6 @@
 import org.maxgamer.quickshop.chat.platform.minedown.BungeeQuickChat;
 import org.maxgamer.quickshop.command.SimpleCommandManager;
 import org.maxgamer.quickshop.database.*;
-import org.maxgamer.quickshop.economy.EconomyProviderNotFoundException;
 import org.maxgamer.quickshop.economy.Economy_GemsEconomy;
 import org.maxgamer.quickshop.economy.Economy_TNE;
 import org.maxgamer.quickshop.economy.Economy_Vault;
@@ -498,21 +497,13 @@ public boolean loadEcon() {
                 return false;
             }
             economy = ServiceInjector.getEconomy(economy);
-            if (Objects.equals(this.bootError, BuiltInSolution.econHandlerMissingError()) || Objects.equals(this.bootError, BuiltInSolution.econError())) {
-                this.bootError = null;
-            }
         } catch (Exception e) {
-            if (e instanceof EconomyProviderNotFoundException) {
-                getLogger().log(Level.WARNING, "Something going wrong when loading up economy system", e);
-                getLogger().severe("Failed to hook into the Economy Handler that configuration point to!");
-                getLogger().severe("QuickShop CANNOT start!");
-                setupBootError(BuiltInSolution.econHandlerMissingError(), false);
-            } else {
-                getLogger().log(Level.WARNING, "Something going wrong when loading up economy system", e);
-                getLogger().severe("QuickShop could not hook into a economy/Not found Vault or Reserve!");
-                getLogger().severe("QuickShop CANNOT start!");
-                setupBootError(BuiltInSolution.econError(), false);
-            }
+            this.getSentryErrorReporter().ignoreThrow();
+            getLogger().log(Level.WARNING, "Something going wrong when loading up economy system", e);
+            getLogger().severe("QuickShop could not hook into a economy/Not found Vault or Reserve!");
+            getLogger().severe("QuickShop CANNOT start!");
+            setupBootError(BuiltInSolution.econError(), false);
+            getLogger().severe("Plugin listeners was disabled, please fix the economy issue.");
             return false;
         }
         return true;
diff --git a/src/main/java/org/maxgamer/quickshop/economy/EconomyProviderNotFoundException.java b/src/main/java/org/maxgamer/quickshop/economy/EconomyProviderNotFoundException.java
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,7 +24,6 @@
 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;
@@ -48,7 +47,7 @@ public class Economy_GemsEconomy extends AbstractEconomy {
     @Setter
     private GemsEconomyAPI api;
 
-    public Economy_GemsEconomy(@NotNull QuickShop plugin) throws EconomyProviderNotFoundException {
+    public Economy_GemsEconomy(@NotNull QuickShop plugin) {
         super();
         this.plugin = plugin;
         this.formatter = new BuiltInEconomyFormatter(plugin);
@@ -62,10 +61,7 @@ private void init() {
         this.allowLoan = plugin.getConfiguration().getBoolean("shop.allow-economy-loan");
     }
 
-    private void setupEconomy() throws EconomyProviderNotFoundException {
-        if (Bukkit.getPluginManager().getPlugin("GemsEconomy") == null) {
-            throw new EconomyProviderNotFoundException("Configuration set economy to GemsEconomy but GemsEconomy not installed");
-        }
+    private void setupEconomy() {
         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) throws EconomyProviderNotFoundException {
+    public Economy_Reserve(@NotNull QuickShop plugin) {
         this.plugin = plugin;
         this.formatter = new BuiltInEconomyFormatter(plugin);
         plugin.getReloadManager().register(this);
@@ -71,19 +71,14 @@ public Economy_Reserve(@NotNull QuickShop plugin) throws EconomyProviderNotFound
     }
 
     @SuppressWarnings("ConstantConditions")
-    private void setup() throws EconomyProviderNotFoundException {
+    private void setup() {
         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) throws EconomyProviderNotFoundException {
+    public Economy_TNE(@NotNull QuickShop plugin) {
         super();
         this.plugin = plugin;
         plugin.getReloadManager().register(this);
@@ -61,12 +61,7 @@ private void init() {
         this.allowLoan = plugin.getConfiguration().getBoolean("shop.allow-economy-loan");
     }
 
-    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");
-        }
+    private void setupEconomy() {
         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) throws EconomyProviderNotFoundException {
+    public Economy_Vault(@NotNull QuickShop plugin) {
         super();
         this.plugin = plugin;
         this.formatter = new BuiltInEconomyFormatter(plugin);
@@ -71,16 +71,15 @@ private void init() {
         this.allowLoan = plugin.getConfiguration().getBoolean("shop.allow-economy-loan");
     }
 
-    private boolean setupEconomy() throws EconomyProviderNotFoundException {
+    private boolean setupEconomy() {
         if (!Util.isClassAvailable("net.milkbowl.vault.economy.Economy")) {
-            throw new EconomyProviderNotFoundException("Configuration set economy to Vault but Vault not installed");
+            return false; // QUICKSHOP-YS I can't believe it broken almost a year and nobody found it, my sentry exploded.
         }
         RegisteredServiceProvider<net.milkbowl.vault.economy.Economy> economyProvider;
         try {
             economyProvider = plugin.getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
         } catch (Exception e) {
-            plugin.getLogger().log(Level.SEVERE, "Failed to getting vault registration", e);
-            throw new EconomyProviderNotFoundException();
+            return false;
         }
 
         if (economyProvider != null) {
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java b/src/main/java/org/maxgamer/quickshop/shop/ShopLoader.java
@@ -354,7 +354,7 @@ public List<ShopRawDatabaseInfo> getOriginShopsInDatabase() {
         errors = 0;
         List<ShopRawDatabaseInfo> shopRawDatabaseInfoList = new ArrayList<>();
         try (WarpedResultSet warpRS = plugin.getDatabaseHelper().selectAllShops(); ResultSet rs = warpRS.getResultSet()) {
-            this.plugin.getLogger().info("Getting shops from the database...");
+           // this.plugin.getLogger().info("Getting shops from the database...");
             while (rs.next()) {
                 ShopRawDatabaseInfo origin = new ShopRawDatabaseInfo(rs);
                 shopRawDatabaseInfoList.add(origin);
diff --git a/src/main/resources/lang/messages.json b/src/main/resources/lang/messages.json
@@ -5,7 +5,7 @@
   "translation-version": "Support Version: Reremake",
   "translation-contributors": "Contributors: Timtower, Netherfoam, KaiNoMood, Mgazul, JackTheChicken and Andre_601",
   "translation-country": "Language Zone: English (en_US)",
-  "language-version": "61",
+  "language-version": "62",
   "not-looking-at-shop": "&cCould not find a QuickShop. You need to look at one.",
   "no-anythings-in-your-hand": "&cThere is nothing in your hand.",
   "no-permission": "&cYou do not have permission to do that.",
@@ -228,7 +228,9 @@
     "lock": "&eShop lock: &b{0} &e[&d&lToggle&e]",
     "lock-hover": "&eEnable/Disable the shop's lock protection.",
     "freeze": "&eFreeze mode: &b{0} &e[&d&lToggle&e]",
-    "freeze-hover": "&eToggle the shop's freeze status."
+    "freeze-hover": "&eToggle the shop's freeze status.",
+    "toggledisplay": "&eDisplayItem: &b{0} &e[&d&lToggle&e]",
+    "toggledisplay-hover": "&eToggle the shop's displayitem status"
   },
   "tableformat": {
     "full_line": "+---------------------------------------------------+",
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -68,10 +68,6 @@ softdepend:
   - IridiumSkyblock
   - FabledSkyblock
   - NBTAPI
-  - TNE
-  - TNE-Bukkit
-  - TheNewEconomy
-  - GemsEconomy
 
 api-version: 1.15
 
