Merge pull request #26 from myzticbean/release/v2.0

Release/v2.0
myzticbean · Apr 29, 2024 · 9827669 · 9827669
2 parents 375669c + 9de66d5
commit 9827669
Show file tree

Hide file tree

Showing 28 changed files with 598 additions and 357 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,25 @@
-## Snapshot 2.0.5.7
+## Release 2.0.6.0
+### Changes (Feature request [#23](https://github.com/myzticbean/QSFindItemAddOn/issues/23))
+- Plugin updated for Minecraft version 1.20.5.
+- Changed 15Min Scheduled Task to run in async thread (should help with lag).
+- Deprecated QSReremakeAPIHandler. Reremake implementation will no longer be updated. Last support is for QS-Reremake v5.1.2.5.
+- Changed logger statements to show Main/Async thread state.
+- Structural changes in the config.yml, specifically for shop-gui related options.
+- Fixed an issue with showing large numbers in currency.
+- Added new feature to format currency format. For example: $10,210,100 will be shown as $10.21M. New config option to toggle it:
+```yaml
+shop-gui:
+  use-shorter-currency-format: true
+```
+- New config option added as below to toggle if players should be allowed to warp to locked warps (Only for PlayerWarps).
+```yaml
+player-shop-teleportation:
+  nearest-warp-tp-mode:
+    do-not-tp-if-warp-locked: true
+```
+- Config version is now 15.
+
+## Release 2.0.5.7
 ### Bug fixes
 - Fixed a bug where disabling hideshop/revealshop will not disable it for `/qs finditem` ([#13](https://github.com/myzticbean/QSFindItemAddOn/issues/13))
 - Fixed stock/space not updating properly from QS cache ([#17](https://github.com/myzticbean/QSFindItemAddOn/issues/17))

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Shop Search AddOn For QuickShop
-### Version: 2.0.5.7-RELEASE
+### Version: 2.0.6.0-RELEASE
 
 An unofficial add-on for the QuickShop Hikari and Reremake spigot plugin.
 Adds a `/finditem` command in game for searching through all the shops on the server.

diff --git a/pom.xml b/pom.xml
@@ -6,14 +6,15 @@
 
     <groupId>io.myzticbean.FindItemAddOn</groupId>
     <artifactId>QSFindItemAddOn</artifactId>
-    <version>2.0.5.7-RELEASE</version>
+    <version>2.0.6.0-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>QSFindItemAddOn</name>
 
     <properties>
-        <java.version>16</java.version>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spigot.version>1.20.5-R0.1-SNAPSHOT</spigot.version>
     </properties>
 
     <build>
@@ -137,7 +138,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.2-R0.1-SNAPSHOT</version>
+            <version>${spigot.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -161,7 +162,7 @@
         <dependency>
             <groupId>com.ghostchu</groupId>
             <artifactId>quickshop-api</artifactId>
-            <version>6.0.0.10</version>
+            <version>6.1.0.1</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -197,7 +198,7 @@
         <dependency>
             <groupId>com.ghostchu</groupId>
             <artifactId>quickshop-bukkit</artifactId>
-            <version>6.0.0.10</version>
+            <version>6.1.0.1</version>
             <scope>provided</scope>
             <classifier>shaded</classifier>
             <exclusions>

diff --git a/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdHikariImpl.java b/src/main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdHikariImpl.java
@@ -3,7 +3,7 @@
 import com.ghostchu.quickshop.api.command.CommandHandler;
 import io.myzticbean.finditemaddon.FindItemAddOn;
 import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
+import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPermsEnum;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Material;
@@ -53,7 +53,7 @@ public void onCommand(Player commandSender, @NotNull String label, @NotNull Stri
             commandSender.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cIncorrect usage!"));
         }
         else if(args.length == 1) {
-            if(commandSender.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
+            if(commandSender.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
                 if(args[0].equalsIgnoreCase(hideSubCommand)) {
                     cmdExecutor.handleHideShop(commandSender);
                 } else if(args[0].equalsIgnoreCase(revealShopSubCommand)) {
@@ -94,7 +94,7 @@ else if(args.length == 1) {
                 buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE);
             }
             // hide
-            if(sender.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
+            if(sender.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
                 buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE);
                 buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE);
             }

diff --git a/...main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdReremakeImpl.java b/...main/java/io/myzticbean/finditemaddon/Commands/QSSubCommands/FindItemCmdReremakeImpl.java
@@ -2,7 +2,7 @@
 
 import io.myzticbean.finditemaddon.FindItemAddOn;
 import io.myzticbean.finditemaddon.Handlers.CommandHandler.CmdExecutorHandler;
-import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPerms;
+import io.myzticbean.finditemaddon.Utils.Defaults.PlayerPermsEnum;
 import me.kodysimpson.simpapi.colors.ColorTranslator;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Material;
@@ -47,7 +47,7 @@ public void onCommand(Player commandSender, @NotNull String label, @NotNull Stri
             commandSender.sendMessage(ColorTranslator.translateColorCodes(FindItemAddOn.getConfigProvider().PLUGIN_PREFIX + "&cIncorrect usage!"));
         }
         else if(args.length == 1) {
-            if(commandSender.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
+            if(commandSender.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
                 if(args[0].equalsIgnoreCase(hideSubCommand)) {
                     cmdExecutor.handleHideShop(commandSender);
                 } else if(args[0].equalsIgnoreCase(revealShopSubCommand)) {
@@ -88,7 +88,7 @@ else if(args.length == 1) {
                 buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_TO_SELL_AUTOCOMPLETE);
             }
             // hide
-            if(sender.hasPermission(PlayerPerms.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
+            if(sender.hasPermission(PlayerPermsEnum.FINDITEM_HIDESHOP.value()) && !FindItemAddOn.getConfigProvider().FIND_ITEM_CMD_REMOVE_HIDE_REVEAL_SUBCMDS) {
                 buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_HIDESHOP_AUTOCOMPLETE);
                 buyOrSellList.add(FindItemAddOn.getConfigProvider().FIND_ITEM_REVEALSHOP_AUTOCOMPLETE);
             }