Implementing new configuration system

2026-06-06 20:02:20 +00:00 · 2022-03-29 16:20:07 -04:00
parent 8edef241e4
commit ba72ad2a44
30 changed files with 382 additions and 1781 deletions
@@ -1,199 +0,0 @@
-package dev.brighten.antivpn.bukkit;
-
-import dev.brighten.antivpn.api.VPNConfig;
-import dev.brighten.antivpn.bukkit.util.ConfigDefault;
-import org.bukkit.Bukkit;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-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),
-            defaultDatabaseType = new ConfigDefault<>("H2",
-                    "database.type", BukkitPlugin.pluginInstance),
-            defaultDatabaseName = new ConfigDefault<>("kaurivpn",
-                    "database.database", BukkitPlugin.pluginInstance),
-            defaultMongoURL = new ConfigDefault<>("", "database.mongoURL", BukkitPlugin.pluginInstance),
-            defaultUsername = new ConfigDefault<>("root",
-                    "database.username", BukkitPlugin.pluginInstance),
-            defaultPassword = new ConfigDefault<>("password",
-                    "database.password", BukkitPlugin.pluginInstance),
-
-
-            defaultIp = new ConfigDefault<>("localhost", "database.ip", BukkitPlugin.pluginInstance),
-            defaultAlertMsg = new ConfigDefault<>("&8[&6KauriVPN&8] &e%player% &7has joined on a VPN/proxy" +
-                    " &8(&f%reason%&8) &7in location &8(&f%city%&7, &f%country%&8)", "alerts.message",
-                    BukkitPlugin.pluginInstance);
-    private final ConfigDefault<Boolean> cacheResultsDefault = new ConfigDefault<>(true,
-            "cachedResults", BukkitPlugin.pluginInstance),
-            defaultUseCredentials = new ConfigDefault<>(true,
-                    "database.useCredentials", BukkitPlugin.pluginInstance),
-            defaultDatabaseEnabled = new ConfigDefault<>(false, "database.enabled",
-                    BukkitPlugin.pluginInstance), defaultCommandsEnable = new ConfigDefault<>(false,
-            "commands.enabled", BukkitPlugin.pluginInstance), defaultKickPlayers
-            = new ConfigDefault<>(true, "kickPlayers", BukkitPlugin.pluginInstance),
-            defaultAlertToStaff = new ConfigDefault<>(true, "alerts.enabled",
-                    BukkitPlugin.pluginInstance),
-            defaultMetrics = new ConfigDefault<>(true, "bstats", 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), defaultCommands = new ConfigDefault<>(
-            Collections.singletonList("kick %player% VPNs are not allowed on our server!"), "commands.execute",
-            BukkitPlugin.pluginInstance),
-            defBlockedCountries = new ConfigDefault<>(new ArrayList<>(), "blockedCountries",
-                    BukkitPlugin.pluginInstance),
-            defAllowedCountries = new ConfigDefault<>(new ArrayList<>(), "allowedCountries",
-            BukkitPlugin.pluginInstance);
-
-    private String license, kickMessage, databaseType, databaseName, mongoURL, username, password, ip, alertMsg;
-    private List<String> prefixWhitelists, commands, allowedCountries, blockedCountries;
-    private int port;
-    private boolean cacheResults, databaseEnabled, useCredentials, commandsEnabled, kickPlayers, alertToStaff, metrics;
-
-    @Override
-    public String getLicense() {
-        return license;
-    }
-
-    @Override
-    public boolean cachedResults() {
-        return cacheResults;
-    }
-
-    @Override
-    public String getKickString() {
-        return kickMessage;
-    }
-
-    @Override
-    public String alertMessage() {
-        return alertMsg;
-    }
-
-    @Override
-    public boolean alertToStaff() {
-        return alertToStaff;
-    }
-
-    @Override
-    public boolean runCommands() {
-        return commandsEnabled;
-    }
-
-    @Override
-    public List<String> commands() {
-        return commands;
-    }
-
-    @Override
-    public boolean kickPlayersOnDetect() {
-        return kickPlayers;
-    }
-
-    @Override
-    public List<String> getPrefixWhitelists() {
-        return prefixWhitelists;
-    }
-
-    @Override
-    public boolean isDatabaseEnabled() {
-        return databaseEnabled;
-    }
-
-    @Override
-    public boolean useDatabaseCreds() {
-        return useCredentials;
-    }
-
-    @Override
-    public String mongoDatabaseURL() {
-        return mongoURL;
-    }
-
-    @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 List<String> allowedCountries() {
-        return allowedCountries;
-    }
-
-    @Override
-    public List<String> blockedCountries() {
-        return blockedCountries;
-    }
-
-    @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;
-    }
-
-    @Override
-    public boolean metrics() {
-        return metrics;
-    }
-
-    public void update() {
-        license = licenseDefault.get();
-        kickMessage = kickStringDefault.get();
-        cacheResults = cacheResultsDefault.get();
-        prefixWhitelists = prefixWhitelistsDefault.get();
-        databaseEnabled = defaultDatabaseEnabled.get();
-        useCredentials = defaultUseCredentials.get();
-        databaseType = defaultDatabaseType.get();
-        databaseName = defaultDatabaseName.get();
-        mongoURL = defaultMongoURL.get();
-        username = defaultUsername.get();
-        password = defaultPassword.get();
-        ip = defaultIp.get();
-        port = defaultPort.get();
-        commandsEnabled = defaultCommandsEnable.get();
-        commands = defaultCommands.get();
-        kickPlayers = defaultKickPlayers.get();
-        alertToStaff = defaultAlertToStaff.get();
-        alertMsg = defaultAlertMsg.get();
-        metrics = defaultMetrics.get();
-        blockedCountries = defBlockedCountries.get();
-        allowedCountries = defAllowedCountries.get();
-    }
-}
@@ -73,7 +73,7 @@ public class BukkitListener extends VPNExecutor implements Listener {
        //If they're exempt, don't check.
        if(AntiVPN.getInstance().getExecutor().isWhitelisted(event.getPlayer().getUniqueId())
                || AntiVPN.getInstance().getExecutor().isWhitelisted(event.getAddress().getHostAddress())) return;
-        checkIp(event.getAddress().getHostAddress(), AntiVPN.getInstance().getConfig().cachedResults(), result -> {
+        checkIp(event.getAddress().getHostAddress(), AntiVPN.getInstance().getVpnConfig().cachedResults(), result -> {
            if(result.isSuccess() && result.isProxy()) {
                new BukkitRunnable() {
                    public void run() {
@@ -81,25 +81,25 @@ public class BukkitListener extends VPNExecutor implements Listener {

                        if(!player.hasPermission("antivpn.bypass") //Has bypass permission
                                //Or has a name that starts with a certain prefix. This is for Bedrock exempting.
-                                && AntiVPN.getInstance().getConfig().getPrefixWhitelists().stream()
+                                && AntiVPN.getInstance().getVpnConfig().getPrefixWhitelists().stream()
                                .noneMatch(prefix -> player.getName().startsWith(prefix))) {
-                            if (AntiVPN.getInstance().getConfig().kickPlayersOnDetect())
+                            if (AntiVPN.getInstance().getVpnConfig().kickPlayersOnDetect())
                                player.kickPlayer(ChatColor.translateAlternateColorCodes('&',
-                                        AntiVPN.getInstance().getConfig().getKickString()));
+                                        AntiVPN.getInstance().getVpnConfig().getKickString()));

                            //Ensuring the user wishes to alert to staff
-                            if(AntiVPN.getInstance().getConfig().alertToStaff())
+                            if(AntiVPN.getInstance().getVpnConfig().alertToStaff())
                                AntiVPN.getInstance().getPlayerExecutor().getOnlinePlayers().stream()
                                        .filter(APIPlayer::isAlertsEnabled)
-                                        .forEach(pl -> pl.sendMessage(AntiVPN.getInstance().getConfig()
+                                        .forEach(pl -> pl.sendMessage(AntiVPN.getInstance().getVpnConfig()
                                                .alertMessage().replace("%player%", event.getPlayer().getName())
                                                .replace("%reason%", result.getMethod())
                                                .replace("%country%", result.getCountryName())
                                                .replace("%city%", result.getCity())));

                            //In case the user wants to run their own commands instead of using the built in kicking
-                            if(AntiVPN.getInstance().getConfig().runCommands())
-                                for (String command : AntiVPN.getInstance().getConfig().commands()) {
+                            if(AntiVPN.getInstance().getVpnConfig().runCommands())
+                                for (String command : AntiVPN.getInstance().getVpnConfig().commands()) {
                                    Bukkit.dispatchCommand(Bukkit.getConsoleSender(),
                                            ChatColor.translateAlternateColorCodes('&',
                                                    command.replace("%player%", event.getPlayer().getName())));
@@ -1,14 +1,13 @@
 package dev.brighten.antivpn.bukkit;

 import dev.brighten.antivpn.AntiVPN;
-import dev.brighten.antivpn.bukkit.util.ConfigDefault;
 import dev.brighten.antivpn.command.Command;
+import dev.brighten.antivpn.utils.ConfigDefault;
 import dev.brighten.antivpn.utils.MiscUtils;
 import dev.brighten.antivpn.utils.config.Configuration;
 import lombok.val;
 import net.md_5.bungee.api.ChatColor;
 import org.bstats.bukkit.Metrics;
-import org.bstats.charts.MultiLineChart;
 import org.bstats.charts.SingleLineChart;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -46,9 +45,9 @@ public class BukkitPlugin extends JavaPlugin {
        }

        Bukkit.getLogger().info("Starting AntiVPN services...");
-        AntiVPN.start(new BukkitConfig(), new BukkitListener(), new BukkitPlayerExecutor(), getDataFolder());
+        AntiVPN.start(new BukkitListener(), new BukkitPlayerExecutor(), getDataFolder());

-        if(AntiVPN.getInstance().getConfig().metrics()) {
+        if(AntiVPN.getInstance().getVpnConfig().metrics()) {
            Bukkit.getLogger().info("Starting bStats metrics...");
            Metrics metrics = new Metrics(this, 12615);
            metrics.addCustomChart(vpnDetections = new SingleLineChart("vpn_detections",
@@ -136,7 +135,7 @@ public class BukkitPlugin extends JavaPlugin {
        }

        AntiVPN.getInstance().getMessageHandler().initStrings(vpnString -> new ConfigDefault<>
-                (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), BukkitPlugin.pluginInstance)
+                (vpnString.getDefaultMessage(), "messages." + vpnString.getKey(), AntiVPN.getInstance())
                .get());
        //TODO Finish system before implementing on startup
        /*Bukkit.getLogger().info("Getting strings...");
@@ -1,32 +0,0 @@
-package dev.brighten.antivpn.bukkit.util;
-
-import dev.brighten.antivpn.utils.MiscUtils;
-import dev.brighten.antivpn.utils.config.Configuration;
-import lombok.AllArgsConstructor;
-import org.bukkit.plugin.Plugin;
-
-import java.io.File;
-
-@AllArgsConstructor
-public class ConfigDefault<A> {
-
-    private final A defaultValue;
-    private final String path;
-    private final Plugin plugin;
-
-    public A get() {
-        if(plugin.getConfig().get(path) != null)
-            return (A) plugin.getConfig().get(path);
-        else {
-            plugin.getConfig().set(path, defaultValue);
-            plugin.saveConfig();
-            return defaultValue;
-        }
-    }
-
-    public A set(A value) {
-        plugin.getConfig().set(path, value);
-
-        return value;
-    }
-}