From 6cc8eb7d4c588c1b316ba6f4ec8ee44d4b780b2c Mon Sep 17 00:00:00 2001
From: TechnicallyCoded <technicallycoded@gmail.com>
Date: Thu, 4 Jan 2024 17:44:01 +0100
Subject: [PATCH] Update Kingdoms & Use Residence public build (#189)

* Remove refernece to org.kingdoms in CmdWorld

* Remove unused imports

* Update Kingdoms API

* Use public build of Residence instead of reflection
---
 pom.xml                                            | 14 ++++++--------
 .../BetterRTP/player/commands/types/CmdWorld.java  |  1 -
 .../depends/regionPlugins/RTP_KingdomsX.java       |  6 ++----
 .../depends/regionPlugins/RTP_Residence.java       | 12 +++++-------
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index a509bbd..4879091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,7 +255,7 @@
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>kingdoms</artifactId>
-            <version>1.13.9</version>
+            <version>1.16.8.1.1</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -372,15 +372,13 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>-->
-        <!-- CAN BE UNCOMMENTED IF YOU HAVE ACCESS TO THE PLUGIN -->
-        <!-- Private Repoed -->
-        <!-- This is uploaded to our private repo on https://repo.ronanplugins.com -->
-        <!--<dependency>
-            <groupId>com.ronanplugins</groupId>
+        <!-- Provided by repo: devmart-public -->
+        <dependency>
+            <groupId>com.bekvon.bukkit.residence</groupId>
             <artifactId>Residence</artifactId>
-            <version>4.9.1.9</version>
+            <version>5.1.4.1</version>
             <scope>provided</scope>
             <optional>true</optional>
-        </dependency>-->
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
index a3c84c9..4d12e8d 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdWorld.java
@@ -15,7 +15,6 @@
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
-import org.kingdoms.commands.general.misc.CommandTeleport;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_KingdomsX.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_KingdomsX.java
index 9cd6c0f..88d3c87 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_KingdomsX.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_KingdomsX.java
@@ -1,13 +1,11 @@
 package me.SuperRonanCraft.BetterRTP.references.depends.regionPlugins;
 
-import me.SuperRonanCraft.BetterRTP.BetterRTP;
-import me.SuperRonanCraft.BetterRTP.references.settings.SoftDepends;
 import org.bukkit.Location;
 
 public class RTP_KingdomsX implements RegionPluginCheck {
 
-    // NOT TESTED (3.0.2)
-    // KingdomsX (v1.10.5.2)
+    // NOT TESTED (3.6.12)
+    // KingdomsX (v1.16.8.1.1)
     // https://www.spigotmc.org/resources/kingdomsx.77670/
     public boolean check(Location loc) {
         boolean result = true;
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_Residence.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_Residence.java
index 91f677d..b625012 100644
--- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_Residence.java
+++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/regionPlugins/RTP_Residence.java
@@ -4,18 +4,16 @@
 
 public class RTP_Residence implements RegionPluginCheck {
 
-    // NOT TESTED (2.14.3)
-    // Residence (v4.9.1.9)
+    // NOT TESTED (3.6.12)
+    // Residence (v5.1.4.1)
     // https://www.spigotmc.org/resources/residence.11480/
     public boolean check(Location loc) {
         boolean result = true;
         if (REGIONPLUGINS.RESIDENCE.isEnabled())
             try {
-                // Using reflection
-                Class<?> residenceClass = Class.forName("com.bekvon.bukkit.residence.api.ResidenceApi");
-                Object residenceManager = residenceClass.getMethod("getResidenceManager").invoke(null);
-                Class<?> residenceManagerClass = residenceManager.getClass();
-                Object claim = residenceManagerClass.getMethod("getByLoc", Location.class).invoke(residenceManager, loc);
+                // Don't import to avoid class loader issues
+                com.bekvon.bukkit.residence.Residence instance = com.bekvon.bukkit.residence.Residence.getInstance();
+                com.bekvon.bukkit.residence.protection.ClaimedResidence claim = instance.getResidenceManagerAPI().getByLoc(loc);
                 result = claim == null;
             } catch (Exception e) {
                 e.printStackTrace();