From b1132eb6b4dd51428890bcb9998ffa294e731d37 Mon Sep 17 00:00:00 2001
From: BenceX100 <52270269+BenceX100@users.noreply.github.com>
Date: Mon, 13 May 2024 19:24:39 +0200
Subject: [PATCH] Progress

---
 pom.xml                                       | 33 ++++++++++++++++---
 .../artillexstudios/axtrade/trade/Trade.java  |  3 ++
 .../axtrade/utils/ItemBuilderUtil.java        |  4 +--
 .../axtrade/utils/ShulkerUtils.java           |  2 +-
 src/main/resources/config.yml                 |  2 +-
 src/main/resources/guis.yml                   |  1 -
 6 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 78f9c9d..f09c0f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.5.3</version>
         <executions>
             <execution>
                 <phase>package</phase>
@@ -53,7 +53,7 @@
                             <shadedPattern>com.artillexstudios.axtrade.libs.gui</shadedPattern>
                         </relocation>
                         <relocation>
-                            <pattern>net.kyori.adventure</pattern>
+                            <pattern>net.kyori</pattern>
                             <shadedPattern>com.artillexstudios.axtrade.libs.kyori</shadedPattern>
                         </relocation>
                         <relocation>
@@ -109,8 +109,9 @@
       <dependency>
           <groupId>com.artillexstudios.axapi</groupId>
           <artifactId>axapi</artifactId>
-          <version>1.4.136</version>
+          <version>1.4.224</version>
           <scope>compile</scope>
+          <classifier>all</classifier>
       </dependency>
       <dependency>
           <groupId>org.spigotmc</groupId>
@@ -127,7 +128,7 @@
       <dependency>
           <groupId>me.clip</groupId>
           <artifactId>placeholderapi</artifactId>
-          <version>2.11.3</version>
+          <version>2.11.5</version>
           <scope>provided</scope>
       </dependency>
       <dependency>
@@ -136,6 +137,30 @@
           <version>3.0.2</version>
           <scope>compile</scope>
       </dependency>
+      <dependency>
+          <groupId>net.kyori</groupId>
+          <artifactId>adventure-platform-bukkit</artifactId>
+          <version>4.3.2</version>
+          <scope>compile</scope>
+      </dependency>
+      <dependency>
+          <groupId>net.kyori</groupId>
+          <artifactId>adventure-text-minimessage</artifactId>
+          <version>4.16.0</version>
+          <scope>compile</scope>
+      </dependency>
+      <dependency>
+          <groupId>net.kyori</groupId>
+          <artifactId>adventure-text-serializer-legacy</artifactId>
+          <version>4.16.0</version>
+          <scope>compile</scope>
+      </dependency>
+      <dependency>
+          <groupId>net.kyori</groupId>
+          <artifactId>adventure-api</artifactId>
+          <version>4.16.0</version>
+          <scope>compile</scope>
+      </dependency>
 
       <dependency>
           <groupId>me.aglerr.mobcoins</groupId>
diff --git a/src/main/java/com/artillexstudios/axtrade/trade/Trade.java b/src/main/java/com/artillexstudios/axtrade/trade/Trade.java
index 3f5cbbc..d4618a7 100644
--- a/src/main/java/com/artillexstudios/axtrade/trade/Trade.java
+++ b/src/main/java/com/artillexstudios/axtrade/trade/Trade.java
@@ -26,6 +26,8 @@ public class Trade {
         this.player2 = new TradePlayer(this, p2);
         player1.setOtherPlayer(player2);
         player2.setOtherPlayer(player1);
+
+        HistoryUtils.writeToHistory(String.format("Started: %s - %s", player1.getPlayer().getName(), player2.getPlayer().getName()));
     }
 
     public void update() {
@@ -43,6 +45,7 @@ public class Trade {
             if (itemStack == null) return;
             player2.getPlayer().getInventory().addItem(itemStack);
         });
+        HistoryUtils.writeToHistory(String.format("Aborted: %s - %s", player1.getPlayer().getName(), player2.getPlayer().getName()));
         MESSAGEUTILS.sendLang(player1.getPlayer(), "trade.aborted", Map.of("%player%", player2.getPlayer().getName()));
         MESSAGEUTILS.sendLang(player2.getPlayer(), "trade.aborted", Map.of("%player%", player1.getPlayer().getName()));
         SoundUtils.playSound(player1.getPlayer(), "aborted");
diff --git a/src/main/java/com/artillexstudios/axtrade/utils/ItemBuilderUtil.java b/src/main/java/com/artillexstudios/axtrade/utils/ItemBuilderUtil.java
index 5a6cd1d..7a5dc47 100644
--- a/src/main/java/com/artillexstudios/axtrade/utils/ItemBuilderUtil.java
+++ b/src/main/java/com/artillexstudios/axtrade/utils/ItemBuilderUtil.java
@@ -23,14 +23,14 @@ public class ItemBuilderUtil {
         final ItemBuilder builder = new ItemBuilder(section);
 
         section.getOptionalString("name").ifPresent((name) -> {
-            if (ClassUtils.classExists("me.clip.placeholderapi.PlaceholderAPI")) {
+            if (ClassUtils.INSTANCE.classExists("me.clip.placeholderapi.PlaceholderAPI")) {
                 name = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(player, name);
             }
             builder.setName(name, replacements);
         });
 
         section.getOptionalStringList("lore").ifPresent((lore) -> {
-            if (ClassUtils.classExists("me.clip.placeholderapi.PlaceholderAPI")) {
+            if (ClassUtils.INSTANCE.classExists("me.clip.placeholderapi.PlaceholderAPI")) {
                 lore = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(player, lore);
             }
             builder.setLore(lore, replacements);
diff --git a/src/main/java/com/artillexstudios/axtrade/utils/ShulkerUtils.java b/src/main/java/com/artillexstudios/axtrade/utils/ShulkerUtils.java
index 238036c..81c9c23 100644
--- a/src/main/java/com/artillexstudios/axtrade/utils/ShulkerUtils.java
+++ b/src/main/java/com/artillexstudios/axtrade/utils/ShulkerUtils.java
@@ -15,7 +15,7 @@ public class ShulkerUtils {
         final BlockStateMeta meta = (BlockStateMeta) item.getItemMeta();
         if (meta.getBlockState() instanceof ShulkerBox) {
             final ShulkerBox shulker = (ShulkerBox) meta.getBlockState();
-            if (ClassUtils.classExists("com.artillexstudios.axshulkers.utils.ShulkerUtils") && com.artillexstudios.axshulkers.utils.ShulkerUtils.getShulkerUUID(item) != null) {
+            if (ClassUtils.INSTANCE.classExists("com.artillexstudios.axshulkers.utils.ShulkerUtils") && com.artillexstudios.axshulkers.utils.ShulkerUtils.getShulkerUUID(item) != null) {
                 return com.artillexstudios.axshulkers.AxShulkers.getDB().getShulker(com.artillexstudios.axshulkers.utils.ShulkerUtils.getShulkerUUID(item));
             }
             return shulker.getInventory().getContents();
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 4dc3288..b896ea0 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -11,7 +11,7 @@ command-aliases:
   - "trade"
 
 # the time after clicking the trade confirm button before the trade finishes
-trade-confirm-seconds: 10
+trade-confirm-seconds: 5
 
 # how fast should trade requests expire?
 trade-request-expire-seconds: 60
diff --git a/src/main/resources/guis.yml b/src/main/resources/guis.yml
index bb4a61a..71fa31d 100644
--- a/src/main/resources/guis.yml
+++ b/src/main/resources/guis.yml
@@ -60,7 +60,6 @@ own:
       - "&#00ffdd&l> &#00ffddClick &8- &#00ffddChange Amount"
   currency2:
     slot: 3
-    # you need Vault installed for this
     currency: "Experience"
     material: "EXPERIENCE_BOTTLE"
     name: "&#00ffdd&lᴇxᴘᴇʀɪᴇɴᴄᴇ"