From cba3c2f2d90af1b48efff882bbb0b61cf3c56e4e Mon Sep 17 00:00:00 2001
From: Dawson Hessler <funkemunkybiz@gmail.com>
Date: Sun, 19 Dec 2021 13:45:53 -0500
Subject: [PATCH] Fixing KauriVPN on Velocity 1.5.2.1

---
 Assembly/dependency-reduced-pom.xml              |  4 ++--
 Assembly/pom.xml                                 |  6 +++---
 Bukkit/dependency-reduced-pom.xml                | 10 +++++++---
 Bukkit/pom.xml                                   |  4 ++--
 Bungee/dependency-reduced-pom.xml                | 10 +++++++---
 Bungee/pom.xml                                   |  4 ++--
 Common/pom.xml                                   |  9 ++++++++-
 Velocity/pom.xml                                 |  4 ++--
 Velocity/src/main/resources/velocity-plugin.json |  1 +
 pom.xml                                          |  2 +-
 10 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 Velocity/src/main/resources/velocity-plugin.json

diff --git a/Assembly/dependency-reduced-pom.xml b/Assembly/dependency-reduced-pom.xml
index 6dea4ed..ee2850c 100644
--- a/Assembly/dependency-reduced-pom.xml
+++ b/Assembly/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.5.2</version>
+    <version>1.5.2.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Assembly</artifactId>
@@ -35,8 +35,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
   </properties>
 </project>
 
diff --git a/Assembly/pom.xml b/Assembly/pom.xml
index 3f8fab0..d9da090 100644
--- a/Assembly/pom.xml
+++ b/Assembly/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.5.2</version>
+        <version>1.5.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -46,13 +46,13 @@
         </dependency>
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
-            <artifactId>Common</artifactId>
+            <artifactId>Velocity</artifactId>
             <version>${version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
-            <artifactId>Velocity</artifactId>
+            <artifactId>Common</artifactId>
             <version>${version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/Bukkit/dependency-reduced-pom.xml b/Bukkit/dependency-reduced-pom.xml
index 511d748..69a2d6f 100644
--- a/Bukkit/dependency-reduced-pom.xml
+++ b/Bukkit/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.5.2</version>
+    <version>1.5.2.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bukkit</artifactId>
@@ -56,13 +56,17 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.5.2</version>
+      <version>1.5.2.1</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
           <artifactId>toml4j</artifactId>
           <groupId>com.moandjiezana.toml</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>mysql-connector-java</artifactId>
+          <groupId>mysql</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -73,8 +77,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
   </properties>
 </project>
 
diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
index b5f7d8e..74fc477 100644
--- a/Bukkit/pom.xml
+++ b/Bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.5.2</version>
+        <version>1.5.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.5.2</version>
+            <version>1.5.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/Bungee/dependency-reduced-pom.xml b/Bungee/dependency-reduced-pom.xml
index 1366d39..0b08a46 100644
--- a/Bungee/dependency-reduced-pom.xml
+++ b/Bungee/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.5.2</version>
+    <version>1.5.2.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bungee</artifactId>
@@ -50,13 +50,17 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.5.2</version>
+      <version>1.5.2.1</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
           <artifactId>toml4j</artifactId>
           <groupId>com.moandjiezana.toml</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>mysql-connector-java</artifactId>
+          <groupId>mysql</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -73,8 +77,8 @@
     </dependency>
   </dependencies>
   <properties>
-    <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
+    <maven.compiler.source>8</maven.compiler.source>
   </properties>
 </project>
 
diff --git a/Bungee/pom.xml b/Bungee/pom.xml
index 5cd93b4..fb558f2 100644
--- a/Bungee/pom.xml
+++ b/Bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.5.2</version>
+        <version>1.5.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.5.2</version>
+            <version>1.5.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/Common/pom.xml b/Common/pom.xml
index d890a48..c46a7cb 100644
--- a/Common/pom.xml
+++ b/Common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.5.2</version>
+        <version>1.5.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -51,6 +51,13 @@
             <version>0.7.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.27</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/Velocity/pom.xml b/Velocity/pom.xml
index 9bba078..47e0f6d 100644
--- a/Velocity/pom.xml
+++ b/Velocity/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.5.2</version>
+        <version>1.5.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.5.2</version>
+            <version>1.5.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/Velocity/src/main/resources/velocity-plugin.json b/Velocity/src/main/resources/velocity-plugin.json
new file mode 100644
index 0000000..68f362d
--- /dev/null
+++ b/Velocity/src/main/resources/velocity-plugin.json
@@ -0,0 +1 @@
+{"id":"kaurivpn","name":"KauriVPN","version":"1.5.0","authors":["funkemunky"],"dependencies":[],"main":"dev.brighten.antivpn.velocity.VelocityPlugin"}
diff --git a/pom.xml b/pom.xml
index 4771876..494b91e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.brighten.antivpn</groupId>
     <artifactId>AntiVPN</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.2</version>
+    <version>1.5.2.1</version>
 
     <modules>
         <module>Common</module>