QuickShop-Community · creatorfromhell · Mar 3, 2026 · Mar 7, 2026 · Mar 7, 2026 · Mar 7, 2026
diff --git a/.changelog/6.3.0.0.md b/.changelog/6.3.0.0.md
@@ -67,6 +67,35 @@ updater-source: "modrinth"
 
 This lays the groundwork for future providers (CurseForge, Hangar, GitHub, etc.) without core rewrites.
 
+### New: Shop Tagging System
+
+A new player-driven tagging system has been introduced, allowing players to organize and track shops using custom tags.
+
+**Highlights**
+- Players can add custom tags to shops they are looking at.
+- Tags support letters, underscores (`_`), and dashes (`-`).
+- Tags are normalized and limited in length to ensure consistency and performance.
+- Reserved system tags power built-in features such as:
+  - `@fav` — Favorites
+  - `@watch` — Watchlist
+  - `@avoid` — Avoided shops
+- Tags are stored per-player per-shop, allowing each player to maintain their own organization system.
+
+**Commands**
+- `/qs tag <tag>` — Add a tag to the shop you are looking at
+- `/qs tag remove <tag>` — Remove a tag from the current shop
+- `/qs tag clear` — Remove all of your tags from the current shop
+- `/qs tag tags` — List all tags you have created
+- `/qs tag tagged <tag>` — List shops you have tagged with a specific tag
+- `/qs tag purge <tag>` — Remove a tag from all shops
+- `/qs favorite` - Add the current shop to your favorites
+- `/qs watch` - Add the current shop to your watchlist
+- `/qs avoid` - Add the current shop to your avoid list
+
+**Performance**
+- Uses a dual-index caching system (`shop → tags` and `player → tag → shops`) for fast lookups.
+- Tag filtering and listing operations are now **O(1)** instead of scanning all shops.
+
 ## Minor Changes
 - Replaced startup parameter "playerDBFindUUIDTask" with config option "uuid-lookup.allow-playerdb-uuid"
 - Replaced startup parameter "playerDBFindNameTask" with config option "uuid-lookup.allow-playerdb-name"
@@ -94,9 +123,29 @@ This lays the groundwork for future providers (CurseForge, Hangar, GitHub, etc.)
 - Replaced startup parameter "skipDatabaseVersionCheck" with config option "database.skip-version-check"
 - Bumped config version to 1037
 - started including tax amount in shop failure message "you-cant-afford-to-buy"
+- Update configuration file comments and standardize formatting(thanks to YuanYuanOwO)
+- Split metrics into separate files and added FastStats metric tracking.
+- Added toggle display icon to GUI.
+
+## Internals
+- Deprecated FrozenType in favor of a new ShopState system.
+- Added new ShopState system to handle shop state changes.
+- Added new ShopPrice interface that accepts a generic type, which is an object for the shop's price.
+  - This new interface also contains methods for comparison purposes, such as price comparison for sorting in UIs.
+  - Added a format method to the ShopPrice interface to format the price for display.
+- Added bukkitLocation() to the Locatable interface, which returns a BukkitLocation object.
+- Replaced internal calls to shop.getLocation with shop.bukkitLocation
+- Split the Shop interface into different sub interfaces to improve readability and maintainability.
+- Started preloading all data for qs history command to improve performance.(reported by Warrior)
+
+## Deprecation Removals
+- Removed ShopType enum and methods
+- Removed deprecated tax methods.
 
 ## Fixes
 - Fix issue where disabling tax for unlimited shops wasn't properly working.
 - Fix issue where FAWE on 2.11.2 and lower wasn't working correctly.
 - Fix issue where FAWE would remove shops outside of selection zone.
-- Fix issue where limits configs were not working properly(thanks to YuanYuanOwO)
+- Fix issue where limits configs were not working properly(thanks to YuanYuanOwO)
+- Fix Folia thread violations in /qs info stock stats(thanks to GoodrichDev)
+- Fix Towny Compat not working in Folia(thanks to GoodrichDev)
diff --git a/addon/betonquest/pom.xml b/addon/betonquest/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.compatibility</groupId>

diff --git a/addon/bluemap/pom.xml b/addon/bluemap/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/bluemap/src/main/java/com/ghostchu/quickshop/addon/bluemap/Main.java b/addon/bluemap/src/main/java/com/ghostchu/quickshop/addon/bluemap/Main.java
@@ -82,7 +82,7 @@ private void updateAllMarkers() {
 
   public void updateShopMarker(final Shop shop) {
 
-    final Optional<BlueMapWorld> bWorld = blueMapAPI.getWorld(shop.getLocation().getWorld());
+    final Optional<BlueMapWorld> bWorld = blueMapAPI.getWorld(shop.bukkitLocation().getWorld());
     if(bWorld.isEmpty()) {
       return;
     }
@@ -93,9 +93,9 @@ public void updateShopMarker(final Shop shop) {
 
       final POIMarker.Builder markerBuilder = POIMarker.builder()
               .label(markerName)
-              .position(shop.getLocation().getX(),
-                        shop.getLocation().getY() + 1,
-                        shop.getLocation().getZ())
+              .position(shop.bukkitLocation().getX(),
+                        shop.bukkitLocation().getY() + 1,
+                        shop.bukkitLocation().getZ())
               .maxDistance(getConfig().getDouble("max-distance"))
               .detail(desc);
 
@@ -150,7 +150,7 @@ private String getShopColor(final Shop shop) {
 
   private String fillPlaceholders(String s, final Shop shop) {
 
-    final Location loc = shop.getLocation();
+    final Location loc = shop.bukkitLocation();
     final String x = String.valueOf(loc.getX());
     final String y = String.valueOf(loc.getY());
     final String z = String.valueOf(loc.getZ());

diff --git a/addon/discordsrv/pom.xml b/addon/discordsrv/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/...cordsrv/src/main/java/com/ghostchu/quickshop/addon/discordsrv/message/MessageFactory.java b/...cordsrv/src/main/java/com/ghostchu/quickshop/addon/discordsrv/message/MessageFactory.java
@@ -55,10 +55,10 @@ public MessageEmbed modShopCreated(@NotNull final ShopCreateEvent event) {
 
     map.put("shop.name", ChatColor.stripColor(shop.getShopName()));
     map.put("shop.owner.name", wrap(shop.ownerName(plugin.text().findRelativeLanguages(langUser, false))));
-    map.put("shop.location.world", shop.getLocation().getWorld().getName());
-    map.put("shop.location.x", String.valueOf(shop.getLocation().getBlockX()));
-    map.put("shop.location.y", String.valueOf(shop.getLocation().getBlockY()));
-    map.put("shop.location.z", String.valueOf(shop.getLocation().getBlockZ()));
+    map.put("shop.location.world", shop.bukkitLocation().getWorld().getName());
+    map.put("shop.location.x", String.valueOf(shop.bukkitLocation().getBlockX()));
+    map.put("shop.location.y", String.valueOf(shop.bukkitLocation().getBlockY()));
+    map.put("shop.location.z", String.valueOf(shop.bukkitLocation().getBlockZ()));
     map.put("shop.location.id", String.valueOf(shop.getShopId()));
     final Component customName = Util.getItemCustomName(shop.getItem());
     if(customName != null) {
@@ -77,7 +77,7 @@ public MessageEmbed modShopCreated(@NotNull final ShopCreateEvent event) {
       map.put("shop.display-name", shop.getShopName());
     } else {
       // world, x, y, z
-      map.put("shop.display-name", String.format("%s %s, %s, %s", shop.getLocation().getWorld().getName(), shop.getLocation().getBlockX(), shop.getLocation().getBlockY(), shop.getLocation().getBlockZ()));
+      map.put("shop.display-name", String.format("%s %s, %s, %s", shop.bukkitLocation().getWorld().getName(), shop.bukkitLocation().getBlockX(), shop.bukkitLocation().getBlockY(), shop.bukkitLocation().getBlockZ()));
     }
     map.put("shop.type", shop.shopType().identifier());
     return map;
@@ -126,7 +126,7 @@ private Map<String, String> applyPlaceHoldersForPurchaseEvent(@NotNull final Map
     placeHolders.put("purchase.uuid", event.getPurchaser().toString());
     placeHolders.put("purchase.name", getPlayerName(langUser));
     //noinspection DataFlowIssue
-    placeHolders.put("purchase.world", shop.getLocation().getWorld().getName());
+    placeHolders.put("purchase.world", shop.bukkitLocation().getWorld().getName());
     placeHolders.put("purchase.amount", String.valueOf(event.getAmount()));
     placeHolders.put("purchase.balance", String.valueOf(event.getBalanceWithoutTax()));
     placeHolders.put("purchase.balance-formatted", purgeColors(plugin.getShopManager().format(event.getBalanceWithoutTax(), shop)));

diff --git a/addon/discount/pom.xml b/addon/discount/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/...n/discount/src/main/java/com/ghostchu/quickshop/addon/discount/listener/MainListener.java b/...n/discount/src/main/java/com/ghostchu/quickshop/addon/discount/listener/MainListener.java
@@ -48,7 +48,7 @@ public void onPrePurchase(final ShopInfoPanelEvent event) {
         case APPLICABLE ->
                 quickshop.text().of(purchaser, "addon.discount.discount-code-applicable", code).send();
         case APPLICABLE_WITH_THRESHOLD ->
-                quickshop.text().of(purchaser, "addon.discount.discount-code-applicable", code, quickshop.getEconomyManager().provider().format(BigDecimal.valueOf(codeInstalled.getThreshold()), shop.getLocation().getWorld().getName(), shop.getCurrency())).send();
+                quickshop.text().of(purchaser, "addon.discount.discount-code-applicable", code, quickshop.getEconomyManager().provider().format(BigDecimal.valueOf(codeInstalled.getThreshold()), shop.bukkitLocation().getWorld().getName(), shop.getCurrency())).send();
         case NOT_APPLICABLE ->
                 quickshop.text().of(purchaser, "addon.discount.discount-code-not-applicable", code).send();
         case REACHED_THE_LIMIT ->
@@ -84,16 +84,16 @@ public void onPurchase(final ShopPurchaseEvent event) {
         final double beforeDiscount = event.getTotal();
         event.setTotal(codeInstalled.apply(purchaser, event.getTotal()));
         final double discounted = beforeDiscount - event.getTotal();
-        quickshop.text().of(purchaser, "addon.discount.discount-code-applied-in-purchase", code, quickshop.getEconomyManager().provider().format(BigDecimal.valueOf(discounted), shop.getLocation().getWorld().getName(), shop.getCurrency())).send();
+        quickshop.text().of(purchaser, "addon.discount.discount-code-applied-in-purchase", code, quickshop.getEconomyManager().provider().format(BigDecimal.valueOf(discounted), shop.bukkitLocation().getWorld().getName(), shop.getCurrency())).send();
       }
       case APPLICABLE_WITH_THRESHOLD -> {
         if(event.getTotal() < codeInstalled.getThreshold()) {
-          quickshop.text().of(purchaser, "addon.discount.discount-code-under-threshold", quickshop.getEconomyManager().provider().format(BigDecimal.valueOf(codeInstalled.getThreshold()), shop.getLocation().getWorld().getName(), shop.getCurrency())).send();
+          quickshop.text().of(purchaser, "addon.discount.discount-code-under-threshold", quickshop.getEconomyManager().provider().format(BigDecimal.valueOf(codeInstalled.getThreshold()), shop.bukkitLocation().getWorld().getName(), shop.getCurrency())).send();
         } else {
           final double beforeDiscount = event.getTotal();
           event.setTotal(codeInstalled.apply(purchaser, event.getTotal()));
           final double discounted = beforeDiscount - event.getTotal();
-          quickshop.text().of(purchaser, "addon.discount.discount-code-applied-in-purchase", code, quickshop.getEconomyManager().provider().format(BigDecimal.valueOf(discounted), shop.getLocation().getWorld().getName(), shop.getCurrency())).send();
+          quickshop.text().of(purchaser, "addon.discount.discount-code-applied-in-purchase", code, quickshop.getEconomyManager().provider().format(BigDecimal.valueOf(discounted), shop.bukkitLocation().getWorld().getName(), shop.getCurrency())).send();
         }
       }
       case NOT_APPLICABLE ->

diff --git a/addon/displaycontrol/pom.xml b/addon/displaycontrol/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/dynmap/pom.xml b/addon/dynmap/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/dynmap/src/main/java/com/ghostchu/quickshop/addon/dynmap/Main.java b/addon/dynmap/src/main/java/com/ghostchu/quickshop/addon/dynmap/Main.java
@@ -207,7 +207,7 @@ public void updateShopMarker(final Shop shop) {
 
     final MarkerSet markerSet = getMarkerSet();
     String shopName = shop.getShopName();
-    final String posStr = String.format("%s %s, %s, %s", shop.getLocation().getWorld().getName(), shop.getLocation().getBlockX(), shop.getLocation().getBlockY(), shop.getLocation().getBlockZ());
+    final String posStr = String.format("%s %s, %s, %s", shop.bukkitLocation().getWorld().getName(), shop.bukkitLocation().getBlockX(), shop.bukkitLocation().getBlockY(), shop.bukkitLocation().getBlockZ());
     if(shopName == null) {
       shopName = posStr;
     }
@@ -229,16 +229,16 @@ public void updateShopMarker(final Shop shop) {
     if(marker == null) {
       marker = markerSet.createMarker("quickshop-hikari-shop-" + shop.getShopId()
               , markerName
-              , shop.getLocation().getWorld().getName(),
-                                      shop.getLocation().getX(),
-                                      shop.getLocation().getY(),
-                                      shop.getLocation().getZ(),
+              , shop.bukkitLocation().getWorld().getName(),
+                                      shop.bukkitLocation().getX(),
+                                      shop.bukkitLocation().getY(),
+                                      shop.bukkitLocation().getZ(),
                                       getShopMarkerIcon(), false);
     } else {
-      marker.setLocation(shop.getLocation().getWorld().getName(),
-                         shop.getLocation().getX(),
-                         shop.getLocation().getY(),
-                         shop.getLocation().getZ());
+      marker.setLocation(shop.bukkitLocation().getWorld().getName(),
+                         shop.bukkitLocation().getX(),
+                         shop.bukkitLocation().getY(),
+                         shop.bukkitLocation().getZ());
     }
     final String desc = plain(text().of("addon.dynmap.marker-description",
                                         shopName,

diff --git a/addon/limited/pom.xml b/addon/limited/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/list/pom.xml b/addon/list/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/list/src/main/java/com/ghostchu/quickshop/addon/list/command/SubCommand_List.java b/addon/list/src/main/java/com/ghostchu/quickshop/addon/list/command/SubCommand_List.java
@@ -111,7 +111,7 @@ private void lookup(@NotNull final Player sender, @NotNull final UUID lookupUser
         continue;
       }
       String shopName = shop.getShopName();
-      final Location location = shop.getLocation();
+      final Location location = shop.bukkitLocation();
       final String combineLocation = location.getWorld().getName() + " " + location.getBlockX() + ", " + location.getBlockY() + ", " + location.getBlockZ();
       if(CommonUtil.isEmptyString(shopName)) {
         shopName = combineLocation;
@@ -125,7 +125,7 @@ private void lookup(@NotNull final Player sender, @NotNull final UUID lookupUser
       } else {
         shopTypeComponent = quickshop.text().of(sender, "menu.this-shop-is-frozen").forLocale();
       }
-      Component component = quickshop.text().of(sender, "addon.list.entry", counter, shopNameComponent, location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ(), quickshop.getEconomyManager().provider().format(BigDecimal.valueOf(shop.getPrice()), shop.getLocation().getWorld().getName(), shop.getCurrency()), shop.getShopStackingAmount(), Util.getItemStackName(shop.getItem()), shopTypeComponent).forLocale();
+      Component component = quickshop.text().of(sender, "addon.list.entry", counter, shopNameComponent, location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ(), shop.format(shop.bukkitLocation().getWorld().getName(), shop.getCurrency()), shop.getShopStackingAmount(), Util.getItemStackName(shop.getItem()), shopTypeComponent).forLocale();
       component = component.clickEvent(ClickEvent.runCommand(MsgUtil.fillArgs("/{0} {1} {2}", quickshop.getMainCommand(), quickshop.getCommandPrefix("silentpreview"), shop.getRuntimeRandomUniqueId().toString())));
       printer.printLine(component);
       loopCounter++;

diff --git a/addon/pl3xmap/pom.xml b/addon/pl3xmap/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>

diff --git a/addon/pl3xmap/src/main/java/com/ghostchu/quickshop/addon/pl3xmap/ShopMarkerManager.java b/addon/pl3xmap/src/main/java/com/ghostchu/quickshop/addon/pl3xmap/ShopMarkerManager.java
@@ -54,11 +54,11 @@ public void addMarker(@NotNull final String key, @NotNull final Shop shop) {
 
     removeMarker(shop);
 
-    this.shopMarkers.get(shop.getLocation().getWorld().getName()).add(icon);
+    this.shopMarkers.get(shop.bukkitLocation().getWorld().getName()).add(icon);
   }
 
   public void removeMarker(@NotNull final Shop shop) {
-    final String worldName = shop.getLocation().getWorld().getName();
+    final String worldName = shop.bukkitLocation().getWorld().getName();
 
     final String key = String.format("%s_%s_%s", Main.PL3X_KEY, worldName, shop.getShopId());
 
@@ -74,7 +74,7 @@ public void removeMarker(@NotNull final Shop shop) {
   }
 
   public Icon getIcon(@NotNull final String key, @NotNull final Shop shop) {
-    return Marker.icon(key, point(shop.getLocation()), Main.instance().icon())
+    return Marker.icon(key, point(shop.bukkitLocation()), Main.instance().icon())
         .setOptions(Options.builder()
             .tooltipDirection(Tooltip.Direction.TOP)
             .tooltipContent(fillPlaceholders(Main.instance().markerDetail(), shop))
@@ -89,7 +89,7 @@ public String plain(@NotNull final Component component) {
 
   private String fillPlaceholders(String s, final Shop shop) {
 
-    final Location loc = shop.getLocation();
+    final Location loc = shop.bukkitLocation();
     final String x = String.valueOf(loc.getX());
     final String y = String.valueOf(loc.getY());
     final String z = String.valueOf(loc.getZ());

diff --git a/addon/plan/pom.xml b/addon/plan/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.ghostchu</groupId>
         <artifactId>quickshop-hikari</artifactId>
-        <version>6.3.0.0-SNAPSHOT-5</version>
+        <version>6.3.0.0-SNAPSHOT-6</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <groupId>com.ghostchu.quickshop.addon</groupId>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>com.ghostchu</groupId>
             <artifactId>quickshop-platform-interface</artifactId>
-            <version>6.3.0.0-SNAPSHOT-5</version>
+            <version>6.3.0.0-SNAPSHOT-6</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>