Implementing database and allowlist system

Bukkit/src/main/java/dev/brighten/antivpn/bukkit/BukkitConfig.java

@@ -10,15 +10,31 @@ public class BukkitConfig implements VPNConfig {
     private final ConfigDefault<String> licenseDefault = new ConfigDefault<>("",
             "license", BukkitPlugin.pluginInstance), kickStringDefault =
             new ConfigDefault<>("Proxies are not allowed on our server",
-                    "kickMessage", BukkitPlugin.pluginInstance);
+                    "kickMessage", BukkitPlugin.pluginInstance),
+            defaultDatabaseType = new ConfigDefault<>("MySQL",
+                    "database.type", BukkitPlugin.pluginInstance),
+            defaultDatabaseName = new ConfigDefault<>("kaurivpn",
+                    "database.database", BukkitPlugin.pluginInstance),
+            defaultUsername = new ConfigDefault<>("root",
+                    "database.username", BukkitPlugin.pluginInstance),
+            defaultPassword = new ConfigDefault<>("password",
+                    "database.password", BukkitPlugin.pluginInstance),
+            defaultAuthDatabase = new ConfigDefault<>("admin",
+                    "database.auth", BukkitPlugin.pluginInstance),
+            defaultIp = new ConfigDefault<>("localhost", "database.ip", BukkitPlugin.pluginInstance);
     private final ConfigDefault<Boolean> cacheResultsDefault = new ConfigDefault<>(true,
-            "cachedResults", BukkitPlugin.pluginInstance);
+            "cachedResults", BukkitPlugin.pluginInstance),
+            defaultDatabaseEnabled = new ConfigDefault<>(false, "database.enabled",
+                    BukkitPlugin.pluginInstance);
+    private final ConfigDefault<Integer>
+            defaultPort = new ConfigDefault<>(-1, "database.port", BukkitPlugin.pluginInstance);
     private final ConfigDefault<List<String>> prefixWhitelistsDefault = new ConfigDefault<>(new ArrayList<>(),
             "prefixWhitelists", BukkitPlugin.pluginInstance);
 
-    private String license, kickMessage;
+    private String license, kickMessage, databaseType, databaseName, username, password, ip;
     private List<String> prefixWhitelists;
-    private boolean cacheResults;
+    private int port;
+    private boolean cacheResults, databaseEnabled;
 
     @Override
     public String getLicense() {
@@ -40,10 +56,64 @@ public class BukkitConfig implements VPNConfig {
         return prefixWhitelists;
     }
 
+    @Override
+    public boolean isDatabaseEnabled() {
+        return databaseEnabled;
+    }
+
+    @Override
+    public String getDatabaseType() {
+        return databaseType;
+    }
+
+    @Override
+    public String getDatabaseName() {
+        return databaseName;
+    }
+
+    @Override
+    public String getUsername() {
+        return username;
+    }
+
+    @Override
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public String getIp() {
+        return ip;
+    }
+
+    @Override
+    public int getPort() {
+        if(port == -1) {
+            switch (getDatabaseType().toLowerCase()) {
+                case "mongodb":
+                case "mongo":
+                case "mongod":
+                    return 27017;
+                case "sql":
+                case "mysql":
+                    return 3306;
+            }
+        }
+
+        return port;
+    }
+
     public void update() {
         license = licenseDefault.get();
         kickMessage = kickStringDefault.get();
         cacheResults = cacheResultsDefault.get();
         prefixWhitelists = prefixWhitelistsDefault.get();
+        databaseEnabled = defaultDatabaseEnabled.get();
+        databaseType = defaultDatabaseType.get();
+        databaseName = defaultDatabaseName.get();
+        username = defaultUsername.get();
+        password = defaultPassword.get();
+        ip = defaultIp.get();
+        port = defaultPort.get();
     }
 }

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

@@ -43,6 +43,8 @@ public class BukkitListener extends VPNExecutor implements Listener {
 
     @EventHandler
     public void onListener(final AsyncPlayerPreLoginEvent event) {
+        //If they're exempt, don't check.
+        if(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getUniqueId())) return;
         checkIp(event.getAddress().getHostAddress(), AntiVPN.getInstance().getConfig().cachedResults(), result -> {
             if(result.isSuccess() && result.isProxy()) {
                 event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);

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

@@ -3,6 +3,7 @@ package dev.brighten.antivpn.bukkit;
 import dev.brighten.antivpn.api.APIPlayer;
 import dev.brighten.antivpn.api.PlayerExecutor;
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 
 public class BukkitPlayerExecutor implements PlayerExecutor {
+
     @Override
     public Optional<APIPlayer> getPlayer(String name) {
         final Player player = Bukkit.getPlayer(name);
@@ -33,8 +35,10 @@ public class BukkitPlayerExecutor implements PlayerExecutor {
         return Optional.of(new BukkitPlayer(player));
     }
 
+
     @Override
     public List<APIPlayer> getOnlinePlayers() {
         return Bukkit.getOnlinePlayers().stream().map(BukkitPlayer::new).collect(Collectors.toList());
     }
+
 }

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

@@ -56,7 +56,8 @@ public class BukkitPlugin extends JavaPlugin {
 
                     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())
+                                    .anyMatch(alias2 -> alias2.equalsIgnoreCase(args[0]))) {
                                 return child.tabComplete(new BukkitCommandExecutor(sender), alias, IntStream
                                         .range(0, args.length - 1)
                                         .mapToObj(i -> args[i + 1]).toArray(String[]::new));
@@ -78,7 +79,8 @@ public class BukkitPlugin extends JavaPlugin {
 
                     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())
+                                    .anyMatch(alias -> alias.equalsIgnoreCase(args[0]))) {
                                 if(!sender.hasPermission("antivpn.command.*")
                                         && !sender.hasPermission(child.permission())) {
                                     sender.sendMessage(ChatColor.RED + "No permission.");