Use QuickShop Hikari

Author: Veyronity

build.gradle.kts

@@ -26,7 +26,7 @@ repositories {
     }
 
     maven("https://repo.codemc.io/repository/maven-public/") {
-        mavenContent { includeGroup("org.maxgamer") }
+        mavenContent { includeGroup("com.ghostchu") }
     }
 }
 
@@ -41,6 +41,7 @@ dependencies {
     compileOnly(libs.quickshop) {
         exclude("*")
     }
+    compileOnly(libs.quickshop.api)
     implementation(libs.hikaricp) {
         exclude(group = "org.slf4j", module = "slf4j-api")
     }

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-paper = "1.21.8-R0.1-SNAPSHOT"
+paper = "1.21.1-R0.1-SNAPSHOT"
 javalin = "6.7.0"
 discordsrv = "1.27.0"
 quarters = "e9ed8a133a"
 towny = "0.102.0.0"
 mysterymaster-api = "1.0.0"
 superbvote = "0.6.0"
-quickshop = "5.1.2.5-SNAPSHOT"
+quickshop = "6.2.0.11"
 hikaricp = "7.0.2"
 
 # plugins
@@ -21,7 +21,8 @@ javalin = { group = "io.javalin", name = "javalin", version.ref = "javalin" }
 paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
 mysterymaster-api = { group = "net.earthmc.mysterymaster", name = "mysterymaster-api", version.ref = "mysterymaster-api" }
 superbvote = { group = "net.earthmc.superbvote", name = "SuperbVote", version.ref = "superbvote" }
-quickshop = { group = "org.maxgamer", name = "QuickShop", version.ref = "quickshop" }
+quickshop = { group = "com.ghostchu", name = "quickshop-bukkit", version.ref = "quickshop" }
+quickshop-api = { group = "com.ghostchu", name = "quickshop-api", version.ref = "quickshop" }
 hikaricp = { group = "com.zaxxer", name = "HikariCP", version.ref = "hikaricp" }
 
 [plugins]

src/main/java/net/earthmc/emcapi/endpoint/ShopEndpoint.java

@@ -1,5 +1,6 @@
 package net.earthmc.emcapi.endpoint;
 
+import com.ghostchu.quickshop.api.shop.Shop;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import io.javalin.http.BadRequestResponse;
@@ -10,7 +11,6 @@
 import net.earthmc.emcapi.util.EndpointUtils;
 import net.earthmc.emcapi.util.JSONUtil;
 import org.jetbrains.annotations.Nullable;
-import org.maxgamer.quickshop.api.shop.Shop;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -73,7 +73,7 @@ public JsonElement getJsonElement(List<Shop> object, @Nullable String key) {
         final List<CompletableFuture<Void>> shopFutures = new ArrayList<>();
 
         for (Shop shop : object) {
-            if (!shop.getOwner().equals(keyOwner)) continue;
+            if (!keyOwner.equals(shop.getOwner().getUniqueId())) continue;
 
             final CompletableFuture<Void> shopFuture = new CompletableFuture<>();
             shopFutures.add(shopFuture);

src/main/java/net/earthmc/emcapi/integration/QuickShopIntegration.java

@@ -1,8 +1,8 @@
 package net.earthmc.emcapi.integration;
 
+import com.ghostchu.quickshop.api.QuickShopAPI;
+import com.ghostchu.quickshop.api.shop.Shop;
 import net.earthmc.emcapi.manager.KeyManager;
-import org.maxgamer.quickshop.QuickShop;
-import org.maxgamer.quickshop.api.shop.Shop;
 
 import java.util.List;
 import java.util.UUID;
@@ -20,6 +20,6 @@ public List<Shop> getPlayerShops(UUID player, String key) {
         if (!player.equals(KeyManager.getKeyOwner(key))) {
             return List.of();
         }
-        return QuickShop.getInstance().getShopManager().getPlayerAllShops(player);
+        return QuickShopAPI.getInstance().getShopManager().getAllShops(player);
     }
 }

src/main/java/net/earthmc/emcapi/sse/listeners/ShopSSEListener.java

@@ -1,14 +1,15 @@
 package net.earthmc.emcapi.sse.listeners;
 
+import com.ghostchu.quickshop.api.event.economy.ShopSuccessPurchaseEvent;
+import com.ghostchu.quickshop.api.obj.QUser;
+import com.ghostchu.quickshop.api.shop.Shop;
 import com.google.gson.JsonObject;
 import com.palmergames.bukkit.towny.TownyAPI;
 import com.palmergames.bukkit.towny.object.Resident;
 import net.earthmc.emcapi.sse.SSEManager;
 import net.earthmc.emcapi.util.EndpointUtils;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.maxgamer.quickshop.api.event.ShopSuccessPurchaseEvent;
-import org.maxgamer.quickshop.api.shop.Shop;
 
 import java.util.UUID;
 
@@ -21,7 +22,10 @@ public ShopSSEListener(SSEManager sseManager) {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onShopPurchase(ShopSuccessPurchaseEvent event) {
         Shop shop = event.getShop();
-        UUID owner = shop.getOwner();
+        UUID owner = shop.getOwner().getUniqueId();
+        if (owner == null) {
+            return;
+        }
 
         boolean isSelling = shop.isSelling();
         String purchaser = getPlayerName(event.getPurchaser());
@@ -55,15 +59,23 @@ private void checkShopOut(Shop shop) {
         JsonObject alertMessage = new JsonObject();
         alertMessage.addProperty("action", isSelling ? "out_of_stock" : "out_of_space");
         alertMessage.add("shop", EndpointUtils.getShopObject(shop));
-        sse.sendEvent("ShopOutOf" + (isSelling ? "Stock " : "Space"), alertMessage, shop.getOwner());
+        sse.sendEvent("ShopOutOf" + (isSelling ? "Stock " : "Space"), alertMessage, shop.getOwner().getUniqueId());
     }
 
-    private String getPlayerName(UUID uuid) {
+    private String getPlayerName(QUser user) {
+        String name = user.getUsername();
+        if (name != null) {
+            return name;
+        }
+        UUID uuid = user.getUniqueId();
+        if (uuid == null) {
+            return "Unknown player";
+        }
         Resident res = TownyAPI.getInstance().getResident(uuid);
         if (res != null) {
             return res.getName();
         } else {
-            return "Unknown player `(" + uuid + ")`";
+            return "Unknown player (" + uuid + ")";
         }
     }
 }

src/main/java/net/earthmc/emcapi/util/EndpointUtils.java

@@ -1,5 +1,6 @@
 package net.earthmc.emcapi.util;
 
+import com.ghostchu.quickshop.api.shop.Shop;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.palmergames.bukkit.towny.object.Nation;
@@ -10,7 +11,6 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
-import org.maxgamer.quickshop.api.shop.Shop;
 
 import java.util.ArrayList;
 import java.util.Collections;