From 314e554ce07d62fd21da481b5f8ca943760c4b87 Mon Sep 17 00:00:00 2001
From: funkemunky <funkemunkybiz@gmail.com>
Date: Wed, 6 Apr 2022 09:20:07 -0400
Subject: [PATCH] Fixing velocity loading, v1.7.1 update

---
 Assembly/dependency-reduced-pom.xml                    |  6 +-----
 Assembly/pom.xml                                       |  6 +-----
 Bukkit/dependency-reduced-pom.xml                      |  4 ++--
 Bukkit/pom.xml                                         |  4 ++--
 Bungee/dependency-reduced-pom.xml                      |  4 ++--
 Bungee/pom.xml                                         |  4 ++--
 Common/pom.xml                                         |  2 +-
 Velocity/pom.xml                                       |  4 ++--
 .../dev/brighten/antivpn/velocity/VelocityPlugin.java  | 10 ++++------
 pom.xml                                                |  2 +-
 10 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/Assembly/dependency-reduced-pom.xml b/Assembly/dependency-reduced-pom.xml
index 4f5e177..3fb9ff6 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.7</version>
+    <version>1.7.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Assembly</artifactId>
@@ -37,10 +37,6 @@
                   <pattern>com.mysql</pattern>
                   <shadedPattern>dev.brighten.antivpn.utils.shaded.com.mysql</shadedPattern>
                 </relocation>
-                <relocation>
-                  <pattern>com.google</pattern>
-                  <shadedPattern>dev.brighten.antivpn.utils.shaded.com.google</shadedPattern>
-                </relocation>
                 <relocation>
                   <pattern>com.moandjiezana</pattern>
                   <shadedPattern>dev.brighten.antivpn.utils.shaded.com.moandjiezana</shadedPattern>
diff --git a/Assembly/pom.xml b/Assembly/pom.xml
index ee603e7..ab87fe5 100644
--- a/Assembly/pom.xml
+++ b/Assembly/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.7</version>
+        <version>1.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,10 +47,6 @@
                                     <pattern>com.mysql</pattern>
                                     <shadedPattern>dev.brighten.antivpn.utils.shaded.com.mysql</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>com.google</pattern>
-                                    <shadedPattern>dev.brighten.antivpn.utils.shaded.com.google</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>com.moandjiezana</pattern>
                                     <shadedPattern>dev.brighten.antivpn.utils.shaded.com.moandjiezana</shadedPattern>
diff --git a/Bukkit/dependency-reduced-pom.xml b/Bukkit/dependency-reduced-pom.xml
index 94d1665..0f8f0c3 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.7</version>
+    <version>1.7.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bukkit</artifactId>
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.7</version>
+      <version>1.7.1</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
diff --git a/Bukkit/pom.xml b/Bukkit/pom.xml
index df0dca9..50feea3 100644
--- a/Bukkit/pom.xml
+++ b/Bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.7</version>
+        <version>1.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.7</version>
+            <version>1.7.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/Bungee/dependency-reduced-pom.xml b/Bungee/dependency-reduced-pom.xml
index 4d9ac21..691b36e 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.7</version>
+    <version>1.7.1</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bungee</artifactId>
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.7</version>
+      <version>1.7.1</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
diff --git a/Bungee/pom.xml b/Bungee/pom.xml
index baa19f5..608697d 100644
--- a/Bungee/pom.xml
+++ b/Bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.7</version>
+        <version>1.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.7</version>
+            <version>1.7.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/Common/pom.xml b/Common/pom.xml
index 8573408..7742d1c 100644
--- a/Common/pom.xml
+++ b/Common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.7</version>
+        <version>1.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/Velocity/pom.xml b/Velocity/pom.xml
index 5178e79..fa831e4 100644
--- a/Velocity/pom.xml
+++ b/Velocity/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>AntiVPN</artifactId>
         <groupId>dev.brighten.antivpn</groupId>
-        <version>1.7</version>
+        <version>1.7.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>dev.brighten.antivpn</groupId>
             <artifactId>Common</artifactId>
-            <version>1.7</version>
+            <version>1.7.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java b/Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java
index 4a63c08..afecfa9 100644
--- a/Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java
+++ b/Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityPlugin.java
@@ -16,23 +16,21 @@ import java.nio.file.Path;
 import java.util.logging.Logger;
 
 @Getter
-@Plugin(id = "kaurivpn", name = "KauriVPN", version = "1.5.0", authors = {"funkemunky"})
+@Plugin(id = "kaurivpn", name = "KauriVPN", version = "1.7.1", authors = {"funkemunky"})
 public class VelocityPlugin {
 
     private final ProxyServer server;
     private final Logger logger;
     private final Metrics.Factory metricsFactory;
+    private final Path configDir;
 
     public static VelocityPlugin INSTANCE;
 
     @Inject
-    @DataDirectory
-    private Path configDir;
-
-    @Inject
-    public VelocityPlugin(ProxyServer server, Logger logger, Metrics.Factory metricsFactory) {
+    public VelocityPlugin(ProxyServer server, Logger logger, @DataDirectory Path path, Metrics.Factory metricsFactory) {
         this.server = server;
         this.logger = logger;
+        this.configDir = path;
         this.metricsFactory = metricsFactory;
     }
 
diff --git a/pom.xml b/pom.xml
index 2b45b4a..3931473 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.brighten.antivpn</groupId>
     <artifactId>AntiVPN</artifactId>
     <packaging>pom</packaging>
-    <version>1.7</version>
+    <version>1.7.1</version>
 
     <modules>
         <module>Common</module>