From b3c0f4194864b09431c43824ef1b2304f91906dd Mon Sep 17 00:00:00 2001
From: ceze88 <dev.ceze@gmail.com>
Date: Mon, 15 Apr 2024 16:53:51 +0200
Subject: [PATCH] Update EssentialsX kit conversion (EssentialsX 2.20.1+
 required)

---
 pom.xml                                       | 35 +++++++++++++++++--
 .../ultimatekits/conversion/Convert.java      |  3 +-
 .../conversion/hooks/EssentialsHook.java      |  7 ++--
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 74262e6..c7cbbc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,11 +111,31 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+        </repository>
+
         <repository>
             <id>spigotmc-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
 
+        <repository>
+            <id>essentials-snapshots</id>
+            <url>https://repo.essentialsx.net/snapshots/</url>
+        </repository>
+
+        <repository>
+            <id>essentials-releases</id>
+            <url>https://repo.essentialsx.net/releases/</url>
+        </repository>
+
+        <repository>
+            <id>paper-repo</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+
         <repository>
             <id>public</id>
             <url>https://repo.craftaro.com/repository/public/</url>
@@ -144,10 +164,19 @@
             <scope>provided</scope>
         </dependency>
 
+
         <dependency>
-            <groupId>com.earth2me</groupId>
-            <artifactId>essentials</artifactId>
-            <version>2.17.1</version>
+            <groupId>net.essentialsx</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.19.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Required by Essentials -->
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>3.0.2</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/src/main/java/com/craftaro/ultimatekits/conversion/Convert.java b/src/main/java/com/craftaro/ultimatekits/conversion/Convert.java
index 2c6428d..1c2c5ac 100644
--- a/src/main/java/com/craftaro/ultimatekits/conversion/Convert.java
+++ b/src/main/java/com/craftaro/ultimatekits/conversion/Convert.java
@@ -53,7 +53,8 @@ public class Convert {
             }
             plugin.saveKits(true);
         } catch (NoSuchMethodError | NoClassDefFoundError e) {
-            System.out.println("UltimateKits conversion failed.");
+            plugin.getLogger().severe("Failed to convert kits from " + hook.getClass().getSimpleName() + "most likely due to an outdated plugin version.");
+            e.printStackTrace();
         }
     }
 
diff --git a/src/main/java/com/craftaro/ultimatekits/conversion/hooks/EssentialsHook.java b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/EssentialsHook.java
index 6188cdd..d956177 100644
--- a/src/main/java/com/craftaro/ultimatekits/conversion/hooks/EssentialsHook.java
+++ b/src/main/java/com/craftaro/ultimatekits/conversion/hooks/EssentialsHook.java
@@ -5,6 +5,7 @@ import com.craftaro.ultimatekits.conversion.Hook;
 import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.Kit;
 import com.earth2me.essentials.MetaItemStack;
+import com.earth2me.essentials.config.EssentialsConfiguration;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
@@ -23,10 +24,10 @@ public class EssentialsHook implements Hook {
 
     @Override
     public Map<String, ConversionKit> getKits() {
-        ConfigurationSection cs = this.essentials.getSettings().getKits();
+        EssentialsConfiguration cs = this.essentials.getKits().getRootConfig();
         Map<String, ConversionKit> kits = new LinkedHashMap<>();
         try {
-            for (String name : cs.getKeys(false)) {
+            for (String name : cs.getKeys()) {
                 Set<ItemStack> stacks = new HashSet<>();
                 Kit kitObj = new Kit(name, this.essentials);
                 for (String nonParse : kitObj.getItems()) {
@@ -42,7 +43,7 @@ public class EssentialsHook implements Hook {
                     }
                     stacks.add(metaStack.getItemStack());
                 }
-                kits.put(name, new ConversionKit(stacks, Integer.toUnsignedLong((int) this.essentials.getSettings().getKit(name).getOrDefault("delay", 0))));
+                kits.put(name, new ConversionKit(stacks, Integer.toUnsignedLong((int) cs.getInt("delay", 0))));
             }
         } catch (Exception e) {
             return kits;