Merge branch 'master' into 57-feature-allow-subnets-to-be-whitelisted

# Conflicts:
#	Bukkit/pom.xml
#	Bungee/pom.xml
#	Bungee/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java
#	Common/pom.xml
#	Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
#	Common/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java
#	Common/src/main/java/dev/brighten/antivpn/database/local/H2VPN.java
#	Common/src/main/java/dev/brighten/antivpn/database/mongo/MongoVPN.java
#	Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java
#	Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java
#	Common/src/main/java/dev/brighten/antivpn/database/sql/utils/Query.java
#	Common/src/main/java/dev/brighten/antivpn/utils/StringUtil.java
#	Sponge/pom.xml
#	Universal/pom.xml
#	Velocity/pom.xml
#	Velocity/src/main/java/dev/brighten/antivpn/velocity/VelocityListener.java
#	pom.xml

Common/src/main/java/dev/brighten/antivpn/AntiVPN.java

@@ -7,6 +7,9 @@ import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.impl.AntiVPNCommand;
 import dev.brighten.antivpn.database.VPNDatabase;
 import dev.brighten.antivpn.database.sqllite.LiteDatabase;
+import dev.brighten.antivpn.depends.LibraryLoader;
+import dev.brighten.antivpn.depends.MavenLibrary;
+import dev.brighten.antivpn.depends.Relocate;
 import dev.brighten.antivpn.message.MessageHandler;
 import dev.brighten.antivpn.utils.ConfigDefault;
 import dev.brighten.antivpn.utils.MiscUtils;
@@ -27,6 +30,25 @@ import java.util.List;
 
 @Getter
 @Setter(AccessLevel.PRIVATE)
+@MavenLibrary(groupId = "com.h2database", artifactId ="h2", version = "2.2.220", relocations = {
+        @Relocate(from ="org" + ".\\h2", to ="dev.brighten.antivpn.shaded.org.h2")})
+@MavenLibrary(groupId = "org.mongodb", artifactId = "mongo-java-driver", version = "3.12.14", relocations = {
+        @Relocate(from = "com." + "\\mongodb", to = "dev.brighten.antivpn.shaded.com.mongodb"),
+        @Relocate(from = "org" + "\\.bson", to = "dev.brighten.antivpn.shaded.org.bson")
+})
+@MavenLibrary(
+        groupId = "com.mysql",
+        artifactId = "mysql-connector-j",
+        version = "9.1.0",
+        relocations = {
+                @Relocate(from = "com.my\\" + "sql.cj", to = "dev.brighten.antivpn.shaded.com.mysql.cj"),
+                @Relocate(from = "com.my\\" + "sql.jdbc", to = "dev.brighten.antivpn.shaded.com.mysql.jdbc")
+        }
+)
+@MavenLibrary(groupId = "com.\\github\\.ben-manes\\.caffeine", artifactId = "caffeine", version = "3.1.8",
+        relocations = {
+                @Relocate(from = "com\\.github\\.benmanes\\.caffeine", to = "dev.brighten.antivpn.shaded.com.github.benmanes.caffeine"),
+        })
 public class AntiVPN {
 
     private static AntiVPN INSTANCE;
@@ -49,16 +71,22 @@ public class AntiVPN {
         INSTANCE.executor = executor;
         INSTANCE.playerExecutor = playerExecutor;
 
+        LibraryLoader.loadAll(INSTANCE);
+
         try {
             File configFile = new File(pluginFolder, "config.yml");
             if(!configFile.exists()){
-                configFile.getParentFile().mkdirs();
+                if(configFile.getParentFile().mkdirs()) {
+                    AntiVPN.getInstance().getExecutor().log("Created plugin folder!");
+                }
                 MiscUtils.copy(INSTANCE.getResource( "config.yml"), configFile);
             }
             INSTANCE.config = ConfigurationProvider.getProvider(YamlConfiguration.class)
                     .load(configFile);
         } catch (IOException e) {
-            e.printStackTrace();
+            AntiVPN.getInstance().getExecutor().logException("Could not load config.yml, plugin disabling...", e);
+            executor.disablePlugin();
+            return;
         }
 
         INSTANCE.vpnConfig = new VPNConfig();
@@ -89,6 +117,9 @@ public class AntiVPN {
                 (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), AntiVPN.getInstance())
                 .get());
         AntiVPN.getInstance().getMessageHandler().reloadStrings();
+
+        // Starting kick checks
+        AntiVPN.getInstance().getExecutor().startKickChecks();
     }
 
     public InputStream getResource(String filename) {
@@ -111,7 +142,21 @@ public class AntiVPN {
     }
 
     public void stop() {
-        executor.shutdown();
+        if (database instanceof H2VPN) {
+            database.shutdown();
+
+            // Try to deregister driver
+            try {
+                java.sql.Driver driver = java.sql.DriverManager.getDriver("jdbc:h2:");
+                if (driver != null) {
+                    java.sql.DriverManager.deregisterDriver(driver);
+                }
+            } catch (Exception e) {
+                // Log but don't throw
+                executor.log("Failed to deregister H2 driver: " + e.getMessage());
+            }
+        }
+        VPNExecutor.threadExecutor.shutdown();
         if(database != null) database.shutdown();
     }
 
@@ -132,7 +177,7 @@ public class AntiVPN {
             ConfigurationProvider.getProvider(YamlConfiguration.class)
                     .save(getConfig(), new File(pluginFolder.getPath() + File.separator + "config.yml"));
         } catch (IOException e) {
-            e.printStackTrace();
+            AntiVPN.getInstance().getExecutor().logException(e);
         }
     }