Adds a regression test to ensure this doesnt happen again

.github/workflows/create-release.yml

@@ -18,10 +18,8 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: '9.4.1'
-          cache-read-only: true
-          cache-cleanup: on-success
       - name: Build
-        run: gradle build -x test --no-daemon
+        run: gradle build --no-daemon
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Get Version Number from Gradle
@@ -33,13 +31,10 @@ jobs:
         id: changelog
         run: |
           CHANGELOG_CONTENT=$(awk 'BEGIN {print_section=0;} /^## \[/ {if (print_section == 0) {print_section=1;} else {exit;}} print_section {print;}' CHANGELOG.md)
+          CHANGELOG_ESCAPED=$(echo "$CHANGELOG_CONTENT" | sed ':a;N;$!ba;s/\n/%0A/g')
           echo "Extracted latest release notes from CHANGELOG.md:" 
-          echo "$CHANGELOG_CONTENT"
+          echo -e "$CHANGELOG_CONTENT" 
-          {
+          echo "content=$CHANGELOG_ESCAPED" >> "$GITHUB_OUTPUT"
-            echo 'content<<EOF'
-            echo "$CHANGELOG_CONTENT"
-            echo 'EOF'
-          } >> "$GITHUB_OUTPUT"
       - name: Create Release
         uses: actions/create-release@v1
         id: create_release

.github/workflows/gradle.yml

@@ -23,9 +23,6 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: '9.4.1'
-          cache-overwrite-existing: 'true'
-          cache-read-only: ${{ github.event_name == 'pull_request' }}
-          cache-cleanup: on-success
       - name: Build
         run: gradle build -x test --no-daemon
         env:

.github/workflows/test-gradle.yml

@@ -2,6 +2,32 @@ on:
   push:
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      JAVA_TOOL_OPTIONS: -Djavax.net.ssl.trustStoreType=JKS -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStorePassword=changeit
+
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          java-version: '21'
+          distribution: 'zulu'
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: '9.4.1'
+      - name: Build
+        run: gradle build -x test --no-daemon
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload AntiVPN
+        uses: actions/upload-artifact@v4
+        with:
+          name: AntiVPN-Universal
+          path: build/libs/AntiVPN-*-universal.jar
+
   build-and-test:
     runs-on: ubuntu-latest
     env:
@@ -18,17 +44,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           gradle-version: '9.4.1'
-          cache-overwrite-existing: 'true'
+      - name: Build and Test
-          cache-read-only: ${{ github.event_name == 'pull_request' }}
+        run: gradle build --no-daemon
-          cache-cleanup: on-success
-      - name: Build
-        run: gradle build -x test --no-daemon
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload AntiVPN
-        uses: actions/upload-artifact@v4
-        with:
-          name: AntiVPN-Universal
-          path: build/libs/AntiVPN-*-universal.jar
-      - name: Test
-        run: gradle test --no-daemon --parallel

.gitignore

@@ -296,4 +296,3 @@ $RECYCLE.BIN/
 # End of https://www.toptal.com/developers/gitignore/api/windows,macos,linux,maven,java,intellij,eclipse,netbeans
 /.gradle/
 .grade/**
-/run/

Bukkit/Loader/build.gradle

@@ -10,12 +10,6 @@ dependencies {
     implementation project(':Common:loader-utils')
 }
 
-tasks.processResources {
-    filesMatching('plugin.yml') {
-        expand(project: project, projectVersion: project.version)
-    }
-}
-
 shadowJar {
     archiveClassifier.set('')
 
@@ -30,8 +24,4 @@ tasks.named('shadowJar') {
     dependsOn(':Bukkit:Plugin:shadowJar')
 }
 
-tasks.named('compileJava') {
-    dependsOn(':Bukkit:Plugin:shadowJar')
-}
-
 tasks.build.dependsOn shadowJar

Bukkit/Loader/src/main/java/dev/brighten/antivpn/bukkit/loader/BukkitLoaderPlugin.java

@@ -29,8 +29,7 @@ public class BukkitLoaderPlugin extends JavaPlugin {
     private final LoaderBootstrap plugin;
 
     public BukkitLoaderPlugin() {
-    JarInJarClassLoader loader =
+        JarInJarClassLoader loader = new JarInJarClassLoader(getClass().getClassLoader(), JAR_NAME, SOURCE_NAME);
-        new JarInJarClassLoader(getClass().getClassLoader(), JAR_NAME, SOURCE_NAME);
         this.plugin = loader.instantiatePlugin(BOOTSTRAP_CLASS, JavaPlugin.class, this);
     }
 
@@ -48,4 +47,6 @@ public class BukkitLoaderPlugin extends JavaPlugin {
     public void onDisable() {
         this.plugin.onDisable();
     }
+
+
 }

Bukkit/Plugin/build.gradle

@@ -12,7 +12,6 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:5.11.0'
     testImplementation 'org.mockito:mockito-subclass:5.11.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:5.11.0'
-    testImplementation testFixtures(project(':Common:Source'))
 }
 
 shadowJar {

Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitCommandExecutor.java

@@ -19,12 +19,13 @@ package dev.brighten.antivpn.bukkit;
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.command.CommandExecutor;
-import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.Optional;
+
 @RequiredArgsConstructor
 public class BukkitCommandExecutor implements CommandExecutor {
 
@@ -32,8 +33,8 @@ public class BukkitCommandExecutor implements CommandExecutor {
 
     @Override
     public void sendMessage(String message, Object... objects) {
-    sender.sendMessage(
+        sender.sendMessage(ChatColor.translateAlternateColorCodes('&',
-        ChatColor.translateAlternateColorCodes('&', String.format(message, objects)));
+                String.format(message, objects)));
     }
 
     @Override
@@ -43,9 +44,9 @@ public class BukkitCommandExecutor implements CommandExecutor {
 
     @Override
     public Optional<APIPlayer> getPlayer() {
-    if (!isPlayer()) return Optional.empty();
+        if(!isPlayer()) return Optional.empty();
 
-    return AntiVPN.getInstance().getPlayerExecutor().getPlayer(((Player) sender).getUniqueId());
+        return AntiVPN.getInstance().getPlayerExecutor().getPlayer(((Player)sender).getUniqueId());
     }
 
     @Override

Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitListener.java

@@ -18,11 +18,9 @@ package dev.brighten.antivpn.bukkit;
 
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.api.APIPlayer;
-import dev.brighten.antivpn.api.CheckResult;
 import dev.brighten.antivpn.api.OfflinePlayer;
 import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.utils.StringUtil;
-import java.util.logging.Level;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
@@ -34,11 +32,14 @@ import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.util.logging.Level;
+
 public class BukkitListener extends VPNExecutor implements Listener {
 
     @Override
     public void registerListeners() {
-    Bukkit.getPluginManager().registerEvents(this, BukkitPlugin.pluginInstance.getPlugin());
+        Bukkit.getPluginManager()
+                .registerEvents(this, BukkitPlugin.pluginInstance.getPlugin());
     }
 
     @Override
@@ -60,9 +61,8 @@ public class BukkitListener extends VPNExecutor implements Listener {
     public void runCommand(String command) {
         new BukkitRunnable() {
             public void run() {
-        Bukkit.getServer()
+                Bukkit.getServer().dispatchCommand(Bukkit.getConsoleSender(),
-            .dispatchCommand(
+                        ChatColor.translateAlternateColorCodes('&', command));
-                Bukkit.getConsoleSender(), ChatColor.translateAlternateColorCodes('&', command));
             }
         }.runTask(BukkitPlugin.pluginInstance.getPlugin());
     }
@@ -75,44 +75,41 @@ public class BukkitListener extends VPNExecutor implements Listener {
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onLogin(final PlayerLoginEvent event) {
-    APIPlayer player =
+        APIPlayer player = AntiVPN.getInstance().getPlayerExecutor().getPlayer(event.getPlayer().getUniqueId())
-        AntiVPN.getInstance()
+                .orElse(new OfflinePlayer(
-            .getPlayerExecutor()
-            .getPlayer(event.getPlayer().getUniqueId())
-            .orElse(
-                new OfflinePlayer(
                         event.getPlayer().getUniqueId(),
                         event.getPlayer().getName(),
-                    event.getAddress()));
+                        event.getAddress()
+                ));
 
-    CheckResult result = player.checkPlayer();
+        player.checkPlayer(result -> {
+            if(!result.resultType().isShouldBlock()) return;
 
-    if (!result.resultType().isShouldBlock()) return;
+            if(!AntiVPN.getInstance().getVpnConfig().isKickPlayers()) {
-
-    if (!AntiVPN.getInstance().getVpnConfig().isKickPlayers()) {
                 return;
             }
 
             event.setResult(PlayerLoginEvent.Result.KICK_BANNED);
-    event.setKickMessage(
+            event.setKickMessage(switch (result.resultType()) {
-        switch (result.resultType()) {
+                case DENIED_COUNTRY -> StringUtil.varReplace(
-          case DENIED_COUNTRY ->
-              StringUtil.varReplace(
                         AntiVPN.getInstance().getVpnConfig().getCountryVanillaKickReason(),
                         player,
-                  result.response());
+                        result.response()
+                );
                 case DENIED_PROXY ->
                         StringUtil.varReplace(
-                  AntiVPN.getInstance().getVpnConfig().getKickMessage(), player, result.response());
+                                AntiVPN.getInstance().getVpnConfig().getKickMessage(),
+                                player,
+                                result.response()
+                        );
                 default -> "You were kicked by KauriVPN for an unknown reason!";
             });
+        });
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onJoin(final PlayerJoinEvent event) {
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getPlayerExecutor().getPlayer(event.getPlayer().getUniqueId())
-        .getPlayerExecutor()
-        .getPlayer(event.getPlayer().getUniqueId())
                 .ifPresent(APIPlayer::checkAlertsState);
     }
 

Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlayer.java

@@ -24,12 +24,8 @@ import org.bukkit.scheduler.BukkitRunnable;
 public class BukkitPlayer extends APIPlayer {
 
     private final Player player;
-
     public BukkitPlayer(Player player) {
-    super(
+        super(player.getUniqueId(), player.getName(), player.getAddress() != null ? player.getAddress().getAddress() : null);
-        player.getUniqueId(),
-        player.getName(),
-        player.getAddress() != null ? player.getAddress().getAddress() : null);
 
         this.player = player;
     }

Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlayerExecutor.java

@@ -18,11 +18,12 @@ package dev.brighten.antivpn.bukkit;
 
 import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.api.PlayerExecutor;
-import java.util.*;
-import java.util.stream.Collectors;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 public class BukkitPlayerExecutor implements PlayerExecutor {
 
     private final Map<UUID, BukkitPlayer> cachedPlayers = new HashMap<>();
@@ -31,24 +32,22 @@ public class BukkitPlayerExecutor implements PlayerExecutor {
     public Optional<APIPlayer> getPlayer(String name) {
         final Player player = Bukkit.getPlayer(name);
 
-    if (player == null) {
+        if(player == null) {
             return Optional.empty();
         }
 
-    return Optional.of(
+        return Optional.of(cachedPlayers.computeIfAbsent(player.getUniqueId(), k -> new BukkitPlayer(player)));
-        cachedPlayers.computeIfAbsent(player.getUniqueId(), k -> new BukkitPlayer(player)));
     }
 
     @Override
     public Optional<APIPlayer> getPlayer(UUID uuid) {
         final Player player = Bukkit.getPlayer(uuid);
 
-    if (player == null) {
+        if(player == null) {
             return Optional.empty();
         }
 
-    return Optional.of(
+        return Optional.of(cachedPlayers.computeIfAbsent(player.getUniqueId(), k -> new BukkitPlayer(player)));
-        cachedPlayers.computeIfAbsent(player.getUniqueId(), k -> new BukkitPlayer(player)));
     }
 
     @Override
@@ -56,10 +55,12 @@ public class BukkitPlayerExecutor implements PlayerExecutor {
         cachedPlayers.remove(uuid);
     }
 
+
     @Override
     public List<APIPlayer> getOnlinePlayers() {
         return Bukkit.getOnlinePlayers().stream()
                 .map(pl -> cachedPlayers.computeIfAbsent(pl.getUniqueId(), k -> new BukkitPlayer(pl)))
                 .collect(Collectors.toList());
     }
+
 }

Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/BukkitPlugin.java

@@ -24,11 +24,6 @@ import dev.brighten.antivpn.database.local.H2VPN;
 import dev.brighten.antivpn.database.mongo.MongoVPN;
 import dev.brighten.antivpn.database.sql.MySqlVPN;
 import dev.brighten.antivpn.loader.LoaderBootstrap;
-import java.io.File;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 import lombok.Getter;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
@@ -39,19 +34,28 @@ import org.bukkit.plugin.SimplePluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 public class BukkitPlugin implements LoaderBootstrap {
 
     public static BukkitPlugin pluginInstance;
     private SimpleCommandMap commandMap;
-  @Getter private File dataFolder;
+    @Getter
+    private File dataFolder;
     private final List<org.bukkit.command.Command> registeredCommands = new ArrayList<>();
-  @Getter private final JavaPlugin plugin;
+    @Getter
+    private final JavaPlugin plugin;
 
     public BukkitPlugin(JavaPlugin plugin) {
         this.plugin = plugin;
     }
 
-  @Getter private PlayerCommandRunner playerCommandRunner;
+    @Getter
+    private PlayerCommandRunner playerCommandRunner;
 
     @Override
     public void onLoad(File dataFolder) {
@@ -68,7 +72,7 @@ public class BukkitPlugin implements LoaderBootstrap {
         playerCommandRunner.start();
 
         // Loading our bStats metrics to be pushed to https://bstats.org
-    if (AntiVPN.getInstance().getVpnConfig().metrics()) {
+        if(AntiVPN.getInstance().getVpnConfig().metrics()) {
             Bukkit.getLogger().info("Starting bStats metrics...");
             Metrics metrics = new Metrics(plugin, 12615);
             metrics.addCustomChart(new SimplePie("database_used", this::getDatabaseType));
@@ -86,10 +90,7 @@ public class BukkitPlugin implements LoaderBootstrap {
                 Field field = SimplePluginManager.class.getDeclaredField("commandMap");
                 field.setAccessible(true);
                 commandMap = (SimpleCommandMap) field.get(manager);
-      } catch (IllegalArgumentException
+            } catch (IllegalArgumentException | SecurityException | NoSuchFieldException | IllegalAccessException e) {
-          | SecurityException
-          | NoSuchFieldException
-          | IllegalAccessException e) {
                 AntiVPN.getInstance().getExecutor().logException(e);
             }
         }
@@ -106,7 +107,7 @@ public class BukkitPlugin implements LoaderBootstrap {
             commandMap.register(plugin.getName(), newCommand);
         }
 
-    // TODO Finish system before implementing on startup
+        //TODO Finish system before implementing on startup
         /*Bukkit.getLogger().info("Getting strings...");
         AntiVPN.getInstance().getMessageHandler().initStrings(vpnString -> new ConfigDefault<>
                 (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), BukkitPlugin.pluginInstance)
@@ -128,9 +129,8 @@ public class BukkitPlugin implements LoaderBootstrap {
             Field field = SimpleCommandMap.class.getDeclaredField("knownCommands");
             field.setAccessible(true);
 
-      if (field.get(commandMap) instanceof Map<?, ?> knownCommands) {
+            if(field.get(commandMap) instanceof Map<?, ?> knownCommands) {
-        Map<String, org.bukkit.command.Command> casted =
+                Map<String, org.bukkit.command.Command> casted = (Map<String, org.bukkit.command.Command>) knownCommands;
-            (Map<String, org.bukkit.command.Command>) knownCommands;
                 casted.values().removeAll(registeredCommands);
                 registeredCommands.clear();
             }
@@ -149,11 +149,11 @@ public class BukkitPlugin implements LoaderBootstrap {
     private String getDatabaseType() {
         VPNDatabase database = AntiVPN.getInstance().getDatabase();
 
-    if (database instanceof MySqlVPN) {
+        if(database instanceof MySqlVPN) {
             return "MySQL";
-    } else if (database instanceof H2VPN) {
+        } else if(database instanceof H2VPN) {
             return "H2";
-    } else if (database instanceof MongoVPN) {
+        } else if(database instanceof MongoVPN) {
             return "MongoDB";
         } else {
             return "No-Database";

Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/PlayerCommandRunner.java

@@ -17,36 +17,36 @@
 package dev.brighten.antivpn.bukkit;
 
 import dev.brighten.antivpn.utils.MiscUtils;
+import lombok.Data;
+import org.bukkit.Bukkit;
+import org.bukkit.scheduler.BukkitRunnable;
+
 import java.util.Queue;
 import java.util.UUID;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import lombok.Data;
-import org.bukkit.Bukkit;
-import org.bukkit.scheduler.BukkitRunnable;
 
 public class PlayerCommandRunner {
     private final ScheduledExecutorService executorService;
     private final Queue<PlayerAction> playerActions = new ArrayBlockingQueue<>(10000);
 
     public PlayerCommandRunner() {
-    executorService =
+        executorService = Executors.newSingleThreadScheduledExecutor(
-        Executors.newSingleThreadScheduledExecutor(
+                MiscUtils.createThreadFactory("AntiVPN:PlayerCommandRunner")
-            MiscUtils.createThreadFactory("AntiVPN:PlayerCommandRunner"));
+        );
     }
 
     void start() {
-    executorService.scheduleAtFixedRate(
+        executorService.scheduleAtFixedRate(() -> {
-        () -> {
             long currentTime = System.currentTimeMillis();
-          while (!playerActions.isEmpty()) {
+            while(!playerActions.isEmpty()) {
                 PlayerAction action = playerActions.peek();
 
-            if (action == null) continue;
+                if(action == null) continue;
 
-            if (currentTime - action.start > 2000L || Bukkit.getPlayer(action.getUuid()) != null) {
+                if(currentTime - action.start > 2000L || Bukkit.getPlayer(action.getUuid()) != null) {
                     new BukkitRunnable() {
                         public void run() {
                             action.getAction().run();
@@ -56,10 +56,7 @@ public class PlayerCommandRunner {
                     playerActions.poll();
                 }
             }
-        },
+        }, 1000, 100, TimeUnit.MILLISECONDS);
-        1000,
-        100,
-        TimeUnit.MILLISECONDS);
     }
 
     void stop() {

Bukkit/Plugin/src/main/java/dev/brighten/antivpn/bukkit/command/BukkitCommand.java

@@ -19,17 +19,17 @@ package dev.brighten.antivpn.bukkit.command;
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.bukkit.BukkitCommandExecutor;
 import dev.brighten.antivpn.command.Command;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.IntStream;
 import lombok.val;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.command.CommandSender;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.IntStream;
+
 public class BukkitCommand extends org.bukkit.command.Command {
 
     private final Command command;
-
     public BukkitCommand(Command command) {
         super(command.name(), command.description(), command.usage(), Arrays.asList(command.aliases()));
 
@@ -41,17 +41,13 @@ public class BukkitCommand extends org.bukkit.command.Command {
             throws IllegalArgumentException {
         val children = command.children();
 
-    if (children.length > 0 && args.length > 0) {
+        if(children.length > 0 && args.length > 0) {
             for (Command child : children) {
-        if (child.name().equalsIgnoreCase(args[0])
+                if(child.name().equalsIgnoreCase(args[0])  || Arrays.stream(child.aliases())
-            || Arrays.stream(child.aliases())
                         .anyMatch(alias2 -> alias2.equalsIgnoreCase(args[0]))) {
-          return child.tabComplete(
+                    return child.tabComplete(new BukkitCommandExecutor(sender), alias, IntStream
-              new BukkitCommandExecutor(sender),
+                            .range(0, args.length - 1)
-              alias,
+                            .mapToObj(i -> args[i + 1]).toArray(String[]::new));
-              IntStream.range(0, args.length - 1)
-                  .mapToObj(i -> args[i + 1])
-                  .toArray(String[]::new));
                 }
             }
         }
@@ -60,48 +56,37 @@ public class BukkitCommand extends org.bukkit.command.Command {
 
     @Override
     public boolean execute(CommandSender sender, String s, String[] args) {
-    if (!sender.hasPermission("antivpn.command.*") && !sender.hasPermission(command.permission())) {
+        if(!sender.hasPermission("antivpn.command.*")
-      sender.sendMessage(
+                && !sender.hasPermission(command.permission())) {
-          ChatColor.translateAlternateColorCodes(
+            sender.sendMessage(ChatColor.translateAlternateColorCodes('&',
-              '&',
                     AntiVPN.getInstance().getMessageHandler().getString("no-permission").getMessage()));
             return true;
         }
 
         val children = command.children();
 
-    if (children.length > 0 && args.length > 0) {
+        if(children.length > 0 && args.length > 0) {
             for (Command child : children) {
-        if (child.name().equalsIgnoreCase(args[0])
+                if(child.name().equalsIgnoreCase(args[0])  || Arrays.stream(child.aliases())
-            || Arrays.stream(child.aliases()).anyMatch(alias -> alias.equalsIgnoreCase(args[0]))) {
+                        .anyMatch(alias -> alias.equalsIgnoreCase(args[0]))) {
-          if (!sender.hasPermission("antivpn.command.*")
+                    if(!sender.hasPermission("antivpn.command.*")
                             && !sender.hasPermission(child.permission())) {
-            sender.sendMessage(
+                        sender.sendMessage(ChatColor.translateAlternateColorCodes('&',
-                ChatColor.translateAlternateColorCodes(
+                                AntiVPN.getInstance().getMessageHandler().getString("no-permission").getMessage()));
-                    '&',
-                    AntiVPN.getInstance()
-                        .getMessageHandler()
-                        .getString("no-permission")
-                        .getMessage()));
                         return true;
                     }
 
-          sender.sendMessage(
+                    sender.sendMessage(ChatColor.translateAlternateColorCodes('&',
-              ChatColor.translateAlternateColorCodes(
+                            child.execute(new BukkitCommandExecutor(sender), IntStream
-                  '&',
+                                    .range(0, args.length - 1)
-                  child.execute(
+                                    .mapToObj(i -> args[i + 1]).toArray(String[]::new))));
-                      new BukkitCommandExecutor(sender),
-                      IntStream.range(0, args.length - 1)
-                          .mapToObj(i -> args[i + 1])
-                          .toArray(String[]::new))));
                     return true;
                 }
             }
         }
 
-    sender.sendMessage(
+        sender.sendMessage(ChatColor.translateAlternateColorCodes('&',
-        ChatColor.translateAlternateColorCodes(
+                command.execute(new BukkitCommandExecutor(sender), args)));
-            '&', command.execute(new BukkitCommandExecutor(sender), args)));
 
         return true;
     }

Bukkit/Plugin/src/test/java/dev/brighten/antivpn/bukkit/BukkitListenerTest.java

@@ -1,20 +1,24 @@
 package dev.brighten.antivpn.bukkit;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
-
 import be.seeseemelk.mockbukkit.MockBukkit;
 import be.seeseemelk.mockbukkit.ServerMock;
 import be.seeseemelk.mockbukkit.entity.PlayerMock;
 import dev.brighten.antivpn.AntiVPN;
-import dev.brighten.antivpn.StandardTest;
+import dev.brighten.antivpn.api.PlayerExecutor;
-import dev.brighten.antivpn.api.*;
+import dev.brighten.antivpn.api.VPNConfig;
+import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.message.MessageHandler;
 import dev.brighten.antivpn.message.VpnString;
 import dev.brighten.antivpn.web.objects.VPNResponse;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import java.lang.reflect.Field;
 import java.net.InetAddress;
 import java.util.Optional;
@@ -25,16 +29,14 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
-import org.bukkit.command.CommandSender;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 
-public class BukkitListenerTest extends StandardTest {
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.*;
+
+public class BukkitListenerTest {
 
     private ServerMock server;
     private BukkitListener listener;
@@ -43,10 +45,10 @@ public class BukkitListenerTest extends StandardTest {
     @BeforeEach
     public void setUp() throws Exception {
         server = MockBukkit.mock(new RecordingServerMock());
-    JavaPlugin plugin =
+        JavaPlugin plugin = MockBukkit.loadWith(
-        MockBukkit.loadWith(
                 TestPlugin.class,
-            new PluginDescriptionFile("AntiVPNTest", "1.0.0", TestPlugin.class.getName()));
+                new PluginDescriptionFile("AntiVPNTest", "1.0.0", TestPlugin.class.getName())
+        );
         BukkitPlugin.pluginInstance = new BukkitPlugin(plugin);
 
         AntiVPN antiVPN = mock(AntiVPN.class);
@@ -70,17 +72,10 @@ public class BukkitListenerTest extends StandardTest {
         when(mockVpnString.getFormattedMessage(any())).thenReturn("Blocked!");
         when(messageHandler.getString(anyString())).thenReturn(mockVpnString);
         
-    when(vpnExecutor.checkIp(anyString()))
+        when(vpnExecutor.checkIp(anyString())).thenReturn(CompletableFuture.completedFuture(
-        .thenReturn(
+                VPNResponse.builder().success(true).proxy(false).ip("127.0.0.1")
-            CompletableFuture.completedFuture(
+                        .method("N/A").countryName("N/A").city("N/A").build()
-                VPNResponse.builder()
+        ));
-                    .success(true)
-                    .proxy(false)
-                    .ip("127.0.0.1")
-                    .method("N/A")
-                    .countryName("N/A")
-                    .city("N/A")
-                    .build()));
         
         // Use reflection to set the private static INSTANCE field
         Field instanceField = AntiVPN.class.getDeclaredField("INSTANCE");
@@ -106,21 +101,6 @@ public class BukkitListenerTest extends StandardTest {
         PlayerMock player = server.addPlayer("TestPlayer");
         InetAddress address = InetAddress.getByName("127.0.0.1");
         
-    mockCache(
-        "127.0.0.1",
-        new CheckResult(
-            VPNResponse.builder()
-                .success(true)
-                .proxy(false)
-                .ip("127.0.0.1")
-                .method("N/A")
-                .countryName("N/A")
-                .countryCode("N/A")
-                .city("N/A")
-                .build(),
-            ResultType.ALLOWED,
-            true));
-
         PlayerLoginEvent event = new PlayerLoginEvent(player, "localhost", address);
         
         listener.onLogin(event);
@@ -128,21 +108,41 @@ public class BukkitListenerTest extends StandardTest {
         assertEquals(PlayerLoginEvent.Result.ALLOWED, event.getResult());
     }
 
+    @Test
+    public void testLoginEventBlocked() throws Exception {
+        PlayerMock player = server.addPlayer("ProxyPlayer");
+        InetAddress address = InetAddress.getByName("1.1.1.1");
+        
+        // Mock proxy response
+        when(vpnExecutor.checkIp("1.1.1.1")).thenReturn(CompletableFuture.completedFuture(
+                VPNResponse.builder().success(true).proxy(true).ip("1.1.1.1")
+                        .method("N/A").countryName("N/A").countryCode("N/A").city("N/A").build()
+        ));
+        
+        PlayerLoginEvent event = new PlayerLoginEvent(player, "localhost", address);
+        
+        listener.onLogin(event);
+        
+        assertEquals(PlayerLoginEvent.Result.KICK_BANNED, event.getResult());
+        assertEquals("Blocked!", net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(event.kickMessage()));
+    }
+
     @Test
     public void testLoginPipelineProxyPlayerIsKickedWithoutErrors() throws Exception {
         PlayerMock player = server.addPlayer("PipelineProxyPlayer");
         InetAddress address = InetAddress.getByName("1.1.1.1");
 
-    mockCache();
+        when(vpnExecutor.checkIp("1.1.1.1")).thenReturn(CompletableFuture.completedFuture(
+                VPNResponse.builder().success(true).proxy(true).ip("1.1.1.1")
+                        .method("N/A").countryName("N/A").countryCode("N/A").city("N/A").build()
+        ));
+
         PlayerLoginEvent event = new PlayerLoginEvent(player, "localhost", address);
 
         assertDoesNotThrow(() -> listener.onLogin(event));
 
         assertEquals(PlayerLoginEvent.Result.KICK_BANNED, event.getResult());
-    assertEquals(
+        assertEquals("Blocked!", net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(event.kickMessage()));
-        "Blocked!",
-        net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection()
-            .serialize(event.kickMessage()));
     }
 
     @Test
@@ -151,29 +151,26 @@ public class BukkitListenerTest extends StandardTest {
         ExecutorService executor = Executors.newSingleThreadExecutor();
 
         try {
-      CompletableFuture<Void> asyncCall =
+            CompletableFuture<Void> asyncCall = CompletableFuture.runAsync(
-          CompletableFuture.runAsync(() -> listener.runCommand("antivpn-test &aok"), executor);
+                    () -> listener.runCommand("antivpn-test &aok"),
+                    executor
+            );
 
             assertDoesNotThrow(() -> asyncCall.get(5, TimeUnit.SECONDS));
-      assertFalse(
+            assertFalse(recordingServer.commandDispatched(), "Command should be scheduled, not dispatched asynchronously");
-          recordingServer.commandDispatched(),
-          "Command should be scheduled, not dispatched asynchronously");
 
             server.getScheduler().performOneTick();
 
-      assertTrue(
+            assertTrue(recordingServer.commandDispatched(), "Scheduled command should be dispatched on the next server tick");
-          recordingServer.commandDispatched(),
+            assertTrue(recordingServer.dispatchedOnPrimaryThread(), "Command dispatch must happen on Bukkit's primary thread");
-          "Scheduled command should be dispatched on the next server tick");
-      assertTrue(
-          recordingServer.dispatchedOnPrimaryThread(),
-          "Command dispatch must happen on Bukkit's primary thread");
             assertEquals("antivpn-test §aok", recordingServer.dispatchedCommand());
         } finally {
             executor.shutdownNow();
         }
     }
 
-  public static class TestPlugin extends JavaPlugin {}
+    public static class TestPlugin extends JavaPlugin {
+    }
 
     private static class RecordingServerMock extends ServerMock {
         private final AtomicBoolean commandDispatched = new AtomicBoolean();

Bukkit/Plugin/src/test/java/dev/brighten/antivpn/bukkit/BukkitPlayerTest.java

@@ -1,21 +1,22 @@
 package dev.brighten.antivpn.bukkit;
 
+import be.seeseemelk.mockbukkit.MockBukkit;
+import be.seeseemelk.mockbukkit.ServerMock;
+import be.seeseemelk.mockbukkit.entity.PlayerMock;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import be.seeseemelk.mockbukkit.MockBukkit;
-import be.seeseemelk.mockbukkit.ServerMock;
-import be.seeseemelk.mockbukkit.entity.PlayerMock;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
 class BukkitPlayerTest {
 
     private ServerMock server;
@@ -43,8 +44,7 @@ class BukkitPlayerTest {
 
         assertTrue(player.isOnline());
 
-    CompletableFuture<Void> asyncKick =
+        CompletableFuture<Void> asyncKick = CompletableFuture.runAsync(() -> bukkitPlayer.kickPlayer("&cBlocked!"));
-        CompletableFuture.runAsync(() -> bukkitPlayer.kickPlayer("&cBlocked!"));
         assertDoesNotThrow(() -> asyncKick.get(1, TimeUnit.SECONDS));
 
         assertTrue(player.isOnline(), "Kick should be deferred to the server scheduler");

Bungee/BungeeLoader/build.gradle

@@ -10,12 +10,6 @@ dependencies {
     implementation project(':Common:loader-utils')
 }
 
-tasks.processResources {
-    filesMatching('bungee.yml') {
-        expand(project: project, projectVersion: project.version)
-    }
-}
-
 shadowJar {
     archiveClassifier.set('')
 
@@ -29,8 +23,4 @@ tasks.named('shadowJar') {
     dependsOn(':Bungee:BungeePlugin:shadowJar')
 }
 
-tasks.named('compileJava') {
-    dependsOn(':Bungee:BungeePlugin:shadowJar')
-}
-
 tasks.build.dependsOn shadowJar

Bungee/BungeeLoader/src/main/java/dev/brighten/antivpn/bungee/BungeeLoaderPlugin.java

@@ -29,8 +29,7 @@ public class BungeeLoaderPlugin extends Plugin {
     private final LoaderBootstrap plugin;
 
     public BungeeLoaderPlugin() {
-    JarInJarClassLoader loader =
+        JarInJarClassLoader loader = new JarInJarClassLoader(getClass().getClassLoader(), JAR_NAME, SOURCE_NAME);
-        new JarInJarClassLoader(getClass().getClassLoader(), JAR_NAME, SOURCE_NAME);
         this.plugin = loader.instantiatePlugin(BOOTSTRAP_CLASS, Plugin.class, this);
     }
 
@@ -48,4 +47,6 @@ public class BungeeLoaderPlugin extends Plugin {
     public void onDisable() {
         this.plugin.onDisable();
     }
+
+
 }

Bungee/BungeePlugin/build.gradle

@@ -13,7 +13,6 @@ dependencies {
     testImplementation 'org.mockito:mockito-subclass:5.11.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:5.11.0'
     testImplementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
-    testImplementation testFixtures(project(':Common:Source'))
 }
 tasks.compileJava.dependsOn(':Common:Source:jar')
 

Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeeListener.java

@@ -20,9 +20,6 @@ import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.api.*;
 import dev.brighten.antivpn.utils.MiscUtils;
 import dev.brighten.antivpn.utils.StringUtil;
-import java.net.InetSocketAddress;
-import java.util.UUID;
-import java.util.logging.Level;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.event.LoginEvent;
 import net.md_5.bungee.api.event.PlayerDisconnectEvent;
@@ -32,15 +29,17 @@ import net.md_5.bungee.api.scheduler.ScheduledTask;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 
+import java.net.InetSocketAddress;
+import java.util.UUID;
+import java.util.logging.Level;
+
 public class BungeeListener extends VPNExecutor implements Listener {
 
     private ScheduledTask cacheResetTask;
 
     @Override
     public void registerListeners() {
-    BungeePlugin.pluginInstance
+        BungeePlugin.pluginInstance.getProxy().getPluginManager()
-        .getProxy()
-        .getPluginManager()
                 .registerListener(BungeePlugin.pluginInstance.getPlugin(), this);
     }
 
@@ -61,89 +60,58 @@ public class BungeeListener extends VPNExecutor implements Listener {
 
     @Override
     public void runCommand(String command) {
-    BungeePlugin.pluginInstance
+        BungeePlugin.pluginInstance.getProxy().getPluginManager()
-        .getProxy()
-        .getPluginManager()
                 .dispatchCommand(BungeePlugin.pluginInstance.getProxy().getConsole(), command);
     }
 
     @Override
     public void disablePlugin() {
-    BungeePlugin.pluginInstance
+        BungeePlugin.pluginInstance.getProxy().getPluginManager().unregisterListeners(BungeePlugin.pluginInstance.getPlugin());
-        .getProxy()
-        .getPluginManager()
-        .unregisterListeners(BungeePlugin.pluginInstance.getPlugin());
         if (cacheResetTask != null) {
             cacheResetTask.cancel();
             cacheResetTask = null;
         }
-    BungeePlugin.pluginInstance
+        BungeePlugin.pluginInstance.getProxy().getPluginManager().unregisterCommands(BungeePlugin.pluginInstance.getPlugin());
-        .getProxy()
-        .getPluginManager()
-        .unregisterCommands(BungeePlugin.pluginInstance.getPlugin());
         BungeePlugin.pluginInstance.onDisable();
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onListener(final PreLoginEvent event) {
-    APIPlayer player =
-        AntiVPN.getInstance()
-            .getPlayerExecutor()
-            .getPlayer(event.getConnection().getUniqueId())
-            .orElseGet(
-                () -> {
-                  UUID uuid = MiscUtils.lookupUUID(event.getConnection().getName());
-                  AntiVPN.getInstance()
-                      .getExecutor()
-                      .log(
-                          Level.INFO,
-                          "Getting offline player for %s with name %s",
-                          event.getConnection().getUniqueId(),
-                          uuid);
 
-                  return new OfflinePlayer(
+        APIPlayer player = AntiVPN.getInstance().getPlayerExecutor().getPlayer(event.getConnection().getUniqueId())
-                      uuid,
+                .orElseGet(() -> {
-                      event.getConnection().getName(),
+                    UUID uuid = MiscUtils.lookupUUID(event.getConnection().getName());
+                    AntiVPN.getInstance().getExecutor().log(Level.INFO, "Getting offline player for %s with name %s",
+                            event.getConnection().getUniqueId(), uuid);
+
+                    return new OfflinePlayer(uuid, event.getConnection().getName(),
                             ((InetSocketAddress) event.getConnection().getSocketAddress()).getAddress());
                 });
 
-    CheckResult result = player.checkPlayer();
+        player.checkPlayer(result -> {
-
             if (!result.resultType().isShouldBlock()) return;
 
-    if (!AntiVPN.getInstance().getVpnConfig().isKickPlayers()) {
+            if(!AntiVPN.getInstance().getVpnConfig().isKickPlayers()) {
                 return;
             }
 
             event.setCancelled(true);
-    event.setReason(
+            event.setReason(TextComponent.fromLegacy(StringUtil.varReplace(switch (result.resultType()) {
-        TextComponent.fromLegacy(
+                case DENIED_PROXY -> StringUtil.varReplace(AntiVPN.getInstance().getVpnConfig()
-            StringUtil.varReplace(
+                        .getKickMessage(), player, result.response());
-                switch (result.resultType()) {
+                case DENIED_COUNTRY -> StringUtil.varReplace(AntiVPN.getInstance().getVpnConfig()
-                  case DENIED_PROXY ->
+                        .getCountryVanillaKickReason(), player, result.response());
-                      StringUtil.varReplace(
-                          AntiVPN.getInstance().getVpnConfig().getKickMessage(),
-                          player,
-                          result.response());
-                  case DENIED_COUNTRY ->
-                      StringUtil.varReplace(
-                          AntiVPN.getInstance().getVpnConfig().getCountryVanillaKickReason(),
-                          player,
-                          result.response());
                 default -> "You were kicked by KauriVPN for an unknown reason!";
-                },
+            }, player, result.response())));
-                player,
+        });
-                result.response())));
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onJoin(LoginEvent event) {
-    if (event.isCancelled()) return;
+        if(event.isCancelled()) return;
 
         // Handling player alerts on join
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getPlayerExecutor().getPlayer(event.getConnection().getUniqueId())
-        .getPlayerExecutor()
-        .getPlayer(event.getConnection().getUniqueId())
                 .ifPresent(APIPlayer::checkAlertsState);
     }
 

Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeePlayer.java

@@ -24,23 +24,23 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
 public class BungeePlayer extends APIPlayer {
 
     private final ProxiedPlayer player;
-
     public BungeePlayer(ProxiedPlayer player) {
         super(player.getUniqueId(), player.getName(), player.getAddress().getAddress());
 
         this.player = player;
     }
 
+
     @Override
     public void sendMessage(String message) {
-    player.sendMessage(
+        player.sendMessage(TextComponent.fromLegacyText(ChatColor
-        TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&', message)));
+                .translateAlternateColorCodes('&', message)));
     }
 
     @Override
     public void kickPlayer(String reason) {
-    player.disconnect(
+        player.disconnect(TextComponent.fromLegacyText(ChatColor
-        TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&', reason)));
+                .translateAlternateColorCodes('&', reason)));
     }
 
     @Override

Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeePlayerExecutor.java

@@ -18,9 +18,10 @@ package dev.brighten.antivpn.bungee;
 
 import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.api.PlayerExecutor;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
 import java.util.*;
 import java.util.stream.Collectors;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
 
 public class BungeePlayerExecutor implements PlayerExecutor {
 
@@ -30,17 +31,16 @@ public class BungeePlayerExecutor implements PlayerExecutor {
     public Optional<APIPlayer> getPlayer(String name) {
         ProxiedPlayer player = BungeePlugin.pluginInstance.getProxy().getPlayer(name);
 
-    if (player == null) return Optional.empty();
+        if(player == null) return Optional.empty();
 
-    return Optional.of(
+        return Optional.of(cachedPlayers.computeIfAbsent(player.getUniqueId(), key -> new BungeePlayer(player)));
-        cachedPlayers.computeIfAbsent(player.getUniqueId(), key -> new BungeePlayer(player)));
     }
 
     @Override
     public Optional<APIPlayer> getPlayer(UUID uuid) {
         ProxiedPlayer player = BungeePlugin.pluginInstance.getProxy().getPlayer(uuid);
 
-    if (player == null) return Optional.empty();
+        if(player == null) return Optional.empty();
 
         return Optional.of(cachedPlayers.computeIfAbsent(uuid, key -> new BungeePlayer(player)));
     }

Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/BungeePlugin.java

@@ -24,21 +24,24 @@ import dev.brighten.antivpn.database.local.H2VPN;
 import dev.brighten.antivpn.database.mongo.MongoVPN;
 import dev.brighten.antivpn.database.sql.MySqlVPN;
 import dev.brighten.antivpn.loader.LoaderBootstrap;
-import java.io.File;
-import java.util.concurrent.TimeUnit;
 import lombok.Getter;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
 
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
 public class BungeePlugin implements LoaderBootstrap {
 
     public static BungeePlugin pluginInstance;
     
-  @Getter private File dataFolder;
+    @Getter
+    private File dataFolder;
 
-  @Getter private final Plugin plugin;
+    @Getter
+    private final Plugin plugin;
 
     public BungeePlugin(Plugin plugin) {
         this.plugin = plugin;
@@ -53,31 +56,25 @@ public class BungeePlugin implements LoaderBootstrap {
     public void onEnable() {
         pluginInstance = this;
 
-    // Setting up config
+        //Setting up config
         ProxyServer.getInstance().getLogger().info("Loading config...");
 
-    // Loading plugin
+
+        //Loading plugin
         ProxyServer.getInstance().getLogger().info("Starting AntiVPN services...");
         AntiVPN.start(new BungeeListener(), new BungeePlayerExecutor(), getDataFolder());
 
-    if (AntiVPN.getInstance().getVpnConfig().metrics()) {
+        if(AntiVPN.getInstance().getVpnConfig().metrics()) {
             ProxyServer.getInstance().getLogger().info("Starting bStats metrics...");
             Metrics metrics = new Metrics(getPlugin(), 12616);
             metrics.addCustomChart(new SimplePie("database_used", this::getDatabaseType));
-      ProxyServer.getInstance()
+            ProxyServer.getInstance().getScheduler().schedule(getPlugin(),
-          .getScheduler()
-          .schedule(
-              getPlugin(),
                     () -> AntiVPN.getInstance().checked = AntiVPN.getInstance().detections = 0,
-              10,
+                    10, 10, TimeUnit.MINUTES);
-              10,
-              TimeUnit.MINUTES);
         }
 
         for (Command command : AntiVPN.getInstance().getCommands()) {
-      ProxyServer.getInstance()
+            ProxyServer.getInstance().getPluginManager().registerCommand(getPlugin(), new BungeeCommand(command));
-          .getPluginManager()
-          .registerCommand(getPlugin(), new BungeeCommand(command));
         }
     }
 
@@ -88,11 +85,11 @@ public class BungeePlugin implements LoaderBootstrap {
 
     private String getDatabaseType() {
         VPNDatabase database = AntiVPN.getInstance().getDatabase();
-    if (database instanceof MySqlVPN) {
+        if(database instanceof MySqlVPN) {
             return "MySQL";
-    } else if (database instanceof H2VPN) {
+        } else if(database instanceof H2VPN) {
             return "H2";
-    } else if (database instanceof MongoVPN) {
+        } else if(database instanceof MongoVPN) {
             return "MongoDB";
         } else {
             return "No-Database";

Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/command/BungeeCommand.java

@@ -17,8 +17,6 @@
 package dev.brighten.antivpn.bungee.command;
 
 import dev.brighten.antivpn.AntiVPN;
-import java.util.Arrays;
-import java.util.stream.IntStream;
 import lombok.val;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
@@ -26,10 +24,12 @@ import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.TabExecutor;
 
+import java.util.Arrays;
+import java.util.stream.IntStream;
+
 public class BungeeCommand extends Command implements TabExecutor {
 
     private final dev.brighten.antivpn.command.Command command;
-
     public BungeeCommand(dev.brighten.antivpn.command.Command command) {
         super(command.name(), command.permission(), command.aliases());
 
@@ -38,72 +38,55 @@ public class BungeeCommand extends Command implements TabExecutor {
 
     @Override
     public void execute(CommandSender sender, String[] args) {
-    if (!sender.hasPermission("antivpn.command.*") && !sender.hasPermission(command.permission())) {
+        if(!sender.hasPermission("antivpn.command.*")
-      sender.sendMessage(
+                && !sender.hasPermission(command.permission())) {
-          TextComponent.fromLegacyText(
+            sender.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&',
-              ChatColor.translateAlternateColorCodes(
+                    AntiVPN.getInstance().getMessageHandler().getString("no-permission").getMessage())));
-                  '&',
-                  AntiVPN.getInstance()
-                      .getMessageHandler()
-                      .getString("no-permission")
-                      .getMessage())));
             return;
         }
 
         val children = command.children();
 
-    if (children.length > 0 && args.length > 0) {
+        if(children.length > 0 && args.length > 0) {
             for (dev.brighten.antivpn.command.Command child : children) {
-        if (child.name().equalsIgnoreCase(args[0])
+                if(child.name().equalsIgnoreCase(args[0]) || Arrays.stream(child.aliases())
-            || Arrays.stream(child.aliases()).anyMatch(alias -> alias.equalsIgnoreCase(args[0]))) {
+                        .anyMatch(alias -> alias.equalsIgnoreCase(args[0]))) {
-          if (!sender.hasPermission("antivpn.command.*")
+                    if(!sender.hasPermission("antivpn.command.*")
                             && !sender.hasPermission(child.permission())) {
-            sender.sendMessage(
+                        sender.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&',
-                TextComponent.fromLegacyText(
+                                AntiVPN.getInstance().getMessageHandler().getString("no-permission").getMessage())));
-                    ChatColor.translateAlternateColorCodes(
-                        '&',
-                        AntiVPN.getInstance()
-                            .getMessageHandler()
-                            .getString("no-permission")
-                            .getMessage())));
                         return;
                     }
 
-          sender.sendMessage(
+                    sender.sendMessage(TextComponent
-              TextComponent.fromLegacyText(
+                            .fromLegacyText(ChatColor
-                  ChatColor.translateAlternateColorCodes(
+                                    .translateAlternateColorCodes('&',
-                      '&',
+                                            child.execute(new BungeeCommandExecutor(sender),  IntStream
-                      child.execute(
+                                                    .range(0, args.length - 1)
-                          new BungeeCommandExecutor(sender),
+                                                    .mapToObj(i -> args[i + 1]).toArray(String[]::new)))));
-                          IntStream.range(0, args.length - 1)
-                              .mapToObj(i -> args[i + 1])
-                              .toArray(String[]::new)))));
                     return;
                 }
             }
         }
 
-    sender.sendMessage(
+
-        TextComponent.fromLegacyText(
+        sender.sendMessage(TextComponent
-            ChatColor.translateAlternateColorCodes(
+                .fromLegacyText(ChatColor
-                '&', command.execute(new BungeeCommandExecutor(sender), args))));
+                        .translateAlternateColorCodes('&',
+                                command.execute(new BungeeCommandExecutor(sender), args))));
     }
 
     @Override
     public Iterable<String> onTabComplete(CommandSender sender, String[] args) {
         val children = command.children();
 
-    if (children.length > 0 && args.length > 0) {
+        if(children.length > 0 && args.length > 0) {
             for (dev.brighten.antivpn.command.Command child : children) {
-        if (child.name().equalsIgnoreCase(args[0])
+                if(child.name().equalsIgnoreCase(args[0])  || Arrays.stream(child.aliases())
-            || Arrays.stream(child.aliases())
                         .anyMatch(alias2 -> alias2.equalsIgnoreCase(args[0]))) {
-          return child.tabComplete(
+                    return child.tabComplete(new BungeeCommandExecutor(sender), "alias", IntStream
-              new BungeeCommandExecutor(sender),
+                            .range(0, args.length - 1)
-              "alias",
+                            .mapToObj(i -> args[i + 1]).toArray(String[]::new));
-              IntStream.range(0, args.length - 1)
-                  .mapToObj(i -> args[i + 1])
-                  .toArray(String[]::new));
                 }
             }
         }

Bungee/BungeePlugin/src/main/java/dev/brighten/antivpn/bungee/command/BungeeCommandExecutor.java

@@ -19,13 +19,14 @@ package dev.brighten.antivpn.bungee.command;
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.command.CommandExecutor;
-import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
+import java.util.Optional;
+
 @RequiredArgsConstructor
 public class BungeeCommandExecutor implements CommandExecutor {
 
@@ -33,9 +34,8 @@ public class BungeeCommandExecutor implements CommandExecutor {
 
     @Override
     public void sendMessage(String message, Object... objects) {
-    sender.sendMessage(
+        sender.sendMessage(TextComponent.fromLegacyText(ChatColor
-        TextComponent.fromLegacyText(
+                .translateAlternateColorCodes('&', String.format(message, objects))));
-            ChatColor.translateAlternateColorCodes('&', String.format(message, objects))));
     }
 
     @Override
@@ -45,11 +45,9 @@ public class BungeeCommandExecutor implements CommandExecutor {
 
     @Override
     public Optional<APIPlayer> getPlayer() {
-    if (!isPlayer()) return Optional.empty();
+        if(!isPlayer()) return Optional.empty();
 
-    return AntiVPN.getInstance()
+        return AntiVPN.getInstance().getPlayerExecutor().getPlayer(((ProxiedPlayer) sender).getUniqueId());
-        .getPlayerExecutor()
-        .getPlayer(((ProxiedPlayer) sender).getUniqueId());
     }
 
     @Override

Bungee/BungeePlugin/src/test/java/dev/brighten/antivpn/bungee/BungeeListenerTest.java

@@ -1,27 +1,27 @@
 package dev.brighten.antivpn.bungee;
 
-import static org.mockito.Mockito.*;
-
 import dev.brighten.antivpn.AntiVPN;
-import dev.brighten.antivpn.StandardTest;
 import dev.brighten.antivpn.api.PlayerExecutor;
 import dev.brighten.antivpn.api.VPNConfig;
 import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.message.MessageHandler;
 import dev.brighten.antivpn.message.VpnString;
 import dev.brighten.antivpn.web.objects.VPNResponse;
-import java.lang.reflect.Field;
-import java.net.InetSocketAddress;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 import net.md_5.bungee.api.connection.PendingConnection;
 import net.md_5.bungee.api.event.PreLoginEvent;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class BungeeListenerTest extends StandardTest {
+import java.lang.reflect.Field;
+import java.net.InetSocketAddress;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+import static org.mockito.Mockito.*;
+
+public class BungeeListenerTest {
 
     private BungeeListener listener;
     private VPNExecutor vpnExecutor;
@@ -49,17 +49,10 @@ public class BungeeListenerTest extends StandardTest {
         when(mockVpnString.getFormattedMessage(any())).thenReturn("Blocked!");
         when(messageHandler.getString(anyString())).thenReturn(mockVpnString);
 
-    when(vpnExecutor.checkIp(anyString()))
+        when(vpnExecutor.checkIp(anyString())).thenReturn(CompletableFuture.completedFuture(
-        .thenReturn(
+                VPNResponse.builder().success(true).proxy(false).ip("127.0.0.1")
-            CompletableFuture.completedFuture(
+                        .method("N/A").countryName("N/A").city("N/A").build()
-                VPNResponse.builder()
+        ));
-                    .success(true)
-                    .proxy(false)
-                    .ip("127.0.0.1")
-                    .method("N/A")
-                    .countryName("N/A")
-                    .city("N/A")
-                    .build()));
 
         // Use reflection to set the private static INSTANCE field
         Field instanceField = AntiVPN.class.getDeclaredField("INSTANCE");
@@ -93,7 +86,7 @@ public class BungeeListenerTest extends StandardTest {
     }
 
     @Test
-  public void testPreLoginEventBlocked() throws NoSuchFieldException, IllegalAccessException {
+    public void testPreLoginEventBlocked() {
         PreLoginEvent event = mock(PreLoginEvent.class);
         PendingConnection connection = mock(PendingConnection.class);
 
@@ -104,7 +97,10 @@ public class BungeeListenerTest extends StandardTest {
         when(connection.getSocketAddress()).thenReturn(new InetSocketAddress("1.1.1.1", 12345));
 
         // Mock proxy response
-    mockCache();
+        when(vpnExecutor.checkIp("1.1.1.1")).thenReturn(CompletableFuture.completedFuture(
+                VPNResponse.builder().success(true).proxy(true).ip("1.1.1.1")
+                        .method("N/A").countryName("N/A").countryCode("N/A").city("N/A").build()
+        ));
 
         listener.onListener(event);
 

CHANGELOG.md

@@ -4,28 +4,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.10.1.2] 2026-05-03
-
-### Fixed
-- Kick spam on non-cached VPN detection events.
-
-### Changed
-- Project cleanup and performance improvements.
-
-## [1.10.1.1] 2026-04-29
-
-### Fixed
-- Startup error on velocity instances is now corrected.
-
-### Changed
-- Bumped dependency versions for H2 database.
-
-## [1.10.1] - 2026-04-28
-
-### Fixed
-- Async kick error that caused issues during player removal when running commands.
-- Startup error caused by a packaging issue is now corrected.
-
 ## [1.10.0] - 2026-04-07
 
 ### Added

Common/Source/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id 'com.gradleup.shadow'
-    id 'java-test-fixtures'
 }
 
 dependencies {
@@ -10,7 +9,7 @@ dependencies {
     implementation 'org.jetbrains:annotations:26.0.2'
     
     compileOnly 'com.mysql:mysql-connector-j:9.3.0'
-    compileOnly 'com.h2database:h2:2.4.240'
+    compileOnly 'com.h2database:h2:2.2.220'
     implementation'com.github.ben-manes.caffeine:caffeine:3.1.8'
     compileOnly 'org.mongodb:mongo-java-driver:3.12.14'
     
@@ -22,14 +21,18 @@ dependencies {
     testImplementation 'org.testcontainers:mongodb:1.20.4'
     testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.16'
     testImplementation 'com.mysql:mysql-connector-j:9.3.0'
-    testImplementation 'com.h2database:h2:2.4.240'
+    testImplementation 'com.h2database:h2:2.2.220'
     testImplementation 'org.mongodb:mongo-java-driver:3.12.14'
     testImplementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
-    testFixturesImplementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
 }
 
 shadowJar {
     archiveClassifier.set('')
+
+    dependencies {
+        exclude 'dev/brighten/antivpn/depends/Relocate*'
+        exclude 'dev/brighten/antivpn/depends/MavenLibraries*'
+    }
 }
 
 tasks.build.dependsOn shadowJar

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

@@ -33,6 +33,10 @@ import dev.brighten.antivpn.utils.MiscUtils;
 import dev.brighten.antivpn.utils.config.Configuration;
 import dev.brighten.antivpn.utils.config.ConfigurationProvider;
 import dev.brighten.antivpn.utils.config.YamlConfiguration;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,15 +44,16 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 @Setter(AccessLevel.PRIVATE)
-@MavenLibrary(groupId = "com.h2database", artifactId = "h2", version = "2.4.240")
+@MavenLibrary(groupId = "com.h2database", artifactId ="h2", version = "2.2.220")
 @MavenLibrary(groupId = "org.mongodb", artifactId = "mongo-java-driver", version = "3.12.14")
-@MavenLibrary(groupId = "com.mysql", artifactId = "mysql-connector-j", version = "9.3.0")
+@MavenLibrary(
+        groupId = "com.mysql",
+        artifactId = "mysql-connector-j",
+        version = "9.3.0"
+)
 public class AntiVPN {
 
     private static AntiVPN INSTANCE;
@@ -63,7 +68,7 @@ public class AntiVPN {
     private File pluginFolder;
 
     public static void start(VPNExecutor executor, PlayerExecutor playerExecutor, File pluginFolder) {
-    // Initializing
+        //Initializing
 
         INSTANCE = new AntiVPN();
 
@@ -75,17 +80,16 @@ public class AntiVPN {
 
         try {
             File configFile = new File(pluginFolder, "config.yml");
-      if (!configFile.exists()) {
+            if(!configFile.exists()){
-        if (configFile.getParentFile().mkdirs()) {
+                if(configFile.getParentFile().mkdirs()) {
                     AntiVPN.getInstance().getExecutor().log("Created plugin folder!");
                 }
-        MiscUtils.copy(INSTANCE.getResource("config.yml"), configFile);
+                MiscUtils.copy(INSTANCE.getResource( "config.yml"), configFile);
             }
-      INSTANCE.config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile);
+            INSTANCE.config = ConfigurationProvider.getProvider(YamlConfiguration.class)
+                    .load(configFile);
         } catch (IOException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not load config.yml, plugin disabling...", e);
-          .getExecutor()
-          .logException("Could not load config.yml, plugin disabling...", e);
             executor.disablePlugin();
             return;
         }
@@ -98,19 +102,17 @@ public class AntiVPN {
         INSTANCE.messageHandler = new MessageHandler();
 
         try {
-      switch (INSTANCE.vpnConfig.getDatabaseType().toLowerCase()) {
+            switch(INSTANCE.vpnConfig.getDatabaseType().toLowerCase()) {
                 case "h2":
                 case "local":
-        case "flatfile":
+                case "flatfile": {
-          {
                     AntiVPN.getInstance().getExecutor().log("Using databaseType H2...");
                     INSTANCE.database = new H2VPN();
                     INSTANCE.database.init();
                     break;
                 }
                 case "mysql":
-        case "sql":
+                case "sql": {
-          {
                     AntiVPN.getInstance().getExecutor().log("Using databaseType MySQL...");
                     INSTANCE.database = new MySqlVPN();
                     INSTANCE.database.init();
@@ -118,56 +120,38 @@ public class AntiVPN {
                 }
                 case "mongo":
                 case "mongodb":
-        case "mongod":
+                case "mongod": {
-          {
                     INSTANCE.database = new MongoVPN();
                     INSTANCE.database.init();
                     break;
                 }
-        default:
+                default: {
-          {
+                    AntiVPN.getInstance().getExecutor().log("Could not find database type \"" + INSTANCE.vpnConfig.getDatabaseType() + "\". " +
-            AntiVPN.getInstance()
+                            "Options: [MySQL]");
-                .getExecutor()
-                .log(
-                    "Could not find database type \""
-                        + INSTANCE.vpnConfig.getDatabaseType()
-                        + "\". "
-                        + "Options: [MySQL]");
                     break;
                 }
             }
         } catch (Exception e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not initialize database, plugin disabling...", e);
-          .getExecutor()
-          .logException("Could not initialize database, plugin disabling...", e);
             executor.disablePlugin();
             return;
         }
 
-    // Registering commands
+        //Registering commands
         INSTANCE.registerCommands();
 
-    // Turning on alerts of players who are already online.
+        //Turning on alerts of players who are already online.
-    playerExecutor
+        playerExecutor.getOnlinePlayers().forEach(player -> {
-        .getOnlinePlayers()
+            //We want to make sure they even have permission to see alerts before we make a bunch
-        .forEach(
+            //of unnecessary database queries.
-            player -> {
+            if(player.hasPermission("antivpn.command.alerts")) {
-              // We want to make sure they even have permission to see alerts before we make a bunch
+                //Running database check for enabled alerts.
-              // of unnecessary database queries.
-              if (player.hasPermission("antivpn.command.alerts")) {
-                // Running database check for enabled alerts.
                 INSTANCE.database.alertsState(player.getUuid(), player::setAlertsEnabled);
             }
         });
 
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getMessageHandler().initStrings(vpnString -> new ConfigDefault<>
-        .getMessageHandler()
+                (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), AntiVPN.getInstance())
-        .initStrings(
-            vpnString ->
-                new ConfigDefault<>(
-                        vpnString.getDefaultMessage(),
-                        "messages." + vpnString.getKey(),
-                        AntiVPN.getInstance())
                 .get());
         AntiVPN.getInstance().getMessageHandler().reloadStrings();
 
@@ -212,7 +196,7 @@ public class AntiVPN {
         if (executor != null && executor.getThreadExecutor() != null) {
             executor.getThreadExecutor().shutdown();
         }
-    if (database != null) database.shutdown();
+        if(database != null) database.shutdown();
 
         INSTANCE = null;
     }
@@ -220,19 +204,17 @@ public class AntiVPN {
     public void reloadDatabase() {
         database.shutdown();
 
-    switch (AntiVPN.getInstance().getVpnConfig().getDatabaseType().toLowerCase()) {
+        switch(AntiVPN.getInstance().getVpnConfig().getDatabaseType().toLowerCase()) {
             case "h2":
             case "local":
-      case "flatfile":
+            case "flatfile": {
-        {
                 AntiVPN.getInstance().getExecutor().log("Using databaseType H2...");
                 INSTANCE.database = new H2VPN();
                 INSTANCE.database.init();
                 break;
             }
             case "mysql":
-      case "sql":
+            case "sql":{
-        {
                 AntiVPN.getInstance().getExecutor().log("Using databaseType MySQL...");
                 INSTANCE.database = new MySqlVPN();
                 INSTANCE.database.init();
@@ -240,28 +222,21 @@ public class AntiVPN {
             }
             case "mongo":
             case "mongodb":
-      case "mongod":
+            case "mongod": {
-        {
                 INSTANCE.database = new MongoVPN();
                 INSTANCE.database.init();
                 break;
             }
-      default:
+            default: {
-        {
+                AntiVPN.getInstance().getExecutor().log("Could not find database type \"" + INSTANCE.vpnConfig.getDatabaseType() + "\". " +
-          AntiVPN.getInstance()
+                        "Options: [MySQL]");
-              .getExecutor()
-              .log(
-                  "Could not find database type \""
-                      + INSTANCE.vpnConfig.getDatabaseType()
-                      + "\". "
-                      + "Options: [MySQL]");
                 break;
             }
         }
     }
 
     public static AntiVPN getInstance() {
-    assert INSTANCE != null : "AntiVPN has not been initialized!";
+        assert INSTANCE != null: "AntiVPN has not been initialized!";
 
         return INSTANCE;
     }
@@ -278,8 +253,7 @@ public class AntiVPN {
     public void reloadConfig() {
         try {
 
-      config =
+            config = ConfigurationProvider.getProvider(YamlConfiguration.class)
-          ConfigurationProvider.getProvider(YamlConfiguration.class)
                     .load(new File(pluginFolder.getPath() + File.separator + "config.yml"));
         } catch (IOException e) {
             throw new RuntimeException(e);

Common/Source/src/main/java/dev/brighten/antivpn/api/APIPlayer.java

@@ -20,22 +20,27 @@ import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.message.VpnString;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.net.InetAddress;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.logging.Level;
-import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 public abstract class APIPlayer {
     private final UUID uuid;
     private final String name;
     private final InetAddress ip;
-  @Setter private boolean alertsEnabled;
+    @Setter
+    private boolean alertsEnabled;
 
-  public static final Cache<String, CheckResult> checkResultCache =
+    private static final Cache<String, CheckResult> checkResultCache = Caffeine.newBuilder()
-      Caffeine.newBuilder().expireAfterWrite(5, TimeUnit.MINUTES).maximumSize(2000).build();
+            .expireAfterWrite(5, TimeUnit.MINUTES)
+            .maximumSize(2000)
+            .build();
 
     public APIPlayer(UUID uuid, String name, InetAddress ip) {
         this.uuid = uuid;
@@ -50,101 +55,75 @@ public abstract class APIPlayer {
     public abstract boolean hasPermission(String permission);
 
     public void updateAlertsState() {
-    // Updating into database so its synced across servers and saved on logout.
+        //Updating into database so its synced across servers and saved on logout.
         AntiVPN.getInstance().getDatabase().updateAlertsState(uuid, alertsEnabled);
 
-    sendMessage(
+        sendMessage(AntiVPN.getInstance().getMessageHandler()
-        AntiVPN.getInstance()
-            .getMessageHandler()
                 .getString("command-alerts-toggled")
                 .getFormattedMessage(new VpnString.Var<>("state", alertsEnabled)));
     }
 
     public void checkAlertsState() {
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().getThreadExecutor().execute(() ->
-        .getExecutor()
+                AntiVPN.getInstance().getDatabase().alertsState(uuid, state -> {
-        .getThreadExecutor()
+                    if(state) {
-        .execute(
-            () ->
-                AntiVPN.getInstance()
-                    .getDatabase()
-                    .alertsState(
-                        uuid,
-                        state -> {
-                          if (state) {
                         alertsEnabled = true;
                         updateAlertsState();
                     }
-                        }));
+                })
+        );
     }
 
-  /***
+    public void checkPlayer(Consumer<CheckResult> onResult) {
-   * The result is only returned if it is cached. Otherwise, there is an asynchronous call to the API
+        if (hasPermission("antivpn.bypass") //Has bypass permission
-   * and will handle kicking the player if necessary.
+                //Is exempt
-   * @return CheckResult - The cached result of the check if it exists.
-   */
-  public CheckResult checkPlayer() {
-    if (hasPermission("antivpn.bypass") // Has bypass permission
-        // Is exempt
                 || (uuid != null && AntiVPN.getInstance().getExecutor().isWhitelisted(uuid))
-        // Or has a name that starts with a certain prefix. This is for Bedrock exempting.
+                //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
                 || AntiVPN.getInstance().getExecutor().isWhitelisted(ip.getHostAddress() + "/32")
                 || AntiVPN.getInstance().getVpnConfig().getPrefixWhitelists().stream()
                 .anyMatch(name::startsWith)) {
-      return new CheckResult(null, ResultType.WHITELISTED, false);
+            onResult.accept(new CheckResult(null, ResultType.WHITELISTED, false));
+            return;
         }
 
         CheckResult cachedResult = checkResultCache.getIfPresent(ip.getHostAddress());
 
-    if (cachedResult != null) {
+        if(cachedResult != null) {
-      if (cachedResult.response().getIp().equals(ip.getHostAddress())) {
+            if(cachedResult.response().getIp().equals(ip.getHostAddress())) {
-        AntiVPN.getInstance()
+                AntiVPN.getInstance().getExecutor().log(Level.FINE, "Cached result for " + ip.getHostAddress() + " is " + cachedResult.resultType());
-            .getExecutor()
+                if(cachedResult.resultType().isShouldBlock()) {
-            .log(
-                Level.FINE,
-                "Cached result for " + ip.getHostAddress() + " is " + cachedResult.resultType());
-        if (cachedResult.resultType().isShouldBlock()) {
                     AntiVPN.getInstance().getExecutor().handleKickingOfPlayer(cachedResult, this);
                 }
-        return cachedResult;
+                onResult.accept(cachedResult);
+                return;
             }
         }
 
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().checkIp(ip.getHostAddress())
-        .getExecutor()
+                .thenAccept(result -> {
-        .checkIp(ip.getHostAddress())
+                    if(!result.isSuccess()) {
-        .thenAccept(
+                        AntiVPN.getInstance().getExecutor().log(Level.WARNING, "The API query was not a success! " +
-            result -> {
+                                "You may need to upgrade your license on " +
-              if (!result.isSuccess()) {
+                                "https://funkemunky.cc/shop");
-                AntiVPN.getInstance()
+                        onResult.accept(new CheckResult(null, ResultType.API_FAILURE, false));
-                    .getExecutor()
-                    .log(
-                        Level.WARNING,
-                        "The API query was not a success! "
-                            + "You may need to upgrade your license on "
-                            + "https://funkemunky.cc/shop");
                         return;
                     }
                     // If the countryList() size is zero, no need to check.
                     // Running country check first
                     CheckResult checkResult;
                     if (!AntiVPN.getInstance().getVpnConfig().getCountryList().isEmpty()
-                  && !((uuid != null && AntiVPN.getInstance().getExecutor().isWhitelisted(uuid))
+                            && !((uuid != null && AntiVPN.getInstance().getExecutor()
-                      // Or has a name that starts with a certain prefix. This is for Bedrock
+                            .isWhitelisted(uuid))
-                      // exempting.
+                            //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
-                      || AntiVPN.getInstance()
+                            || AntiVPN.getInstance().getExecutor().isWhitelisted(ip.getHostAddress() + "/32"))
-                          .getExecutor()
-                          .isWhitelisted(ip.getHostAddress() + "/32"))
                             // This bit of code will decide whether or not to kick the player
                             // If it contains the code and it is set to whitelist, it will not kick
                             // as they are equal and vise versa. However, if the contains does not match
                             // the state, it will kick.
-                  && AntiVPN.getInstance()
+                            && AntiVPN.getInstance().getVpnConfig().getCountryList()
-                          .getVpnConfig()
-                          .getCountryList()
                             .contains(result.getCountryCode())
                             != AntiVPN.getInstance().getVpnConfig().getWhitelistCountries()) {
-                // Using our built in kicking system if no commands are configured
+                        //Using our built in kicking system if no commands are configured
                         checkResult = new CheckResult(result, ResultType.DENIED_COUNTRY, false);
                     } else if (result.isProxy()) {
                         checkResult = new CheckResult(result, ResultType.DENIED_PROXY, false);
@@ -152,20 +131,15 @@ public abstract class APIPlayer {
                         checkResult = new CheckResult(result, ResultType.ALLOWED, false);
                     }
 
-              AntiVPN.getInstance()
+                    AntiVPN.getInstance().getExecutor().log(Level.FINE, "Result for " + ip.getHostAddress() + " is " + checkResult.resultType());
-                  .getExecutor()
-                  .log(
-                      Level.FINE,
-                      "Result for " + ip.getHostAddress() + " is " + checkResult.resultType());
 
-              checkResultCache.put(
+                    checkResultCache.put(ip.getHostAddress(), new CheckResult(checkResult.response(), checkResult.resultType(), true));
-                  ip.getHostAddress(),
+                    if(checkResult.resultType().isShouldBlock()) {
-                  new CheckResult(checkResult.response(), checkResult.resultType(), true));
-              if (checkResult.resultType().isShouldBlock()) {
                         AntiVPN.getInstance().getExecutor().handleKickingOfPlayer(checkResult, this);
                     }
+                    onResult.accept(checkResult);
                     AntiVPN.getInstance().checked++;
                 });
-    return new CheckResult(null, ResultType.UNKNOWN, false);
+        onResult.accept(new CheckResult(null, ResultType.UNKNOWN, false));
     }
 }

Common/Source/src/main/java/dev/brighten/antivpn/api/CheckResult.java

@@ -18,4 +18,5 @@ package dev.brighten.antivpn.api;
 
 import dev.brighten.antivpn.web.objects.VPNResponse;
 
-public record CheckResult(VPNResponse response, ResultType resultType, boolean isFromCache) {}
+public record CheckResult(VPNResponse response, ResultType resultType, boolean isFromCache) {
+}

Common/Source/src/main/java/dev/brighten/antivpn/api/OfflinePlayer.java

@@ -26,10 +26,14 @@ public class OfflinePlayer extends APIPlayer {
     }
 
     @Override
-  public void sendMessage(String message) {}
+    public void sendMessage(String message) {
+
+    }
 
     @Override
-  public void kickPlayer(String reason) {}
+    public void kickPlayer(String reason) {
+
+    }
 
     @Override
     public boolean hasPermission(String permission) {

Common/Source/src/main/java/dev/brighten/antivpn/api/ResultType.java

@@ -26,7 +26,8 @@ public enum ResultType {
     API_FAILURE(false),
     UNKNOWN(false);
 
-  @Getter private final boolean shouldBlock;
+    @Getter
+    private final boolean shouldBlock;
 
     ResultType(boolean shouldBlock) {
         this.shouldBlock = shouldBlock;

Common/Source/src/main/java/dev/brighten/antivpn/api/VPNConfig.java

@@ -18,87 +18,97 @@ package dev.brighten.antivpn.api;
 
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.utils.ConfigDefault;
+import lombok.Getter;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import lombok.Getter;
 
 public class VPNConfig {
-  private final ConfigDefault<String>
+    private final ConfigDefault<String> licenseDefault = new ConfigDefault<>("",
-      licenseDefault = new ConfigDefault<>("", "license", AntiVPN.getInstance()),
+            "license", AntiVPN.getInstance()), kickStringDefault =
-      kickStringDefault =
+            new ConfigDefault<>("Proxies are not allowed on our server",
-          new ConfigDefault<>(
+                    "kickMessage", AntiVPN.getInstance()),
-              "Proxies are not allowed on our server", "kickMessage", AntiVPN.getInstance()),
+            defaultDatabaseType = new ConfigDefault<>("H2",
-      defaultDatabaseType = new ConfigDefault<>("H2", "database.type", AntiVPN.getInstance()),
+                    "database.type", AntiVPN.getInstance()),
-      defaultDatabaseName =
+            defaultDatabaseName = new ConfigDefault<>("kaurivpn",
-          new ConfigDefault<>("kaurivpn", "database.database", AntiVPN.getInstance()),
+                    "database.database", AntiVPN.getInstance()),
             defaultMongoURL = new ConfigDefault<>("", "database.mongoURL", AntiVPN.getInstance()),
-      defaultUsername = new ConfigDefault<>("root", "database.username", AntiVPN.getInstance()),
+            defaultUsername = new ConfigDefault<>("root",
-      defaultPassword = new ConfigDefault<>("password", "database.password", AntiVPN.getInstance()),
+                    "database.username", AntiVPN.getInstance()),
-      defaultCountryKickReason =
+            defaultPassword = new ConfigDefault<>("password",
-          new ConfigDefault<>(
+                    "database.password", AntiVPN.getInstance()),
+            defaultCountryKickReason = new ConfigDefault<>(
                     "&cSorry, but our server does not allow connections from\n&f%country%",
                     "countries.vanillaKickReason", AntiVPN.getInstance()),
             defaultIp = new ConfigDefault<>("localhost", "database.ip", AntiVPN.getInstance()),
-      defaultAlertMsg =
+            defaultAlertMsg = new ConfigDefault<>("&8[&6KauriVPN&8] &e%player% &7has joined on a VPN/proxy" +
-          new ConfigDefault<>(
+                    " &8(&f%reason%&8) &7in location &8(&f%city%&7, &f%country%&8)", "alerts.message",
-              "&8[&6KauriVPN&8] &e%player% &7has joined on a VPN/proxy"
+                    AntiVPN.getInstance());
-                  + " &8(&f%reason%&8) &7in location &8(&f%city%&7, &f%country%&8)",
+    private final ConfigDefault<Boolean> cacheResultsDefault = new ConfigDefault<>(true,
-              "alerts.message", AntiVPN.getInstance());
+            "cachedResults", AntiVPN.getInstance()),
-  private final ConfigDefault<Boolean>
+            defaultUseCredentials = new ConfigDefault<>(true,
-      cacheResultsDefault = new ConfigDefault<>(true, "cachedResults", AntiVPN.getInstance()),
+                    "database.useCredentials", AntiVPN.getInstance()),
-      defaultUseCredentials =
+            defaultDatabaseEnabled = new ConfigDefault<>(false, "database.enabled",
-          new ConfigDefault<>(true, "database.useCredentials", AntiVPN.getInstance()),
+                    AntiVPN.getInstance()), defaultCommandsEnable = new ConfigDefault<>(false,
-      defaultDatabaseEnabled =
+            "commands.enabled", AntiVPN.getInstance()), defaultKickPlayers
-          new ConfigDefault<>(false, "database.enabled", AntiVPN.getInstance()),
+            = new ConfigDefault<>(true, "kickPlayers", AntiVPN.getInstance()),
-      defaultCommandsEnable = new ConfigDefault<>(false, "commands.enabled", AntiVPN.getInstance()),
+            defaultAlertToStaff = new ConfigDefault<>(true, "alerts.enabled",
-      defaultKickPlayers = new ConfigDefault<>(true, "kickPlayers", AntiVPN.getInstance()),
-      defaultAlertToStaff = new ConfigDefault<>(true, "alerts.enabled", AntiVPN.getInstance()),
-      defaultWhitelistCountries =
-          new ConfigDefault<>(true, "countries.whitelist", AntiVPN.getInstance()),
-      defaultMetrics = new ConfigDefault<>(true, "bstats", AntiVPN.getInstance());
-  private final ConfigDefault<Integer> defaultPort =
-      new ConfigDefault<>(-1, "database.port", AntiVPN.getInstance());
-  private final ConfigDefault<List<String>>
-      prefixWhitelistsDefault =
-          new ConfigDefault<>(new ArrayList<>(), "prefixWhitelists", AntiVPN.getInstance()),
-      defaultCommands =
-          new ConfigDefault<>(
-              Collections.singletonList("kick %player% VPNs are not allowed on our server!"),
-              "commands.execute",
                     AntiVPN.getInstance()),
-      defCountryKickCommands =
+            defaultWhitelistCountries = new ConfigDefault<>(true, "countries.whitelist",
-          new ConfigDefault<>(Collections.emptyList(), "countries.commands", AntiVPN.getInstance()),
+                    AntiVPN.getInstance()),
-      defCountrylist =
+            defaultMetrics = new ConfigDefault<>(true, "bstats", AntiVPN.getInstance());
-          new ConfigDefault<>(new ArrayList<>(), "countries.list", AntiVPN.getInstance());
+    private final ConfigDefault<Integer>
+            defaultPort = new ConfigDefault<>(-1, "database.port", AntiVPN.getInstance());
+    private final ConfigDefault<List<String>> prefixWhitelistsDefault = new ConfigDefault<>(new ArrayList<>(),
+            "prefixWhitelists", AntiVPN.getInstance()), defaultCommands = new ConfigDefault<>(
+            Collections.singletonList("kick %player% VPNs are not allowed on our server!"), "commands.execute",
+            AntiVPN.getInstance()),
+            defCountryKickCommands = new ConfigDefault<>(Collections.emptyList(),
+                    "countries.commands", AntiVPN.getInstance()),
+            defCountrylist = new ConfigDefault<>(new ArrayList<>(), "countries.list",
+                    AntiVPN.getInstance());
 
-  @Getter private String license;
+    @Getter
-  @Getter private String kickMessage;
+    private String license;
-  @Getter private String databaseType;
+    @Getter
-  @Getter private String databaseName;
+    private String kickMessage;
+    @Getter
+    private String databaseType;
+    @Getter
+    private String databaseName;
     private String mongoURL;
-  @Getter private String username;
+    @Getter
-  @Getter private String password;
+    private String username;
-  @Getter private String ip;
+    @Getter
-  @Getter private String alertMsg;
+    private String password;
-  @Getter private String countryVanillaKickReason;
+    @Getter
-  @Getter private List<String> prefixWhitelists;
+    private String ip;
+    @Getter
+    private String alertMsg;
+    @Getter
+    private String countryVanillaKickReason;
+    @Getter
+    private List<String> prefixWhitelists;
     private List<String> commands;
-  @Getter private List<String> countryList;
+    @Getter
+    private List<String> countryList;
     private List<String> countryKickCommands;
     private int port;
     private boolean cacheResults;
-  @Getter private boolean databaseEnabled;
+    @Getter
+    private boolean databaseEnabled;
     private boolean useCredentials;
-  @Getter private boolean commandsEnabled;
+    @Getter
-  @Getter private boolean kickPlayers;
+    private boolean commandsEnabled;
+    @Getter
+    private boolean kickPlayers;
     private boolean alertToStaff;
     private boolean metrics;
     private boolean whitelistCountries;
 
     /**
      * If true, results will be cached to reduce queries to <a href="https://funkemunky.cc">...</a>
-   *
      * @return boolean
      */
     public boolean cachedResults() {
@@ -107,7 +117,6 @@ public class VPNConfig {
 
     /**
      * If true, staff will be alerted on proxy detection.
-   *
      * @return boolean
      */
     public boolean isAlertToSTaff() {
@@ -116,7 +125,6 @@ public class VPNConfig {
 
     /**
      * Commands to run on proxy detection.
-   *
      * @return List
      */
     public List<String> commands() {
@@ -125,7 +133,6 @@ public class VPNConfig {
 
     /**
      * Whether or not the database we want to connect to requires credentials.
-   *
      * @return boolean
      */
     public boolean useDatabaseCreds() {
@@ -134,7 +141,6 @@ public class VPNConfig {
 
     /**
      * Only for Mongo only. URL used for connecting to database. Overrides other fields
-   *
      * @return String
      */
     public String mongoDatabaseURL() {
@@ -142,9 +148,7 @@ public class VPNConfig {
     }
 
     /**
-   * If true, we only allow the {@link VPNConfig#countryKickCommands()}. If false, we blacklist
+     * If true, we only allow the {@link VPNConfig#countryKickCommands()}. If false, we blacklist them.
-   * them.
-   *
      * @return boolean
      */
     public boolean getWhitelistCountries() {
@@ -153,7 +157,6 @@ public class VPNConfig {
 
     /**
      * Returns our configured commands to run on player country detection.
-   *
      * @return List
      */
     public List<String> countryKickCommands() {
@@ -163,11 +166,10 @@ public class VPNConfig {
     /**
      * Gets the port based on configuration. If {@link VPNConfig#port} is -1, will get default port
      * based on {@link VPNConfig#getDatabaseType()} lowerCase().
-   *
      * @return int
      */
     public int getPort() {
-    if (port == -1) {
+        if(port == -1) {
             switch (getDatabaseType().toLowerCase()) {
                 case "mongodb":
                 case "mongo":
@@ -182,16 +184,18 @@ public class VPNConfig {
         return port;
     }
 
+
     /**
      * If true, <a href="https://bstats.org">...</a> metrics will be collected to improve KauriVPN.
-   *
      * @return boolean
      */
     public boolean metrics() {
         return metrics;
     }
 
-  /** Grabs all information from the config.yml */
+    /**
+     * Grabs all information from the config.yml
+     */
     public void update() {
         license = licenseDefault.get();
         kickMessage = kickStringDefault.get();
@@ -217,4 +221,5 @@ public class VPNConfig {
         countryKickCommands = defCountryKickCommands.get();
         countryVanillaKickReason = defaultCountryKickReason.get();
     }
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java

@@ -25,12 +25,13 @@ import dev.brighten.antivpn.utils.Tuple;
 import dev.brighten.antivpn.utils.json.JSONException;
 import dev.brighten.antivpn.web.FunkemunkyAPI;
 import dev.brighten.antivpn.web.objects.VPNResponse;
+import lombok.Getter;
+
 import java.io.IOException;
 import java.net.UnknownHostException;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.logging.Level;
-import lombok.Getter;
 
 @Getter
 public abstract class VPNExecutor {
@@ -41,6 +42,7 @@ public abstract class VPNExecutor {
     private final Queue<APIPlayer> playersToRecheck = new LinkedBlockingQueue<>();
     private ScheduledFuture<?> kickTask = null;
 
+
     public abstract void registerListeners();
 
     public abstract void log(Level level, String log, Object... objects);
@@ -56,74 +58,53 @@ public abstract class VPNExecutor {
     }
 
     public void startKickChecks() {
-    kickTask =
+        kickTask = threadExecutor.scheduleAtFixedRate(() -> {
-        threadExecutor.scheduleAtFixedRate(
-            () -> {
             synchronized (toKick) {
-                if (toKick.isEmpty()) return;
+                if(toKick.isEmpty()) return;
 
                 Tuple<CheckResult, UUID> toCheck;
 
-                while ((toCheck = toKick.poll()) != null) {
+                while((toCheck = toKick.poll()) != null) {
-                  Optional<APIPlayer> player =
+                    Optional<APIPlayer> player = AntiVPN.getInstance().getPlayerExecutor().getPlayer(toCheck.second());
-                      AntiVPN.getInstance().getPlayerExecutor().getPlayer(toCheck.second());
 
-                  if (player.isEmpty()) {
+                    if(player.isEmpty()) {
                         continue;
                     }
 
                     handleKickingOfPlayer(toCheck.first(), player.get());
                 }
             }
-            },
+        }, 8, 2, TimeUnit.SECONDS);
-            8,
-            2,
-            TimeUnit.SECONDS);
     }
 
     public void handleKickingOfPlayer(CheckResult result, APIPlayer player) {
 
-    // Ensuring kick task is always running
+        //Ensuring kick task is always running
-    if (kickTask == null || kickTask.isDone() || kickTask.isCancelled()) {
+        if(kickTask == null || kickTask.isDone() || kickTask.isCancelled()) {
             startKickChecks();
         }
 
-    if (AntiVPN.getInstance().getVpnConfig().isAlertToSTaff())
+        if (AntiVPN.getInstance().getVpnConfig().isAlertToSTaff()) AntiVPN.getInstance().getPlayerExecutor()
-      AntiVPN.getInstance().getPlayerExecutor().getOnlinePlayers().stream()
+                .getOnlinePlayers()
+                .stream()
                 .filter(APIPlayer::isAlertsEnabled)
-          .forEach(
+                .forEach(pl ->
-              pl ->
+                        pl.sendMessage(StringUtil.translateAlternateColorCodes('&',
-                  pl.sendMessage(
+                                StringUtil.varReplace(dev.brighten.antivpn.AntiVPN.getInstance().getVpnConfig()
-                      StringUtil.translateAlternateColorCodes(
+                                        .getAlertMsg(), player, result.response()))));
-                          '&',
-                          StringUtil.varReplace(
-                              dev.brighten.antivpn.AntiVPN.getInstance()
-                                  .getVpnConfig()
-                                  .getAlertMsg(),
-                              player,
-                              result.response()))));
 
-    if (AntiVPN.getInstance().getVpnConfig().isKickPlayers()) {
+        if(AntiVPN.getInstance().getVpnConfig().isKickPlayers()) {
             switch (result.resultType()) {
-        case DENIED_PROXY ->
+                case DENIED_PROXY -> player.kickPlayer(StringUtil.varReplace(AntiVPN.getInstance().getVpnConfig()
-            player.kickPlayer(
+                        .getKickMessage(), player, result.response()));
-                StringUtil.varReplace(
+                case DENIED_COUNTRY -> player.kickPlayer(StringUtil.varReplace(AntiVPN.getInstance().getVpnConfig()
-                    AntiVPN.getInstance().getVpnConfig().getKickMessage(),
+                        .getCountryVanillaKickReason(), player, result.response()));
-                    player,
-                    result.response()));
-        case DENIED_COUNTRY ->
-            player.kickPlayer(
-                StringUtil.varReplace(
-                    AntiVPN.getInstance().getVpnConfig().getCountryVanillaKickReason(),
-                    player,
-                    result.response()));
             }
         } else {
-      if (!AntiVPN.getInstance().getVpnConfig().isCommandsEnabled()) return;
+            if(!AntiVPN.getInstance().getVpnConfig().isCommandsEnabled()) return;
         }
 
-    Runnable runCommands =
+        Runnable runCommands = () -> {
-        () -> {
             switch (result.resultType()) {
                 case DENIED_PROXY -> {
                     for (String command : AntiVPN.getInstance().getVpnConfig().commands()) {
@@ -138,33 +119,26 @@ public abstract class VPNExecutor {
             }
         };
 
-    // Fixes the commands running too fast and causing messaging errors by any downstream plugins
+        // Fixes the commands running too fast and causing messaging errors by any downstream plugins like LiteBans
-    // like LiteBans
+        var scheduleResult = threadExecutor.schedule(runCommands, 1, TimeUnit.SECONDS);
-    var scheduleResult = threadExecutor.schedule(runCommands, 200, TimeUnit.MILLISECONDS);
 
-    if (scheduleResult.isCancelled()) {
+        if(scheduleResult.isCancelled()) {
             runCommands.run();
         }
 
-    var toAdd = new Tuple<>(result, player.getUuid());
+        //Ensuring players are actually kicked as they are supposed to be.
-    // Ensuring players are actually kicked as they are supposed to be.
+        toKick.add(new Tuple<>(result, player.getUuid()));
-    threadExecutor.schedule(
-        () -> {
-          toKick.add(toAdd);
-        },
-        500,
-        TimeUnit.MILLISECONDS);
     }
 
     public boolean isWhitelisted(UUID uuid) {
-    if (AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
+        if(AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
             return AntiVPN.getInstance().getDatabase().isWhitelisted(uuid);
         }
         return whitelisted.contains(uuid);
     }
 
     public boolean isWhitelisted(String cidr) {
-    if (AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
+        if(AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
             return AntiVPN.getInstance().getDatabase().isWhitelisted(cidr);
         }
         try {
@@ -174,28 +148,28 @@ public abstract class VPNExecutor {
         }
     }
 
-  private final Cache<String, VPNResponse> cachedResponses =
+    private final Cache<String, VPNResponse> cachedResponses = Caffeine.newBuilder()
-      Caffeine.newBuilder().expireAfterWrite(20, TimeUnit.MINUTES).maximumSize(4000).build();
+            .expireAfterWrite(20, TimeUnit.MINUTES)
+            .maximumSize(4000)
+            .build();
 
     public CompletableFuture<VPNResponse> checkIp(String ip) {
         VPNResponse cached = cachedResponses.getIfPresent(ip);
 
-    if (cached != null) {
+        if(cached != null) {
             return CompletableFuture.completedFuture(cached);
         }
 
-    return CompletableFuture.supplyAsync(
+        return CompletableFuture.supplyAsync(() -> {
-        () -> {
+            Optional<VPNResponse> cachedRes = AntiVPN.getInstance().getDatabase().getStoredResponse(ip);
-          Optional<VPNResponse> cachedRes =
-              AntiVPN.getInstance().getDatabase().getStoredResponse(ip);
 
-          if (cachedRes.isPresent()) {
+            if(cachedRes.isPresent()) {
                 return cachedRes.get();
-          } else {
+            }
+            else {
                 try {
-              VPNResponse response =
+                    VPNResponse response = FunkemunkyAPI
-                  FunkemunkyAPI.getVPNResponse(
+                            .getVPNResponse(ip, AntiVPN.getInstance().getVpnConfig().getLicense(), true);
-                      ip, AntiVPN.getInstance().getVpnConfig().getLicense(), true);
 
                     if (response.isSuccess()) {
                         AntiVPN.getInstance().getDatabase().cacheResponse(response);
@@ -209,8 +183,7 @@ public abstract class VPNExecutor {
                     return VPNResponse.FAILED_RESPONSE;
                 }
             }
-        },
+        }, threadExecutor);
-        threadExecutor);
     }
 
     public abstract void disablePlugin();

Common/Source/src/main/java/dev/brighten/antivpn/command/CommandExecutor.java

@@ -17,15 +17,14 @@
 package dev.brighten.antivpn.command;
 
 import dev.brighten.antivpn.api.APIPlayer;
+
 import java.util.Optional;
 
 public interface CommandExecutor {
 
     void sendMessage(String message, Object... objects);
-
     boolean hasPermission(String permission);
-
     Optional<APIPlayer> getPlayer();
-
     boolean isPlayer();
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/command/impl/AlertsCommand.java

@@ -21,6 +21,7 @@ import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.CommandExecutor;
 import dev.brighten.antivpn.message.VpnString;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -64,20 +65,15 @@ public class AlertsCommand extends Command {
     @Override
     public String execute(CommandExecutor executor, String[] args) {
         Optional<APIPlayer> pgetter = executor.getPlayer();
-    if (!pgetter.isPresent())
+        if(!pgetter.isPresent()) return AntiVPN.getInstance().getMessageHandler()
-      return AntiVPN.getInstance()
+                .getString("command-misc-playerRequired").getMessage();
-          .getMessageHandler()
-          .getString("command-misc-playerRequired")
-          .getMessage();
 
         APIPlayer player = pgetter.get();
 
         player.setAlertsEnabled(!player.isAlertsEnabled());
         player.updateAlertsState();
 
-    return AntiVPN.getInstance()
+        return AntiVPN.getInstance().getMessageHandler().getString("command-alerts-toggled")
-        .getMessageHandler()
-        .getString("command-alerts-toggled")
                 .getFormattedMessage(new VpnString.Var<>("state", player.isAlertsEnabled()));
     }
 

Common/Source/src/main/java/dev/brighten/antivpn/command/impl/AllowlistCommand.java

@@ -22,6 +22,7 @@ import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.CommandExecutor;
 import dev.brighten.antivpn.utils.CIDRUtils;
 import dev.brighten.antivpn.utils.MiscUtils;
+
 import java.net.UnknownHostException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -67,12 +68,11 @@ public class AllowlistCommand extends Command {
 
     @Override
     public String execute(CommandExecutor executor, String[] args) {
-    if (args.length == 0
+        if(args.length == 0 || Arrays.stream(secondArgs).noneMatch(arg -> arg.equalsIgnoreCase(args[0]))) {
-        || Arrays.stream(secondArgs).noneMatch(arg -> arg.equalsIgnoreCase(args[0]))) {
             return "&cUsage: /antivpn allowlist " + usage();
         }
 
-    if (args[0].equalsIgnoreCase("show")) {
+        if(args[0].equalsIgnoreCase("show")) {
             // args[1] = optional page number (defaults to 1)
             int page = 1;
             if (args.length > 1) {
@@ -86,12 +86,10 @@ public class AllowlistCommand extends Command {
 
             boolean databaseEnabled = AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled();
 
-      List<UUID> uuids =
+            List<UUID> uuids = databaseEnabled
-          databaseEnabled
                     ? AntiVPN.getInstance().getDatabase().getAllWhitelisted()
                     : new ArrayList<>(AntiVPN.getInstance().getExecutor().getWhitelisted());
-      List<CIDRUtils> ips =
+            List<CIDRUtils> ips = databaseEnabled
-          databaseEnabled
                     ? AntiVPN.getInstance().getDatabase().getAllWhitelistedIps()
                     : new ArrayList<>(AntiVPN.getInstance().getExecutor().getWhitelistedIps());
 
@@ -106,7 +104,7 @@ public class AllowlistCommand extends Command {
             return buildPage(entries, page, null, "show");
         }
 
-    if (args[0].equalsIgnoreCase("search")) {
+        if(args[0].equalsIgnoreCase("search")) {
             // args[1..n-1] = query terms; args[n] = optional page number if last arg is an integer
             if (args.length < 2) {
                 return "&cUsage: /antivpn allowlist search <query> [page]";
@@ -121,8 +119,7 @@ public class AllowlistCommand extends Command {
                     page = candidate;
                     queryEnd = args.length - 1;
                 }
-      } catch (NumberFormatException ignored) {
+            } catch (NumberFormatException ignored) {}
-      }
 
             String search = String.join(" ", Arrays.copyOfRange(args, 1, queryEnd)).toLowerCase();
             // Strip color code characters to prevent formatting injection in output
@@ -134,12 +131,10 @@ public class AllowlistCommand extends Command {
 
             boolean databaseEnabled = AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled();
 
-      List<UUID> uuids =
+            List<UUID> uuids = databaseEnabled
-          databaseEnabled
                     ? AntiVPN.getInstance().getDatabase().getAllWhitelisted()
                     : new ArrayList<>(AntiVPN.getInstance().getExecutor().getWhitelisted());
-      List<CIDRUtils> ips =
+            List<CIDRUtils> ips = databaseEnabled
-          databaseEnabled
                     ? AntiVPN.getInstance().getDatabase().getAllWhitelistedIps()
                     : new ArrayList<>(AntiVPN.getInstance().getExecutor().getWhitelistedIps());
 
@@ -160,25 +155,24 @@ public class AllowlistCommand extends Command {
             return buildPage(entries, page, safeSearch, "search " + safeSearch);
         }
 
-    if (args.length == 1) return "&cYou have to provide a player to allow or deny exemption.";
+        if(args.length == 1)
+            return "&cYou have to provide a player to allow or deny exemption.";
 
         boolean databaseEnabled = AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled();
 
-    if (!databaseEnabled)
+        if(!databaseEnabled) executor.sendMessage("&cThe database is currently not setup, " +
-      executor.sendMessage(
+                "so any changes here will disappear after a restart.");
-          "&cThe database is currently not setup, "
-              + "so any changes here will disappear after a restart.");
 
         CIDRUtils cidrUtils;
 
         try {
             cidrUtils = new CIDRUtils(args[1]);
-    } catch (IllegalArgumentException | UnknownHostException e) {
+        } catch(IllegalArgumentException | UnknownHostException e) {
             cidrUtils = null;
         }
 
-    if (cidrUtils != null) {
+        if(cidrUtils != null) {
-      if (!databaseEnabled) {
+            if(!databaseEnabled) {
                 return switch (args[0].toLowerCase()) {
                     case "add", "insert" -> {
                         AntiVPN.getInstance().getExecutor().getWhitelistedIps().add(cidrUtils);
@@ -186,13 +180,11 @@ public class AllowlistCommand extends Command {
                     }
                     case "remove", "delete" -> {
                         AntiVPN.getInstance().getExecutor().getWhitelistedIps().remove(cidrUtils);
-            yield String.format(
+                        yield String.format("&cRemoved &%s &cfrom the exemption allowlist.", cidrUtils.getCidr());
-                "&cRemoved &%s &cfrom the exemption allowlist.", cidrUtils.getCidr());
                     }
                     default -> "&c\"" + args[0] + "\" is not a valid argument";
                 };
-      } else
+            } else return switch (args[0].toLowerCase()) {
-        return switch (args[0].toLowerCase()) {
                 case "add", "insert" -> {
                     AntiVPN.getInstance().getExecutor().getWhitelistedIps().add(cidrUtils);
                     AntiVPN.getInstance().getDatabase().addWhitelist(cidrUtils);
@@ -201,39 +193,29 @@ public class AllowlistCommand extends Command {
                 case "remove", "delete" -> {
                     AntiVPN.getInstance().getExecutor().getWhitelistedIps().remove(cidrUtils);
                     AntiVPN.getInstance().getDatabase().removeWhitelist(cidrUtils);
-            yield String.format(
+                    yield String.format("&cRemoved &6%s &cfrom the exemption allowlist.", cidrUtils.getCidr());
-                "&cRemoved &6%s &cfrom the exemption allowlist.", cidrUtils.getCidr());
                 }
                 default -> "&c\"" + args[0] + "\" is not a valid argument";
             };
         }
-    if (MiscUtils.isIpv4(args[1])) {
+        if(MiscUtils.isIpv4(args[1])) {
-      if (!databaseEnabled) {
+            if(!databaseEnabled) {
                 try {
-          return switch (args[0].toLowerCase()) {
+                    return switch(args[0].toLowerCase()) {
                         case "add", "insert" -> {
-              AntiVPN.getInstance()
+                            AntiVPN.getInstance().getExecutor().getWhitelistedIps().add(new CIDRUtils(args[1] + "/32"));
-                  .getExecutor()
-                  .getWhitelistedIps()
-                  .add(new CIDRUtils(args[1] + "/32"));
                             AntiVPN.getInstance().getDatabase().addWhitelist(new CIDRUtils(args[1] + "/32"));
                             yield String.format("&aAdded &6%s &ato the exemption allowlist.", args[1] + "/32");
                         }
                         case "remove", "delete" -> {
-              AntiVPN.getInstance()
+                            AntiVPN.getInstance().getExecutor().getWhitelistedIps().remove(new CIDRUtils(args[1] + "/32"));
-                  .getExecutor()
-                  .getWhitelistedIps()
-                  .remove(new CIDRUtils(args[1] + "/32"));
                             AntiVPN.getInstance().getDatabase().removeWhitelist(new CIDRUtils(args[1] + "/32"));
-              yield String.format(
+                            yield String.format("&cRemoved &6%s &cfrom the exemption allowlist.", args[1] + "/32");
-                  "&cRemoved &6%s &cfrom the exemption allowlist.", args[1] + "/32");
                         }
                         default -> "&c\"" + args[0] + "\" is not a valid argument";
                     };
                 } catch (UnknownHostException e) {
-          AntiVPN.getInstance()
+                    AntiVPN.getInstance().getExecutor().logException("Invalid IP format for allowlist command", e);
-              .getExecutor()
-              .logException("Invalid IP format for allowlist command", e);
                     return "&cInvalid IP format for allowlist command";
                 }
             } else {
@@ -245,15 +227,12 @@ public class AllowlistCommand extends Command {
                         }
                         case "remove", "delete" -> {
                             AntiVPN.getInstance().getDatabase().removeWhitelist(new CIDRUtils(args[1] + "/32"));
-              yield String.format(
+                            yield String.format("&cRemoved &6%s &c from the exemption allowlist.", args[1] + "/32");
-                  "&cRemoved &6%s &c from the exemption allowlist.", args[1] + "/32");
                         }
                         default -> "&c\"" + args[0] + "\" is not a valid argument";
                     };
                 } catch (UnknownHostException e) {
-          AntiVPN.getInstance()
+                    AntiVPN.getInstance().getExecutor().logException("Invalid IP format for allowlist command", e);
-              .getExecutor()
-              .logException("Invalid IP format for allowlist command", e);
                     return "&cInvalid IP format for allowlist command";
                 }
             }
@@ -261,21 +240,19 @@ public class AllowlistCommand extends Command {
             UUID uuid;
             try {
                 uuid = UUID.fromString(args[1]);
-      } catch (IllegalArgumentException e) {
+            } catch(IllegalArgumentException e) {
                 Optional<APIPlayer> player = AntiVPN.getInstance().getPlayerExecutor().getPlayer(args[1]);
                 if (player.isPresent()) {
                     uuid = player.get().getUuid();
                 } else {
                     uuid = MiscUtils.lookupUUID(args[1]);
                     if (uuid == null) {
-            return "&cCould not find a UUID for \""
+                        return "&cCould not find a UUID for \"" + args[1] + "\". They might not have provided a valid username.";
-                + args[1]
-                + "\". They might not have provided a valid username.";
                     }
                 }
             }
 
-      if (!databaseEnabled) {
+            if(!databaseEnabled) {
                 return switch (args[0].toLowerCase()) {
                     case "add" -> {
                         AntiVPN.getInstance().getExecutor().getWhitelisted().add(uuid);
@@ -283,8 +260,7 @@ public class AllowlistCommand extends Command {
                     }
                     case "remove", "delete" -> {
                         AntiVPN.getInstance().getExecutor().getWhitelisted().remove(uuid);
-            yield String.format(
+                        yield String.format("&cRemoved &6%s &cuuid from the exemption allowlist.", uuid.toString());
-                "&cRemoved &6%s &cuuid from the exemption allowlist.", uuid.toString());
                     }
                     default -> "&c\"" + args[0] + "\" is not a valid argument";
                 };
@@ -296,8 +272,7 @@ public class AllowlistCommand extends Command {
                     }
                     case "remove", "delete" -> {
                         AntiVPN.getInstance().getDatabase().removeWhitelist(uuid);
-            yield String.format(
+                        yield String.format("&cRemoved &6%s &cuuid from the exemption allowlist.", uuid.toString());
-                "&cRemoved &6%s &cuuid from the exemption allowlist.", uuid.toString());
                     }
                     default -> "&c\"" + args[0] + "\" is not a valid argument";
                 };
@@ -308,8 +283,7 @@ public class AllowlistCommand extends Command {
     @Override
     public List<String> tabComplete(CommandExecutor executor, String alias, String[] args) {
         return switch (args.length) {
-      case 1 ->
+            case 1 -> Arrays.stream(secondArgs)
-          Arrays.stream(secondArgs)
                     .filter(narg -> narg.toLowerCase().startsWith(args[0].toLowerCase()))
                     .collect(Collectors.toList());
             case 2 -> {
@@ -325,26 +299,19 @@ public class AllowlistCommand extends Command {
         };
     }
 
-  private String buildPage(
+    private String buildPage(List<String> entries, int page, String safeSearch, String subcommandPrefix) {
-      List<String> entries, int page, String safeSearch, String subcommandPrefix) {
         int pageSize = 10;
         int totalPages = Math.max(1, (entries.size() + pageSize - 1) / pageSize);
         if (page > totalPages) page = totalPages;
 
         List<String> messages = new ArrayList<>();
         messages.add("&8&m-----------------------------------------------------");
-    messages.add(
+        messages.add("&6&lAllowlist Entries &8(&7Page &f" + page + "&7/&f" + totalPages + "&8)"
-        "&6&lAllowlist Entries &8(&7Page &f"
-            + page
-            + "&7/&f"
-            + totalPages
-            + "&8)"
                 + (safeSearch != null ? " &7(search: &f" + safeSearch + "&7)" : ""));
         messages.add("");
 
         if (entries.isEmpty()) {
-      messages.add(
+            messages.add(safeSearch != null
-          safeSearch != null
                     ? "&cNo allowlist entries matching &f\"" + safeSearch + "&c\" were found."
                     : "&cThe allowlist is empty.");
         } else {
@@ -356,8 +323,7 @@ public class AllowlistCommand extends Command {
             if (totalPages > 1) {
                 messages.add("");
                 if (page > 1) {
-          messages.add(
+                    messages.add("&7Previous page: &f/antivpn allowlist " + subcommandPrefix + " " + (page - 1));
-              "&7Previous page: &f/antivpn allowlist " + subcommandPrefix + " " + (page - 1));
                 }
                 if (page < totalPages) {
                     messages.add("&7Next page: &f/antivpn allowlist " + subcommandPrefix + " " + (page + 1));

Common/Source/src/main/java/dev/brighten/antivpn/command/impl/AntiVPNCommand.java

@@ -20,6 +20,7 @@ import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.CommandExecutor;
 import dev.brighten.antivpn.utils.StringUtil;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -59,14 +60,8 @@ public class AntiVPNCommand extends Command {
 
     @Override
     public Command[] children() {
-    return new Command[] {
+        return new Command[] {new LookupCommand(), new AllowlistCommand(), new AlertsCommand(),
-      new LookupCommand(),
+                new ClearCacheCommand(), new PlanCommand(), new ReloadCommand()};
-      new AllowlistCommand(),
-      new AlertsCommand(),
-      new ClearCacheCommand(),
-      new PlanCommand(),
-      new ReloadCommand()
-    };
     }
 
     @Override
@@ -77,30 +72,14 @@ public class AntiVPNCommand extends Command {
         messages.add("&6&lAntiVPN Help Page");
         messages.add("");
         for (Command cmd : AntiVPN.getInstance().getCommands()) {
-      messages.add(
+            messages.add(String.format("&8/&f%s &8- &7&o%s", "&7" + cmd.parent()
-          String.format(
+                    + (cmd.parent().length() > 0 ? " " : "") + "&f" + cmd.name() + " &7"
-              "&8/&f%s &8- &7&o%s",
+                            + cmd.usage(), cmd.description()));
-              "&7"
-                  + cmd.parent()
-                  + (cmd.parent().length() > 0 ? " " : "")
-                  + "&f"
-                  + cmd.name()
-                  + " &7"
-                  + cmd.usage(),
-              cmd.description()));
         }
         for (Command child : children()) {
-      messages.add(
+            messages.add(String.format("&8/&f%s &8- &7&o%s", "&7" + child.parent()
-          String.format(
+                    + (child.parent().length() > 0 ? " " : "") + "&f" + child.name() + " &7"
-              "&8/&f%s &8- &7&o%s",
+                    + child.usage(), child.description()));
-              "&7"
-                  + child.parent()
-                  + (child.parent().length() > 0 ? " " : "")
-                  + "&f"
-                  + child.name()
-                  + " &7"
-                  + child.usage(),
-              child.description()));
         }
 
         messages.add(StringUtil.line("&8"));
@@ -110,7 +89,7 @@ public class AntiVPNCommand extends Command {
 
     @Override
     public List<String> tabComplete(CommandExecutor executor, String alias, String[] args) {
-    if (args.length == 1)
+        if(args.length == 1)
         return Arrays.stream(children())
                 .map(Command::name)
                 .filter(name -> name.toLowerCase().startsWith(args[0].toLowerCase()))

Common/Source/src/main/java/dev/brighten/antivpn/command/impl/ClearCacheCommand.java

@@ -17,8 +17,10 @@
 package dev.brighten.antivpn.command.impl;
 
 import dev.brighten.antivpn.AntiVPN;
+import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.CommandExecutor;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -60,10 +62,7 @@ public class ClearCacheCommand extends Command {
 
     @Override
     public String execute(CommandExecutor executor, String[] args) {
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().getThreadExecutor().execute(() -> AntiVPN.getInstance().getDatabase().clearResponses());
-        .getExecutor()
-        .getThreadExecutor()
-        .execute(() -> AntiVPN.getInstance().getDatabase().clearResponses());
         return "&aCleared all cached API response information!";
     }
 

Common/Source/src/main/java/dev/brighten/antivpn/command/impl/LookupCommand.java

@@ -21,6 +21,7 @@ import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.CommandExecutor;
 import dev.brighten.antivpn.utils.StringUtil;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -64,50 +65,46 @@ public class LookupCommand extends Command {
 
     @Override
     public String execute(CommandExecutor executor, String[] args) {
-    if (args.length == 0) {
+        if(args.length == 0) {
             return "&cPlease supply a player to check.";
         }
 
         Optional<APIPlayer> player = AntiVPN.getInstance().getPlayerExecutor().getPlayer(args[0]);
 
-    if (player.isEmpty()) {
+        if(player.isEmpty()) {
             return String.format("&cNo player found with the name \"%s\"", args[0]);
         }
 
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor()
-        .getExecutor()
                 .checkIp(player.get().getIp().getHostAddress())
-        .thenAccept(
+                .thenAccept(result -> {
-            result -> {
+                    if(!result.isSuccess()) {
-              if (!result.isSuccess()) {
+                        executor.sendMessage("&cThere was an error trying to find the " +
-                executor.sendMessage(
+                                "information of this player.");
-                    "&cThere was an error trying to find the " + "information of this player.");
                         return;
                     }
 
                     executor.sendMessage(StringUtil.line("&8"));
-              executor.sendMessage(
+                    executor.sendMessage("&6&l" + player.get().getName() + "&7&l's Connection Information");
-                  "&6&l" + player.get().getName() + "&7&l's Connection Information");
                     executor.sendMessage("");
-              executor.sendMessage(
+                    executor.sendMessage("&e%s&8: &f%s", "Proxy", result.isProxy()
-                  "&e%s&8: &f%s", "Proxy", result.isProxy() ? "&a" + result.getMethod() : "&cNo");
+                            ? "&a" + result.getMethod() : "&cNo");
                     executor.sendMessage("&e%s&8: &f%s", "ISP", result.getIsp());
                     executor.sendMessage("&e%s&8: &f%s", "Country", result.getCountryName());
                     executor.sendMessage("&e%s&8: &f%s", "City", result.getCity());
-              executor.sendMessage(
+                    executor.sendMessage("&e%s&8: &f%s", "Coordinates", result.getLatitude()
-                  "&e%s&8: &f%s",
+                            + "&7/&f" + result.getLongitude());
-                  "Coordinates", result.getLatitude() + "&7/&f" + result.getLongitude());
                     executor.sendMessage(StringUtil.line("&8"));
                 });
 
+
         return "&7Looking up the IP information for player " + player.get().getName() + "...";
     }
 
     @Override
     public List<String> tabComplete(CommandExecutor executor, String alias, String[] args) {
 
-    if (args.length == 1)
+        if(args.length == 1) return AntiVPN.getInstance().getPlayerExecutor().getOnlinePlayers().stream()
-      return AntiVPN.getInstance().getPlayerExecutor().getOnlinePlayers().stream()
                 .map(APIPlayer::getName)
                 .filter(name -> name.toLowerCase().startsWith(args[0].toLowerCase()))
                 .collect(Collectors.toList());

Common/Source/src/main/java/dev/brighten/antivpn/command/impl/PlanCommand.java

@@ -17,12 +17,14 @@
 package dev.brighten.antivpn.command.impl;
 
 import dev.brighten.antivpn.AntiVPN;
+import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.CommandExecutor;
 import dev.brighten.antivpn.utils.StringUtil;
 import dev.brighten.antivpn.utils.json.JSONException;
 import dev.brighten.antivpn.web.FunkemunkyAPI;
 import dev.brighten.antivpn.web.objects.QueryResponse;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
@@ -65,24 +67,17 @@ public class PlanCommand extends Command {
 
     @Override
     public String execute(CommandExecutor executor, String[] args) {
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().getThreadExecutor().execute(() -> {
-        .getExecutor()
-        .getThreadExecutor()
-        .execute(
-            () -> {
             QueryResponse result;
             try {
-                if (AntiVPN.getInstance().getVpnConfig().getLicense().isEmpty()) {
+                if(AntiVPN.getInstance().getVpnConfig().getLicense().isEmpty()) {
                     result = FunkemunkyAPI.getQueryResponse();
                 } else {
-                  result =
+                    result = FunkemunkyAPI.getQueryResponse(AntiVPN.getInstance().getVpnConfig().getLicense());
-                      FunkemunkyAPI.getQueryResponse(
-                          AntiVPN.getInstance().getVpnConfig().getLicense());
 
-                  if (!result.isValidPlan()) {
+                    if(!result.isValidPlan()) {
-                    executor.sendMessage(
+                        executor.sendMessage("&cThe license &f%s &cis not a valid license, " +
-                        "&cThe license &f%s &cis not a valid license, "
+                                        "checking your Free plan information...",
-                            + "checking your Free plan information...",
                                 AntiVPN.getInstance().getVpnConfig().getLicense());
 
                         result = FunkemunkyAPI.getQueryResponse();
@@ -90,30 +85,26 @@ public class PlanCommand extends Command {
                 }
 
                 String plan = result.getPlanType();
-                if (plan.equals("IP")) plan += " (Free)";
+                if(plan.equals("IP")) plan+= " (Free)";
 
-                String queryMax =
+                String queryMax = result.getQueriesMax() == Long.MAX_VALUE
-                    result.getQueriesMax() == Long.MAX_VALUE
+                        ? "Unlimited" : String.valueOf(result.getQueriesMax());
-                        ? "Unlimited"
-                        : String.valueOf(result.getQueriesMax());
 
                 executor.sendMessage(StringUtil.line("&8"));
                 executor.sendMessage("&6&lKauriVPN Plan Information");
                 executor.sendMessage("");
                 executor.sendMessage("&e%s&8: &f%s", "Plan", plan);
-                executor.sendMessage(
+                executor.sendMessage("&e%s&8: &f%s&7/&f%s", "Queries Used",
-                    "&e%s&8: &f%s&7/&f%s", "Queries Used", result.getQueries(), queryMax);
+                        result.getQueries(), queryMax);
                 executor.sendMessage(StringUtil.line("&8"));
-              } catch (JSONException e) {
+            } catch(JSONException e) {
                 AntiVPN.getInstance().getExecutor().logException(e);
-                executor.sendMessage(
+                executor.sendMessage("&cThere was a JSONException thrown while looking up your query " +
-                    "&cThere was a JSONException thrown while looking up your query "
+                        "information. Check console for more details.");
-                        + "information. Check console for more details.");
             } catch (IOException e) {
                 AntiVPN.getInstance().getExecutor().logException(e);
-                executor.sendMessage(
+                executor.sendMessage("&cThere was a IOException thrown while looking up your query " +
-                    "&cThere was a IOException thrown while looking up your query "
+                        "information. Check console for more details.");
-                        + "information. Check console for more details.");
             }
         });
         return "&7Looking up your query information...";

Common/Source/src/main/java/dev/brighten/antivpn/command/impl/ReloadCommand.java

@@ -19,6 +19,7 @@ package dev.brighten.antivpn.command.impl;
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.command.Command;
 import dev.brighten.antivpn.command.CommandExecutor;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -70,10 +71,7 @@ public class ReloadCommand extends Command {
 
         AntiVPN.getInstance().reloadDatabase();
 
-    return AntiVPN.getInstance()
+        return AntiVPN.getInstance().getMessageHandler().getString("command-reload-complete").getMessage();
-        .getMessageHandler()
-        .getString("command-reload-complete")
-        .getMessage();
     }
 
     @Override

Common/Source/src/main/java/dev/brighten/antivpn/database/VPNDatabase.java

@@ -18,6 +18,7 @@ package dev.brighten.antivpn.database;
 
 import dev.brighten.antivpn.utils.CIDRUtils;
 import dev.brighten.antivpn.web.objects.VPNResponse;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;

Common/Source/src/main/java/dev/brighten/antivpn/database/local/H2VPN.java

@@ -24,6 +24,8 @@ import dev.brighten.antivpn.database.sql.utils.Query;
 import dev.brighten.antivpn.database.version.Version;
 import dev.brighten.antivpn.utils.CIDRUtils;
 import dev.brighten.antivpn.web.objects.VPNResponse;
+import lombok.SneakyThrows;
+
 import java.io.File;
 import java.math.BigInteger;
 import java.net.UnknownHostException;
@@ -33,71 +35,46 @@ import java.sql.Timestamp;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import lombok.SneakyThrows;
 
 public class H2VPN implements VPNDatabase {
 
-  public H2VPN() {
-    AntiVPN.getInstance()
-        .getExecutor()
-        .getThreadExecutor()
-        .scheduleAtFixedRate(
-            () -> {
-              if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
-                return;
 
-              // Refreshing whitelisted players
+    public H2VPN() {
+        AntiVPN.getInstance().getExecutor().getThreadExecutor().scheduleAtFixedRate(() -> {
+            if(!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;
+
+            //Refreshing whitelisted players
             AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
-              AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().getWhitelisted()
-                  .getExecutor()
-                  .getWhitelisted()
                     .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
 
-              // Refreshing whitlisted IPs
+            //Refreshing whitlisted IPs
             AntiVPN.getInstance().getExecutor().getWhitelistedIps().clear();
-              AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps()
-                  .getExecutor()
-                  .getWhitelistedIps()
                     .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelistedIps());
-            },
+        }, 2, 30, TimeUnit.SECONDS);
-            2,
-            30,
-            TimeUnit.SECONDS);
     }
 
     @Override
     public Optional<VPNResponse> getStoredResponse(String ip) {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()|| MySQL.isClosed())
             return Optional.empty();
 
-    try (ExecutableStatement statement =
+        try(ExecutableStatement statement = Query.prepare("select * from `responses` where `ip` = ? limit 1").append(ip)) {
-        Query.prepare("select * from `responses` where `ip` = ? limit 1").append(ip)) {
+            try(ResultSet rs = statement.executeQuery()) {
-      try (ResultSet rs = statement.executeQuery()) {
                 if (rs != null && rs.next()) {
-          return Optional.of(
+                    return Optional.of(new VPNResponse(rs.getString("asn"), rs.getString("ip"),
-              new VPNResponse(
+                            rs.getString("countryName"), rs.getString("countryCode"),
-                  rs.getString("asn"),
+                            rs.getString("city"), rs.getString("timeZone"),
-                  rs.getString("ip"),
+                            rs.getString("method"), rs.getString("isp"), "N/A",
-                  rs.getString("countryName"),
+                            rs.getBoolean("proxy"), rs.getBoolean("cached"), true,
-                  rs.getString("countryCode"),
+                            rs.getDouble("latitude"), rs.getDouble("longitude"),
-                  rs.getString("city"),
+                            rs.getTimestamp("inserted").getTime(), -1));
-                  rs.getString("timeZone"),
-                  rs.getString("method"),
-                  rs.getString("isp"),
-                  "N/A",
-                  rs.getBoolean("proxy"),
-                  rs.getBoolean("cached"),
-                  true,
-                  rs.getDouble("latitude"),
-                  rs.getDouble("longitude"),
-                  rs.getTimestamp("inserted").getTime(),
-                  -1));
                 }
             }
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("There was a problem getting a response for "
-          .getExecutor()
+                    + ip, e);
-          .logException("There was a problem getting a response for " + ip, e);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -115,60 +92,46 @@ public class H2VPN implements VPNDatabase {
      */
     @Override
     public void cacheResponse(VPNResponse toCache) {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+            return;
 
-    try (var statement =
+        try(var statement = Query.prepare("insert into `responses` (`ip`,`asn`,`countryName`,`countryCode`,`city`,`timeZone`,"
-        Query.prepare(
-                "insert into `responses` (`ip`,`asn`,`countryName`,`countryCode`,`city`,`timeZone`,"
                         + "`method`,`isp`,`proxy`,`cached`,`inserted`,`latitude`,`longitude`) values (?,?,?,?,?,?,?,?,?,?,?,?,?)")
-            .append(toCache.getIp())
+                .append(toCache.getIp()).append(toCache.getAsn()).append(toCache.getCountryName())
-            .append(toCache.getAsn())
+                .append(toCache.getCountryCode()).append(toCache.getCity()).append(toCache.getTimeZone())
-            .append(toCache.getCountryName())
+                .append(toCache.getMethod()).append(toCache.getIsp()).append(toCache.isProxy())
-            .append(toCache.getCountryCode())
+                .append(toCache.isCached()).append(new Timestamp(System.currentTimeMillis()))
-            .append(toCache.getCity())
+                .append(toCache.getLatitude()).append(toCache.getLongitude())) {
-            .append(toCache.getTimeZone())
-            .append(toCache.getMethod())
-            .append(toCache.getIsp())
-            .append(toCache.isProxy())
-            .append(toCache.isCached())
-            .append(new Timestamp(System.currentTimeMillis()))
-            .append(toCache.getLatitude())
-            .append(toCache.getLongitude())) {
             statement.execute();
-    } catch (SQLException e) {
+        } catch(SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not cache response for IP: " + toCache.getIp(), e);
-          .getExecutor()
-          .logException("Could not cache response for IP: " + toCache.getIp(), e);
         }
     }
 
     @Override
     public void deleteResponse(String ip) {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;
+        if(!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+            return;
 
-    try (var statement = Query.prepare("delete from `responses` where `ip` = ?").append(ip)) {
+        try(var statement = Query.prepare("delete from `responses` where `ip` = ?").append(ip)) {
             statement.execute();
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not delete response from IP: " + ip, e);
-          .getExecutor()
-          .logException("Could not delete response from IP: " + ip, e);
         }
     }
 
     @Override
     public boolean isWhitelisted(UUID uuid) {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return false;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+            return false;
 
-    try (var statement =
+        try(var statement = Query.prepare("select uuid from `whitelisted` where `uuid` = ? limit 1")
-        Query.prepare("select uuid from `whitelisted` where `uuid` = ? limit 1")
                 .append(uuid.toString())) {
-      try (var set = statement.executeQuery()) {
+            try(var set = statement.executeQuery()) {
                 return set != null && set.next() && set.getString("uuid") != null;
             }
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not check whitelist for uuid '" + uuid + "' due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not check whitelist for uuid '" + uuid + "' due to SQL error.", e);
             return false;
         }
     }
@@ -181,88 +144,73 @@ public class H2VPN implements VPNDatabase {
 
     @Override
     public boolean isWhitelisted(CIDRUtils cidr) {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return false;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+            return false;
 
         BigInteger start = cidr.getStartIpInt();
         BigInteger end = cidr.getEndIpInt();
 
-    try (var statement =
+        try(var statement = Query.prepare("SELECT * FROM `whitelisted-ranges` WHERE ip_start <= ? AND ip_end >= ?")
-        Query.prepare("SELECT * FROM `whitelisted-ranges` WHERE ip_start <= ? AND ip_end >= ?")
+                .append(start).append(end)) {
-            .append(start)
-            .append(end)) {
 
-      try (var result = statement.executeQuery()) {
+            try(var result = statement.executeQuery()) {
                 return result.next();
             }
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not check whitelist for cidr '" + cidr + "' due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not check whitelist for cidr '" + cidr + "' due to SQL error.", e);
         }
         return false;
     }
 
     @Override
     public void addWhitelist(UUID uuid) {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+            return;
 
-    try (var statement =
+        try(var statement = Query.prepare("insert into `whitelisted` (`uuid`) values (?)").append(uuid.toString())) {
-        Query.prepare("insert into `whitelisted` (`uuid`) values (?)").append(uuid.toString())) {
             statement.execute();
             AntiVPN.getInstance().getExecutor().getWhitelisted().add(uuid);
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not add uuid '" + uuid + "' to whitelist due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not add uuid '" + uuid + "' to whitelist due to SQL error.", e);
         }
     }
 
     @Override
     public void removeWhitelist(UUID uuid) {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
-    try (var statement =
+            return;
-        Query.prepare("delete from `whitelisted` where `uuid` = ?").append(uuid.toString())) {
+        try(var statement = Query.prepare("delete from `whitelisted` where `uuid` = ?").append(uuid.toString())) {
             statement.execute();
             AntiVPN.getInstance().getExecutor().getWhitelisted().remove(uuid);
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not remove uuid '" + uuid + "' from whitelist due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not remove uuid '" + uuid + "' from whitelist due to SQL error.", e);
         }
     }
 
     @Override
     public void addWhitelist(CIDRUtils cidr) {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+            return;
 
-    try (var statement =
+        try(var statement = Query.prepare("insert into `whitelisted-ranges` (`cidr_string`, `ip_start`, `ip_end`) values (?, ?, ?)")
-        Query.prepare(
+                .append(cidr.getCidr()).append(cidr.getStartIpInt()).append(cidr.getEndIpInt())) {
-                "insert into `whitelisted-ranges` (`cidr_string`, `ip_start`, `ip_end`) values (?, ?, ?)")
-            .append(cidr.getCidr())
-            .append(cidr.getStartIpInt())
-            .append(cidr.getEndIpInt())) {
             statement.execute();
 
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not add cidr '" + cidr + "' to whitelist due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not add cidr '" + cidr + "' to whitelist due to SQL error.", e);
         }
     }
 
     @Override
     public void removeWhitelist(CIDRUtils cidr) {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+            return;
 
-    try (var statement =
+        try(var statement = Query.prepare("delete from `whitelisted-ranges` where `cidr_string` = ?").append(cidr.getCidr())) {
-        Query.prepare("delete from `whitelisted-ranges` where `cidr_string` = ?")
-            .append(cidr.getCidr())) {
             statement.execute();
 
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not remove cidr '" + cidr + "' from whitelist due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not remove cidr '" + cidr + "' from whitelist due to SQL error.", e);
         }
     }
 
@@ -270,14 +218,13 @@ public class H2VPN implements VPNDatabase {
     public List<UUID> getAllWhitelisted() {
         List<UUID> uuids = new ArrayList<>();
 
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return uuids;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
+            return uuids;
 
-    try (var statement = Query.prepare("select uuid from `whitelisted`")) {
+        try(var statement = Query.prepare("select uuid from `whitelisted`")) {
             statement.execute(set -> uuids.add(UUID.fromString(set.getString("uuid"))));
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not get all whitelisted players due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not get all whitelisted players due to SQL error.", e);
         }
 
         return uuids;
@@ -287,27 +234,23 @@ public class H2VPN implements VPNDatabase {
     public List<CIDRUtils> getAllWhitelistedIps() {
         List<CIDRUtils> ips = new ArrayList<>();
 
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return ips;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
-    try (var statement =
+            return ips;
-        Query.prepare("select `cidr_string`, `ip_start`, `ip_end` from `whitelisted-ranges`")) {
+        try(var statement = Query.prepare("select `cidr_string`, `ip_start`, `ip_end` from `whitelisted-ranges`")) {
-      statement.execute(
+            statement.execute(set -> {
-          set -> {
                         try {
                             String cidrString = set.getString("cidr_string");
 
                             ips.add(new CIDRUtils(cidrString));
 
                         } catch (UnknownHostException e) {
-              AntiVPN.getInstance()
+                            AntiVPN.getInstance().getExecutor()
-                  .getExecutor()
+                                    .logException("Could not format ip "
-                  .logException(
+                                            + set.getString("cidr_string") + " into a CIDR!", e);
-                      "Could not format ip " + set.getString("cidr_string") + " into a CIDR!", e);
                         }
                     });
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not get all whitelisted ips due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not get all whitelisted ips due to SQL error.", e);
         }
 
         return ips;
@@ -315,22 +258,16 @@ public class H2VPN implements VPNDatabase {
 
     @Override
     public void alertsState(UUID uuid, Consumer<Boolean> result) {
-    if (MySQL.isClosed()) return;
+        if(MySQL.isClosed()) return;
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().getThreadExecutor().execute(() -> {
-        .getExecutor()
+
-        .getThreadExecutor()
+            try(var statement = Query.prepare("select * from `alerts` where `uuid` = ? limit 1")
-        .execute(
-            () -> {
-              try (var statement =
-                  Query.prepare("select * from `alerts` where `uuid` = ? limit 1")
                     .append(uuid.toString())) {
-                try (var set = statement.executeQuery()) {
+                try(var set = statement.executeQuery()) {
                     result.accept(set != null && set.next() && set.getString("uuid") != null);
                 }
             } catch (SQLException e) {
-                AntiVPN.getInstance()
+                AntiVPN.getInstance().getExecutor().logException("There was a problem getting alerts state for " + uuid, e);
-                    .getExecutor()
-                    .logException("There was a problem getting alerts state for " + uuid, e);
                 result.accept(false);
             }
         });
@@ -338,59 +275,52 @@ public class H2VPN implements VPNDatabase {
 
     @Override
     public void updateAlertsState(UUID uuid, boolean enabled) {
-    if (MySQL.isClosed()) return;
+        if(MySQL.isClosed()) return;
 
-    if (enabled) {
+        if(enabled) {
-      // We want to make sure there isn't already a uuid inserted to prevent double insertions
+            //We want to make sure there isn't already a uuid inserted to prevent double insertions
-      alertsState(
+            alertsState(uuid, alreadyEnabled -> { //No need to make another thread execute, already async
-          uuid,
+                if(!alreadyEnabled) {
-          alreadyEnabled -> { // No need to make another thread execute, already async
+                    try(var statement = Query.prepare("insert into `alerts` (`uuid`) values (?)")
-            if (!alreadyEnabled) {
-              try (var statement =
-                  Query.prepare("insert into `alerts` (`uuid`) values (?)")
                             .append(uuid.toString())) {
                         statement.execute();
                     } catch (SQLException e) {
-                AntiVPN.getInstance()
+                        AntiVPN.getInstance().getExecutor()
-                    .getExecutor()
                                 .logException("There was a problem updating alerts state for " + uuid, e);
                     }
-            } // No need to insert again of already enabled
+                } //No need to insert again of already enabled
             });
-      // Removing any uuid from the alerts table will disable alerts globally.
+            //Removing any uuid from the alerts table will disable alerts globally.
         } else {
-      try (var statement =
+            try(var statement = Query.prepare("delete from `alerts` where `uuid` = ?").append(uuid.toString())) {
-          Query.prepare("delete from `alerts` where `uuid` = ?").append(uuid.toString())) {
                         statement.execute();
             } catch (SQLException e) {
-        AntiVPN.getInstance()
+                AntiVPN.getInstance().getExecutor().logException("There was a problem updating alerts state for "
-            .getExecutor()
+                        + uuid, e);
-            .logException("There was a problem updating alerts state for " + uuid, e);
             }
         }
     }
 
     @Override
     public void clearResponses() {
-    if (MySQL.isClosed()) return;
+        if(MySQL.isClosed()) return;
 
-    try (var statement = Query.prepare("delete from `responses`")) {
+        try(var statement = Query.prepare("delete from `responses`")) {
             statement.execute();
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("There was a problem clearing responses.", e);
-          .getExecutor()
-          .logException("There was a problem clearing responses.", e);
         }
     }
 
     @Override
     public void init() {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) return;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled())
+            return;
         AntiVPN.getInstance().getExecutor().log("Initializing H2...");
         MySQL.initH2();
         try {
             for (Version<H2VPN> version : Version.h2Versions) {
-        if (version.needsUpdate(this)) {
+                if(version.needsUpdate(this)) {
                     version.update(this);
                 }
             }
@@ -400,12 +330,13 @@ public class H2VPN implements VPNDatabase {
 
         AntiVPN.getInstance().getExecutor().log("Creating tables...");
 
-    // Running check for old table types to update
+        //Running check for old table types to update
     }
 
     @Override
     public void shutdown() {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) return;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled())
+            return;
 
         MySQL.shutdown();
     }
@@ -413,21 +344,18 @@ public class H2VPN implements VPNDatabase {
     public void backupDatabase() {
         File dataFolder = new File(AntiVPN.getInstance().getPluginFolder(), "databases");
 
-    if (!dataFolder.exists() || MySQL.isClosed()) {
+        if(!dataFolder.exists() || MySQL.isClosed()) {
             return;
         }
 
         try {
             var connection = Query.getConn();
-      if (connection == null
+            if (connection == null || connection.getMetaData() == null
-          || connection.getMetaData() == null
                     || !connection.getMetaData().getDatabaseProductName().equalsIgnoreCase("H2")) {
                 return;
             }
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not verify database type before H2 backup.", e);
-          .getExecutor()
-          .logException("Could not verify database type before H2 backup.", e);
             return;
         }
 
@@ -437,17 +365,16 @@ public class H2VPN implements VPNDatabase {
             return;
         }
 
-    File backupFile =
+        File backupFile = new File(backupDir, "database.h2_backup_" + System.currentTimeMillis() + ".zip");
-        new File(backupDir, "database.h2_backup_" + System.currentTimeMillis() + ".zip");
+        String backupPath = backupFile.getAbsolutePath()
-    String backupPath = backupFile.getAbsolutePath().replace("\\", "/").replace("'", "''");
+                .replace("\\", "/")
+                .replace("'", "''");
 
         try (var statement = Query.prepare("BACKUP TO '" + backupPath + "'")) {
             statement.execute();
             AntiVPN.getInstance().getExecutor().log("Created H2 backup at " + backupFile.getName());
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not create H2 backup before migration.", e);
-          .getExecutor()
-          .logException("Could not create H2 backup before migration.", e);
         }
     }
 }

Common/Source/src/main/java/dev/brighten/antivpn/database/local/version/First.java

@@ -23,6 +23,7 @@ import dev.brighten.antivpn.database.sql.utils.ExecutableStatement;
 import dev.brighten.antivpn.database.sql.utils.Query;
 import dev.brighten.antivpn.database.version.Version;
 import dev.brighten.antivpn.utils.MiscUtils;
+
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -32,33 +33,23 @@ import java.util.List;
 public class First implements Version<VPNDatabase> {
 
     private final List<AutoCloseable> toClose = new ArrayList<>();
-
     @Override
     public void update(VPNDatabase database) throws DatabaseException {
         try {
-      closeOnEnd(
+            closeOnEnd(Query.prepare("create table if not exists `whitelisted` (`uuid` varchar(36) not null)"))
-              Query.prepare(
-                  "create table if not exists `whitelisted` (`uuid` varchar(36) not null)"))
                     .execute();
-      closeOnEnd(
+            closeOnEnd(Query.prepare("create table if not exists `whitelisted-ips` (`ip` varchar(45) not null)"))
-              Query.prepare(
-                  "create table if not exists `whitelisted-ips` (`ip` varchar(45) not null)"))
                     .execute();
-      closeOnEnd(
+            closeOnEnd(Query
-              Query.prepare(
+                    .prepare("create table if not exists `responses` (`ip` varchar(45) not null, `asn` varchar(12),"
-                  "create table if not exists `responses` (`ip` varchar(45) not null, `asn` varchar(12),"
                     + "`countryName` text, `countryCode` varchar(10), `city` text, `timeZone` varchar(64), "
                     + "`method` varchar(32), `isp` text, `proxy` boolean, `cached` boolean, `inserted` timestamp,"
-                      + "`latitude` double, `longitude` double)"))
+                    + "`latitude` double, `longitude` double)")).execute();
-          .execute();
             closeOnEnd(Query.prepare("create table if not exists `alerts` (`uuid` varchar(36) not null)"))
                     .execute();
-      closeOnEnd(Query.prepare("create table if not exists `database_version` (`version` int)"))
+            closeOnEnd(Query.prepare("create table if not exists `database_version` (`version` int)")).execute();
-          .execute();
+            closeOnEnd(Query.prepare("insert into `database_version` (`version`) values (?)")
-      closeOnEnd(
+                    .append(versionNumber())).execute();
-              Query.prepare("insert into `database_version` (`version`) values (?)")
-                  .append(versionNumber()))
-          .execute();
 
             AntiVPN.getInstance().getExecutor().log("Creating indexes...");
             createIndexIfAbsent("whitelisted", "whitelisted_uuid_1", "`uuid`");
@@ -79,16 +70,17 @@ public class First implements Version<VPNDatabase> {
         return statement;
     }
 
-  protected void createIndexIfAbsent(String tableName, String indexName, String columnList)
+    protected void createIndexIfAbsent(String tableName, String indexName, String columnList) throws SQLException {
-      throws SQLException {
         if (hasIndex(tableName, indexName)) {
             return;
         }
 
-    closeOnEnd(
+        closeOnEnd(Query.prepare(String.format(
-            Query.prepare(
+                "create index `%s` on `%s` (%s)",
-                String.format("create index `%s` on `%s` (%s)", indexName, tableName, columnList)))
+                indexName,
-        .execute();
+                tableName,
+                columnList
+        ))).execute();
     }
 
     protected void dropIndexIfPresent(String tableName, String indexName) throws SQLException {
@@ -96,8 +88,11 @@ public class First implements Version<VPNDatabase> {
             return;
         }
 
-    closeOnEnd(Query.prepare(String.format("drop index `%s` on `%s`", indexName, tableName)))
+        closeOnEnd(Query.prepare(String.format(
-        .execute();
+                "drop index `%s` on `%s`",
+                indexName,
+                tableName
+        ))).execute();
     }
 
     protected boolean hasIndex(String tableName, String indexName) throws SQLException {
@@ -123,12 +118,13 @@ public class First implements Version<VPNDatabase> {
 
     @Override
     public boolean needsUpdate(VPNDatabase database) {
-    try (var statement = Query.prepare("select * from `database_version` where version = 0")) {
+        try(var statement = Query.prepare("select * from `database_version` where version = 0")) {
-      try (ResultSet set = statement.executeQuery()) {
+            try(ResultSet set =  statement.executeQuery()) {
                 return !set.next();
             }
         } catch (SQLException e) {
             return true;
         }
+
     }
 }

Common/Source/src/main/java/dev/brighten/antivpn/database/local/version/Second.java

@@ -26,6 +26,7 @@ import dev.brighten.antivpn.database.sql.utils.Query;
 import dev.brighten.antivpn.database.version.Version;
 import dev.brighten.antivpn.utils.CIDRUtils;
 import dev.brighten.antivpn.utils.MiscUtils;
+
 import java.net.UnknownHostException;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -36,13 +37,13 @@ public class Second extends First implements Version<VPNDatabase> {
 
     @Override
     public void update(VPNDatabase database) throws DatabaseException {
-    if (database instanceof H2VPN h2VPN && !(database instanceof MySqlVPN)) {
+        if(database instanceof H2VPN h2VPN && !(database instanceof MySqlVPN)) {
             h2VPN.backupDatabase();
         }
         List<String> whitelistedIps = new ArrayList<>();
 
         try (var statement = Query.prepare("SELECT * FROM `whitelisted-ips`")) {
-      try (var set = statement.executeQuery()) {
+            try(var set = statement.executeQuery()) {
                 while (set.next()) {
                     whitelistedIps.add(set.getString("ip"));
                 }
@@ -52,33 +53,24 @@ public class Second extends First implements Version<VPNDatabase> {
         }
 
         try {
-      closeOnEnd(
+            closeOnEnd(Query.prepare("CREATE TABLE IF NOT EXISTS `whitelisted-ranges` " +
-              Query.prepare(
+                    "(id INT AUTO_INCREMENT PRIMARY KEY, " +
-                  "CREATE TABLE IF NOT EXISTS `whitelisted-ranges` "
+                    "cidr_string VARCHAR(45), " +
-                      + "(id INT AUTO_INCREMENT PRIMARY KEY, "
+                    "ip_start BIGINT NOT NULL, " +
-                      + "cidr_string VARCHAR(45), "
+                    "ip_end BIGINT NOT NULL)"))
-                      + "ip_start BIGINT NOT NULL, "
-                      + "ip_end BIGINT NOT NULL)"))
                     .execute();
             createIndexIfAbsent("whitelisted-ranges", "idx_ip_range", "ip_start, ip_end");
 
-      var cidrs =
+            var cidrs = whitelistedIps.stream().map(ip -> {
-          whitelistedIps.stream()
-              .map(
-                  ip -> {
                 try {
                     return new CIDRUtils(ip + "/32");
                 } catch (UnknownHostException e) {
                     throw new RuntimeException("Could not format ip " + ip + " into a CIDR!", e);
                 }
-                  })
+            }).toList();
-              .toList();
+            var insertStatement = Query.prepare("INSERT INTO `whitelisted-ranges` (`cidr_string`, `ip_start`, `ip_end`) VALUES (?, ?, ?)");
-      var insertStatement =
-          Query.prepare(
-              "INSERT INTO `whitelisted-ranges` (`cidr_string`, `ip_start`, `ip_end`) VALUES (?, ?, ?)");
             for (CIDRUtils cidr : cidrs) {
-        insertStatement =
+                insertStatement = insertStatement
-            insertStatement
                         .append(cidr.toString())
                         .append(cidr.getStartIpInt())
                         .append(cidr.getEndIpInt())
@@ -88,23 +80,17 @@ public class Second extends First implements Version<VPNDatabase> {
             int[] updateCounts = insertStatement.executeBatch();
 
             for (int updateCount : updateCounts) {
-        if (updateCount == 0) {
+                if(updateCount == 0) {
-          throw new RuntimeException(
+                    throw new RuntimeException("Could not insert a CIDR from previous whitelisted lists, attempted to restore previous database!");
-              "Could not insert a CIDR from previous whitelisted lists, attempted to restore previous database!");
                 }
             }
 
             dropIndexIfPresent("whitelisted-ips", "ip_1");
             dropIndexIfPresent("whitelisted-ips", "whitelisted_ips_ip_1");
             closeOnEnd(Query.prepare("DROP TABLE `whitelisted-ips`")).execute();
-      closeOnEnd(
+            closeOnEnd(Query.prepare("INSERT INTO `database_version` (`version`) VALUES (?)").append(versionNumber())).execute();
-              Query.prepare("INSERT INTO `database_version` (`version`) VALUES (?)")
-                  .append(versionNumber()))
-          .execute();
         } catch (Throwable e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().log("Failed to update database to version 1: " + e.getMessage());
-          .getExecutor()
-          .log("Failed to update database to version 1: " + e.getMessage());
             try {
                 rollback(whitelistedIps);
             } catch (SQLException ex) {
@@ -115,6 +101,7 @@ public class Second extends First implements Version<VPNDatabase> {
             MiscUtils.close(toClose.toArray(AutoCloseable[]::new));
             toClose.clear();
         }
+
     }
 
     private ExecutableStatement closeOnEnd(ExecutableStatement statement) {
@@ -125,27 +112,25 @@ public class Second extends First implements Version<VPNDatabase> {
     private void rollback(List<String> ipAddresses) throws SQLException {
         AntiVPN.getInstance().getExecutor().log("Rolling back to version 0...");
         dropIndexIfPresent("whitelisted-ranges", "idx_ip_range");
-    try (var statement = Query.prepare("DROP TABLE `whitelisted-ranges`")) {
+        try(var statement = Query.prepare("DROP TABLE `whitelisted-ranges`")) {
             statement.execute();
         }
 
-    try (var statement =
+        try(var statement = Query.prepare("DELETE FROM `database_version` WHERE version = ?").append(versionNumber())) {
-        Query.prepare("DELETE FROM `database_version` WHERE version = ?").append(versionNumber())) {
             statement.execute();
         }
 
-    try (var statement =
+        try(var statement = Query.prepare("CREATE TABLE IF NOT EXISTS `whitelisted-ips` (`ip` VARCHAR(45) NOT NULL)")) {
-        Query.prepare("CREATE TABLE IF NOT EXISTS `whitelisted-ips` (`ip` VARCHAR(45) NOT NULL)")) {
             statement.execute();
         }
 
         createIndexIfAbsent("whitelisted-ips", "whitelisted_ips_ip_1", "`ip`");
 
-    try (var statement = Query.prepare("DELETE FROM `whitelisted-ips`")) {
+        try(var statement = Query.prepare("DELETE FROM `whitelisted-ips`")) {
             statement.execute();
         }
 
-    try (var statement = Query.prepare("INSERT INTO `whitelisted-ips` (`ip`) VALUES (?)")) {
+        try(var statement = Query.prepare("INSERT INTO `whitelisted-ips` (`ip`) VALUES (?)")) {
             for (String ip : ipAddresses) {
                 statement.append(ip);
                 statement.addBatch();
@@ -163,7 +148,7 @@ public class Second extends First implements Version<VPNDatabase> {
     @Override
     public boolean needsUpdate(VPNDatabase database) {
         try (var statement = Query.prepare("select * from `database_version` where version = 1")) {
-      try (var set = statement.executeQuery()) {
+           try(var set = statement.executeQuery()) {
                return !set.next();
            }
         } catch (SQLException e) {

Common/Source/src/main/java/dev/brighten/antivpn/database/local/version/Third.java

@@ -23,6 +23,7 @@ import dev.brighten.antivpn.database.sql.utils.Query;
 import dev.brighten.antivpn.database.version.Version;
 import dev.brighten.antivpn.utils.CIDRUtils;
 import dev.brighten.antivpn.utils.MiscUtils;
+
 import java.math.BigInteger;
 import java.net.UnknownHostException;
 import java.sql.SQLException;
@@ -37,110 +38,62 @@ public class Third implements Version<VPNDatabase> {
         List<CIDRUtils> rangesToInsert = new ArrayList<>();
         List<BigInteger[]> rangesToRemove = new ArrayList<>(); 
         try (var preparedQuery = Query.prepare("select ip_start, ip_end from `whitelisted-ranges`")) {
-      preparedQuery.execute(
+            preparedQuery.execute(set -> {
-          set -> {
                 BigInteger start = set.getBigDecimal("ip_start").toBigInteger();
                 BigInteger end = set.getBigDecimal("ip_end").toBigInteger();
 
                 try {
                     var range = MiscUtils.rangeToCidrs(start, end);
 
-              if (range.size() > 1) {
+                    if(range.size() > 1) {
-                rangesToRemove.add(new BigInteger[] {start, end});
+                        rangesToRemove.add(new BigInteger[]{start, end});
                         rangesToInsert.addAll(range);
-                AntiVPN.getInstance()
+                        AntiVPN.getInstance().getExecutor().log(Level.WARNING, "Found multiple CIDR ranges for whitelist range for %s, %s!", start, end);
-                    .getExecutor()
-                    .log(
-                        Level.WARNING,
-                        "Found multiple CIDR ranges for whitelist range for %s, %s!",
-                        start,
-                        end);
                     } else ipRanges.addAll(range);
                 } catch (UnknownHostException e) {
-              AntiVPN.getInstance()
+                    AntiVPN.getInstance().getExecutor().logException(
-                  .getExecutor()
-                  .logException(
                             String.format("Could not convert ip range to CIDR! %s, %s", start, end), e);
                 }
             });
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not get all whitelisted ranges due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not get all whitelisted ranges due to SQL error.", e);
         }
 
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().log("Inserting %s new ranges into database...", rangesToInsert.size());
-        .getExecutor()
-        .log("Inserting %s new ranges into database...", rangesToInsert.size());
 
         for (CIDRUtils cidr : rangesToInsert) {
-      try (var statement =
+            try(var statement = Query.prepare("insert into `whitelisted-ranges` (`cidr_string`, `ip_start`, `ip_end`) values (?, ?, ?)")
-          Query.prepare(
+                    .append(cidr.getCidr()).append(cidr.getStartIpInt()).append(cidr.getEndIpInt())) {
-                  "insert into `whitelisted-ranges` (`cidr_string`, `ip_start`, `ip_end`) values (?, ?, ?)")
-              .append(cidr.getCidr())
-              .append(cidr.getStartIpInt())
-              .append(cidr.getEndIpInt())) {
                 statement.execute();
             } catch (SQLException e) {
-        AntiVPN.getInstance()
+                AntiVPN.getInstance().getExecutor().logException("Could not add cidr '" + cidr + "' to whitelist due to SQL error.", e);
-            .getExecutor()
-            .logException("Could not add cidr '" + cidr + "' to whitelist due to SQL error.", e);
             }
         }
 
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().log("Removing %s old ranges from database...", rangesToRemove.size());
-        .getExecutor()
-        .log("Removing %s old ranges from database...", rangesToRemove.size());
 
         for (BigInteger[] range : rangesToRemove) {
-      try (var statement =
+            try(var statement = Query.prepare("delete from `whitelisted-ranges` where `ip_start` = ? and `ip_end` = ?")) {
-          Query.prepare("delete from `whitelisted-ranges` where `ip_start` = ? and `ip_end` = ?")) {
                 statement.append(range[0]).append(range[1]).execute();
             } catch (SQLException e) {
-        AntiVPN.getInstance()
+                AntiVPN.getInstance().getExecutor().logException("Could not remove cidr range '" + range[0] + ", " + range[1] + "' from whitelist due to SQL error.", e);
-            .getExecutor()
-            .logException(
-                "Could not remove cidr range '"
-                    + range[0]
-                    + ", "
-                    + range[1]
-                    + "' from whitelist due to SQL error.",
-                e);
             }
         }
 
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().log("Updating %s ranges to proper CIDR notation with the database", ipRanges.size());
-        .getExecutor()
-        .log("Updating %s ranges to proper CIDR notation with the database", ipRanges.size());
 
         for (CIDRUtils cidr : ipRanges) {
-      try (var statement =
+            try(var statement = Query.prepare("update `whitelisted-ranges` set `cidr_string` = ? where `ip_start` = ? and `ip_end` = ?")) {
-          Query.prepare(
+                statement.append(cidr.getCidr()).append(cidr.getStartIpInt()).append(cidr.getEndIpInt()).execute();
-              "update `whitelisted-ranges` set `cidr_string` = ? where `ip_start` = ? and `ip_end` = ?")) {
-        statement
-            .append(cidr.getCidr())
-            .append(cidr.getStartIpInt())
-            .append(cidr.getEndIpInt())
-            .execute();
             } catch (SQLException e) {
-        AntiVPN.getInstance()
+                AntiVPN.getInstance().getExecutor().logException("Could not update cidr '" + cidr + "' to proper CIDR notation in whitelist due to SQL error.", e);
-            .getExecutor()
-            .logException(
-                "Could not update cidr '"
-                    + cidr
-                    + "' to proper CIDR notation in whitelist due to SQL error.",
-                e);
             }
         }
 
-    try (var preparedStatement =
+        try (var preparedStatement = Query.prepare("INSERT INTO `database_version` (`version`) VALUES (?)").append(versionNumber())) {
-        Query.prepare("INSERT INTO `database_version` (`version`) VALUES (?)")
-            .append(versionNumber())) {
             preparedStatement.execute();
         } catch (SQLException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Could not update database version to 2 due to SQL error.", e);
-          .getExecutor()
-          .logException("Could not update database version to 2 due to SQL error.", e);
         }
     }
 
@@ -152,7 +105,7 @@ public class Third implements Version<VPNDatabase> {
     @Override
     public boolean needsUpdate(VPNDatabase database) {
         try (var statement = Query.prepare("select * from `database_version` where version = 2")) {
-      try (var set = statement.executeQuery()) {
+            try(var set = statement.executeQuery()) {
                 return !set.next();
             }
         } catch (SQLException e) {

Common/Source/src/main/java/dev/brighten/antivpn/database/mongo/MongoVPN.java

@@ -16,6 +16,8 @@
 
 package dev.brighten.antivpn.database.mongo;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import com.mongodb.*;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -28,14 +30,15 @@ import dev.brighten.antivpn.database.VPNDatabase;
 import dev.brighten.antivpn.database.version.Version;
 import dev.brighten.antivpn.utils.CIDRUtils;
 import dev.brighten.antivpn.web.objects.VPNResponse;
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.bson.types.Decimal128;
+
 import java.math.BigDecimal;
 import java.net.UnknownHostException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import org.bson.Document;
-import org.bson.conversions.Bson;
-import org.bson.types.Decimal128;
 
 public class MongoVPN implements VPNDatabase {
 
@@ -45,48 +48,33 @@ public class MongoVPN implements VPNDatabase {
     public MongoDatabase antivpnDatabase;
 
     public MongoVPN() {
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().getThreadExecutor().scheduleAtFixedRate(() -> {
-        .getExecutor()
+            if(!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) return;
-        .getThreadExecutor()
-        .scheduleAtFixedRate(
-            () -> {
-              if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) return;
 
-              // Refreshing whitelisted players
+            //Refreshing whitelisted players
             AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
-              AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().getWhitelisted()
-                  .getExecutor()
-                  .getWhitelisted()
                     .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
 
-              // Refreshing whitlisted IPs
+            //Refreshing whitlisted IPs
             AntiVPN.getInstance().getExecutor().getWhitelistedIps().clear();
-              AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps()
-                  .getExecutor()
-                  .getWhitelistedIps()
                     .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelistedIps());
-            },
+        }, 2, 30, TimeUnit.SECONDS);
-            2,
-            30,
-            TimeUnit.SECONDS);
     }
-
     @Override
     public Optional<VPNResponse> getStoredResponse(String ip) {
         Document rdoc = cacheDocument.find(Filters.eq("ip", ip)).first();
 
-    if (rdoc != null) {
+        if(rdoc != null) {
             long lastUpdate = rdoc.get("lastAccess", 0L);
 
-      if (System.currentTimeMillis() - lastUpdate > TimeUnit.HOURS.toMillis(1)) {
+            if(System.currentTimeMillis() - lastUpdate > TimeUnit.HOURS.toMillis(1)) {
                 AntiVPN.getInstance().getExecutor().getThreadExecutor().execute(() -> deleteResponse(ip));
                 return null;
             }
 
-      return Optional.of(
+            return Optional.of(VPNResponse.builder().asn(rdoc.getString("asn")).ip(ip)
-          VPNResponse.builder()
-              .asn(rdoc.getString("asn"))
-              .ip(ip)
                     .countryName(rdoc.getString("countryName"))
                     .countryCode(rdoc.getString("countryCode"))
                     .city(rdoc.getString("city"))
@@ -106,7 +94,7 @@ public class MongoVPN implements VPNDatabase {
 
     @Override
     public void cacheResponse(VPNResponse toCache) {
-    if (AntiVPN.getInstance().getVpnConfig().cachedResults()) {
+        if(AntiVPN.getInstance().getVpnConfig().cachedResults()) {
             Document rdoc = new Document("ip", toCache.getIp());
 
             rdoc.put("asn", toCache.getAsn());
@@ -123,14 +111,10 @@ public class MongoVPN implements VPNDatabase {
             rdoc.put("longitude", toCache.getLongitude());
             rdoc.put("lastAccess", System.currentTimeMillis());
 
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().getThreadExecutor().execute(() -> {
-          .getExecutor()
-          .getThreadExecutor()
-          .execute(
-              () -> {
                 Bson update = new Document("$set", rdoc);
-                cacheDocument.updateOne(
+                cacheDocument.updateOne(Filters.eq("ip", toCache.getIp()), update,
-                    Filters.eq("ip", toCache.getIp()), update, new UpdateOptions().upsert(true));
+                        new UpdateOptions().upsert(true));
             });
         }
     }
@@ -143,11 +127,8 @@ public class MongoVPN implements VPNDatabase {
     @Override
     public boolean isWhitelisted(UUID uuid) {
         return settingsDocument
-            .find(
+                .find(Filters.and(Filters.eq("setting", "whitelist"),
-                Filters.and(
+                        Filters.eq("uuid", uuid.toString()))).first() != null;
-                    Filters.eq("setting", "whitelist"), Filters.eq("uuid", uuid.toString())))
-            .first()
-        != null;
     }
 
     @Override
@@ -164,14 +145,8 @@ public class MongoVPN implements VPNDatabase {
     public boolean isWhitelisted(CIDRUtils cidr) {
         var start =  new Decimal128(new BigDecimal(cidr.getStartIpInt()));
         var end = new Decimal128(new BigDecimal(cidr.getEndIpInt()));
-    return settingsDocument
+        return settingsDocument.find(Filters.and(Filters.eq("setting", "whitelist"),
-            .find(
+                Filters.lte("ip_start", start), Filters.gte("ip_end", end))).first() != null;
-                Filters.and(
-                    Filters.eq("setting", "whitelist"),
-                    Filters.lte("ip_start", start),
-                    Filters.gte("ip_end", end)))
-            .first()
-        != null;
     }
 
     @Override
@@ -185,8 +160,10 @@ public class MongoVPN implements VPNDatabase {
     @Override
     public void removeWhitelist(UUID uuid) {
         AntiVPN.getInstance().getExecutor().getWhitelisted().remove(uuid);
-    settingsDocument.deleteMany(
+        settingsDocument.deleteMany(Filters
-        Filters.and(Filters.eq("setting", "whitelist"), Filters.eq("uuid", uuid.toString())));
+                .and(
+                        Filters.eq("setting", "whitelist"),
+                        Filters.eq("uuid", uuid.toString())));
     }
 
     @Override
@@ -201,8 +178,8 @@ public class MongoVPN implements VPNDatabase {
 
     @Override
     public void removeWhitelist(CIDRUtils cidr) {
-    settingsDocument.deleteMany(
+        settingsDocument.deleteMany(Filters
-        Filters.and(
+                .and(
                         Filters.eq("setting", "whitelist"),
                         Filters.eq("ip_start", new Decimal128(new BigDecimal(cidr.getStartIpInt()))),
                         Filters.eq("ip_end", new Decimal128(new BigDecimal(cidr.getEndIpInt())))));
@@ -211,30 +188,22 @@ public class MongoVPN implements VPNDatabase {
     @Override
     public List<UUID> getAllWhitelisted() {
         List<UUID> uuids = new ArrayList<>();
-    settingsDocument
+        settingsDocument.find(Filters.and(Filters.eq("setting", "whitelist"),
-        .find(Filters.and(Filters.eq("setting", "whitelist"), Filters.exists("uuid")))
+                Filters.exists("uuid")))
-        .forEach(
+                .forEach((Consumer<? super Document>) doc -> uuids.add(UUID.fromString(doc.getString("uuid"))));
-            (Consumer<? super Document>) doc -> uuids.add(UUID.fromString(doc.getString("uuid"))));
         return uuids;
     }
 
     @Override
     public List<CIDRUtils> getAllWhitelistedIps() {
         List<CIDRUtils> ips = new ArrayList<>();
-    settingsDocument
+        settingsDocument.find(Filters.and(Filters.eq("setting", "whitelist"),
-        .find(Filters.and(Filters.eq("setting", "whitelist"), Filters.exists("cidr_string")))
+                        Filters.exists("cidr_string"))).forEach((Consumer<? super Document>) doc -> {
-        .forEach(
-            (Consumer<? super Document>)
-                doc -> {
                     try {
                         var cidr = new CIDRUtils(doc.getString("cidr_string"));
                         ips.add(cidr);
                     } catch (UnknownHostException e) {
-                    AntiVPN.getInstance()
+                        AntiVPN.getInstance().getExecutor().logException("Could not format ip " + doc.getString("cidr_string") + " into a CIDR!", e);
-                        .getExecutor()
-                        .logException(
-                            "Could not format ip " + doc.getString("cidr_string") + " into a CIDR!",
-                            e);
                     }
                 });
         return ips;
@@ -242,32 +211,17 @@ public class MongoVPN implements VPNDatabase {
 
     @Override
     public void alertsState(UUID uuid, Consumer<Boolean> result) {
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().getThreadExecutor().execute(() -> result.accept(settingsDocument
-        .getExecutor()
+                .find(Filters.and(Filters.eq("setting", "alerts"),
-        .getThreadExecutor()
+                Filters.eq("uuid", uuid.toString()))).first() != null));
-        .execute(
-            () ->
-                result.accept(
-                    settingsDocument
-                            .find(
-                                Filters.and(
-                                    Filters.eq("setting", "alerts"),
-                                    Filters.eq("uuid", uuid.toString())))
-                            .first()
-                        != null));
     }
 
     @Override
     public void updateAlertsState(UUID uuid, boolean state) {
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().getThreadExecutor().execute(() -> {
-        .getExecutor()
+            settingsDocument.deleteMany(Filters.and(Filters.eq("setting", "alerts"),
-        .getThreadExecutor()
+                    Filters.eq("uuid", uuid.toString())));
-        .execute(
+            if(state) {
-            () -> {
-              settingsDocument.deleteMany(
-                  Filters.and(
-                      Filters.eq("setting", "alerts"), Filters.eq("uuid", uuid.toString())));
-              if (state) {
                 Document adoc = new Document("setting", "alerts");
 
                 adoc.put("uuid", uuid.toString());
@@ -283,27 +237,21 @@ public class MongoVPN implements VPNDatabase {
 
     @Override
     public void init() {
-    if (!AntiVPN.getInstance().getVpnConfig().mongoDatabaseURL().isEmpty()) { // URL
+        if(!AntiVPN.getInstance().getVpnConfig().mongoDatabaseURL().isEmpty()) { //URL
-      ConnectionString cs =
+            ConnectionString cs = new ConnectionString(AntiVPN.getInstance().getVpnConfig().mongoDatabaseURL());
-          new ConnectionString(AntiVPN.getInstance().getVpnConfig().mongoDatabaseURL());
+            MongoClientSettings settings = MongoClientSettings.builder().applyConnectionString(cs).build();
-      MongoClientSettings settings =
-          MongoClientSettings.builder().applyConnectionString(cs).build();
             client = MongoClients.create(settings);
         } else {
-      MongoClientSettings.Builder settingsBld =
+            MongoClientSettings.Builder settingsBld = MongoClientSettings.builder().readPreference(ReadPreference.nearest())
-          MongoClientSettings.builder()
+                    .applyToClusterSettings(builder -> builder.
-              .readPreference(ReadPreference.nearest())
+                            hosts(Collections.singletonList(
-              .applyToClusterSettings(
-                  builder ->
-                      builder.hosts(
-                          Collections.singletonList(
                                     new ServerAddress(
                                             AntiVPN.getInstance().getVpnConfig().getIp(),
-                                  AntiVPN.getInstance().getVpnConfig().getPort()))));
+                                            AntiVPN.getInstance().getVpnConfig().getPort())
-      if (AntiVPN.getInstance().getVpnConfig().useDatabaseCreds()) {
+                            )));
-        settingsBld.credential(
+            if(AntiVPN.getInstance().getVpnConfig().useDatabaseCreds()) {
-            MongoCredential.createCredential(
+                settingsBld.credential(MongoCredential
-                AntiVPN.getInstance().getVpnConfig().getUsername(),
+                        .createCredential(AntiVPN.getInstance().getVpnConfig().getUsername(),
                                 AntiVPN.getInstance().getVpnConfig().getDatabaseName(),
                                 AntiVPN.getInstance().getVpnConfig().getPassword().toCharArray()));
             }
@@ -317,7 +265,7 @@ public class MongoVPN implements VPNDatabase {
         cacheDocument = antivpnDatabase.getCollection("cache");
 
         for (Version<MongoVPN> mongoDbVersion : Version.mongoDbVersions) {
-      if (mongoDbVersion.needsUpdate(this)) {
+            if(mongoDbVersion.needsUpdate(this)) {
                 mongoDbVersion.update(this);
             }
         }

Common/Source/src/main/java/dev/brighten/antivpn/database/mongo/version/MongoFirst.java

@@ -28,7 +28,7 @@ public class MongoFirst implements Version<MongoVPN> {
 
     @Override
     public void update(MongoVPN database) throws DatabaseException {
-    if (database.settingsDocument.listIndexes().first() == null) {
+        if(database.settingsDocument.listIndexes().first() == null) {
             AntiVPN.getInstance().getExecutor().log("Created index for settings collection!");
             database.settingsDocument.createIndex(Indexes.ascending("ip"));
             database.settingsDocument.createIndex(Indexes.ascending("setting"));

Common/Source/src/main/java/dev/brighten/antivpn/database/mongo/version/MongoSecond.java

@@ -23,24 +23,22 @@ import dev.brighten.antivpn.database.DatabaseException;
 import dev.brighten.antivpn.database.mongo.MongoVPN;
 import dev.brighten.antivpn.database.version.Version;
 import dev.brighten.antivpn.utils.CIDRUtils;
+import org.bson.Document;
+import org.bson.types.Decimal128;
+
 import java.math.BigDecimal;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
-import org.bson.Document;
-import org.bson.types.Decimal128;
 
 public class MongoSecond implements Version<MongoVPN> {
     @Override
     public void update(MongoVPN database) throws DatabaseException {
         List<Document> backup = new ArrayList<>();
-    database
+        database.settingsDocument.find(Filters.and(Filters.eq("setting", "whitelist"),
-        .settingsDocument
+                        Filters.exists("ip")))
-        .find(Filters.and(Filters.eq("setting", "whitelist"), Filters.exists("ip")))
+                .forEach((Consumer<? super Document>) doc -> {
-        .forEach(
-            (Consumer<? super Document>)
-                doc -> {
                     backup.add(new Document(doc));
 
                     String ip = doc.getString("ip");
@@ -53,16 +51,14 @@ public class MongoSecond implements Version<MongoVPN> {
                         doc.append("cidr_string", cidr.toString());
                         doc.remove("ip");
 
-                    database.settingsDocument.replaceOne(
+                        database.settingsDocument.replaceOne(Filters.eq("_id", doc.getObjectId("_id")), doc);
-                        Filters.eq("_id", doc.getObjectId("_id")), doc);
                     } catch (UnknownHostException e) {
                         rollback(backup, database);
                         throw new RuntimeException(e);
                     }
                 });
 
-    database.settingsDocument.createIndex(
+        database.settingsDocument.createIndex(Indexes.compoundIndex(Indexes.ascending("ip_start"), Indexes.ascending("ip_end")));
-        Indexes.compoundIndex(Indexes.ascending("ip_start"), Indexes.ascending("ip_end")));
         database.settingsDocument.createIndex(Indexes.ascending("cidr_string"));
         var versionCollect = database.antivpnDatabase.getCollection("version");
         versionCollect.insertOne(new Document("version", versionNumber()));
@@ -70,9 +66,7 @@ public class MongoSecond implements Version<MongoVPN> {
 
     private void rollback(List<Document> toRollback, MongoVPN database) {
         AntiVPN.getInstance().getExecutor().log("Rolling back to version 0...");
-    toRollback.forEach(
+        toRollback.forEach(doc -> database.settingsDocument.replaceOne(Filters.eq("_id", doc.getObjectId("_id")), doc));
-        doc ->
-            database.settingsDocument.replaceOne(Filters.eq("_id", doc.getObjectId("_id")), doc));
         toRollback.clear();
     }
 

Common/Source/src/main/java/dev/brighten/antivpn/database/mongo/version/MongoThird.java

@@ -23,6 +23,9 @@ import dev.brighten.antivpn.database.mongo.MongoVPN;
 import dev.brighten.antivpn.database.version.Version;
 import dev.brighten.antivpn.utils.CIDRUtils;
 import dev.brighten.antivpn.utils.MiscUtils;
+import org.bson.Document;
+import org.bson.types.Decimal128;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.UnknownHostException;
@@ -30,8 +33,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.logging.Level;
-import org.bson.Document;
-import org.bson.types.Decimal128;
 
 public class MongoThird  implements Version<MongoVPN> {
     @Override
@@ -39,81 +40,51 @@ public class MongoThird implements Version<MongoVPN> {
         List<CIDRUtils> ipRanges = new ArrayList<>();
         List<CIDRUtils> rangesToInsert = new ArrayList<>();
         List<BigInteger[]> rangesToRemove = new ArrayList<>();
-    database
+        database.settingsDocument.find(Filters.and(Filters.eq("setting", "whitelist"), Filters.exists("cidr_string")))
-        .settingsDocument
+                .forEach((Consumer<? super Document>) doc -> {
-        .find(Filters.and(Filters.eq("setting", "whitelist"), Filters.exists("cidr_string")))
+                    BigInteger start = doc.get("ip_start", Decimal128.class).bigDecimalValue().toBigInteger();
-        .forEach(
+                    BigInteger end = doc.get("ip_end", Decimal128.class).bigDecimalValue().toBigInteger();
-            (Consumer<? super Document>)
-                doc -> {
-                  BigInteger start =
-                      doc.get("ip_start", Decimal128.class).bigDecimalValue().toBigInteger();
-                  BigInteger end =
-                      doc.get("ip_end", Decimal128.class).bigDecimalValue().toBigInteger();
 
                     try {
                         var range = MiscUtils.rangeToCidrs(start, end);
 
-                    if (range.size() > 1) {
+                        if(range.size() > 1) {
-                      rangesToRemove.add(new BigInteger[] {start, end});
+                            rangesToRemove.add(new BigInteger[]{start, end});
                             rangesToInsert.addAll(range);
-                      AntiVPN.getInstance()
+                            AntiVPN.getInstance().getExecutor().log(Level.WARNING, "Found multiple CIDR ranges for whitelist range for %s, %s!", start, end);
-                          .getExecutor()
-                          .log(
-                              Level.WARNING,
-                              "Found multiple CIDR ranges for whitelist range for %s, %s!",
-                              start,
-                              end);
                         } else ipRanges.addAll(range);
                     } catch (UnknownHostException e) {
-                    AntiVPN.getInstance()
+                        AntiVPN.getInstance().getExecutor().logException(
-                        .getExecutor()
+                                String.format("Could not convert ip range to CIDR! %s, %s", start, end), e);
-                        .logException(
-                            String.format("Could not convert ip range to CIDR! %s, %s", start, end),
-                            e);
                     }
                 });
 
-    if (!rangesToInsert.isEmpty()) {
+        if(!rangesToInsert.isEmpty()) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().log("Inserting %s new ranges into database...", rangesToInsert.size());
-          .getExecutor()
+            var documentsToInsert = rangesToInsert.stream().map(cidr -> {
-          .log("Inserting %s new ranges into database...", rangesToInsert.size());
-      var documentsToInsert =
-          rangesToInsert.stream()
-              .map(
-                  cidr -> {
                 Document doc = new Document("setting", "whitelist");
                 doc.append("ip_start", new Decimal128(new BigDecimal(cidr.getStartIpInt())));
                 doc.append("ip_end", new Decimal128(new BigDecimal(cidr.getEndIpInt())));
                 doc.append("cidr_string", cidr.getCidr());
 
                 return doc;
-                  })
+            }).toList();
-              .toList();
 
             database.settingsDocument.insertMany(documentsToInsert);
         }
-    if (!rangesToRemove.isEmpty()) {
+        if(!rangesToRemove.isEmpty()) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().log("Removing %s old ranges from database...", rangesToRemove.size());
-          .getExecutor()
+            rangesToRemove.forEach(range -> database.settingsDocument
-          .log("Removing %s old ranges from database...", rangesToRemove.size());
+                    .deleteMany(Filters.and(
-      rangesToRemove.forEach(
-          range ->
-              database.settingsDocument.deleteMany(
-                  Filters.and(
                             Filters.gte("ip_start", new Decimal128(new BigDecimal(range[0]))),
                             Filters.lte("ip_end", new Decimal128(new BigDecimal(range[1]))))));
         }
 
-    if (!ipRanges.isEmpty()) {
+        if(!ipRanges.isEmpty()) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().log("Updating %s CIDRs in database with proper notation...", ipRanges.size());
-          .getExecutor()
-          .log("Updating %s CIDRs in database with proper notation...", ipRanges.size());
 
-      ipRanges.forEach(
+            ipRanges.forEach(cidr -> database.settingsDocument
-          cidr ->
+                    .updateMany(Filters.and(Filters.eq("setting", "whitelist"),
-              database.settingsDocument.updateMany(
-                  Filters.and(
-                      Filters.eq("setting", "whitelist"),
                                     Filters.eq("ip_start", new Decimal128(new BigDecimal(cidr.getStartIpInt()))),
                                     Filters.eq("ip_end", new Decimal128(new BigDecimal(cidr.getEndIpInt())))),
                             new Document("$set", new Document("cidr_string", cidr.getCidr()))));

Common/Source/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java

@@ -20,50 +20,40 @@ import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.database.local.H2VPN;
 import dev.brighten.antivpn.database.sql.utils.MySQL;
 import dev.brighten.antivpn.database.version.Version;
+
 import java.util.concurrent.TimeUnit;
 
 public class MySqlVPN extends H2VPN {
 
     public MySqlVPN() {
-    AntiVPN.getInstance()
+        AntiVPN.getInstance().getExecutor().getThreadExecutor().scheduleAtFixedRate(() -> {
-        .getExecutor()
+            if(!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed()) return;
-        .getThreadExecutor()
-        .scheduleAtFixedRate(
-            () -> {
-              if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
-                return;
 
-              // Refreshing whitelisted players
+            //Refreshing whitelisted players
             AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
-              AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().getWhitelisted()
-                  .getExecutor()
-                  .getWhitelisted()
                     .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
 
-              // Refreshing whitlisted IPs
+            //Refreshing whitlisted IPs
             AntiVPN.getInstance().getExecutor().getWhitelistedIps().clear();
-              AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().getWhitelistedIps()
-                  .getExecutor()
-                  .getWhitelistedIps()
                     .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelistedIps());
-            },
+        }, 2, 30, TimeUnit.SECONDS);
-            2,
-            30,
-            TimeUnit.SECONDS);
     }
 
     @Override
     public void init() {
-    if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) return;
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled())
+            return;
         AntiVPN.getInstance().getExecutor().log("Initializing MySQL...");
         MySQL.init();
 
         AntiVPN.getInstance().getExecutor().log("Checking for updates...");
 
-    // Running check for old table types to update
+        //Running check for old table types to update
         try {
             for (Version<MySqlVPN> version : Version.mysqlVersions) {
-        if (version.needsUpdate(this)) {
+                if(version.needsUpdate(this)) {
                     version.update(this);
                 }
             }

Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/ExecutableStatement.java

@@ -16,13 +16,15 @@
 
 package dev.brighten.antivpn.database.sql.utils;
 
-import java.sql.*;
-import java.util.UUID;
 import lombok.Getter;
 import lombok.SneakyThrows;
 
+import java.sql.*;
+import java.util.UUID;
+
 public class ExecutableStatement implements AutoCloseable {
-  @Getter private final PreparedStatement statement;
+    @Getter
+    private final PreparedStatement statement;
     private int pos = 1;
 
     public ExecutableStatement(PreparedStatement statement) {
@@ -34,7 +36,7 @@ public class ExecutableStatement implements AutoCloseable {
     }
 
     public void execute(ResultSetIterator iterator) throws SQLException {
-    try (var rs = statement.executeQuery()) {
+        try(var rs = statement.executeQuery()) {
             while (rs.next()) iterator.next(rs);
         }
     }

Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java

@@ -18,6 +18,9 @@ package dev.brighten.antivpn.database.sql.utils;
 
 import com.mysql.cj.jdbc.Driver;
 import dev.brighten.antivpn.AntiVPN;
+import org.h2.jdbc.JdbcSQLFeatureNotSupportedException;
+import org.h2.jdbc.JdbcSQLNonTransientConnectionException;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -26,8 +29,6 @@ import java.sql.SQLException;
 import java.sql.SQLSyntaxErrorException;
 import java.util.Properties;
 import java.util.logging.Level;
-import org.h2.jdbc.JdbcSQLFeatureNotSupportedException;
-import org.h2.jdbc.JdbcSQLNonTransientConnectionException;
 
 public class MySQL {
     private static Connection conn;
@@ -35,11 +36,8 @@ public class MySQL {
     public static void init() {
         try {
             if (conn == null || conn.isClosed()) {
-        String url =
+                String url = "jdbc:mysql://" + AntiVPN.getInstance().getVpnConfig().getIp()
-            "jdbc:mysql://"
+                        + ":" + AntiVPN.getInstance().getVpnConfig().getPort()
-                + AntiVPN.getInstance().getVpnConfig().getIp()
-                + ":"
-                + AntiVPN.getInstance().getVpnConfig().getPort()
                         + "/?useSSL=true&autoReconnect=true";
                 Properties properties = new Properties();
                 properties.setProperty("user", AntiVPN.getInstance().getVpnConfig().getUsername());
@@ -60,11 +58,8 @@ public class MySQL {
                         throw ex;
                     }
 
-          AntiVPN.getInstance()
+                    AntiVPN.getInstance().getExecutor().log(
-              .getExecutor()
+                            "No permission to create MySQL database `" + databaseName
-              .log(
-                  "No permission to create MySQL database `"
-                      + databaseName
                                     + "`. Attempting to use the existing database instead.");
                 }
 
@@ -72,9 +67,7 @@ public class MySQL {
                 AntiVPN.getInstance().getExecutor().log("Connection to MySQL has been established.");
             }
         } catch (Exception e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Failed to load mysql: " + e.getMessage(), e);
-          .getExecutor()
-          .logException("Failed to load mysql: " + e.getMessage(), e);
             throw new RuntimeException("Could not initialize MySQL connection", e);
         }
     }
@@ -99,46 +92,33 @@ public class MySQL {
 
         File databaseFile = new File(dataFolder, "database");
         try {
-      conn =
+            conn = new NonClosableConnection(new org.h2.jdbc.JdbcConnection("jdbc:h2:file:" +
-          new NonClosableConnection(
+                    databaseFile.getAbsolutePath(),
-              new org.h2.jdbc.JdbcConnection(
+                    new Properties(), AntiVPN.getInstance().getVpnConfig().getUsername(),
-                  "jdbc:h2:file:" + databaseFile.getAbsolutePath(),
+                    AntiVPN.getInstance().getVpnConfig().getPassword(), false));
-                  new Properties(),
-                  AntiVPN.getInstance().getVpnConfig().getUsername(),
-                  AntiVPN.getInstance().getVpnConfig().getPassword(),
-                  false));
             conn.setAutoCommit(true);
             Query.use(conn);
             AntiVPN.getInstance().getExecutor().log("Connection to H2 has been established.");
         } catch (SQLException ex) {
             AntiVPN.getInstance().getExecutor().logException("H2 exception on initialize", ex);
-      if (ex instanceof JdbcSQLFeatureNotSupportedException
+            if(ex instanceof JdbcSQLFeatureNotSupportedException
                     || ex instanceof JdbcSQLNonTransientConnectionException) {
-        AntiVPN.getInstance()
+                AntiVPN.getInstance().getExecutor()
-            .getExecutor()
+                        .log("H2 database file is incompatible with this version of AntiVPN. " +
-            .log(
+                                "Backing up old database file...");
-                "H2 database file is incompatible with this version of AntiVPN. "
-                    + "Backing up old database file...");
                 shutdown();
                 if (allowRetry && backupOldDB(dbFile, dataFolder)) {
                     initH2(false);
                 } else {
-          AntiVPN.getInstance()
+                    AntiVPN.getInstance().getExecutor().log(
-              .getExecutor()
+                            "Could not back up and remove the incompatible H2 database file automatically.");
-              .log("Could not back up and remove the incompatible H2 database file automatically.");
                 }
             } else {
-        AntiVPN.getInstance()
+                AntiVPN.getInstance().getExecutor().logException("Failed to load H2 database: " + ex.getCause().toString(), ex);
-            .getExecutor()
-            .logException("Failed to load H2 database: " + ex.getCause().toString(), ex);
             }
         } catch (Exception e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Failed to load H2 database: " + e.getMessage(), e);
-          .getExecutor()
+            AntiVPN.getInstance().getExecutor().log(Level.INFO, "TIP: Try deleting the plugin folder and restarting your server!");
-          .logException("Failed to load H2 database: " + e.getMessage(), e);
-      AntiVPN.getInstance()
-          .getExecutor()
-          .log(Level.INFO, "TIP: Try deleting the plugin folder and restarting your server!");
         }
     }
 
@@ -148,15 +128,13 @@ public class MySQL {
         }
 
         if (!dbFile.isFile()) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().log("Skipping backup for non-file path: " + dbFile.getAbsolutePath());
-          .getExecutor()
-          .log("Skipping backup for non-file path: " + dbFile.getAbsolutePath());
             return false;
         }
 
         try {
             File backupDir = new File(dataFolder, "backups");
-      if (backupDir.mkdirs()) {
+            if(backupDir.mkdirs()) {
                 AntiVPN.getInstance().getExecutor().log("Created backup directory");
             } else if (backupDir.exists()) {
                 AntiVPN.getInstance().getExecutor().log("Backup directory already exists");
@@ -164,15 +142,12 @@ public class MySQL {
                 AntiVPN.getInstance().getExecutor().log("Could not create backup directory");
                 return false;
             }
-      File backupFile =
+            File backupFile = new File(backupDir, dbFile.getName() + ".backup_" + System.currentTimeMillis());
-          new File(backupDir, dbFile.getName() + ".backup_" + System.currentTimeMillis());
             Files.copy(dbFile.toPath(), backupFile.toPath());
 
             if (!dbFile.delete()) {
                 dbFile.deleteOnExit();
-        AntiVPN.getInstance()
+                AntiVPN.getInstance().getExecutor().log("Could not delete database file - will try again on shutdown");
-            .getExecutor()
-            .log("Could not delete database file - will try again on shutdown");
                 return false;
             }
 
@@ -195,9 +170,9 @@ public class MySQL {
 
     public static void shutdown() {
         try {
-      if (conn != null && !conn.isClosed()) {
+            if(conn != null && !conn.isClosed()) {
-        if (conn instanceof NonClosableConnection) {
+                if(conn instanceof NonClosableConnection) {
-          ((NonClosableConnection) conn).shutdown();
+                    ((NonClosableConnection)conn).shutdown();
                 } else conn.close();
                 conn = null;
             }
@@ -207,7 +182,8 @@ public class MySQL {
     }
 
     public static boolean isClosed() {
-    if (conn == null) return true;
+        if(conn == null)
+            return true;
 
         try {
             return conn.isClosed();

Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/NonClosableConnection.java

@@ -31,7 +31,9 @@ public class NonClosableConnection implements Connection {
         this.delegate = delegate;
     }
 
-  /** Actually {@link #close() closes} the underlying connection. */
+    /**
+     * Actually {@link #close() closes} the underlying connection.
+     */
     public final void shutdown() throws SQLException {
         this.delegate.close();
     }
@@ -56,268 +58,56 @@ public class NonClosableConnection implements Connection {
     }
 
     // Forward to the delegate connection
-  @Override
+    @Override public Statement createStatement() throws SQLException { return this.delegate.createStatement(); }
-  public Statement createStatement() throws SQLException {
+    @Override public PreparedStatement prepareStatement(String sql) throws SQLException { return this.delegate.prepareStatement(sql); }
-    return this.delegate.createStatement();
+    @Override public CallableStatement prepareCall(String sql) throws SQLException { return this.delegate.prepareCall(sql); }
-  }
+    @Override public String nativeSQL(String sql) throws SQLException { return this.delegate.nativeSQL(sql); }
+    @Override public void setAutoCommit(boolean autoCommit) throws SQLException { this.delegate.setAutoCommit(autoCommit); }
+    @Override public boolean getAutoCommit() throws SQLException { return this.delegate.getAutoCommit(); }
+    @Override public void commit() throws SQLException { this.delegate.commit(); }
+    @Override public void rollback() throws SQLException { this.delegate.rollback(); }
+    @Override public boolean isClosed() throws SQLException { return this.delegate.isClosed(); }
+    @Override public DatabaseMetaData getMetaData() throws SQLException { return this.delegate.getMetaData(); }
+    @Override public void setReadOnly(boolean readOnly) throws SQLException { this.delegate.setReadOnly(readOnly); }
+    @Override public boolean isReadOnly() throws SQLException { return this.delegate.isReadOnly(); }
+    @Override public void setCatalog(String catalog) throws SQLException { this.delegate.setCatalog(catalog); }
+    @Override public String getCatalog() throws SQLException { return this.delegate.getCatalog(); }
+    @Override public void setTransactionIsolation(int level) throws SQLException { this.delegate.setTransactionIsolation(level); }
+    @Override public int getTransactionIsolation() throws SQLException { return this.delegate.getTransactionIsolation(); }
+    @Override public SQLWarning getWarnings() throws SQLException { return this.delegate.getWarnings(); }
+    @Override public void clearWarnings() throws SQLException { this.delegate.clearWarnings(); }
+    @Override public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException { return this.delegate.createStatement(resultSetType, resultSetConcurrency); }
+    @Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException { return this.delegate.prepareStatement(sql, resultSetType, resultSetConcurrency); }
+    @Override public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException { return this.delegate.prepareCall(sql, resultSetType, resultSetConcurrency); }
+    @Override public Map<String, Class<?>> getTypeMap() throws SQLException { return this.delegate.getTypeMap(); }
+    @Override public void setTypeMap(Map<String, Class<?>> map) throws SQLException { this.delegate.setTypeMap(map); }
+    @Override public void setHoldability(int holdability) throws SQLException { this.delegate.setHoldability(holdability); }
+    @Override public int getHoldability() throws SQLException { return this.delegate.getHoldability(); }
+    @Override public Savepoint setSavepoint() throws SQLException { return this.delegate.setSavepoint(); }
+    @Override public Savepoint setSavepoint(String name) throws SQLException { return this.delegate.setSavepoint(name); }
+    @Override public void rollback(Savepoint savepoint) throws SQLException { this.delegate.rollback(savepoint); }
+    @Override public void releaseSavepoint(Savepoint savepoint) throws SQLException { this.delegate.releaseSavepoint(savepoint); }
+    @Override public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { return this.delegate.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability); }
+    @Override public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { return this.delegate.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability); }
+    @Override public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { return this.delegate.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability); }
+    @Override public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException { return this.delegate.prepareStatement(sql, autoGeneratedKeys); }
+    @Override public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException { return this.delegate.prepareStatement(sql, columnIndexes); }
+    @Override public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException { return this.delegate.prepareStatement(sql, columnNames); }
+    @Override public Clob createClob() throws SQLException { return this.delegate.createClob(); }
+    @Override public Blob createBlob() throws SQLException { return this.delegate.createBlob(); }
+    @Override public NClob createNClob() throws SQLException { return this.delegate.createNClob(); }
+    @Override public SQLXML createSQLXML() throws SQLException { return this.delegate.createSQLXML(); }
+    @Override public boolean isValid(int timeout) throws SQLException { return this.delegate.isValid(timeout); }
+    @Override public void setClientInfo(String name, String value) throws SQLClientInfoException { this.delegate.setClientInfo(name, value); }
+    @Override public void setClientInfo(Properties properties) throws SQLClientInfoException { this.delegate.setClientInfo(properties); }
+    @Override public String getClientInfo(String name) throws SQLException { return this.delegate.getClientInfo(name); }
+    @Override public Properties getClientInfo() throws SQLException { return this.delegate.getClientInfo(); }
+    @Override public Array createArrayOf(String typeName, Object[] elements) throws SQLException { return this.delegate.createArrayOf(typeName, elements); }
+    @Override public Struct createStruct(String typeName, Object[] attributes) throws SQLException { return this.delegate.createStruct(typeName, attributes); }
+    @Override public void setSchema(String schema) throws SQLException { this.delegate.setSchema(schema); }
+    @Override public String getSchema() throws SQLException { return this.delegate.getSchema(); }
+    @Override public void abort(Executor executor) throws SQLException { this.delegate.abort(executor); }
+    @Override public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { this.delegate.setNetworkTimeout(executor, milliseconds); }
+    @Override public int getNetworkTimeout() throws SQLException { return this.delegate.getNetworkTimeout(); }
 
-  @Override
-  public PreparedStatement prepareStatement(String sql) throws SQLException {
-    return this.delegate.prepareStatement(sql);
-  }
-
-  @Override
-  public CallableStatement prepareCall(String sql) throws SQLException {
-    return this.delegate.prepareCall(sql);
-  }
-
-  @Override
-  public String nativeSQL(String sql) throws SQLException {
-    return this.delegate.nativeSQL(sql);
-  }
-
-  @Override
-  public void setAutoCommit(boolean autoCommit) throws SQLException {
-    this.delegate.setAutoCommit(autoCommit);
-  }
-
-  @Override
-  public boolean getAutoCommit() throws SQLException {
-    return this.delegate.getAutoCommit();
-  }
-
-  @Override
-  public void commit() throws SQLException {
-    this.delegate.commit();
-  }
-
-  @Override
-  public void rollback() throws SQLException {
-    this.delegate.rollback();
-  }
-
-  @Override
-  public boolean isClosed() throws SQLException {
-    return this.delegate.isClosed();
-  }
-
-  @Override
-  public DatabaseMetaData getMetaData() throws SQLException {
-    return this.delegate.getMetaData();
-  }
-
-  @Override
-  public void setReadOnly(boolean readOnly) throws SQLException {
-    this.delegate.setReadOnly(readOnly);
-  }
-
-  @Override
-  public boolean isReadOnly() throws SQLException {
-    return this.delegate.isReadOnly();
-  }
-
-  @Override
-  public void setCatalog(String catalog) throws SQLException {
-    this.delegate.setCatalog(catalog);
-  }
-
-  @Override
-  public String getCatalog() throws SQLException {
-    return this.delegate.getCatalog();
-  }
-
-  @Override
-  public void setTransactionIsolation(int level) throws SQLException {
-    this.delegate.setTransactionIsolation(level);
-  }
-
-  @Override
-  public int getTransactionIsolation() throws SQLException {
-    return this.delegate.getTransactionIsolation();
-  }
-
-  @Override
-  public SQLWarning getWarnings() throws SQLException {
-    return this.delegate.getWarnings();
-  }
-
-  @Override
-  public void clearWarnings() throws SQLException {
-    this.delegate.clearWarnings();
-  }
-
-  @Override
-  public Statement createStatement(int resultSetType, int resultSetConcurrency)
-      throws SQLException {
-    return this.delegate.createStatement(resultSetType, resultSetConcurrency);
-  }
-
-  @Override
-  public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
-      throws SQLException {
-    return this.delegate.prepareStatement(sql, resultSetType, resultSetConcurrency);
-  }
-
-  @Override
-  public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency)
-      throws SQLException {
-    return this.delegate.prepareCall(sql, resultSetType, resultSetConcurrency);
-  }
-
-  @Override
-  public Map<String, Class<?>> getTypeMap() throws SQLException {
-    return this.delegate.getTypeMap();
-  }
-
-  @Override
-  public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
-    this.delegate.setTypeMap(map);
-  }
-
-  @Override
-  public void setHoldability(int holdability) throws SQLException {
-    this.delegate.setHoldability(holdability);
-  }
-
-  @Override
-  public int getHoldability() throws SQLException {
-    return this.delegate.getHoldability();
-  }
-
-  @Override
-  public Savepoint setSavepoint() throws SQLException {
-    return this.delegate.setSavepoint();
-  }
-
-  @Override
-  public Savepoint setSavepoint(String name) throws SQLException {
-    return this.delegate.setSavepoint(name);
-  }
-
-  @Override
-  public void rollback(Savepoint savepoint) throws SQLException {
-    this.delegate.rollback(savepoint);
-  }
-
-  @Override
-  public void releaseSavepoint(Savepoint savepoint) throws SQLException {
-    this.delegate.releaseSavepoint(savepoint);
-  }
-
-  @Override
-  public Statement createStatement(
-      int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-    return this.delegate.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability);
-  }
-
-  @Override
-  public PreparedStatement prepareStatement(
-      String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability)
-      throws SQLException {
-    return this.delegate.prepareStatement(
-        sql, resultSetType, resultSetConcurrency, resultSetHoldability);
-  }
-
-  @Override
-  public CallableStatement prepareCall(
-      String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability)
-      throws SQLException {
-    return this.delegate.prepareCall(
-        sql, resultSetType, resultSetConcurrency, resultSetHoldability);
-  }
-
-  @Override
-  public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
-    return this.delegate.prepareStatement(sql, autoGeneratedKeys);
-  }
-
-  @Override
-  public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
-    return this.delegate.prepareStatement(sql, columnIndexes);
-  }
-
-  @Override
-  public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
-    return this.delegate.prepareStatement(sql, columnNames);
-  }
-
-  @Override
-  public Clob createClob() throws SQLException {
-    return this.delegate.createClob();
-  }
-
-  @Override
-  public Blob createBlob() throws SQLException {
-    return this.delegate.createBlob();
-  }
-
-  @Override
-  public NClob createNClob() throws SQLException {
-    return this.delegate.createNClob();
-  }
-
-  @Override
-  public SQLXML createSQLXML() throws SQLException {
-    return this.delegate.createSQLXML();
-  }
-
-  @Override
-  public boolean isValid(int timeout) throws SQLException {
-    return this.delegate.isValid(timeout);
-  }
-
-  @Override
-  public void setClientInfo(String name, String value) throws SQLClientInfoException {
-    this.delegate.setClientInfo(name, value);
-  }
-
-  @Override
-  public void setClientInfo(Properties properties) throws SQLClientInfoException {
-    this.delegate.setClientInfo(properties);
-  }
-
-  @Override
-  public String getClientInfo(String name) throws SQLException {
-    return this.delegate.getClientInfo(name);
-  }
-
-  @Override
-  public Properties getClientInfo() throws SQLException {
-    return this.delegate.getClientInfo();
-  }
-
-  @Override
-  public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
-    return this.delegate.createArrayOf(typeName, elements);
-  }
-
-  @Override
-  public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
-    return this.delegate.createStruct(typeName, attributes);
-  }
-
-  @Override
-  public void setSchema(String schema) throws SQLException {
-    this.delegate.setSchema(schema);
-  }
-
-  @Override
-  public String getSchema() throws SQLException {
-    return this.delegate.getSchema();
-  }
-
-  @Override
-  public void abort(Executor executor) throws SQLException {
-    this.delegate.abort(executor);
-  }
-
-  @Override
-  public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
-    this.delegate.setNetworkTimeout(executor, milliseconds);
-  }
-
-  @Override
-  public int getNetworkTimeout() throws SQLException {
-    return this.delegate.getNetworkTimeout();
-  }
 }

Common/Source/src/main/java/dev/brighten/antivpn/database/sql/utils/Query.java

@@ -16,13 +16,15 @@
 
 package dev.brighten.antivpn.database.sql.utils;
 
-import java.sql.Connection;
-import java.sql.SQLException;
 import lombok.Getter;
 import org.intellij.lang.annotations.Language;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+
 public class Query {
-  @Getter private static Connection conn;
+    @Getter
+    private static Connection conn;
 
     public static void use(Connection conn) {
         Query.conn = conn;
@@ -32,4 +34,6 @@ public class Query {
     public static ExecutableStatement prepare(@Language("SQL") String sql) throws SQLException {
         return new ExecutableStatement(conn.prepareStatement(sql));
     }
+
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/database/sql/version/MySQLFirst.java

@@ -21,29 +21,26 @@ import dev.brighten.antivpn.database.DatabaseException;
 import dev.brighten.antivpn.database.VPNDatabase;
 import dev.brighten.antivpn.database.local.version.First;
 import dev.brighten.antivpn.database.sql.utils.Query;
+
 import java.sql.SQLException;
 
 public class MySQLFirst extends First {
 
     @Override
     public void update(VPNDatabase database) throws DatabaseException {
-    try (var statement =
+        try(var statement = Query.prepare("select `DATA_TYPE` from INFORMATION_SCHEMA.COLUMNS " +
-        Query.prepare(
+                "WHERE table_name = 'responses' AND COLUMN_NAME = 'isp';")) {
-            "select `DATA_TYPE` from INFORMATION_SCHEMA.COLUMNS "
+            statement.execute(set -> {
-                + "WHERE table_name = 'responses' AND COLUMN_NAME = 'isp';")) {
+                if(set.getObject("DATA_TYPE").toString().contains("varchar")) {
-      statement.execute(
+                    AntiVPN.getInstance().getExecutor().log("Using old database format for storing responses! " +
-          set -> {
+                            "Dropping table and creating a new one...");
-            if (set.getObject("DATA_TYPE").toString().contains("varchar")) {
+                    try(var state = Query.prepare("drop table `responses`")) {
-              AntiVPN.getInstance()
+                        if(state.execute() > 0) {
-                  .getExecutor()
-                  .log(
-                      "Using old database format for storing responses! "
-                          + "Dropping table and creating a new one...");
-              try (var state = Query.prepare("drop table `responses`")) {
-                if (state.execute() > 0) {
                             AntiVPN.getInstance().getExecutor().log("Successfully dropped table!");
                         }
                     }
+
+
                 }
             });
         } catch (SQLException e) {

Common/Source/src/main/java/dev/brighten/antivpn/database/version/Version.java

@@ -28,15 +28,13 @@ import dev.brighten.antivpn.database.mongo.version.MongoThird;
 import dev.brighten.antivpn.database.sql.MySqlVPN;
 import dev.brighten.antivpn.database.sql.version.MySQLFirst;
 
+
 public interface Version<DB> {
     void update(DB database) throws DatabaseException;
-
     int versionNumber();
-
     boolean needsUpdate(DB database);
 
-  Version<MongoVPN>[] mongoDbVersions =
+    Version<MongoVPN>[] mongoDbVersions = new Version[] {new MongoFirst(), new MongoSecond(), new MongoThird()};
-      new Version[] {new MongoFirst(), new MongoSecond(), new MongoThird()};
     Version<MySqlVPN>[] mysqlVersions = new Version[] {new MySQLFirst(), new Second(), new Third()};
     Version<H2VPN>[] h2Versions = new Version[] {new First(), new Second(), new Third()};
 }

Common/Source/src/main/java/dev/brighten/antivpn/depends/LibraryLoader.java

@@ -20,16 +20,6 @@ import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.utils.NonnullByDefault;
 import dev.brighten.antivpn.utils.Supplier;
 import dev.brighten.antivpn.utils.Suppliers;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
 import lombok.Getter;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassReader;
@@ -42,9 +32,20 @@ import org.objectweb.asm.RecordComponentVisitor;
 import org.objectweb.asm.commons.ClassRemapper;
 import org.objectweb.asm.commons.Remapper;
 
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+
 /**
- * Resolves {@link MavenLibrary} annotations for a class, and loads the dependency into the
+ * Resolves {@link MavenLibrary} annotations for a class, and loads the dependency
- * classloader.
+ * into the classloader.
  */
 @SuppressWarnings("CallToPrintStackTrace")
 @NonnullByDefault
@@ -53,21 +54,20 @@ public final class LibraryLoader {
     private static final String RELOCATION_METADATA_PATH = "META-INF/antivpn-relocation.properties";
 
     @SuppressWarnings("Guava")
-  private static final Supplier<URLClassLoaderAccess> URL_INJECTOR =
+    private static final Supplier<URLClassLoaderAccess> URL_INJECTOR = AntiVPN.getInstance().getClass().getClassLoader() instanceof URLClassLoader ?
-      AntiVPN.getInstance().getClass().getClassLoader() instanceof URLClassLoader
+            Suppliers.memoize(() ->
-          ? Suppliers.memoize(
+                    URLClassLoaderAccess.create((URLClassLoader) AntiVPN.getInstance().getClass().getClassLoader()))
-              () ->
-                  URLClassLoaderAccess.create(
-                      (URLClassLoader) AntiVPN.getInstance().getClass().getClassLoader()))
             : null;
 
     public static void loadAll(Object object) {
-    if (URL_INJECTOR == null) return;
+        if(URL_INJECTOR == null)
+            return;
         loadAll(object.getClass());
     }
 
     public static void loadAll(Class<?> clazz) {
-    if (URL_INJECTOR == null) return;
+        if(URL_INJECTOR == null)
+            return;
         MavenLibrary[] libs = clazz.getDeclaredAnnotationsByType(MavenLibrary.class);
 
         for (MavenLibrary lib : libs) {
@@ -77,27 +77,17 @@ public final class LibraryLoader {
                 relocations.put(relocate.from().replace("\\", ""), relocate.to());
             }
 
-      load(
+            load(lib.groupId().replace("\\", ""), lib.artifactId(), lib.version(), lib.repo().url(), relocations);
-          lib.groupId().replace("\\", ""),
-          lib.artifactId(),
-          lib.version(),
-          lib.repo().url(),
-          relocations);
         }
     }
 
-  public static void load(
+    public static void load(String groupId, String artifactId, String version, String repoUrl,
-      String groupId,
-      String artifactId,
-      String version,
-      String repoUrl,
                             Map<String, String> relocations) {
         load(new Dependency(groupId, artifactId, version, repoUrl), relocations);
     }
 
     public static void load(Dependency d, Map<String, String> relocations) {
-    System.out.printf(
+        System.out.printf("Loading dependency %s:%s:%s from %s%n",
-        "Loading dependency %s:%s:%s from %s%n",
                 d.getGroupId(), d.getArtifactId(), d.getVersion(), d.getRepoUrl());
         String name = d.getArtifactId() + "-" + d.getVersion();
 
@@ -113,10 +103,8 @@ public final class LibraryLoader {
         // Download the original jar if it doesn't exist
         if (!originalJar.exists()) {
             try {
-        System.out.println(
+                System.out.println("Dependency '" + name +
-            "Dependency '"
+                        "' is not already in the libraries folder. Attempting to download...");
-                + name
-                + "' is not already in the libraries folder. Attempting to download...");
                 URL url = d.getUrl();
 
                 try (InputStream is = url.openStream()) {
@@ -194,8 +182,7 @@ public final class LibraryLoader {
                         jos.write(relocatedBytes);
                         jos.closeEntry();
                     } else {
-            // Relocate package-scoped resources so ResourceBundle lookups follow relocated
+                        // Relocate package-scoped resources so ResourceBundle lookups follow relocated packages.
-            // packages.
                         String relocatedPath = relocateResourcePath(name, relocations);
 
                         JarEntry newEntry = new JarEntry(relocatedPath);
@@ -215,8 +202,8 @@ public final class LibraryLoader {
                     jos.closeEntry();
                 } catch (Exception e) {
                     // Log but continue with other service files
-          System.out.println(
+                    System.out.println("Warning: Could not write service file " +
-              "Warning: Could not write service file " + entry.getKey() + ": " + e.getMessage());
+                            entry.getKey() + ": " + e.getMessage());
                 }
             }
 
@@ -226,8 +213,7 @@ public final class LibraryLoader {
         validateRelocatedJar(targetJar, relocations);
     }
 
-  private static boolean shouldRebuildRelocatedJar(
+    private static boolean shouldRebuildRelocatedJar(File relocatedJar, Map<String, String> relocations) {
-      File relocatedJar, Map<String, String> relocations) {
         if (!relocatedJar.exists()) {
             return true;
         }
@@ -243,8 +229,7 @@ public final class LibraryLoader {
                 metadata.load(is);
             }
 
-      if (!String.valueOf(RELOCATION_FORMAT_VERSION)
+            if (!String.valueOf(RELOCATION_FORMAT_VERSION).equals(metadata.getProperty("formatVersion"))) {
-          .equals(metadata.getProperty("formatVersion"))) {
                 return true;
             }
 
@@ -281,12 +266,9 @@ public final class LibraryLoader {
         jos.closeEntry();
     }
 
-  private static void processServiceFile(
+    private static void processServiceFile(String name, InputStream is,
-      String name,
-      InputStream is,
                                            Map<String, StringBuilder> serviceFiles,
-      Map<String, String> relocations)
+                                           Map<String, String> relocations) throws IOException {
-      throws IOException {
         // Read service file content
         String content = new String(readAllBytes(is));
         StringBuilder contentBuilder = serviceFiles.computeIfAbsent(name, k -> new StringBuilder());
@@ -297,7 +279,8 @@ public final class LibraryLoader {
             if (!trimmed.isEmpty() && !trimmed.startsWith("#")) {
                 for (Map.Entry<String, String> relocation : relocations.entrySet()) {
                     if (trimmed.startsWith(relocation.getKey())) {
-            trimmed = relocation.getValue() + trimmed.substring(relocation.getKey().length());
+                        trimmed = relocation.getValue() +
+                                trimmed.substring(relocation.getKey().length());
                         break;
                     }
                 }
@@ -306,16 +289,14 @@ public final class LibraryLoader {
         }
     }
 
-  private static byte[] relocateClass(
+    private static byte[] relocateClass(String entryName, byte[] classBytes, Map<String, String> relocations) {
-      String entryName, byte[] classBytes, Map<String, String> relocations) {
         try {
             // Convert to slash notation for ASM
             Remapper prefixRemapper = getPrefixRemapper(relocations);
 
             // Create custom ClassWriter to handle missing classes
             ClassReader reader = new ClassReader(classBytes);
-      ClassWriter writer =
+            ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS) {
-          new ClassWriter(ClassWriter.COMPUTE_MAXS) {
                 @Override
                 protected String getCommonSuperClass(String type1, String type2) {
                     try {
@@ -327,8 +308,7 @@ public final class LibraryLoader {
                 }
             };
 
-      ClassVisitor visitor =
+            ClassVisitor visitor = createStringRelocationVisitor(new ClassRemapper(writer, prefixRemapper), relocations);
-          createStringRelocationVisitor(new ClassRemapper(writer, prefixRemapper), relocations);
             visitor = createMySqlUtilFallbackVisitor(entryName, visitor);
 
             // Process class with remapper
@@ -352,8 +332,7 @@ public final class LibraryLoader {
         return className;
     }
 
-  private static byte[] relocateUtf8Constants(byte[] classBytes, Map<String, String> relocations)
+    private static byte[] relocateUtf8Constants(byte[] classBytes, Map<String, String> relocations) throws IOException {
-      throws IOException {
         Map<String, String> dotMappings = new HashMap<>();
         Map<String, String> slashMappings = new HashMap<>();
         for (Map.Entry<String, String> entry : relocations.entrySet()) {
@@ -442,24 +421,22 @@ public final class LibraryLoader {
         };
     }
 
-  private static ClassVisitor createMySqlUtilFallbackVisitor(
+    private static ClassVisitor createMySqlUtilFallbackVisitor(String entryName, ClassVisitor delegate) {
-      String entryName, ClassVisitor delegate) {
         if (!"com/mysql/cj/util/Util.class".equals(entryName)) {
             return delegate;
         }
 
         return new ClassVisitor(Opcodes.ASM9, delegate) {
             @Override
-      public MethodVisitor visitMethod(
+            public MethodVisitor visitMethod(int access, String name, String descriptor, String signature,
-          int access, String name, String descriptor, String signature, String[] exceptions) {
+                                             String[] exceptions) {
                 MethodVisitor visitor = super.visitMethod(access, name, descriptor, signature, exceptions);
                 if (visitor == null) {
                     return null;
                 }
 
                 if (!"getInstance".equals(name)
-            || !"(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;Lcom/mysql/cj/exceptions/ExceptionInterceptor;)Ljava/lang/Object;"
+                        || !"(Ljava/lang/Class;Ljava/lang/String;[Ljava/lang/Class;[Ljava/lang/Object;Lcom/mysql/cj/exceptions/ExceptionInterceptor;)Ljava/lang/Object;".equals(descriptor)) {
-                .equals(descriptor)) {
                     return visitor;
                 }
 
@@ -468,8 +445,7 @@ public final class LibraryLoader {
                     public void visitCode() {
                         super.visitCode();
                         super.visitVarInsn(Opcodes.ALOAD, 1);
-            super.visitMethodInsn(
+                        super.visitMethodInsn(Opcodes.INVOKESTATIC,
-                Opcodes.INVOKESTATIC,
                                 "dev/brighten/antivpn/depends/LibraryLoader",
                                 "relocateReflectiveClassName",
                                 "(Ljava/lang/String;)Ljava/lang/String;",
@@ -481,8 +457,8 @@ public final class LibraryLoader {
         };
     }
 
-  private static ClassVisitor createStringRelocationVisitor(
+    private static ClassVisitor createStringRelocationVisitor(ClassVisitor delegate,
-      ClassVisitor delegate, Map<String, String> relocations) {
+                                                              Map<String, String> relocations) {
         Map<String, String> dotMappings = new HashMap<>();
         Map<String, String> slashMappings = new HashMap<>();
         for (Map.Entry<String, String> entry : relocations.entrySet()) {
@@ -493,22 +469,18 @@ public final class LibraryLoader {
         return new ClassVisitor(Opcodes.ASM9, delegate) {
             @Override
             public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
-        return wrapAnnotationVisitor(
+                return wrapAnnotationVisitor(super.visitAnnotation(descriptor, visible), dotMappings, slashMappings);
-            super.visitAnnotation(descriptor, visible), dotMappings, slashMappings);
             }
 
             @Override
-      public AnnotationVisitor visitTypeAnnotation(
+            public AnnotationVisitor visitTypeAnnotation(int typeRef, org.objectweb.asm.TypePath typePath,
-          int typeRef, org.objectweb.asm.TypePath typePath, String descriptor, boolean visible) {
+                                                         String descriptor, boolean visible) {
-        return wrapAnnotationVisitor(
+                return wrapAnnotationVisitor(super.visitTypeAnnotation(typeRef, typePath, descriptor, visible),
-            super.visitTypeAnnotation(typeRef, typePath, descriptor, visible),
+                        dotMappings, slashMappings);
-            dotMappings,
-            slashMappings);
             }
 
             @Override
-      public RecordComponentVisitor visitRecordComponent(
+            public RecordComponentVisitor visitRecordComponent(String name, String descriptor, String signature) {
-          String name, String descriptor, String signature) {
                 RecordComponentVisitor visitor = super.visitRecordComponent(name, descriptor, signature);
                 if (visitor == null) {
                     return null;
@@ -516,33 +488,22 @@ public final class LibraryLoader {
                 return new RecordComponentVisitor(Opcodes.ASM9, visitor) {
                     @Override
                     public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
-            return wrapAnnotationVisitor(
+                        return wrapAnnotationVisitor(super.visitAnnotation(descriptor, visible),
-                super.visitAnnotation(descriptor, visible), dotMappings, slashMappings);
+                                dotMappings, slashMappings);
                     }
 
                     @Override
-          public AnnotationVisitor visitTypeAnnotation(
+                    public AnnotationVisitor visitTypeAnnotation(int typeRef, org.objectweb.asm.TypePath typePath,
-              int typeRef,
+                                                                 String descriptor, boolean visible) {
-              org.objectweb.asm.TypePath typePath,
+                        return wrapAnnotationVisitor(super.visitTypeAnnotation(typeRef, typePath, descriptor, visible),
-              String descriptor,
+                                dotMappings, slashMappings);
-              boolean visible) {
-            return wrapAnnotationVisitor(
-                super.visitTypeAnnotation(typeRef, typePath, descriptor, visible),
-                dotMappings,
-                slashMappings);
                     }
                 };
             }
 
             @Override
-      public FieldVisitor visitField(
+            public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
-          int access, String name, String descriptor, String signature, Object value) {
+                FieldVisitor visitor = super.visitField(access, name, descriptor, signature,
-        FieldVisitor visitor =
-            super.visitField(
-                access,
-                name,
-                descriptor,
-                signature,
                         relocateAsmValue(value, dotMappings, slashMappings));
                 if (visitor == null) {
                     return null;
@@ -550,27 +511,22 @@ public final class LibraryLoader {
                 return new FieldVisitor(Opcodes.ASM9, visitor) {
                     @Override
                     public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
-            return wrapAnnotationVisitor(
+                        return wrapAnnotationVisitor(super.visitAnnotation(descriptor, visible),
-                super.visitAnnotation(descriptor, visible), dotMappings, slashMappings);
+                                dotMappings, slashMappings);
                     }
 
                     @Override
-          public AnnotationVisitor visitTypeAnnotation(
+                    public AnnotationVisitor visitTypeAnnotation(int typeRef, org.objectweb.asm.TypePath typePath,
-              int typeRef,
+                                                                 String descriptor, boolean visible) {
-              org.objectweb.asm.TypePath typePath,
+                        return wrapAnnotationVisitor(super.visitTypeAnnotation(typeRef, typePath, descriptor, visible),
-              String descriptor,
+                                dotMappings, slashMappings);
-              boolean visible) {
-            return wrapAnnotationVisitor(
-                super.visitTypeAnnotation(typeRef, typePath, descriptor, visible),
-                dotMappings,
-                slashMappings);
                     }
                 };
             }
 
             @Override
-      public MethodVisitor visitMethod(
+            public MethodVisitor visitMethod(int access, String name, String descriptor, String signature,
-          int access, String name, String descriptor, String signature, String[] exceptions) {
+                                             String[] exceptions) {
                 MethodVisitor visitor = super.visitMethod(access, name, descriptor, signature, exceptions);
                 if (visitor == null) {
                     return null;
@@ -578,75 +534,53 @@ public final class LibraryLoader {
                 return new MethodVisitor(Opcodes.ASM9, visitor) {
                     @Override
                     public AnnotationVisitor visitAnnotationDefault() {
-            return wrapAnnotationVisitor(
+                        return wrapAnnotationVisitor(super.visitAnnotationDefault(), dotMappings, slashMappings);
-                super.visitAnnotationDefault(), dotMappings, slashMappings);
                     }
 
                     @Override
                     public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
-            return wrapAnnotationVisitor(
+                        return wrapAnnotationVisitor(super.visitAnnotation(descriptor, visible),
-                super.visitAnnotation(descriptor, visible), dotMappings, slashMappings);
+                                dotMappings, slashMappings);
                     }
 
                     @Override
-          public AnnotationVisitor visitTypeAnnotation(
+                    public AnnotationVisitor visitTypeAnnotation(int typeRef, org.objectweb.asm.TypePath typePath,
-              int typeRef,
+                                                                 String descriptor, boolean visible) {
-              org.objectweb.asm.TypePath typePath,
+                        return wrapAnnotationVisitor(super.visitTypeAnnotation(typeRef, typePath, descriptor, visible),
-              String descriptor,
+                                dotMappings, slashMappings);
+                    }
+
+                    @Override
+                    public AnnotationVisitor visitParameterAnnotation(int parameter, String descriptor,
                                                                      boolean visible) {
-            return wrapAnnotationVisitor(
+                        return wrapAnnotationVisitor(super.visitParameterAnnotation(parameter, descriptor, visible),
-                super.visitTypeAnnotation(typeRef, typePath, descriptor, visible),
+                                dotMappings, slashMappings);
-                dotMappings,
-                slashMappings);
                     }
 
                     @Override
-          public AnnotationVisitor visitParameterAnnotation(
+                    public AnnotationVisitor visitInsnAnnotation(int typeRef, org.objectweb.asm.TypePath typePath,
-              int parameter, String descriptor, boolean visible) {
+                                                                 String descriptor, boolean visible) {
-            return wrapAnnotationVisitor(
+                        return wrapAnnotationVisitor(super.visitInsnAnnotation(typeRef, typePath, descriptor, visible),
-                super.visitParameterAnnotation(parameter, descriptor, visible),
+                                dotMappings, slashMappings);
-                dotMappings,
-                slashMappings);
                     }
 
                     @Override
-          public AnnotationVisitor visitInsnAnnotation(
+                    public AnnotationVisitor visitTryCatchAnnotation(int typeRef, org.objectweb.asm.TypePath typePath,
-              int typeRef,
+                                                                     String descriptor, boolean visible) {
-              org.objectweb.asm.TypePath typePath,
+                        return wrapAnnotationVisitor(super.visitTryCatchAnnotation(typeRef, typePath, descriptor, visible),
-              String descriptor,
+                                dotMappings, slashMappings);
-              boolean visible) {
-            return wrapAnnotationVisitor(
-                super.visitInsnAnnotation(typeRef, typePath, descriptor, visible),
-                dotMappings,
-                slashMappings);
                     }
 
                     @Override
-          public AnnotationVisitor visitTryCatchAnnotation(
+                    public AnnotationVisitor visitLocalVariableAnnotation(int typeRef,
-              int typeRef,
-              org.objectweb.asm.TypePath typePath,
-              String descriptor,
-              boolean visible) {
-            return wrapAnnotationVisitor(
-                super.visitTryCatchAnnotation(typeRef, typePath, descriptor, visible),
-                dotMappings,
-                slashMappings);
-          }
-
-          @Override
-          public AnnotationVisitor visitLocalVariableAnnotation(
-              int typeRef,
                                                                           org.objectweb.asm.TypePath typePath,
                                                                           org.objectweb.asm.Label[] start,
                                                                           org.objectweb.asm.Label[] end,
-              int[] index,
+                                                                          int[] index, String descriptor,
-              String descriptor,
                                                                           boolean visible) {
                         return wrapAnnotationVisitor(
-                super.visitLocalVariableAnnotation(
+                                super.visitLocalVariableAnnotation(typeRef, typePath, start, end, index, descriptor, visible),
-                    typeRef, typePath, start, end, index, descriptor, visible),
+                                dotMappings, slashMappings);
-                dotMappings,
-                slashMappings);
                     }
 
                     @Override
@@ -655,15 +589,11 @@ public final class LibraryLoader {
                     }
 
                     @Override
-          public void visitInvokeDynamicInsn(
+                    public void visitInvokeDynamicInsn(String name, String descriptor, org.objectweb.asm.Handle bootstrapMethodHandle,
-              String name,
-              String descriptor,
-              org.objectweb.asm.Handle bootstrapMethodHandle,
                                                        Object... bootstrapMethodArguments) {
                         Object[] relocatedArgs = new Object[bootstrapMethodArguments.length];
                         for (int i = 0; i < bootstrapMethodArguments.length; i++) {
-              relocatedArgs[i] =
+                            relocatedArgs[i] = relocateAsmValue(bootstrapMethodArguments[i], dotMappings, slashMappings);
-                  relocateAsmValue(bootstrapMethodArguments[i], dotMappings, slashMappings);
                         }
                         super.visitInvokeDynamicInsn(name, descriptor, bootstrapMethodHandle, relocatedArgs);
                     }
@@ -672,8 +602,7 @@ public final class LibraryLoader {
         };
     }
 
-  private static AnnotationVisitor wrapAnnotationVisitor(
+    private static AnnotationVisitor wrapAnnotationVisitor(AnnotationVisitor delegate,
-      AnnotationVisitor delegate,
                                                            Map<String, String> dotMappings,
                                                            Map<String, String> slashMappings) {
         if (delegate == null) {
@@ -688,8 +617,7 @@ public final class LibraryLoader {
 
             @Override
             public AnnotationVisitor visitAnnotation(String name, String descriptor) {
-        return wrapAnnotationVisitor(
+                return wrapAnnotationVisitor(super.visitAnnotation(name, descriptor), dotMappings, slashMappings);
-            super.visitAnnotation(name, descriptor), dotMappings, slashMappings);
             }
 
             @Override
@@ -699,8 +627,8 @@ public final class LibraryLoader {
         };
     }
 
-  private static Object relocateAsmValue(
+    private static Object relocateAsmValue(Object value, Map<String, String> dotMappings,
-      Object value, Map<String, String> dotMappings, Map<String, String> slashMappings) {
+                                           Map<String, String> slashMappings) {
         if (value instanceof String stringValue) {
             return relocateStringValue(stringValue, dotMappings, slashMappings);
         }
@@ -708,8 +636,8 @@ public final class LibraryLoader {
         return value;
     }
 
-  private static String relocateStringValue(
+    private static String relocateStringValue(String value, Map<String, String> dotMappings,
-      String value, Map<String, String> dotMappings, Map<String, String> slashMappings) {
+                                              Map<String, String> slashMappings) {
         for (Map.Entry<String, String> entry : dotMappings.entrySet()) {
             String from = entry.getKey();
             String relocated = relocateByPrefixes(value, from, entry.getValue(), '.', '$');
@@ -746,8 +674,7 @@ public final class LibraryLoader {
         return value;
     }
 
-  private static String relocateByPrefixes(
+    private static String relocateByPrefixes(String value, String from, String to, char... delimiters) {
-      String value, String from, String to, char... delimiters) {
         if (value.equals(from)) {
             return to;
         }
@@ -761,16 +688,14 @@ public final class LibraryLoader {
         return value;
     }
 
-  private static void validateRelocatedJar(File targetJar, Map<String, String> relocations)
+    private static void validateRelocatedJar(File targetJar, Map<String, String> relocations) throws IOException {
-      throws IOException {
         Set<String> relocatedPrefixes = new HashSet<>();
         Map<String, String> dotMappings = new HashMap<>();
         Map<String, String> slashMappings = new HashMap<>();
         for (Map.Entry<String, String> relocation : relocations.entrySet()) {
             relocatedPrefixes.add(relocation.getValue().replace('.', '/') + "/");
             dotMappings.put(relocation.getKey(), relocation.getValue());
-      slashMappings.put(
+            slashMappings.put(relocation.getKey().replace('.', '/'), relocation.getValue().replace('.', '/'));
-          relocation.getKey().replace('.', '/'), relocation.getValue().replace('.', '/'));
         }
 
         try (JarFile jar = new JarFile(targetJar)) {
@@ -800,12 +725,8 @@ public final class LibraryLoader {
         }
     }
 
-  private static void findUnrelocatedConstant(
+    private static void findUnrelocatedConstant(String entryName, byte[] classBytes, Map<String, String> dotMappings,
-      String entryName,
+                                                Map<String, String> slashMappings) throws IOException {
-      byte[] classBytes,
-      Map<String, String> dotMappings,
-      Map<String, String> slashMappings)
-      throws IOException {
         DataInputStream in = new DataInputStream(new ByteArrayInputStream(classBytes));
         in.readInt();
         in.readUnsignedShort();
@@ -819,11 +740,8 @@ public final class LibraryLoader {
                     String value = in.readUTF();
                     String relocated = relocateStringValue(value, dotMappings, slashMappings);
                     if (!value.equals(relocated)) {
-            throw new IOException(
+                        throw new IOException("Relocated jar still contains original reference '" + value
-                "Relocated jar still contains original reference '"
+                                + "' in class entry " + entryName);
-                    + value
-                    + "' in class entry "
-                    + entryName);
                     }
                 }
                 case 3, 4 -> in.readInt();
@@ -840,9 +758,7 @@ public final class LibraryLoader {
                     in.readUnsignedByte();
                     in.readUnsignedShort();
                 }
-        default ->
+                default -> throw new IOException("Unknown constant pool tag " + tag + " while validating " + entryName);
-            throw new IOException(
-                "Unknown constant pool tag " + tag + " while validating " + entryName);
             }
         }
     }
@@ -901,7 +817,7 @@ public final class LibraryLoader {
     private static File getLibFolder() {
         File pluginDataFolder = AntiVPN.getInstance().getPluginFolder();
         File libs = new File(pluginDataFolder, "libraries");
-    if (libs.mkdirs()) {
+        if(libs.mkdirs()) {
             System.out.println("Created libraries folder!");
         }
         return libs;
@@ -909,7 +825,7 @@ public final class LibraryLoader {
 
     @Getter
     @NonnullByDefault
-  // Fix the Dependency class to preserve original groupId for downloading
+// Fix the Dependency class to preserve original groupId for downloading
     public static final class Dependency {
         private final String groupId;
         private final String artifactId;
@@ -936,17 +852,13 @@ public final class LibraryLoader {
             repo += "%s/%s/%s/%s-%s.jar";
 
             // Always use original groupId for Maven repository URL
-      String url =
+            String url = String.format(repo, this.originalGroupId.replace(".", "/"),
-          String.format(
+                    this.originalArtifactId, this.version, this.originalArtifactId, this.version);
-              repo,
-              this.originalGroupId.replace(".", "/"),
-              this.originalArtifactId,
-              this.version,
-              this.originalArtifactId,
-              this.version);
             return new URL(url);
         }
 
         // Rest of the class unchanged
     }
+
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/depends/MavenLibraries.java

@@ -18,11 +18,14 @@ package dev.brighten.antivpn.depends;
 
 import java.lang.annotation.*;
 
-/** Annotation to indicate the required libraries for a class. */
+/**
+ * Annotation to indicate the required libraries for a class.
+ */
 @Documented
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface MavenLibraries {
 
     MavenLibrary[] value() default {};
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/depends/MavenLibrary.java

@@ -18,7 +18,9 @@ package dev.brighten.antivpn.depends;
 
 import java.lang.annotation.*;
 
-/** Annotation to indicate a required library for a class. */
+/**
+ * Annotation to indicate a required library for a class.
+ */
 @Documented
 @Repeatable(MavenLibraries.class)
 @Target(ElementType.TYPE)
@@ -54,4 +56,5 @@ public @interface MavenLibrary {
     Repository repo() default @Repository(url = "https://repo1.maven.org/maven2");
 
     Relocate[] relocations() default {}; // Add this line
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/depends/Relocate.java

@@ -26,6 +26,5 @@ import java.lang.annotation.Target;
 @Target({})
 public @interface Relocate {
     String from();
-
     String to();
 }

Common/Source/src/main/java/dev/brighten/antivpn/depends/Repository.java

@@ -18,7 +18,9 @@ package dev.brighten.antivpn.depends;
 
 import java.lang.annotation.*;
 
-/** Represents a maven repository. */
+/**
+ * Represents a maven repository.
+ */
 @Documented
 @Target(ElementType.LOCAL_VARIABLE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -30,4 +32,5 @@ public @interface Repository {
      * @return the base url of the repository
      */
     String url();
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/depends/URLClassLoaderAccess.java

@@ -22,7 +22,9 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Collection;
 
-/** Provides access to {@link URLClassLoader}#addURL. */
+/**
+ * Provides access to {@link URLClassLoader}#addURL.
+ */
 public abstract class URLClassLoaderAccess {
 
     /**
@@ -47,6 +49,7 @@ public abstract class URLClassLoaderAccess {
         this.classLoader = classLoader;
     }
 
+
     /**
      * Adds the given URL to the class loader.
      *
@@ -54,7 +57,9 @@ public abstract class URLClassLoaderAccess {
      */
     public abstract void addURL(URL url);
 
-  /** Accesses using reflection, not supported on Java 9+. */
+    /**
+     * Accesses using reflection, not supported on Java 9+.
+     */
     private static class Reflection extends URLClassLoaderAccess {
         private static final Method ADD_URL_METHOD;
 
@@ -132,8 +137,7 @@ public abstract class URLClassLoaderAccess {
             this.pathURLs = pathURLs;
         }
 
-    private static Object fetchField(final Class<?> clazz, final Object object, final String name)
+        private static Object fetchField(final Class<?> clazz, final Object object, final String name) throws NoSuchFieldException {
-        throws NoSuchFieldException {
             Field field = clazz.getDeclaredField(name);
             long offset = UNSAFE.objectFieldOffset(field);
             return UNSAFE.getObject(object, offset);
@@ -158,4 +162,5 @@ public abstract class URLClassLoaderAccess {
             throw new UnsupportedOperationException();
         }
     }
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/message/MessageHandler.java

@@ -17,6 +17,7 @@
 package dev.brighten.antivpn.message;
 
 import dev.brighten.antivpn.AntiVPN;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
@@ -25,7 +26,7 @@ public class MessageHandler {
     private final Map<String, VpnString> messages = new HashMap<>();
 
     public VpnString getString(String key) {
-    if (!messages.containsKey(key)) {
+        if(!messages.containsKey(key)) {
             throw new NullPointerException("There is no VpnString with the key \"" + key + "\"");
         }
 
@@ -50,18 +51,12 @@ public class MessageHandler {
     }
 
     public void initStrings(Function<VpnString, String> getter) {
-    addString(
+        addString(new VpnString("command-misc-playerRequired",
-        new VpnString(
+                "&cYou must be a player to execute this command!"), getter);
-            "command-misc-playerRequired", "&cYou must be a player to execute this command!"),
+        addString(new VpnString("command-alerts-toggled",
-        getter);
+                "&7Your player proxy notifications have been set to: &e%state%"), getter);
-    addString(
+        addString(new VpnString("command-reload-complete",
-        new VpnString(
+                        "&aSuccessfully reloaded KauriVPN plugin!"), getter);
-            "command-alerts-toggled",
-            "&7Your player proxy notifications have been set to: &e%state%"),
-        getter);
-    addString(
-        new VpnString("command-reload-complete", "&aSuccessfully reloaded KauriVPN plugin!"),
-        getter);
         addString(new VpnString("no-permission", "&cNo permission."), getter);
     }
 }

Common/Source/src/main/java/dev/brighten/antivpn/message/VpnString.java

@@ -17,18 +17,20 @@
 package dev.brighten.antivpn.message;
 
 import dev.brighten.antivpn.api.APIPlayer;
-import java.util.function.Function;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import lombok.SneakyThrows;
 
+import java.util.function.Function;
+
 @Getter
 public class VpnString {
     private final String key;
     private final String defaultMessage;
     private String message;
-  @Setter private Function<VpnString, String> configStringGetter;
+    @Setter
+    private Function<VpnString, String> configStringGetter;
 
     public VpnString(String key, String defaultMessage) {
         this.key = key;
@@ -37,8 +39,7 @@ public class VpnString {
 
     @SneakyThrows
     public void updateString() {
-    if (configStringGetter == null)
+        if(configStringGetter == null) throw new Exception("The configStringGetter for string " + key + " is null!");
-      throw new Exception("The configStringGetter for string " + key + " is null!");
 
         message = configStringGetter.apply(this);
     }
@@ -47,9 +48,8 @@ public class VpnString {
         String formatted = configStringGetter.apply(this);
 
         for (Var<String, Object> replacement : replacements) {
-      formatted =
+            formatted = formatted
-          formatted.replace(
+                    .replace("%" + replacement.getKey() + "%", replacement.getReplacement().toString());
-              "%" + replacement.getKey() + "%", replacement.getReplacement().toString());
         }
 
         return formatted;
@@ -59,9 +59,8 @@ public class VpnString {
         String formatted = message;
 
         for (Var<String, Object> replacement : replacements) {
-      formatted =
+            formatted = formatted
-          formatted.replace(
+                    .replace("%" + replacement.getKey() + "%", replacement.getReplacement().toString());
-              "%" + replacement.getKey() + "%", replacement.getReplacement().toString());
         }
         player.sendMessage(formatted);
     }

Common/Source/src/main/java/dev/brighten/antivpn/utils/CIDRUtils.java

@@ -16,16 +16,18 @@
 
 package dev.brighten.antivpn.utils;
 
+import lombok.Getter;
+
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Getter;
 
 /**
- * A class that enables to get an IP range from CIDR specification. It supports both IPv4 and IPv6.
+ * A class that enables to get an IP range from CIDR specification. It supports
+ * both IPv4 and IPv6.
  */
 @Getter
 public class CIDRUtils {
@@ -38,13 +40,14 @@ public class CIDRUtils {
     private InetAddress endAddress;
     private final int prefixLength;
 
+
     public CIDRUtils(String cidr) throws UnknownHostException {
 
         this.cidr = cidr;
 
         /* split CIDR to address and prefix part */
         if (this.cidr.contains("/")) {
-      int index = this.cidr.indexOf('/');
+            int index = this.cidr.indexOf("/");
             String addressPart = this.cidr.substring(0, index);
             String networkPart = this.cidr.substring(index + 1);
 
@@ -57,15 +60,21 @@ public class CIDRUtils {
         }
     }
 
+
     private void calculate() throws UnknownHostException {
 
         ByteBuffer maskBuffer;
         int targetSize;
         if (inetAddress.getAddress().length == 4) {
-      maskBuffer = ByteBuffer.allocate(4).putInt(-1);
+            maskBuffer =
+                    ByteBuffer
+                            .allocate(4)
+                            .putInt(-1);
             targetSize = 4;
         } else {
-      maskBuffer = ByteBuffer.allocate(16).putLong(-1L).putLong(-1L);
+            maskBuffer = ByteBuffer.allocate(16)
+                    .putLong(-1L)
+                    .putLong(-1L);
             targetSize = 16;
         }
 
@@ -84,6 +93,7 @@ public class CIDRUtils {
 
         this.startAddress = InetAddress.getByAddress(startIpArr);
         this.endAddress = InetAddress.getByAddress(endIpArr);
+
     }
 
     private byte[] toBytes(byte[] array, int targetSize) {

Common/Source/src/main/java/dev/brighten/antivpn/utils/ConfigDefault.java

@@ -27,7 +27,8 @@ public class ConfigDefault<A> {
     private final AntiVPN plugin;
 
     public A get() {
-    if (plugin.getConfig().get(path) != null) return (A) plugin.getConfig().get(path);
+        if(plugin.getConfig().get(path) != null)
+            return (A) plugin.getConfig().get(path);
         else {
             plugin.getConfig().set(path, defaultValue);
             plugin.saveConfig();

Common/Source/src/main/java/dev/brighten/antivpn/utils/EvictingMap.java

@@ -16,15 +16,17 @@
 
 package dev.brighten.antivpn.utils;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 @RequiredArgsConstructor
 public class EvictingMap<K, V> extends LinkedHashMap<K, V> {
 
-  @Getter private final int size;
+    @Getter
+    private final int size;
 
     @Override
     protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {

Common/Source/src/main/java/dev/brighten/antivpn/utils/IpUtils.java

@@ -29,11 +29,10 @@ public class IpUtils {
         try {
             InetAddress inet = InetAddress.getByName(address);
 
-      if (inet instanceof Inet4Address) {
+            if(inet instanceof Inet4Address) {
                 return Optional.of(BigDecimal.valueOf(ipv4ToLong(address)));
-      }
+            } return Optional.of(new BigDecimal(ipv6ToDecimalFormat(address)));
-      return Optional.of(new BigDecimal(ipv6ToDecimalFormat(address)));
+        } catch(Exception e) {
-    } catch (Exception e) {
             return Optional.empty();
         }
     }
@@ -75,7 +74,6 @@ public class IpUtils {
     public static boolean isIpv6(BigDecimal ip) {
         return ip.compareTo(BigDecimal.valueOf(4294967295L)) > 0;
     }
-
     public static boolean isIpv4(String ip) {
         return ip.matches("^(?:[0-9]{1,3}\\.){3}[0-9]{1,3}$");
     }
@@ -85,8 +83,7 @@ public class IpUtils {
     }
 
     public static boolean isIpv6(String ip) {
-    return ip.matches(
+        return ip.matches("^([0-9a-fA-F]{1,4}:){7}([0-9a-fA-F]{1,4}|:)$|^(([0-9a-fA-F]{1,4}:){0,6}([0-9a-fA-F]{1,4}|:))?(::([0-9a-fA-F]{1,4}:){0,5}([0-9a-fA-F]{1,4}|:))?$");
-        "^([0-9a-fA-F]{1,4}:){7}([0-9a-fA-F]{1,4}|:)$|^(([0-9a-fA-F]{1,4}:){0,6}([0-9a-fA-F]{1,4}|:))?(::([0-9a-fA-F]{1,4}:){0,5}([0-9a-fA-F]{1,4}|:))?$");
     }
 
     public static String getIpv4(BigDecimal ip) {
@@ -108,4 +105,5 @@ public class IpUtils {
     public static BigInteger ipv6ToDecimalFormat(String ipAddress) throws UnknownHostException {
         return new BigInteger(1, Inet6Address.getByName(ipAddress).getAddress());
     }
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/utils/MiscUtils.java

@@ -20,6 +20,7 @@ import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.utils.json.JSONException;
 import dev.brighten.antivpn.utils.json.JSONObject;
 import dev.brighten.antivpn.utils.json.JsonReader;
+
 import java.io.*;
 import java.math.BigInteger;
 import java.net.*;
@@ -31,12 +32,9 @@ import java.util.regex.Pattern;
 
 public class MiscUtils {
 
-  private static final Pattern ipv4 =
+    private static final Pattern ipv4 = Pattern.compile("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}");
-      Pattern.compile("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}");
+    private static final String DEFAULT_FUNKEMUNKY_UUID_ENDPOINT = "https://funkemunky.cc/mojang/uuid?name=";
-  private static final String DEFAULT_FUNKEMUNKY_UUID_ENDPOINT =
+    private static final String DEFAULT_MOJANG_UUID_ENDPOINT = "https://api.mojang.com/users/profiles/minecraft/";
-      "https://funkemunky.cc/mojang/uuid?name=";
-  private static final String DEFAULT_MOJANG_UUID_ENDPOINT =
-      "https://api.mojang.com/users/profiles/minecraft/";
     private static volatile String funkemunkyUuidEndpoint = DEFAULT_FUNKEMUNKY_UUID_ENDPOINT;
     private static volatile String mojangUuidEndpoint = DEFAULT_MOJANG_UUID_ENDPOINT;
 
@@ -62,7 +60,8 @@ public class MiscUtils {
             int lenght;
             byte[] buf = new byte[1024];
 
-      while ((lenght = in.read(buf)) > 0) {
+            while ((lenght = in.read(buf)) > 0)
+            {
                 out.write(buf, 0, lenght);
             }
 
@@ -81,14 +80,12 @@ public class MiscUtils {
         };
     }
 
-  public static List<CIDRUtils> rangeToCidrs(BigInteger start, BigInteger end)
+    public static List<CIDRUtils> rangeToCidrs(BigInteger start, BigInteger end) throws UnknownHostException {
-      throws UnknownHostException {
         List<CIDRUtils> cidrs = new ArrayList<>();
 
         while (start.compareTo(end) <= 0) {
             // Find the number of trailing zero bits — this determines max block size alignment
-      int trailingZeros =
+            int trailingZeros = start.equals(BigInteger.ZERO)
-          start.equals(BigInteger.ZERO)
                     ? 128  // handle the edge case
                     : start.getLowestSetBit();
 
@@ -127,18 +124,14 @@ public class MiscUtils {
                 return uuid;
             }
         } catch (IOException | JSONException | URISyntaxException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Error while looking up UUID for " + playername + "! Falling back to Mojang API", e);
-          .getExecutor()
-          .logException(
-              "Error while looking up UUID for " + playername + "! Falling back to Mojang API", e);
             return lookupMojangUuid(playername);
         }
 
         return null;
     }
 
-  private static UUID lookupUuidFromUrl(String url)
+    private static UUID lookupUuidFromUrl(String url) throws IOException, JSONException, URISyntaxException {
-      throws IOException, JSONException, URISyntaxException {
         HttpURLConnection connection = (HttpURLConnection) new URI(url).toURL().openConnection();
         connection.setConnectTimeout(5000);
         connection.setReadTimeout(5000);
@@ -153,10 +146,7 @@ public class MiscUtils {
         }
 
         try (InputStream inputStream = connection.getInputStream()) {
-      JSONObject object =
+            JSONObject object = new JSONObject(JsonReader.readAll(new InputStreamReader(inputStream, java.nio.charset.StandardCharsets.UTF_8)));
-          new JSONObject(
-              JsonReader.readAll(
-                  new InputStreamReader(inputStream, java.nio.charset.StandardCharsets.UTF_8)));
             if (object.has("uuid")) {
                 return parseUuid(object.getString("uuid"));
             }
@@ -170,10 +160,10 @@ public class MiscUtils {
 
     private static UUID parseUuid(String value) {
         if (value.length() == 32) {
-      value =
+            value = value.replaceFirst(
-          value.replaceFirst(
                     "([0-9a-fA-F]{8})([0-9a-fA-F]{4})([0-9a-fA-F]{4})([0-9a-fA-F]{4})([0-9a-fA-F]{12})",
-              "$1-$2-$3-$4-$5");
+                    "$1-$2-$3-$4-$5"
+            );
         }
 
         return UUID.fromString(value);
@@ -183,9 +173,7 @@ public class MiscUtils {
         try {
             return lookupUuidFromUrl(mojangUuidEndpoint + playerName);
         } catch (IOException | JSONException | URISyntaxException e) {
-      AntiVPN.getInstance()
+            AntiVPN.getInstance().getExecutor().logException("Error while looking up UUID for " + playerName + " from Mojang!:", e);
-          .getExecutor()
-          .logException("Error while looking up UUID for " + playerName + " from Mojang!:", e);
         }
 
         return null;
@@ -200,8 +188,8 @@ public class MiscUtils {
         funkemunkyUuidEndpoint = DEFAULT_FUNKEMUNKY_UUID_ENDPOINT;
         mojangUuidEndpoint = DEFAULT_MOJANG_UUID_ENDPOINT;
     }
-
+    public static boolean isIpv4(String ip)
-  public static boolean isIpv4(String ip) {
+    {
         return ipv4.matcher(ip).matches();
     }
 }

Common/Source/src/main/java/dev/brighten/antivpn/utils/NonnullByDefault.java

@@ -22,4 +22,6 @@ import java.lang.annotation.RetentionPolicy;
 
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-public @interface NonnullByDefault {}
+public @interface NonnullByDefault {
+
+}

Common/Source/src/main/java/dev/brighten/antivpn/utils/Preconditions.java

@@ -22,7 +22,8 @@
 package dev.brighten.antivpn.utils;
 
 public final class Preconditions {
-  private Preconditions() {}
+    private Preconditions() {
+    }
 
     public static <T> T checkNotNull(T reference) {
         if (reference == null) {
@@ -40,8 +41,7 @@ public final class Preconditions {
         }
     }
 
-  public static <T> T checkNotNull(
+    public static <T> T checkNotNull(T reference, String errorMessageTemplate, Object... errorMessageArgs) {
-      T reference, String errorMessageTemplate, Object... errorMessageArgs) {
         if (reference == null) {
             throw new NullPointerException(format(errorMessageTemplate, errorMessageArgs));
         } else {
@@ -209,8 +209,7 @@ public final class Preconditions {
         }
     }
 
-  public static <T> T checkNotNull(
+    public static <T> T checkNotNull(T obj, String errorMessageTemplate, Object p1, Object p2, Object p3) {
-      T obj, String errorMessageTemplate, Object p1, Object p2, Object p3) {
         if (obj == null) {
             throw new NullPointerException(format(errorMessageTemplate, p1, p2, p3));
         } else {
@@ -218,8 +217,7 @@ public final class Preconditions {
         }
     }
 
-  public static <T> T checkNotNull(
+    public static <T> T checkNotNull(T obj, String errorMessageTemplate, Object p1, Object p2, Object p3, Object p4) {
-      T obj, String errorMessageTemplate, Object p1, Object p2, Object p3, Object p4) {
         if (obj == null) {
             throw new NullPointerException(format(errorMessageTemplate, p1, p2, p3, p4));
         } else {
@@ -234,7 +232,7 @@ public final class Preconditions {
 
         int i;
         int placeholderStart;
-    for (i = 0; i < args.length; templateStart = placeholderStart + 2) {
+        for(i = 0; i < args.length; templateStart = placeholderStart + 2) {
             placeholderStart = template.indexOf("%s", templateStart);
             if (placeholderStart == -1) {
                 break;
@@ -249,7 +247,7 @@ public final class Preconditions {
             builder.append(" [");
             builder.append(args[i++]);
 
-      while (i < args.length) {
+            while(i < args.length) {
                 builder.append(", ");
                 builder.append(args[i++]);
             }

Common/Source/src/main/java/dev/brighten/antivpn/utils/StringUtil.java

@@ -29,10 +29,7 @@ public class StringUtil {
     }
 
     public static String varReplace(String input, APIPlayer player, VPNResponse result) {
-    return translateAlternateColorCodes(
+        return translateAlternateColorCodes('&', input.replace("%player%", player.getName())
-        '&',
-        input
-            .replace("%player%", player.getName())
                 .replace("%reason%", result.getMethod())
                 .replace("%country%", result.getCountryName())
                 .replace("%city%", result.getCity()));
@@ -41,7 +38,7 @@ public class StringUtil {
     public static String translateAlternateColorCodes(char altColorChar, String textToTranslate) {
         char[] b = textToTranslate.toCharArray();
 
-    for (int i = 0; i < b.length - 1; ++i) {
+        for(int i = 0; i < b.length - 1; ++i) {
             if (b[i] == altColorChar && "0123456789AaBbCcDdEeFfKkLlMmNnOoRr".indexOf(b[i + 1]) > -1) {
                 b[i] = 167;
                 b[i + 1] = Character.toLowerCase(b[i + 1]);

Common/Source/src/main/java/dev/brighten/antivpn/utils/Suppliers.java

@@ -16,13 +16,12 @@
 
 package dev.brighten.antivpn.utils;
 
+import java.io.Serializable;
+
 import static dev.brighten.antivpn.utils.NullnessCasts.uncheckedCastNullableTToT;
 import static dev.brighten.antivpn.utils.Preconditions.checkNotNull;
 import static java.util.Objects.requireNonNull;
 
-import java.io.Serial;
-import java.io.Serializable;
-
 /**
  * Useful suppliers.
  *
@@ -37,7 +36,7 @@ public final class Suppliers {
 
     /**
      * Returns a supplier which caches the instance retrieved during the first call to {@code get()}
-   * and returns that value on later calls to {@code get()}. See: <a
+     * and returns that value on subsequent calls to {@code get()}. See: <a
      * href="http://en.wikipedia.org/wiki/Memoization">memoization</a>
      *
      * <p>The returned supplier is thread-safe. The delegate's {@code get()} method will be invoked at
@@ -45,7 +44,7 @@ public final class Suppliers {
      * form does not contain the cached value, which will be recalculated when {@code get()} is called
      * on the reserialized instance.
      *
-   * <p>When the underlying delegate throws an exception then this memorizing supplier will keep
+     * <p>When the underlying delegate throws an exception then this memoizing supplier will keep
      * delegating calls until it returns valid data.
      *
      * <p>If {@code delegate} is an instance created by an earlier call to {@code memoize}, it is
@@ -96,7 +95,7 @@ public final class Suppliers {
                     + ")";
         }
 
-    @Serial private static final long serialVersionUID = 0;
+        private static final long serialVersionUID = 0;
     }
 
     static class NonSerializableMemoizingSupplier<T> implements Supplier<T> {

Common/Source/src/main/java/dev/brighten/antivpn/utils/Tuple.java

@@ -16,4 +16,6 @@
 
 package dev.brighten.antivpn.utils;
 
-public record Tuple<F, S>(F first, S second) {}
+public record Tuple<F, S>(F first, S second) {
+
+}

Common/Source/src/main/java/dev/brighten/antivpn/utils/config/Configuration.java

@@ -18,36 +18,40 @@ package dev.brighten.antivpn.utils.config;
 
 import java.util.*;
 
-public final class Configuration {
+public final class Configuration
+{
 
     private static final char SEPARATOR = '.';
     final Map<String, Object> self;
     final Map<String, List<String>> comments;
     private final Configuration defaults;
 
-  public Configuration() {
+    public Configuration()
-    this(null);
+    {
+        this( null );
     }
 
-  public Configuration(Configuration defaults) {
+    public Configuration(Configuration defaults)
-    this(new LinkedHashMap<String, Object>(), defaults);
+    {
+        this( new LinkedHashMap<String, Object>(), defaults );
     }
 
-  Configuration(Map<?, ?> map, Configuration defaults) {
+    Configuration(Map<?, ?> map, Configuration defaults)
+    {
         this.self = new LinkedHashMap<>();
         this.defaults = defaults;
         comments = new HashMap<>();
 
-    for (Map.Entry<?, ?> entry : map.entrySet()) {
+        for ( Map.Entry<?, ?> entry : map.entrySet() )
-      String key = (entry.getKey() == null) ? "null" : entry.getKey().toString();
+        {
+            String key = ( entry.getKey() == null ) ? "null" : entry.getKey().toString();
 
-      if (entry.getValue() instanceof Map) {
+            if ( entry.getValue() instanceof Map )
-        this.self.put(
+            {
-            key,
+                this.self.put( key, new Configuration( (Map) entry.getValue(), ( defaults == null ) ? null : defaults.getSection( key ) ) );
-            new Configuration(
+            } else
-                (Map) entry.getValue(), (defaults == null) ? null : defaults.getSection(key)));
+            {
-      } else {
+                this.self.put( key, entry.getValue() );
-        this.self.put(key, entry.getValue());
             }
         }
     }
@@ -61,29 +65,30 @@ public final class Configuration {
         String currentPath = "";
 
         int lineNumber = 0;
-    for (Iterator<String> iterator = list.iterator(); iterator.hasNext(); lineNumber++) {
+        for(Iterator<String> iterator = list.iterator(); iterator.hasNext(); lineNumber++) {
             String line = iterator.next();
 
             String trimmed = line.trim();
-      if (trimmed.startsWith("#") || trimmed.isEmpty()) {
+            if(trimmed.startsWith("#") || trimmed.isEmpty()) {
                 addCommentLine(currentPath, line);
                 continue;
             }
 
-      if (!line.isEmpty()) {
+            if(!line.isEmpty()) {
-        if (line.contains(":")) {
+                if(line.contains(":")) {
 
                     int layerFromLine = getLayerFromLine(line, lineNumber);
 
-          if (layerFromLine < currentLayer) {
+                    if(layerFromLine < currentLayer) {
                         currentPath = regressPathBy(currentLayer - layerFromLine, currentPath);
                     }
 
                     String key = getKeyFromLine(line);
 
-          if (currentLayer == 0) {
+                    if(currentLayer == 0) {
                         currentPath = key;
-          } else {
+                    }
+                    else {
                         currentPath += "." + key;
                     }
                 }
@@ -94,7 +99,7 @@ public final class Configuration {
     private void addCommentLine(String currentPath, String line) {
 
         List<String> list = comments.get(currentPath);
-    if (list == null) {
+        if(list == null) {
             list = new ArrayList<>();
         }
         list.add(line);
@@ -105,8 +110,8 @@ public final class Configuration {
     String getKeyFromLine(String line) {
         String key = null;
 
-    for (int i = 0; i < line.length(); i++) {
+        for(int i = 0; i < line.length(); i++) {
-      if (line.charAt(i) == ':') {
+            if(line.charAt(i) == ':') {
                 key = line.substring(0, i);
                 break;
             }
@@ -116,15 +121,15 @@ public final class Configuration {
     }
 
     String regressPathBy(int i, String currentPath) {
-    if (i <= 0) {
+        if(i <= 0) {
             return currentPath;
         }
         String[] split = currentPath.split("\\.");
 
         String rebuild = "";
-    for (int j = 0; j < split.length - i; j++) {
+        for(int j = 0; j < split.length - i; j++) {
             rebuild += split[j];
-      if (j <= (split.length - j)) {
+            if(j <= (split.length - j)) {
                 rebuild += ".";
             }
         }
@@ -135,94 +140,109 @@ public final class Configuration {
     int getLayerFromLine(String line, int lineNumber) {
 
         double d = 0;
-    for (int i = 0; i < line.length(); i++) {
+        for(int i = 0; i < line.length(); i++) {
-      if (line.charAt(i) == ' ') {
+            if(line.charAt(i) == ' ') {
                 d += 0.5;
-      } else {
+            }
+            else {
                 break;
             }
         }
 
         return (int) d;
+
     }
 
-  private Configuration getSectionFor(String path) {
+    private Configuration getSectionFor(String path)
-    int index = path.indexOf(SEPARATOR);
+    {
-    if (index == -1) {
+        int index = path.indexOf( SEPARATOR );
+        if ( index == -1 )
+        {
             return this;
         }
 
-    String root = path.substring(0, index);
+        String root = path.substring( 0, index );
-    Object section = self.get(root);
+        Object section = self.get( root );
-    if (section == null) {
+        if ( section == null )
-      section = new Configuration((defaults == null) ? null : defaults.getSection(root));
+        {
-      self.put(root, section);
+            section = new Configuration( ( defaults == null ) ? null : defaults.getSection( root ) );
+            self.put( root, section );
         }
 
         return (Configuration) section;
     }
 
-  private String getChild(String path) {
+    private String getChild(String path)
-    int index = path.indexOf(SEPARATOR);
+    {
-    return (index == -1) ? path : path.substring(index + 1);
+        int index = path.indexOf( SEPARATOR );
+        return ( index == -1 ) ? path : path.substring( index + 1 );
     }
 
     /*------------------------------------------------------------------------*/
     @SuppressWarnings("unchecked")
-  public <T> T get(String path, T def) {
+    public <T> T get(String path, T def)
-    Configuration section = getSectionFor(path);
+    {
+        Configuration section = getSectionFor( path );
         Object val;
-    if (section == this) {
+        if ( section == this )
-      val = self.get(path);
+        {
-    } else {
+            val = self.get( path );
-      val = section.get(getChild(path), def);
+        } else
+        {
+            val = section.get( getChild( path ), def );
         }
 
-    if (val == null && def instanceof Configuration) {
+        if ( val == null && def instanceof Configuration )
-      self.put(path, def);
+        {
+            self.put( path, def );
         }
 
-    return (val != null) ? (T) val : def;
+        return ( val != null ) ? (T) val : def;
     }
 
-  public boolean contains(String path) {
+    public boolean contains(String path)
-    return get(path, null) != null;
+    {
+        return get( path, null ) != null;
     }
 
-  public Object get(String path) {
+    public Object get(String path)
-    return get(path, getDefault(path));
+    {
+        return get( path, getDefault( path ) );
     }
 
-  public Object getDefault(String path) {
+    public Object getDefault(String path)
-    return (defaults == null) ? null : defaults.get(path);
+    {
+        return ( defaults == null ) ? null : defaults.get( path );
     }
 
-  public void set(String path, Object value) {
+    public void set(String path, Object value)
-    if (value instanceof Map) {
+    {
-      value = new Configuration((Map) value, (defaults == null) ? null : defaults.getSection(path));
+        if ( value instanceof Map )
+        {
+            value = new Configuration( (Map) value, ( defaults == null ) ? null : defaults.getSection( path ) );
         }
 
-    Configuration section = getSectionFor(path);
+        Configuration section = getSectionFor( path );
-    if (section == this) {
+        if ( section == this )
-      if (value == null) {
+        {
-        self.remove(path);
+            if ( value == null )
-      } else {
+            {
-        self.put(path, value);
+                self.remove( path );
+            } else
+            {
+                self.put( path, value );
             }
-    } else {
+        } else
-      section.set(getChild(path), value);
+        {
+            section.set( getChild( path ), value );
         }
     }
 
     /*------------------------------------------------------------------------*/
-  public Configuration getSection(String path) {
+    public Configuration getSection(String path)
-    Object def = getDefault(path);
+    {
-    return (Configuration)
+        Object def = getDefault( path );
-        get(
+        return (Configuration) get( path, ( def instanceof Configuration ) ? def : new Configuration( ( defaults == null ) ? null : defaults.getSection( path ) ) );
-            path,
-            (def instanceof Configuration)
-                ? def
-                : new Configuration((defaults == null) ? null : defaults.getSection(path)));
     }
 
     /**
@@ -230,212 +250,258 @@ public final class Configuration {
      *
      * @return top level keys for this section
      */
-  public Collection<String> getKeys() {
+    public Collection<String> getKeys()
-    return new LinkedHashSet<>(self.keySet());
+    {
+        return new LinkedHashSet<>( self.keySet() );
     }
 
     /*------------------------------------------------------------------------*/
-  public byte getByte(String path) {
+    public byte getByte(String path)
-    Object def = getDefault(path);
+    {
-    return getByte(path, (def instanceof Number) ? ((Number) def).byteValue() : 0);
+        Object def = getDefault( path );
+        return getByte( path, ( def instanceof Number ) ? ( (Number) def ).byteValue() : 0 );
     }
 
-  public byte getByte(String path, byte def) {
+    public byte getByte(String path, byte def)
-    Object val = get(path, def);
+    {
-    return (val instanceof Number) ? ((Number) val).byteValue() : def;
+        Object val = get( path, def );
+        return ( val instanceof Number ) ? ( (Number) val ).byteValue() : def;
     }
 
-  public List<Byte> getByteList(String path) {
+    public List<Byte> getByteList(String path)
-    List<?> list = getList(path);
+    {
+        List<?> list = getList( path );
         List<Byte> result = new ArrayList<>();
 
-    for (Object object : list) {
+        for ( Object object : list )
-      if (object instanceof Number) {
+        {
-        result.add(((Number) object).byteValue());
+            if ( object instanceof Number )
+            {
+                result.add( ( (Number) object ).byteValue() );
             }
         }
 
         return result;
     }
 
-  public short getShort(String path) {
+    public short getShort(String path)
-    Object def = getDefault(path);
+    {
-    return getShort(path, (def instanceof Number) ? ((Number) def).shortValue() : 0);
+        Object def = getDefault( path );
+        return getShort( path, ( def instanceof Number ) ? ( (Number) def ).shortValue() : 0 );
     }
 
-  public short getShort(String path, short def) {
+    public short getShort(String path, short def)
-    Object val = get(path, def);
+    {
-    return (val instanceof Number) ? ((Number) val).shortValue() : def;
+        Object val = get( path, def );
+        return ( val instanceof Number ) ? ( (Number) val ).shortValue() : def;
     }
 
-  public List<Short> getShortList(String path) {
+    public List<Short> getShortList(String path)
-    List<?> list = getList(path);
+    {
+        List<?> list = getList( path );
         List<Short> result = new ArrayList<>();
 
-    for (Object object : list) {
+        for ( Object object : list )
-      if (object instanceof Number) {
+        {
-        result.add(((Number) object).shortValue());
+            if ( object instanceof Number )
+            {
+                result.add( ( (Number) object ).shortValue() );
             }
         }
 
         return result;
     }
 
-  public int getInt(String path) {
+    public int getInt(String path)
-    Object def = getDefault(path);
+    {
-    return getInt(path, (def instanceof Number) ? ((Number) def).intValue() : 0);
+        Object def = getDefault( path );
+        return getInt( path, ( def instanceof Number ) ? ( (Number) def ).intValue() : 0 );
     }
 
-  public int getInt(String path, int def) {
+    public int getInt(String path, int def)
-    Object val = get(path, def);
+    {
-    return (val instanceof Number) ? ((Number) val).intValue() : def;
+        Object val = get( path, def );
+        return ( val instanceof Number ) ? ( (Number) val ).intValue() : def;
     }
 
-  public List<Integer> getIntList(String path) {
+    public List<Integer> getIntList(String path)
-    List<?> list = getList(path);
+    {
+        List<?> list = getList( path );
         List<Integer> result = new ArrayList<>();
 
-    for (Object object : list) {
+        for ( Object object : list )
-      if (object instanceof Number) {
+        {
-        result.add(((Number) object).intValue());
+            if ( object instanceof Number )
+            {
+                result.add( ( (Number) object ).intValue() );
             }
         }
 
         return result;
     }
 
-  public long getLong(String path) {
+    public long getLong(String path)
-    Object def = getDefault(path);
+    {
-    return getLong(path, (def instanceof Number) ? ((Number) def).longValue() : 0);
+        Object def = getDefault( path );
+        return getLong( path, ( def instanceof Number ) ? ( (Number) def ).longValue() : 0 );
     }
 
-  public long getLong(String path, long def) {
+    public long getLong(String path, long def)
-    Object val = get(path, def);
+    {
-    return (val instanceof Number) ? ((Number) val).longValue() : def;
+        Object val = get( path, def );
+        return ( val instanceof Number ) ? ( (Number) val ).longValue() : def;
     }
 
-  public List<Long> getLongList(String path) {
+    public List<Long> getLongList(String path)
-    List<?> list = getList(path);
+    {
+        List<?> list = getList( path );
         List<Long> result = new ArrayList<>();
 
-    for (Object object : list) {
+        for ( Object object : list )
-      if (object instanceof Number) {
+        {
-        result.add(((Number) object).longValue());
+            if ( object instanceof Number )
+            {
+                result.add( ( (Number) object ).longValue() );
             }
         }
 
         return result;
     }
 
-  public float getFloat(String path) {
+    public float getFloat(String path)
-    Object def = getDefault(path);
+    {
-    return getFloat(path, (def instanceof Number) ? ((Number) def).floatValue() : 0);
+        Object def = getDefault( path );
+        return getFloat( path, ( def instanceof Number ) ? ( (Number) def ).floatValue() : 0 );
     }
 
-  public float getFloat(String path, float def) {
+    public float getFloat(String path, float def)
-    Object val = get(path, def);
+    {
-    return (val instanceof Number) ? ((Number) val).floatValue() : def;
+        Object val = get( path, def );
+        return ( val instanceof Number ) ? ( (Number) val ).floatValue() : def;
     }
 
-  public List<Float> getFloatList(String path) {
+    public List<Float> getFloatList(String path)
-    List<?> list = getList(path);
+    {
+        List<?> list = getList( path );
         List<Float> result = new ArrayList<>();
 
-    for (Object object : list) {
+        for ( Object object : list )
-      if (object instanceof Number) {
+        {
-        result.add(((Number) object).floatValue());
+            if ( object instanceof Number )
+            {
+                result.add( ( (Number) object ).floatValue() );
             }
         }
 
         return result;
     }
 
-  public double getDouble(String path) {
+    public double getDouble(String path)
-    Object def = getDefault(path);
+    {
-    return getDouble(path, (def instanceof Number) ? ((Number) def).doubleValue() : 0);
+        Object def = getDefault( path );
+        return getDouble( path, ( def instanceof Number ) ? ( (Number) def ).doubleValue() : 0 );
     }
 
-  public double getDouble(String path, double def) {
+    public double getDouble(String path, double def)
-    Object val = get(path, def);
+    {
-    return (val instanceof Number) ? ((Number) val).doubleValue() : def;
+        Object val = get( path, def );
+        return ( val instanceof Number ) ? ( (Number) val ).doubleValue() : def;
     }
 
-  public List<Double> getDoubleList(String path) {
+    public List<Double> getDoubleList(String path)
-    List<?> list = getList(path);
+    {
+        List<?> list = getList( path );
         List<Double> result = new ArrayList<>();
 
-    for (Object object : list) {
+        for ( Object object : list )
-      if (object instanceof Number) {
+        {
-        result.add(((Number) object).doubleValue());
+            if ( object instanceof Number )
+            {
+                result.add( ( (Number) object ).doubleValue() );
             }
         }
 
         return result;
     }
 
-  public boolean getBoolean(String path) {
+    public boolean getBoolean(String path)
-    Object def = getDefault(path);
+    {
-    return getBoolean(path, (def instanceof Boolean) ? (Boolean) def : false);
+        Object def = getDefault( path );
+        return getBoolean( path, ( def instanceof Boolean ) ? (Boolean) def : false );
     }
 
-  public boolean getBoolean(String path, boolean def) {
+    public boolean getBoolean(String path, boolean def)
-    Object val = get(path, def);
+    {
-    return (val instanceof Boolean) ? (Boolean) val : def;
+        Object val = get( path, def );
+        return ( val instanceof Boolean ) ? (Boolean) val : def;
     }
 
-  public List<Boolean> getBooleanList(String path) {
+    public List<Boolean> getBooleanList(String path)
-    List<?> list = getList(path);
+    {
+        List<?> list = getList( path );
         List<Boolean> result = new ArrayList<>();
 
-    for (Object object : list) {
+        for ( Object object : list )
-      if (object instanceof Boolean) {
+        {
-        result.add((Boolean) object);
+            if ( object instanceof Boolean )
+            {
+                result.add( (Boolean) object );
             }
         }
 
         return result;
     }
 
-  public char getChar(String path) {
+    public char getChar(String path)
-    Object def = getDefault(path);
+    {
-    return getChar(path, (def instanceof Character) ? (Character) def : '\u0000');
+        Object def = getDefault( path );
+        return getChar( path, ( def instanceof Character ) ? (Character) def : '\u0000' );
     }
 
-  public char getChar(String path, char def) {
+    public char getChar(String path, char def)
-    Object val = get(path, def);
+    {
-    return (val instanceof Character) ? (Character) val : def;
+        Object val = get( path, def );
+        return ( val instanceof Character ) ? (Character) val : def;
     }
 
-  public List<Character> getCharList(String path) {
+    public List<Character> getCharList(String path)
-    List<?> list = getList(path);
+    {
+        List<?> list = getList( path );
         List<Character> result = new ArrayList<>();
 
-    for (Object object : list) {
+        for ( Object object : list )
-      if (object instanceof Character) {
+        {
-        result.add((Character) object);
+            if ( object instanceof Character )
+            {
+                result.add( (Character) object );
             }
         }
 
         return result;
     }
 
-  public String getString(String path) {
+    public String getString(String path)
-    Object def = getDefault(path);
+    {
-    return getString(path, (def instanceof String) ? (String) def : "");
+        Object def = getDefault( path );
+        return getString( path, ( def instanceof String ) ? (String) def : "" );
     }
 
-  public String getString(String path, String def) {
+    public String getString(String path, String def)
-    Object val = get(path, def);
+    {
-    return (val instanceof String) ? (String) val : def;
+        Object val = get( path, def );
+        return ( val instanceof String ) ? (String) val : def;
     }
 
-  public List<String> getStringList(String path) {
+    public List<String> getStringList(String path)
-    List<?> list = getList(path);
+    {
+        List<?> list = getList( path );
         List<String> result = new ArrayList<>();
 
-    for (Object object : list) {
+        for ( Object object : list )
-      if (object instanceof String) {
+        {
-        result.add((String) object);
+            if ( object instanceof String )
+            {
+                result.add( (String) object );
             }
         }
 
@@ -443,13 +509,15 @@ public final class Configuration {
     }
 
     /*------------------------------------------------------------------------*/
-  public List<?> getList(String path) {
+    public List<?> getList(String path)
-    Object def = getDefault(path);
+    {
-    return getList(path, (def instanceof List<?>) ? (List<?>) def : Collections.EMPTY_LIST);
+        Object def = getDefault( path );
+        return getList( path, ( def instanceof List<?> ) ? (List<?>) def : Collections.EMPTY_LIST );
     }
 
-  public List<?> getList(String path, List<?> def) {
+    public List<?> getList(String path, List<?> def)
-    Object val = get(path, def);
+    {
-    return (val instanceof List<?>) ? (List<?>) val : def;
+        Object val = get( path, def );
+        return ( val instanceof List<?> ) ? (List<?>) val : def;
     }
 }

Common/Source/src/main/java/dev/brighten/antivpn/utils/config/ConfigurationProvider.java

@@ -20,22 +20,26 @@ import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class ConfigurationProvider {
+public abstract class ConfigurationProvider
+{
 
-  public static final Map<Class<? extends ConfigurationProvider>, ConfigurationProvider> providers =
+    public static final Map<Class<? extends ConfigurationProvider>, ConfigurationProvider> providers = new HashMap<>();
-      new HashMap<>();
 
-  static {
+    static
-    try {
+    {
-      providers.put(YamlConfiguration.class, new YamlConfiguration());
+        try
-    } catch (NoClassDefFoundError ex) {
+        {
+            providers.put( YamlConfiguration.class, new YamlConfiguration() );
+        } catch ( NoClassDefFoundError ex )
+        {
             ex.printStackTrace();
             // Ignore, no SnakeYAML
         }
     }
 
-  public static ConfigurationProvider getProvider(Class<? extends ConfigurationProvider> provider) {
+    public static ConfigurationProvider getProvider(Class<? extends ConfigurationProvider> provider)
-    return providers.get(provider);
+    {
+        return providers.get( provider );
     }
 
     /*------------------------------------------------------------------------*/

Common/Source/src/main/java/dev/brighten/antivpn/utils/config/YamlConfiguration.java

@@ -16,10 +16,6 @@
 
 package dev.brighten.antivpn.utils.config;
 
-import java.io.*;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.SneakyThrows;
@@ -29,38 +25,46 @@ import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.representer.Representer;
 
-@NoArgsConstructor(access = AccessLevel.PACKAGE)
+import java.io.*;
-public class YamlConfiguration extends ConfigurationProvider {
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 
-  private final ThreadLocal<Yaml> yaml =
+@NoArgsConstructor(access = AccessLevel.PACKAGE)
-      new ThreadLocal<Yaml>() {
+public class YamlConfiguration extends ConfigurationProvider
-        @Override
+{
-        protected Yaml initialValue() {
+
-          DumperOptions options = new DumperOptions();
+    private final ThreadLocal<Yaml> yaml = new ThreadLocal<Yaml>()
-          options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-          Representer representer =
-              new Representer(options) {
     {
-                  representers.put(
+        @Override
-                      Configuration.class, data -> represent(((Configuration) data).self));
+        protected Yaml initialValue()
+        {
+            DumperOptions options = new DumperOptions();
+            options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
+            Representer representer = new Representer(options)
+            {
+                {
+                    representers.put( Configuration.class, data -> represent( ( (Configuration) data ).self ));
                 }
             };
 
             representer.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-          return new Yaml(new Constructor(new LoaderOptions()), representer, options);
+            return new Yaml( new Constructor(new LoaderOptions()), representer, options );
         }
     };
 
     @Override
-  public void save(Configuration config, File file) throws IOException {
+    public void save(Configuration config, File file) throws IOException
-    try (Writer writer =
+    {
-        new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8)) {
+        try ( Writer writer = new OutputStreamWriter( new FileOutputStream( file ), StandardCharsets.UTF_8 ) )
-      save(config, writer);
+        {
+            save( config, writer );
         }
     }
 
     @Override
-  public void save(Configuration config, Writer writer) {
+    public void save(Configuration config, Writer writer)
+    {
         String contents = this.yaml.get().dump(config.self);
         if (contents.equals("{}\n")) {
             contents = "";
@@ -75,7 +79,7 @@ public class YamlConfiguration extends ConfigurationProvider {
         StringBuilder sb = new StringBuilder();
 
         int lineNumber = 0;
-    for (Iterator<String> iterator = list.iterator(); iterator.hasNext(); lineNumber++) {
+        for(Iterator<String> iterator = list.iterator(); iterator.hasNext(); lineNumber++) {
             String line = iterator.next();
             sb.append(line);
             sb.append('\n');
@@ -86,9 +90,7 @@ public class YamlConfiguration extends ConfigurationProvider {
                     int layerFromLine = config.getLayerFromLine(line, lineNumber);
 
                     if (layerFromLine < currentLayer) {
-            currentPath =
+                        currentPath = new StringBuilder(config.regressPathBy(currentLayer - layerFromLine, currentPath.toString()));
-                new StringBuilder(
-                    config.regressPathBy(currentLayer - layerFromLine, currentPath.toString()));
                     }
 
                     String key = config.getKeyFromLine(line);
@@ -101,11 +103,7 @@ public class YamlConfiguration extends ConfigurationProvider {
 
                     String path = currentPath.toString();
                     if (config.comments.containsKey(path)) {
-            config
+                        config.comments.get(path).forEach(string -> {
-                .comments
-                .get(path)
-                .forEach(
-                    string -> {
                             sb.append(string);
                             sb.append('\n');
                         });
@@ -120,34 +118,37 @@ public class YamlConfiguration extends ConfigurationProvider {
             e.printStackTrace();
         }
     }
-
     @Override
-  public Configuration load(File file) throws IOException {
+    public Configuration load(File file) throws IOException
-    return load(file, null);
+    {
+        return load( file, null );
     }
 
     @Override
-  public Configuration load(File file, Configuration defaults) throws IOException {
+    public Configuration load(File file, Configuration defaults) throws IOException
-    try (FileInputStream is = new FileInputStream(file)) {
+    {
-      return load(is, defaults);
+        try ( FileInputStream is = new FileInputStream( file ) )
+        {
+            return load( is, defaults );
         }
     }
 
     @Override
-  public Configuration load(Reader reader) {
+    public Configuration load(Reader reader)
-    return load(reader, null);
+    {
+        return load( reader, null );
     }
 
     @SneakyThrows
     @Override
-  public Configuration load(Reader reader, Configuration defaults) {
+    public Configuration load(Reader reader, Configuration defaults)
-    BufferedReader input =
+    {
-        reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader);
+        BufferedReader input = reader instanceof BufferedReader ? (BufferedReader)reader : new BufferedReader(reader);
         StringBuilder builder = new StringBuilder();
 
         String line;
         try {
-      while ((line = input.readLine()) != null) {
+            while((line = input.readLine()) != null) {
                 builder.append(line);
                 builder.append('\n');
             }
@@ -155,35 +156,42 @@ public class YamlConfiguration extends ConfigurationProvider {
             input.close();
         }
 
+
         return load(builder.toString(), defaults);
     }
 
     @Override
-  public Configuration load(InputStream is) {
+    public Configuration load(InputStream is)
+    {
         return this.load(new InputStreamReader(is, Charset.defaultCharset()));
     }
 
     @Override
-  public Configuration load(InputStream is, Configuration defaults) {
+    public Configuration load(InputStream is, Configuration defaults)
+    {
         return this.load(new InputStreamReader(is, Charset.defaultCharset()), defaults);
     }
 
     @Override
-  public Configuration load(String string) {
+    public Configuration load(String string)
-    return load(string, null);
+    {
+        return load( string, null );
     }
 
+
     @Override
     @SuppressWarnings("unchecked")
-  public Configuration load(String contents, Configuration defaults) {
+    public Configuration load(String contents, Configuration defaults)
+    {
         Map<String, Object> map;
         LoaderOptions loaderOptions = new LoaderOptions();
         loaderOptions.setMaxAliasesForCollections(2147483647);
         map = this.yaml.get().loadAs(contents, LinkedHashMap.class);
 
-    Configuration config = new Configuration(map, defaults);
+        Configuration config = new Configuration( map, defaults );
         config.loadFromString(contents);
 
         return config;
     }
+
 }

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/CDL.java

@@ -17,18 +17,21 @@
 package dev.brighten.antivpn.utils.json;
 
 /**
- * This provides static methods to convert comma delimited text into a JSONArray, and to covert a
+ * This provides static methods to convert comma delimited text into a
- * JSONArray into comma delimited text. Comma delimited text is a very popular format for data
+ * JSONArray, and to covert a JSONArray into comma delimited text. Comma
- * interchange. It is understood by most database, spreadsheet, and organizer programs.
+ * delimited text is a very popular format for data interchange. It is
- *
+ * understood by most database, spreadsheet, and organizer programs.
- * <p>Each row of text represents a row in a table or a data record. Each row ends with a NEWLINE
+ * <p>
- * character. Each row contains one or more values. Values are separated by commas. A value can
+ * Each row of text represents a row in a table or a data record. Each row
- * contain any character except for comma, unless is is wrapped in single quotes or double quotes.
+ * ends with a NEWLINE character. Each row contains one or more values.
- *
+ * Values are separated by commas. A value can contain any character except
- * <p>The first row usually contains the names of the columns.
+ * for comma, unless is is wrapped in single quotes or double quotes.
- *
+ * <p>
- * <p>A comma delimited list can be converted into a JSONArray of JSONObjects. The names for the
+ * The first row usually contains the names of the columns.
- * elements in the JSONObjects can be taken from the names in the first row.
+ * <p>
+ * A comma delimited list can be converted into a JSONArray of JSONObjects.
+ * The names for the elements in the JSONObjects can be taken from the names
+ * in the first row.
  *
  * @author JSON.org
  * @version 2010-12-24
@@ -36,7 +39,8 @@ package dev.brighten.antivpn.utils.json;
 public class CDL {
 
     /**
-   * Get the next value. The value can be wrapped in quotes. The value can be empty.
+     * Get the next value. The value can be wrapped in quotes. The value can
+     * be empty.
      *
      * @param x A JSONTokener of the source text.
      * @return The value string, or null if empty.
@@ -88,7 +92,8 @@ public class CDL {
         for (; ; ) {
             String value = getValue(x);
             char c = x.next();
-      if (value == null || (ja.length() == 0 && value.isEmpty() && c != ',')) {
+            if (value == null ||
+                    (ja.length() == 0 && value.length() == 0 && c != ',')) {
                 return null;
             }
             ja.put(value);
@@ -100,7 +105,8 @@ public class CDL {
                     if (c == '\n' || c == '\r' || c == 0) {
                         return ja;
                     }
-          throw x.syntaxError("Bad character '" + c + "' (" + (int) c + ").");
+                    throw x.syntaxError("Bad character '" + c + "' (" +
+                            (int) c + ").");
                 }
                 c = x.next();
             }
@@ -108,23 +114,26 @@ public class CDL {
     }
 
     /**
-   * Produce a JSONObject from a row of comma delimited text, using a parallel JSONArray of strings
+     * Produce a JSONObject from a row of comma delimited text, using a
-   * to provides the names of the elements.
+     * parallel JSONArray of strings to provides the names of the elements.
      *
-   * @param names A JSONArray of names. This is commonly obtained from the first row of a comma
+     * @param names A JSONArray of names. This is commonly obtained from the
-   *     delimited text file using the rowToJSONArray method.
+     *              first row of a comma delimited text file using the rowToJSONArray
+     *              method.
      * @param x     A JSONTokener of the source text.
      * @return A JSONObject combining the names and values.
      * @throws JSONException
      */
-  public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x) throws JSONException {
+    public static JSONObject rowToJSONObject(JSONArray names, JSONTokener x)
+            throws JSONException {
         JSONArray ja = rowToJSONArray(x);
         return ja != null ? ja.toJSONObject(names) : null;
     }
 
     /**
-   * Produce a comma delimited text row from a JSONArray. Values containing the comma character will
+     * Produce a comma delimited text row from a JSONArray. Values containing
-   * be quoted. Troublesome characters may be removed.
+     * the comma character will be quoted. Troublesome characters may be
+     * removed.
      *
      * @param ja A JSONArray of strings.
      * @return A string ending in NEWLINE.
@@ -138,12 +147,9 @@ public class CDL {
             Object object = ja.opt(i);
             if (object != null) {
                 String string = object.toString();
-        if (string.length() > 0
+                if (string.length() > 0 && (string.indexOf(',') >= 0 ||
-            && (string.indexOf(',') >= 0
+                        string.indexOf('\n') >= 0 || string.indexOf('\r') >= 0 ||
-                || string.indexOf('\n') >= 0
+                        string.indexOf(0) >= 0 || string.charAt(0) == '"')) {
-                || string.indexOf('\r') >= 0
-                || string.indexOf(0) >= 0
-                || string.charAt(0) == '"')) {
                     sb.append('"');
                     int length = string.length();
                     for (int j = 0; j < length; j += 1) {
@@ -163,8 +169,8 @@ public class CDL {
     }
 
     /**
-   * Produce a JSONArray of JSONObjects from a comma delimited text string, using the first row as a
+     * Produce a JSONArray of JSONObjects from a comma delimited text string,
-   * source of names.
+     * using the first row as a source of names.
      *
      * @param string The comma delimited text.
      * @return A JSONArray of JSONObjects.
@@ -175,8 +181,8 @@ public class CDL {
     }
 
     /**
-   * Produce a JSONArray of JSONObjects from a comma delimited text string, using the first row as a
+     * Produce a JSONArray of JSONObjects from a comma delimited text string,
-   * source of names.
+     * using the first row as a source of names.
      *
      * @param x The JSONTokener containing the comma delimited text.
      * @return A JSONArray of JSONObjects.
@@ -187,28 +193,30 @@ public class CDL {
     }
 
     /**
-   * Produce a JSONArray of JSONObjects from a comma delimited text string using a supplied
+     * Produce a JSONArray of JSONObjects from a comma delimited text string
-   * JSONArray as the source of element names.
+     * using a supplied JSONArray as the source of element names.
      *
      * @param names  A JSONArray of strings.
      * @param string The comma delimited text.
      * @return A JSONArray of JSONObjects.
      * @throws JSONException
      */
-  public static JSONArray toJSONArray(JSONArray names, String string) throws JSONException {
+    public static JSONArray toJSONArray(JSONArray names, String string)
+            throws JSONException {
         return toJSONArray(names, new JSONTokener(string));
     }
 
     /**
-   * Produce a JSONArray of JSONObjects from a comma delimited text string using a supplied
+     * Produce a JSONArray of JSONObjects from a comma delimited text string
-   * JSONArray as the source of element names.
+     * using a supplied JSONArray as the source of element names.
      *
      * @param names A JSONArray of strings.
      * @param x     A JSONTokener of the source text.
      * @return A JSONArray of JSONObjects.
      * @throws JSONException
      */
-  public static JSONArray toJSONArray(JSONArray names, JSONTokener x) throws JSONException {
+    public static JSONArray toJSONArray(JSONArray names, JSONTokener x)
+            throws JSONException {
         if (names == null || names.length() == 0) {
             return null;
         }
@@ -226,9 +234,11 @@ public class CDL {
         return ja;
     }
 
+
     /**
-   * Produce a comma delimited text from a JSONArray of JSONObjects. The first row will be a list of
+     * Produce a comma delimited text from a JSONArray of JSONObjects. The
-   * names obtained by inspecting the first JSONObject.
+     * first row will be a list of names obtained by inspecting the first
+     * JSONObject.
      *
      * @param ja A JSONArray of JSONObjects.
      * @return A comma delimited text.
@@ -246,15 +256,17 @@ public class CDL {
     }
 
     /**
-   * Produce a comma delimited text from a JSONArray of JSONObjects using a provided list of names.
+     * Produce a comma delimited text from a JSONArray of JSONObjects using
-   * The list of names is not included in the output.
+     * a provided list of names. The list of names is not included in the
+     * output.
      *
      * @param names A JSONArray of strings.
      * @param ja    A JSONArray of JSONObjects.
      * @return A comma delimited text.
      * @throws JSONException
      */
-  public static String toString(JSONArray names, JSONArray ja) throws JSONException {
+    public static String toString(JSONArray names, JSONArray ja)
+            throws JSONException {
         if (names == null || names.length() == 0) {
             return null;
         }

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/Cookie.java

@@ -17,8 +17,8 @@
 package dev.brighten.antivpn.utils.json;
 
 /**
- * Convert a web browser cookie specification to a JSONObject and back. JSON and Cookies are both
+ * Convert a web browser cookie specification to a JSONObject and back.
- * notations for name/value pairs.
+ * JSON and Cookies are both notations for name/value pairs.
  *
  * @author JSON.org
  * @version 2010-12-24
@@ -26,12 +26,14 @@ package dev.brighten.antivpn.utils.json;
 public class Cookie {
 
     /**
-   * Produce a copy of a string in which the characters '+', '%', '=', ';' and control characters
+     * Produce a copy of a string in which the characters '+', '%', '=', ';'
-   * are replaced with "%hh". This is a gentle form of URL encoding, attempting to cause as little
+     * and control characters are replaced with "%hh". This is a gentle form
-   * distortion to the string as possible. The characters '=' and ';' are meta characters in
+     * of URL encoding, attempting to cause as little distortion to the
-   * cookies. By convention, they are escaped using the URL-encoding. This is only a convention, not
+     * string as possible. The characters '=' and ';' are meta characters in
-   * a standard. Often, cookies are expected to have encoded values. We encode '=' and ';' because
+     * cookies. By convention, they are escaped using the URL-encoding. This is
-   * we must. We encode '%' and '+' because they are meta characters in URL encoding.
+     * only a convention, not a standard. Often, cookies are expected to have
+     * encoded values. We encode '=' and ';' because we must. We encode '%' and
+     * '+' because they are meta characters in URL encoding.
      *
      * @param string The source string.
      * @return The escaped result.
@@ -54,17 +56,21 @@ public class Cookie {
         return sb.toString();
     }
 
+
     /**
-   * Convert a cookie specification string into a JSONObject. The string will contain a name value
+     * Convert a cookie specification string into a JSONObject. The string
-   * pair separated by '='. The name and the value will be unescaped, possibly converting '+' and
+     * will contain a name value pair separated by '='. The name and the value
-   * '%' sequences. The cookie properties may follow, separated by ';', also represented as
+     * will be unescaped, possibly converting '+' and '%' sequences. The
-   * name=value (except the secure property, which does not have a value). The name will be stored
+     * cookie properties may follow, separated by ';', also represented as
-   * under the key "name", and the value will be stored under the key "value". This method does not
+     * name=value (except the secure property, which does not have a value).
-   * do checking or validation of the parameters. It only converts the cookie string into a
+     * The name will be stored under the key "name", and the value will be
-   * JSONObject.
+     * stored under the key "value". This method does not do checking or
+     * validation of the parameters. It only converts the cookie string into
+     * a JSONObject.
      *
      * @param string The cookie specification string.
-   * @return A JSONObject containing "name", "value", and possibly other members.
+     * @return A JSONObject containing "name", "value", and possibly other
+     * members.
      * @throws JSONException
      */
     public static JSONObject toJSONObject(String string) throws JSONException {
@@ -93,10 +99,13 @@ public class Cookie {
         return jo;
     }
 
+
     /**
-   * Convert a JSONObject into a cookie specification string. The JSONObject must contain "name" and
+     * Convert a JSONObject into a cookie specification string. The JSONObject
-   * "value" members. If the JSONObject contains "expires", "domain", "path", or "secure" members,
+     * must contain "name" and "value" members.
-   * they will be appended to the cookie specification string. All other members are ignored.
+     * If the JSONObject contains "expires", "domain", "path", or "secure"
+     * members, they will be appended to the cookie specification string.
+     * All other members are ignored.
      *
      * @param jo A JSONObject
      * @return A cookie specification string
@@ -127,10 +136,12 @@ public class Cookie {
     }
 
     /**
-   * Convert <code>%</code><i>hh</i> sequences to single characters, and convert plus to space.
+     * Convert <code>%</code><i>hh</i> sequences to single characters, and
+     * convert plus to space.
      *
-   * @param string A string that may contain <code>+</code>&nbsp;<small>(plus)</small> and <code>%
+     * @param string A string that may contain
-   *     </code><i>hh</i> sequences.
+     *               <code>+</code>&nbsp;<small>(plus)</small> and
+     *               <code>%</code><i>hh</i> sequences.
      * @return The unescaped string.
      */
     public static String unescape(String string) {

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/CookieList.java

@@ -27,11 +27,13 @@ import java.util.Iterator;
 public class CookieList {
 
     /**
-   * Convert a cookie list into a JSONObject. A cookie list is a sequence of name/value pairs. The
+     * Convert a cookie list into a JSONObject. A cookie list is a sequence
-   * names are separated from the values by '='. The pairs are separated by ';'. The names and the
+     * of name/value pairs. The names are separated from the values by '='.
-   * values will be unescaped, possibly converting '+' and '%' sequences.
+     * The pairs are separated by ';'. The names and the values
-   *
+     * will be unescaped, possibly converting '+' and '%' sequences.
-   * <p>To add a cookie to a cooklist, cookielistJSONObject.put(cookieJSONObject.getString("name"),
+     * <p>
+     * To add a cookie to a cooklist,
+     * cookielistJSONObject.put(cookieJSONObject.getString("name"),
      * cookieJSONObject.getString("value"));
      *
      * @param string A cookie list string
@@ -50,10 +52,12 @@ public class CookieList {
         return jo;
     }
 
+
     /**
-   * Convert a JSONObject into a cookie list. A cookie list is a sequence of name/value pairs. The
+     * Convert a JSONObject into a cookie list. A cookie list is a sequence
-   * names are separated from the values by '='. The pairs are separated by ';'. The characters '%',
+     * of name/value pairs. The names are separated from the values by '='.
-   * '+', '=', and ';' in the names and values are replaced by "%hh".
+     * The pairs are separated by ';'. The characters '%', '+', '=', and ';'
+     * in the names and values are replaced by "%hh".
      *
      * @param jo A JSONObject
      * @return A cookie list string

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/HTTP.java

@@ -26,48 +26,42 @@ import java.util.Iterator;
  */
 public class HTTP {
 
-  /** Carriage return/line feed. */
+    /**
+     * Carriage return/line feed.
+     */
     public static final String CRLF = "\r\n";
 
     /**
-   * Convert an HTTP header string into a JSONObject. It can be a request header or a response
+     * Convert an HTTP header string into a JSONObject. It can be a request
-   * header. A request header will contain
+     * header or a response header. A request header will contain
-   *
      * <pre>{
      *    Method: "POST" (for example),
      *    "Request-URI": "/" (for example),
      *    "HTTP-Version": "HTTP/1.1" (for example)
      * }</pre>
-   *
      * A response header will contain
-   *
      * <pre>{
      *    "HTTP-Version": "HTTP/1.1" (for example),
      *    "Fixes-Code": "200" (for example),
      *    "Reason-Phrase": "OK" (for example)
      * }</pre>
-   *
+     * In addition, the other parameters in the header will be captured, using
-   * In addition, the other parameters in the header will be captured, using the HTTP field names as
+     * the HTTP field names as JSON names, so that <pre>
-   * JSON names, so that
-   *
-   * <pre>
      *    Date: Sun, 26 May 2002 18:06:04 GMT
      *    Cookie: Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s
      *    Cache-Control: no-cache</pre>
-   *
      * become
-   *
      * <pre>{...
      *    Date: "Sun, 26 May 2002 18:06:04 GMT",
      *    Cookie: "Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s",
      *    "Cache-Control": "no-cache",
      * ...}</pre>
-   *
+     * It does no further checking or conversion. It does not parse dates.
-   * It does no further checking or conversion. It does not parse dates. It does not do '%'
+     * It does not do '%' transforms on URLs.
-   * transforms on URLs.
      *
      * @param string An HTTP header string.
-   * @return A JSONObject containing the elements and attributes of the XML string.
+     * @return A JSONObject containing the elements and attributes
+     * of the XML string.
      * @throws JSONException
      */
     public static JSONObject toJSONObject(String string) throws JSONException {
@@ -78,7 +72,7 @@ public class HTTP {
         token = x.nextToken();
         if (token.toUpperCase().startsWith("HTTP")) {
 
-      // Response
+// Response
 
             jo.put("HTTP-Version", token);
             jo.put("Fixes-Code", x.nextToken());
@@ -87,14 +81,14 @@ public class HTTP {
 
         } else {
 
-      // Request
+// Request
 
             jo.put("Method", token);
             jo.put("Request-URI", x.nextToken());
             jo.put("HTTP-Version", x.nextToken());
         }
 
-    // Fields
+// Fields
 
         while (x.more()) {
             String name = x.nextTo(':');
@@ -105,29 +99,27 @@ public class HTTP {
         return jo;
     }
 
+
     /**
      * Convert a JSONObject into an HTTP header. A request header must contain
-   *
      * <pre>{
      *    Method: "POST" (for example),
      *    "Request-URI": "/" (for example),
      *    "HTTP-Version": "HTTP/1.1" (for example)
      * }</pre>
-   *
      * A response header must contain
-   *
      * <pre>{
      *    "HTTP-Version": "HTTP/1.1" (for example),
      *    "Fixes-Code": "200" (for example),
      *    "Reason-Phrase": "OK" (for example)
      * }</pre>
-   *
+     * Any other members of the JSONObject will be output as HTTP fields.
-   * Any other members of the JSONObject will be output as HTTP fields. The result will end with two
+     * The result will end with two CRLF pairs.
-   * CRLF pairs.
      *
      * @param jo A JSONObject
      * @return An HTTP header string.
-   * @throws JSONException if the object does not contain enough information.
+     * @throws JSONException if the object does not contain enough
+     *                       information.
      */
     public static String toString(JSONObject jo) throws JSONException {
         Iterator keys = jo.keys();
@@ -153,12 +145,9 @@ public class HTTP {
         sb.append(CRLF);
         while (keys.hasNext()) {
             string = keys.next().toString();
-      if (!string.equals("HTTP-Version")
+            if (!string.equals("HTTP-Version") && !string.equals("Fixes-Code") &&
-          && !string.equals("Fixes-Code")
+                    !string.equals("Reason-Phrase") && !string.equals("Method") &&
-          && !string.equals("Reason-Phrase")
+                    !string.equals("Request-URI") && !jo.isNull(string)) {
-          && !string.equals("Method")
-          && !string.equals("Request-URI")
-          && !jo.isNull(string)) {
                 sb.append(string);
                 sb.append(": ");
                 sb.append(jo.getString(string));

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/HTTPTokener.java

@@ -17,8 +17,8 @@
 package dev.brighten.antivpn.utils.json;
 
 /**
- * The HTTPTokener extends the JSONTokener to provide additional methods for the parsing of HTTP
+ * The HTTPTokener extends the JSONTokener to provide additional methods
- * headers.
+ * for the parsing of HTTP headers.
  *
  * @author JSON.org
  * @version 2010-12-24
@@ -34,6 +34,7 @@ public class HTTPTokener extends JSONTokener {
         super(string);
     }
 
+
     /**
      * Get the next token or string. This is used in parsing HTTP headers.
      *

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/JSONArray.java

@@ -25,41 +25,48 @@ import java.util.Iterator;
 import java.util.Map;
 
 /**
- * A JSONArray is an ordered sequence of values. Its external text form is a string wrapped in
+ * A JSONArray is an ordered sequence of values. Its external text form is a
- * square brackets with commas separating the values. The internal form is an object having <code>
+ * string wrapped in square brackets with commas separating the values. The
- * get</code> and <code>opt</code> methods for accessing the values by index, and <code>put</code>
+ * internal form is an object having <code>get</code> and <code>opt</code>
- * methods for adding or replacing values. The values can be any of these types: <code>Boolean
+ * methods for accessing the values by index, and <code>put</code> methods for
- * </code>, <code>JSONArray</code>, <code>JSONObject</code>, <code>Number</code>, <code>String
+ * adding or replacing values. The values can be any of these types:
- * </code>, or the <code>JSONObject.NULL object</code>.
+ * <code>Boolean</code>, <code>JSONArray</code>, <code>JSONObject</code>,
- *
+ * <code>Number</code>, <code>String</code>, or the
- * <p>The constructor can convert a JSON text into a Java object. The <code>toString</code> method
+ * <code>JSONObject.NULL object</code>.
- * converts to JSON text.
+ * <p>
- *
+ * The constructor can convert a JSON text into a Java object. The
- * <p>A <code>get</code> method returns a value if one can be found, and throws an exception if one
+ * <code>toString</code> method converts to JSON text.
- * cannot be found. An <code>opt</code> method returns a default value instead of throwing an
+ * <p>
- * exception, and so is useful for obtaining optional values.
+ * A <code>get</code> method returns a value if one can be found, and throws an
- *
+ * exception if one cannot be found. An <code>opt</code> method returns a
- * <p>The generic <code>get()</code> and <code>opt()</code> methods return an object which you can
+ * default value instead of throwing an exception, and so is useful for
- * cast or query for type. There are also typed <code>get</code> and <code>opt</code> methods that
+ * obtaining optional values.
- * do type checking and type coercion for you.
+ * <p>
- *
+ * The generic <code>get()</code> and <code>opt()</code> methods return an
- * <p>The texts produced by the <code>toString</code> methods strictly conform to JSON syntax rules.
+ * object which you can cast or query for type. There are also typed
- * The constructors are more forgiving in the texts they will accept:
+ * <code>get</code> and <code>opt</code> methods that do type checking and type
- *
+ * coercion for you.
+ * <p>
+ * The texts produced by the <code>toString</code> methods strictly conform to
+ * JSON syntax rules. The constructors are more forgiving in the texts they will
+ * accept:
  * <ul>
- *   <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may appear just before the closing
+ * <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may appear just
- *       bracket.
+ * before the closing bracket.</li>
- *   <li>The <code>null</code> value will be inserted when there is <code>,</code>
+ * <li>The <code>null</code> value will be inserted when there
- *       &nbsp;<small>(comma)</small> elision.
+ * is <code>,</code>&nbsp;<small>(comma)</small> elision.</li>
- *   <li>Strings may be quoted with <code>'</code>&nbsp;<small>(single quote)</small>.
+ * <li>Strings may be quoted with <code>'</code>&nbsp;<small>(single
- *   <li>Strings do not need to be quoted at all if they do not begin with a quote or single quote,
+ * quote)</small>.</li>
- *       and if they do not contain leading or trailing spaces, and if they do not contain any of
+ * <li>Strings do not need to be quoted at all if they do not begin with a quote
- *       these characters: <code>{ } [ ] / \ : , = ; #</code> and if they do not look like numbers
+ * or single quote, and if they do not contain leading or trailing spaces,
- *       and if they are not the reserved words <code>true</code>, <code>false</code>, or <code>null
+ * and if they do not contain any of these characters:
- *       </code>.
+ * <code>{ } [ ] / \ : , = ; #</code> and if they do not look like numbers
- *   <li>Values can be separated by <code>;</code> <small>(semicolon)</small> as well as by <code>,
+ * and if they are not the reserved words <code>true</code>,
- *       </code> <small>(comma)</small>.
+ * <code>false</code>, or <code>null</code>.</li>
- *   <li>Numbers may have the <code>0x-</code> <small>(hex)</small> prefix.
+ * <li>Values can be separated by <code>;</code> <small>(semicolon)</small> as
+ * well as by <code>,</code> <small>(comma)</small>.</li>
+ * <li>Numbers may have the
+ * <code>0x-</code> <small>(hex)</small> prefix.</li>
  * </ul>
  *
  * @author JSON.org
@@ -67,10 +74,16 @@ import java.util.Map;
  */
 public class JSONArray {
 
-  /** The arrayList where the JSONArray's properties are kept. */
+
+    /**
+     * The arrayList where the JSONArray's properties are kept.
+     */
     private ArrayList myArrayList;
 
-  /** Construct an empty JSONArray. */
+
+    /**
+     * Construct an empty JSONArray.
+     */
     public JSONArray() {
         this.myArrayList = new ArrayList();
     }
@@ -113,17 +126,20 @@ public class JSONArray {
         }
     }
 
+
     /**
      * Construct a JSONArray from a source JSON text.
      *
-   * @param source A string that begins with <code>[</code>&nbsp;<small>(left bracket)</small> and
+     * @param source A string that begins with
-   *     ends with <code>]</code>&nbsp;<small>(right bracket)</small>.
+     *               <code>[</code>&nbsp;<small>(left bracket)</small>
+     *               and ends with <code>]</code>&nbsp;<small>(right bracket)</small>.
      * @throws JSONException If there is a syntax error.
      */
     public JSONArray(String source) throws JSONException {
         this(new JSONTokener(source));
     }
 
+
     /**
      * Construct a JSONArray from a Collection.
      *
@@ -139,6 +155,7 @@ public class JSONArray {
         }
     }
 
+
     /**
      * Construct a JSONArray from an array
      *
@@ -152,10 +169,12 @@ public class JSONArray {
                 this.put(JSONObject.wrap(Array.get(array, i)));
             }
         } else {
-      throw new JSONException("JSONArray initial value should be a string or collection or array.");
+            throw new JSONException(
+                    "JSONArray initial value should be a string or collection or array.");
         }
     }
 
+
     /**
      * Get the object value associated with an index.
      *
@@ -171,45 +190,52 @@ public class JSONArray {
         return object;
     }
 
+
     /**
-   * Get the boolean value associated with an index. The string values "true" and "false" are
+     * Get the boolean value associated with an index.
-   * converted to boolean.
+     * The string values "true" and "false" are converted to boolean.
      *
      * @param index The index must be between 0 and length() - 1.
      * @return The truth.
-   * @throws JSONException If there is no value for the index or if the value is not convertible to
+     * @throws JSONException If there is no value for the index or if the
-   *     boolean.
+     *                       value is not convertible to boolean.
      */
     public boolean getBoolean(int index) throws JSONException {
         Object object = get(index);
-    if (object.equals(Boolean.FALSE)
+        if (object.equals(Boolean.FALSE) ||
-        || (object instanceof String && ((String) object).equalsIgnoreCase("false"))) {
+                (object instanceof String &&
+                        ((String) object).equalsIgnoreCase("false"))) {
             return false;
-    } else if (object.equals(Boolean.TRUE)
+        } else if (object.equals(Boolean.TRUE) ||
-        || (object instanceof String && ((String) object).equalsIgnoreCase("true"))) {
+                (object instanceof String &&
+                        ((String) object).equalsIgnoreCase("true"))) {
             return true;
         }
         throw new JSONException("JSONArray[" + index + "] is not a boolean.");
     }
 
+
     /**
      * Get the double value associated with an index.
      *
      * @param index The index must be between 0 and length() - 1.
      * @return The value.
-   * @throws JSONException If the key is not found or if the value cannot be converted to a number.
+     * @throws JSONException If the key is not found or if the value cannot
+     *                       be converted to a number.
      */
     public double getDouble(int index) throws JSONException {
         Object object = get(index);
         try {
-      return object instanceof Number
+            return object instanceof Number ?
-          ? ((Number) object).doubleValue()
+                    ((Number) object).doubleValue() :
-          : Double.parseDouble((String) object);
+                    Double.parseDouble((String) object);
         } catch (Exception e) {
-      throw new JSONException("JSONArray[" + index + "] is not a number.");
+            throw new JSONException("JSONArray[" + index +
+                    "] is not a number.");
         }
     }
 
+
     /**
      * Get the int value associated with an index.
      *
@@ -220,62 +246,73 @@ public class JSONArray {
     public int getInt(int index) throws JSONException {
         Object object = get(index);
         try {
-      return object instanceof Number
+            return object instanceof Number ?
-          ? ((Number) object).intValue()
+                    ((Number) object).intValue() :
-          : Integer.parseInt((String) object);
+                    Integer.parseInt((String) object);
         } catch (Exception e) {
-      throw new JSONException("JSONArray[" + index + "] is not a number.");
+            throw new JSONException("JSONArray[" + index +
+                    "] is not a number.");
         }
     }
 
+
     /**
      * Get the JSONArray associated with an index.
      *
      * @param index The index must be between 0 and length() - 1.
      * @return A JSONArray value.
-   * @throws JSONException If there is no value for the index. or if the value is not a JSONArray
+     * @throws JSONException If there is no value for the index. or if the
+     *                       value is not a JSONArray
      */
     public JSONArray getJSONArray(int index) throws JSONException {
         Object object = get(index);
         if (object instanceof JSONArray) {
             return (JSONArray) object;
         }
-    throw new JSONException("JSONArray[" + index + "] is not a JSONArray.");
+        throw new JSONException("JSONArray[" + index +
+                "] is not a JSONArray.");
     }
 
+
     /**
      * Get the JSONObject associated with an index.
      *
      * @param index subscript
      * @return A JSONObject value.
-   * @throws JSONException If there is no value for the index or if the value is not a JSONObject
+     * @throws JSONException If there is no value for the index or if the
+     *                       value is not a JSONObject
      */
     public JSONObject getJSONObject(int index) throws JSONException {
         Object object = get(index);
         if (object instanceof JSONObject) {
             return (JSONObject) object;
         }
-    throw new JSONException("JSONArray[" + index + "] is not a JSONObject.");
+        throw new JSONException("JSONArray[" + index +
+                "] is not a JSONObject.");
     }
 
+
     /**
      * Get the long value associated with an index.
      *
      * @param index The index must be between 0 and length() - 1.
      * @return The value.
-   * @throws JSONException If the key is not found or if the value cannot be converted to a number.
+     * @throws JSONException If the key is not found or if the value cannot
+     *                       be converted to a number.
      */
     public long getLong(int index) throws JSONException {
         Object object = get(index);
         try {
-      return object instanceof Number
+            return object instanceof Number ?
-          ? ((Number) object).longValue()
+                    ((Number) object).longValue() :
-          : Long.parseLong((String) object);
+                    Long.parseLong((String) object);
         } catch (Exception e) {
-      throw new JSONException("JSONArray[" + index + "] is not a number.");
+            throw new JSONException("JSONArray[" + index +
+                    "] is not a number.");
         }
     }
 
+
     /**
      * Get the string associated with an index.
      *
@@ -291,6 +328,7 @@ public class JSONArray {
         throw new JSONException("JSONArray[" + index + "] not a string.");
     }
 
+
     /**
      * Determine if the value is null.
      *
@@ -301,10 +339,11 @@ public class JSONArray {
         return JSONObject.NULL.equals(opt(index));
     }
 
+
     /**
-   * Make a string from the contents of this JSONArray. The <code>separator</code> string is
+     * Make a string from the contents of this JSONArray. The
-   * inserted between each element. Warning: This method assumes that the data structure is
+     * <code>separator</code> string is inserted between each element.
-   * acyclical.
+     * Warning: This method assumes that the data structure is acyclical.
      *
      * @param separator A string that will be inserted between the elements.
      * @return a string.
@@ -323,6 +362,7 @@ public class JSONArray {
         return sb.toString();
     }
 
+
     /**
      * Get the number of elements in the JSONArray, included nulls.
      *
@@ -332,19 +372,24 @@ public class JSONArray {
         return this.myArrayList.size();
     }
 
+
     /**
      * Get the optional object value associated with an index.
      *
      * @param index The index must be between 0 and length() - 1.
-   * @return An object value, or null if there is no object at that index.
+     * @return An object value, or null if there is no
+     * object at that index.
      */
     public Object opt(int index) {
-    return (index < 0 || index >= length()) ? null : this.myArrayList.get(index);
+        return (index < 0 || index >= length()) ?
+                null : this.myArrayList.get(index);
     }
 
+
     /**
-   * Get the optional boolean value associated with an index. It returns false if there is no value
+     * Get the optional boolean value associated with an index.
-   * at that index, or if the value is not Boolean.TRUE or the String "true".
+     * It returns false if there is no value at that index,
+     * or if the value is not Boolean.TRUE or the String "true".
      *
      * @param index The index must be between 0 and length() - 1.
      * @return The truth.
@@ -353,10 +398,11 @@ public class JSONArray {
         return optBoolean(index, false);
     }
 
+
     /**
-   * Get the optional boolean value associated with an index. It returns the defaultValue if there
+     * Get the optional boolean value associated with an index.
-   * is no value at that index or if it is not a Boolean or the String "true" or "false" (case
+     * It returns the defaultValue if there is no value at that index or if
-   * insensitive).
+     * it is not a Boolean or the String "true" or "false" (case insensitive).
      *
      * @param index        The index must be between 0 and length() - 1.
      * @param defaultValue A boolean default.
@@ -370,9 +416,11 @@ public class JSONArray {
         }
     }
 
+
     /**
-   * Get the optional double value associated with an index. NaN is returned if there is no value
+     * Get the optional double value associated with an index.
-   * for the index, or if the value is not a number and cannot be converted to a number.
+     * NaN is returned if there is no value for the index,
+     * or if the value is not a number and cannot be converted to a number.
      *
      * @param index The index must be between 0 and length() - 1.
      * @return The value.
@@ -381,9 +429,11 @@ public class JSONArray {
         return optDouble(index, Double.NaN);
     }
 
+
     /**
-   * Get the optional double value associated with an index. The defaultValue is returned if there
+     * Get the optional double value associated with an index.
-   * is no value for the index, or if the value is not a number and cannot be converted to a number.
+     * The defaultValue is returned if there is no value for the index,
+     * or if the value is not a number and cannot be converted to a number.
      *
      * @param index        subscript
      * @param defaultValue The default value.
@@ -397,9 +447,11 @@ public class JSONArray {
         }
     }
 
+
     /**
-   * Get the optional int value associated with an index. Zero is returned if there is no value for
+     * Get the optional int value associated with an index.
-   * the index, or if the value is not a number and cannot be converted to a number.
+     * Zero is returned if there is no value for the index,
+     * or if the value is not a number and cannot be converted to a number.
      *
      * @param index The index must be between 0 and length() - 1.
      * @return The value.
@@ -408,9 +460,11 @@ public class JSONArray {
         return optInt(index, 0);
     }
 
+
     /**
-   * Get the optional int value associated with an index. The defaultValue is returned if there is
+     * Get the optional int value associated with an index.
-   * no value for the index, or if the value is not a number and cannot be converted to a number.
+     * The defaultValue is returned if there is no value for the index,
+     * or if the value is not a number and cannot be converted to a number.
      *
      * @param index        The index must be between 0 and length() - 1.
      * @param defaultValue The default value.
@@ -424,21 +478,24 @@ public class JSONArray {
         }
     }
 
+
     /**
      * Get the optional JSONArray associated with an index.
      *
      * @param index subscript
-   * @return A JSONArray value, or null if the index has no value, or if the value is not a
+     * @return A JSONArray value, or null if the index has no value,
-   *     JSONArray.
+     * or if the value is not a JSONArray.
      */
     public JSONArray optJSONArray(int index) {
         Object o = opt(index);
         return o instanceof JSONArray ? (JSONArray) o : null;
     }
 
+
     /**
-   * Get the optional JSONObject associated with an index. Null is returned if the key is not found,
+     * Get the optional JSONObject associated with an index.
-   * or null if the index has no value, or if the value is not a JSONObject.
+     * Null is returned if the key is not found, or null if the index has
+     * no value, or if the value is not a JSONObject.
      *
      * @param index The index must be between 0 and length() - 1.
      * @return A JSONObject value.
@@ -448,9 +505,11 @@ public class JSONArray {
         return o instanceof JSONObject ? (JSONObject) o : null;
     }
 
+
     /**
-   * Get the optional long value associated with an index. Zero is returned if there is no value for
+     * Get the optional long value associated with an index.
-   * the index, or if the value is not a number and cannot be converted to a number.
+     * Zero is returned if there is no value for the index,
+     * or if the value is not a number and cannot be converted to a number.
      *
      * @param index The index must be between 0 and length() - 1.
      * @return The value.
@@ -459,9 +518,11 @@ public class JSONArray {
         return optLong(index, 0);
     }
 
+
     /**
-   * Get the optional long value associated with an index. The defaultValue is returned if there is
+     * Get the optional long value associated with an index.
-   * no value for the index, or if the value is not a number and cannot be converted to a number.
+     * The defaultValue is returned if there is no value for the index,
+     * or if the value is not a number and cannot be converted to a number.
      *
      * @param index        The index must be between 0 and length() - 1.
      * @param defaultValue The default value.
@@ -475,10 +536,11 @@ public class JSONArray {
         }
     }
 
+
     /**
-   * Get the optional string value associated with an index. It returns an empty string if there is
+     * Get the optional string value associated with an index. It returns an
-   * no value at that index. If the value is not a string and is not null, then it is coverted to a
+     * empty string if there is no value at that index. If the value
-   * string.
+     * is not a string and is not null, then it is coverted to a string.
      *
      * @param index The index must be between 0 and length() - 1.
      * @return A String value.
@@ -487,9 +549,10 @@ public class JSONArray {
         return optString(index, "");
     }
 
+
     /**
-   * Get the optional string associated with an index. The defaultValue is returned if the key is
+     * Get the optional string associated with an index.
-   * not found.
+     * The defaultValue is returned if the key is not found.
      *
      * @param index        The index must be between 0 and length() - 1.
      * @param defaultValue The default value.
@@ -500,6 +563,7 @@ public class JSONArray {
         return object != null ? object.toString() : defaultValue;
     }
 
+
     /**
      * Append a boolean value. This increases the array's length by one.
      *
@@ -511,9 +575,10 @@ public class JSONArray {
         return this;
     }
 
+
     /**
-   * Put a value in the JSONArray, where the value will be a JSONArray which is produced from a
+     * Put a value in the JSONArray, where the value will be a
-   * Collection.
+     * JSONArray which is produced from a Collection.
      *
      * @param value A Collection value.
      * @return this.
@@ -523,6 +588,7 @@ public class JSONArray {
         return this;
     }
 
+
     /**
      * Append a double value. This increases the array's length by one.
      *
@@ -537,6 +603,7 @@ public class JSONArray {
         return this;
     }
 
+
     /**
      * Append an int value. This increases the array's length by one.
      *
@@ -548,6 +615,7 @@ public class JSONArray {
         return this;
     }
 
+
     /**
      * Append an long value. This increases the array's length by one.
      *
@@ -559,9 +627,10 @@ public class JSONArray {
         return this;
     }
 
+
     /**
-   * Put a value in the JSONArray, where the value will be a JSONObject which is produced from a
+     * Put a value in the JSONArray, where the value will be a
-   * Map.
+     * JSONObject which is produced from a Map.
      *
      * @param value A Map value.
      * @return this.
@@ -571,11 +640,13 @@ public class JSONArray {
         return this;
     }
 
+
     /**
      * Append an object value. This increases the array's length by one.
      *
-   * @param value An object value. The value should be a Boolean, Double, Integer, JSONArray,
+     * @param value An object value.  The value should be a
-   *     JSONObject, Long, or String, or the JSONObject.NULL object.
+     *              Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+     *              JSONObject.NULL object.
      * @return this.
      */
     public JSONArray put(Object value) {
@@ -583,9 +654,11 @@ public class JSONArray {
         return this;
     }
 
+
     /**
-   * Put or replace a boolean value in the JSONArray. If the index is greater than the length of the
+     * Put or replace a boolean value in the JSONArray. If the index is greater
-   * JSONArray, then null elements will be added as necessary to pad it out.
+     * than the length of the JSONArray, then null elements will be added as
+     * necessary to pad it out.
      *
      * @param index The subscript.
      * @param value A boolean value.
@@ -597,37 +670,44 @@ public class JSONArray {
         return this;
     }
 
+
     /**
-   * Put a value in the JSONArray, where the value will be a JSONArray which is produced from a
+     * Put a value in the JSONArray, where the value will be a
-   * Collection.
+     * JSONArray which is produced from a Collection.
      *
      * @param index The subscript.
      * @param value A Collection value.
      * @return this.
-   * @throws JSONException If the index is negative or if the value is not finite.
+     * @throws JSONException If the index is negative or if the value is
+     *                       not finite.
      */
     public JSONArray put(int index, Collection value) throws JSONException {
         put(index, new JSONArray(value));
         return this;
     }
 
+
     /**
-   * Put or replace a double value. If the index is greater than the length of the JSONArray, then
+     * Put or replace a double value. If the index is greater than the length of
-   * null elements will be added as necessary to pad it out.
+     * the JSONArray, then null elements will be added as necessary to pad
+     * it out.
      *
      * @param index The subscript.
      * @param value A double value.
      * @return this.
-   * @throws JSONException If the index is negative or if the value is not finite.
+     * @throws JSONException If the index is negative or if the value is
+     *                       not finite.
      */
     public JSONArray put(int index, double value) throws JSONException {
         put(index, new Double(value));
         return this;
     }
 
+
     /**
-   * Put or replace an int value. If the index is greater than the length of the JSONArray, then
+     * Put or replace an int value. If the index is greater than the length of
-   * null elements will be added as necessary to pad it out.
+     * the JSONArray, then null elements will be added as necessary to pad
+     * it out.
      *
      * @param index The subscript.
      * @param value An int value.
@@ -639,9 +719,11 @@ public class JSONArray {
         return this;
     }
 
+
     /**
-   * Put or replace a long value. If the index is greater than the length of the JSONArray, then
+     * Put or replace a long value. If the index is greater than the length of
-   * null elements will be added as necessary to pad it out.
+     * the JSONArray, then null elements will be added as necessary to pad
+     * it out.
      *
      * @param index The subscript.
      * @param value A long value.
@@ -653,28 +735,35 @@ public class JSONArray {
         return this;
     }
 
+
     /**
-   * Put a value in the JSONArray, where the value will be a JSONObject that is produced from a Map.
+     * Put a value in the JSONArray, where the value will be a
+     * JSONObject that is produced from a Map.
      *
      * @param index The subscript.
      * @param value The Map value.
      * @return this.
-   * @throws JSONException If the index is negative or if the the value is an invalid number.
+     * @throws JSONException If the index is negative or if the the value is
+     *                       an invalid number.
      */
     public JSONArray put(int index, Map value) throws JSONException {
         put(index, new JSONObject(value));
         return this;
     }
 
+
     /**
-   * Put or replace an object value in the JSONArray. If the index is greater than the length of the
+     * Put or replace an object value in the JSONArray. If the index is greater
-   * JSONArray, then null elements will be added as necessary to pad it out.
+     * than the length of the JSONArray, then null elements will be added as
+     * necessary to pad it out.
      *
      * @param index The subscript.
-   * @param value The value to put into the array. The value should be a Boolean, Double, Integer,
+     * @param value The value to put into the array. The value should be a
-   *     JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
+     *              Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+     *              JSONObject.NULL object.
      * @return this.
-   * @throws JSONException If the index is negative or if the the value is an invalid number.
+     * @throws JSONException If the index is negative or if the the value is
+     *                       an invalid number.
      */
     public JSONArray put(int index, Object value) throws JSONException {
         JSONObject.testValidity(value);
@@ -692,11 +781,13 @@ public class JSONArray {
         return this;
     }
 
+
     /**
      * Remove an index and close the hole.
      *
      * @param index The index of the element to be removed.
-   * @return The value that was associated with the index, or null if there was no value.
+     * @return The value that was associated with the index,
+     * or null if there was no value.
      */
     public Object remove(int index) {
         Object o = opt(index);
@@ -704,12 +795,15 @@ public class JSONArray {
         return o;
     }
 
+
     /**
-   * Produce a JSONObject by combining a JSONArray of names with the values of this JSONArray.
+     * Produce a JSONObject by combining a JSONArray of names with the values
+     * of this JSONArray.
      *
-   * @param names A JSONArray containing a list of key strings. These will be paired with the
+     * @param names A JSONArray containing a list of key strings. These will be
-   *     values.
+     *              paired with the values.
-   * @return A JSONObject, or null if there are no names or if this JSONArray has no values.
+     * @return A JSONObject, or null if there are no names or if this JSONArray
+     * has no values.
      * @throws JSONException If any of the names are null.
      */
     public JSONObject toJSONObject(JSONArray names) throws JSONException {
@@ -723,14 +817,17 @@ public class JSONArray {
         return jo;
     }
 
+
     /**
-   * Make a JSON text of this JSONArray. For compactness, no unnecessary whitespace is added. If it
+     * Make a JSON text of this JSONArray. For compactness, no
-   * is not possible to produce a syntactically correct JSON text then null will be returned
+     * unnecessary whitespace is added. If it is not possible to produce a
-   * instead. This could occur if the array contains an invalid number.
+     * syntactically correct JSON text then null will be returned instead. This
+     * could occur if the array contains an invalid number.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
      *
-   * <p>Warning: This method assumes that the data structure is acyclical.
+     * @return a printable, displayable, transmittable
-   *
+     * representation of the array.
-   * @return a printable, displayable, transmittable representation of the array.
      */
     public String toString() {
         try {
@@ -740,27 +837,33 @@ public class JSONArray {
         }
     }
 
+
     /**
-   * Make a prettyprinted JSON text of this JSONArray. Warning: This method assumes that the data
+     * Make a prettyprinted JSON text of this JSONArray.
-   * structure is acyclical.
+     * Warning: This method assumes that the data structure is acyclical.
      *
-   * @param indentFactor The number of spaces to add to each level of indentation.
+     * @param indentFactor The number of spaces to add to each level of
-   * @return a printable, displayable, transmittable representation of the object, beginning with
+     *                     indentation.
-   *     <code>[</code>&nbsp;<small>(left bracket)</small> and ending with <code>]</code>
+     * @return a printable, displayable, transmittable
-   *     &nbsp;<small>(right bracket)</small>.
+     * representation of the object, beginning
+     * with <code>[</code>&nbsp;<small>(left bracket)</small> and ending
+     * with <code>]</code>&nbsp;<small>(right bracket)</small>.
      * @throws JSONException
      */
     public String toString(int indentFactor) throws JSONException {
         return toString(indentFactor, 0);
     }
 
+
     /**
-   * Make a prettyprinted JSON text of this JSONArray. Warning: This method assumes that the data
+     * Make a prettyprinted JSON text of this JSONArray.
-   * structure is acyclical.
+     * Warning: This method assumes that the data structure is acyclical.
      *
-   * @param indentFactor The number of spaces to add to each level of indentation.
+     * @param indentFactor The number of spaces to add to each level of
+     *                     indentation.
      * @param indent       The indention of the top level.
-   * @return a printable, displayable, transmittable representation of the array.
+     * @return a printable, displayable, transmittable
+     * representation of the array.
      * @throws JSONException
      */
     String toString(int indentFactor, int indent) throws JSONException {
@@ -771,7 +874,8 @@ public class JSONArray {
         int i;
         StringBuffer sb = new StringBuffer("[");
         if (len == 1) {
-      sb.append(JSONObject.valueToString(this.myArrayList.get(0), indentFactor, indent));
+            sb.append(JSONObject.valueToString(this.myArrayList.get(0),
+                    indentFactor, indent));
         } else {
             int newindent = indent + indentFactor;
             sb.append('\n');
@@ -782,7 +886,8 @@ public class JSONArray {
                 for (int j = 0; j < newindent; j += 1) {
                     sb.append(' ');
                 }
-        sb.append(JSONObject.valueToString(this.myArrayList.get(i), indentFactor, newindent));
+                sb.append(JSONObject.valueToString(this.myArrayList.get(i),
+                        indentFactor, newindent));
             }
             sb.append('\n');
             for (i = 0; i < indent; i += 1) {
@@ -793,11 +898,12 @@ public class JSONArray {
         return sb.toString();
     }
 
+
     /**
-   * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is
+     * Write the contents of the JSONArray as JSON text to a writer.
-   * added.
+     * For compactness, no whitespace is added.
-   *
+     * <p>
-   * <p>Warning: This method assumes that the data structure is acyclical.
+     * Warning: This method assumes that the data structure is acyclical.
      *
      * @return The writer.
      * @throws JSONException

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/JSONML.java

@@ -18,9 +18,11 @@ package dev.brighten.antivpn.utils.json;
 
 import java.util.Iterator;
 
+
 /**
- * This provides static methods to convert an XML text into a JSONArray or JSONObject, and to covert
+ * This provides static methods to convert an XML text into a JSONArray or
- * a JSONArray or JSONObject into an XML text using the JsonML transform.
+ * JSONObject, and to covert a JSONArray or JSONObject into an XML text using
+ * the JsonML transform.
  *
  * @author JSON.org
  * @version 2010-12-23
@@ -32,12 +34,13 @@ public class JSONML {
      *
      * @param x         The XMLTokener containing the source string.
      * @param arrayForm true if array form, false if object form.
-   * @param ja The JSONArray that is containing the current tag or null if we are at the outermost
+     * @param ja        The JSONArray that is containing the current tag or null
-   *     level.
+     *                  if we are at the outermost level.
      * @return A JSONArray if the value is the outermost tag, otherwise null.
      * @throws JSONException
      */
-  private static Object parse(XMLTokener x, boolean arrayForm, JSONArray ja) throws JSONException {
+    private static Object parse(XMLTokener x, boolean arrayForm,
+                                JSONArray ja) throws JSONException {
         String attribute;
         char c;
         String closeTag = null;
@@ -47,11 +50,11 @@ public class JSONML {
         Object token;
         String tagName = null;
 
-    // Test for and skip past these forms:
+// Test for and skip past these forms:
-    //      <!-- ... -->
+//      <!-- ... -->
-    //      <![  ... ]]>
+//      <![  ... ]]>
-    //      <!   ...   >
+//      <!   ...   >
-    //      <?   ...  ?>
+//      <?   ...  ?>
 
         while (true) {
             token = x.nextContent();
@@ -60,11 +63,13 @@ public class JSONML {
                 if (token instanceof Character) {
                     if (token == XML.SLASH) {
 
-            // Close tag </
+// Close tag </
 
                         token = x.nextToken();
                         if (!(token instanceof String)) {
-              throw new JSONException("Expected a closing name instead of '" + token + "'.");
+                            throw new JSONException(
+                                    "Expected a closing name instead of '" +
+                                            token + "'.");
                         }
                         if (x.nextToken() != XML.GT) {
                             throw x.syntaxError("Misshaped close tag");
@@ -72,7 +77,7 @@ public class JSONML {
                         return token;
                     } else if (token == XML.BANG) {
 
-            // <!
+// <!
 
                         c = x.next();
                         if (c == '-') {
@@ -104,14 +109,14 @@ public class JSONML {
                         }
                     } else if (token == XML.QUEST) {
 
-            // <?
+// <?
 
                         x.skipPast("?>");
                     } else {
                         throw x.syntaxError("Misshaped tag");
                     }
 
-          // Open tag <
+// Open tag <
 
                 } else {
                     if (!(token instanceof String)) {
@@ -143,7 +148,7 @@ public class JSONML {
                             break;
                         }
 
-            // attribute = value
+// attribute = value
 
                         attribute = (String) token;
                         if (!arrayForm && (attribute == "tagName" || attribute == "childNode")) {
@@ -165,7 +170,7 @@ public class JSONML {
                         newja.put(newjo);
                     }
 
-          // Empty tag <.../>
+// Empty tag <.../>
 
                     if (token == XML.SLASH) {
                         if (x.nextToken() != XML.GT) {
@@ -179,7 +184,7 @@ public class JSONML {
                             }
                         }
 
-            // Content, between <...> and </...>
+// Content, between <...> and </...>
 
                     } else {
                         if (token != XML.GT) {
@@ -188,7 +193,8 @@ public class JSONML {
                         closeTag = (String) parse(x, arrayForm, newja);
                         if (closeTag != null) {
                             if (!closeTag.equals(tagName)) {
-                throw x.syntaxError("Mismatched '" + tagName + "' and '" + closeTag + "'");
+                                throw x.syntaxError("Mismatched '" + tagName +
+                                        "' and '" + closeTag + "'");
                             }
                             tagName = null;
                             if (!arrayForm && newja.length() > 0) {
@@ -206,18 +212,22 @@ public class JSONML {
                 }
             } else {
                 if (ja != null) {
-          ja.put(token instanceof String ? XML.stringToValue((String) token) : token);
+                    ja.put(token instanceof String ?
+                            XML.stringToValue((String) token) : token);
                 }
             }
         }
     }
 
+
     /**
-   * Convert a well-formed (but not necessarily valid) XML string into a JSONArray using the JsonML
+     * Convert a well-formed (but not necessarily valid) XML string into a
-   * transform. Each XML tag is represented as a JSONArray in which the first element is the tag
+     * JSONArray using the JsonML transform. Each XML tag is represented as
-   * name. If the tag has attributes, then the second element will be JSONObject containing the
+     * a JSONArray in which the first element is the tag name. If the tag has
-   * name/value pairs. If the tag contains children, then strings and JSONArrays will represent the
+     * attributes, then the second element will be JSONObject containing the
-   * child tags. Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
+     * name/value pairs. If the tag contains children, then strings and
+     * JSONArrays will represent the child tags.
+     * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
      *
      * @param string The source string.
      * @return A JSONArray containing the structured data from the XML string.
@@ -227,12 +237,15 @@ public class JSONML {
         return toJSONArray(new XMLTokener(string));
     }
 
+
     /**
-   * Convert a well-formed (but not necessarily valid) XML string into a JSONArray using the JsonML
+     * Convert a well-formed (but not necessarily valid) XML string into a
-   * transform. Each XML tag is represented as a JSONArray in which the first element is the tag
+     * JSONArray using the JsonML transform. Each XML tag is represented as
-   * name. If the tag has attributes, then the second element will be JSONObject containing the
+     * a JSONArray in which the first element is the tag name. If the tag has
-   * name/value pairs. If the tag contains children, then strings and JSONArrays will represent the
+     * attributes, then the second element will be JSONObject containing the
-   * child content and tags. Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
+     * name/value pairs. If the tag contains children, then strings and
+     * JSONArrays will represent the child content and tags.
+     * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
      *
      * @param x An XMLTokener.
      * @return A JSONArray containing the structured data from the XML string.
@@ -242,14 +255,16 @@ public class JSONML {
         return (JSONArray) parse(x, true, null);
     }
 
+
     /**
-   * Convert a well-formed (but not necessarily valid) XML string into a JSONObject using the JsonML
+     * Convert a well-formed (but not necessarily valid) XML string into a
-   * transform. Each XML tag is represented as a JSONObject with a "tagName" property. If the tag
+     * JSONObject using the JsonML transform. Each XML tag is represented as
-   * has attributes, then the attributes will be in the JSONObject as properties. If the tag
+     * a JSONObject with a "tagName" property. If the tag has attributes, then
-   * contains children, the object will have a "childNodes" property which will be an array of
+     * the attributes will be in the JSONObject as properties. If the tag
-   * strings and JsonML JSONObjects.
+     * contains children, the object will have a "childNodes" property which
-   *
+     * will be an array of strings and JsonML JSONObjects.
-   * <p>Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
+     * <p>
+     * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
      *
      * @param x An XMLTokener of the XML source text.
      * @return A JSONObject containing the structured data from the XML string.
@@ -259,14 +274,16 @@ public class JSONML {
         return (JSONObject) parse(x, false, null);
     }
 
+
     /**
-   * Convert a well-formed (but not necessarily valid) XML string into a JSONObject using the JsonML
+     * Convert a well-formed (but not necessarily valid) XML string into a
-   * transform. Each XML tag is represented as a JSONObject with a "tagName" property. If the tag
+     * JSONObject using the JsonML transform. Each XML tag is represented as
-   * has attributes, then the attributes will be in the JSONObject as properties. If the tag
+     * a JSONObject with a "tagName" property. If the tag has attributes, then
-   * contains children, the object will have a "childNodes" property which will be an array of
+     * the attributes will be in the JSONObject as properties. If the tag
-   * strings and JsonML JSONObjects.
+     * contains children, the object will have a "childNodes" property which
-   *
+     * will be an array of strings and JsonML JSONObjects.
-   * <p>Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
+     * <p>
+     * Comments, prologs, DTDs, and <code>&lt;[ [ ]]></code> are ignored.
      *
      * @param string The XML source text.
      * @return A JSONObject containing the structured data from the XML string.
@@ -276,6 +293,7 @@ public class JSONML {
         return toJSONObject(new XMLTokener(string));
     }
 
+
     /**
      * Reverse the JSONML transformation, making an XML text from a JSONArray.
      *
@@ -294,7 +312,7 @@ public class JSONML {
         String tagName;
         String value;
 
-    // Emit <tagName
+// Emit <tagName	    
 
         tagName = ja.getString(0);
         XML.noSpace(tagName);
@@ -307,7 +325,7 @@ public class JSONML {
             i = 2;
             jo = (JSONObject) object;
 
-      // Emit the attributes
+// Emit the attributes
 
             keys = jo.keys();
             while (keys.hasNext()) {
@@ -327,7 +345,7 @@ public class JSONML {
             i = 1;
         }
 
-    // Emit content in body
+//Emit content in body
 
         length = ja.length();
         if (i >= length) {
@@ -357,9 +375,10 @@ public class JSONML {
     }
 
     /**
-   * Reverse the JSONML transformation, making an XML text from a JSONObject. The JSONObject must
+     * Reverse the JSONML transformation, making an XML text from a JSONObject.
-   * contain a "tagName" property. If it has children, then it must have a "childNodes" property
+     * The JSONObject must contain a "tagName" property. If it has children,
-   * containing an array of objects. The other properties are attributes with string values.
+     * then it must have a "childNodes" property containing an array of objects.
+     * The other properties are attributes with string values.
      *
      * @param jo A JSONObject.
      * @return An XML string.
@@ -376,7 +395,7 @@ public class JSONML {
         String tagName;
         String value;
 
-    // Emit <tagName
+//Emit <tagName
 
         tagName = jo.optString("tagName");
         if (tagName == null) {
@@ -387,7 +406,7 @@ public class JSONML {
         sb.append('<');
         sb.append(tagName);
 
-    // Emit the attributes
+//Emit the attributes
 
         keys = jo.keys();
         while (keys.hasNext()) {
@@ -406,7 +425,7 @@ public class JSONML {
             }
         }
 
-    // Emit content in body
+//Emit content in body
 
         ja = jo.optJSONArray("childNodes");
         if (ja == null) {

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/JSONString.java

@@ -17,17 +17,19 @@
 package dev.brighten.antivpn.utils.json;
 
 /**
- * The <code>JSONString</code> interface allows a <code>toJSONString()</code> method so that a class
+ * The <code>JSONString</code> interface allows a <code>toJSONString()</code>
- * can change the behavior of <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
+ * method so that a class can change the behavior of
- * and <code>JSONWriter.value(</code>Object<code>)</code>. The <code>toJSONString</code> method will
+ * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
- * be used instead of the default behavior of using the Object's <code>toString()</code> method and
+ * and <code>JSONWriter.value(</code>Object<code>)</code>. The
- * quoting the result.
+ * <code>toJSONString</code> method will be used instead of the default behavior
+ * of using the Object's <code>toString()</code> method and quoting the result.
  */
 public interface JSONString {
     /**
-   * The <code>toJSONString</code> method allows a class to produce its own JSON serialization.
+     * The <code>toJSONString</code> method allows a class to produce its own JSON
+     * serialization.
      *
      * @return A strictly syntactically correct JSON text.
      */
-  String toJSONString();
+    public String toJSONString();
 }

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/JSONStringer.java

@@ -19,49 +19,50 @@ package dev.brighten.antivpn.utils.json;
 import java.io.StringWriter;
 
 /**
- * JSONStringer provides a quick and convenient way of producing JSON text. The texts produced
+ * JSONStringer provides a quick and convenient way of producing JSON text.
- * strictly conform to JSON syntax rules. No whitespace is added, so the results are ready for
+ * The texts produced strictly conform to JSON syntax rules. No whitespace is
- * transmission or storage. Each instance of JSONStringer can produce one JSON text.
+ * added, so the results are ready for transmission or storage. Each instance of
- *
+ * JSONStringer can produce one JSON text.
- * <p>A JSONStringer instance provides a <code>value</code> method for appending values to the text,
+ * <p>
- * and a <code>key</code> method for adding keys before values in objects. There are <code>array
+ * A JSONStringer instance provides a <code>value</code> method for appending
- * </code> and <code>endArray</code> methods that make and bound array values, and <code>object
+ * values to the
- * </code> and <code>endObject</code> methods which make and bound object values. All of these
+ * text, and a <code>key</code>
- * methods return the JSONWriter instance, permitting cascade style. For example,
+ * method for adding keys before values in objects. There are <code>array</code>
- *
+ * and <code>endArray</code> methods that make and bound array values, and
- * <pre>
+ * <code>object</code> and <code>endObject</code> methods which make and bound
+ * object values. All of these methods return the JSONWriter instance,
+ * permitting cascade style. For example, <pre>
  * myString = new JSONStringer()
  *     .object()
  *         .key("JSON")
  *         .value("Hello, World!")
  *     .endObject()
- *     .toString();</pre>
+ *     .toString();</pre> which produces the string <pre>
- *
- * which produces the string
- *
- * <pre>
  * {"JSON":"Hello, World!"}</pre>
- *
+ * <p>
- * <p>The first method called must be <code>array</code> or <code>object</code>. There are no
+ * The first method called must be <code>array</code> or <code>object</code>.
- * methods for adding commas or colons. JSONStringer adds them for you. Objects and arrays can be
+ * There are no methods for adding commas or colons. JSONStringer adds them for
- * nested up to 20 levels deep.
+ * you. Objects and arrays can be nested up to 20 levels deep.
- *
+ * <p>
- * <p>This can sometimes be easier than using a JSONObject to build a string.
+ * This can sometimes be easier than using a JSONObject to build a string.
  *
  * @author JSON.org
  * @version 2008-09-18
  */
 public class JSONStringer extends JSONWriter {
-  /** Make a fresh JSONStringer. It can be used to build one JSON text. */
+    /**
+     * Make a fresh JSONStringer. It can be used to build one JSON text.
+     */
     public JSONStringer() {
         super(new StringWriter());
     }
 
     /**
-   * Return the JSON text. This method is used to obtain the product of the JSONStringer instance.
+     * Return the JSON text. This method is used to obtain the product of the
-   * It will return <code>null</code> if there was a problem in the construction of the JSON text
+     * JSONStringer instance. It will return <code>null</code> if there was a
-   * (such as the calls to <code>array</code> were not properly balanced with calls to <code>
+     * problem in the construction of the JSON text (such as the calls to
-   * endArray</code>).
+     * <code>array</code> were not properly balanced with calls to
+     * <code>endArray</code>).
      *
      * @return The JSON text.
      */

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/JSONTokener.java

@@ -19,8 +19,9 @@ package dev.brighten.antivpn.utils.json;
 import java.io.*;
 
 /**
- * A JSONTokener takes a source string and extracts characters and tokens from it. It is used by the
+ * A JSONTokener takes a source string and extracts characters and tokens from
- * JSONObject and JSONArray constructors to parse JSON source strings.
+ * it. It is used by the JSONObject and JSONArray constructors to parse
+ * JSON source strings.
  *
  * @author JSON.org
  * @version 2010-12-24
@@ -35,13 +36,15 @@ public class JSONTokener {
     private Reader reader;
     private boolean usePrevious;
 
+
     /**
      * Construct a JSONTokener from a Reader.
      *
      * @param reader A reader.
      */
     public JSONTokener(Reader reader) {
-    this.reader = reader.markSupported() ? reader : new BufferedReader(reader);
+        this.reader = reader.markSupported() ?
+                reader : new BufferedReader(reader);
         this.eof = false;
         this.usePrevious = false;
         this.previous = 0;
@@ -50,11 +53,15 @@ public class JSONTokener {
         this.line = 1;
     }
 
-  /** Construct a JSONTokener from an InputStream. */
+
+    /**
+     * Construct a JSONTokener from an InputStream.
+     */
     public JSONTokener(InputStream inputStream) throws JSONException {
         this(new InputStreamReader(inputStream));
     }
 
+
     /**
      * Construct a JSONTokener from a string.
      *
@@ -67,7 +74,8 @@ public class JSONTokener {
     /**
      * Get the hex value of a character (base16).
      *
-   * @param c A character between '0' and '9' or between 'A' and 'F' or between 'a' and 'f'.
+     * @param c A character between '0' and '9' or between 'A' and 'F' or
+     *          between 'a' and 'f'.
      * @return An int between 0 and 15, or -1 if c was not a hex digit.
      */
     public static int dehexchar(char c) {
@@ -84,8 +92,9 @@ public class JSONTokener {
     }
 
     /**
-   * Back up one character. This provides a sort of lookahead capability, so that you can test for a
+     * Back up one character. This provides a sort of lookahead capability,
-   * digit or letter before attempting to parse the next number or identifier.
+     * so that you can test for a digit or letter before attempting to parse
+     * the next number or identifier.
      */
     public void back() throws JSONException {
         if (usePrevious || index <= 0) {
@@ -101,8 +110,10 @@ public class JSONTokener {
         return eof && !usePrevious;
     }
 
+
     /**
-   * Determine if the source string still contains characters that next() can consume.
+     * Determine if the source string still contains characters that next()
+     * can consume.
      *
      * @return true if not yet at the end of the source.
      */
@@ -115,6 +126,7 @@ public class JSONTokener {
         return true;
     }
 
+
     /**
      * Get the next character in the source string.
      *
@@ -151,8 +163,10 @@ public class JSONTokener {
         return this.previous;
     }
 
+
     /**
-   * Consume the next character, and check that it matches a specified character.
+     * Consume the next character, and check that it matches a specified
+     * character.
      *
      * @param c The character to match.
      * @return The character.
@@ -161,18 +175,20 @@ public class JSONTokener {
     public char next(char c) throws JSONException {
         char n = next();
         if (n != c) {
-      throw syntaxError("Expected '" + c + "' and instead saw '" + n + "'");
+            throw syntaxError("Expected '" + c + "' and instead saw '" +
+                    n + "'");
         }
         return n;
     }
 
+
     /**
      * Get the next n characters.
      *
      * @param n The number of characters to take.
      * @return A string of n characters.
-   * @throws JSONException Substring bounds error if there are not n characters remaining in the
+     * @throws JSONException Substring bounds error if there are not
-   *     source string.
+     *                       n characters remaining in the source string.
      */
     public String next(int n) throws JSONException {
         if (n == 0) {
@@ -192,6 +208,7 @@ public class JSONTokener {
         return new String(chars);
     }
 
+
     /**
      * Get the next char in the string, skipping whitespace.
      *
@@ -207,12 +224,15 @@ public class JSONTokener {
         }
     }
 
+
     /**
-   * Return the characters up to the next close quote character. Backslash processing is done. The
+     * Return the characters up to the next close quote character.
-   * formal JSON format does not allow strings in single quotes, but an implementation is allowed to
+     * Backslash processing is done. The formal JSON format does not
+     * allow strings in single quotes, but an implementation is allowed to
      * accept them.
      *
-   * @param quote The quoting character, either <code>"</code>&nbsp;<small>(double quote)</small> or
+     * @param quote The quoting character, either
+     *              <code>"</code>&nbsp;<small>(double quote)</small> or
      *              <code>'</code>&nbsp;<small>(single quote)</small>.
      * @return A String.
      * @throws JSONException Unterminated string.
@@ -267,9 +287,10 @@ public class JSONTokener {
         }
     }
 
+
     /**
-   * Get the text up but not including the specified character or the end of line, whichever comes
+     * Get the text up but not including the specified character or the
-   * first.
+     * end of line, whichever comes first.
      *
      * @param delimiter A delimiter character.
      * @return A string.
@@ -288,9 +309,10 @@ public class JSONTokener {
         }
     }
 
+
     /**
-   * Get the text up but not including one of the specified delimiter characters or the end of line,
+     * Get the text up but not including one of the specified delimiter
-   * whichever comes first.
+     * characters or the end of line, whichever comes first.
      *
      * @param delimiters A set of delimiter characters.
      * @return A string, trimmed.
@@ -300,7 +322,8 @@ public class JSONTokener {
         StringBuffer sb = new StringBuffer();
         for (; ; ) {
             c = next();
-      if (delimiters.indexOf(c) >= 0 || c == 0 || c == '\n' || c == '\r') {
+            if (delimiters.indexOf(c) >= 0 || c == 0 ||
+                    c == '\n' || c == '\r') {
                 if (c != 0) {
                     back();
                 }
@@ -310,9 +333,10 @@ public class JSONTokener {
         }
     }
 
+
     /**
-   * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long,
+     * Get the next value. The value can be a Boolean, Double, Integer,
-   * or String, or the JSONObject.NULL object.
+     * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
      *
      * @return An object.
      * @throws JSONException If syntax error.
@@ -350,18 +374,20 @@ public class JSONTokener {
         back();
 
         string = sb.toString().trim();
-    if (string.isEmpty()) {
+        if (string.equals("")) {
             throw syntaxError("Missing value");
         }
         return JSONObject.stringToValue(string);
     }
 
+
     /**
-   * Skip characters until the next character is the requested character. If the requested character
+     * Skip characters until the next character is the requested character.
-   * is not found, no characters are skipped.
+     * If the requested character is not found, no characters are skipped.
      *
      * @param to A character to skip to.
-   * @return The requested character, or zero if the requested character is not found.
+     * @return The requested character, or zero if the requested character
+     * is not found.
      */
     public char skipTo(char to) throws JSONException {
         char c;
@@ -388,6 +414,7 @@ public class JSONTokener {
         return c;
     }
 
+
     /**
      * Make a JSONException to signal a syntax error.
      *
@@ -398,12 +425,14 @@ public class JSONTokener {
         return new JSONException(message + toString());
     }
 
+
     /**
      * Make a printable string of this JSONTokener.
      *
      * @return " at {index} [character {character} line {line}]"
      */
     public String toString() {
-    return " at " + index + " [character " + this.character + " line " + this.line + "]";
+        return " at " + index + " [character " + this.character + " line " +
+                this.line + "]";
     }
 }

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/JSONWriter.java

@@ -20,56 +20,67 @@ import java.io.IOException;
 import java.io.Writer;
 
 /**
- * JSONWriter provides a quick and convenient way of producing JSON text. The texts produced
+ * JSONWriter provides a quick and convenient way of producing JSON text.
- * strictly conform to JSON syntax rules. No whitespace is added, so the results are ready for
+ * The texts produced strictly conform to JSON syntax rules. No whitespace is
- * transmission or storage. Each instance of JSONWriter can produce one JSON text.
+ * added, so the results are ready for transmission or storage. Each instance of
- *
+ * JSONWriter can produce one JSON text.
- * <p>A JSONWriter instance provides a <code>value</code> method for appending values to the text,
+ * <p>
- * and a <code>key</code> method for adding keys before values in objects. There are <code>array
+ * A JSONWriter instance provides a <code>value</code> method for appending
- * </code> and <code>endArray</code> methods that make and bound array values, and <code>object
+ * values to the
- * </code> and <code>endObject</code> methods which make and bound object values. All of these
+ * text, and a <code>key</code>
- * methods return the JSONWriter instance, permitting a cascade style. For example,
+ * method for adding keys before values in objects. There are <code>array</code>
- *
+ * and <code>endArray</code> methods that make and bound array values, and
- * <pre>
+ * <code>object</code> and <code>endObject</code> methods which make and bound
+ * object values. All of these methods return the JSONWriter instance,
+ * permitting a cascade style. For example, <pre>
  * new JSONWriter(myWriter)
  *     .object()
  *         .key("JSON")
  *         .value("Hello, World!")
- *     .endObject();</pre>
+ *     .endObject();</pre> which writes <pre>
- *
- * which writes
- *
- * <pre>
  * {"JSON":"Hello, World!"}</pre>
- *
+ * <p>
- * <p>The first method called must be <code>array</code> or <code>object</code>. There are no
+ * The first method called must be <code>array</code> or <code>object</code>.
- * methods for adding commas or colons. JSONWriter adds them for you. Objects and arrays can be
+ * There are no methods for adding commas or colons. JSONWriter adds them for
- * nested up to 20 levels deep.
+ * you. Objects and arrays can be nested up to 20 levels deep.
- *
+ * <p>
- * <p>This can sometimes be easier than using a JSONObject to build a string.
+ * This can sometimes be easier than using a JSONObject to build a string.
  *
  * @author JSON.org
  * @version 2010-12-24
  */
 public class JSONWriter {
     private static final int maxdepth = 20;
-
+    /**
-  /** The current mode. Values: 'a' (array), 'd' (done), 'i' (initial), 'k' (key), 'o' (object). */
+     * The current mode. Values:
+     * 'a' (array),
+     * 'd' (done),
+     * 'i' (initial),
+     * 'k' (key),
+     * 'o' (object).
+     */
     protected char mode;
-
+    /**
-  /** The writer that will receive the output. */
+     * The writer that will receive the output.
+     */
     protected Writer writer;
-
+    /**
-  /** The comma flag determines if a comma should be output before the next value. */
+     * The comma flag determines if a comma should be output before the next
+     * value.
+     */
     private boolean comma;
-
+    /**
-  /** The object/array stack. */
+     * The object/array stack.
+     */
     private JSONObject stack[];
-
+    /**
-  /** The stack top index. A value of 0 indicates that the stack is empty. */
+     * The stack top index. A value of 0 indicates that the stack is empty.
+     */
     private int top;
 
-  /** Make a fresh JSONWriter. It can be used to build one JSON text. */
+    /**
+     * Make a fresh JSONWriter. It can be used to build one JSON text.
+     */
     public JSONWriter(Writer w) {
         this.comma = false;
         this.mode = 'i';
@@ -108,13 +119,14 @@ public class JSONWriter {
     }
 
     /**
-   * Begin appending a new array. All values until the balancing <code>endArray</code> will be
+     * Begin appending a new array. All values until the balancing
-   * appended to this array. The <code>endArray</code> method must be called to mark the array's
+     * <code>endArray</code> will be appended to this array. The
-   * end.
+     * <code>endArray</code> method must be called to mark the array's end.
      *
      * @return this
-   * @throws JSONException If the nesting is too deep, or if the object is started in the wrong
+     * @throws JSONException If the nesting is too deep, or if the object is
-   *     place (for example as a key or after the end of the outermost array or object).
+     *                       started in the wrong place (for example as a key or after the end of the
+     *                       outermost array or object).
      */
     public JSONWriter array() throws JSONException {
         if (this.mode == 'i' || this.mode == 'o' || this.mode == 'a') {
@@ -136,7 +148,8 @@ public class JSONWriter {
      */
     private JSONWriter end(char mode, char c) throws JSONException {
         if (this.mode != mode) {
-      throw new JSONException(mode == 'a' ? "Misplaced endArray." : "Misplaced endObject.");
+            throw new JSONException(mode == 'a' ? "Misplaced endArray." :
+                    "Misplaced endObject.");
         }
         this.pop(mode);
         try {
@@ -149,7 +162,8 @@ public class JSONWriter {
     }
 
     /**
-   * End an array. This method most be called to balance calls to <code>array</code>.
+     * End an array. This method most be called to balance calls to
+     * <code>array</code>.
      *
      * @return this
      * @throws JSONException If incorrectly nested.
@@ -159,7 +173,8 @@ public class JSONWriter {
     }
 
     /**
-   * End an object. This method most be called to balance calls to <code>object</code>.
+     * End an object. This method most be called to balance calls to
+     * <code>object</code>.
      *
      * @return this
      * @throws JSONException If incorrectly nested.
@@ -169,13 +184,13 @@ public class JSONWriter {
     }
 
     /**
-   * Append a key. The key will be associated with the next value. In an object, every value must be
+     * Append a key. The key will be associated with the next value. In an
-   * preceded by a key.
+     * object, every value must be preceded by a key.
      *
      * @param string A key string.
      * @return this
-   * @throws JSONException If the key is out of place. For example, keys do not belong in arrays or
+     * @throws JSONException If the key is out of place. For example, keys
-   *     if the key is null.
+     *                       do not belong in arrays or if the key is null.
      */
     public JSONWriter key(String string) throws JSONException {
         if (string == null) {
@@ -199,14 +214,16 @@ public class JSONWriter {
         throw new JSONException("Misplaced key.");
     }
 
+
     /**
-   * Begin appending a new object. All keys and values until the balancing <code>endObject</code>
+     * Begin appending a new object. All keys and values until the balancing
-   * will be appended to this object. The <code>endObject</code> method must be called to mark the
+     * <code>endObject</code> will be appended to this object. The
-   * object's end.
+     * <code>endObject</code> method must be called to mark the object's end.
      *
      * @return this
-   * @throws JSONException If the nesting is too deep, or if the object is started in the wrong
+     * @throws JSONException If the nesting is too deep, or if the object is
-   *     place (for example as a key or after the end of the outermost array or object).
+     *                       started in the wrong place (for example as a key or after the end of the
+     *                       outermost array or object).
      */
     public JSONWriter object() throws JSONException {
         if (this.mode == 'i') {
@@ -219,8 +236,10 @@ public class JSONWriter {
             return this;
         }
         throw new JSONException("Misplaced object.");
+
     }
 
+
     /**
      * Pop an array or object scope.
      *
@@ -236,7 +255,8 @@ public class JSONWriter {
             throw new JSONException("Nesting error.");
         }
         this.top -= 1;
-    this.mode = this.top == 0 ? 'd' : this.stack[this.top - 1] == null ? 'a' : 'k';
+        this.mode = this.top == 0 ?
+                'd' : this.stack[this.top - 1] == null ? 'a' : 'k';
     }
 
     /**
@@ -254,8 +274,10 @@ public class JSONWriter {
         this.top += 1;
     }
 
+
     /**
-   * Append either the value <code>true</code> or the value <code>false</code>.
+     * Append either the value <code>true</code> or the value
+     * <code>false</code>.
      *
      * @param b A boolean.
      * @return this
@@ -287,11 +309,12 @@ public class JSONWriter {
         return this.append(Long.toString(l));
     }
 
+
     /**
      * Append an object value.
      *
-   * @param object The object to append. It can be null, or a Boolean, Number, String, JSONObject,
+     * @param object The object to append. It can be null, or a Boolean, Number,
-   *     or JSONArray, or an object that implements JSONString.
+     *               String, JSONObject, or JSONArray, or an object that implements JSONString.
      * @return this
      * @throws JSONException If the value is out of sequence.
      */

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/JsonReader.java

@@ -15,7 +15,6 @@
  */
 
 package dev.brighten.antivpn.utils.json;
-
 import java.io.*;
 import java.net.URL;
 import java.nio.charset.Charset;

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/XML.java

@@ -18,45 +18,63 @@ package dev.brighten.antivpn.utils.json;
 
 import java.util.Iterator;
 
+
 /**
- * This provides static methods to convert an XML text into a JSONObject, and to covert a JSONObject
+ * This provides static methods to convert an XML text into a JSONObject,
- * into an XML text.
+ * and to covert a JSONObject into an XML text.
  *
  * @author JSON.org
  * @version 2011-02-11
  */
 public class XML {
 
-  /** The Character '&'. */
+    /**
+     * The Character '&'.
+     */
     public static final Character AMP = new Character('&');
 
-  /** The Character '''. */
+    /**
+     * The Character '''.
+     */
     public static final Character APOS = new Character('\'');
 
-  /** The Character '!'. */
+    /**
+     * The Character '!'.
+     */
     public static final Character BANG = new Character('!');
 
-  /** The Character '='. */
+    /**
+     * The Character '='.
+     */
     public static final Character EQ = new Character('=');
 
-  /** The Character '>'. */
+    /**
+     * The Character '>'.
+     */
     public static final Character GT = new Character('>');
 
-  /** The Character '<'. */
+    /**
+     * The Character '<'.
+     */
     public static final Character LT = new Character('<');
 
-  /** The Character '?'. */
+    /**
+     * The Character '?'.
+     */
     public static final Character QUEST = new Character('?');
 
-  /** The Character '"'. */
+    /**
+     * The Character '"'.
+     */
     public static final Character QUOT = new Character('"');
 
-  /** The Character '/'. */
+    /**
+     * The Character '/'.
+     */
     public static final Character SLASH = new Character('/');
 
     /**
      * Replace special characters with XML escapes:
-   *
      * <pre>
      * &amp; <small>(ampersand)</small> is replaced by &amp;amp;
      * &lt; <small>(less than)</small> is replaced by &amp;lt;
@@ -95,8 +113,8 @@ public class XML {
     }
 
     /**
-   * Throw an exception if the string contains whitespace. Whitespace is not allowed in tagNames and
+     * Throw an exception if the string contains whitespace.
-   * attributes.
+     * Whitespace is not allowed in tagNames and attributes.
      *
      * @param string
      * @throws JSONException
@@ -108,7 +126,8 @@ public class XML {
         }
         for (i = 0; i < length; i += 1) {
             if (Character.isWhitespace(string.charAt(i))) {
-        throw new JSONException("'" + string + "' contains a space character.");
+                throw new JSONException("'" + string +
+                        "' contains a space character.");
             }
         }
     }
@@ -122,7 +141,8 @@ public class XML {
      * @return true if the close tag is processed.
      * @throws JSONException
      */
-  private static boolean parse(XMLTokener x, JSONObject context, String name) throws JSONException {
+    private static boolean parse(XMLTokener x, JSONObject context,
+                                 String name) throws JSONException {
         char c;
         int i;
         JSONObject jsonobject = null;
@@ -130,19 +150,19 @@ public class XML {
         String tagName;
         Object token;
 
-    // Test for and skip past these forms:
+// Test for and skip past these forms:
-    //      <!-- ... -->
+//      <!-- ... -->
-    //      <!   ...   >
+//      <!   ...   >
-    //      <![  ... ]]>
+//      <![  ... ]]>
-    //      <?   ...  ?>
+//      <?   ...  ?>
-    // Report errors for these forms:
+// Report errors for these forms:
-    //      <>
+//      <>
-    //      <=
+//      <=
-    //      <<
+//      <<
 
         token = x.nextToken();
 
-    // <!
+// <!
 
         if (token == BANG) {
             c = x.next();
@@ -179,13 +199,13 @@ public class XML {
             return false;
         } else if (token == QUEST) {
 
-      // <?
+// <?
 
             x.skipPast("?>");
             return false;
         } else if (token == SLASH) {
 
-      // Close tag </
+// Close tag </
 
             token = x.nextToken();
             if (name == null) {
@@ -202,7 +222,7 @@ public class XML {
         } else if (token instanceof Character) {
             throw x.syntaxError("Misshaped tag");
 
-      // Open tag <
+// Open tag <
 
         } else {
             tagName = (String) token;
@@ -213,7 +233,7 @@ public class XML {
                     token = x.nextToken();
                 }
 
-        // attribute = value
+// attribute = value
 
                 if (token instanceof String) {
                     string = (String) token;
@@ -223,13 +243,14 @@ public class XML {
                         if (!(token instanceof String)) {
                             throw x.syntaxError("Missing value");
                         }
-            jsonobject.accumulate(string, XML.stringToValue((String) token));
+                        jsonobject.accumulate(string,
+                                XML.stringToValue((String) token));
                         token = null;
                     } else {
                         jsonobject.accumulate(string, "");
                     }
 
-          // Empty tag <.../>
+// Empty tag <.../>
 
                 } else if (token == SLASH) {
                     if (x.nextToken() != GT) {
@@ -242,7 +263,7 @@ public class XML {
                     }
                     return false;
 
-          // Content, between <...> and </...>
+// Content, between <...> and </...>
 
                 } else if (token == GT) {
                     for (; ; ) {
@@ -255,17 +276,20 @@ public class XML {
                         } else if (token instanceof String) {
                             string = (String) token;
                             if (string.length() > 0) {
-                jsonobject.accumulate("content", XML.stringToValue(string));
+                                jsonobject.accumulate("content",
+                                        XML.stringToValue(string));
                             }
 
-              // Nested element
+// Nested element
 
                         } else if (token == LT) {
                             if (parse(x, jsonobject, tagName)) {
                                 if (jsonobject.length() == 0) {
                                     context.accumulate(tagName, "");
-                } else if (jsonobject.length() == 1 && jsonobject.opt("content") != null) {
+                                } else if (jsonobject.length() == 1 &&
-                  context.accumulate(tagName, jsonobject.opt("content"));
+                                        jsonobject.opt("content") != null) {
+                                    context.accumulate(tagName,
+                                            jsonobject.opt("content"));
                                 } else {
                                     context.accumulate(tagName, jsonobject);
                                 }
@@ -280,17 +304,19 @@ public class XML {
         }
     }
 
+
     /**
-   * Try to convert a string into a number, boolean, or null. If the string can't be converted,
+     * Try to convert a string into a number, boolean, or null. If the string
-   * return the string. This is much less ambitious than JSONObject.stringToValue, especially
+     * can't be converted, return the string. This is much less ambitious than
-   * because it does not attempt to convert plus forms, octal forms, hex forms, or E forms lacking
+     * JSONObject.stringToValue, especially because it does not attempt to
-   * decimal points.
+     * convert plus forms, octal forms, hex forms, or E forms lacking decimal
+     * points.
      *
      * @param string A String.
      * @return A simple JSON value.
      */
     public static Object stringToValue(String string) {
-    if (string.isEmpty()) {
+        if (string.equals("")) {
             return string;
         }
         if (string.equalsIgnoreCase("true")) {
@@ -306,8 +332,8 @@ public class XML {
             return new Integer(0);
         }
 
-    // If it might be a number, try converting it. If that doesn't work,
+// If it might be a number, try converting it. If that doesn't work, 
-    // return the string.
+// return the string.
 
         try {
             char initial = string.charAt(0);
@@ -336,13 +362,16 @@ public class XML {
         return string;
     }
 
+
     /**
-   * Convert a well-formed (but not necessarily valid) XML string into a JSONObject. Some
+     * Convert a well-formed (but not necessarily valid) XML string into a
-   * information may be lost in this transformation because JSON is a data format and XML is a
+     * JSONObject. Some information may be lost in this transformation
-   * document format. XML uses elements, attributes, and content text, while JSON uses unordered
+     * because JSON is a data format and XML is a document format. XML uses
-   * collections of name/value pairs and arrays of values. JSON does not does not like to
+     * elements, attributes, and content text, while JSON uses unordered
-   * distinguish between elements and attributes. Sequences of similar elements are represented as
+     * collections of name/value pairs and arrays of values. JSON does not
-   * JSONArrays. Content text may be placed in a "content" member. Comments, prologs, DTDs, and
+     * does not like to distinguish between elements and attributes.
+     * Sequences of similar elements are represented as JSONArrays. Content
+     * text may be placed in a "content" member. Comments, prologs, DTDs, and
      * <code>&lt;[ [ ]]></code> are ignored.
      *
      * @param string The source string.
@@ -358,6 +387,7 @@ public class XML {
         return jo;
     }
 
+
     /**
      * Convert a JSONObject into a well-formed, element-normal XML string.
      *
@@ -369,6 +399,7 @@ public class XML {
         return toString(object, null);
     }
 
+
     /**
      * Convert a JSONObject into a well-formed, element-normal XML string.
      *
@@ -377,7 +408,8 @@ public class XML {
      * @return A string.
      * @throws JSONException
      */
-  public static String toString(Object object, String tagName) throws JSONException {
+    public static String toString(Object object, String tagName)
+            throws JSONException {
         StringBuffer sb = new StringBuffer();
         int i;
         JSONArray ja;
@@ -389,7 +421,7 @@ public class XML {
         Object value;
         if (object instanceof JSONObject) {
 
-      // Emit <tagName>
+// Emit <tagName>
 
             if (tagName != null) {
                 sb.append('<');
@@ -397,7 +429,7 @@ public class XML {
                 sb.append('>');
             }
 
-      // Loop thru the keys.
+// Loop thru the keys.
 
             jo = (JSONObject) object;
             keys = jo.keys();
@@ -413,7 +445,7 @@ public class XML {
                     string = null;
                 }
 
-        // Emit content in body
+// Emit content in body
 
                 if (key.equals("content")) {
                     if (value instanceof JSONArray) {
@@ -429,7 +461,7 @@ public class XML {
                         sb.append(escape(value.toString()));
                     }
 
-          // Emit an array of similar keys
+// Emit an array of similar keys
 
                 } else if (value instanceof JSONArray) {
                     ja = (JSONArray) value;
@@ -453,7 +485,7 @@ public class XML {
                     sb.append(key);
                     sb.append("/>");
 
-          // Emit a new tag <k>
+// Emit a new tag <k>
 
                 } else {
                     sb.append(toString(value, key));
@@ -461,7 +493,7 @@ public class XML {
             }
             if (tagName != null) {
 
-        // Emit the </tagname> close tag
+// Emit the </tagname> close tag
 
                 sb.append("</");
                 sb.append(tagName);
@@ -469,8 +501,8 @@ public class XML {
             }
             return sb.toString();
 
-      // XML does not have good support for arrays. If an array appears in a place
+// XML does not have good support for arrays. If an array appears in a place
-      // where XML is lacking, synthesize an <array> element.
+// where XML is lacking, synthesize an <array> element.
 
         } else {
             if (object.getClass().isArray()) {
@@ -485,11 +517,9 @@ public class XML {
                 return sb.toString();
             } else {
                 string = (object == null) ? "null" : escape(object.toString());
-        return (tagName == null)
+                return (tagName == null) ? "\"" + string + "\"" :
-            ? "\"" + string + "\""
+                        (string.length() == 0) ? "<" + tagName + "/>" :
-            : (string.isEmpty())
+                                "<" + tagName + ">" + string + "</" + tagName + ">";
-                ? "<" + tagName + "/>"
-                : "<" + tagName + ">" + string + "</" + tagName + ">";
             }
         }
     }

Common/Source/src/main/java/dev/brighten/antivpn/utils/json/XMLTokener.java

@@ -17,16 +17,18 @@
 package dev.brighten.antivpn.utils.json;
 
 /**
- * The XMLTokener extends the JSONTokener to provide additional methods for the parsing of XML
+ * The XMLTokener extends the JSONTokener to provide additional methods
- * texts.
+ * for the parsing of XML texts.
  *
  * @author JSON.org
  * @version 2010-12-24
  */
 public class XMLTokener extends JSONTokener {
 
+
     /**
-   * The table of entity values. It initially contains Character values for amp, apos, gt, lt, quot.
+     * The table of entity values. It initially contains Character values for
+     * amp, apos, gt, lt, quot.
      */
     public static final java.util.HashMap entity;
 
@@ -65,18 +67,22 @@ public class XMLTokener extends JSONTokener {
             }
             sb.append(c);
             i = sb.length() - 3;
-      if (i >= 0 && sb.charAt(i) == ']' && sb.charAt(i + 1) == ']' && sb.charAt(i + 2) == '>') {
+            if (i >= 0 && sb.charAt(i) == ']' &&
+                    sb.charAt(i + 1) == ']' && sb.charAt(i + 2) == '>') {
                 sb.setLength(i);
                 return sb.toString();
             }
         }
     }
 
+
     /**
-   * Get the next XML outer token, trimming whitespace. There are two kinds of tokens: the '<'
+     * Get the next XML outer token, trimming whitespace. There are two kinds
-   * character which begins a markup tag, and the content text between markup tags.
+     * of tokens: the '<' character which begins a markup tag, and the content
+     * text between markup tags.
      *
-   * @return A string, or a '<' Character, or null if there is no more source text.
+     * @return A string, or a '<' Character, or null if there is no more
+     * source text.
      * @throws JSONException
      */
     public Object nextContent() throws JSONException {
@@ -106,9 +112,10 @@ public class XMLTokener extends JSONTokener {
         }
     }
 
+
     /**
-   * Return the next entity. These entities are translated to Characters: <code>
+     * Return the next entity. These entities are translated to Characters:
-   * &amp;  &apos;  &gt;  &lt;  &quot;</code>.
+     * <code>&amp;  &apos;  &gt;  &lt;  &quot;</code>.
      *
      * @param ampersand An ampersand character.
      * @return A Character or an entity String if the entity is not recognized.
@@ -131,12 +138,16 @@ public class XMLTokener extends JSONTokener {
         return object != null ? object : ampersand + string + ";";
     }
 
+
     /**
-   * Returns the next XML meta token. This is used for skipping over <!...> and <?...?> structures.
+     * Returns the next XML meta token. This is used for skipping over <!...>
+     * and <?...?> structures.
      *
-   * @return Syntax characters (<code>< > / = ! ?</code>) are returned as Character, and strings and
+     * @return Syntax characters (<code>< > / = ! ?</code>) are returned as
-   *     names are returned as Boolean. We don't care what the values actually are.
+     * Character, and strings and names are returned as Boolean. We don't care
-   * @throws JSONException If a string is not properly closed or if the XML is badly structured.
+     * what the values actually are.
+     * @throws JSONException If a string is not properly closed or if the XML
+     *                       is badly structured.
      */
     public Object nextMeta() throws JSONException {
         char c;
@@ -194,10 +205,12 @@ public class XMLTokener extends JSONTokener {
         }
     }
 
+
     /**
-   * Get the next XML Token. These tokens are found inside of angle brackets. It may be one of these
+     * Get the next XML Token. These tokens are found inside of angle
-   * characters: <code>/ > = ! ?</code> or it may be a string wrapped in single quotes or double
+     * brackets. It may be one of these characters: <code>/ > = ! ?</code> or it
-   * quotes, or it may be a name.
+     * may be a string wrapped in single quotes or double quotes, or it may be a
+     * name.
      *
      * @return a String or a Character.
      * @throws JSONException If the XML is not well formed.
@@ -225,7 +238,7 @@ public class XMLTokener extends JSONTokener {
             case '?':
                 return XML.QUEST;
 
-      // Quoted string
+// Quoted string
 
             case '"':
             case '\'':
@@ -247,7 +260,7 @@ public class XMLTokener extends JSONTokener {
                 }
             default:
 
-        // Name
+// Name
 
                 sb = new StringBuffer();
                 for (; ; ) {
@@ -277,9 +290,10 @@ public class XMLTokener extends JSONTokener {
         }
     }
 
+
     /**
-   * Skip characters until past the requested string. If it is not found, we are left at the end of
+     * Skip characters until past the requested string.
-   * the source with a result of false.
+     * If it is not found, we are left at the end of the source with a result of false.
      *
      * @param to A string to skip past.
      * @throws JSONException

Common/Source/src/main/java/dev/brighten/antivpn/web/FunkemunkyAPI.java

@@ -21,11 +21,13 @@ import dev.brighten.antivpn.utils.json.JSONObject;
 import dev.brighten.antivpn.utils.json.JsonReader;
 import dev.brighten.antivpn.web.objects.QueryResponse;
 import dev.brighten.antivpn.web.objects.VPNResponse;
+
 import java.io.IOException;
 
 public class FunkemunkyAPI {
 
     /**
+     *
      * Queries <a href="https://funkemunky.cc/vpn">...</a> API and returns information on the IP
      *
      * @param ip String
@@ -33,47 +35,40 @@ public class FunkemunkyAPI {
      * @param cachedResults boolean
      * @return VPNResponse
      * @throws JSONException Throws when JSON response is not formatted properly.
-   * @throws IOException Throws when there is an error connecting to and processing information from
+     * @throws IOException Throws when there is an error connecting to and processing information from API.
-   *     API.
      */
-  public static VPNResponse getVPNResponse(
+    public static VPNResponse getVPNResponse(String ip, String license, boolean cachedResults /* faster if set to true*/)
-      String ip, String license, boolean cachedResults /* faster if set to true*/)
             throws JSONException, IOException {
-    JSONObject result =
+        JSONObject result = JsonReader.readJsonFromUrl(String
-        JsonReader.readJsonFromUrl(
+                .format("https://funkemunky.cc/vpn?ip=%s&license=%s&cache=%s",
-            String.format(
-                "https://funkemunky.cc/vpn?ip=%s&license=%s&cache=%s",
                         ip, license.isEmpty() ? "none" : license, cachedResults));
 
         return VPNResponse.fromJson(result);
     }
 
     /**
-   * Feeds into {@link FunkemunkyAPI#getQueryResponse(String)} using "none" as argument to grab
+     * Feeds into {@link FunkemunkyAPI#getQueryResponse(String)} using "none" as argument
-   * query information based on the connecting IP address.
+     * to grab query information based on the connecting IP address.
      *
      * @return QueryResponse
      * @throws JSONException Throws when JSON response is not formatted properly.
-   * @throws IOException Throws when there is an error connecting to and processing information from
+     * @throws IOException Throws when there is an error connecting to and processing information from API.
-   *     API.
      */
     public static QueryResponse getQueryResponse() throws JSONException, IOException {
         return getQueryResponse("none");
     }
 
     /**
-   * Queries <a href="https://funkemunky.cc/vpn/queryCheck">...</a> and returns information based on
+     * Queries <a href="https://funkemunky.cc/vpn/queryCheck">...</a> and returns information based on the
-   * the provided licence input.
+     * provided licence input.
      *
      * @param license String
      * @return QueryResponse
      * @throws JSONException Throws when JSON response is not formatted properly.
-   * @throws IOException Throws when there is an error connecting to and processing information from
+     * @throws IOException Throws when there is an error connecting to and processing information from API.
-   *     API.
      */
     public static QueryResponse getQueryResponse(String license) throws JSONException, IOException {
-    JSONObject result =
+        JSONObject result = JsonReader.readJsonFromUrl("https://funkemunky.cc/vpn/queryCheck?license=" + license);
-        JsonReader.readJsonFromUrl("https://funkemunky.cc/vpn/queryCheck?license=" + license);
 
         return QueryResponse.fromJson(result);
     }

Common/Source/src/main/java/dev/brighten/antivpn/web/objects/QueryResponse.java

@@ -21,9 +21,9 @@ import dev.brighten.antivpn.utils.json.JSONObject;
 import lombok.Builder;
 import lombok.Data;
 
+
 /**
- * Used to format the JSON response from <a href="https://funkemunky.cc/vpn/queryCheck">...</a> into
+ * Used to format the JSON response from <a href="https://funkemunky.cc/vpn/queryCheck">...</a> into an object for project use.
- * an object for project use.
  */
 @Data
 @Builder(toBuilder = true)
@@ -35,8 +35,7 @@ public class QueryResponse {
     private long queriesMax;
 
     /**
-   * Formats response from <a href="https://funkemunky.cc/vpn/queryCheck">...</a> into {@link
+     * Formats response from <a href="https://funkemunky.cc/vpn/queryCheck">...</a> into {@link QueryResponse} for project use.
-   * QueryResponse} for project use.
      *
      * @param object JSONObject
      * @return QueryResponse
@@ -45,15 +44,13 @@ public class QueryResponse {
     public static QueryResponse fromJson(JSONObject object) throws JSONException {
         boolean validPlan = object.getBoolean("validPlan");
 
-    if (!validPlan) { // Nothing else will be returned from API if validPlan is false.
+        if(!validPlan) { // Nothing else will be returned from API if validPlan is false.
             return QueryResponse.builder().validPlan(false).build();
         }
 
-    return QueryResponse.builder()
+        return QueryResponse.builder().validPlan(object.getBoolean("validPlan"))
-        .validPlan(object.getBoolean("validPlan"))
                 .planType(object.getString("planType"))
                 .queries(object.getLong("queries"))
-        .queriesMax(object.getLong("queryLimit"))
+                .queriesMax(object.getLong("queryLimit")).build();
-        .build();
     }
 }

Common/Source/src/main/java/dev/brighten/antivpn/web/objects/VPNResponse.java

@@ -26,15 +26,7 @@ import lombok.Data;
 @AllArgsConstructor
 @Builder
 public class VPNResponse {
-  private String asn,
+    private String asn, ip, countryName, countryCode, city, timeZone, method, isp, failureReason = "N/A";
-      ip,
-      countryName,
-      countryCode,
-      city,
-      timeZone,
-      method,
-      isp,
-      failureReason = "N/A";
     private boolean proxy, cached;
     private final boolean success;
     private double latitude, longitude;
@@ -60,8 +52,8 @@ public class VPNResponse {
     }
 
     /**
-   * Feeds into {@link VPNResponse#fromJson(JSONObject)} formatting the JSON {@link String} into a
+     * Feeds into {@link VPNResponse#fromJson(JSONObject)} formatting the JSON {@link String} into
-   * {@link JSONObject}
+     * a {@link JSONObject}
      *
      * @param json String
      * @return VPNResponse
@@ -70,41 +62,31 @@ public class VPNResponse {
         return fromJson(new JSONObject(json));
     }
 
-  public static final VPNResponse FAILED_RESPONSE =
+    public static final VPNResponse FAILED_RESPONSE = VPNResponse.builder()
-      VPNResponse.builder().success(false).failureReason("Internal plugin API error.").build();
+            .success(false)
+            .failureReason("Internal plugin API error.")
+            .build();
 
     /**
-   * Formats response from <a href="https://funkemunky.cc/vpn">...</a> into {@link VPNResponse} for
+     * Formats response from <a href="https://funkemunky.cc/vpn">...</a> into {@link VPNResponse} for project use.
-   * project use.
      *
      * @param jsonObject JSONObject
      * @return VPNResponse
      * @throws JSONException Throws when JSON is not formatted properly.
      */
     public static VPNResponse fromJson(JSONObject jsonObject) throws JSONException {
-    if (jsonObject.getBoolean("success")) {
+        if(jsonObject.getBoolean("success")) {
-      return new VPNResponse(
+            return new VPNResponse(jsonObject.getString("asn"), jsonObject.getString("ip"),
-          jsonObject.getString("asn"),
+                    jsonObject.getString("countryName"), jsonObject.getString("countryCode"),
-          jsonObject.getString("ip"),
+                    jsonObject.getString("city"), jsonObject.getString("timeZone"),
-          jsonObject.getString("countryName"),
-          jsonObject.getString("countryCode"),
-          jsonObject.getString("city"),
-          jsonObject.getString("timeZone"),
                     jsonObject.has("method") ? jsonObject.getString("method") : "N/A",
-          jsonObject.getString("isp"),
+                    jsonObject.getString("isp"), "N/A", jsonObject.getBoolean("proxy"),
-          "N/A",
+                    jsonObject.getBoolean("cached"), jsonObject.getBoolean("success"),
-          jsonObject.getBoolean("proxy"),
+                    jsonObject.getDouble("latitude"), jsonObject.getDouble("longitude"),
-          jsonObject.getBoolean("cached"),
+                    jsonObject.getLong("lastAccess"), jsonObject.getInt("queriesLeft"));
-          jsonObject.getBoolean("success"),
-          jsonObject.getDouble("latitude"),
-          jsonObject.getDouble("longitude"),
-          jsonObject.getLong("lastAccess"),
-          jsonObject.getInt("queriesLeft"));
         } else {
-      return VPNResponse.builder()
+            return VPNResponse.builder().success(false)
-          .success(false)
+                    .failureReason(jsonObject.getString("failureReason")).build();
-          .failureReason(jsonObject.getString("failureReason"))
-          .build();
         }
     }
 }

Common/Source/src/test/java/dev/brighten/antivpn/database/DatabaseIntegrationTestSupport.java

@@ -1,15 +1,18 @@
 package dev.brighten.antivpn.database;
 
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.when;
-
 import dev.brighten.antivpn.AntiVPN;
 import dev.brighten.antivpn.api.VPNConfig;
 import dev.brighten.antivpn.api.VPNExecutor;
 import dev.brighten.antivpn.database.sql.utils.MySQL;
 import dev.brighten.antivpn.utils.CIDRUtils;
 import dev.brighten.antivpn.web.objects.VPNResponse;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.io.IOException;
 import java.lang.reflect.Field;
 import java.nio.file.Path;
 import java.util.List;
@@ -19,19 +22,21 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
-import org.junit.jupiter.api.AfterEach;
+
-import org.junit.jupiter.api.BeforeEach;
+import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.io.TempDir;
+import static org.mockito.Mockito.lenient;
-import org.mockito.Mock;
+import static org.mockito.Mockito.when;
-import org.mockito.MockitoAnnotations;
 
 abstract class DatabaseIntegrationTestSupport {
 
-  @TempDir Path pluginFolder;
+    @TempDir
+    Path pluginFolder;
 
-  @Mock protected AntiVPN antiVPN;
+    @Mock
+    protected AntiVPN antiVPN;
 
-  @Mock protected VPNConfig vpnConfig;
+    @Mock
+    protected VPNConfig vpnConfig;
 
     protected TestVPNExecutor vpnExecutor;
     private AutoCloseable mocks;
@@ -88,8 +93,7 @@ abstract class DatabaseIntegrationTestSupport {
         registerDatabase(database);
         database.init();
 
-    VPNResponse response =
+        VPNResponse response = VPNResponse.builder()
-        VPNResponse.builder()
                 .ip("1.2.3.4")
                 .asn("AS123")
                 .countryName("United States")
@@ -108,13 +112,11 @@ abstract class DatabaseIntegrationTestSupport {
         assertTrue(storedResponse.get().isProxy());
 
         database.deleteResponse(response.getIp());
-    awaitCondition(
+        awaitCondition(() -> database.getStoredResponse(response.getIp()).isEmpty(),
-        () -> database.getStoredResponse(response.getIp()).isEmpty(),
                 "Expected cached response to be deleted");
 
         database.cacheResponse(response);
-    awaitCondition(
+        awaitCondition(() -> database.getStoredResponse(response.getIp()).isPresent(),
-        () -> database.getStoredResponse(response.getIp()).isPresent(),
                 "Expected cached response to be restored");
 
         UUID uuid = UUID.randomUUID();
@@ -124,8 +126,7 @@ abstract class DatabaseIntegrationTestSupport {
         List<UUID> whitelisted = database.getAllWhitelisted();
         assertTrue(whitelisted.contains(uuid));
         database.removeWhitelist(uuid);
-    awaitCondition(
+        awaitCondition(() -> !database.isWhitelisted(uuid), "Expected UUID whitelist entry to be removed");
-        () -> !database.isWhitelisted(uuid), "Expected UUID whitelist entry to be removed");
 
         CIDRUtils cidr = new CIDRUtils("192.168.1.0/24");
         assertFalse(database.isWhitelisted(cidr));
@@ -134,8 +135,7 @@ abstract class DatabaseIntegrationTestSupport {
         List<CIDRUtils> whitelistedIps = database.getAllWhitelistedIps();
         assertTrue(whitelistedIps.stream().anyMatch(entry -> entry.getCidr().equals(cidr.getCidr())));
         database.removeWhitelist(cidr);
-    awaitCondition(
+        awaitCondition(() -> !database.isWhitelisted(cidr), "Expected CIDR whitelist entry to be removed");
-        () -> !database.isWhitelisted(cidr), "Expected CIDR whitelist entry to be removed");
 
         database.updateAlertsState(uuid, true);
         awaitCondition(() -> awaitAlertsState(database, uuid), "Expected alerts to be enabled");
@@ -143,30 +143,24 @@ abstract class DatabaseIntegrationTestSupport {
         awaitCondition(() -> !awaitAlertsState(database, uuid), "Expected alerts to be disabled");
 
         database.clearResponses();
-    awaitCondition(
+        awaitCondition(() -> database.getStoredResponse(response.getIp()).isEmpty(),
-        () -> database.getStoredResponse(response.getIp()).isEmpty(),
                 "Expected cached responses to be cleared");
     }
 
-  private Optional<VPNResponse> awaitStoredResponse(VPNDatabase database, String ip)
+    private Optional<VPNResponse> awaitStoredResponse(VPNDatabase database, String ip) throws InterruptedException {
-      throws InterruptedException {
         AtomicReference<Optional<VPNResponse>> result = new AtomicReference<>(Optional.empty());
-    awaitCondition(
+        awaitCondition(() -> {
-        () -> {
             Optional<VPNResponse> response = database.getStoredResponse(ip);
             result.set(response);
             return response.isPresent();
-        },
+        }, "Timed out waiting for cached response");
-        "Timed out waiting for cached response");
         return result.get();
     }
 
     private boolean awaitAlertsState(VPNDatabase database, UUID uuid) throws InterruptedException {
         CountDownLatch latch = new CountDownLatch(1);
         AtomicReference<Boolean> result = new AtomicReference<>(false);
-    database.alertsState(
+        database.alertsState(uuid, enabled -> {
-        uuid,
-        enabled -> {
             result.set(enabled);
             latch.countDown();
         });
@@ -174,8 +168,7 @@ abstract class DatabaseIntegrationTestSupport {
         return result.get();
     }
 
-  protected void awaitCondition(CheckedBooleanSupplier condition, String failureMessage)
+    protected void awaitCondition(CheckedBooleanSupplier condition, String failureMessage) throws InterruptedException {
-      throws InterruptedException {
         long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(10);
         while (System.nanoTime() < deadline) {
             try {