Put ping, player count, and player list hover messages into sections

.github/CHANGELOG.md

@@ -2,8 +2,11 @@
 This file contains update logs for this project. The top may contain a `Unreleased` section, gathering update logs for a future update during development.
 
 ---
+## 4.3.0 - September 17th 2024
 ## Unreleased
 ### Changed
+* Added alternative player count and player list hover message for when endtimers are running, similar to the existing ping messages setting. They are disabled by default and can be found in their `player-count-message` and `player-list-hover-message` config sections
+* Slightly reorganized the configuration file (it will be automatically migrated on startup, but new sections will be slapped at the bottom of the file)
 * The `fallback` field now also null values next to an empty array for disabling the feature
 * Updated language files from [Crowdin](https://crowdin.com/translate/maintenance)
 

core/src/main/java/eu/kennytv/maintenance/core/Settings.java

@@ -42,7 +42,7 @@ import org.jetbrains.annotations.Nullable;
 
 public class Settings implements eu.kennytv.maintenance.api.Settings {
     public static final String NEW_LINE_REPLACEMENT = "<br>";
-    private static final int CONFIG_VERSION = 8;
+    private static final int CONFIG_VERSION = 9;
     private static final int LANGUAGE_VERSION = 2;
     private static final Random RANDOM = new Random();
     protected final MaintenancePlugin plugin;
@@ -175,41 +175,44 @@ public class Settings implements eu.kennytv.maintenance.api.Settings {
     private void loadSettings() {
         updateConfig();
 
-        enablePingMessages = config.getBoolean("enable-pingmessages", true);
-        // Can't store these two already parsed as components because gradients will break replacements
-        pingMessages = loadPingMessages("pingmessages");
-        if (config.getBoolean("enable-timerspecific-messages")) {
-            timerSpecificPingMessages = loadPingMessages("timerspecific-pingmessages");
+        final ConfigSection pingMessageSection = config.getSection("ping-message");
+        enablePingMessages = pingMessageSection.getBoolean("enabled", true);
+        // Can't store this pre-parsed as components because gradients will break replacements
+        pingMessages = loadPingMessages(pingMessageSection.getStringList("messages"));
+        if (pingMessageSection.getBoolean("enable-timer-specific-messages")) {
+            timerSpecificPingMessages = loadPingMessages(pingMessageSection.getStringList("timer-messages"));
         } else {
             timerSpecificPingMessages = null;
         }
+
         maintenance = config.getBoolean("maintenance-enabled");
         commandsOnMaintenanceEnable = config.getStringList("commands-on-maintenance-enable");
         commandsOnMaintenanceDisable = config.getStringList("commands-on-maintenance-disable");
-        customPlayerCountMessage = config.getBoolean("enable-playercountmessage");
-        customPlayerCountHoverMessage = config.getBoolean("enable-playercounthovermessage");
         customMaintenanceIcon = config.getBoolean("custom-maintenance-icon");
         joinNotifications = config.getBoolean("send-join-notification");
         broadcastIntervals = new HashSet<>(config.getIntList("timer-broadcast-for-seconds"));
 
-        // Player count and player count hover messages are only accepted and rendered as legacy chat
+        // Player count and player list hover messages are only accepted and rendered as legacy chat
         if (plugin.getServerType() != ServerType.SPONGE) {
-            legacyParsedPlayerCountMessage = toLegacy(parse(getConfigMessage("playercountmessage")));
-            if (config.getBoolean("enable-timerspecific-playercountmessage")) {
-                legacyParsedTimerPlayerCountMessage = toLegacy(parse(getConfigMessage("timer-playercountmessage")));
+            final ConfigSection playerCountMessageSection = config.getSection("player-count-message");
+            customPlayerCountMessage = playerCountMessageSection.getBoolean("enabled");
+            legacyParsedPlayerCountMessage = toLegacy(parse(getConfigMessage(playerCountMessageSection, "message")));
+            if (playerCountMessageSection.getBoolean("enable-timer-specific-message")) {
+                legacyParsedTimerPlayerCountMessage = toLegacy(parse(getConfigMessage(playerCountMessageSection, "timer-message")));
             } else {
                 legacyParsedTimerPlayerCountMessage = null;
             }
         }
 
+        final ConfigSection listHoverMessageSection = config.getSection("player-list-hover-message");
+        customPlayerCountHoverMessage = listHoverMessageSection.getBoolean("enabled");
         legacyParsedPlayerCountHoverLines = new ArrayList<>();
-        for (final String line : config.getString("playercounthovermessage").split("<br>")) {
+        for (final String line : listHoverMessageSection.getString("message").split("<br>")) {
             legacyParsedPlayerCountHoverLines.add(toLegacy(parse(line)));
         }
-
-        if (config.getBoolean("enable-timerspecific-playercounthovermessage")) {
+        if (listHoverMessageSection.getBoolean("enable-timer-specific-message")) {
             legacyParsedTimerPlayerCountHoverLines = new ArrayList<>();
-            for (final String line : config.getString("timer-playercounthovermessage").split("<br>")) {
+            for (final String line : listHoverMessageSection.getString("timer-message").split("<br>")) {
                 legacyParsedTimerPlayerCountHoverLines.add(toLegacy(parse(line)));
             }
         } else {
@@ -272,6 +275,18 @@ public class Settings implements eu.kennytv.maintenance.api.Settings {
                 config.set("playercounthovermessage", legacyToMinimessage(config.getString("playercounthovermessage")));
                 config.set("playercountmessage", legacyToMinimessage(config.getString("playercountmessage")));
             }
+            if (version < 9) {
+                config.move("enable-pingmessages", "ping-message.enabled");
+                config.move("pingmessages", "ping-message.messages");
+                config.move("enable-timerspecific-messages", "ping-message.enable-timer-specific-messages");
+                config.move("timerspecific-pingmessages", "ping-message.timer-messages");
+
+                config.move("enable-playercountmessage", "player-count-message.enabled");
+                config.move("playercountmessage", "player-count-message.message");
+
+                config.move("enable-playercounthovermessage", "player-list-hover-message.enabled");
+                config.move("playercounthovermessage", "player-list-hover-message.message");
+            }
 
             createFile("config-new.yml", "config.yml");
             final File file = new File(plugin.getDataFolder(), "config-new.yml");
@@ -282,7 +297,8 @@ public class Settings implements eu.kennytv.maintenance.api.Settings {
                 e.printStackTrace();
             }
 
-            config.addMissingFields(tempConfig.getValues(), tempConfig.getComments());
+            config.addMissingFields(tempConfig);
+            config.replaceComments(tempConfig);
             config.set("config-version", CONFIG_VERSION);
 
             file.delete();
@@ -325,7 +341,8 @@ public class Settings implements eu.kennytv.maintenance.api.Settings {
             file.delete();
         }
 
-        language.addMissingFields(tempConfig.getValues(), tempConfig.getComments());
+        language.addMissingFields(tempConfig);
+        language.replaceComments(tempConfig);
         tempConfig.clear();
 
         language.set("language-version", LANGUAGE_VERSION);
@@ -341,8 +358,8 @@ public class Settings implements eu.kennytv.maintenance.api.Settings {
         return serialized.replaceAll("</[a-z_]+>", "");
     }
 
-    public String getConfigMessage(final String path) {
-        final String s = config.getString(path);
+    private String getConfigMessage(final ConfigSection section, final String path) {
+        final String s = section.getString(path);
         if (s == null) {
             plugin.getLogger().warning("The config file is missing the following string: " + path);
             return path;
@@ -350,6 +367,10 @@ public class Settings implements eu.kennytv.maintenance.api.Settings {
         return replaceNewlineVar(s);
     }
 
+    public String getConfigMessage(final String path) {
+        return getConfigMessage(config, path);
+    }
+
     public String getLanguageString(final String path, final String... replacements) {
         String s = language.getString(path);
         if (s == null) {
@@ -391,8 +412,7 @@ public class Settings implements eu.kennytv.maintenance.api.Settings {
         return parse(plugin.replacePingVariables(component));
     }
 
-    private List<String> loadPingMessages(final String path) {
-        final List<String> list = config.getStringList(path);
+    private List<String> loadPingMessages(final List<String> list) {
         final List<String> components = new ArrayList<>(list.size());
         for (final String s : list) {
             components.add(replaceNewlineVar(s));

core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/RemoveMotdCommand.java

@@ -20,6 +20,7 @@ package eu.kennytv.maintenance.core.command.subcommand;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.command.CommandInfo;
+import eu.kennytv.maintenance.core.config.ConfigSection;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 
 import java.util.ArrayList;
@@ -51,7 +52,8 @@ public final class RemoveMotdCommand extends CommandInfo {
         }
 
         final Settings settings = getSettings();
-        final List<String> pingMessages = settings.getConfig().getStringList(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages");
+        final ConfigSection section = settings.getConfig().getSection("ping-message");
+        final List<String> pingMessages = section.getStringList(timerPingMessages ? "timer-messages" : "messages");
         if (pingMessages.size() < 2) {
             sender.send(getMessage("removeMotdError"));
             return;
@@ -68,7 +70,7 @@ public final class RemoveMotdCommand extends CommandInfo {
         final List<String> pingComponents = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
         pingComponents.remove(index - 1);
         pingMessages.remove(index - 1);
-        settings.getConfig().set(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages", pingMessages);
+        section.set(timerPingMessages ? "timer-messages" : "messages", pingMessages);
         settings.saveConfig();
         sender.send(getMessage("removedMotd", "%INDEX%", args[1]));
     }

core/src/main/java/eu/kennytv/maintenance/core/command/subcommand/SetMotdCommand.java

@@ -20,6 +20,7 @@ package eu.kennytv.maintenance.core.command.subcommand;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.command.CommandInfo;
+import eu.kennytv.maintenance.core.config.ConfigSection;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -54,7 +55,8 @@ public final class SetMotdCommand extends CommandInfo {
 
         final Settings settings = getSettings();
         final List<String> pingComponents = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
-        final List<String> pingMessages = settings.getConfig().getStringList(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages");
+        final ConfigSection section = settings.getConfig().getSection("ping-message");
+        final List<String> pingMessages = section.getStringList(timerPingMessages ? "timer-messages" : "messages");
         final int index = Integer.parseInt(args[1]);
         if (index == 0 || index > pingMessages.size() + 1) {
             sender.send(getMessage("setMotdIndexError",
@@ -95,7 +97,7 @@ public final class SetMotdCommand extends CommandInfo {
             pingComponents.set(index - 1, componentString);
         }
 
-        settings.getConfig().set(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages", pingMessages);
+        section.set(timerPingMessages ? "timer-messages" : "messages", pingMessages);
         settings.saveConfig();
         sender.send(settings.getMessage(
                 "setMotd",

core/src/main/java/eu/kennytv/maintenance/core/config/Config.java

@@ -18,10 +18,6 @@
 package eu.kennytv.maintenance.core.config;
 
 import com.google.common.collect.Sets;
-import org.jetbrains.annotations.Nullable;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -31,6 +27,9 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import org.jetbrains.annotations.Nullable;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
 
 /**
  * Further modified version of the <a href="https://github.com/PSandro/SimpleConfig">SimpleConfig</a>SimpleConfig project of PSandro.
@@ -110,30 +109,8 @@ public final class Config extends ConfigSection {
         Files.write(file.toPath(), bytes);
     }
 
-    public boolean addMissingFields(final Map<String, Object> fields, final Map<String, String[]> comments) {
-        // Note: Only scans for the first two levels
-        boolean changed = false;
-        for (final Map.Entry<String, Object> entry : fields.entrySet()) {
-            final Object o = values.get(entry.getKey());
-            if (o != null) {
-                final Object o2 = entry.getValue();
-                if (!(o instanceof Map) || !(o2 instanceof Map)) continue;
-
-                final Map<String, Object> deepMap = (Map<String, Object>) o2;
-                for (final Map.Entry<String, Object> deepEntry : ((Map<String, Object>) o2).entrySet()) {
-                    if (deepMap.containsKey(deepEntry.getKey())) continue;
-                    deepMap.put(deepEntry.getKey(), deepEntry.getValue());
-                    changed = true;
-                }
-                continue;
-            }
-
-            values.put(entry.getKey(), entry.getValue());
-            changed = true;
-        }
-
-        this.comments = new HashMap<>(comments);
-        return changed;
+    public void replaceComments(final Config fromConfig) {
+        this.comments = new HashMap<>(fromConfig.comments);
     }
 
     private static Yaml createYaml() {

core/src/main/java/eu/kennytv/maintenance/core/config/ConfigSection.java

@@ -17,12 +17,12 @@
  */
 package eu.kennytv.maintenance.core.config;
 
-import org.jetbrains.annotations.Nullable;
-
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Further modified version of the <a href="https://github.com/PSandro/SimpleConfig">SimpleConfig</a>SimpleConfig project of PSandro.
@@ -63,15 +63,15 @@ public class ConfigSection {
 
     @Nullable
     public Object getObject(final String key, final Object def) {
-        int i1 = -1;
-        int i2;
+        int nextSeparatorIndex = -1;
+        int sectionStartIndex;
         ConfigSection section = this;
-        while ((i1 = key.indexOf('.', i2 = i1 + 1)) != -1) {
-            section = section.getSection(key.substring(i2, i1));
+        while ((nextSeparatorIndex = key.indexOf('.', sectionStartIndex = nextSeparatorIndex + 1)) != -1) {
+            section = section.getSection(key.substring(sectionStartIndex, nextSeparatorIndex));
             if (section == null) return def;
         }
 
-        final String subKey = key.substring(i2);
+        final String subKey = key.substring(sectionStartIndex);
         if (section == this) {
             final Object result = values.get(subKey);
             return result != null ? result : def;
@@ -97,17 +97,41 @@ public class ConfigSection {
         return new ConfigSection(getRoot(), getFullKeyInPath(key), (Map<String, Object>) o);
     }
 
+    public ConfigSection getOrCreateSection(final String key) {
+        final Object o = getObject(key);
+        if (!(o instanceof Map)) {
+            set(key, new LinkedHashMap<>());
+            return getSection(key);
+        }
+        return new ConfigSection(getRoot(), getFullKeyInPath(key), (Map<String, Object>) o);
+    }
+
     public boolean contains(final String key) {
         return getObject(key) != null;
     }
 
     public void set(final String key, @Nullable final Object value) {
-        //TODO go deep if necessary
+        int nextSeparatorIndex = -1;
+        int sectionStartIndex;
+        ConfigSection section = this;
+        while ((nextSeparatorIndex = key.indexOf('.', sectionStartIndex = nextSeparatorIndex + 1)) != -1) {
+            section = section.getOrCreateSection(key.substring(sectionStartIndex, nextSeparatorIndex));
+        }
+
+        final String sectionKey = key.substring(sectionStartIndex);
         if (value == null) {
-            values.remove(key);
+            section.values.remove(sectionKey);
             getRoot().getComments().remove(getFullKeyInPath(key));
         } else {
-            values.put(key, value);
+            section.values.put(sectionKey, value);
+        }
+    }
+
+    public void move(final String key, final String toKey) {
+        final Object o = getObject(key);
+        if (o != null) {
+            remove(key);
+            set(toKey, o);
         }
     }
 
@@ -192,6 +216,28 @@ public class ConfigSection {
         return list != null ? list : def;
     }
 
+    public boolean addMissingFields(final ConfigSection fromSection) {
+        boolean changed = false;
+        for (final Map.Entry<String, Object> entry : fromSection.values.entrySet()) {
+            final String key = entry.getKey();
+            final Object value = this.values.get(key);
+            if (value != null) {
+                // Go deeper for sections
+                final Object newValue = entry.getValue();
+                if (!(value instanceof Map) || !(newValue instanceof Map)) {
+                    continue;
+                }
+
+                changed |= this.getSection(key).addMissingFields(fromSection.getSection(key));
+            } else {
+                // Value is missing
+                this.values.put(key, entry.getValue());
+                changed = true;
+            }
+        }
+        return changed;
+    }
+
     /**
      * @return root config
      */

core/src/main/resources/config.yml

@@ -11,12 +11,18 @@
 # The config and language files use MiniMessage, NOT legacy text for input. Use https://webui.adventure.kyori.net/ to edit and preview the formatted text.
 # For a full list of formats and fancy examples of MiniMessage, see https://docs.adventure.kyori.net/minimessage/format.html
 
+# Changes the language of command feedback/messages.
+# If you find missing translations or want to contribute, see https://crowdin.com/project/maintenance
+# Currently available are: en (English), de (German), fr (French), pt (Portuguese), es (Spanish), ru (Russian), zh (Chinese), it (Italian),
+#  pl (Polish), tr (Turkish), sv (Swedish), uk (Ukrainian), ja (Japanese), da (Danish), ko (Korean), hu (Hungarian), vi (Vietnamese)
+language: en
+
 # Enables maintenance mode.
 maintenance-enabled: false
 
 # Enables maintenance on certain servers managed by your proxy instance(s).
 proxied-maintenance-servers:
-  - SpigotServer1
+  - PaperServer1
 # - AnotherServer
 
 # If maintenance is enabled on a proxied server with players on it, they will be sent to the fallback server instead of being kicked off the network.
@@ -28,13 +34,37 @@ fallback: lobby
 # Leave this empty to disable.
 waiting-server: ""
 
-# The message shown in the multiplayer server list motd when maintenance is enabled.
+# The message (MOTD) shown in the multiplayer server list motd when maintenance is enabled.
 # If you put in multiple entries, one of them will be chosen randomly on every ping.
-# If running an endtimer, the time left can be displayed by including '%TIMER%' in a pingmessage (also works in playercount(-hover) message).
-pingmessages:
-  - "<red>Currently under maintenance<br><gradient:#fbffc2:#0fffff>We will be back soon!"
-# - "Other entry"
-enable-pingmessages: true
+# If running an endtimer, the time left can be displayed by including '%TIMER%' in a ping message.
+ping-message:
+  enabled: true
+  messages:
+    - "<red>Currently under maintenance<br><gradient:#fbffc2:#0fffff>We will be back soon!"
+  # If set to true and an endtimer is currently running, a message from this pool will be chosen
+  # instead of the ones above, so you can have different messages for when an endtimer is running/not running.
+  enable-timer-specific-messages: true
+  timer-messages:
+    - "<red>Currently under maintenance<br><gradient:#fbffc2:#fffff>Come back in:</gradient> <color:#aa55ee>%TIMER%"
+
+# If enabled, the message below will be shown in the top right corner of the server in the server list, where the player count would normally be displayed.
+# You can use '%ONLINE%' and '%MAX%' if you want to include the player count in a custom message (e.g. "Maintenance %ONLINE%/%MAX%").
+# DOES NOT SUPPORT RGB!
+player-count-message:
+  enabled: true
+  message: "<dark_red>Maintenance"
+  # If set to true and an endtimer is currently running, the timer message will be used instead of the normal one.
+  enable-timer-specific-message: false
+  timer-message: "<dark_red>Come back in: <yellow>%TIMER%"
+
+# Is shown when you move your mouse above the text in the top right corner of the server in the server list, where the player count would normally be displayed.
+# DOES NOT SUPPORT RGB!
+player-list-hover-message:
+  enabled: true
+  message: "<red>Currently under<br><red>maintenance"
+  # If set to true and an endtimer is currently running, the timer message will be used instead of the normal one.
+  enable-timer-specific-message: false
+  timer-message: "<red>Come back in:<br><red><yellow>%TIMER%"
 
 # Any extra commands inside the arrays will be executed when maintenance is enabled/disabled.
 # Example: commands-on-maintenance-enable: ["say hello!", "stop"]
@@ -50,33 +80,6 @@ commands-on-single-maintenance-enable:
 commands-on-single-maintenance-disable:
   all: []
 
-# If set to true and an endtimer is currently running, a pingmessage from this pool will be chosen
-# instead of the ones above, so you can have different messages for when an endtimer is running/not running.
-enable-timerspecific-messages: true
-timerspecific-pingmessages:
-  - "<red>Currently under maintenance<br><gradient:#fbffc2:#fffff>Come back in:</gradient> <color:#aa55ee>%TIMER%"
-# - "Other entry"
-
-# If set to true, the message below will be shown in the top right corner of the server in the serverlist, where the playercount would normally be displayed.
-# If set to false, the normal playercount will be shown.
-#
-# Alternatively you can use '%ONLINE%' and '%MAX%' if you want to include the playercount in a custom message (e.g. "Maintenance %ONLINE%/%MAX%").
-# You may also set a different message for when a maintenance endtimer is running.
-# DOES NOT SUPPORT RGB!
-enable-playercountmessage: true
-enable-timerspecific-playercountmessage: false
-playercountmessage: "<dark_red>Maintenance"
-timer-playercountmessage: "<dark_red>Maintenance: <yellow>%TIMER%"
-
-# Is shown when you move your mouse above the text in the top right corner of the server in the serverlist,
-# where the playercount would normally be displayed.
-# You may also set a different message for when a maintenance endtimer is running.
-# DOES NOT SUPPORT RGB!
-enable-playercounthovermessage: true
-enable-timerspecific-playercounthovermessage: false
-playercounthovermessage: "<red>Currently under<br><red>maintenance"
-timer-playercounthovermessage: "<red>Currently under<br><red>maintenance: <yellow>%TIMER%"
-
 # If set to true, the server icon will be changed to the 'maintenance-icon.png' file in the plugin's folder during maintenance.
 custom-maintenance-icon: false
 
@@ -90,11 +93,16 @@ kick-online-players: true
 # When fetched player does not exist then fallback to offline uuid. Only works on proxies like Velocity or BungeeCord
 fallback-to-offline-uuid: false
 
-# Changes the language of command feedback/messages.
-# If you find missing translations or want to contribute a new language file, you are very welcome to message me on Spigot or my Discord server! :)
-# Currently available are: en (English), de (German), fr (French), pt (Portuguese), es (Spanish), ru (Russian), zh (Chinese), it (Italian),
-#  pl (Polish), tr (Turkish), sv (Swedish), uk (Ukrainian), ja (Japanese), da (Danish), ko (Korean), hu (Hungarian)
-language: en
+# If enabled and the server is restarted while running an endtimer, the timer will be continued after the restart.
+# If the timer ends while the server is offline, maintenance will be disabled as soon as the server starts again.
+continue-endtimer-after-restart:
+  enabled: false
+  # This value is set everytime an endtimer is started, cancelled or ended.
+  # Do not manually change this value.
+  end: 0
+
+# If using the timer command: In what intervalls before enabling/disabling maintenance there will be a broadcast.
+timer-broadcast-for-seconds: [1200, 900, 600, 300, 120, 60, 30, 20, 10, 5, 4, 3, 2, 1]
 
 # If you have 2 or more proxy instances, the database connection will make sure all proxies
 # have the same maintenance status, so you won't have to enable/disable it on every proxy by hand.
@@ -114,21 +122,10 @@ mysql:
   # If you for some reason cannot establish SSL connections to your database, you may disable it here (not recommended).
   use-ssl: true
 
-# If enabled and the server is restarted while running an endtimer, the timer will be continued after the restart.
-# If the timer ends while the server is offline, maintenance will be disabled as soon as the server starts again.
-continue-endtimer-after-restart:
-  enabled: false
-  # This value is set everytime an endtimer is started, cancelled or ended.
-  # Do not manually change this value.
-  end: 0
-
-# If using the timer command: In what intervalls before enabling/disabling maintenance there will be a broadcast.
-timer-broadcast-for-seconds: [1200, 900, 600, 300, 120, 60, 30, 20, 10, 5, 4, 3, 2, 1]
-
 # If disabled, you will no longer receive any messages if there is an update.
 # Not recommended to disable, as new versions generally tend to run better and with fewer bugs.
 # However, you can always check for updates manually using the '/maintenance update' command.
 update-checks: true
 
 # Used for autoupdating the config, do not change this value.
-config-version: 8
+config-version: 9

core/src/test/java/eu/kennytv/maintenance/core/config/ConfigTest.java

@@ -89,7 +89,8 @@ class ConfigTest {
         final Config newestConfig = new Config(getTestFile("config.yml"));
         newestConfig.load();
 
-        config.addMissingFields(newestConfig.getValues(), newestConfig.getComments());
+        config.addMissingFields(newestConfig);
+        config.replaceComments(newestConfig);
         config.set("config-version", 4);
         final File saveTo = getTestFile("dirty-config-upgraded.yml");
         config.resetAwesomeHeader();

gradle.properties

@@ -1,4 +1,4 @@
-projectVersion=4.2.2-SNAPSHOT
+projectVersion=4.3.0-SNAPSHOT
 
 # Gradle properties
 org.gradle.daemon=true