Implementing new configuration system

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

@@ -9,7 +9,11 @@ import dev.brighten.antivpn.database.VPNDatabase;
 import dev.brighten.antivpn.database.mongo.MongoVPN;
 import dev.brighten.antivpn.database.sql.MySqlVPN;
 import dev.brighten.antivpn.message.MessageHandler;
+import dev.brighten.antivpn.utils.MiscUtils;
 import dev.brighten.antivpn.utils.VPNResponse;
+import dev.brighten.antivpn.utils.config.Configuration;
+import dev.brighten.antivpn.utils.config.ConfigurationProvider;
+import dev.brighten.antivpn.utils.config.YamlConfiguration;
 import dev.brighten.antivpn.utils.json.JSONException;
 import dev.brighten.antivpn.utils.json.JSONObject;
 import dev.brighten.antivpn.utils.json.JsonReader;
@@ -19,6 +23,9 @@ import lombok.Setter;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,31 +34,44 @@ import java.util.List;
 public class AntiVPN {
 
     private static AntiVPN INSTANCE;
-    private VPNConfig config;
+    private VPNConfig vpnConfig;
     private VPNExecutor executor;
     private PlayerExecutor playerExecutor;
     private VPNDatabase database;
     private MessageHandler messageHandler;
+    private Configuration config;
     private List<Command> commands = new ArrayList<>();
     public int detections, checked;
     private File pluginFolder;
 
-    public static void start(VPNConfig config, VPNExecutor executor, PlayerExecutor playerExecutor, File pluginFolder) {
+    public static void start(VPNExecutor executor, PlayerExecutor playerExecutor, File pluginFolder) {
         //Initializing
 
         INSTANCE = new AntiVPN();
 
         INSTANCE.pluginFolder = pluginFolder;
-        INSTANCE.config = config;
         INSTANCE.executor = executor;
         INSTANCE.playerExecutor = playerExecutor;
+        try {
+            File configFile = new File(pluginFolder, "config.yml");
+            if(!configFile.exists()){
+                configFile.getParentFile().mkdirs();
+                MiscUtils.copy(INSTANCE.getResource( "config.yml"), configFile);
+            }
+            INSTANCE.config = ConfigurationProvider.getProvider(YamlConfiguration.class)
+                    .load(configFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        INSTANCE.vpnConfig = new VPNConfig();
 
         INSTANCE.executor.registerListeners();
-        INSTANCE.config.update();
+        INSTANCE.vpnConfig.update();
 
         INSTANCE.messageHandler = new MessageHandler();
 
-        switch(INSTANCE.config.getDatabaseType().toLowerCase()) {
+        switch(INSTANCE.vpnConfig.getDatabaseType().toLowerCase()) {
             case "mysql":
             case "h2":
             case "sql":{
@@ -68,7 +88,7 @@ public class AntiVPN {
                 break;
             }
             default: {
-                AntiVPN.getInstance().getExecutor().log("Could not find database type \"" + INSTANCE.config.getDatabaseType() + "\". " +
+                AntiVPN.getInstance().getExecutor().log("Could not find database type \"" + INSTANCE.vpnConfig.getDatabaseType() + "\". " +
                         "Options: [MySQL]");
                 break;
             }
@@ -88,6 +108,25 @@ public class AntiVPN {
         });
     }
 
+    public InputStream getResource(String filename) {
+        if (filename == null) {
+            throw new IllegalArgumentException("Filename cannot be null");
+        } else {
+            try {
+                URL url = executor.getClass().getClassLoader().getResource(filename);
+                if (url == null) {
+                    return null;
+                } else {
+                    URLConnection connection = url.openConnection();
+                    connection.setUseCaches(false);
+                    return connection.getInputStream();
+                }
+            } catch (IOException var4) {
+                return null;
+            }
+        }
+    }
+
     public void stop() {
         executor.shutdown();
         if(database != null) database.shutdown();
@@ -99,6 +138,15 @@ public class AntiVPN {
         return INSTANCE;
     }
 
+    public void saveConfig() {
+        try {
+            ConfigurationProvider.getProvider(YamlConfiguration.class)
+                    .save(getConfig(), new File(pluginFolder.getPath() + File.separator + "config.yml"));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     public static VPNResponse getVPNResponse(String ip, String license, boolean cachedResults /* faster if set to true*/)
             throws JSONException, IOException {
         JSONObject result = JsonReader.readJsonFromUrl(String

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

@@ -1,51 +1,181 @@
 package dev.brighten.antivpn.api;
 
+import dev.brighten.antivpn.AntiVPN;
+import dev.brighten.antivpn.utils.ConfigDefault;
+
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-public interface VPNConfig {
+public class VPNConfig {
+    private final ConfigDefault<String> licenseDefault = new ConfigDefault<>("",
+            "license", AntiVPN.getInstance()), kickStringDefault =
+            new ConfigDefault<>("Proxies are not allowed on our server",
+                    "kickMessage", AntiVPN.getInstance()),
+            defaultDatabaseType = new ConfigDefault<>("H2",
+                    "database.type", AntiVPN.getInstance()),
+            defaultDatabaseName = new ConfigDefault<>("kaurivpn",
+                    "database.database", AntiVPN.getInstance()),
+            defaultMongoURL = new ConfigDefault<>("", "database.mongoURL", AntiVPN.getInstance()),
+            defaultUsername = new ConfigDefault<>("root",
+                    "database.username", AntiVPN.getInstance()),
+            defaultPassword = new ConfigDefault<>("password",
+                    "database.password", AntiVPN.getInstance()),
 
-    String getLicense();
 
-    boolean cachedResults();
+    defaultIp = new ConfigDefault<>("localhost", "database.ip", AntiVPN.getInstance()),
+            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",
+                    AntiVPN.getInstance());
+    private final ConfigDefault<Boolean> cacheResultsDefault = new ConfigDefault<>(true,
+            "cachedResults", AntiVPN.getInstance()),
+            defaultUseCredentials = new ConfigDefault<>(true,
+                    "database.useCredentials", AntiVPN.getInstance()),
+            defaultDatabaseEnabled = new ConfigDefault<>(false, "database.enabled",
+                    AntiVPN.getInstance()), defaultCommandsEnable = new ConfigDefault<>(false,
+            "commands.enabled", AntiVPN.getInstance()), defaultKickPlayers
+            = new ConfigDefault<>(true, "kickPlayers", AntiVPN.getInstance()),
+            defaultAlertToStaff = new ConfigDefault<>(true, "alerts.enabled",
+                    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()),
+            defBlockedCountries = new ConfigDefault<>(new ArrayList<>(), "blockedCountries",
+                    AntiVPN.getInstance()),
+            defAllowedCountries = new ConfigDefault<>(new ArrayList<>(), "allowedCountries",
+                    AntiVPN.getInstance());
 
-    String getKickString();
+    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;
 
-    String alertMessage();
+    public String getLicense() {
+        return license;
+    }
 
-    boolean alertToStaff();
+    public boolean cachedResults() {
+        return cacheResults;
+    }
 
-    boolean runCommands();
+    public String getKickString() {
+        return kickMessage;
+    }
+    
+    public String alertMessage() {
+        return alertMsg;
+    }
+    
+    public boolean alertToStaff() {
+        return alertToStaff;
+    }
 
-    List<String> commands();
+    public boolean runCommands() {
+        return commandsEnabled;
+    }
+    
+    public List<String> commands() {
+        return commands;
+    }
 
-    boolean kickPlayersOnDetect();
+    public boolean kickPlayersOnDetect() {
+        return kickPlayers;
+    }
+    
+    public List<String> getPrefixWhitelists() {
+        return prefixWhitelists;
+    }
+    
+    public boolean isDatabaseEnabled() {
+        return databaseEnabled;
+    }
 
-    List<String> getPrefixWhitelists();
+    public boolean useDatabaseCreds() {
+        return useCredentials;
+    }
 
-    boolean isDatabaseEnabled();
+    public String mongoDatabaseURL() {
+        return mongoURL;
+    }
+    
+    public String getDatabaseType() {
+        return databaseType;
+    }
+    
+    public String getDatabaseName() {
+        return databaseName;
+    }
 
-    boolean useDatabaseCreds();
+    public String getUsername() {
+        return username;
+    }
+    
+    public String getPassword() {
+        return password;
+    }
 
-    String mongoDatabaseURL();
+    public String getIp() {
+        return ip;
+    }
 
-    String getDatabaseType();
+    
+    public List<String> allowedCountries() {
+        return allowedCountries;
+    }
 
-    String getDatabaseName();
+    
+    public List<String> blockedCountries() {
+        return blockedCountries;
+    }
 
-    String getUsername();
+    
+    public int getPort() {
+        if(port == -1) {
+            switch (getDatabaseType().toLowerCase()) {
+                case "mongodb":
+                case "mongo":
+                case "mongod":
+                    return 27017;
+                case "sql":
+                case "mysql":
+                    return 3306;
+            }
+        }
 
-    String getPassword();
+        return port;
+    }
 
-    String getIp();
+    
+    public boolean metrics() {
+        return metrics;
+    }
 
-    List<String> allowedCountries();
-
-    List<String> blockedCountries();
-
-    int getPort();
-
-    boolean metrics();
-
-    void update();
+    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();
+    }
 
 }

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

@@ -51,7 +51,7 @@ public abstract class VPNExecutor {
                 else {
                     try {
                         VPNResponse response =  AntiVPN
-                                .getVPNResponse(ip, AntiVPN.getInstance().getConfig().getLicense(), cachedResults);
+                                .getVPNResponse(ip, AntiVPN.getInstance().getVpnConfig().getLicense(), cachedResults);
 
                         if(response.isSuccess()) {
                             AntiVPN.getInstance().getDatabase().cacheResponse(response);
@@ -80,7 +80,7 @@ public abstract class VPNExecutor {
                 else {
                     try {
                         VPNResponse response =  AntiVPN
-                                .getVPNResponse(ip, AntiVPN.getInstance().getConfig().getLicense(), cachedResults);
+                                .getVPNResponse(ip, AntiVPN.getInstance().getVpnConfig().getLicense(), cachedResults);
 
                         if(response.isSuccess()) {
                             threadExecutor.execute(() -> AntiVPN.getInstance().getDatabase().cacheResponse(response));

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

@@ -57,7 +57,7 @@ public class AllowlistCommand extends Command {
         if(args.length == 1)
             return "&cYou have to provide a player to allow or deny exemption.";
 
-        boolean databaseEnabled = AntiVPN.getInstance().getConfig().isDatabaseEnabled();
+        boolean databaseEnabled = AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled();
 
         if(!databaseEnabled) executor.sendMessage("&cThe database is currently not setup, " +
                 "so any changes here will disappear after a restart.");

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

@@ -170,26 +170,26 @@ public class MongoVPN implements VPNDatabase {
 
     @Override
     public void init() {
-        if(AntiVPN.getInstance().getConfig().mongoDatabaseURL().length() > 0) { //URL
-            ConnectionString cs = new ConnectionString(AntiVPN.getInstance().getConfig().mongoDatabaseURL());
+        if(AntiVPN.getInstance().getVpnConfig().mongoDatabaseURL().length() > 0) { //URL
+            ConnectionString cs = new ConnectionString(AntiVPN.getInstance().getVpnConfig().mongoDatabaseURL());
             MongoClientSettings settings = MongoClientSettings.builder().applyConnectionString(cs).build();
             client = MongoClients.create(settings);
         } else {
             MongoClientSettings.Builder settingsBld = MongoClientSettings.builder().readPreference(ReadPreference.nearest())
                     .applyToClusterSettings(builder -> {
-                        builder.hosts(Collections.singletonList(new ServerAddress(AntiVPN.getInstance().getConfig().getIp(),
-                                AntiVPN.getInstance().getConfig().getPort())));
+                        builder.hosts(Collections.singletonList(new ServerAddress(AntiVPN.getInstance().getVpnConfig().getIp(),
+                                AntiVPN.getInstance().getVpnConfig().getPort())));
                     });
-            if(AntiVPN.getInstance().getConfig().useDatabaseCreds()) {
+            if(AntiVPN.getInstance().getVpnConfig().useDatabaseCreds()) {
                 settingsBld = settingsBld.credential(MongoCredential
-                        .createCredential(AntiVPN.getInstance().getConfig().getUsername(),
-                                AntiVPN.getInstance().getConfig().getDatabaseName(),
-                                AntiVPN.getInstance().getConfig().getPassword().toCharArray()));
+                        .createCredential(AntiVPN.getInstance().getVpnConfig().getUsername(),
+                                AntiVPN.getInstance().getVpnConfig().getDatabaseName(),
+                                AntiVPN.getInstance().getVpnConfig().getPassword().toCharArray()));
             }
 
             client = MongoClients.create(settingsBld.build());
         }
-        antivpnDatabase = client.getDatabase(AntiVPN.getInstance().getConfig().getDatabaseName());
+        antivpnDatabase = client.getDatabase(AntiVPN.getInstance().getVpnConfig().getDatabaseName());
 
         settingsDocument = antivpnDatabase.getCollection("settings");
         if(settingsDocument.listIndexes().first() == null) {

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

@@ -26,7 +26,7 @@ public class MySqlVPN implements VPNDatabase {
             }
             while (true) {
                 // Updating from database
-                if (AntiVPN.getInstance().getConfig().isDatabaseEnabled()) {
+                if (AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
                     AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
                     AntiVPN.getInstance().getExecutor().getWhitelisted()
                             .addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
@@ -47,7 +47,7 @@ public class MySqlVPN implements VPNDatabase {
 
     @Override
     public Optional<VPNResponse> getStoredResponse(String ip) {
-        if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled()|| MySQL.isClosed())
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()|| MySQL.isClosed())
             return Optional.empty();
 
         ResultSet rs = Query.prepare("select * from `responses` where `ip` = ? limit 1").append(ip).executeQuery();
@@ -81,7 +81,7 @@ public class MySqlVPN implements VPNDatabase {
      */
     @Override
     public void cacheResponse(VPNResponse toCache) {
-        if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
             return;
 
         Query.prepare("insert into `responses` (`ip`,`asn`,`countryName`,`countryCode`,`city`,`timeZone`,"
@@ -96,7 +96,7 @@ public class MySqlVPN implements VPNDatabase {
     @SneakyThrows
     @Override
     public boolean isWhitelisted(UUID uuid) {
-        if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
             return false;
         ResultSet set = Query.prepare("select uuid from `whitelisted` where `uuid` = ? limit 1")
                 .append(uuid.toString()).executeQuery();
@@ -107,7 +107,7 @@ public class MySqlVPN implements VPNDatabase {
     @SneakyThrows
     @Override
     public boolean isWhitelisted(String ip) {
-        if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
             return false;
         ResultSet set = Query.prepare("select `ip` from `whitelisted-ips` where `ip` = ? limit 1")
                 .append(ip).executeQuery();
@@ -118,7 +118,7 @@ public class MySqlVPN implements VPNDatabase {
 
     @Override
     public void setWhitelisted(UUID uuid, boolean whitelisted) {
-        if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
             return;
 
         if (whitelisted) {
@@ -134,7 +134,7 @@ public class MySqlVPN implements VPNDatabase {
 
     @Override
     public void setWhitelisted(String ip, boolean whitelisted) {
-        if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled() || MySQL.isClosed())
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled() || MySQL.isClosed())
             return;
 
         if(whitelisted) {
@@ -234,10 +234,10 @@ public class MySqlVPN implements VPNDatabase {
 
     @Override
     public void init() {
-        if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled())
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled())
             return;
         AntiVPN.getInstance().getExecutor().log("Initializing MySQL...");
-        if(AntiVPN.getInstance().getConfig().getDatabaseType().contains("sql")) {
+        if(AntiVPN.getInstance().getVpnConfig().getDatabaseType().contains("sql")) {
             MySQL.init();
         } else MySQL.initH2();
 
@@ -333,7 +333,7 @@ public class MySqlVPN implements VPNDatabase {
 
     @Override
     public void shutdown() {
-        if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled())
+        if (!AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled())
             return;
         MySQL.shutdown();
     }

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

@@ -20,16 +20,16 @@ public class MySQL {
                 } catch (ClassNotFoundException e) {
                     Class.forName("com.mysql.jdbc.Driver");
                 }
-                conn = DriverManager.getConnection("jdbc:mysql://" + AntiVPN.getInstance().getConfig().getIp()
-                                + ":" + AntiVPN.getInstance().getConfig().getPort()
+                conn = DriverManager.getConnection("jdbc:mysql://" + AntiVPN.getInstance().getVpnConfig().getIp()
+                                + ":" + AntiVPN.getInstance().getVpnConfig().getPort()
                                 + "/?useSSL=true&autoReconnect=true",
-                        AntiVPN.getInstance().getConfig().getUsername(),
-                        AntiVPN.getInstance().getConfig().getPassword());
+                        AntiVPN.getInstance().getVpnConfig().getUsername(),
+                        AntiVPN.getInstance().getVpnConfig().getPassword());
                 conn.setAutoCommit(true);
                 Query.use(conn);
                 Query.prepare("CREATE DATABASE IF NOT EXISTS `"
-                        + AntiVPN.getInstance().getConfig().getDatabaseName() + "`").execute();
-                Query.prepare("USE `" + AntiVPN.getInstance().getConfig().getDatabaseName() + "`").execute();
+                        + AntiVPN.getInstance().getVpnConfig().getDatabaseName() + "`").execute();
+                Query.prepare("USE `" + AntiVPN.getInstance().getVpnConfig().getDatabaseName() + "`").execute();
                 AntiVPN.getInstance().getExecutor().log("Connection to MySQL has been established.");
             }
         } catch (Exception e) {
@@ -44,7 +44,7 @@ public class MySQL {
             Class.forName("org.h2.Driver");
             conn = new NonClosableConnection(DriverManager.getConnection ("jdbc:h2:file:" +
                     dataFolder.getAbsolutePath(),
-                    AntiVPN.getInstance().getConfig().getUsername(),AntiVPN.getInstance().getConfig().getPassword()));
+                    AntiVPN.getInstance().getVpnConfig().getUsername(),AntiVPN.getInstance().getVpnConfig().getPassword()));
             conn.setAutoCommit(true);
             Query.use(conn);
             AntiVPN.getInstance().getExecutor().log("Connection to SQlLite has been established.");

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

@@ -0,0 +1,28 @@
+package dev.brighten.antivpn.utils;
+
+import dev.brighten.antivpn.AntiVPN;
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public class ConfigDefault<A> {
+
+    private final A defaultValue;
+    private final String path;
+    private final AntiVPN 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;
+    }
+}

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

@@ -53,7 +53,7 @@ public final class Configuration
             String line = iterator.next();
 
             String trimmed = line.trim();
-            if(trimmed.startsWith("##") || trimmed.isEmpty()) {
+            if(trimmed.startsWith("#") || trimmed.isEmpty()) {
                 addCommentLine(currentPath, line);
                 continue;
             }

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

@@ -2,13 +2,19 @@ package dev.brighten.antivpn.utils.config;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import lombok.SneakyThrows;
 import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.error.YAMLException;
+import org.yaml.snakeyaml.nodes.Node;
+import org.yaml.snakeyaml.representer.Represent;
+import org.yaml.snakeyaml.representer.Representer;
 
 import java.io.*;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.*;
 
 @NoArgsConstructor(access = AccessLevel.PACKAGE)
@@ -20,11 +26,17 @@ public class YamlConfiguration extends ConfigurationProvider
         @Override
         protected Yaml initialValue()
         {
+            Representer representer = new Representer()
+            {
+                {
+                    representers.put( Configuration.class, data -> represent( ( (Configuration) data ).self ));
+                }
+            };
 
             DumperOptions options = new DumperOptions();
             options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
-
-            return new Yaml(options);
+            representer.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+            return new Yaml( new Constructor(), representer, options );
         }
     };
 
@@ -41,6 +53,9 @@ public class YamlConfiguration extends ConfigurationProvider
     public void save(Configuration config, Writer writer)
     {
         String contents = this.yaml.get().dump(config.self);
+        if (contents.equals("{}\n")) {
+            contents = "";
+        }
 
         List<String> list = new ArrayList<>();
         Collections.addAll(list, contents.split("\n"));
@@ -85,7 +100,7 @@ public class YamlConfiguration extends ConfigurationProvider
         }
 
         try {
-            writer.write(contents);
+            writer.write(sb.toString());
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -111,34 +126,37 @@ public class YamlConfiguration extends ConfigurationProvider
         return load( reader, null );
     }
 
+    @SneakyThrows
     @Override
-    @SuppressWarnings("unchecked")
     public Configuration load(Reader reader, Configuration defaults)
     {
-        Map<String, Object> map = yaml.get().loadAs( reader, LinkedHashMap.class );
-        if ( map == null )
-        {
-            map = new LinkedHashMap<>();
+        BufferedReader input = reader instanceof BufferedReader ? (BufferedReader)reader : new BufferedReader(reader);
+        StringBuilder builder = new StringBuilder();
+
+        String line;
+        try {
+            while((line = input.readLine()) != null) {
+                builder.append(line);
+                builder.append('\n');
+            }
+        } finally {
+            input.close();
         }
-        return new Configuration( map, defaults );
+
+
+        return load(builder.toString(), defaults);
     }
 
     @Override
     public Configuration load(InputStream is)
     {
-        return load( is, null );
+        return this.load(new InputStreamReader(is, Charset.defaultCharset()));
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public Configuration load(InputStream is, Configuration defaults)
     {
-        Map<String, Object> map = yaml.get().loadAs( is, LinkedHashMap.class );
-        if ( map == null )
-        {
-            map = new LinkedHashMap<>();
-        }
-        return new Configuration( map, defaults );
+        return this.load(new InputStreamReader(is, Charset.defaultCharset()), defaults);
     }
 
     @Override
@@ -147,15 +165,20 @@ public class YamlConfiguration extends ConfigurationProvider
         return load( string, null );
     }
 
+
     @Override
     @SuppressWarnings("unchecked")
-    public Configuration load(String string, Configuration defaults)
+    public Configuration load(String contents, Configuration defaults)
     {
-        Map<String, Object> map = yaml.get().loadAs( string, LinkedHashMap.class );
-        if ( map == null )
-        {
-            map = new LinkedHashMap<>();
-        }
-        return new Configuration( map, 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 );
+        config.loadFromString(contents);
+
+        return config;
     }
+
 }