From 2c21d8a49f879558c45a9c63aae7b98db07bd5c3 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Mon, 21 Jun 2021 19:40:16 -0500
Subject: [PATCH] Update JDA for Java 16 and Pterodactyl integration
 compatibility

---
 pom.xml                       | 40 +++++++++++++++++++++++++++--------
 src/main/resources/plugin.yml |  4 ++--
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index d113cf2..4763b98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,32 +20,38 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
+
         <repository>
             <id>dv8tion</id>
             <name>m2-dv8tion</name>
             <url>https://m2.dv8tion.net/releases/</url>
         </repository>
+
+        <repository>
+            <id>apache-snapshots</id>
+            <url>https://repository.apache.org/content/repositories/snapshots/</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.1_255</version>
+            <version>4.3.0_277</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.spigotmc</groupId>
-             <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
-            <scope>compile</scope>
+            <artifactId>spigot-api</artifactId>
+            <version>1.17-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.neovisionaries</groupId>
             <artifactId>nv-websocket-client</artifactId>
-            <version>2.10</version>
+            <version>2.14</version>
             <scope>compile</scope>
         </dependency>
 
@@ -56,12 +62,28 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- Required for both JDA and Pterodactyl integration -->
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20210307</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.30</version>
+            <version>1.7.31</version>
             <scope>provided</scope>
         </dependency>
+
+        <!-- This should only be temporary. The stable release does not yet support Java 16.
+        This should be removed when a stable version comes out that supports Java 16 -->
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <version>3.3.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <organization>
@@ -76,14 +98,14 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.3.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 1fa2883..1e6f67c 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,4 +1,4 @@
 name: JDA
-version: 4.2.0_222
-author: scripthead
+version: 4.3.0_277
+author: StevenNL2000
 main: me.totalfreedom.jda.JDA
\ No newline at end of file