From 6c1378f37031f5fc6a01005dcac837a9044ba4ce Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Thu, 30 Dec 2021 21:18:48 +0100
Subject: [PATCH] Update dependencies and fix tellRaw for 1.17+

---
 pom.xml                                       | 66 ++++++++++---------
 .../java/buttondevteam/chat/VanillaUtils.java |  6 +-
 src/main/java/org/dynmap/towny/DTBridge.java  |  4 +-
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2421397..6db7a7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,22 +95,26 @@
 		</repository>
         <repository>
             <id>ess-repo</id>
-            <url>https://ci.ender.zone/plugin/repository/everything/</url>
+            <url>https://repo.essentialsx.net/releases/</url>
         </repository>
         <!-- <repository>
             <id>Minigames</id>
             <url>http://maven.addstar.com.au/artifactory/release</url>
         </repository> -->
-		<!-- <repository>
-			<id>vault-repo</id>
-			<url>http://nexus.hc.to/content/repositories/pub_releases</url>
-		</repository> -->
-		<!-- <repository> <id>WorldEdit</id> <url>http://maven.sk89q.com/artifactory/repo</url> 
-			</repository> -->
-		<repository>
-			<id>projectlombok.org</id>
-			<url>http://projectlombok.org/mavenrepo</url>
-		</repository>
+        <!-- <repository>
+            <id>vault-repo</id>
+            <url>http://nexus.hc.to/content/repositories/pub_releases</url>
+        </repository> -->
+        <!-- <repository> <id>WorldEdit</id> <url>http://maven.sk89q.com/artifactory/repo</url>
+            </repository> -->
+        <repository>
+            <id>projectlombok.org</id>
+            <url>https://projectlombok.org/mavenrepo</url>
+        </repository>
+        <repository>
+            <id>Dynmap</id>
+            <url>https://repo.mikeprimm.com</url>
+        </repository>
     </repositories>
 	<dependencies>
 		<dependency>
@@ -124,9 +128,9 @@
             <version>v1.0.0</version>
 		</dependency>
         <dependency>
-            <groupId>net.ess3</groupId>
+            <groupId>net.essentialsx</groupId>
             <artifactId>EssentialsX</artifactId>
-            <version>2.17.1</version>
+            <version>2.19.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -136,19 +140,19 @@
             <version>0.96.2.0</version>
             <scope>provided</scope>
         </dependency>
-		<!-- <dependency> <groupId>au.com.mineauz</groupId> <artifactId>Minigames</artifactId> 
-			<version>1.8.0</version> </dependency> -->
-		<dependency>
-			<groupId>com.github.milkbowl</groupId>
-			<artifactId>VaultAPI</artifactId>
-			<version>master-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
+        <!-- <dependency> <groupId>au.com.mineauz</groupId> <artifactId>Minigames</artifactId>
+            <version>1.8.0</version> </dependency> -->
+        <dependency>
+            <groupId>com.github.MilkBowl</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
 
@@ -164,20 +168,20 @@
             <version>1.16.4-R0.1-SNAPSHOT</version>
         </dependency> -->
 		<dependency>
-			<groupId>com.github.webbukkit</groupId>
+            <groupId>com.github.TownyAdvanced</groupId>
 			<artifactId>Dynmap-Towny</artifactId>
-			<version>master-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>com.github.webbukkit</groupId>
-			<artifactId>Dynmap</artifactId>
-			<version>v2.5</version>
+            <version>0.89</version>
 		</dependency>
+        <dependency>
+            <groupId>us.dynmap</groupId>
+            <artifactId>dynmap-api</artifactId>
+            <version>3.2-beta-1</version>
+        </dependency>
 		<!-- https://mvnrepository.com/artifact/junit/junit -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-            <version>4.13.1</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <!-- Included in vanilla minecraft's JAR -->
@@ -191,7 +195,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.0.0</version>
+            <version>4.2.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/buttondevteam/chat/VanillaUtils.java b/src/main/java/buttondevteam/chat/VanillaUtils.java
index 4bcb67a..43b6d22 100644
--- a/src/main/java/buttondevteam/chat/VanillaUtils.java
+++ b/src/main/java/buttondevteam/chat/VanillaUtils.java
@@ -82,8 +82,10 @@ public class VanillaUtils {
 				if (notCraftPlayer(pcl)) return false;
 				val hm = pcl.getMethod("getHandle");
 				val handle = hm.invoke(p);
-				val nms = handle.getClass().getPackage().getName();
-				val chatcompcl = Class.forName(nms + ".IChatBaseComponent");
+				var nmsOrChat = handle.getClass().getPackage().getName();
+				if (!nmsOrChat.contains(".v1_"))
+					nmsOrChat = "net.minecraft.network.chat";
+				val chatcompcl = Class.forName(nmsOrChat + ".IChatBaseComponent");
 				//val chatcomarrcl = Class.forName("[L" + chatcompcl.getName() + ";");
 				val chatcomparr = Array.newInstance(chatcompcl, 1);
 				final Method sendmsg;
diff --git a/src/main/java/org/dynmap/towny/DTBridge.java b/src/main/java/org/dynmap/towny/DTBridge.java
index c6a3aa7..2fca363 100644
--- a/src/main/java/org/dynmap/towny/DTBridge.java
+++ b/src/main/java/org/dynmap/towny/DTBridge.java
@@ -4,7 +4,7 @@ import lombok.val;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.Plugin;
-import org.dynmap.bukkit.DynmapPlugin;
+import org.dynmap.DynmapCommonAPI;
 import org.dynmap.markers.MarkerAPI;
 
 import java.lang.reflect.Constructor;
@@ -35,7 +35,7 @@ public class DTBridge {
 			Constructor<?> c = cl.getDeclaredConstructor(FileConfiguration.class, String.class, MarkerAPI.class);
 			c.setAccessible(true);
 			style = c.newInstance(dtp.getConfig(), "custstyle." + townname,
-				((DynmapPlugin) Bukkit.getPluginManager().getPlugin("dynmap")).getMarkerAPI());
+				((DynmapCommonAPI) Bukkit.getPluginManager().getPlugin("dynmap")).getMarkerAPI());
 			map.put(townname, style);
 		}
 		set(cl, style, "fillcolor", fillcolor);