.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+patreon: scarsz
+custom: https://scarsz.me/donate/10

README.md

@@ -10,14 +10,21 @@
 A Minecraft to Discord and back link plugin
 
 ## Thanks to:
-<a href="https://www.jetbrains.com/idea/"><img src="https://scarsz.me/i/x2262.png" alt="Jetbrains IntelliJ IDEA" width="400px"></img></a>
-
-<strong>The Java IDE for Professional Developers by JetBrains</strong>
-
-<a href="https://pebblehost.com"><img src="https://pebblehost.com/src/img/logos/main.png" alt="PebbleHost" width="250px"></img></a>
-
-<strong>Need a server host? Try PebbleHost! Plans starting at $1/GB. Use promo code `DISCORDSRV` at checkout for 15% off your first three bills!</strong>
-
-<a href="http://www.ej-technologies.com/products/jprofiler/overview.html"><img src="https://www.ej-technologies.com/images/product_banners/jprofiler_large.png" alt="JProfiler" width="150px"></img></a>
-
-<strong>JProfiler's intuitive UI helps you resolve performance bottlenecks, pin down memory leaks and understand threading issues.</strong>
+<table>
+    <tr>
+        <td align="center" colspan="2">
+            <a href="https://pebblehost.com"><img src="https://pebblehost.com/src/img/logos/main.png" alt="PebbleHost" width="250px"></img></a>
+            <p><strong>Need a server host? Try PebbleHost! Plans starting at $1/GB.</p><p>Use promo code <code>DISCORDSRV</code> at checkout for 15% off your first three bills!</strong></p>
+        </td>
+    </tr>
+    <tr>
+        <td align="center" width="50%">
+            <a href="https://www.jetbrains.com/idea/"><img src="https://scarsz.me/i/x2262.png" alt="Jetbrains IntelliJ IDEA" width="400px"></img></a>
+            <p><strong>The Java IDE for Professional Developers by JetBrains</strong></p>            
+        </td>
+        <td align="center" width="50%">
+            <a href="http://www.ej-technologies.com/products/jprofiler/overview.html"><img src="https://www.ej-technologies.com/images/product_banners/jprofiler_large.png" alt="JProfiler" width="150px"></img></a>
+            <p><strong>JProfiler's intuitive UI helps you resolve performance bottlenecks, pin down memory leaks and understand threading issues.</strong></p>
+        </td>
+    </tr>
+</table>

pom.xml

@@ -3,8 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>github.scarsz.discordsrv</groupId>
     <artifactId>DiscordSRV</artifactId>
-    <version>1.16.9-MH</version>
-
+    <version>1.17.1-MH</version>
     <name>DiscordSRV</name>
     <url>https://www.spigotmc.org/resources/discordsrv.18494/</url>
 
@@ -18,12 +17,12 @@
 
     <issueManagement>
         <system>GitHub</system>
-        <url>https://github.com/Scarsz/DiscordSRV/issues</url>
+        <url>https://github.com/DiscordSRV/DiscordSRV/issues</url>
     </issueManagement>
 
     <scm>
-        <connection>scm:git:https://github.com/Scarsz/DiscordSRV.git</connection>
-        <url>https://github.com/Scarsz/DiscordSRV/</url>
+        <connection>scm:git:https://github.com/DiscordSRV/DiscordSRV.git</connection>
+        <url>https://github.com/DiscordSRV/DiscordSRV/</url>
     </scm>
 
     <properties>
@@ -49,7 +48,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -59,7 +58,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -79,6 +78,14 @@
                                     <pattern>net.dv8tion.jda</pattern>
                                     <shadedPattern>github.scarsz.discordsrv.dependencies.jda</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>net.kyori</pattern>
+                                    <shadedPattern>github.scarsz.discordsrv.dependencies.net.kyori</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>me.vankka</pattern>
+                                    <shadedPattern>github.scarsz.discordsrv.dependencies.me.vankka</shadedPattern>
+                                </relocation>
 
                                 <!-- relocated due to dependency hell -->
                                 <relocation>
@@ -105,6 +112,10 @@
                                     <pattern>okio</pattern>
                                     <shadedPattern>github.scarsz.discordsrv.dependencies.okio</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>gnu.trove</pattern>
+                                    <shadedPattern>github.scarsz.discordsrv.dependencies.trove</shadedPattern>
+                                </relocation>
                             </relocations>
 
                             <minimizeJar>true</minimizeJar>
@@ -127,7 +138,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.1.1</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -173,14 +184,18 @@
             <id>scarsz</id>
             <url>https://nexus.scarsz.me/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
 
     <dependencies>
         <!-- jda -->
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>3.8.2_459</version>
+            <version>3.8.3_463</version>
             <exclusions>
                 <exclusion>
                     <groupId>club.minnced</groupId>
@@ -269,10 +284,24 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.12</version>
+            <version>1.18.8</version>
             <scope>provided</scope>
         </dependency>
 
+        <!-- mysql driver -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.16</version>
+        </dependency>
+
+        <!-- dependency hell -->
+        <dependency>
+            <groupId>net.sf.trove4j</groupId>
+            <artifactId>trove4j</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+
         <!-- json.simple -->
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -294,6 +323,37 @@
             <version>0.9.0</version>
         </dependency>
 
+        <!-- Discord <-> Minecraft reserializer -->
+        <dependency>
+            <groupId>com.github.Vankka</groupId>
+            <artifactId>MCDiscordReserializer</artifactId>
+            <version>-b00bafd9c6-1</version>
+        </dependency>
+
+        <!-- Kyori Text -->
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>text-api</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>text-serializer-legacy</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>text-adapter-bukkit</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
+        <!-- guava -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>27.1-jre</version>
+        </dependency>
+
         <!-- herochat -->
         <dependency>
             <groupId>com.dthielke.herochat</groupId>