feat: Fully replace with new config api

src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java

@@ -7,12 +7,7 @@
 
 package com.onarandombox.MultiverseCore;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,8 +27,8 @@ import com.onarandombox.MultiverseCore.commands.ConfirmCommand;
 import com.onarandombox.MultiverseCore.commands.CreateCommand;
 import com.onarandombox.MultiverseCore.commands.DebugCommand;
 import com.onarandombox.MultiverseCore.commands.DeleteCommand;
-import com.onarandombox.MultiverseCore.commands.ImportCommand;
 import com.onarandombox.MultiverseCore.commands.GameruleCommand;
+import com.onarandombox.MultiverseCore.commands.ImportCommand;
 import com.onarandombox.MultiverseCore.commands.LoadCommand;
 import com.onarandombox.MultiverseCore.commands.RegenCommand;
 import com.onarandombox.MultiverseCore.commands.ReloadCommand;
@@ -68,9 +63,6 @@ import com.onarandombox.MultiverseCore.utils.metrics.MetricsConfigurator;
 import com.onarandombox.MultiverseCore.world.SimpleMVWorldManager;
 import com.onarandombox.MultiverseCore.world.WorldProperties;
 import me.main__.util.SerializationConfig.SerializationConfig;
-import org.bukkit.configuration.Configuration;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -95,8 +87,7 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
     private final MVWorldManager worldManager = new SimpleMVWorldManager(this);
 
     // Configurations
-    private FileConfiguration multiverseConfig;
-    private volatile MultiverseCoreConfiguration config;
+    private DefaultMVConfig config;
 
     // Listeners
     private MVChatListener chatListener;
@@ -126,7 +117,6 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
         Logging.init(this);
 
         // Register our config classes
-        SerializationConfig.registerAll(MultiverseCoreConfiguration.class);
         SerializationConfig.registerAll(WorldProperties.class);
         SerializationConfig.initLogging(Logging.getLogger());
     }
@@ -138,7 +128,7 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
     public void onEnable() {
         // Load our configs first as we need them for everything else.
         this.loadConfigs();
-        if (this.multiverseConfig == null) {
+        if (this.config == null) {
             Logging.severe("Your configs were not loaded.");
             Logging.severe("Please check your configs and restart the server.");
             this.getServer().getPluginManager().disablePlugin(this);
@@ -359,35 +349,10 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
      */
     @Override
     public void loadConfigs() {
-        DefaultMVConfig defaultMVConfig = new DefaultMVConfig(this);
-        defaultMVConfig.load();
-        defaultMVConfig.save();
+        config = new DefaultMVConfig(this);
+        config.load();
+        config.save();
 
-        // Now grab the Configuration Files.
-        this.multiverseConfig = YamlConfiguration.loadConfiguration(new File(getDataFolder(), "config.yml"));
-        InputStream resourceURL = this.getClass().getResourceAsStream("/defaults/config.yml");
-
-        // Read in our default config with UTF-8 now
-        Configuration coreDefaults;
-        try {
-            coreDefaults = YamlConfiguration.loadConfiguration(new BufferedReader(new InputStreamReader(resourceURL, "UTF-8")));
-            this.multiverseConfig.setDefaults(coreDefaults);
-        } catch (UnsupportedEncodingException e) {
-            Logging.severe("Couldn't load default config with UTF-8 encoding. Details follow:");
-            e.printStackTrace();
-            Logging.severe("Default configs NOT loaded.");
-        }
-
-        this.multiverseConfig.options().copyDefaults(false);
-        this.multiverseConfig.options().copyHeader(true);
-
-        MultiverseCoreConfiguration wantedConfig = null;
-        try {
-            wantedConfig = (MultiverseCoreConfiguration) multiverseConfig.get("multiverse-configuration");
-        } catch (Exception ignore) {
-        } finally {
-            config = ((wantedConfig == null) ? new MultiverseCoreConfiguration() : wantedConfig);
-        }
         this.worldManager.loadWorldConfig(new File(getDataFolder(), "worlds.yml"));
 
         int level = Logging.getDebugLevel();
@@ -402,14 +367,8 @@ public class MultiverseCore extends JavaPlugin implements MVCore {
      */
     @Override
     public boolean saveMVConfig() {
-        try {
-            this.multiverseConfig.set("multiverse-configuration", getMVConfig());
-            this.multiverseConfig.save(new File(getDataFolder(), "config.yml"));
-            return true;
-        } catch (IOException e) {
-            Logging.severe("Could not save Multiverse config.yml config. Please check your file permissions.");
-            return false;
-        }
+        this.config.save();
+        return true;
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java

@@ -1,316 +0,0 @@
-package com.onarandombox.MultiverseCore;
-
-import java.util.Map;
-
-import com.dumptruckman.minecraft.util.Logging;
-import com.onarandombox.MultiverseCore.api.MVConfig;
-import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
-import me.main__.util.SerializationConfig.NoSuchPropertyException;
-import me.main__.util.SerializationConfig.Property;
-import me.main__.util.SerializationConfig.SerializationConfig;
-import org.bukkit.Bukkit;
-
-/**
- * Our configuration.
- */
-public class MultiverseCoreConfiguration extends SerializationConfig implements MVConfig {
-    private static MultiverseCoreConfiguration instance;
-
-    /**
-     * Sets the statically saved instance.
-     * @param instance The new instance.
-     */
-    public static void setInstance(MultiverseCoreConfiguration instance) {
-        MultiverseCoreConfiguration.instance = instance;
-    }
-
-    /**
-     * @return True if the static instance of config is set.
-     */
-    public static boolean isSet() {
-        return instance != null;
-    }
-
-    /**
-     * Gets the statically saved instance.
-     * @return The statically saved instance.
-     */
-    @Deprecated
-    public static MultiverseCoreConfiguration getInstance() {
-        if (instance == null)
-            throw new IllegalStateException("The instance wasn't set!");
-        return instance;
-    }
-
-    @Property
-    private volatile boolean enforceaccess;
-    @Property
-    private volatile boolean prefixchat;
-    @Property
-    private volatile String prefixchatformat;
-    @Property
-    private volatile boolean teleportintercept;
-    @Property
-    private volatile boolean firstspawnoverride;
-    @Property
-    private volatile boolean displaypermerrors;
-    @Property
-    private volatile int globaldebug;
-    @Property
-    private volatile boolean silentstart;
-    @Property
-    private volatile double version;
-    @Property
-    private volatile String firstspawnworld;
-    @Property
-    private volatile boolean defaultportalsearch;
-    @Property
-    private volatile int portalsearchradius;
-    @Property
-    private volatile boolean autopurge;
-    @Property
-    private volatile boolean idonotwanttodonate;
-
-    public MultiverseCoreConfiguration() {
-        super();
-        MultiverseCoreConfiguration.setInstance(this);
-    }
-
-    public MultiverseCoreConfiguration(Map<String, Object> values) {
-        super(values);
-        MultiverseCoreConfiguration.setInstance(this);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void setDefaults() {
-        // BEGIN CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-        enforceaccess = false;
-        prefixchat = false;
-        prefixchatformat = "[%world%]%chat%";
-        teleportintercept = true;
-        firstspawnoverride = true;
-        displaypermerrors = true;
-        globaldebug = 0;
-        this.version = 2.9;
-        silentstart = false;
-        defaultportalsearch = true;
-        portalsearchradius = 128;
-        autopurge = true;
-        idonotwanttodonate = false;
-        // END CHECKSTYLE-SUPPRESSION: MagicNumberCheck
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean setConfigProperty(String property, String value) {
-        try {
-            return this.setProperty(property, value, true);
-        } catch (NoSuchPropertyException e) {
-            return false;
-        }
-    }
-
-    // And here we go:
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getEnforceAccess() {
-        return this.enforceaccess;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setEnforceAccess(boolean enforceAccess) {
-        this.enforceaccess = enforceAccess;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getPrefixChat() {
-        return this.prefixchat;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setPrefixChat(boolean prefixChat) {
-        this.prefixchat = prefixChat;
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getPrefixChatFormat() {
-        return this.prefixchatformat;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setPrefixChatFormat(String prefixChatFormat) {
-        this.prefixchatformat = prefixChatFormat;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getTeleportIntercept() {
-        return this.teleportintercept;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setTeleportIntercept(boolean teleportIntercept) {
-        this.teleportintercept = teleportIntercept;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getFirstSpawnOverride() {
-        return this.firstspawnoverride;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setFirstSpawnOverride(boolean firstSpawnOverride) {
-        this.firstspawnoverride = firstSpawnOverride;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getDisplayPermErrors() {
-        return this.displaypermerrors;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setDisplayPermErrors(boolean displayPermErrors) {
-        this.displaypermerrors = displayPermErrors;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getGlobalDebug() {
-        return this.globaldebug;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setGlobalDebug(int globalDebug) {
-        this.globaldebug = globalDebug;
-        Logging.setDebugLevel(globalDebug);
-        Bukkit.getPluginManager().callEvent(new MVDebugModeEvent(globalDebug));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public double getVersion() {
-        return this.version;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setVersion(int version) {
-        this.version = version;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getFirstSpawnWorld() {
-        return this.firstspawnworld;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setFirstSpawnWorld(String firstSpawnWorld) {
-        this.firstspawnworld = firstSpawnWorld;
-    }
-
-    @Override
-    public void setSilentStart(boolean silentStart) {
-        Logging.setShowingConfig(!silentStart);
-        this.silentstart = silentStart;
-    }
-
-    @Override
-    public boolean getSilentStart() {
-        return silentstart;
-    }
-
-    @Override
-    public void setUseDefaultPortalSearch(boolean useDefaultPortalSearch) {
-        defaultportalsearch = useDefaultPortalSearch;
-    }
-
-    @Override
-    public boolean isUsingDefaultPortalSearch() {
-        return defaultportalsearch;
-    }
-
-    @Override
-    public void setPortalSearchRadius(int searchRadius) {
-        this.portalsearchradius = searchRadius;
-    }
-
-    @Override
-    public int getPortalSearchRadius() {
-        return portalsearchradius;
-    }
-
-    @Override
-    public boolean isAutoPurgeEnabled() {
-        return autopurge;
-    }
-
-    @Override
-    public void setAutoPurgeEnabled(boolean autopurge) {
-        this.autopurge = autopurge;
-    }
-
-    @Override
-    public boolean isShowingDonateMessage() {
-        return !idonotwanttodonate;
-    }
-
-    @Override
-    public void setShowDonateMessage(boolean showDonateMessage) {
-        this.idonotwanttodonate = !showDonateMessage;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/api/MVConfig.java

@@ -1,78 +1,31 @@
 package com.onarandombox.MultiverseCore.api;
 
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
-
-/**
- * The configuration of MultiverseCore.
- */
-public interface MVConfig extends ConfigurationSerializable {
+public interface MVConfig {
     /**
-     * Sets a property using a {@link String}.
-     * @param property The name of the property.
-     * @param value The value.
-     * @return True on success, false if the operation failed.
+     * Sets enforceAccess.
+     * @param enforceAccess The new value.
      */
-    boolean setConfigProperty(String property, String value);
+    void setEnforceAccess(boolean enforceAccess);
 
     /**
-     * Sets firstSpawnWorld.
-     * @param firstSpawnWorld The new value.
+     * Gets enforceAccess.
+     * @return enforceAccess.
      */
-    void setFirstSpawnWorld(String firstSpawnWorld);
+    boolean getEnforceAccess();
 
     /**
-     * Gets firstSpawnWorld.
-     * @return firstSpawnWorld.
+     * Sets whether or not the automatic purge of entities is enabled.
+     *
+     * @param autopurge True if automatic purge should be enabled.
      */
-    String getFirstSpawnWorld();
+    void setAutoPurgeEnabled(boolean autopurge);
 
     /**
-     * Sets version.
-     * @param version The new value.
+     * Gets whether or not the automatic purge of entities is enabled.
+     *
+     * @return True if automatic purge is enabled.
      */
-    void setVersion(int version);
-
-    /**
-     * Gets version.
-     * @return version.
-     */
-    double getVersion();
-
-    /**
-     * Sets globalDebug.
-     * @param globalDebug The new value.
-     */
-    void setGlobalDebug(int globalDebug);
-
-    /**
-     * Gets globalDebug.
-     * @return globalDebug.
-     */
-    int getGlobalDebug();
-
-    /**
-     * Sets displayPermErrors.
-     * @param displayPermErrors The new value.
-     */
-    void setDisplayPermErrors(boolean displayPermErrors);
-
-    /**
-     * Gets displayPermErrors.
-     * @return displayPermErrors.
-     */
-    boolean getDisplayPermErrors();
-
-    /**
-     * Sets firstSpawnOverride.
-     * @param firstSpawnOverride The new value.
-     */
-    void setFirstSpawnOverride(boolean firstSpawnOverride);
-
-    /**
-     * Gets firstSpawnOverride.
-     * @return firstSpawnOverride.
-     */
-    boolean getFirstSpawnOverride();
+    boolean isAutoPurgeEnabled();
 
     /**
      * Sets teleportIntercept.
@@ -87,54 +40,28 @@ public interface MVConfig extends ConfigurationSerializable {
     boolean getTeleportIntercept();
 
     /**
-     * Sets prefixChat.
-     * @param prefixChat The new value.
+     * Sets firstSpawnOverride.
+     * @param firstSpawnOverride The new value.
      */
-    void setPrefixChat(boolean prefixChat);
+    void setFirstSpawnOverride(boolean firstSpawnOverride);
 
     /**
-     * Gets prefixChat.
-     * @return prefixChat.
+     * Gets firstSpawnOverride.
+     * @return firstSpawnOverride.
      */
-    boolean getPrefixChat();
-    
-    /**
-     * Sets prefixChatFormat.
-     * @param prefixChatFormat The new value.
-     */
-    void setPrefixChatFormat(String prefixChatFormat);
+    boolean getFirstSpawnOverride();
 
     /**
-     * Gets prefixChatFormat.
-     * @return prefixChatFormat.
+     * Sets firstSpawnWorld.
+     * @param firstSpawnWorld The new value.
      */
-    String getPrefixChatFormat();
+    void setFirstSpawnWorld(String firstSpawnWorld);
 
     /**
-     * Sets enforceAccess.
-     * @param enforceAccess The new value.
+     * Gets firstSpawnWorld.
+     * @return firstSpawnWorld.
      */
-    void setEnforceAccess(boolean enforceAccess);
-
-    /**
-     * Gets enforceAccess.
-     * @return enforceAccess.
-     */
-    boolean getEnforceAccess();
-
-    /**
-     * Sets whether to suppress startup messages.
-     *
-     * @param silentStart true to suppress messages.
-     */
-    void setSilentStart(boolean silentStart);
-
-    /**
-     * Whether we are suppressing startup messages.
-     *
-     * @return true if we are suppressing startup messages.
-     */
-    boolean getSilentStart();
+    String getFirstSpawnWorld();
 
     /**
      * Sets whether or not to let Bukkit determine portal search radius on its own or if Multiverse should give input.
@@ -165,25 +92,54 @@ public interface MVConfig extends ConfigurationSerializable {
     int getPortalSearchRadius();
 
     /**
-     * Gets whether or not the automatic purge of entities is enabled.
-     *
-     * @return True if automatic purge is enabled.
+     * Sets prefixChat.
+     * @param prefixChat The new value.
      */
-    boolean isAutoPurgeEnabled();
+    void setPrefixChat(boolean prefixChat);
 
     /**
-     * Sets whether or not the automatic purge of entities is enabled.
-     *
-     * @param autopurge True if automatic purge should be enabled.
+     * Gets prefixChat.
+     * @return prefixChat.
      */
-    void setAutoPurgeEnabled(boolean autopurge);
+    boolean getPrefixChat();
 
     /**
-     * Gets whether or not the donation/patreon messages are shown.
-     *
-     * @return True if donation/patreon messages should be shown.
+     * Sets prefixChatFormat.
+     * @param prefixChatFormat The new value.
      */
-    boolean isShowingDonateMessage();
+    void setPrefixChatFormat(String prefixChatFormat);
+
+    /**
+     * Gets prefixChatFormat.
+     * @return prefixChatFormat.
+     */
+    String getPrefixChatFormat();
+
+    /**
+     * Sets globalDebug.
+     * @param globalDebug The new value.
+     */
+    void setGlobalDebug(int globalDebug);
+
+    /**
+     * Gets globalDebug.
+     * @return globalDebug.
+     */
+    int getGlobalDebug();
+
+    /**
+     * Sets whether to suppress startup messages.
+     *
+     * @param silentStart true to suppress messages.
+     */
+    void setSilentStart(boolean silentStart);
+
+    /**
+     * Whether we are suppressing startup messages.
+     *
+     * @return true if we are suppressing startup messages.
+     */
+    boolean getSilentStart();
 
     /**
      * Sets whether or not the donation/patreon messages are shown.
@@ -191,4 +147,11 @@ public interface MVConfig extends ConfigurationSerializable {
      * @param idonotwanttodonate True if donation/patreon messages should be shown.
      */
     void setShowDonateMessage(boolean idonotwanttodonate);
+
+    /**
+     * Gets whether or not the donation/patreon messages are shown.
+     *
+     * @return True if donation/patreon messages should be shown.
+     */
+    boolean isShowingDonateMessage();
 }

src/main/java/com/onarandombox/MultiverseCore/api/NewMVConfig.java

@@ -1,157 +0,0 @@
-package com.onarandombox.MultiverseCore.api;
-
-public interface NewMVConfig {
-    /**
-     * Sets enforceAccess.
-     * @param enforceAccess The new value.
-     */
-    void setEnforceAccess(boolean enforceAccess);
-
-    /**
-     * Gets enforceAccess.
-     * @return enforceAccess.
-     */
-    boolean getEnforceAccess();
-
-    /**
-     * Sets whether or not the automatic purge of entities is enabled.
-     *
-     * @param autopurge True if automatic purge should be enabled.
-     */
-    void setAutoPurgeEnabled(boolean autopurge);
-
-    /**
-     * Gets whether or not the automatic purge of entities is enabled.
-     *
-     * @return True if automatic purge is enabled.
-     */
-    boolean isAutoPurgeEnabled();
-
-    /**
-     * Sets teleportIntercept.
-     * @param teleportIntercept The new value.
-     */
-    void setTeleportIntercept(boolean teleportIntercept);
-
-    /**
-     * Gets teleportIntercept.
-     * @return teleportIntercept.
-     */
-    boolean getTeleportIntercept();
-
-    /**
-     * Sets firstSpawnOverride.
-     * @param firstSpawnOverride The new value.
-     */
-    void setFirstSpawnOverride(boolean firstSpawnOverride);
-
-    /**
-     * Gets firstSpawnOverride.
-     * @return firstSpawnOverride.
-     */
-    boolean getFirstSpawnOverride();
-
-    /**
-     * Sets firstSpawnWorld.
-     * @param firstSpawnWorld The new value.
-     */
-    void setFirstSpawnWorld(String firstSpawnWorld);
-
-    /**
-     * Gets firstSpawnWorld.
-     * @return firstSpawnWorld.
-     */
-    String getFirstSpawnWorld();
-
-    /**
-     * Sets whether or not to let Bukkit determine portal search radius on its own or if Multiverse should give input.
-     *
-     * @param useDefaultPortalSearch True to let Bukkit determine portal search radius on its own.
-     */
-    void setUseDefaultPortalSearch(boolean useDefaultPortalSearch);
-
-    /**
-     * Gets whether or not Bukkit will be determining portal search radius on its own or if Multiverse should help.
-     *
-     * @return True means Bukkit will use its own default values.
-     */
-    boolean isUsingDefaultPortalSearch();
-
-    /**
-     * Sets the radius at which vanilla style portals will be searched for to connect to worlds together.
-     *
-     * @param searchRadius The portal search radius.
-     */
-    void setPortalSearchRadius(int searchRadius);
-
-    /**
-     * Gets the radius at which vanilla style portals will be searched for to connect to worlds together.
-     *
-     * @return The portal search radius.
-     */
-    int getPortalSearchRadius();
-
-    /**
-     * Sets prefixChat.
-     * @param prefixChat The new value.
-     */
-    void setPrefixChat(boolean prefixChat);
-
-    /**
-     * Gets prefixChat.
-     * @return prefixChat.
-     */
-    boolean getPrefixChat();
-
-    /**
-     * Sets prefixChatFormat.
-     * @param prefixChatFormat The new value.
-     */
-    void setPrefixChatFormat(String prefixChatFormat);
-
-    /**
-     * Gets prefixChatFormat.
-     * @return prefixChatFormat.
-     */
-    String getPrefixChatFormat();
-
-    /**
-     * Sets globalDebug.
-     * @param globalDebug The new value.
-     */
-    void setGlobalDebug(int globalDebug);
-
-    /**
-     * Gets globalDebug.
-     * @return globalDebug.
-     */
-    int getGlobalDebug();
-
-    /**
-     * Sets whether to suppress startup messages.
-     *
-     * @param silentStart true to suppress messages.
-     */
-    void setSilentStart(boolean silentStart);
-
-    /**
-     * Whether we are suppressing startup messages.
-     *
-     * @return true if we are suppressing startup messages.
-     */
-    boolean getSilentStart();
-
-    /**
-     * Sets whether or not the donation/patreon messages are shown.
-     *
-     * @param idonotwanttodonate True if donation/patreon messages should be shown.
-     */
-    void setShowDonateMessage(boolean idonotwanttodonate);
-
-    /**
-     * Gets whether or not the donation/patreon messages are shown.
-     *
-     * @return True if donation/patreon messages should be shown.
-     */
-    boolean isShowingDonateMessage();
-}

src/main/java/com/onarandombox/MultiverseCore/configuration/DefaultMVConfig.java

@@ -4,16 +4,18 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
+import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.NewMVConfig;
+import com.onarandombox.MultiverseCore.api.MVConfig;
 import com.onarandombox.MultiverseCore.utils.settings.MVSettings;
 import com.onarandombox.MultiverseCore.utils.settings.migration.ConfigMigrator;
 import com.onarandombox.MultiverseCore.utils.settings.migration.InvertBoolMigratorAction;
 import com.onarandombox.MultiverseCore.utils.settings.migration.MoveMigratorAction;
 import com.onarandombox.MultiverseCore.utils.settings.migration.VersionMigrator;
 
-public class DefaultMVConfig implements NewMVConfig {
-    public static final String CONFIG_FILENAME = "config2.yml";
+public class DefaultMVConfig implements MVConfig {
+    public static final String CONFIG_FILENAME = "config.yml";
+    public static final double CONFIG_VERSION = 5.0;
 
     private final Path configPath;
     private final MVSettings settings;
@@ -21,10 +23,10 @@ public class DefaultMVConfig implements NewMVConfig {
     public DefaultMVConfig(MultiverseCore core) {
         configPath = Path.of(core.getDataFolder().getPath(), CONFIG_FILENAME);
 
-        migrateFromOldConfig();
+        migrateFromOldConfigFile();
 
         settings = MVSettings.builder(configPath)
-                .logger(core.getLogger())
+                .logger(Logging.getLogger())
                 .defaultNodes(MVConfigNodes.getNodes())
                 .migrator(ConfigMigrator.builder(MVConfigNodes.VERSION)
                         .addVersionMigrator(VersionMigrator.builder(5.0)
@@ -47,13 +49,14 @@ public class DefaultMVConfig implements NewMVConfig {
                 .build();
     }
 
-    private void migrateFromOldConfig() {
+    private void migrateFromOldConfigFile() {
         String content;
         try {
             content = Files.readString(configPath);
         } catch (IOException e) {
             return;
         }
+        // Remove the old config section if it is still in the old ConfigurationSerializable.
         if (content.contains("version: 2.5")) {
             content = content.replace("==: com.onarandombox.MultiverseCore.MultiverseCoreConfiguration", "");
         }

src/main/java/com/onarandombox/MultiverseCore/configuration/MVConfigNodes.java

@@ -165,6 +165,6 @@ public class MVConfigNodes {
             .comment("")
             .comment("This just signifies the version number so we can see what version of config you have.")
             .comment("NEVER TOUCH THIS VALUE")
-            .defaultValue(5.0D)
+            .defaultValue(DefaultMVConfig.CONFIG_VERSION)
             .build());
 }

src/main/java/com/onarandombox/MultiverseCore/utils/settings/MVSettings.java

@@ -36,10 +36,10 @@ public class MVSettings {
     /**
      * Creates a new MVSettings instance that makes use of CommentedConfiguration.
      *
-     * @param configPath   The path to the configuration file.
-     * @param logger       The Logger to use for error messages.
-     * @param defaultNodes The default node values to add to the configuration.
-     * @param migrator
+     * @param configPath    The path to the configuration file.
+     * @param logger        The Logger to use for error messages.
+     * @param defaultNodes  The default node values to add to the configuration.
+     * @param migrator      The migrator to use for migrating the configuration.
      */
     protected MVSettings(@NotNull Path configPath, @Nullable Logger logger, @Nullable List<CommentedNode> defaultNodes, ConfigMigrator migrator) {
         this.configPath = configPath;
@@ -177,6 +177,10 @@ public class MVSettings {
         config.set(node.getPath(), value);
     }
 
+    public <T> void setDefault(@NotNull TypedValueNode<T> node) {
+        config.set(node.getPath(), node.getDefaultValue());
+    }
+
     /**
      * Gets the configuration object.
      *

src/main/java/com/onarandombox/MultiverseCore/utils/settings/migration/ConfigMigrator.java

@@ -29,12 +29,20 @@ public class ConfigMigrator {
                 versionMigrator.migrate(settings);
             }
         }
+
+        settings.setDefault(versionNode);
     }
 
     public static class Builder {
         private final TypedValueNode<Double> versionNode;
         private final List<VersionMigrator> versionMigrators;
 
+        /**
+         * Creates a new builder for a ConfigMigrator.
+         *
+         * @param versionNode   The node that stores the version number of the config.
+         *                      Default value should be the current latest version number.
+         */
         public Builder(TypedValueNode<Double> versionNode) {
             this.versionNode = versionNode;
             this.versionMigrators = new ArrayList<>();

src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorld.java

@@ -14,7 +14,6 @@ import java.util.UUID;
 
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
 import com.onarandombox.MultiverseCore.api.BlockSafety;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
@@ -282,7 +281,7 @@ public class SimpleMVWorld implements MVWorld {
                 }
                 world.setSpawnFlags(allowMonsters, allowAnimals);
             }
-            if (MultiverseCoreConfiguration.getInstance().isAutoPurgeEnabled()) {
+            if (plugin.getMVConfig().isAutoPurgeEnabled()) {
                 plugin.getMVWorldManager().getTheWorldPurger().purgeWorld(SimpleMVWorld.this);
             }
             return super.validateChange(property, newValue, oldValue, object);

src/main/java/com/onarandombox/MultiverseCore/world/SimpleMVWorldManager.java

@@ -26,7 +26,6 @@ import java.util.stream.Collectors;
 
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.MultiverseCoreConfiguration;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MVWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
@@ -482,7 +481,7 @@ public class SimpleMVWorldManager implements MVWorldManager {
             return false;
         }
         SimpleMVWorld world = new SimpleMVWorld(plugin, cbworld, mvworld);
-        if (MultiverseCoreConfiguration.getInstance().isAutoPurgeEnabled()) {
+        if (plugin.getMVConfig().isAutoPurgeEnabled()) {
             this.worldPurger.purgeWorld(world);
         }
         this.worlds.put(worldName, world);