4.0.1 Release

Update dependencies, actually fix tests
Fix tests
2022-04-16 18:40:34 +02:00 · 2022-04-15 21:51:29 +02:00 · 2022-04-15 20:08:13 +02:00 · 2022-03-23 09:27:43 +01:00 · 2022-03-23 09:26:53 +01:00 · 2022-03-23 09:20:09 +01:00
187 changed files with 5278 additions and 3501 deletions
@@ -1,6 +1,80 @@
 # Maintenance Changelog
 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.0.1 - April 17th 2022
+### Fixed
+* Fixed the config header sometimes breaking the config on upgrading/saving
+---
+## 4.0.0 - March 17th 2022
+### Changed
+* Added support for hex colors in messages and replaced the component parsing with adventure-minimessage
+  * This means that section symbols (`§`) are no longer the intended/supported format
+  * You can use the following page to edit and preview formatted text: https://webui.adventure.kyori.net/
+  * You can find full documentation on the format (including normal colors and formatting, rgb, click/hover events, and more) here: https://docs.adventure.kyori.net/minimessage/format
+  * Your config and language file will be updated to the new format automatically, you won't have to change anything manually!
+  * Note that the player count and player count hover messages do not support rgb colors
+* Updated Sponge module to SpongeAPI v8 (Minecraft 1.15+)
+* Changed `%NEWLINE%` replacement to `<br>`
+* Changed `enable-timerspecific-messages` to default to `true` in newly generated config files
+* Added `prefix` entry in language file to use the placeholder `<prefix>` instead of copy-pasting the actual prefix every time
+* Added `singleServerMaintenanceListEntry` language string
+* Added Polish translations (thanks to Slasherss1)
+* Updated French translations (thanks to Aurelien30000)
+* Updated Spanish translations (thanks to Jaximo)
+* If you were using the MaintenanceAddon, you need to update it to [version 1.2.0](https://github.com/kennytv/MaintenanceAddon/releases/tag/1.2.0)
+### Fixed
+* Fixed missing language key warning for the scheduletimer command
+* Fixed typo in `singleServerMaintenanceListEmpty` default language string
+* Fixed typo in language key `whitelistEmpty` in the German language file (by Ceddix)
+---
+## 3.0.7 - August 17th 2021
+### Changed
+* Bungee/Velocity: `/maintenance add <name>` now works for offline players as well
+* Added config options `commands-on-maintenance-enable` and `commands-on-maintenance-disable` to define commands to be executed after maintenance has been toggled
+* Added config option `enable-pingmessages` to can change whether a custom maintenance motd should be displayed during maintenance
+* Added language fields `scheduletimerBroadcast` and `singleScheduletimerBroadcast` with the variables `%SERVER%`, `%TIME%`, and `%DURATION%` instead of using the normal starttimer broadcasts
+### Fixed
+* Fixed SQL loading issues on some platforms
+* Fixed missing language key warning for the debug command
+* Velocity: Fixed the update message
+---
+## 3.0.6 - February 17th 2021
+### Changed
+* Updated the Velocity version to be compatible with Velocity 1.1.0 (use Maintenance 3.0.5 if you use an older version of Velocity)
+* Added `maintenance schedule <minutes> <duration> command`
+  * This starts a timer for maintenance to be enabled, after which another timer will be started to disable it again (in contrast to `starttimer` and `endtimer`, which each only do one of)
+  * On proxies, you can use `maintenance schedule [server] <minutes> <duration> command` to schedule maintenance on a proxied server
+* Added command alias `mt` for the Maintenance command
+* Added secret argument to the whitelist add command: You can use `maintenance add <uuid> <name>` to add offline entries per command
+* The maintenance's base command is now properly registered with a permission on each platform, so that it is excluded from tabcomplection to unauthorized players
+* Some improvements to the French language file (thanks to @Aurelien30000)
+* API addition: Added MaintenanceReloadedEvent
+  * If you are using the MaintenancePlaceholderAddon, you need to [update it to 1.1.0](https://github.com/KennyTV/MaintenanceAddon/releases)
+### Fixed
+* Fixed not setting custom singleserver kickmessages throwing warnings
+* Bungee: Fixed linebreaks in the playercount hovermessage for 1.16+ clients
+---
+## 3.0.5 - June 17th 2020
+### Changed
+* The plugin identifiers are now `Maintenance` instead of the previous `MaintenanceSpigot` and `MaintenanceBungee`,
+ and `maintenance` instead of `maintenancesponge` and `maintenancevelocity`
+  * The plugin directory will automatically be renamed accordingly when starting the server
+  * If you are using the MaintenancePlaceholderAddon, you need to [update it to 1.0.3](https://github.com/KennyTV/MaintenanceAddon/releases)
+* Bungee/Velocity: The `fallback` field can now also be set as a list to define multiple fallback servers
+* Bungee/Velocity: Added language fields to choose custom kickmessages for individual proxied servers
+  * See [**HERE**](https://github.com/KennyTV/Maintenance/wiki/Configuration#language-file) for an example setting
+* Added Chinese language file (thanks to Spigot user yeban)
+* Added Italian language file (thanks to @TheViperShow)
+* Updated Russian language file (thanks to Spigot user En_0t_S)
+* Removed automated config migration from 2.x->3.0
+  * See [**HERE**](https://github.com/KennyTV/Maintenance/wiki/Updates#updating-from-2x) on how to do that manually - virtually noone should be using such old versions anymore
+### Fixed
+* Fixed the `use-ssl` option being inverted
+* Fixed disabling the playercount-message still hiding online/max players
+* Fixed config parsing with multi line strings
+* Bungee: Fixed compatibility with other motd changing plugins using the 'HIGHEST' ping listener priority
+---
 ## 3.0.4 - March 17th 2020
 ### Changed
 * Bungee/Velocity: Added config option `waiting-server` to send players to a waiting server when global maintenance is enabled (instead of kicking them)
@@ -10,6 +84,7 @@ This file contains update logs for this project. The top may contain a `Unreleas
 * Updated bStats metrics
 ### Fixed
 * Fixed singleserver timers using input as seconds instead of minutes (by mxs42)
+* Fixed singleserver timers broadcasting globally
 * Fixed language updating with an unknown/self-translated language file
 * Fixed Velocity server autocompletion in the maintenance command
 ---
@@ -0,0 +1,25 @@
+name: Build
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3.0.0
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3.0.0
+        with:
+          java-version: 11
+          distribution: 'temurin'
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v3.0.0
+        with:
+          name: Maintenance Files
+          path: build/libs
@@ -1,5 +1,6 @@
 .metadata
-dependencies/
+build/
+.gradle
 bin/
 tmp/
 *.tmp
@@ -14,7 +15,6 @@ local.properties
 .externalToolBuilders/
 *.launch
 *.pydevproject
-*.jar
 .cproject
 .classpath
 .factorypath
@@ -92,4 +92,6 @@ $RECYCLE.BIN/
 *.msm
 *.msp
 *.lnk
-!MaintenanceAPI.jar
+!MaintenanceAPI.jar
+**/src/test/resources/
+!core/src/test/resources/dirty-config.yml
@@ -1,7 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8
-dist: trusty
-cache:
-  directories:
-    - '$HOME/.m2/repository'
@@ -1,7 +1,7 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
@@ -1,10 +1,11 @@
 # Maintenance
-[![Version](https://img.shields.io/github/release/KennyTV/Maintenance.svg)](https://github.com/KennyTV/Maintenance/releases)
-[![Build Status](https://travis-ci.org/KennyTV/Maintenance.svg?branch=master)](https://travis-ci.org/KennyTV/Maintenance)
+[![Version](https://img.shields.io/github/release/kennytv/Maintenance.svg)](https://github.com/kennytv/Maintenance/releases)
+![Build Status](https://github.com/kennytv/Maintenance/workflows/Build/badge.svg)
+[![GH Downloads](https://img.shields.io/github/downloads/kennytv/Maintenance/total)](https://github.com/kennytv/Maintenance/releases)
 [![Discord](https://img.shields.io/discord/489135856284729384.svg?label=Discord&logo=discord&logoColor=fff)](https://discord.gg/vGCUzHq)
-[![Twitter](https://img.shields.io/twitter/follow/KennyTVN.svg?label=Twitter)](https://twitter.com/KennyTVN)
+[![Twitter](https://img.shields.io/twitter/follow/kennytvn.svg?label=Twitter)](https://twitter.com/kennytvn)

-Maintenance is probably the most customizable free maintenance plugin for your Minecraft server you can find. It runs on Bukkit/Spigot, BungeeCord, Sponge as well as Velocity.
+Maintenance is the most customizable free maintenance plugin for your Minecraft server you can find. It runs on Spigot, BungeeCord, Sponge, as well as Velocity.

 Its features include:
 * A custom motd as well as server icon, that will be shown during maintenance
@@ -15,23 +16,22 @@ Its features include:
 * Features specifically for Bungee/Velocity
  * Only want to enable maintenance on a single server? You can also do so by using the `/maintenance <on/off> <servername>` command
  * Link multiple proxy instances through a MySQL database connection, so you don't have to change maintenance on each proxy by hand
-  * Use PlaceholderAPI placeholders with the [**MaintenanceAddon**](https://github.com/KennyTV/Maintenance/wiki/MaintenanceAddon) (only for Bungee)
+  * Use PlaceholderAPI placeholders with the [**MaintenanceAddon**](https://github.com/kennytv/Maintenance/wiki/MaintenanceAddon) (only for Bungee)

 A full list of commands, permissions and configuration options can be found in the wiki listed below.
-* [Wiki](https://github.com/KennyTV/Maintenance/wiki)
-* [Downloads](https://github.com/KennyTV/Maintenance/releases) (GitHub)
-* [Development builds](https://kennytv.eu/maintenance/snapshot/) (out of order at the moment)
-* [Changelogs](https://github.com/KennyTV/Maintenance/blob/master/.github/CHANGELOG.md)
-* [Issue tracker/bug reports](https://github.com/KennyTV/Maintenance/issues)
+* [Wiki](https://github.com/kennytv/Maintenance/wiki) (configuration, permissions, API usage)
+* [Downloads](https://github.com/kennytv/Maintenance/releases) (GitHub)
+* [Changelogs](https://github.com/kennytv/Maintenance/blob/master/.github/CHANGELOG.md)
+* [Issue tracker/bug reports](https://github.com/kennytv/Maintenance/issues)
 * [Discord](https://discord.gg/vGCUzHq)
+* [PlaceholderAPI addon](https://github.com/kennytv/Maintenance/wiki/MaintenanceAddon)

 Other forum threads
 * [Spigot forums](https://www.spigotmc.org/resources/maintenance.40699/)
 * [Ore/Sponge Forums](https://ore.spongepowered.org/KennyTV/Maintenance)
-* [Velocity forums](https://forums.velocitypowered.com/t/maintenance/129)

 ## Compiling
-To create a working jar yourself, simply clone the project and compile it with maven (by using `mvn clean package` in your IDE console).
+To create a working jar yourself, simply clone the project and compile it with Gradle (`gradlew build`).

-## Licence
-When modifying the project's code, do that on a public repository while also keeping it under the same license (see [GNU General Public License](http://www.gnu.org/licenses/gpl-3.0)).
+## License
+This project is licensed under the [GNU General Public License v3](LICENSE.txt).
@@ -0,0 +1,24 @@
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
+
+// Shade and relocate adventure in an extra module, so that common/the rest can directly depend on a
+// relocated adventure without breaking native platform's adventure usage with project wide relocation
+tasks {
+    shadowJar {
+        relocate("net.kyori", "eu.kennytv.maintenance.lib.kyori")
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+}
+
+dependencies {
+    api(libs.bundles.adventure) {
+        exclude("net.kyori", "adventure-api")
+        exclude("net.kyori", "adventure-bom")
+        exclude("com.google.code.gson", "gson")
+    }
+}
+
+publishShadowJar()
@@ -0,0 +1,20 @@
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
+
+tasks {
+    shadowJar {
+        relocate("net.kyori", "eu.kennytv.maintenance.lib.kyori")
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+}
+
+dependencies {
+    api(libs.adventurePlatformBukkit) {
+        exclude("net.kyori", "adventure-api")
+    }
+}
+
+publishShadowJar()
@@ -0,0 +1,20 @@
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
+
+tasks {
+    shadowJar {
+        relocate("net.kyori", "eu.kennytv.maintenance.lib.kyori")
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+}
+
+dependencies {
+    api(libs.adventurePlatformBungee) {
+        exclude("net.kyori", "adventure-api")
+    }
+}
+
+publishShadowJar()
@@ -0,0 +1,14 @@
+plugins {
+    id("maintenance.shadow-conventions")
+}
+
+dependencies {
+    api(projects.maintenanceApi)
+    compileOnly(projects.adventure.adventureApi) {
+        targetConfiguration = "shadow"
+    }
+}
+
+java {
+    withJavadocJar()
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.api.event.proxy;

 import eu.kennytv.maintenance.api.event.manager.MaintenanceEvent;
@@ -23,9 +22,6 @@ import eu.kennytv.maintenance.api.proxy.Server;

 /**
 * Notification event fired when maintenance mode has been changed on a proxied server.
- *
- * @author KennyTV
- * @since 3.0.1
 */
 public final class ServerMaintenanceChangedEvent implements MaintenanceEvent {
    private final Server server;
@@ -37,7 +33,12 @@ public final class ServerMaintenanceChangedEvent implements MaintenanceEvent {
    }

    /**
-     * @return wrapped server object for the proxied server
+     * Returns wrapped server object for the server.
+     * <br>
+     * This does not necessarily have to be an existing server:
+     * If maintenance is disabled on a *previously* registered server, see {@link Server#isRegisteredServer()}.
+     *
+     * @return wrapped server object for the server
     */
    public Server getServer() {
        return server;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,18 +15,14 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.api.proxy;

-import eu.kennytv.maintenance.api.IMaintenance;
+import eu.kennytv.maintenance.api.Maintenance;
+import org.jetbrains.annotations.Nullable;

 import java.util.Set;

-/**
- * @author KennyTV
- * @since 3.0
- */
-public interface IMaintenanceProxy extends IMaintenance {
+public interface MaintenanceProxy extends Maintenance {

    /**
     * Enables/disables maintenance mode on a proxied server.
@@ -60,8 +56,16 @@ public interface IMaintenanceProxy extends IMaintenance {
     * @param server name of the proxied server
     * @return wrapped server object if present, else null
     */
+    @Nullable
    Server getServer(String server);

+    /**
+     * Returns the currently registered proxied servers.
+     *
+     * @return set of proxied servers
+     */
+    Set<String> getServers();
+
    /**
     * @return immutable set with names of all proxied server that are currently under maintenance
     */
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,15 +15,13 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.api.proxy;

+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+
 /**
 * Wrapper for a proxied server.
- * Use {@link IMaintenanceProxy#getServer(String)} to get a server instance.
- *
- * @author KennyTV
- * @since 3.0
+ * Use {@link MaintenanceProxy#getServer(String)} to get a server instance.
 */
 public interface Server {

@@ -40,7 +38,15 @@ public interface Server {
    /**
     * Sends a message to all players on the server.
     *
-     * @param message message to be broadcasted
+     * @param component message to be broadcasted
     */
-    void broadcast(String message);
+    void broadcast(Component component);
+
+    /**
+     * Returns whether the server is registered under the proxy.
+     * This will only ever be false if maintenance is disabled on a *previously* registered server.
+     *
+     * @return whether the server is registered under the proxy
+     */
+    boolean isRegisteredServer();
 }
@@ -0,0 +1,11 @@
+plugins {
+    id("maintenance.shadow-conventions")
+}
+
+dependencies {
+    compileOnlyApi(libs.jetbrainsAnnotations)
+}
+
+java {
+    withJavadocJar()
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,16 +15,11 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.api;

-import eu.kennytv.maintenance.api.event.manager.IEventManager;
+import eu.kennytv.maintenance.api.event.manager.EventManager;

-/**
- * @author KennyTV
- * @since 2.1
- */
-public interface IMaintenance {
+public interface Maintenance {

    /**
     * Enables/disables maintenance mode.
@@ -54,16 +49,28 @@ public interface IMaintenance {
    String getVersion();

    /**
-     * Returns the {@link ISettings} instance, which gives further insight into settings set in the config files.
+     * Returns the {@link Settings} instance, which gives further insight into settings set in the config files.
     *
-     * @return {@link ISettings} instance
+     * @return {@link Settings} instance
     */
-    ISettings getSettings();
+    Settings getSettings();

    /**
-     * Returns the {@link IEventManager} instance to register listeners to maintenance events.
+     * Returns the {@link EventManager} instance to register listeners to maintenance events.
     *
-     * @return {@link IEventManager} instance
+     * @return {@link EventManager} instance
     */
-    IEventManager getEventManager();
+    EventManager getEventManager();
+
+    /**
+     * @return true if debug mode is enabled, currently only implemented on Bungee
+     */
+    boolean isDebug();
+
+    /**
+     * Sets the debug mode.
+     *
+     * @param debug debug state
+     */
+    void setDebug(boolean debug);
 }
@@ -0,0 +1,49 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.api;
+
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Provider to get the maintenance api instance.
+ */
+public final class MaintenanceProvider {
+    private static Maintenance maintenance;
+
+    private MaintenanceProvider() {
+        throw new IllegalArgumentException();
+    }
+
+    @ApiStatus.Internal
+    public static void setMaintenance(final Maintenance maintenance) {
+        if (MaintenanceProvider.maintenance != null) {
+            throw new IllegalArgumentException("MaintenanceProvider is already set!");
+        }
+        MaintenanceProvider.maintenance = maintenance;
+    }
+
+    /**
+     * Returns the maintenance api instance, or null if not loaded yet.
+     *
+     * @return maintenance api instance
+     */
+    public static @Nullable Maintenance get() {
+        return maintenance;
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,17 +15,12 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.api;

 import java.util.Map;
 import java.util.UUID;

-/**
- * @author KennyTV
- * @since 2.1
- */
-public interface ISettings {
+public interface Settings {

    /**
     * Note that the value might need a few seconds to update, if you're on BungeeCord with MySQL enabled
@@ -34,6 +29,11 @@ public interface ISettings {
     */
    boolean isMaintenance();

+    /**
+     * @return true if custom ping messages during maintenance should be used
+     */
+    boolean isEnablePingMessages();
+
    /**
     * @return value of the 'send-join-notification' config field
     */
@@ -84,7 +84,7 @@ public interface ISettings {
     *
     * @param uuid uuid of the player to add
     * @param name of the player to add
-     * @return true if adding the player was successful
+     * @return true if adding the player was successful, false if already on the whitelist
     */
    boolean addWhitelistedPlayer(UUID uuid, String name);

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,16 +15,12 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.api.event;

 import eu.kennytv.maintenance.api.event.manager.MaintenanceEvent;

 /**
 * Notification event fired when maintenance mode has been changed.
- *
- * @author KennyTV
- * @since 3.0.1
 */
 public final class MaintenanceChangedEvent implements MaintenanceEvent {
    private final boolean maintenance;
@@ -0,0 +1,31 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.api.event;
+
+import eu.kennytv.maintenance.api.Maintenance;
+import eu.kennytv.maintenance.api.event.manager.MaintenanceEvent;
+
+/**
+ * Notification event fired when Maintenance configuration is reloaded.
+ *
+ * @author kennytv
+ * @see Maintenance#isMaintenance() for the new maintenance status
+ * //@see MaintenanceProxy#getMaintenanceServers() for the new list of servers under maintenance
+ */
+public final class MaintenanceReloadedEvent implements MaintenanceEvent {
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,15 +15,12 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.api.event.manager;

 /**
 * Abstract class representing a maintenance eventlistener.
 *
 * @param <T> event to be listened to
- * @author KennyTV
- * @since 3.0.1
 */
 public abstract class EventListener<T extends MaintenanceEvent> {

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,14 +15,9 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.api.event.manager;

-/**
- * @author KennyTV
- * @since 3.0.1
- */
-public interface IEventManager {
+public interface EventManager {

    /**
     * Registers an eventlistener for the given maintenance event.
@@ -31,4 +26,11 @@ public interface IEventManager {
     * @param eventClass class of the event that should be registered
     */
    void registerListener(EventListener listener, Class<? extends MaintenanceEvent> eventClass);
+
+    /**
+     * Fires a maintenance event.
+     *
+     * @param event event to fire
+     */
+    void callEvent(MaintenanceEvent event);
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,14 +15,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.api.event.manager;

 /**
 * Dummy interface representing a maintenance event.
- *
- * @author KennyTV
- * @since 3.0.1
 */
 public interface MaintenanceEvent {
 }
@@ -0,0 +1,12 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    // version must be manually kept in sync with the one in root project settings.gradle.kts
+    implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.1")
+}
@@ -0,0 +1,43 @@
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.named
+import java.io.ByteArrayOutputStream
+
+fun Project.publishShadowJar() {
+    configurePublication {
+        artifact(tasks["shadowJar"])
+        artifact(tasks["sourcesJar"])
+    }
+}
+
+fun Project.publishJavaComponents() {
+    configurePublication {
+        from(components["java"])
+    }
+}
+
+private fun Project.configurePublication(configurer: MavenPublication.() -> Unit) {
+    extensions.configure<PublishingExtension> {
+        publications.named<MavenPublication>("mavenJava") {
+            apply(configurer)
+        }
+    }
+}
+
+fun Project.latestCommitHash(): String {
+    val byteOut = ByteArrayOutputStream()
+    exec {
+        commandLine = listOf("git", "rev-parse", "--short", "HEAD")
+        standardOutput = byteOut
+    }
+    return byteOut.toString(Charsets.UTF_8.name()).trim()
+}
+
+fun JavaPluginExtension.javaTarget(version: Int) {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(version))
+}
@@ -0,0 +1,37 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+tasks {
+    // Variable replacements
+    processResources {
+        filesMatching(listOf("plugin.yml", "bungee.yml", "META-INF/sponge_plugins.json")) {
+            expand("version" to project.version, "description" to project.description)
+        }
+    }
+    javadoc {
+        options.encoding = Charsets.UTF_8.name()
+        (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
+    }
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.compilerArgs.addAll(listOf("-nowarn", "-Xlint:-unchecked", "-Xlint:-deprecation"))
+    }
+    test {
+        useJUnitPlatform()
+    }
+}
+
+java {
+    javaTarget(8)
+    withSourcesJar()
+}
+
+publishing {
+    publications.create<MavenPublication>("mavenJava") {
+        groupId = rootProject.group as String
+        artifactId = project.name
+        version = rootProject.version as String
+    }
+}
@@ -0,0 +1,10 @@
+plugins {
+    id("maintenance.shadow-conventions")
+}
+
+tasks {
+    shadowJar {
+        archiveFileName.set("Maintenance-${project.name.substringAfter("maintenance-").capitalize()}-${project.version}.jar")
+        destinationDirectory.set(rootProject.layout.buildDirectory.dir("libs"))
+    }
+}
@@ -0,0 +1,28 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.jvm.tasks.Jar
+import org.gradle.kotlin.dsl.named
+
+plugins {
+    id("maintenance.base-conventions")
+    id("com.github.johnrengelman.shadow")
+}
+
+tasks {
+    named<Jar>("jar") {
+        archiveClassifier.set("unshaded")
+        from(project.rootProject.file("LICENSE.txt"))
+    }
+    val shadowJar = named<ShadowJar>("shadowJar") {
+        archiveClassifier.set("")
+        configureRelocations()
+    }
+    named("build") {
+        dependsOn(shadowJar)
+    }
+}
+
+publishShadowJar()
+
+fun ShadowJar.configureRelocations() {
+    relocate("com.zaxxer.hikari", "eu.kennytv.maintenance.lib.hikari")
+}
@@ -0,0 +1,5 @@
+plugins {
+    id("maintenance.base-conventions")
+}
+
+publishJavaComponents()
@@ -0,0 +1,42 @@
+import org.gradle.api.plugins.JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME
+
+plugins {
+    base
+    id("maintenance.build-logic")
+}
+
+allprojects {
+    group = "eu.kennytv.maintenance"
+    version = property("projectVersion") as String // from gradle.properties
+    description = "Enable maintenance mode with a custom maintenance motd and icon."
+}
+
+val platforms = setOf(
+    projects.maintenanceSpigot,
+    projects.maintenanceBungee,
+    projects.maintenanceSponge,
+    projects.maintenanceVelocity
+).map { it.dependencyProject }
+
+val special = setOf(
+    projects.maintenance,
+    projects.maintenanceApi,
+    projects.maintenanceApiProxy,
+    projects.adventure,
+    projects.adventure.adventureApi,
+    projects.adventure.adventurePlatformBukkit,
+    projects.adventure.adventurePlatformBungee,
+).map { it.dependencyProject }
+
+subprojects {
+    when (this) {
+        in platforms -> plugins.apply("maintenance.platform-conventions")
+        in special -> plugins.apply("maintenance.base-conventions")
+        else -> plugins.apply("maintenance.standard-conventions")
+    }
+
+    dependencies {
+        TEST_IMPLEMENTATION_CONFIGURATION_NAME(rootProject.libs.bundles.junit)
+        TEST_IMPLEMENTATION_CONFIGURATION_NAME(rootProject.libs.snakeyaml)
+    }
+}
@@ -0,0 +1,7 @@
+dependencies {
+    implementation(projects.maintenanceCoreProxy)
+    implementation(projects.adventure.adventurePlatformBungee) {
+        targetConfiguration = "shadow"
+    }
+    compileOnly(libs.bungee)
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,16 +15,15 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.bungee;

-import eu.kennytv.maintenance.api.IMaintenance;
-import eu.kennytv.maintenance.api.IMaintenanceBase;
+import eu.kennytv.maintenance.api.Maintenance;
+import eu.kennytv.maintenance.core.MaintenanceBase;
 import net.md_5.bungee.api.plugin.Plugin;

 import java.io.File;

-public final class MaintenanceBungeeBase extends Plugin implements IMaintenanceBase {
+public final class MaintenanceBungeeBase extends Plugin implements MaintenanceBase {
    private MaintenanceBungeePlugin maintenance;

    @Override
@@ -38,7 +37,7 @@ public final class MaintenanceBungeeBase extends Plugin implements IMaintenanceB
    }

    @Override
-    public IMaintenance getApi() {
+    public Maintenance getApi() {
        return maintenance;
    }

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,11 +15,8 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.bungee;

-import eu.kennytv.maintenance.api.bungee.MaintenanceBungeeAPI;
-import eu.kennytv.maintenance.api.proxy.IMaintenanceProxy;
 import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.bungee.command.MaintenanceBungeeCommand;
 import eu.kennytv.maintenance.bungee.command.MaintenanceBungeeCommandBase;
@@ -29,13 +26,19 @@ import eu.kennytv.maintenance.bungee.metrics.MetricsLite;
 import eu.kennytv.maintenance.bungee.util.BungeeSenderInfo;
 import eu.kennytv.maintenance.bungee.util.BungeeServer;
 import eu.kennytv.maintenance.bungee.util.BungeeTask;
+import eu.kennytv.maintenance.bungee.util.ComponentUtil;
 import eu.kennytv.maintenance.core.dump.PluginDump;
 import eu.kennytv.maintenance.core.hook.ServerListPlusHook;
 import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
 import eu.kennytv.maintenance.core.proxy.SettingsProxy;
+import eu.kennytv.maintenance.core.proxy.hook.LuckPermsProxyHook;
+import eu.kennytv.maintenance.core.proxy.util.ProfileLookup;
+import eu.kennytv.maintenance.core.proxy.util.ProxyOfflineSenderInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 import eu.kennytv.maintenance.core.util.ServerType;
 import eu.kennytv.maintenance.core.util.Task;
+import eu.kennytv.maintenance.lib.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.Favicon;
 import net.md_5.bungee.api.ProxyServer;
@@ -43,10 +46,12 @@ import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.chat.hover.content.Text;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginManager;
+import org.jetbrains.annotations.Nullable;

 import javax.imageio.ImageIO;
 import java.io.File;
@@ -54,22 +59,22 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;

-/**
- * @author KennyTV
- * @since 1.0
- */
 public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
    private final MaintenanceBungeeBase plugin;
+    private final BungeeAudiences audiences;
    private Favicon favicon;

    MaintenanceBungeePlugin(final MaintenanceBungeeBase plugin) {
        super(plugin.getDescription().getVersion(), ServerType.BUNGEE);
        this.plugin = plugin;
+        this.audiences = BungeeAudiences.create(plugin);

        settingsProxy = new SettingsProxy(this);
        settings = settingsProxy;
@@ -85,18 +90,22 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
        continueLastEndtimer();
        new MetricsLite(plugin);

-        // ServerListPlus integration
        final Plugin serverListPlus = pm.getPlugin("ServerListPlus");
        if (serverListPlus != null) {
            serverListPlusHook = new ServerListPlusHook(serverListPlus);
-            serverListPlusHook.setEnabled(!settingsProxy.isMaintenance());
+            if (settings.isEnablePingMessages()) {
+                serverListPlusHook.setEnabled(!settingsProxy.isMaintenance());
+            }
            plugin.getLogger().info("Enabled ServerListPlus integration!");
        }
-    }

-    @Deprecated
-    public static IMaintenanceProxy getAPI() {
-        return MaintenanceBungeeAPI.getAPI();
+        if (false && pm.getPlugin("LuckPerms") != null) {
+            LuckPermsProxyHook.<ProxiedPlayer>register(this, player -> {
+                final net.md_5.bungee.api.connection.Server server = player.getServer();
+                return server != null ? server.getInfo().getName() : null;
+            });
+            getLogger().info("Registered LuckPerms context");
+        }
    }

    @Override
@@ -105,7 +114,7 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
        final TextComponent tc2 = new TextComponent(TextComponent.fromLegacyText("§cDownload it at: §6https://www.spigotmc.org/resources/maintenance.40699/"));
        final TextComponent click = new TextComponent(TextComponent.fromLegacyText(" §7§l§o(CLICK ME)"));
        click.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://www.spigotmc.org/resources/maintenance.40699/"));
-        click.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("§aDownload the latest version").create()));
+        click.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(new ComponentBuilder("§aDownload the latest version").create())));
        tc1.addExtra(tc2);
        tc1.addExtra(click);
        ((BungeeSenderInfo) sender).sendMessage(tc1);
@@ -117,42 +126,46 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {

    @Override
    protected void kickPlayersFromProxy() {
-        for (final ProxiedPlayer p : getProxy().getPlayers()) {
-            if (!hasPermission(p, "bypass") && !settingsProxy.isWhitelisted(p.getUniqueId())) {
-                p.disconnect(settingsProxy.getKickMessage());
+        for (final ProxiedPlayer player : getProxy().getPlayers()) {
+            if (!hasPermission(player, "bypass") && !settingsProxy.isWhitelisted(player.getUniqueId())) {
+                player.disconnect(ComponentUtil.toBadComponents(settingsProxy.getKickMessage()));
            }
        }
    }

    @Override
    protected void kickPlayers(final Server server, final Server fallback) {
+        // Kick players from a proxied server
        final ServerInfo fallbackServer = fallback != null ? ((BungeeServer) fallback).getServer() : null;
        final boolean checkForFallback = fallbackServer != null && !isMaintenance(fallback);
        for (final ProxiedPlayer player : ((BungeeServer) server).getServer().getPlayers()) {
            if (!hasPermission(player, "bypass") && !settingsProxy.isWhitelisted(player.getUniqueId())) {
                if (checkForFallback && fallbackServer.canAccess(player)) {
-                    player.sendMessage(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName()));
+                    audiences.player(player).sendMessage(settingsProxy.getMessage("singleMaintenanceActivated", "%SERVER%", server.getName()));
                    player.connect(fallbackServer);
-                } else
-                    player.disconnect(settingsProxy.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", server.getName()));
+                } else {
+                    player.disconnect(ComponentUtil.toBadComponents(settingsProxy.getFullServerKickMessage(server.getName())));
+                }
            } else {
-                player.sendMessage(settingsProxy.getMessage("singleMaintenanceActivated").replace("%SERVER%", server.getName()));
+                audiences.player(player).sendMessage(settingsProxy.getMessage("singleMaintenanceActivated", "%SERVER%", server.getName()));
            }
        }
    }

    @Override
    protected void kickPlayersTo(final Server server) {
+        // Kick all players to a single waiting server
        final ServerInfo serverInfo = ((BungeeServer) server).getServer();
        // Notifications done in global method
        for (final ProxiedPlayer player : getProxy().getPlayers()) {
            if (hasPermission(player, "bypass") || settingsProxy.isWhitelisted(player.getUniqueId())) continue;
-            if (player.getServer() != null && player.getServer().getInfo().getName().equals(serverInfo.getName())) continue;
+            if (player.getServer() != null && player.getServer().getInfo().getName().equals(serverInfo.getName()))
+                continue;
            if (serverInfo.canAccess(player) && !isMaintenance(serverInfo)) {
-                player.sendMessage(settingsProxy.getMessage("sentToWaitingServer").replace("%SERVER%", server.getName()));
+                audiences.player(player).sendMessage(settingsProxy.getMessage("sentToWaitingServer", "%SERVER%", server.getName()));
                player.connect(serverInfo);
            } else {
-                player.disconnect(settingsProxy.getKickMessage());
+                player.disconnect(ComponentUtil.toBadComponents(settingsProxy.getKickMessage()));
            }
        }
    }
@@ -163,25 +176,45 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
    }

    @Override
+    public void getOfflinePlayer(final String name, final Consumer<@Nullable SenderInfo> consumer) {
+        final ProxiedPlayer player = getProxy().getPlayer(name);
+        if (player != null) {
+            consumer.accept(new BungeeSenderInfo(player));
+            return;
+        }
+
+        getProxy().getScheduler().runAsync(plugin, () -> {
+            try {
+                final ProfileLookup profile = doUUIDLookup(name);
+                consumer.accept(new ProxyOfflineSenderInfo(profile.getUuid(), profile.getName()));
+            } catch (final IOException e) {
+                e.printStackTrace();
+                consumer.accept(null);
+            }
+        });
+    }
+
+    @Override
+    public void getOfflinePlayer(final UUID uuid, final Consumer<@Nullable SenderInfo> consumer) {
+        final ProxiedPlayer player = getProxy().getPlayer(uuid);
+        consumer.accept(player != null ? new BungeeSenderInfo(player) : null);
+    }
+
+    @Override
+    @Nullable
    public Server getServer(final String server) {
        final ServerInfo serverInfo = getProxy().getServerInfo(server);
        return serverInfo != null ? new BungeeServer(serverInfo) : null;
    }

    @Override
-    public SenderInfo getOfflinePlayer(final String name) {
-        final ProxiedPlayer player = getProxy().getPlayer(name);
-        return player != null ? new BungeeSenderInfo(player) : null;
+    public Set<String> getServers() {
+        return getProxy().getServers().keySet();
    }

    @Override
-    public SenderInfo getOfflinePlayer(final UUID uuid) {
-        final ProxiedPlayer player = getProxy().getPlayer(uuid);
-        return player != null ? new BungeeSenderInfo(player) : null;
-    }
-
-    @Override
-    public String getServer(final SenderInfo sender) {
+    @Nullable
+    public String getServerNameOf(final SenderInfo sender) {
        final ProxiedPlayer player = getProxy().getPlayer(sender.getUuid());
        if (player == null || player.getServer() == null) return null;
        return player.getServer().getInfo().getName();
@@ -193,8 +226,13 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
    }

    @Override
-    public void broadcast(final String message) {
-        getProxy().broadcast(message);
+    protected void executeConsoleCommand(final String command) {
+        getProxy().getPluginManager().dispatchCommand(getProxy().getConsole(), command);
+    }
+
+    @Override
+    public void broadcast(final Component component) {
+        audiences.all().sendMessage(component);
    }

    @Override
@@ -207,6 +245,16 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
        return plugin.getPluginFile();
    }

+    @Override
+    protected int getOnlinePlayers() {
+        return getProxy().getOnlineCount();
+    }
+
+    @Override
+    protected int getMaxPlayers() {
+        return getProxy().getConfig().getPlayerLimit();
+    }
+
    @Override
    public InputStream getResource(final String name) {
        return plugin.getResourceAsStream(name);
@@ -244,4 +292,8 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
    public Favicon getFavicon() {
        return favicon;
    }
+
+    public BungeeAudiences audiences() {
+        return audiences;
+    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.bungee.command;

 import eu.kennytv.maintenance.bungee.MaintenanceBungeePlugin;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.bungee.command;

 import eu.kennytv.maintenance.bungee.util.BungeeSenderInfo;
@@ -28,10 +27,15 @@ public final class MaintenanceBungeeCommandBase extends Command implements TabEx
    private final MaintenanceCommand command;

    public MaintenanceBungeeCommandBase(final MaintenanceCommand command) {
-        super("maintenance", "", "maintenancebungee");
+        super("maintenance", "maintenance.command", "maintenancebungee", "mt");
        this.command = command;
    }

+    @Override
+    public boolean hasPermission(final CommandSender sender) {
+        return sender.hasPermission("maintenance.admin") || sender.hasPermission("maintenance.command");
+    }
+
    @Override
    public void execute(final CommandSender sender, final String[] args) {
        command.execute(new BungeeSenderInfo(sender), args);
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,16 +15,15 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.bungee.listener;

 import eu.kennytv.maintenance.bungee.MaintenanceBungeePlugin;
+import eu.kennytv.maintenance.bungee.util.ComponentUtil;
 import eu.kennytv.maintenance.core.proxy.SettingsProxy;
 import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.event.ProxyPingEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;

 public final class ProxyPingListener implements Listener {
    private final MaintenanceBungeePlugin plugin;
@@ -35,26 +34,33 @@ public final class ProxyPingListener implements Listener {
        this.settings = settings;
    }

-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = 80)
    public void proxyPing(final ProxyPingEvent event) {
-        if (!settings.isMaintenance()) return;
+        if (!settings.isMaintenance() || !settings.isEnablePingMessages()) return;

        final ServerPing ping = event.getResponse();
-        if (settings.hasCustomPlayerCountMessage()) {
-            ping.getVersion().setProtocol(1);
-            ping.getVersion().setName(settings.getPlayerCountMessage()
-                    .replace("%ONLINE%", Integer.toString(ping.getPlayers().getOnline()))
-                    .replace("%MAX%", Integer.toString(ping.getPlayers().getMax())));
+        ServerPing.Players players = ping.getPlayers();
+        if (players == null) {
+            ping.setPlayers(players = new ServerPing.Players(0, 0, null));
        }

-        ping.setDescription(settings.getRandomPingMessage());
-        ping.getPlayers().setOnline(0);
-        ping.getPlayers().setMax(0);
-        ping.getPlayers().setSample(new ServerPing.PlayerInfo[]{
-                new ServerPing.PlayerInfo(settings.getPlayerCountHoverMessage().replace("%NEWLINE%", "\n"), "")
-        });
+        if (settings.hasCustomPlayerCountMessage()) {
+            ping.setVersion(new ServerPing.Protocol(settings.getPlayerCountMessage()
+                    .replace("%ONLINE%", Integer.toString(players.getOnline()))
+                    .replace("%MAX%", Integer.toString(players.getMax())), 1));
+        }

-        if (settings.hasCustomIcon() && plugin.getFavicon() != null)
+        ping.setDescriptionComponent(ComponentUtil.toBadComponents(settings.getRandomPingMessage()));
+
+        final String[] lines = settings.getPlayerCountHoverLines();
+        final ServerPing.PlayerInfo[] samplePlayers = new ServerPing.PlayerInfo[lines.length];
+        for (int i = 0; i < lines.length; i++) {
+            samplePlayers[i] = new ServerPing.PlayerInfo(lines[i], "");
+        }
+        players.setSample(samplePlayers);
+
+        if (settings.hasCustomIcon() && plugin.getFavicon() != null) {
            ping.setFavicon(plugin.getFavicon());
+        }
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.bungee.listener;

 import eu.kennytv.maintenance.api.proxy.Server;
@@ -25,9 +24,8 @@ import eu.kennytv.maintenance.bungee.util.BungeeServer;
 import eu.kennytv.maintenance.core.proxy.SettingsProxy;
 import eu.kennytv.maintenance.core.proxy.listener.ProxyJoinListenerBase;
 import eu.kennytv.maintenance.core.proxy.util.ServerConnectResult;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ServerConnectEvent;
 import net.md_5.bungee.api.plugin.Listener;
@@ -47,19 +45,29 @@ public final class ServerConnectListener extends ProxyJoinListenerBase implement
        // Global maintenance check
        if (event.isCancelled() || event.getReason() != ServerConnectEvent.Reason.JOIN_PROXY) return;

-        final BungeeSenderInfo sender = new BungeeSenderInfo(event.getPlayer());
-        if (shouldKick(sender)) {
-            final Server waitingServer = shouldConnectToWaitingServer(sender);
+        final BungeeSenderInfo player = new BungeeSenderInfo(event.getPlayer());
+        if (plugin.isDebug()) {
+            plugin.getLogger().info("Join permission check for " + event.getPlayer().getName()
+                    + " - Permission: " + player.hasMaintenancePermission("bypass") + ", whitelist: " + settings.isWhitelisted(player.getUuid()));
+        }
+
+        if (shouldKick(player)) {
+            final Server waitingServer = shouldConnectToWaitingServer(player);
            if (waitingServer != null) {
                event.setTarget(((BungeeServer) waitingServer).getServer());
-                sender.sendMessage(settings.getMessage("sentToWaitingServer"));
+                player.send(settings.getMessage("sentToWaitingServer"));
+
+                if (plugin.isDebug()) {
+                    plugin.getLogger().info("Join to waiting server for " + event.getPlayer().getName());
+                }
                return;
            }

            event.setCancelled(true);
-            event.getPlayer().disconnect(settings.getKickMessage());
+
+            player.disconnect(settings.getKickMessage());
            if (settings.isJoinNotifications()) {
-                broadcastJoinNotification(sender.getName());
+                broadcastJoinNotification(player.getName());
            }
        }
    }
@@ -69,15 +77,20 @@ public final class ServerConnectListener extends ProxyJoinListenerBase implement
        // Server specific maintenance check
        if (event.isCancelled()) return;

-        final ProxiedPlayer player = event.getPlayer();
+        final ProxiedPlayer proxiedPlayer = event.getPlayer();
        final boolean normalServerConnect = event.getReason() != ServerConnectEvent.Reason.JOIN_PROXY && event.getReason() != ServerConnectEvent.Reason.KICK_REDIRECT
                && event.getReason() != ServerConnectEvent.Reason.LOBBY_FALLBACK && event.getReason() != ServerConnectEvent.Reason.SERVER_DOWN_REDIRECT;
-        final ServerConnectResult connectResult = serverConnect(new BungeeSenderInfo(player), new BungeeServer(event.getTarget()), normalServerConnect);
+        final BungeeSenderInfo player = new BungeeSenderInfo(proxiedPlayer);
+        final ServerConnectResult connectResult = serverConnect(player, new BungeeServer(event.getTarget()), normalServerConnect);
+        if (plugin.isDebug()) {
+            plugin.getLogger().info("Connectresult for " + player.getName() + " to " + event.getTarget().getName() + ": " + connectResult);
+        }
+
        if (connectResult.isCancelled()) {
            event.setCancelled(true);

            // Player has no server to connect to
-            if (player.getServer() == null) {
+            if (proxiedPlayer.getServer() == null) {
                player.disconnect(settings.getKickMessage());
            }
        } else if (connectResult.getTarget() != null) {
@@ -96,10 +109,10 @@ public final class ServerConnectListener extends ProxyJoinListenerBase implement
    }

    private void sendJoinMessage(final Iterable<ProxiedPlayer> players, final String name) {
-        final BaseComponent[] message = TextComponent.fromLegacyText(settings.getMessage("joinNotification").replace("%PLAYER%", name));
+        final Component component = settings.getMessage("joinNotification", "%PLAYER%", name);
        for (final ProxiedPlayer player : players) {
            if (plugin.hasPermission(player, "joinnotification")) {
-                player.sendMessage(message);
+                plugin.audiences().player(player).sendMessage(component);
            }
        }
    }
@@ -76,7 +76,8 @@ public final class MetricsLite {
    public JsonObject getPluginData() {
        final JsonObject data = new JsonObject();

-        final String pluginName = plugin.getDescription().getName();
+        //final String pluginName = plugin.getDescription().getName();
+        final String pluginName = "MaintenanceBungee"; // I cut off the suffix, not sure how bStats would like the name change
        final String pluginVersion = plugin.getDescription().getVersion();

        data.addProperty("pluginName", pluginName);
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,11 +15,13 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.bungee.util;

+import eu.kennytv.maintenance.api.MaintenanceProvider;
 import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.bungee.MaintenanceBungeePlugin;
 import eu.kennytv.maintenance.core.proxy.util.ProxySenderInfo;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.Connection;
@@ -50,10 +52,16 @@ public final class BungeeSenderInfo implements ProxySenderInfo {
    }

    @Override
+    @Deprecated
    public void sendMessage(final String message) {
        sender.sendMessage(message);
    }

+    @Override
+    public void send(final Component component) {
+        ((MaintenanceBungeePlugin) MaintenanceProvider.get()).audiences().sender(sender).sendMessage(component);
+    }
+
    @Override
    public boolean isPlayer() {
        return sender instanceof ProxiedPlayer;
@@ -69,9 +77,9 @@ public final class BungeeSenderInfo implements ProxySenderInfo {
    }

    @Override
-    public void disconnect(final String message) {
+    public void disconnect(final Component component) {
        if (sender instanceof Connection) {
-            ((Connection) sender).disconnect(message);
+            ((Connection) sender).disconnect(ComponentUtil.toBadComponent(component));
        }
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,11 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.bungee.util;

 import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;

@@ -42,13 +41,18 @@ public final class BungeeServer implements Server {
    }

    @Override
-    public void broadcast(final String message) {
-        final BaseComponent[] s = TextComponent.fromLegacyText(message);
-        for (final ProxiedPlayer p : server.getPlayers()) {
-            p.sendMessage(s);
+    public void broadcast(final Component component) {
+        final BaseComponent[] components = ComponentUtil.toBadComponent(component);
+        for (final ProxiedPlayer player : server.getPlayers()) {
+            player.sendMessage(components);
        }
    }

+    @Override
+    public boolean isRegisteredServer() {
+        return true;
+    }
+
    public ServerInfo getServer() {
        return server;
    }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.bungee.util;

 import eu.kennytv.maintenance.core.util.Task;
@@ -0,0 +1,35 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.bungee.util;
+
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.chat.ComponentSerializer;
+
+public final class ComponentUtil {
+
+    public static BaseComponent[] toBadComponent(final Component component) {
+        return ComponentSerializer.parse(GsonComponentSerializer.gson().serialize(component));
+    }
+
+    public static BaseComponent toBadComponents(final Component component) {
+        return new TextComponent(ComponentSerializer.parse(GsonComponentSerializer.gson().serialize(component)));
+    }
+}
@@ -0,0 +1,7 @@
+name: Maintenance
+version: ${version}
+main: eu.kennytv.maintenance.bungee.MaintenanceBungeeBase
+author: kennytv
+description: ${description}
+softDepends: [ServerListPlus, LuckPerms]
+website: https://www.spigotmc.org/resources/maintenance.40699/
@@ -0,0 +1,12 @@
+dependencies {
+    api(projects.maintenanceApiProxy)
+    api(projects.maintenanceCore)
+    implementation(libs.hikariCP)
+    compileOnly(libs.luckperms)
+    compileOnly(libs.guava)
+    compileOnly(libs.gson)
+}
+
+java {
+    withJavadocJar()
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,28 +15,43 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy;

+import com.google.common.io.CharStreams;
+import com.google.gson.JsonObject;
 import eu.kennytv.maintenance.api.event.proxy.ServerMaintenanceChangedEvent;
-import eu.kennytv.maintenance.api.proxy.IMaintenanceProxy;
+import eu.kennytv.maintenance.api.proxy.MaintenanceProxy;
 import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.proxy.command.MaintenanceProxyCommand;
 import eu.kennytv.maintenance.core.proxy.runnable.SingleMaintenanceRunnable;
-import eu.kennytv.maintenance.core.proxy.server.DummyServer;
+import eu.kennytv.maintenance.core.proxy.runnable.SingleMaintenanceScheduleRunnable;
+import eu.kennytv.maintenance.core.proxy.util.ProfileLookup;
 import eu.kennytv.maintenance.core.runnable.MaintenanceRunnableBase;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 import eu.kennytv.maintenance.core.util.ServerType;
 import eu.kennytv.maintenance.core.util.Task;
+import org.jetbrains.annotations.Nullable;

-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;

 /**
- * @author KennyTV
+ * @author kennytv
 * @since 3.0
 */
-public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implements IMaintenanceProxy {
+public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implements MaintenanceProxy {
    private final Map<String, Task> serverTasks = new HashMap<>();
    protected SettingsProxy settingsProxy;

@@ -77,21 +92,25 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
    }

    public void serverActions(final Server server, final boolean maintenance) {
-        if (server == null || server instanceof DummyServer) return;
-        if (maintenance) {
-            final Server fallback = getServer(settingsProxy.getFallbackServer());
-            if (fallback == null) {
-                if (server.hasPlayers()) {
-                    getLogger().warning("The set fallback could not be found! Instead kicking players from that server off the network!");
-                }
-            } else if (fallback.getName().equals(server.getName())) {
-                getLogger().warning("Maintenance has been enabled on the fallback server! If a player joins on a proxied server, they will be kicked completely instead of being sent to the fallback server!");
-            }
-            kickPlayers(server, fallback);
-        } else
-            server.broadcast(settingsProxy.getMessage("singleMaintenanceDeactivated").replace("%SERVER%", server.getName()));
+        if (server == null) return;
+
+        // Skip to the even fire for dummy servers
+        if (server.isRegisteredServer()) {
+            if (maintenance) {
+                final Server fallback = settingsProxy.getFallbackServer();
+                if (fallback == null) {
+                    if (server.hasPlayers()) {
+                        getLogger().warning("The set fallback could not be found! Instead kicking players from that server off the network!");
+                    }
+                }
+                kickPlayers(server, fallback);
+            } else {
+                server.broadcast(settingsProxy.getMessage("singleMaintenanceDeactivated", "%SERVER%", server.getName()));
+            }
+
+            cancelSingleTask(server);
+        }

-        cancelSingleTask(server);
        eventManager.callEvent(new ServerMaintenanceChangedEvent(server, maintenance));
    }

@@ -107,20 +126,31 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement

    public void cancelSingleTask(final Server server) {
        final Task task = serverTasks.remove(server.getName());
-        if (task != null)
+        if (task != null) {
            task.cancel();
+        }
    }

-    public MaintenanceRunnableBase startSingleMaintenanceRunnable(final Server server, final int minutes, final boolean enable) {
-        final MaintenanceRunnableBase runnable = new SingleMaintenanceRunnable(this, settingsProxy, minutes * 60, enable, server);
+    public MaintenanceRunnableBase startSingleMaintenanceRunnable(final Server server, final long duration, final TimeUnit unit, final boolean enable) {
+        final MaintenanceRunnableBase runnable = new SingleMaintenanceRunnable(this, settingsProxy, (int) unit.toSeconds(duration), enable, server);
+        serverTasks.put(server.getName(), runnable.getTask());
+        return runnable;
+    }
+
+    public MaintenanceRunnableBase scheduleSingleMaintenanceRunnable(final Server server, final long duration, final long maintenanceDuration, final TimeUnit unit) {
+        final MaintenanceRunnableBase runnable = new SingleMaintenanceScheduleRunnable(this, settingsProxy,
+                (int) unit.toSeconds(duration), (int) unit.toSeconds(maintenanceDuration), server);
        serverTasks.put(server.getName(), runnable.getTask());
        return runnable;
    }

    @Override
+    @Nullable
    public List<String> getMaintenanceServersDump() {
        final List<String> list = new ArrayList<>();
-        if (isMaintenance()) list.add("global");
+        if (isMaintenance()) {
+            list.add("global");
+        }
        list.addAll(settingsProxy.getMaintenanceServers());
        return list.isEmpty() ? null : list;
    }
@@ -145,11 +175,25 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
        kickPlayersFromProxy();
    }

+    protected ProfileLookup doUUIDLookup(final String name) throws IOException {
+        final URL url = new URL("https://api.ashcon.app/mojang/v2/user/" + name);
+        final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        try (final InputStream in = connection.getInputStream()) {
+            final String output = CharStreams.toString(new InputStreamReader(in));
+            final JsonObject json = GSON.fromJson(output, JsonObject.class);
+
+            final UUID uuid = UUID.fromString(json.getAsJsonPrimitive("uuid").getAsString());
+            final String username = json.getAsJsonPrimitive("username").getAsString();
+            return new ProfileLookup(uuid, username);
+        }
+    }
+
    public SettingsProxy getSettingsProxy() {
        return settingsProxy;
    }

-    public abstract String getServer(SenderInfo sender);
+    @Nullable
+    public abstract String getServerNameOf(SenderInfo sender);

    protected abstract void kickPlayers(Server server, Server fallback);

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,22 +15,26 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy;

+import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.config.ConfigSection;
 import eu.kennytv.maintenance.core.proxy.mysql.MySQL;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import org.jetbrains.annotations.Nullable;

 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

 public final class SettingsProxy extends Settings {
+    private final MaintenanceProxyPlugin proxyPlugin;
    private Set<String> maintenanceServers;
-    private String fallbackServer;
+    private List<String> fallbackServers;
    private String waitingServer;

    private String mySQLTable;
@@ -45,9 +49,10 @@ public final class SettingsProxy extends Settings {

    public SettingsProxy(final MaintenanceProxyPlugin plugin) {
        super(plugin);
+        this.proxyPlugin = plugin;
    }

-    private void setupMySQL() throws Exception {
+    private void setupMySQL() {
        plugin.getLogger().info("Trying to open database connection... (also, you can simply ignore the SLF4J soft-warning if it shows up)");
        final ConfigSection section = config.getSection("mysql");
        if (section == null) {
@@ -76,7 +81,7 @@ public final class SettingsProxy extends Settings {
    @Override
    protected void loadExtraSettings() {
        // Open database connection if enabled and not already done
-        if (!hasMySQL() && (boolean) config.getDeep("mysql.use-mysql")) {
+        if (!hasMySQL() && config.getBoolean("mysql.use-mysql")) {
            try {
                setupMySQL();
            } catch (final Exception e) {
@@ -86,7 +91,9 @@ public final class SettingsProxy extends Settings {
            }
        }

-        fallbackServer = config.getString("fallback", "lobby");
+        final Object fallback = config.getObject("fallback");
+        fallbackServers = fallback instanceof String ? Collections.singletonList((String) fallback) : config.getStringList("fallback");
+
        waitingServer = config.getString("waiting-server", "");
        if (waitingServer.isEmpty() || waitingServer.equalsIgnoreCase("none")) {
            waitingServer = null;
@@ -124,16 +131,17 @@ public final class SettingsProxy extends Settings {
        if (hasMySQL() && System.currentTimeMillis() - lastServerCheck > millisecondsToCheck) {
            final Set<String> databaseValue = loadMaintenanceServersFromSQL();
            if (!maintenanceServers.equals(databaseValue)) {
-                final MaintenanceProxyPlugin plugin = (MaintenanceProxyPlugin) super.plugin;
                // Enable maintenance on yet unlisted servers
                for (final String s : databaseValue) {
-                    if (!maintenanceServers.contains(s))
-                        plugin.serverActions(plugin.getServer(s), true);
+                    if (!maintenanceServers.contains(s)) {
+                        proxyPlugin.serverActions(proxyPlugin.getServer(s), true);
+                    }
                }
                // Disable maintenance on now unlisted servers
                for (final String s : maintenanceServers) {
-                    if (!databaseValue.contains(s))
-                        plugin.serverActions(plugin.getServer(s), false);
+                    if (!databaseValue.contains(s)) {
+                        proxyPlugin.serverActions(proxyPlugin.getServer(s), false);
+                    }
                }
                maintenanceServers = databaseValue;
            }
@@ -142,6 +150,23 @@ public final class SettingsProxy extends Settings {
        return maintenanceServers.contains(serverName);
    }

+    public Component getServerKickMessage(final String server) {
+        Component message = getMessageOrNull("singleMaintenanceKicks." + server, "%SERVER%", server);
+        if (message == null) {
+            message = getMessage("singleMaintenanceKick", "%SERVER%", server);
+        }
+        return plugin.replacePingVariables(message);
+    }
+
+    // Full = being kicked from the proxy, not just a proxied server
+    public Component getFullServerKickMessage(final String server) {
+        Component message = getMessageOrNull("singleMaintenanceKicksComplete." + server, "%SERVER%", server);
+        if (message == null) {
+            message = getMessage("singleMaintenanceKickComplete", "%SERVER%", server);
+        }
+        return plugin.replacePingVariables(message);
+    }
+
    public boolean hasMySQL() {
        return mySQL != null;
    }
@@ -171,10 +196,12 @@ public final class SettingsProxy extends Settings {
        if (hasMySQL()) {
            maintenanceServers = loadMaintenanceServersFromSQL();
            if (!maintenanceServers.remove(server)) return false;
+
            plugin.async(() -> mySQL.executeUpdate("DELETE FROM " + serverTable + " WHERE server = ?", server));
            lastServerCheck = System.currentTimeMillis();
        } else {
            if (!maintenanceServers.remove(server)) return false;
+
            saveServersToConfig();
        }
        return true;
@@ -219,14 +246,23 @@ public final class SettingsProxy extends Settings {
        return maintenanceServers;
    }

-    public String getFallbackServer() {
-        return fallbackServer;
+    @Nullable
+    public Server getFallbackServer() {
+        for (final String fallbackServer : fallbackServers) {
+            final Server server = proxyPlugin.getServer(fallbackServer);
+            if (server != null && !isMaintenance(server.getName())) {
+                return server;
+            }
+        }
+        return null;
    }

+    @Nullable
    public String getWaitingServer() {
        return waitingServer;
    }

+    @Nullable
    MySQL getMySQL() {
        return mySQL;
    }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.command;

 import eu.kennytv.maintenance.api.proxy.Server;
@@ -45,6 +44,7 @@ public abstract class MaintenanceProxyCommand extends MaintenanceCommand {

        add(new SingleStarttimerCommand(plugin), "starttimer", "start");
        add(new SingleEndtimerCommand(plugin), "endtimer", "end");
+        add(new SingleScheduleTimerCommand(plugin), "scheduletimer", "schedule");
        add(new AbortSingleTimerCommand(plugin), "aborttimer", "abort");
    }

@@ -59,14 +59,14 @@ public abstract class MaintenanceProxyCommand extends MaintenanceCommand {
        return list;
    }

-    public Server checkSingleTimerArgs(final SenderInfo sender, final String[] args) {
-        final Server server = plugin.getServer(args[1]);
+    public Server checkSingleTimerServerArg(final SenderInfo sender, final String serverName) {
+        final Server server = plugin.getServer(serverName);
        if (server == null) {
-            sender.sendMessage(settings.getMessage("serverNotFound"));
+            sender.send(settings.getMessage("serverNotFound"));
            return null;
        }
        if (plugin.isServerTaskRunning(server)) {
-            sender.sendMessage(settings.getMessage("singleTimerAlreadyRunning"));
+            sender.send(settings.getMessage("singleTimerAlreadyRunning"));
            return null;
        }
        return server;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.command;

 import eu.kennytv.maintenance.core.command.CommandInfo;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.command.subcommand;

 import eu.kennytv.maintenance.api.proxy.Server;
@@ -42,28 +41,28 @@ public final class AbortSingleTimerCommand extends ProxyCommandInfo {
        if (args.length == 1) {
            if (checkPermission(sender, "timer")) return;
            if (!plugin.isTaskRunning()) {
-                sender.sendMessage(getMessage("timerNotRunning"));
+                sender.send(getMessage("timerNotRunning"));
                return;
            }

            plugin.cancelTask();
-            sender.sendMessage(getMessage("timerCancelled"));
+            sender.send(getMessage("timerCancelled"));
        } else if (args.length == 2) {
            if (checkPermission(sender, "singleserver.timer")) return;
            final Server server = plugin.getServer(args[1]);
            if (server == null) {
-                sender.sendMessage(getMessage("serverNotFound"));
+                sender.send(getMessage("serverNotFound"));
                return;
            }
            if (!plugin.isServerTaskRunning(server)) {
-                sender.sendMessage(getMessage("singleTimerNotRunning"));
+                sender.send(getMessage("singleTimerNotRunning"));
                return;
            }

            plugin.cancelSingleTask(server);
-            sender.sendMessage(getMessage("singleTimerCancelled"));
+            sender.send(getMessage("singleTimerCancelled"));
        } else
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
    }

    @Override
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.command.subcommand;

 import eu.kennytv.maintenance.api.proxy.Server;
@@ -26,6 +25,7 @@ import eu.kennytv.maintenance.core.util.SenderInfo;

 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;

 public final class SingleEndtimerCommand extends ProxyCommandInfo {

@@ -43,32 +43,35 @@ public final class SingleEndtimerCommand extends ProxyCommandInfo {
        if (args.length == 2) {
            if (checkPermission(sender, "timer")) return;
            if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-                sender.sendMessage(getHelpMessage());
+                sender.send(getHelpMessage());
                return;
            }
            if (!plugin.isMaintenance()) {
-                sender.sendMessage(getMessage("alreadyDisabled"));
-                return;
-            }
-            plugin.startMaintenanceRunnableForMinutes(Integer.parseInt(args[1]), false);
-            sender.sendMessage(getMessage("endtimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
-        } else if (args.length == 3) {
-            if (checkPermission(sender, "singleserver.timer")) return;
-            if (plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
-                sender.sendMessage(getHelpMessage());
+                sender.send(getMessage("alreadyDisabled"));
                return;
            }

-            final Server server = plugin.getCommandManager().checkSingleTimerArgs(sender, args);
-            if (server == null) return;
-            if (!plugin.isMaintenance(server)) {
-                sender.sendMessage(getMessage("singleServerAlreadyDisabled").replace("%SERVER%", server.getName()));
+            plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, false);
+            sender.send(getMessage("endtimerStarted", "%TIME%", plugin.getRunnable().getTime()));
+        } else if (args.length == 3) {
+            if (checkPermission(sender, "singleserver.timer")) return;
+            if (plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
+                sender.send(getHelpMessage());
                return;
            }
-            final MaintenanceRunnableBase runnable = plugin.startSingleMaintenanceRunnable(server, Integer.parseInt(args[2]), false);
-            sender.sendMessage(getMessage("endtimerStarted").replace("%TIME%", runnable.getTime()));
-        } else
-            sender.sendMessage(getHelpMessage());
+
+            final Server server = plugin.getCommandManager().checkSingleTimerServerArg(sender, args[1]);
+            if (server == null) return;
+            if (!plugin.isMaintenance(server)) {
+                sender.send(getMessage("singleServerAlreadyDisabled", "%SERVER%", server.getName()));
+                return;
+            }
+
+            final MaintenanceRunnableBase runnable = plugin.startSingleMaintenanceRunnable(server, Integer.parseInt(args[2]), TimeUnit.MINUTES, false);
+            sender.send(getMessage("endtimerStarted", "%TIME%", runnable.getTime()));
+        } else {
+            sender.send(getHelpMessage());
+        }
    }

    @Override
@@ -0,0 +1,83 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.core.proxy.command.subcommand;
+
+import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
+import eu.kennytv.maintenance.core.proxy.command.ProxyCommandInfo;
+import eu.kennytv.maintenance.core.runnable.MaintenanceRunnableBase;
+import eu.kennytv.maintenance.core.util.SenderInfo;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+public final class SingleScheduleTimerCommand extends ProxyCommandInfo {
+
+    public SingleScheduleTimerCommand(final MaintenanceProxyPlugin plugin) {
+        super(plugin, null);
+    }
+
+    @Override
+    public boolean hasPermission(final SenderInfo sender) {
+        return sender.hasMaintenancePermission("timer") || sender.hasPermission("maintenance.singleserver.timer");
+    }
+
+    @Override
+    public void execute(final SenderInfo sender, final String[] args) {
+        if (args.length == 3) {
+            if (checkPermission(sender, "timer")) return;
+            if (plugin.getCommandManager().checkTimerArgs(sender, args[1])
+                    || plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
+                sender.send(getHelpMessage());
+                return;
+            }
+            if (plugin.isMaintenance()) {
+                sender.send(getMessage("alreadyEnabled"));
+                return;
+            }
+
+            plugin.scheduleMaintenanceRunnable(Integer.parseInt(args[1]), Integer.parseInt(args[2]), TimeUnit.MINUTES);
+            sender.send(getMessage("starttimerStarted", "%TIME%", plugin.getRunnable().getTime()));
+        } else if (args.length == 4) {
+            if (checkPermission(sender, "singleserver.timer")) return;
+            if (plugin.getCommandManager().checkTimerArgs(sender, args[2], false)
+                    || plugin.getCommandManager().checkTimerArgs(sender, args[3], false)) {
+                sender.send(getHelpMessage());
+                return;
+            }
+
+            final Server server = plugin.getCommandManager().checkSingleTimerServerArg(sender, args[1]);
+            if (server == null) return;
+            if (plugin.isMaintenance(server)) {
+                sender.send(getMessage("singleServerAlreadyEnabled", "%SERVER%", server.getName()));
+                return;
+            }
+
+            final MaintenanceRunnableBase runnable = plugin.scheduleSingleMaintenanceRunnable(server, Integer.parseInt(args[2]), Integer.parseInt(args[3]), TimeUnit.MINUTES);
+            sender.send(getMessage("starttimerStarted", "%TIME%", runnable.getTime()));
+        } else {
+            sender.send(getHelpMessage());
+        }
+    }
+
+    @Override
+    public List<String> getTabCompletion(final SenderInfo sender, final String[] args) {
+        return args.length == 2 && sender.hasMaintenancePermission("singleserver.timer") ? plugin.getCommandManager().getServersCompletion(args[1].toLowerCase()) : Collections.emptyList();
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.command.subcommand;

 import eu.kennytv.maintenance.api.proxy.Server;
@@ -26,6 +25,7 @@ import eu.kennytv.maintenance.core.util.SenderInfo;

 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;

 public final class SingleStarttimerCommand extends ProxyCommandInfo {

@@ -43,34 +43,35 @@ public final class SingleStarttimerCommand extends ProxyCommandInfo {
        if (args.length == 2) {
            if (checkPermission(sender, "timer")) return;
            if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-                sender.sendMessage(getHelpMessage());
+                sender.send(getHelpMessage());
                return;
            }
            if (plugin.isMaintenance()) {
-                sender.sendMessage(getMessage("alreadyEnabled"));
+                sender.send(getMessage("alreadyEnabled"));
                return;
            }

-            plugin.startMaintenanceRunnableForMinutes(Integer.parseInt(args[1]), true);
-            sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+            plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, true);
+            sender.send(getMessage("starttimerStarted", "%TIME%", plugin.getRunnable().getTime()));
        } else if (args.length == 3) {
            if (checkPermission(sender, "singleserver.timer")) return;
            if (plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
-                sender.sendMessage(getHelpMessage());
+                sender.send(getHelpMessage());
                return;
            }

-            final Server server = plugin.getCommandManager().checkSingleTimerArgs(sender, args);
+            final Server server = plugin.getCommandManager().checkSingleTimerServerArg(sender, args[1]);
            if (server == null) return;
            if (plugin.isMaintenance(server)) {
-                sender.sendMessage(getMessage("singleServerAlreadyEnabled").replace("%SERVER%", server.getName()));
+                sender.send(getMessage("singleServerAlreadyEnabled", "%SERVER%", server.getName()));
                return;
            }

-            final MaintenanceRunnableBase runnable = plugin.startSingleMaintenanceRunnable(server, Integer.parseInt(args[2]), true);
-            sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", runnable.getTime()));
-        } else
-            sender.sendMessage(getHelpMessage());
+            final MaintenanceRunnableBase runnable = plugin.startSingleMaintenanceRunnable(server, Integer.parseInt(args[2]), TimeUnit.MINUTES, true);
+            sender.send(getMessage("starttimerStarted", "%TIME%", runnable.getTime()));
+        } else {
+            sender.send(getHelpMessage());
+        }
    }

    @Override
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.command.subcommand;

 import eu.kennytv.maintenance.api.proxy.Server;
@@ -44,7 +43,7 @@ public final class SingleToggleCommand extends ProxyCommandInfo {
            if (checkPermission(sender, "toggle")) return;
            final boolean maintenance = args[0].equalsIgnoreCase("on");
            if (maintenance == plugin.isMaintenance()) {
-                sender.sendMessage(getMessage(maintenance ? "alreadyEnabled" : "alreadyDisabled"));
+                sender.send(getMessage(maintenance ? "alreadyEnabled" : "alreadyDisabled"));
                return;
            }

@@ -55,26 +54,27 @@ public final class SingleToggleCommand extends ProxyCommandInfo {
            Server server = plugin.getServer(args[1]);
            if (server == null) {
                if (maintenance) {
-                    sender.sendMessage(getMessage("serverNotFound"));
+                    sender.send(getMessage("serverNotFound"));
                    return;
                }
                // Let servers be removed from the maintenance list, even if they don't exist on the proxy
                server = new DummyServer(args[1]);
                if (!plugin.isMaintenance(server)) {
-                    sender.sendMessage(getMessage("serverNotFound"));
+                    sender.send(getMessage("serverNotFound"));
                    return;
                }
            }

            if (plugin.setMaintenanceToServer(server, maintenance)) {
-                if (!sender.isPlayer() || !server.getName().equals(plugin.getServer(sender))) {
-                    sender.sendMessage(getMessage(maintenance ? "singleMaintenanceActivated" : "singleMaintenanceDeactivated").replace("%SERVER%", server.getName()));
+                if (!sender.isPlayer() || !server.getName().equals(plugin.getServerNameOf(sender))) {
+                    sender.send(getMessage(maintenance ? "singleMaintenanceActivated" : "singleMaintenanceDeactivated", "%SERVER%", server.getName()));
                }
            } else {
-                sender.sendMessage(getMessage(maintenance ? "singleServerAlreadyEnabled" : "singleServerAlreadyDisabled").replace("%SERVER%", server.getName()));
+                sender.send(getMessage(maintenance ? "singleServerAlreadyEnabled" : "singleServerAlreadyDisabled", "%SERVER%", server.getName()));
            }
-        } else
-            sender.sendMessage(getHelpMessage());
+        } else {
+            sender.send(getHelpMessage());
+        }
    }

    @Override
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.command.subcommand;

 import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
@@ -31,12 +30,13 @@ public final class StatusCommand extends ProxyCommandInfo {
    @Override
    public void execute(final SenderInfo sender, final String[] args) {
        if (getSettings().getMaintenanceServers().isEmpty()) {
-            sender.sendMessage(getMessage("singleServerMaintenanceListEmpty"));
-        } else {
-            sender.sendMessage(getMessage("singleServerMaintenanceList"));
-            for (final String server : getSettings().getMaintenanceServers()) {
-                sender.sendMessage("§8- §b" + server);
-            }
+            sender.send(getMessage("singleServerMaintenanceListEmpty"));
+            return;
+        }
+
+        sender.send(getMessage("singleServerMaintenanceList"));
+        for (final String server : getSettings().getMaintenanceServers()) {
+            sender.send(getMessage("singleServerMaintenanceListEntry", "%SERVER%", server));
        }
    }
 }
@@ -0,0 +1,78 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.core.proxy.hook;
+
+import eu.kennytv.maintenance.core.hook.LuckPermsHook;
+import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
+import net.luckperms.api.LuckPermsProvider;
+import net.luckperms.api.context.ContextCalculator;
+import net.luckperms.api.context.ContextConsumer;
+import net.luckperms.api.context.ContextSet;
+import net.luckperms.api.context.ImmutableContextSet;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Function;
+
+public final class LuckPermsProxyHook {
+
+    public static <T> void register(final MaintenanceProxyPlugin plugin, final Function<T, String> function) {
+        LuckPermsProvider.get().getContextManager().registerCalculator(new MaintenanceProxyCalculator<T>(plugin, function));
+    }
+
+    public static final class MaintenanceProxyCalculator<T> implements ContextCalculator<T> {
+
+        private static final String MAINTENANCE_ON_KEY = "is-maintenance-on-";
+        private static final String ON_MAINTENANCE_SERVER_KEY = "on-maintenance-server";
+        private final MaintenanceProxyPlugin maintenance;
+        private final Function<T, String> playerServerFunction;
+
+        private MaintenanceProxyCalculator(final MaintenanceProxyPlugin plugin, final Function<T, String> playerServerFunction) {
+            this.maintenance = plugin;
+            this.playerServerFunction = playerServerFunction;
+        }
+
+        @Override
+        public void calculate(@NotNull final T target, @NotNull final ContextConsumer consumer) {
+            consumer.accept(LuckPermsHook.MaintenanceCalculator.MAINTENANCE_KEY, Boolean.toString(maintenance.isMaintenance()));
+            /*for (final String serverName : maintenance.getServers()) {
+                final Server server = maintenance.getServer(serverName);
+                if (server != null) {
+                    consumer.accept(MAINTENANCE_ON_KEY + server, Boolean.toString(maintenance.isMaintenance(server)));
+                }
+            }*/
+            final String server = playerServerFunction.apply(target);
+            if (server != null) {
+                final String value = Boolean.toString(maintenance.getSettingsProxy().isMaintenance(server));
+                consumer.accept(MAINTENANCE_ON_KEY + server, value);
+                consumer.accept(ON_MAINTENANCE_SERVER_KEY, value);
+            }
+        }
+
+        @Override
+        public ContextSet estimatePotentialContexts() {
+            final ImmutableContextSet.Builder builder = ImmutableContextSet.builder();
+            for (final String serverName : maintenance.getServers()) {
+                final String key = MAINTENANCE_ON_KEY + serverName;
+                builder.add(key, "true").add(key, "false");
+            }
+            return builder.add(ON_MAINTENANCE_SERVER_KEY, "true").add(ON_MAINTENANCE_SERVER_KEY, "false")
+                    .add(LuckPermsHook.MaintenanceCalculator.MAINTENANCE_KEY, "true")
+                    .add(LuckPermsHook.MaintenanceCalculator.MAINTENANCE_KEY, "false").build();
+        }
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.listener;

 import eu.kennytv.maintenance.api.proxy.Server;
@@ -25,6 +24,7 @@ import eu.kennytv.maintenance.core.proxy.SettingsProxy;
 import eu.kennytv.maintenance.core.proxy.util.ProxySenderInfo;
 import eu.kennytv.maintenance.core.proxy.util.ServerConnectResult;
 import eu.kennytv.maintenance.core.util.SenderInfo;
+import org.jetbrains.annotations.Nullable;

 public abstract class ProxyJoinListenerBase extends JoinListenerBase {
    private static final ServerConnectResult ALLOWED = new ServerConnectResult(false);
@@ -58,13 +58,13 @@ public abstract class ProxyJoinListenerBase extends JoinListenerBase {
            if (target.getName().equals(waitingServer.getName())) return ALLOWED;

            // Player already is on the waiting server
-            final String currentServer = plugin.getServer(sender);
-            if (currentServer != null && currentServer.equals(waitingServer.getName())) {
-                sender.sendMessage(settings.getMessage("forceWaitingServer"));
+            final String currentServer = plugin.getServerNameOf(sender);
+            if (waitingServer.getName().equals(currentServer)) {
+                sender.send(settings.getMessage("forceWaitingServer"));
                return DENIED;
            }

-            sender.sendMessage(settings.getMessage("sentToWaitingServer"));
+            sender.send(settings.getMessage("sentToWaitingServer"));
            return new ServerConnectResult(waitingServer);
        }

@@ -80,15 +80,15 @@ public abstract class ProxyJoinListenerBase extends JoinListenerBase {
        }

        if (normalServerConnect) {
-            sender.sendMessage(settings.getMessage("singleMaintenanceKick").replace("%SERVER%", target.getName()));
+            sender.send(settings.getServerKickMessage(target.getName()));
            return DENIED;
        }

        // If it's the initial proxy join or a kick from another server, go back to fallback server
-        final Server fallback = plugin.getServer(settings.getFallbackServer());
-        if (fallback == null || !sender.canAccess(fallback) || plugin.isMaintenance(fallback)) {
+        final Server fallback = settings.getFallbackServer();
+        if (fallback == null || !sender.canAccess(fallback)) {
            // Nothing to redirect to, player has to be kicked from the proxy
-            sender.disconnect(settings.getMessage("singleMaintenanceKickComplete").replace("%NEWLINE%", "\n").replace("%SERVER%", target.getName()));
+            sender.disconnect(settings.getFullServerKickMessage(target.getName()));
            if (!warned) {
                plugin.getLogger().warning("Could not send player to the set fallback server; instead kicking player off the network!");
                warned = true;
@@ -106,6 +106,7 @@ public abstract class ProxyJoinListenerBase extends JoinListenerBase {
     * @param sender sender
     * @return waiting server, null if player should be kicked
     */
+    @Nullable
    protected Server shouldConnectToWaitingServer(final ProxySenderInfo sender) {
        if (settings.getWaitingServer() == null) return null;

@@ -1,7 +1,25 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package eu.kennytv.maintenance.core.proxy.mysql;

 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import org.jetbrains.annotations.Nullable;

 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -15,7 +33,6 @@ public final class MySQL {
    private final Logger logger;
    private final HikariDataSource hikariDataSource;

-    // Excuse me and everything to do with the MySQL stuff, I have little to no idea of how to use databases
    public MySQL(final Logger logger, final String hostname, final int port, final String username, final String password, final String database, final boolean useSSL) {
        this.logger = logger;

@@ -26,16 +43,28 @@ public final class MySQL {
        hikariConfig.addDataSourceProperty("password", password);

        String urlProperty = "jdbc:mysql://" + hostname + ":" + port + "/" + database;
-        if (useSSL) {
+        if (!useSSL) {
            urlProperty += "?useSSL=false";
        }
        hikariConfig.addDataSourceProperty("url", urlProperty);

        hikariConfig.setJdbcUrl(urlProperty);
-        hikariConfig.setDataSourceClassName("com.mysql.jdbc.jdbc2.optional.MysqlDataSource");
+        hikariConfig.setDataSourceClassName(findDriver("com.mysql.jdbc.jdbc2.optional.MysqlDataSource", "com.mysql.cj.jdbc.MysqlDataSource", "org.mariadb.jdbc.MariaDbDataSource"));
        hikariDataSource = new HikariDataSource(hikariConfig);
    }

+    @Nullable
+    private String findDriver(final String... classNames) {
+        for (final String name : classNames) {
+            try {
+                Class.forName(name);
+                return name;
+            } catch (final ClassNotFoundException ignored) {
+            }
+        }
+        throw new IllegalArgumentException("No sql driver class found");
+    }
+
    public void executeUpdate(final String query, final Consumer<Integer> callback, final Object... objects) {
        try (final Connection connection = hikariDataSource.getConnection()) {
            try (final PreparedStatement preparedStatement = connection.prepareStatement(query)) {
@@ -62,9 +91,9 @@ public final class MySQL {
                    current++;
                }

-                final ResultSet resultSet = preparedStatement.executeQuery();
-                callback.accept(resultSet);
-                resultSet.close();
+                try (final ResultSet resultSet = preparedStatement.executeQuery()) {
+                    callback.accept(resultSet);
+                }
            }
        } catch (final SQLException e) {
            logger.log(Level.SEVERE, "Error while executing query method: " + query);
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,17 +15,17 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.runnable;

-import eu.kennytv.maintenance.api.proxy.IMaintenanceProxy;
+import eu.kennytv.maintenance.api.proxy.MaintenanceProxy;
 import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.runnable.MaintenanceRunnableBase;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;

-public final class SingleMaintenanceRunnable extends MaintenanceRunnableBase {
-    private final Server server;
+public class SingleMaintenanceRunnable extends MaintenanceRunnableBase {
+    protected final Server server;

    public SingleMaintenanceRunnable(final MaintenancePlugin plugin, final Settings settings, final int seconds, final boolean enable, final Server server) {
        super(plugin, settings, seconds, enable);
@@ -33,22 +33,26 @@ public final class SingleMaintenanceRunnable extends MaintenanceRunnableBase {
    }

    @Override
-    protected void broadcast(final String message) {
-        server.broadcast(message);
+    protected void broadcast(final Component component) {
+        server.broadcast(component);
    }

    @Override
    protected void finish() {
-        ((IMaintenanceProxy) plugin).setMaintenanceToServer(server, enable);
+        ((MaintenanceProxy) plugin).setMaintenanceToServer(server, enable);
    }

    @Override
-    protected String startMessageKey() {
-        return settings.getMessage("singleStarttimerBroadcast").replace("%TIME%", getTime()).replace("%SERVER%", server.getName());
+    protected Component getStartMessage() {
+        return settings.getMessage("singleStarttimerBroadcast",
+                "%TIME%", getTime(),
+                "%SERVER%", server.getName());
    }

    @Override
-    protected String endMessageKey() {
-        return settings.getMessage("singleEndtimerBroadcast").replace("%TIME%", getTime()).replace("%SERVER%", server.getName());
+    protected Component getEndMessage() {
+        return settings.getMessage("singleEndtimerBroadcast",
+                "%TIME%", getTime(),
+                "%SERVER%", server.getName());
    }
 }
@@ -0,0 +1,48 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.core.proxy.runnable;
+
+import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.core.MaintenancePlugin;
+import eu.kennytv.maintenance.core.Settings;
+import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+
+import java.util.concurrent.TimeUnit;
+
+public final class SingleMaintenanceScheduleRunnable extends SingleMaintenanceRunnable {
+    private final int maintenanceDuration;
+
+    public SingleMaintenanceScheduleRunnable(final MaintenancePlugin plugin, final Settings settings, final int seconds, final int maintenanceDuration, final Server server) {
+        super(plugin, settings, seconds, true, server);
+        this.maintenanceDuration = maintenanceDuration;
+    }
+
+    @Override
+    protected void finish() {
+        super.finish();
+        ((MaintenanceProxyPlugin) plugin).startSingleMaintenanceRunnable(server, maintenanceDuration, TimeUnit.SECONDS, false);
+    }
+
+    @Override
+    protected Component getStartMessage() {
+        return settings.getMessage("singleScheduletimerBroadcast",
+                "%SERVER%", server.getName(),
+                "%TIME%", getTime(), "%DURATION%", plugin.getFormattedTime(maintenanceDuration));
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,10 +15,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.server;

 import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;

 public final class DummyServer implements Server {
    private final String name;
@@ -38,6 +38,11 @@ public final class DummyServer implements Server {
    }

    @Override
-    public void broadcast(final String s) {
+    public void broadcast(final Component component) {
+    }
+
+    @Override
+    public boolean isRegisteredServer() {
+        return false;
    }
 }
@@ -0,0 +1,38 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.core.proxy.util;
+
+import java.util.UUID;
+
+public final class ProfileLookup {
+    private final UUID uuid;
+    private final String name;
+
+    public ProfileLookup(final UUID uuid, final String name) {
+        this.uuid = uuid;
+        this.name = name;
+    }
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
@@ -0,0 +1,71 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.core.proxy.util;
+
+import eu.kennytv.maintenance.api.proxy.Server;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+
+import java.util.UUID;
+
+public final class ProxyOfflineSenderInfo implements ProxySenderInfo {
+    private final UUID uuid;
+    private final String name;
+
+    public ProxyOfflineSenderInfo(final UUID uuid, final String name) {
+        this.uuid = uuid;
+        this.name = name;
+    }
+
+    @Override
+    public boolean canAccess(final Server server) {
+        return false;
+    }
+
+    @Override
+    public void disconnect(final Component component) {
+    }
+
+    @Override
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean hasPermission(final String permission) {
+        return false;
+    }
+
+    @Override
+    @Deprecated
+    public void sendMessage(final String message) {
+    }
+
+    @Override
+    public void send(final Component component) {
+    }
+
+    @Override
+    public boolean isPlayer() {
+        return true;
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,15 +15,15 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.util;

 import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.core.util.SenderInfo;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;

 public interface ProxySenderInfo extends SenderInfo {

    boolean canAccess(Server server);

-    void disconnect(String message);
+    void disconnect(Component component);
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,10 +15,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.proxy.util;

 import eu.kennytv.maintenance.api.proxy.Server;
+import org.jetbrains.annotations.Nullable;

 public final class ServerConnectResult {
    private final boolean cancel;
@@ -38,7 +38,16 @@ public final class ServerConnectResult {
        return cancel;
    }

+    @Nullable
    public Server getTarget() {
        return target;
    }
+
+    @Override
+    public String toString() {
+        return "ServerConnectResult{" +
+                "cancel=" + cancel +
+                ", target=" + target +
+                '}';
+    }
 }
@@ -0,0 +1,24 @@
+plugins {
+    id("net.kyori.blossom")
+}
+
+blossom {
+    replaceToken("\$VERSION", project.version)
+    replaceToken("\$IMPL_VERSION", "git-Maintenance-${project.version}:${rootProject.latestCommitHash()}")
+}
+
+dependencies {
+    api(projects.maintenanceApi)
+    api(projects.adventure.adventureApi) {
+        targetConfiguration = "shadow"
+    }
+    compileOnly(libs.luckperms)
+    compileOnly(libs.serverlistplus)
+    compileOnly(libs.guava)
+    compileOnly(libs.gson)
+    compileOnly(libs.snakeyaml)
+}
+
+java {
+    withJavadocJar()
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,19 +15,17 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+package eu.kennytv.maintenance.core;

-package eu.kennytv.maintenance.api;
+import eu.kennytv.maintenance.api.Maintenance;

-/**
- * @author KennyTV
- * @since 2.2.2
- */
-public interface IMaintenanceBase {
+@FunctionalInterface
+public interface MaintenanceBase {

    /**
     * This method is used internally when getting the api instance.
     *
-     * @return {@link IMaintenance} instance
+     * @return {@link Maintenance} instance
     */
-    IMaintenance getApi();
+    Maintenance getApi();
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,29 +15,41 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core;

 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.io.CharStreams;
+import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
-import eu.kennytv.maintenance.api.IMaintenance;
+import eu.kennytv.maintenance.api.Maintenance;
+import eu.kennytv.maintenance.api.MaintenanceProvider;
 import eu.kennytv.maintenance.api.event.MaintenanceChangedEvent;
-import eu.kennytv.maintenance.api.event.manager.IEventManager;
+import eu.kennytv.maintenance.api.event.manager.EventManager;
 import eu.kennytv.maintenance.core.command.MaintenanceCommand;
 import eu.kennytv.maintenance.core.dump.MaintenanceDump;
 import eu.kennytv.maintenance.core.dump.PluginDump;
-import eu.kennytv.maintenance.core.event.EventManager;
 import eu.kennytv.maintenance.core.hook.ServerListPlusHook;
 import eu.kennytv.maintenance.core.runnable.MaintenanceRunnable;
+import eu.kennytv.maintenance.core.runnable.MaintenanceScheduleRunnable;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 import eu.kennytv.maintenance.core.util.ServerType;
 import eu.kennytv.maintenance.core.util.Task;
 import eu.kennytv.maintenance.core.util.Version;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import org.jetbrains.annotations.Nullable;

-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
@@ -46,11 +58,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;

-public abstract class MaintenancePlugin implements IMaintenance {
-    protected final EventManager eventManager;
+public abstract class MaintenancePlugin implements Maintenance {
+    public static final Gson GSON = new GsonBuilder().create();
+    protected final eu.kennytv.maintenance.core.event.EventManager eventManager;
    protected final Version version;
    protected Settings settings;
    protected ServerListPlusHook serverListPlusHook;
@@ -59,12 +73,14 @@ public abstract class MaintenancePlugin implements IMaintenance {
    private final String prefix;
    private final ServerType serverType;
    private Version newestVersion;
+    private boolean debug;

    protected MaintenancePlugin(final String version, final ServerType serverType) {
        this.version = new Version(version);
        this.serverType = serverType;
        this.prefix = "§8[§eMaintenance" + serverType + "§8] ";
-        this.eventManager = new EventManager();
+        this.eventManager = new eu.kennytv.maintenance.core.event.EventManager();
+        MaintenanceProvider.setMaintenance(this);
    }

    public void disable() {
@@ -76,13 +92,22 @@ public abstract class MaintenancePlugin implements IMaintenance {
        settings.getConfig().set("maintenance-enabled", maintenance);
        settings.saveConfig();
        serverActions(maintenance);
+
+        for (final String command : (maintenance ? settings.getCommandsOnMaintenanceEnable() : settings.getCommandsOnMaintenanceDisable())) {
+            try {
+                executeConsoleCommand(command);
+            } catch (final Exception e) {
+                getLogger().severe("Error while executing extra maintenance " + (maintenance ? "enable" : "disable") + " command: " + command);
+                e.printStackTrace();
+            }
+        }
    }

    public void serverActions(final boolean maintenance) {
        if (isTaskRunning()) {
            cancelTask();
        }
-        if (serverListPlusHook != null) {
+        if (serverListPlusHook != null && settings.isEnablePingMessages()) {
            serverListPlusHook.setEnabled(!maintenance);
        }

@@ -98,36 +123,65 @@ public abstract class MaintenancePlugin implements IMaintenance {
        eventManager.callEvent(new MaintenanceChangedEvent(maintenance));
    }

-    public String formatedTimer(final String s) {
-        return s.contains("%TIMER%") ? s.replace("%TIMER%", formatedTimer()) : s;
+    public Component replacePingVariables(final Component component) {
+        return component.replaceText(builder -> builder.matchLiteral("%TIMER%").replacement(c -> getTimerMessage()))
+                .replaceText(builder -> builder.matchLiteral("%ONLINE%").replacement(c -> Component.text(getOnlinePlayers())))
+                .replaceText(builder -> builder.matchLiteral("%MAX%").replacement(c -> Component.text(getMaxPlayers())));
    }

-    public String formatedTimer() {
-        if (!isTaskRunning()) return settings.getMessage("motdTimerNotRunning", "-");
+    public Component getTimerMessage() {
+        if (!isTaskRunning()) {
+            return settings.getMessage("motdTimerNotRunning");
+        }
+
        final int preHours = runnable.getSecondsLeft() / 60;
        final int minutes = preHours % 60;
        final int seconds = runnable.getSecondsLeft() % 60;
-        return settings.getMessage("motdTimer", "%HOURS%:%MINUTES%:%SECONDS%")
-                .replace("%HOURS%", String.format("%02d", preHours / 60))
-                .replace("%MINUTES%", String.format("%02d", minutes))
-                .replace("%SECONDS%", String.format("%02d", seconds));
+        return settings.getMessage("motdTimer",
+                "%HOURS%", String.format("%02d", preHours / 60),
+                "%MINUTES%", String.format("%02d", minutes),
+                "%SECONDS%", String.format("%02d", seconds));
    }

-    public void startMaintenanceRunnableForMinutes(final int minutes, final boolean enable) {
-        startMaintenanceRunnableForSeconds(minutes * 60, enable);
+    public String getFormattedTime(final int timeSeconds) {
+        final int preHours = timeSeconds / 60;
+        final int minutes = preHours % 60;
+        final int seconds = timeSeconds % 60;
+
+        final StringBuilder buider = new StringBuilder();
+        append(buider, "hour", preHours / 60);
+        append(buider, "minute", minutes);
+        append(buider, "second", seconds);
+        return buider.toString();
    }

-    public void startMaintenanceRunnableForSeconds(final int seconds, final boolean enable) {
-        runnable = new MaintenanceRunnable(this, settings, seconds, enable);
+    private void append(final StringBuilder builder, final String timeUnit, final int time) {
+        if (time == 0) return;
+        if (builder.length() != 0) {
+            builder.append(' ');
+        }
+        builder.append(time).append(' ').append(settings.language.getString(time == 1 ? timeUnit : timeUnit + "s"));
+    }
+
+    public void startMaintenanceRunnable(final long duration, final TimeUnit unit, final boolean enable) {
+        runnable = new MaintenanceRunnable(this, settings, (int) unit.toSeconds(duration), enable);
        // Save the endtimer to be able to continue it after a server stop
        if (settings.isSaveEndtimerOnStop() && !runnable.shouldEnable()) {
            settings.setSavedEndtimer(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(runnable.getSecondsLeft()));
        }
    }

+    public void scheduleMaintenanceRunnable(final long duration, final int maintenanceDuration, final TimeUnit unit) {
+        runnable = new MaintenanceScheduleRunnable(this, settings, (int) unit.toSeconds(duration), (int) unit.toSeconds(maintenanceDuration));
+    }
+
    public boolean updateAvailable() {
-        checkNewestVersion();
-        return version.compareTo(newestVersion) == -1;
+        try {
+            checkNewestVersion();
+            return version.compareTo(newestVersion) == -1;
+        } catch (final Exception e) {
+            return false;
+        }
    }

    protected void continueLastEndtimer() {
@@ -144,23 +198,28 @@ public abstract class MaintenancePlugin implements IMaintenance {
            setMaintenance(false);
            settings.setSavedEndtimer(0);
        } else {
-            final int seconds = (int) TimeUnit.MILLISECONDS.toSeconds(settings.getSavedEndtimer() - current);
-            startMaintenanceRunnableForSeconds(seconds, false);
-            getLogger().info("The timer has been continued - maintenance will be disabled in: " + formatedTimer());
+            startMaintenanceRunnable(settings.getSavedEndtimer() - current, TimeUnit.MILLISECONDS, false);
+            getLogger().info("The timer has been continued - maintenance will be disabled in: " + getTimerMessage());
        }
    }

    protected void sendEnableMessage() {
-        getLogger().info("Plugin by KennyTV");
        if (!settings.hasUpdateChecks()) return;
        async(() -> {
-            checkNewestVersion();
+            try {
+                checkNewestVersion();
+            } catch (final Exception e) {
+                getLogger().warning("An error occured during update checking!");
+                return;
+            }
+
            final int compare = version.compareTo(newestVersion);
            if (compare == -1) {
+                //TODO mmmmmmmm legacy chat
                getLogger().info("§cNewest version available: §aVersion " + newestVersion + "§c, you're on §a" + version);
            } else if (compare == 1) {
                if (version.getTag().equalsIgnoreCase("snapshot")) {
-                    getLogger().info("§cYou're running a development version, please report bugs on the Discord server (https://discord.gg/vGCUzHq) or the GitHub issue tracker (https://github.com/KennyTV/Maintenance/issues)");
+                    getLogger().info("§cYou're running a development version, please report bugs on the Discord server (https://discord.gg/vGCUzHq) or the GitHub issue tracker (https://github.com/kennytv/Maintenance/issues)");
                } else {
                    getLogger().info("§cYou're running a version, that doesn't exist! §cN§ai§dc§ee§5!");
                }
@@ -173,7 +232,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
        Preconditions.checkArgument(serverType != ServerType.SPONGE);
        try {
            final String fileSuffix = serverType == ServerType.VELOCITY ? "Velocity" : "";
-            final URLConnection conn = new URL("https://github.com/KennyTV/Maintenance/releases/download/" + newestVersion + "/Maintenance" + fileSuffix + ".jar").openConnection();
+            final URLConnection conn = new URL("https://github.com/kennytv/Maintenance/releases/download/" + newestVersion + "/Maintenance" + fileSuffix + ".jar").openConnection();
            writeFile(new BufferedInputStream(conn.getInputStream()), new BufferedOutputStream(new FileOutputStream(getPluginFolder() + "Maintenance.tmp")));
            final File file = new File(getPluginFolder() + "Maintenance.tmp");
            final long newlength = file.length();
@@ -201,50 +260,45 @@ public abstract class MaintenancePlugin implements IMaintenance {
        os.close();
    }

-    private void checkNewestVersion() {
-        try {
-            final HttpURLConnection c = (HttpURLConnection) new URL("https://api.spigotmc.org/legacy/update.php?resource=40699").openConnection();
-            final BufferedReader reader = new BufferedReader(new InputStreamReader(c.getInputStream()));
+    private void checkNewestVersion() throws Exception {
+        final HttpURLConnection c = (HttpURLConnection) new URL("https://api.spigotmc.org/legacy/update.php?resource=40699").openConnection();
+        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(c.getInputStream()))) {
            final String newVersionString = reader.readLine();
-            reader.close();
            final Version newVersion = new Version(newVersionString);
            if (!newVersion.equals(version)) {
                newestVersion = newVersion;
            }
-        } catch (final Exception ignored) {
        }
    }

    public String pasteDump() {
        final MaintenanceDump dump = new MaintenanceDump(this, settings);
        try {
-            final HttpURLConnection connection = (HttpURLConnection) new URL("https://hasteb.in/documents").openConnection();
+            final HttpURLConnection connection = (HttpURLConnection) new URL("https://hastebin.com/documents").openConnection();
            connection.setDoOutput(true);
            connection.setRequestMethod("POST");
            connection.setRequestProperty("User-Agent", "Maintenance/" + getVersion());
            connection.setRequestProperty("Content-Type", "text/plain");

-            final GsonBuilder gsonBuilder = new GsonBuilder();
-            final OutputStream out = connection.getOutputStream();
-            out.write(gsonBuilder.disableHtmlEscaping().setPrettyPrinting().create().toJson(dump).getBytes(StandardCharsets.UTF_8));
-            out.close();
+            try (final OutputStream out = connection.getOutputStream()) {
+                out.write(new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create().toJson(dump).getBytes(StandardCharsets.UTF_8));
+            }

            if (connection.getResponseCode() == 503) {
-                getLogger().warning("Could not paste dump, hasteb.in down?");
+                getLogger().warning("Could not paste dump, hastebin.com down?");
                return null;
            }

-            final InputStream in = connection.getInputStream();
-            final String output = CharStreams.toString(new InputStreamReader(in));
-            in.close();
+            try (final InputStream in = connection.getInputStream()) {
+                final String output = CharStreams.toString(new InputStreamReader(in));
+                final JsonObject jsonOutput = GSON.fromJson(output, JsonObject.class);
+                if (!jsonOutput.has("key")) {
+                    getLogger().log(Level.WARNING, "Could not paste dump, there was no key returned :(");
+                    return null;
+                }

-            final JsonObject jsonOutput = gsonBuilder.create().fromJson(output, JsonObject.class);
-            if (!jsonOutput.has("key")) {
-                getLogger().log(Level.WARNING, "Could not paste dump, there was no key returned :(");
-                return null;
+                return jsonOutput.get("key").getAsString();
            }
-
-            return jsonOutput.get("key").getAsString();
        } catch (final IOException e) {
            getLogger().log(Level.WARNING, "Could not paste dump :(");
            e.printStackTrace();
@@ -268,18 +322,21 @@ public abstract class MaintenancePlugin implements IMaintenance {
    }

    public void cancelTask() {
-        if (settings.isSaveEndtimerOnStop() && !runnable.shouldEnable())
+        if (settings.isSaveEndtimerOnStop() && !runnable.shouldEnable()) {
            settings.setSavedEndtimer(0);
+        }
+
        runnable.getTask().cancel();
        runnable = null;
    }

+    @Nullable
    public UUID checkUUID(final SenderInfo sender, final String s) {
        final UUID uuid;
        try {
            uuid = UUID.fromString(s);
        } catch (final Exception e) {
-            sender.sendMessage(settings.getMessage("invalidUuid"));
+            sender.send(settings.getMessage("invalidUuid"));
            return null;
        }
        return uuid;
@@ -311,7 +368,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
    }

    @Override
-    public IEventManager getEventManager() {
+    public EventManager getEventManager() {
        return eventManager;
    }

@@ -320,10 +377,21 @@ public abstract class MaintenancePlugin implements IMaintenance {
        return version.toString();
    }

+    @Nullable
    public List<String> getMaintenanceServersDump() {
        return isMaintenance() ? Arrays.asList("global") : null;
    }

+    @Override
+    public boolean isDebug() {
+        return debug;
+    }
+
+    @Override
+    public void setDebug(final boolean debug) {
+        this.debug = debug;
+    }
+
    public int getSaltLevel() {
        return Integer.MAX_VALUE;
    }
@@ -336,6 +404,10 @@ public abstract class MaintenancePlugin implements IMaintenance {
        return prefix;
    }

+    /**
+     * @see #isTaskRunning()
+     */
+    @Nullable
    public MaintenanceRunnable getRunnable() {
        return runnable;
    }
@@ -354,19 +426,30 @@ public abstract class MaintenancePlugin implements IMaintenance {

    public abstract void async(Runnable runnable);

-    public abstract void broadcast(String message);
+    protected abstract void executeConsoleCommand(String command);
+
+    public abstract void broadcast(Component component);

    public abstract void sendUpdateNotification(SenderInfo sender);

    public abstract Task startMaintenanceRunnable(Runnable runnable);

-    public abstract SenderInfo getOfflinePlayer(String name);
+    /**
+     * Gets the offline sender info of a player.
+     * This method may do a web lookup.
+     *
+     * @param name name of the player
+     */
+    public abstract void getOfflinePlayer(String name, Consumer<@Nullable SenderInfo> consumer);

-    public abstract SenderInfo getOfflinePlayer(UUID uuid);
+    public abstract void getOfflinePlayer(UUID uuid, Consumer<@Nullable SenderInfo> consumer);

    public abstract File getDataFolder();

-    public abstract InputStream getResource(String name);
+    @Nullable
+    public InputStream getResource(String name) {
+        return this.getClass().getClassLoader().getResourceAsStream(name);
+    }

    public abstract Logger getLogger();

@@ -379,4 +462,8 @@ public abstract class MaintenancePlugin implements IMaintenance {
    protected abstract void kickPlayers();

    protected abstract File getPluginFile();
+
+    protected abstract int getOnlinePlayers();
+
+    protected abstract int getMaxPlayers();
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,34 +15,51 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core;

-import eu.kennytv.maintenance.api.ISettings;
+import eu.kennytv.maintenance.api.event.MaintenanceReloadedEvent;
 import eu.kennytv.maintenance.core.config.Config;
 import eu.kennytv.maintenance.core.config.ConfigSection;
 import eu.kennytv.maintenance.core.util.ServerType;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.TextComponent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.TextReplacementConfig;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.minimessage.MiniMessage;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.jetbrains.annotations.Nullable;

 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
-import java.util.*;
-import java.util.logging.Level;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;

-public class Settings implements ISettings {
-    private static final int CURRENT_CONFIG_VERSION = 4;
+public class Settings implements eu.kennytv.maintenance.api.Settings {
+    public static final String NEW_LINE_REPLACEMENT = "<br>";
+    private static final int CONFIG_VERSION = 6;
+    private static final int LANGUAGE_VERSION = 1;
    private static final Random RANDOM = new Random();
    protected final MaintenancePlugin plugin;
    private final Map<UUID, String> whitelistedPlayers = new HashMap<>();
    private final String[] unsupportedFields;
    protected boolean maintenance;
    private Set<Integer> broadcastIntervals;
-    private List<String> pingMessages;
-    private List<String> timerSpecificPingMessages;
-    private String playerCountMessage;
-    private String playerCountHoverMessage;
+    private List<Component> pingMessages;
+    private List<Component> timerSpecificPingMessages;
+    private List<String> commandsOnMaintenanceEnable;
+    private List<String> commandsOnMaintenanceDisable;
+    private Component playerCountMessage;
+    private List<Component> playerCountHoverLines;
+    private Component prefix;
    private String languageName;
+    private boolean enablePingMessages;
    private boolean customPlayerCountMessage;
    private boolean customMaintenanceIcon;
    private boolean joinNotifications;
@@ -59,8 +76,10 @@ public class Settings implements ISettings {
    public Settings(final MaintenancePlugin plugin, final String... unsupportedFields) {
        this.plugin = plugin;
        this.unsupportedFields = unsupportedFields;
-        if (!plugin.getDataFolder().exists())
+        if (!plugin.getDataFolder().exists()) {
+            updatePluginDirectory();
            plugin.getDataFolder().mkdirs();
+        }

        createFile("config.yml");
        createFile("WhitelistedPlayers.yml");
@@ -76,8 +95,8 @@ public class Settings implements ISettings {
            config.resetAwesomeHeader();
            whitelist = new Config(new File(plugin.getDataFolder(), "WhitelistedPlayers.yml"));
            whitelist.load();
-        } catch (final IOException e) {
-            throw new RuntimeException("Unable to load Maintenance files!", e);
+        } catch (final Exception e) {
+            throw new RuntimeException("Unable to load Maintenance files - probably a malformed config file", e);
        }

        loadSettings();
@@ -87,16 +106,19 @@ public class Settings implements ISettings {
            language = new Config(new File(plugin.getDataFolder(), "language-" + languageName + ".yml"));
            language.load();
        } catch (final IOException e) {
-            throw new RuntimeException("Unable to load Maintenance language file!", e);
+            throw new RuntimeException("Unable to load Maintenance language file - probably a malformed file", e);
        }

-        updateLanguageFile();
-
-        // Directly save colored messages
-        for (final Map.Entry<String, Object> entry : language.getValues().entrySet()) {
-            if (!(entry.getValue() instanceof String)) continue;
-            entry.setValue(getColoredString((String) entry.getValue()));
+        try {
+            updateLanguageFile();
+        } catch (final IOException e) {
+            plugin.getLogger().severe("Couldn't update language file");
+            e.printStackTrace();
        }
+
+        prefix = MiniMessage.miniMessage().deserialize(language.getString("prefix"));
+
+        plugin.getEventManager().callEvent(new MaintenanceReloadedEvent());
    }

    public void saveConfig() {
@@ -152,20 +174,29 @@ public class Settings implements ISettings {
    private void loadSettings() {
        updateConfig();

-        pingMessages = config.getStringList("pingmessages");
+        enablePingMessages = config.getBoolean("enable-pingmessages", true);
+        pingMessages = loadPingMessages("pingmessages");
        if (config.getBoolean("enable-timerspecific-messages")) {
-            timerSpecificPingMessages = config.getStringList("timerspecific-pingmessages");
+            timerSpecificPingMessages = loadPingMessages("timerspecific-pingmessages");
        }
        maintenance = config.getBoolean("maintenance-enabled");
+        commandsOnMaintenanceEnable = config.getStringList("commands-on-maintenance-enable");
+        commandsOnMaintenanceDisable = config.getStringList("commands-on-maintenance-disable");
        customPlayerCountMessage = config.getBoolean("enable-playercountmessage");
        customMaintenanceIcon = config.getBoolean("custom-maintenance-icon");
        joinNotifications = config.getBoolean("send-join-notification");
        broadcastIntervals = new HashSet<>(config.getIntList("timer-broadcast-for-seconds"));
        if (plugin.getServerType() != ServerType.SPONGE) {
-            playerCountMessage = getColoredString(getConfigString("playercountmessage"));
+            playerCountMessage = getConfigMessage("playercountmessage");
        }
-        playerCountHoverMessage = getColoredString(getConfigString("playercounthovermessage"));
-        languageName = getConfigString("language").toLowerCase();
+
+        playerCountHoverLines = new ArrayList<>();
+        final String playerHoverMessage = config.getString("playercounthovermessage");
+        for (final String line : playerHoverMessage.split("<br>")) {
+            playerCountHoverLines.add(MiniMessage.miniMessage().deserialize(line));
+        }
+
+        languageName = config.getString("language").toLowerCase();
        kickOnlinePlayers = config.getBoolean("kick-online-players", true);
        updateChecks = config.getBoolean("update-checks", true);
        debug = config.getBoolean("debug");
@@ -190,41 +221,39 @@ public class Settings implements ISettings {
        loadExtraSettings();
    }

+    private void updatePluginDirectory() {
+        // All plugin identifiers were changed to 'Maintenance' ('maintenance' for Sponge and Velocity) in 3.0.5
+        String oldDirName = "Maintenance" + plugin.getServerType();
+        if (plugin.getServerType() == ServerType.SPONGE || plugin.getServerType() == ServerType.VELOCITY) {
+            oldDirName = oldDirName.toLowerCase();
+        }
+
+        final File oldDir = new File(plugin.getDataFolder().getParentFile(), oldDirName);
+        if (!oldDir.exists()) {
+            return;
+        }
+
+        try {
+            Files.move(oldDir.toPath(), plugin.getDataFolder().toPath());
+            plugin.getLogger().info("Moved old " + oldDirName + " to new " + plugin.getDataFolder().getName() + " directory!");
+        } catch (final IOException e) {
+            plugin.getLogger().severe("Error while copying " + oldDirName + " to new " + plugin.getDataFolder().getName() + " directory!");
+            e.printStackTrace();
+        }
+    }
+
    private void updateConfig() {
-        boolean changed = false;
-
-        // 3.0 - update config format from 2.5
-        if (migrateConfig(new File(plugin.getDataFolder(), "bungee-config.yml"))
-                || migrateConfig(new File(plugin.getDataFolder(), "spigot-config.yml"))) {
-            // Also rename old language file
-            final File file = new File(plugin.getDataFolder(), "language-" + languageName + ".yml");
-            if (file.exists()) {
-                if (file.renameTo(new File(plugin.getDataFolder(), "language-" + languageName + ".old"))) {
-                    plugin.getLogger().info("Renamed old language file!");
-                } else {
-                    plugin.getLogger().warning("Could not rename old language file! Please rename/delete it yourself as soon as possible!");
-                }
+        final int version = config.getInt("config-version");
+        if (version != CONFIG_VERSION) {
+            plugin.getLogger().info("Updating config to the latest version...");
+            if (version < 6) {
+                // Legacy text to MiniMessage
+                legacyToMinimessage(config.getStringList("pingmessages"));
+                legacyToMinimessage(config.getStringList("timerspecific-pingmessages"));
+                config.set("playercounthovermessage", legacyToMinimessage(config.getString("playercounthovermessage")));
+                config.set("playercountmessage", legacyToMinimessage(config.getString("playercountmessage")));
            }

-            changed = true;
-        }
-        // 3.0 - move SpigotServer.yml fields to config
-        if (plugin.getServerType() == ServerType.BUNGEE && migrateSpigotServersFile()) {
-            changed = true;
-        }
-        // 3.0 - move maintenace-icon from server to plugin directory
-        final File icon = new File("maintenance-icon.png");
-        if (icon.exists()) {
-            if (icon.renameTo(new File(plugin.getDataFolder(), "maintenance-icon.png"))) {
-                plugin.getLogger().info("Moved maintenance-icon from server directory to the plugin's directory!");
-            } else {
-                plugin.getLogger().warning("Could not move maintenance-icon from server directory to the plugin's directory! Please do so yourself!");
-            }
-        }
-
-        // Update config to latest version (config version included since 3.0.1)
-        if (config.getInt("config-version") != CURRENT_CONFIG_VERSION) {
-            plugin.getLogger().info("Updating config to latest version...");
            createFile("config-new.yml", "config.yml");
            final File file = new File(plugin.getDataFolder(), "config-new.yml");
            final Config tempConfig = new Config(file, unsupportedFields);
@@ -235,166 +264,132 @@ public class Settings implements ISettings {
            }

            config.addMissingFields(tempConfig.getValues(), tempConfig.getComments());
-            config.set("config-version", CURRENT_CONFIG_VERSION);
+            config.set("config-version", CONFIG_VERSION);

            file.delete();
            tempConfig.clear();

-            changed = true;
-        }
-
-        if (changed) {
            saveConfig();
            plugin.getLogger().info("Done! Updated config!");
        }
    }

-    private void updateLanguageFile() {
-        final String filePrefix = "language-" + languageName;
-        try {
-            createFile(filePrefix + "-new.yml", filePrefix + ".yml");
-        } catch (final NullPointerException e) {
-            plugin.getLogger().info("Not checking for updated language strings, since there is no " + filePrefix + ".yml in the resource files (if your file is self translated and up to date, you can ignore this).");
-            return;
-        } catch (final Exception e) {
-            plugin.getLogger().warning("Couldn't update language file, as the " + filePrefix + ".yml could not be loaded from the resource files!");
-            e.printStackTrace();
+    private void updateLanguageFile() throws IOException {
+        final int version = language.getInt("language-version");
+        if (version == LANGUAGE_VERSION) {
            return;
        }

+        plugin.getLogger().info("Updating language file to the latest version...");
+        if (version < 1) {
+            for (final Map.Entry<String, Object> entry : language.getValues().entrySet()) {
+                if (!(entry.getValue() instanceof String)) {
+                    continue;
+                }
+
+                String value = (String) entry.getValue();
+                value = value.replace("&8[&eMaintenance&8] ", "<prefix>");
+                value = legacyToMinimessage(value);
+                value = value.replace("%NEWLINE%", NEW_LINE_REPLACEMENT);
+                language.set(entry.getKey(), value);
+            }
+        }
+
+        final String filePrefix = "language-" + languageName;
+        createFile(filePrefix + "-new.yml", filePrefix + ".yml");
+
        final File file = new File(plugin.getDataFolder(), filePrefix + "-new.yml");
        final Config tempConfig = new Config(file);
        try {
            tempConfig.load();
-        } catch (final IOException e) {
-            e.printStackTrace();
-            return;
+        } finally {
+            file.delete();
        }

-        final boolean updated = language.addMissingFields(tempConfig.getValues(), tempConfig.getComments());
+        language.addMissingFields(tempConfig.getValues(), tempConfig.getComments());
        tempConfig.clear();
-        file.delete();
-        if (updated) {
-            try {
-                language.save();
-                plugin.getLogger().info("Updated language file!");
-            } catch (final IOException e) {
-                e.printStackTrace();
-            }
+
+        language.set("language-version", LANGUAGE_VERSION);
+
+        language.save();
+        plugin.getLogger().info("Updated language file!");
+    }
+
+    private String legacyToMinimessage(final String s) {
+        final TextComponent component = LegacyComponentSerializer.legacyAmpersand().deserialize(s);
+        final String serialized = MiniMessage.miniMessage().serialize(component);
+        //TODO hack to remove explicit closing until fixed in MM
+        return serialized.replaceAll("</[a-z_]+>", "");
+    }
+
+    private void legacyToMinimessage(final List<String> list) {
+        for (int i = 0; i < list.size(); i++) {
+            list.set(i, legacyToMinimessage(list.get(i)));
        }
    }

-    private boolean migrateConfig(final File file) {
-        if (!file.exists()) return false;
-
-        plugin.getLogger().info("Migrating old config to new format...");
-        final Config oldConfig = new Config(file);
-        try {
-            oldConfig.load();
-        } catch (final IOException e) {
-            plugin.getLogger().log(Level.WARNING, "Error while trying to migrate old config file");
-            e.printStackTrace();
-            return false;
+    public Component getConfigMessage(final String path) {
+        final String s = config.getString(path);
+        if (s == null) {
+            plugin.getLogger().warning("The config file is missing the following string: " + path);
+            return Component.text("null");
        }
-
-        if (oldConfig.contains("pingmessage"))
-            config.set("pingmessages", Arrays.asList(oldConfig.getString("pingmessage")));
-        if (oldConfig.contains("enable-maintenance-mode"))
-            config.set("maintenance-enabled", oldConfig.getBoolean("enable-maintenance-mode"));
-        for (final Map.Entry<String, Object> entry : config.getValues().entrySet()) {
-            if (!oldConfig.contains(entry.getKey())) continue;
-            entry.setValue(oldConfig.get(entry.getKey()));
-        }
-
-        oldConfig.clear();
-        if (!file.delete()) {
-            plugin.getLogger().warning("Could not delete old config file! Please delete it as soon as possible.");
-        } else {
-            plugin.getLogger().info("Updated to new config file!");
-        }
-        return true;
+        return MiniMessage.miniMessage().deserialize(replaceNewlineVar(s));
    }

-    private boolean migrateSpigotServersFile() {
-        final File file = new File(plugin.getDataFolder(), "SpigotServers.yml");
-        if (!file.exists()) return false;
-
-        final Config oldFile = new Config(file);
-        try {
-            oldFile.load();
-        } catch (final IOException e) {
-            plugin.getLogger().log(Level.WARNING, "Error while trying to migrate old SpigotServers file");
-            e.printStackTrace();
-            return false;
-        }
-
-        if (oldFile.contains("maintenance-on")) {
-            config.set("proxied-maintenance-servers", oldFile.getStringList("maintenance-on"));
-        }
-        if (oldFile.contains("fallback")) {
-            config.set("fallback", oldFile.getString("fallback"));
-        }
-
-        oldFile.clear();
-        if (!file.delete()) {
-            plugin.getLogger().warning("Could not delete old SpigotServers.yml file! Please delete it as soon as possible.");
-        } else {
-            plugin.getLogger().info("Deleted old SpigotServers.yml file!");
-        }
-        return true;
-    }
-
-    private static final String ALL_CODES = "0123456789AaBbCcDdEeFfKkLlMmNnOoRr";
-
-    public String getColoredString(final String s) {
-        // Method taken from Bungee
-        final char[] b = s.toCharArray();
-        for (int i = 0; i < b.length - 1; i++) {
-            if (b[i] == '&' && ALL_CODES.indexOf(b[i + 1]) > -1) {
-                b[i] = '§';
-                b[i + 1] = Character.toLowerCase(b[i + 1]);
-            }
-        }
-        return new String(b);
-    }
-
-    public String getConfigString(final String path) {
-        if (!config.contains(path)) {
-            plugin.getLogger().warning("The config is missing the following string: " + path);
-            return "null";
-        }
-        return config.getString(path);
-    }
-
-    public String getMessage(final String path) {
-        return getMessage(path, "null");
-    }
-
-    public String getMessage(final String path, final String def) {
-        if (!language.contains(path)) {
+    public Component getMessage(final String path, final String... replacements) {
+        String s = language.getString(path);
+        if (s == null) {
            plugin.getLogger().warning("The language file is missing the following string: " + path);
-            return def;
+            return Component.text("null");
        }
-        return language.getString(path);
+        if (replacements.length != 0) {
+            if (replacements.length % 2 != 0) {
+                throw new IllegalArgumentException("Invalid replacement count: " + replacements.length);
+            }
+
+            for (int i = 0; i < replacements.length; i += 2) {
+                final String key = replacements[i];
+                s = s.replace(key, replacements[i + 1]);
+            }
+        }
+
+        return MiniMessage.miniMessage().deserialize(replaceNewlineVar(s))
+                .replaceText(TextReplacementConfig.builder().matchLiteral("<prefix>").replacement(prefix).build());
    }

-    public String getRandomPingMessage() {
+    public @Nullable Component getMessageOrNull(final String path, final String... replacements) {
+        return language.contains(path) ? getMessage(path, replacements) : null;
+    }
+
+    public Component getRandomPingMessage() {
        if (plugin.isTaskRunning() && !plugin.getRunnable().shouldEnable()
                && hasTimerSpecificPingMessages() && !timerSpecificPingMessages.isEmpty()) {
            return getPingMessage(timerSpecificPingMessages);
        }
-        return pingMessages.isEmpty() ? "" : getPingMessage(pingMessages);
+        return pingMessages.isEmpty() ? Component.empty() : getPingMessage(pingMessages);
    }

-    private String getPingMessage(final List<String> list) {
-        final String s = list.size() == 1 ? list.get(0) : list.get(RANDOM.nextInt(list.size()));
-        return getColoredString(plugin.formatedTimer(s).replace("%NEWLINE%", "\n"));
+    private Component getPingMessage(final List<Component> list) {
+        final Component component = list.size() == 1 ? list.get(0) : list.get(RANDOM.nextInt(list.size()));
+        return plugin.replacePingVariables(component);
+    }
+
+    private List<Component> loadPingMessages(final String path) {
+        final List<String> list = config.getStringList(path);
+        final List<Component> components = new ArrayList<>(list.size());
+        for (final String s : list) {
+            components.add(MiniMessage.miniMessage().deserialize(replaceNewlineVar(s)));
+        }
+        return components;
    }

    @Override
    public boolean removeWhitelistedPlayer(final UUID uuid) {
-        if (!whitelistedPlayers.containsKey(uuid)) return false;
-        whitelistedPlayers.remove(uuid);
+        if (whitelistedPlayers.remove(uuid) == null) {
+            return false;
+        }
+
        whitelist.remove(uuid.toString());
        saveWhitelistedPlayers();
        return true;
@@ -410,7 +405,10 @@ public class Settings implements ISettings {
                break;
            }
        }
-        if (uuid == null) return false;
+
+        if (uuid == null) {
+            return false;
+        }

        whitelistedPlayers.remove(uuid);
        whitelist.remove(uuid.toString());
@@ -420,11 +418,10 @@ public class Settings implements ISettings {

    @Override
    public boolean addWhitelistedPlayer(final UUID uuid, final String name) {
-        final boolean contains = !whitelistedPlayers.containsKey(uuid);
-        whitelistedPlayers.put(uuid, name);
+        final boolean added = whitelistedPlayers.put(uuid, name) == null;
        whitelist.set(uuid.toString(), name);
        saveWhitelistedPlayers();
-        return contains;
+        return added;
    }

    @Override
@@ -446,6 +443,11 @@ public class Settings implements ISettings {
        this.maintenance = maintenance;
    }

+    @Override
+    public boolean isEnablePingMessages() {
+        return enablePingMessages;
+    }
+
    @Override
    public boolean isJoinNotifications() {
        return joinNotifications;
@@ -492,14 +494,20 @@ public class Settings implements ISettings {
        return config;
    }

-    public List<String> getPingMessages() {
+    public List<Component> getPingMessages() {
        return pingMessages;
    }

-    /**
-     * May be null
-     */
-    public List<String> getTimerSpecificPingMessages() {
+    public List<String> getCommandsOnMaintenanceEnable() {
+        return commandsOnMaintenanceEnable;
+    }
+
+    public List<String> getCommandsOnMaintenanceDisable() {
+        return commandsOnMaintenanceDisable;
+    }
+
+    @Nullable
+    public List<Component> getTimerSpecificPingMessages() {
        return timerSpecificPingMessages;
    }

@@ -507,16 +515,22 @@ public class Settings implements ISettings {
        return broadcastIntervals;
    }

+    // Yikeseroo
    public String getPlayerCountMessage() {
-        return plugin.formatedTimer(playerCountMessage);
+        return LegacyComponentSerializer.legacySection().serialize(plugin.replacePingVariables(playerCountMessage));
    }

-    public String getPlayerCountHoverMessage() {
-        return plugin.formatedTimer(playerCountHoverMessage);
+    public String[] getPlayerCountHoverLines() {
+        final String[] lines = new String[playerCountHoverLines.size()];
+        for (int i = 0; i < playerCountHoverLines.size(); i++) {
+            final Component component = plugin.replacePingVariables(playerCountHoverLines.get(i));
+            lines[i] = LegacyComponentSerializer.legacySection().serialize(component);
+        }
+        return lines;
    }

-    public String getKickMessage() {
-        return plugin.formatedTimer(getMessage("kickmessage", "§cThe server is currently under maintenance!%NEWLINE%§cTry again later!").replace("%NEWLINE%", "\n"));
+    public Component getKickMessage() {
+        return plugin.replacePingVariables(getMessage("kickmessage"));
    }

    public String getLanguage() {
@@ -527,6 +541,20 @@ public class Settings implements ISettings {
        return customPlayerCountMessage;
    }

+    /*
+     * Note on why this even exists: Yaml will force save all strings containing line breaks '\n' in this rather chunky format:
+     *   key: |-
+     *     First line text
+     *      Second line text.
+     *      ...
+     *
+     * This also happens to string lists, making those practically unreadable (in particular the motd list), as well as confusing for most users in general.
+     * Because of this, I replace <br> manually, to spare users from these ugly breaks (before I inevitably switch to a different configuration library).
+     */
+    protected String replaceNewlineVar(final String s) {
+        return s.replace(NEW_LINE_REPLACEMENT, "\n");
+    }
+
    protected void loadExtraSettings() {
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,13 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.util.SenderInfo;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import org.jetbrains.annotations.Nullable;

 import java.util.Collections;
 import java.util.List;
@@ -29,19 +30,29 @@ public abstract class CommandInfo {
    protected final MaintenancePlugin plugin;
    private final String helpMessageKey;
    private final String permission;
+    private final boolean visible;

-    protected CommandInfo(final MaintenancePlugin plugin, final String permission) {
+    protected CommandInfo(final MaintenancePlugin plugin, @Nullable final String permission) {
+        this(plugin, permission, true);
+    }
+
+    protected CommandInfo(final MaintenancePlugin plugin, @Nullable final String permission, final boolean visible) {
        this.plugin = plugin;
        this.permission = permission;
        // Just take the class name as the language key
        this.helpMessageKey = "help" + getClass().getSimpleName().replace("Command", "");
+        this.visible = visible;
    }

    public boolean hasPermission(final SenderInfo sender) {
        return sender.hasMaintenancePermission(permission);
    }

-    public String getHelpMessage() {
+    public boolean isVisible() {
+        return visible;
+    }
+
+    public Component getHelpMessage() {
        return getMessage(helpMessageKey);
    }

@@ -53,7 +64,7 @@ public abstract class CommandInfo {

    protected boolean checkPermission(final SenderInfo sender, final String permission) {
        if (!sender.hasMaintenancePermission(permission)) {
-            sender.sendMessage(getMessage("noPermission"));
+            sender.send(getMessage("noPermission"));
            return true;
        }
        return false;
@@ -61,14 +72,14 @@ public abstract class CommandInfo {

    protected boolean checkArgs(final SenderInfo sender, final String[] args, final int length) {
        if (args.length != length) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
            return true;
        }
        return false;
    }

-    protected String getMessage(final String s) {
-        return plugin.getSettings().getMessage(s);
+    protected Component getMessage(final String path, final String... replacements) {
+        return plugin.getSettings().getMessage(path, replacements);
    }

    protected Settings getSettings() {
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,16 +15,34 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
-import eu.kennytv.maintenance.core.command.subcommand.*;
+import eu.kennytv.maintenance.core.command.subcommand.AbortTimerCommand;
+import eu.kennytv.maintenance.core.command.subcommand.DebugCommand;
+import eu.kennytv.maintenance.core.command.subcommand.DumpCommand;
+import eu.kennytv.maintenance.core.command.subcommand.EndtimerCommand;
+import eu.kennytv.maintenance.core.command.subcommand.HelpCommand;
+import eu.kennytv.maintenance.core.command.subcommand.MotdCommand;
+import eu.kennytv.maintenance.core.command.subcommand.ReloadCommand;
+import eu.kennytv.maintenance.core.command.subcommand.RemoveMotdCommand;
+import eu.kennytv.maintenance.core.command.subcommand.ScheduleTimerCommand;
+import eu.kennytv.maintenance.core.command.subcommand.SetMotdCommand;
+import eu.kennytv.maintenance.core.command.subcommand.StarttimerCommand;
+import eu.kennytv.maintenance.core.command.subcommand.ToggleCommand;
+import eu.kennytv.maintenance.core.command.subcommand.UpdateCommand;
+import eu.kennytv.maintenance.core.command.subcommand.WhitelistAddCommand;
+import eu.kennytv.maintenance.core.command.subcommand.WhitelistCommand;
+import eu.kennytv.maintenance.core.command.subcommand.WhitelistRemoveCommand;
 import eu.kennytv.maintenance.core.util.SenderInfo;
 import eu.kennytv.maintenance.core.util.ServerType;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;

 public abstract class MaintenanceCommand {
    protected final MaintenancePlugin plugin;
@@ -55,6 +73,7 @@ public abstract class MaintenanceCommand {

        add(new UpdateCommand(plugin), "update", "forceupdate");
        add(new DumpCommand(plugin), "dump");
+        add(new DebugCommand(plugin), "debug");
    }

    protected void add(final CommandInfo command, final String... aliases) {
@@ -66,7 +85,7 @@ public abstract class MaintenanceCommand {

    public void execute(final SenderInfo sender, final String[] args) {
        if (!sender.hasMaintenancePermission("command")) {
-            sender.sendMessage(settings.getMessage("noPermission"));
+            sender.send(settings.getMessage("noPermission"));
            return;
        }
        if (args.length == 0) {
@@ -80,7 +99,7 @@ public abstract class MaintenanceCommand {
            return;
        }
        if (!command.hasPermission(sender)) {
-            sender.sendMessage(settings.getMessage("noPermission"));
+            sender.send(settings.getMessage("noPermission"));
            return;
        }

@@ -94,7 +113,8 @@ public abstract class MaintenanceCommand {
            final List<String> list = new ArrayList<>();
            for (final Map.Entry<String, CommandInfo> entry : commandExecutors.entrySet()) {
                final String command = entry.getKey();
-                if (command.startsWith(s) && entry.getValue().hasPermission(sender)) {
+                final CommandInfo info = entry.getValue();
+                if (info.isVisible() && command.startsWith(s) && info.hasPermission(sender)) {
                    list.add(command);
                }
            }
@@ -109,18 +129,18 @@ public abstract class MaintenanceCommand {
        if (!plugin.isNumeric(time)) return true;
        if (taskCheck) {
            if (plugin.isTaskRunning()) {
-                sender.sendMessage(settings.getMessage("timerAlreadyRunning"));
+                sender.send(settings.getMessage("timerAlreadyRunning"));
                return true;
            }
        }

        final int minutes = Integer.parseInt(time);
        if (minutes > 40320) {
-            sender.sendMessage(settings.getMessage("timerTooLong"));
+            sender.send(settings.getMessage("timerTooLong"));
            return true;
        }
        if (minutes < 1) {
-            sender.sendMessage("§8§o[KennyTV whispers to you] §7§oThink about running a timer for a negative amount of minutes. Doesn't work §lthat §7§owell.");
+            sender.sendMessage("§8§o[kennytv whispers to you] §7§oThink about running a timer for a negative amount of minutes. Doesn't work §lthat §7§owell.");
            return true;
        }
        return false;
@@ -135,6 +155,7 @@ public abstract class MaintenanceCommand {

        add(new StarttimerCommand(plugin), "starttimer", "start");
        add(new EndtimerCommand(plugin), "endtimer", "end");
+        add(new ScheduleTimerCommand(plugin), "scheduletimer", "schedule");
        add(new AbortTimerCommand(plugin), "aborttimer", "abort");
    }

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
@@ -31,16 +30,16 @@ public final class AbortTimerCommand extends CommandInfo {
    @Override
    public void execute(final SenderInfo sender, final String[] args) {
        if (args.length != 1) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
            return;
        }

        if (!plugin.isTaskRunning()) {
-            sender.sendMessage(getMessage("timerNotRunning"));
+            sender.send(getMessage("timerNotRunning"));
            return;
        }

        plugin.cancelTask();
-        sender.sendMessage(getMessage("timerCancelled"));
+        sender.send(getMessage("timerCancelled"));
    }
 }
@@ -0,0 +1,37 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.core.command.subcommand;
+
+import eu.kennytv.maintenance.core.MaintenancePlugin;
+import eu.kennytv.maintenance.core.command.CommandInfo;
+import eu.kennytv.maintenance.core.util.SenderInfo;
+
+public final class DebugCommand extends CommandInfo {
+
+    public DebugCommand(final MaintenancePlugin plugin) {
+        super(plugin, "debug", false);
+    }
+
+    @Override
+    public void execute(final SenderInfo sender, final String[] args) {
+        if (checkArgs(sender, args, 1)) return;
+
+        plugin.setDebug(!plugin.isDebug());
+        sender.sendMessage("Debug mode is now " + (plugin.isDebug() ? "enabled" : "disabled"));
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
@@ -44,15 +43,17 @@ public final class DumpCommand extends CommandInfo {
        plugin.async(() -> {
            final String key = plugin.pasteDump();
            if (key == null) {
-                if (sender.isPlayer())
+                if (sender.isPlayer()) {
                    sender.sendMessage(plugin.getPrefix() + "§cCould not paste dump (see the console for details)");
+                }
                return;
            }

-            final String url = "https://hasteb.in/" + key;
+            final String url = "https://hastebin.com/" + key;
            sender.sendMessage(plugin.getPrefix() + "§c" + url);
-            if (sender.isPlayer())
+            if (sender.isPlayer()) {
                plugin.getCommandManager().sendDumpMessage(sender, url);
+            }
        });
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,13 +15,14 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.command.CommandInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;

+import java.util.concurrent.TimeUnit;
+
 public final class EndtimerCommand extends CommandInfo {

    public EndtimerCommand(final MaintenancePlugin plugin) {
@@ -32,15 +33,15 @@ public final class EndtimerCommand extends CommandInfo {
    public void execute(final SenderInfo sender, final String[] args) {
        if (checkArgs(sender, args, 2)) return;
        if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
            return;
        }
        if (!plugin.isMaintenance()) {
-            sender.sendMessage(getMessage("alreadyDisabled"));
+            sender.send(getMessage("alreadyDisabled"));
            return;
        }

-        plugin.startMaintenanceRunnableForMinutes(Integer.parseInt(args[1]), false);
-        sender.sendMessage(getMessage("endtimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+        plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, false);
+        sender.send(getMessage("endtimerStarted", "%TIME%", plugin.getRunnable().getTime()));
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,13 +15,13 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import com.google.common.base.Preconditions;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.command.CommandInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;

 import java.util.ArrayList;
 import java.util.List;
@@ -36,21 +36,22 @@ public final class HelpCommand extends CommandInfo {
    @Override
    public void execute(final SenderInfo sender, final String[] args) {
        if (args.length > 2) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
            return;
        }

        if (args.length == 1) {
            sendUsage(sender);
-        } else {
-            if (!plugin.isNumeric(args[1])) {
-                sender.sendMessage(getHelpMessage());
-                return;
-            }
-
-            final int page = Integer.parseInt(args[1]);
-            sendUsage(sender, page == 0 ? 1 : page);
+            return;
        }
+
+        if (!plugin.isNumeric(args[1])) {
+            sender.send(getHelpMessage());
+            return;
+        }
+
+        final int page = Integer.parseInt(args[1]);
+        sendUsage(sender, page == 0 ? 1 : page);
    }

    public void sendUsage(final SenderInfo sender) {
@@ -59,36 +60,37 @@ public final class HelpCommand extends CommandInfo {

    public void sendUsage(final SenderInfo sender, final int page) {
        Preconditions.checkArgument(page > 0);
-        final List<String> commands = new ArrayList<>();
+        final List<Component> commands = new ArrayList<>();
        for (final CommandInfo cmd : plugin.getCommandManager().getCommands()) {
-            if (cmd.hasPermission(sender)) {
+            if (cmd.isVisible() && cmd.hasPermission(sender)) {
                commands.add(cmd.getHelpMessage());
            }
        }
        if ((page - 1) * COMMANDS_PER_PAGE >= commands.size()) {
-            sender.sendMessage(getMessage("helpPageNotFound"));
+            sender.send(getMessage("helpPageNotFound"));
            return;
        }

-        final List<String> filteredCommands;
-        if (page * COMMANDS_PER_PAGE >= commands.size())
-            filteredCommands = commands.subList((page - 1) * COMMANDS_PER_PAGE, commands.size());
-        else
-            filteredCommands = commands.subList((page - 1) * COMMANDS_PER_PAGE, page * COMMANDS_PER_PAGE);
+        final List<Component> filteredCommands = commands.subList((page - 1) * COMMANDS_PER_PAGE, Math.min(page * COMMANDS_PER_PAGE, commands.size()));

-        final String header = getMessage("helpHeader").replace("%NAME%", "Maintenance" + plugin.getServerType())
-                .replace("%PAGE%", Integer.toString(page)).replace("%MAX%", Integer.toString((commands.size() + getDivide(commands.size())) / COMMANDS_PER_PAGE));
-        sender.sendMessage("");
-        sender.sendMessage(header);
-        for (final String command : filteredCommands) {
-            sender.sendMessage(command);
+        final Component header = getMessage("helpHeader",
+                "%NAME%", "Maintenance" + plugin.getServerType(),
+                "%PAGE%", Integer.toString(page),
+                "%MAX%", Integer.toString((commands.size() + getDivide(commands.size())) / COMMANDS_PER_PAGE));
+        sender.send(Component.empty());
+        sender.send(header);
+        for (final Component command : filteredCommands) {
+            sender.send(command);
        }
-        if (page * COMMANDS_PER_PAGE < commands.size())
-            sender.sendMessage(getMessage("helpNextPage").replace("%PAGE%", Integer.toString(page + 1)));
-        else
-            sender.sendMessage("§8× §eVersion " + plugin.getVersion() + " §7by §bKennyTV");
-        sender.sendMessage(header);
-        sender.sendMessage("");
+
+        if (page * COMMANDS_PER_PAGE < commands.size()) {
+            sender.send(getMessage("helpNextPage", "%PAGE%", Integer.toString(page + 1)));
+        } else {
+            sender.sendMessage("§8× §eVersion " + plugin.getVersion() + " §7by §bkennytv");
+        }
+
+        sender.send(header);
+        sender.send(Component.empty());
    }

    private int getDivide(final int size) {
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,13 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.command.CommandInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;

 import java.util.Collections;
 import java.util.List;
@@ -37,27 +38,26 @@ public final class MotdCommand extends CommandInfo {
            sendList(sender, getSettings().getPingMessages());
        } else if (args.length == 2 && args[1].equalsIgnoreCase("timer")) {
            if (!getSettings().hasTimerSpecificPingMessages()) {
-                sender.sendMessage(getMessage("timerMotdDisabled"));
+                sender.send(getMessage("timerMotdDisabled"));
                return;
            }

            sendList(sender, getSettings().getTimerSpecificPingMessages());
-        } else
-            sender.sendMessage(getHelpMessage());
+        } else {
+            sender.send(getHelpMessage());
+        }
    }

-    private void sendList(final SenderInfo sender, final List<String> list) {
+    private void sendList(final SenderInfo sender, final List<Component> list) {
        if (list == null || list.isEmpty()) {
-            sender.sendMessage(getMessage("motdListEmpty"));
+            sender.send(getMessage("motdListEmpty"));
            return;
        }

-        sender.sendMessage(getMessage("motdList"));
+        sender.send(getMessage("motdList"));
        for (int i = 0; i < list.size(); i++) {
            sender.sendMessage("§b" + (i + 1) + "§8§m---------");
-            for (final String motd : getSettings().getColoredString(list.get(i)).split("%NEWLINE%")) {
-                sender.sendMessage(motd);
-            }
+            sender.send(list.get(i));
        }
        sender.sendMessage("§8§m----------");
    }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
@@ -32,6 +31,6 @@ public final class ReloadCommand extends CommandInfo {
    public void execute(final SenderInfo sender, final String[] args) {
        if (checkArgs(sender, args, 1)) return;
        getSettings().reloadConfigs();
-        sender.sendMessage(getMessage("reload"));
+        sender.send(getMessage("reload"));
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,13 +15,13 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 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.util.SenderInfo;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;

 import java.util.ArrayList;
 import java.util.Collections;
@@ -38,7 +38,7 @@ public final class RemoveMotdCommand extends CommandInfo {
        boolean timerPingMessages = false;
        if (args.length == 3 && args[1].equalsIgnoreCase("timer")) {
            if (!getSettings().hasTimerSpecificPingMessages()) {
-                sender.sendMessage(getMessage("timerMotdDisabled"));
+                sender.send(getMessage("timerMotdDisabled"));
                return;
            }

@@ -47,28 +47,31 @@ public final class RemoveMotdCommand extends CommandInfo {
        }
        if (checkArgs(sender, args, 2)) return;
        if (!plugin.isNumeric(args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
            return;
        }

        final Settings settings = getSettings();
-        final List<String> pingMessages = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        final List<String> pingMessages = settings.getConfig().getStringList(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages");
        if (pingMessages.size() < 2) {
-            sender.sendMessage(getMessage("removeMotdError"));
+            sender.send(getMessage("removeMotdError"));
            return;
        }

        final int index = Integer.parseInt(args[1]);
        if (index == 0 || index > pingMessages.size()) {
-            sender.sendMessage(getMessage("setMotdIndexError").replace("%MOTDS%", Integer.toString(pingMessages.size()))
-                    .replace("%NEWAMOUNT%", Integer.toString(pingMessages.size())));
+            sender.send(getMessage("setMotdIndexError",
+                    "%MOTDS%", Integer.toString(pingMessages.size()),
+                    "%NEWAMOUNT%", Integer.toString(pingMessages.size())));
            return;
        }

+        final List<Component> pingComponents = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        pingComponents.remove(index - 1);
        pingMessages.remove(index - 1);
        settings.getConfig().set(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages", pingMessages);
        settings.saveConfig();
-        sender.sendMessage(getMessage("removedMotd").replace("%INDEX%", args[1]));
+        sender.send(getMessage("removedMotd", "%INDEX%", args[1]));
    }

    @Override
@@ -77,7 +80,7 @@ public final class RemoveMotdCommand extends CommandInfo {
            final int size = (args.length == 3 ? plugin.getSettings().getTimerSpecificPingMessages() : plugin.getSettings().getPingMessages()).size();
            final List<String> list = new ArrayList<>(size);
            for (int i = 1; i <= size; i++) {
-                list.add(String.valueOf(i));
+                list.add(Integer.toString(i));
            }
            return list;
        }
@@ -0,0 +1,48 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.core.command.subcommand;
+
+import eu.kennytv.maintenance.core.MaintenancePlugin;
+import eu.kennytv.maintenance.core.command.CommandInfo;
+import eu.kennytv.maintenance.core.util.SenderInfo;
+
+import java.util.concurrent.TimeUnit;
+
+public final class ScheduleTimerCommand extends CommandInfo {
+
+    public ScheduleTimerCommand(final MaintenancePlugin plugin) {
+        super(plugin, "timer");
+    }
+
+    @Override
+    public void execute(final SenderInfo sender, final String[] args) {
+        if (checkArgs(sender, args, 3)) return;
+        if (plugin.getCommandManager().checkTimerArgs(sender, args[1])
+                || plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
+            sender.send(getHelpMessage());
+            return;
+        }
+        if (plugin.isMaintenance()) {
+            sender.send(getMessage("alreadyEnabled"));
+            return;
+        }
+
+        plugin.scheduleMaintenanceRunnable(Integer.parseInt(args[1]), Integer.parseInt(args[2]), TimeUnit.MINUTES);
+        sender.send(getMessage("starttimerStarted", "%TIME%", plugin.getRunnable().getTime()));
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,19 +15,22 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 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.util.SenderInfo;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.minimessage.MiniMessage;

 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

+import static eu.kennytv.maintenance.core.Settings.NEW_LINE_REPLACEMENT;
+
 public final class SetMotdCommand extends CommandInfo {

    public SetMotdCommand(final MaintenancePlugin plugin) {
@@ -39,7 +42,7 @@ public final class SetMotdCommand extends CommandInfo {
        boolean timerPingMessages = false;
        if (args.length > 1 && args[1].equalsIgnoreCase("timer")) {
            if (!getSettings().hasTimerSpecificPingMessages()) {
-                sender.sendMessage(getMessage("timerMotdDisabled"));
+                sender.send(getMessage("timerMotdDisabled"));
                return;
            }

@@ -48,27 +51,29 @@ public final class SetMotdCommand extends CommandInfo {
            timerPingMessages = true;
        }
        if (args.length < 4 || !plugin.isNumeric(args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
            return;
        }

        final Settings settings = getSettings();
-        final List<String> pingMessages = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        final List<Component> pingComponents = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        final List<String> pingMessages = settings.getConfig().getStringList(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages");
        final int index = Integer.parseInt(args[1]);
        if (index == 0 || index > pingMessages.size() + 1) {
-            sender.sendMessage(getMessage("setMotdIndexError").replace("%MOTDS%", Integer.toString(pingMessages.size()))
-                    .replace("%NEWAMOUNT%", Integer.toString(pingMessages.size() + 1)));
+            sender.send(getMessage("setMotdIndexError",
+                    "%MOTDS%", Integer.toString(pingMessages.size()),
+                    "%NEWAMOUNT%", Integer.toString(pingMessages.size() + 1)));
            return;
        }

        if (!plugin.isNumeric(args[2])) {
-            sender.sendMessage(getMessage("setMotdLineError"));
+            sender.send(getMessage("setMotdLineError"));
            return;
        }

        final int line = Integer.parseInt(args[2]);
        if (line != 1 && line != 2) {
-            sender.sendMessage(getMessage("setMotdLineError"));
+            sender.send(getMessage("setMotdLineError"));
            return;
        }

@@ -76,21 +81,28 @@ public final class SetMotdCommand extends CommandInfo {
        final String oldMessage = index > pingMessages.size() ? "" : pingMessages.get(index - 1);
        final String newMessage;
        if (line == 1) {
-            newMessage = oldMessage.contains("%NEWLINE%") ?
-                    message + "%NEWLINE%" + oldMessage.split("%NEWLINE%", 2)[1] : message;
+            newMessage = oldMessage.contains(NEW_LINE_REPLACEMENT) ?
+                    message + NEW_LINE_REPLACEMENT + oldMessage.split(NEW_LINE_REPLACEMENT, 2)[1] : message;
        } else {
-            newMessage = oldMessage.contains("%NEWLINE%") ?
-                    oldMessage.split("%NEWLINE%", 2)[0] + "%NEWLINE%" + message : oldMessage + "%NEWLINE%" + message;
+            newMessage = oldMessage.contains(NEW_LINE_REPLACEMENT) ?
+                    oldMessage.split(NEW_LINE_REPLACEMENT, 2)[0] + NEW_LINE_REPLACEMENT + message : oldMessage + NEW_LINE_REPLACEMENT + message;
        }

-        if (index > pingMessages.size())
+        // Replace component in config and the cached list
+        final Component component = MiniMessage.miniMessage().deserialize(newMessage.replace(NEW_LINE_REPLACEMENT, "\n"));
+        if (index > pingMessages.size()) {
            pingMessages.add(newMessage);
-        else
+            pingComponents.add(component);
+        } else {
            pingMessages.set(index - 1, newMessage);
+            pingComponents.set(index - 1, component);
+        }
+
        settings.getConfig().set(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages", pingMessages);
        settings.saveConfig();
-        sender.sendMessage(settings.getMessage("setMotd").replace("%LINE%", args[2]).replace("%INDEX%", args[1])
-                .replace("%MOTD%", "§f" + settings.getColoredString(message)));
+        sender.send(settings.getMessage("setMotd",
+                "%LINE%", args[2],
+                "%INDEX%", args[1]).replaceText(builder -> builder.matchLiteral("%MOTD%").replacement(component)));
    }

    @Override
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,13 +15,14 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.command.CommandInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;

+import java.util.concurrent.TimeUnit;
+
 public final class StarttimerCommand extends CommandInfo {

    public StarttimerCommand(final MaintenancePlugin plugin) {
@@ -32,15 +33,15 @@ public final class StarttimerCommand extends CommandInfo {
    public void execute(final SenderInfo sender, final String[] args) {
        if (checkArgs(sender, args, 2)) return;
        if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
            return;
        }
        if (plugin.isMaintenance()) {
-            sender.sendMessage(getMessage("alreadyEnabled"));
+            sender.send(getMessage("alreadyEnabled"));
            return;
        }

-        plugin.startMaintenanceRunnableForMinutes(Integer.parseInt(args[1]), true);
-        sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+        plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, true);
+        sender.send(getMessage("starttimerStarted", "%TIME%", plugin.getRunnable().getTime()));
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
@@ -34,7 +33,7 @@ public final class ToggleCommand extends CommandInfo {

        final boolean maintenance = args[0].equalsIgnoreCase("on");
        if (maintenance == plugin.isMaintenance()) {
-            sender.sendMessage(getMessage(maintenance ? "alreadyEnabled" : "alreadyDisabled"));
+            sender.send(getMessage(maintenance ? "alreadyEnabled" : "alreadyDisabled"));
            return;
        }

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
@@ -45,11 +44,12 @@ public final class UpdateCommand extends CommandInfo {
                return;
            }

-            sender.sendMessage(getMessage("updateDownloading"));
-            if (plugin.installUpdate())
-                sender.sendMessage(getMessage("updateFinished"));
-            else
-                sender.sendMessage(getMessage("updateFailed"));
+            sender.send(getMessage("updateDownloading"));
+            if (plugin.installUpdate()) {
+                sender.send(getMessage("updateFinished"));
+            } else {
+                sender.send(getMessage("updateFailed"));
+            }
        }
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,11 +15,11 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.command.CommandInfo;
+import eu.kennytv.maintenance.core.util.DummySenderInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;

 import java.util.Collections;
@@ -34,13 +34,28 @@ public final class WhitelistAddCommand extends CommandInfo {

    @Override
    public void execute(final SenderInfo sender, final String[] args) {
-        if (checkArgs(sender, args, 2)) return;
-        if (args[1].length() == 36) {
+        if (args.length == 2) {
+            if (args[1].length() == 36) {
+                final UUID uuid = plugin.checkUUID(sender, args[1]);
+                if (uuid != null) {
+                    addPlayerToWhitelist(sender, uuid);
+                }
+            } else {
+                addPlayerToWhitelist(sender, args[1]);
+            }
+        } else if (args.length == 3) {
+            if (args[1].length() != 36) {
+                sender.send(getHelpMessage());
+                return;
+            }
+
            final UUID uuid = plugin.checkUUID(sender, args[1]);
-            if (uuid != null)
-                addPlayerToWhitelist(sender, uuid);
-        } else
-            addPlayerToWhitelist(sender, args[1]);
+            if (uuid != null) {
+                addPlayerToWhitelist(sender, new DummySenderInfo(uuid, args[2]));
+            }
+        } else {
+            sender.send(getHelpMessage());
+        }
    }

    @Override
@@ -49,29 +64,32 @@ public final class WhitelistAddCommand extends CommandInfo {
    }

    private void addPlayerToWhitelist(final SenderInfo sender, final String name) {
-        final SenderInfo selected = plugin.getOfflinePlayer(name);
-        if (selected == null) {
-            sender.sendMessage(getMessage("playerNotOnline"));
-            return;
-        }
+        plugin.getOfflinePlayer(name, selected -> {
+            if (selected == null) {
+                sender.send(getMessage("playerNotOnline"));
+                return;
+            }

-        whitelistAddMessage(sender, selected);
+            addPlayerToWhitelist(sender, selected);
+        });
    }

    private void addPlayerToWhitelist(final SenderInfo sender, final UUID uuid) {
-        final SenderInfo selected = plugin.getOfflinePlayer(uuid);
-        if (selected == null) {
-            sender.sendMessage(getMessage("playerNotFoundUuid"));
-            return;
-        }
+        plugin.getOfflinePlayer(uuid, selected -> {
+            if (selected == null) {
+                sender.send(getMessage("playerNotFoundUuid"));
+                return;
+            }

-        whitelistAddMessage(sender, selected);
+            addPlayerToWhitelist(sender, selected);
+        });
    }

-    private void whitelistAddMessage(final SenderInfo sender, final SenderInfo selected) {
-        if (getSettings().addWhitelistedPlayer(selected.getUuid(), selected.getName()))
-            sender.sendMessage(getMessage("whitelistAdded").replace("%PLAYER%", selected.getName()));
-        else
-            sender.sendMessage(getMessage("whitelistAlreadyAdded").replace("%PLAYER%", selected.getName()));
+    private void addPlayerToWhitelist(final SenderInfo sender, final SenderInfo selected) {
+        if (getSettings().addWhitelistedPlayer(selected.getUuid(), selected.getName())) {
+            sender.send(getMessage("whitelistAdded", "%PLAYER%", selected.getName()));
+        } else {
+            sender.send(getMessage("whitelistAlreadyAdded", "%PLAYER%", selected.getName()));
+        }
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,12 +15,12 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.command.CommandInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;

 import java.util.Map;
 import java.util.UUID;
@@ -37,14 +37,17 @@ public final class WhitelistCommand extends CommandInfo {

        final Map<UUID, String> players = getSettings().getWhitelistedPlayers();
        if (players.isEmpty()) {
-            sender.sendMessage(getMessage("whitelistEmpty"));
-        } else {
-            sender.sendMessage(getMessage("whitelistedPlayers"));
-            final String format = getMessage("whitelistedPlayersFormat");
-            for (final Map.Entry<UUID, String> entry : players.entrySet()) {
-                sender.sendMessage(format.replace("%NAME%", entry.getValue()).replace("%UUID%", entry.getKey().toString()));
-            }
-            sender.sendMessage("");
+            sender.send(getMessage("whitelistEmpty"));
+            return;
        }
+
+        sender.send(getMessage("whitelistedPlayers"));
+        final Component format = getMessage("whitelistedPlayersFormat");
+        for (final Map.Entry<UUID, String> entry : players.entrySet()) {
+            sender.send(format.replaceText(builder -> builder.matchLiteral("%NAME%").replacement(entry.getValue()))
+                    .replaceText(builder -> builder.matchLiteral("%UUID%").replacement(entry.getKey().toString())));
+        }
+
+        sender.send(Component.empty());
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.command.subcommand;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
@@ -38,10 +37,12 @@ public final class WhitelistRemoveCommand extends CommandInfo {
        if (checkArgs(sender, args, 2)) return;
        if (args[1].length() == 36) {
            final UUID uuid = plugin.checkUUID(sender, args[1]);
-            if (uuid != null)
+            if (uuid != null) {
                removePlayerFromWhitelist(sender, uuid);
-        } else
+            }
+        } else {
            removePlayerFromWhitelist(sender, args[1]);
+        }
    }

    @Override
@@ -58,30 +59,35 @@ public final class WhitelistRemoveCommand extends CommandInfo {
    }

    private void removePlayerFromWhitelist(final SenderInfo sender, final String name) {
-        final SenderInfo selected = plugin.getOfflinePlayer(name);
-        if (selected == null) {
-            if (getSettings().removeWhitelistedPlayer(name))
-                sender.sendMessage(getMessage("whitelistRemoved").replace("%PLAYER%", name));
-            else
-                sender.sendMessage(getMessage("whitelistNotFound"));
-            return;
-        }
+        plugin.getOfflinePlayer(name, selected -> {
+            if (selected == null) {
+                if (getSettings().removeWhitelistedPlayer(name)) {
+                    sender.send(getMessage("whitelistRemoved", "%PLAYER%", name));
+                } else {
+                    sender.send(getMessage("whitelistNotFound"));
+                }
+                return;
+            }

-        whitelistRemoveMessage(sender, selected.getUuid(), selected.getName());
+            removePlayerFromWhitelist(sender, selected.getUuid(), selected.getName());
+        });
    }

    private void removePlayerFromWhitelist(final SenderInfo sender, final UUID uuid) {
-        final SenderInfo selected = plugin.getOfflinePlayer(uuid);
-        if (selected == null)
-            whitelistRemoveMessage(sender, uuid, uuid.toString());
-        else
-            whitelistRemoveMessage(sender, selected.getUuid(), selected.getName());
+        plugin.getOfflinePlayer(uuid, selected -> {
+            if (selected == null) {
+                removePlayerFromWhitelist(sender, uuid, uuid.toString());
+            } else {
+                removePlayerFromWhitelist(sender, selected.getUuid(), selected.getName());
+            }
+        });
    }

-    private void whitelistRemoveMessage(final SenderInfo sender, final UUID uuid, final String toReplace) {
-        if (getSettings().removeWhitelistedPlayer(uuid))
-            sender.sendMessage(getMessage("whitelistRemoved").replace("%PLAYER%", toReplace));
-        else
-            sender.sendMessage(getMessage("whitelistNotFound"));
+    private void removePlayerFromWhitelist(final SenderInfo sender, final UUID uuid, final String toReplace) {
+        if (getSettings().removeWhitelistedPlayer(uuid)) {
+            sender.send(getMessage("whitelistRemoved", "%PLAYER%", toReplace));
+        } else {
+            sender.send(getMessage("whitelistNotFound"));
+        }
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,10 +15,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 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;

@@ -26,27 +26,33 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;

 /**
 * Further modified version of the SimpleConfig project of PSandro (https://github.com/PSandro/SimpleConfig).
 *
 * @author PSandro on 26.01.19
- * @author KennyTV
+ * @author kennytv
 */
 public final class Config extends ConfigSection {

    private static final String AWESOME_HEADER =
-            "#######################################################################################################################\n" +
-                    "#   __  __       _       _                                    _             _  __                     _______     __  #\n" +
-                    "#  |  \\/  | __ _(_)_ __ | |_ ___ _ __   __ _ _ __   ___ ___  | |__  _   _  | |/ /___ _ __  _ __  _   |_   _\\ \\   / /  #\n" +
-                    "#  | |\\/| |/ _` | | '_ \\| __/ _ \\ '_ \\ / _` | '_ \\ / __/ _ \\ | '_ \\| | | | | ' // _ \\ '_ \\| '_ \\| | | || |  \\ \\ / /   #\n" +
-                    "#  | |  | | (_| | | | | | ||  __/ | | | (_| | | | | (_|  __/ | |_) | |_| | | . \\  __/ | | | | | | |_| || |   \\ V /    #\n" +
-                    "#  |_|  |_|\\__,_|_|_| |_|\\__\\___|_| |_|\\__,_|_| |_|\\___\\___| |_.__/ \\__, | |_|\\_\\___|_| |_|_| |_|\\__, ||_|    \\_/     #\n" +
-                    "#                                                                   |___/                        |___/                #\n" +
-                    "#######################################################################################################################\n" +
-                    "# You can report bugs here: https://github.com/KennyTV/Maintenance/issues\n" +
-                    "# If you need any other help/support, you can also join my Discord server: https://discord.gg/vGCUzHq\n";
+            "###################################################################################################################\n" +
+                    "#   __  __       _       _                                    _             _                          _          #\n" +
+                    "#  |  \\/  | __ _(_)_ __ | |_ ___ _ __   __ _ _ __   ___ ___  | |__  _   _  | | _____ _ __  _ __  _   _| |___   __ #\n" +
+                    "#  | |\\/| |/ _` | | '_ \\| __/ _ \\ '_ \\ / _` | '_ \\ / __/ _ \\ | '_ \\| | | | | |/ / _ \\ '_ \\| '_ \\| | | | __\\ \\ / / #\n" +
+                    "#  | |  | | (_| | | | | | ||  __/ | | | (_| | | | | (_|  __/ | |_) | |_| | |   <  __/ | | | | | | |_| | |_ \\ V /  #\n" +
+                    "#  |_|  |_|\\__,_|_|_| |_|\\__\\___|_| |_|\\__,_|_| |_|\\___\\___| |_.__/ \\__, | |_|\\_\\___|_| |_|_| |_|\\__, |\\__| \\_/   #\n" +
+                    "#                                                                  |___/                        |___/             #\n" +
+                    "###################################################################################################################\n" +
+                    "# You can report bugs here: https://github.com/kennytv/Maintenance/issues\n" +
+                    "# If you need any other help/support, you can also join my Discord server: https://discord.gg/vGCUzHq\n" +
+                    "# 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.\n" +
+                    "# For a full list of formats and fancy examples of MiniMessage, see https://docs.adventure.kyori.net/minimessage/format.html\n";
    private final Yaml yaml = createYaml();
    private final File file;
    private final Set<String> unsupportedFields;
@@ -54,6 +60,7 @@ public final class Config extends ConfigSection {
    private String header;

    public Config(final File file, final String... unsupportedFields) {
+        super(null, "");
        this.file = file;
        this.unsupportedFields = unsupportedFields.length == 0 ? Collections.emptySet() : Sets.newHashSet(unsupportedFields);
    }
@@ -63,26 +70,27 @@ public final class Config extends ConfigSection {
        final Map<String, Object> map = yaml.load(data);
        this.values = map != null ? map : new LinkedHashMap<>();
        this.comments = ConfigSerializer.deserializeComments(data);
-        if (comments.containsKey(".header"))
-            this.header = String.join("\n", comments.remove(".header"));
+
+        final String[] header = comments.remove(".header");
+        if (header != null) {
+            this.header = String.join("\n", header);
+        }

        final boolean removedFields = values.keySet().removeIf(key -> {
            final String[] split = key.split("\\.");
            String splitKey = "";
-            boolean remove = false;
            for (final String s : split) {
                splitKey += s;
                if (!unsupportedFields.contains(splitKey)) {
                    splitKey += ".";
                    continue;
                }
-                remove = true;
-                break;
-            }

-            if (remove)
+                // Unsupported field
                comments.remove(key);
-            return remove;
+                return true;
+            }
+            return false;
        });
        if (removedFields) {
            save();
@@ -90,10 +98,16 @@ public final class Config extends ConfigSection {
    }

    public void save() throws IOException {
-        final byte[] bytes = this.saveConfigToString().getBytes(StandardCharsets.UTF_8);
-        this.file.getParentFile().mkdirs();
-        this.file.createNewFile();
-        Files.write(this.file.toPath(), bytes);
+        saveTo(file);
+    }
+
+    public void saveTo(final File file) throws IOException {
+        final byte[] bytes = toString().getBytes(StandardCharsets.UTF_8);
+        if (file.getParentFile() != null) {
+            file.getParentFile().mkdirs();
+        }
+        file.createNewFile();
+        Files.write(file.toPath(), bytes);
    }

    public boolean addMissingFields(final Map<String, Object> fields, final Map<String, String[]> comments) {
@@ -122,35 +136,15 @@ public final class Config extends ConfigSection {
        return changed;
    }

-    @Override
-    public void set(final String key, final Object value, final String... comments) {
-        if (value == null) {
-            remove(key);
-        } else {
-            this.values.put(key, value);
-            this.comments.put(key, comments);
-        }
-    }
-
-    @Override
-    public void remove(final String key) {
-        this.values.remove(key);
-        this.comments.remove(key);
-    }
-
    private static Yaml createYaml() {
        final DumperOptions options = new DumperOptions();
        options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
        options.setPrettyFlow(false);
        options.setIndent(2);
-        options.setWidth(10_000); // be sneaky because autobreak on read/save looks disgusting
+        options.setWidth(10_000); // be sneaky because autobreak on saving looks disgusting
        return new Yaml(options);
    }

-    public String saveConfigToString() {
-        return ConfigSerializer.serialize(this.header, this.values, this.comments, this.yaml);
-    }
-
    public void clear() {
        this.values.clear();
        this.comments.clear();
@@ -165,6 +159,12 @@ public final class Config extends ConfigSection {
        return unsupportedFields;
    }

+    @Override
+    public Config getRoot() {
+        return this;
+    }
+
+    @Nullable
    public String getHeader() {
        return header;
    }
@@ -172,4 +172,9 @@ public final class Config extends ConfigSection {
    public void resetAwesomeHeader() {
        this.header = AWESOME_HEADER;
    }
+
+    @Override
+    public String toString() {
+        return ConfigSerializer.serialize(this.header, this.values, this.comments, this.yaml);
+    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,9 +15,10 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.config;

+import org.jetbrains.annotations.Nullable;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,35 +27,61 @@ import java.util.Set;
 /**
 * Further modified version of the SimpleConfig project of PSandro (https://github.com/PSandro/SimpleConfig).
 *
- * @author KennyTV
+ * @author kennytv
 */
 public class ConfigSection {

+    protected final Config root;
+    protected final String currentPath;
    protected Map<String, Object> values;

-    ConfigSection() {
-        this(new HashMap<>());
+    ConfigSection(final Config root, final String currentPath) {
+        this(root, currentPath, new HashMap<>());
    }

-    ConfigSection(final Map<String, Object> values) {
+    ConfigSection(final Config root, final String currentPath, final Map<String, Object> values) {
+        this.root = root;
+        this.currentPath = currentPath;
        this.values = values;
    }

+    @Nullable
    public <E> E get(final String key) {
-        return (E) this.values.get(key);
+        return (E) getObject(key);
    }

-    public <E> E get(final String key, final E def) {
-        final Object o = this.values.get(key);
+    @Nullable
+    public <E> E get(final String key, @Nullable final E def) {
+        final Object o = getObject(key);
        return o != null ? (E) o : def;
    }

+    @Nullable
    public Object getObject(final String key) {
-        return this.values.get(key);
+        return getObject(key, null);
    }

-    public <E> E getOrSet(final String key, final E def) {
-        final Object o = this.values.get(key);
+    @Nullable
+    public Object getObject(final String key, final Object def) {
+        int i1 = -1;
+        int i2;
+        ConfigSection section = this;
+        while ((i1 = key.indexOf('.', i2 = i1 + 1)) != -1) {
+            section = section.getSection(key.substring(i2, i1));
+            if (section == null) return def;
+        }
+
+        final String subKey = key.substring(i2);
+        if (section == this) {
+            final Object result = values.get(subKey);
+            return result != null ? result : def;
+        }
+        return section.getObject(subKey, def);
+    }
+
+    @Nullable
+    public <E> E getOrSet(final String key, @Nullable final E def) {
+        final Object o = getObject(key);
        if (o != null) {
            return (E) o;
        } else {
@@ -63,50 +90,29 @@ public class ConfigSection {
        }
    }

-    /**
-     * Convenience method, not further established as currently not necessary.
-     *
-     * @see #getSection(String)
-     * @deprecated this config is only made for a quite simple use, only goes one level deeper
-     */
-    @Deprecated
-    public Object getDeep(final String key) {
-        final String[] split = key.split("\\.", 2);
-        if (split.length != 2) return get(key);
-
-        final Object o = getObject(split[0]);
-        if (!(o instanceof Map)) return null;
-
-        final Map<String, Object> map = (Map<String, Object>) o;
-        return map.get(split[1]);
-    }
-
+    @Nullable
    public ConfigSection getSection(final String key) {
        final Object o = getObject(key);
-        return o instanceof Map ? new ConfigSection((Map<String, Object>) o) : null;
+        if (!(o instanceof Map)) return null;
+        return new ConfigSection(getRoot(), getFullKeyInPath(key), (Map<String, Object>) o);
    }

    public boolean contains(final String key) {
-        return this.values.containsKey(key);
+        return getObject(key) != null;
    }

-    public void set(final String key, final Object value) {
+    public void set(final String key, @Nullable final Object value) {
+        //TODO go deep if necessary
        if (value == null) {
-            remove(key);
-        } else
-            this.values.put(key, value);
-    }
-
-    public void set(final String key, final Object value, final String... comments) {
-        if (value == null) {
-            remove(key);
+            values.remove(key);
+            getRoot().getComments().remove(getFullKeyInPath(key));
        } else {
-            this.values.put(key, value);
+            values.put(key, value);
        }
    }

    public void remove(final String key) {
-        this.values.remove(key);
+        set(key, null);
    }

    public Set<String> getKeys() {
@@ -122,16 +128,18 @@ public class ConfigSection {
    }

    public boolean getBoolean(final String key, final boolean def) {
-        final Object o = values.get(key);
+        final Object o = getObject(key);
        return o instanceof Boolean ? (boolean) o : def;
    }

+    @Nullable
    public String getString(final String key) {
        return get(key);
    }

-    public String getString(final String key, final String def) {
-        final Object o = get(key);
+    @Nullable
+    public String getString(final String key, @Nullable final String def) {
+        final Object o = getObject(key);
        return o instanceof String ? (String) o : def;
    }

@@ -140,7 +148,7 @@ public class ConfigSection {
    }

    public int getInt(final String key, final int def) {
-        final Object o = values.get(key);
+        final Object o = getObject(key);
        return o instanceof Number ? ((Number) o).intValue() : def;
    }

@@ -149,7 +157,7 @@ public class ConfigSection {
    }

    public double getDouble(final String key, final double def) {
-        final Object o = values.get(key);
+        final Object o = getObject(key);
        return o instanceof Number ? ((Number) o).doubleValue() : def;
    }

@@ -158,23 +166,47 @@ public class ConfigSection {
    }

    public long getLong(final String key, final long def) {
-        final Object o = values.get(key);
+        final Object o = getObject(key);
        return o instanceof Number ? ((Number) o).longValue() : def;
    }

+    @Nullable
    public List<String> getStringList(final String key) {
        return get(key);
    }

-    public List<String> getStringList(final String key, final List<String> def) {
-        return values.containsKey(key) ? get(key) : def;
+    @Nullable
+    public List<String> getStringList(final String key, @Nullable final List<String> def) {
+        final List<String> list = get(key);
+        return list != null ? list : def;
    }

+    @Nullable
    public List<Integer> getIntList(final String key) {
        return get(key);
    }

-    public List<Integer> getIntList(final String key, final List<Integer> def) {
-        return values.containsKey(key) ? get(key) : def;
+    @Nullable
+    public List<Integer> getIntList(final String key, @Nullable final List<Integer> def) {
+        final List<Integer> list = get(key);
+        return list != null ? list : def;
+    }
+
+    /**
+     * @return root config
+     */
+    public Config getRoot() {
+        return root;
+    }
+
+    /**
+     * @return current path, or empty string if root
+     */
+    public String getCurrentPath() {
+        return currentPath;
+    }
+
+    protected String getFullKeyInPath(final String key) {
+        return currentPath.isEmpty() ? key : currentPath + "." + key;
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.config;

 import org.yaml.snakeyaml.Yaml;
@@ -30,7 +29,7 @@ import java.util.regex.Pattern;
 * Further modified version of the SimpleConfig project of PSandro (https://github.com/PSandro/SimpleConfig).
 *
 * @author PSandro on 26.01.19
- * @author KennyTV
+ * @author kennytv
 */
 public final class ConfigSerializer {

@@ -40,7 +39,9 @@ public final class ConfigSerializer {
    private static final int INDENT_UNIT = 2;

    public static String serialize(final String header, final Map<String, Object> data, final Map<String, String[]> comments, final Yaml yaml) {
-        if (data.isEmpty()) return yaml.dump(null);
+        if (data.isEmpty()) {
+            return yaml.dump(null);
+        }

        final String rawYaml = yaml.dump(data);
        final StringBuilder fileData = new StringBuilder();
@@ -61,46 +62,60 @@ public final class ConfigSerializer {
                key = join(array, array.length - backspace);
                keyLine = true;
            } else {
-                keyLine = line.contains(":");
+                keyLine = line.indexOf(':') != -1;
            }

-            if (keyLine) {
-                final String newKey = substring.split(Pattern.quote(":"))[0]; // Not sure about the quote thing, so I'll just keep it :aaa:
-                if (!key.isEmpty())
-                    key += PATH_SEPARATOR_STRING;
-                key += newKey;
+            if (!keyLine) {
+                // Nothing to do, go to next line
+                fileData.append(line).append('\n');
+                continue;
+            }

+            final String newKey = substring.split(Pattern.quote(":"))[0]; // Not sure about the quote thing, so I'll just keep it :aaa:
+            if (!key.isEmpty()) {
+                key += PATH_SEPARATOR_STRING;
+            }
+            key += newKey;
+
+            // Add comments if present
+            if (comments != null) {
                final String[] strings = comments.get(key);
                if (strings != null) {
                    final String indentText = indent > 0 ? line.substring(0, indent) : "";
                    for (final String comment : strings) {
-                        if (comment.isEmpty())
+                        if (comment.isEmpty()) {
                            fileData.append('\n');
-                        else
+                        } else {
                            fileData.append(indentText).append(comment).append('\n');
+                        }
                    }
                }
-
-                currentKeyIndents = indents;
            }

+            currentKeyIndents = indents;
            fileData.append(line).append('\n');
        }
        return header != null && !header.isEmpty() ? header + fileData : fileData.toString();
    }

    public static Map<String, String[]> deserializeComments(final String data) {
+        //TODO go through known yaml keys and figure out comments from there instead of from line to line?
+        // ... tho everything here would benefit from a cleanup
        final Map<String, String[]> comments = new HashMap<>();
        final List<String> currentComments = new ArrayList<>();
        boolean header = true;
+        boolean multiLineValue = false;
        int currentIndents = 0;
        String key = "";
        for (final String line : data.split("\n")) {
            final String s = line.trim();
+            // It's a comment!
            if (s.startsWith("#")) {
                currentComments.add(s);
                continue;
            }
+
+            // Header is over - save it!
            if (header) {
                if (!currentComments.isEmpty()) {
                    currentComments.add("");
@@ -109,21 +124,39 @@ public final class ConfigSerializer {
                }
                header = false;
            }
+
+            // Save empty lines as well
            if (s.isEmpty()) {
                currentComments.add(s);
                continue;
            }

+            // Multi line values?
+            if (s.startsWith("- |")) {
+                multiLineValue = true;
+                continue;
+            }
+
            final int indent = getIndents(line);
            final int indents = indent / INDENT_UNIT;
+            // Check if the multi line value is over
+            if (multiLineValue) {
+                if (indents > currentIndents) continue;
+
+                multiLineValue = false;
+            }
+
+            // Check if this is a level lower
            if (indents <= currentIndents) {
                final String[] array = key.split(PATH_SEPARATOR_QUOTED);
                final int backspace = currentIndents - indents + 1;
-                key = join(array, array.length - backspace);
+                final int delta = array.length - backspace;
+                key = delta >= 0 ? join(array, delta) : key;
            }

+            // Finish current key
            final String separator = key.isEmpty() ? "" : PATH_SEPARATOR_STRING;
-            final String lineKey = line.contains(":") ? line.split(Pattern.quote(":"))[0] : line;
+            final String lineKey = line.indexOf(':') != -1 ? line.split(Pattern.quote(":"))[0] : line;
            key += separator + lineKey.substring(indent);
            currentIndents = indents;

@@ -138,8 +171,11 @@ public final class ConfigSerializer {
    private static int getIndents(final String line) {
        int count = 0;
        for (int i = 0; i < line.length(); i++) {
-            if (line.charAt(i) == ' ') count++;
-            else break;
+            if (line.charAt(i) != ' ') {
+                break;
+            }
+
+            count++;
        }
        return count;
    }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,10 +15,8 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.dump;

-import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
@@ -46,7 +44,7 @@ public final class MaintenanceDump {
        configuration.put("icon-exists", new File(plugin.getDataFolder(), "maintenance-icon.png").exists());

        final JsonObject jsonObject = new JsonObject();
-        jsonObject.add("plugins", new GsonBuilder().create().toJsonTree(plugin.getPlugins()));
+        jsonObject.add("plugins", MaintenancePlugin.GSON.toJsonTree(plugin.getPlugins()));
        plugins = jsonObject;
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.dump;

 import java.util.List;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.dump;

 import java.util.List;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,11 +15,9 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.event;

 import eu.kennytv.maintenance.api.event.manager.EventListener;
-import eu.kennytv.maintenance.api.event.manager.IEventManager;
 import eu.kennytv.maintenance.api.event.manager.MaintenanceEvent;

 import java.util.ArrayList;
@@ -27,7 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-public final class EventManager implements IEventManager {
+public final class EventManager implements eu.kennytv.maintenance.api.event.manager.EventManager {
    private final Map<String, List<EventListener>> listeners = new HashMap<>();

    @Override
@@ -35,6 +33,7 @@ public final class EventManager implements IEventManager {
        listeners.computeIfAbsent(eventClass.getSimpleName(), s -> new ArrayList<>()).add(listener);
    }

+    @Override
    public void callEvent(final MaintenanceEvent event) {
        final List<EventListener> list = listeners.get(event.getClass().getSimpleName());
        if (list != null) {
@@ -0,0 +1,53 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.core.hook;
+
+import eu.kennytv.maintenance.api.Maintenance;
+import net.luckperms.api.LuckPermsProvider;
+import net.luckperms.api.context.ContextCalculator;
+import net.luckperms.api.context.ContextConsumer;
+import net.luckperms.api.context.ContextSet;
+import net.luckperms.api.context.ImmutableContextSet;
+import org.jetbrains.annotations.NotNull;
+
+public final class LuckPermsHook {
+
+    public static <T> void register(final Maintenance maintenance) {
+        LuckPermsProvider.get().getContextManager().registerCalculator(new MaintenanceCalculator<T>(maintenance));
+    }
+
+    public static final class MaintenanceCalculator<T> implements ContextCalculator<T> {
+
+        public static final String MAINTENANCE_KEY = "is-maintenance";
+        private final Maintenance maintenance;
+
+        private MaintenanceCalculator(final Maintenance maintenance) {
+            this.maintenance = maintenance;
+        }
+
+        @Override
+        public void calculate(@NotNull final T target, @NotNull final ContextConsumer consumer) {
+            consumer.accept(MAINTENANCE_KEY, Boolean.toString(maintenance.isMaintenance()));
+        }
+
+        @Override
+        public ContextSet estimatePotentialContexts() {
+            return ImmutableContextSet.builder().add(MAINTENANCE_KEY, "true").add(MAINTENANCE_KEY, "false").build();
+        }
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.hook;

 import net.minecrell.serverlistplus.core.ServerListPlusCore;
@@ -25,8 +24,9 @@ public final class ServerListPlusHook {
    private final ServerListPlusCore serverListPlusCore;

    public ServerListPlusHook(final Object serverListPlus) {
-        if (!(serverListPlus instanceof ServerListPlusPlugin))
+        if (!(serverListPlus instanceof ServerListPlusPlugin)) {
            throw new IllegalArgumentException("Couldn't parse ServerListPlus instance!");
+        }
        this.serverListPlusCore = ((ServerListPlusPlugin) serverListPlus).getCore();
    }

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.listener;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
@@ -29,7 +28,6 @@ import java.util.UUID;
 public abstract class JoinListenerBase {
    protected final MaintenancePlugin plugin;
    protected final Settings settings;
-    protected final UUID notifyUuid = new UUID(-6334418481592579467L, -4779835342378829761L);
    private final Set<UUID> notifiedPlayers = new HashSet<>();

    protected JoinListenerBase(final MaintenancePlugin plugin, final Settings settings) {
@@ -59,14 +57,11 @@ public abstract class JoinListenerBase {
    }

    protected void updateCheck(final SenderInfo sender) {
-        if (sender.getUuid().equals(notifyUuid)) {
-            sender.sendMessage("§6Maintenance §aVersion " + plugin.getVersion());
-            return;
-        }
        if (!settings.hasUpdateChecks()) return;
        if (!sender.hasPermission("maintenance.admin") || notifiedPlayers.contains(sender.getUuid())) return;
        plugin.async(() -> {
            if (!plugin.updateAvailable()) return;
+
            notifiedPlayers.add(sender.getUuid());
            sender.sendMessage(plugin.getPrefix() + "§cThere is a newer version available: §aVersion " + plugin.getNewestVersion() + "§c, you're on §a" + plugin.getVersion());
            plugin.sendUpdateNotification(sender);
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,13 +15,13 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.runnable;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;

-public final class MaintenanceRunnable extends MaintenanceRunnableBase {
+public class MaintenanceRunnable extends MaintenanceRunnableBase {

    public MaintenanceRunnable(final MaintenancePlugin plugin, final Settings settings, final int seconds, final boolean enable) {
        super(plugin, settings, seconds, enable);
@@ -33,12 +33,12 @@ public final class MaintenanceRunnable extends MaintenanceRunnableBase {
    }

    @Override
-    protected String startMessageKey() {
-        return settings.getMessage("starttimerBroadcast").replace("%TIME%", getTime());
+    protected Component getStartMessage() {
+        return settings.getMessage("starttimerBroadcast", "%TIME%", getTime());
    }

    @Override
-    protected String endMessageKey() {
-        return settings.getMessage("endtimerBroadcast").replace("%TIME%", getTime());
+    protected Component getEndMessage() {
+        return settings.getMessage("endtimerBroadcast", "%TIME%", getTime());
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,18 +15,18 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 package eu.kennytv.maintenance.core.runnable;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.util.Task;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;

 public abstract class MaintenanceRunnableBase implements Runnable {
    protected final MaintenancePlugin plugin;
    protected final Settings settings;
-    protected final boolean enable;
    private final Task task;
+    protected boolean enable;
    protected int seconds;

    protected MaintenanceRunnableBase(final MaintenancePlugin plugin, final Settings settings, final int seconds, final boolean enable) {
@@ -42,29 +42,14 @@ public abstract class MaintenanceRunnableBase implements Runnable {
        if (seconds == 0) {
            finish();
        } else if (settings.getBroadcastIntervals().contains(seconds)) {
-            broadcast(enable ? startMessageKey() : endMessageKey());
+            broadcast(enable ? getStartMessage() : getEndMessage());
        }

        seconds--;
    }

    public String getTime() {
-        final int preHours = this.seconds / 60;
-        final int minutes = preHours % 60;
-        final int seconds = this.seconds % 60;
-
-        final StringBuilder buider = new StringBuilder();
-        append(buider, "hour", preHours / 60);
-        append(buider, "minute", minutes);
-        append(buider, "second", seconds);
-        return buider.toString();
-    }
-
-    private void append(final StringBuilder builder, final String timeUnit, final int time) {
-        if (time == 0) return;
-        if (builder.length() != 0)
-            builder.append(" ");
-        builder.append(time).append(" ").append(settings.getMessage(time == 1 ? timeUnit : timeUnit + "s"));
+        return plugin.getFormattedTime(seconds);
    }

    public boolean shouldEnable() {
@@ -79,13 +64,13 @@ public abstract class MaintenanceRunnableBase implements Runnable {
        return task;
    }

-    protected void broadcast(final String message) {
+    protected void broadcast(final Component message) {
        plugin.broadcast(message);
    }

    protected abstract void finish();

-    protected abstract String startMessageKey();
+    protected abstract Component getStartMessage();

-    protected abstract String endMessageKey();
+    protected abstract Component getEndMessage();
 }
Author	SHA1	Message	Date
Nassim Jahnke	d8e36d7ff6	4.0.1 Release	2022-04-16 18:40:34 +02:00
Nassim Jahnke	39f966ba5d	Update dependencies, actually fix tests	2022-04-15 21:51:29 +02:00
Nassim Jahnke	879f07e3e7	Fix tests	2022-04-15 20:08:13 +02:00
Nassim Jahnke	9cbead310a	Fix config header saving	2022-03-23 09:27:43 +01:00
Nassim Jahnke	25375b184d	Update workflow	2022-03-23 09:26:53 +01:00
Nassim Jahnke	eec5acd0ce	Bump version to 4.0.1-SNAPSHOT	2022-03-23 09:20:09 +01:00
Nassim Jahnke	14cef4d53b	Fix Sponge metadata replacement	2022-03-17 10:50:56 +01:00
Nassim Jahnke	4d06d0f6b8	4.0.0 Release	2022-03-17 10:07:29 +01:00
Nassim Jahnke	5e22098023	Update adventure, update changelog, fix publishing	2022-03-15 10:44:21 +01:00
Nassim Jahnke	80cc51e48e	Update gradle wrapper to 7.4.1	2022-03-09 18:52:43 +01:00
Nassim Jahnke	15ebe045f6	Update language files	2022-03-08 21:47:20 +01:00
Nassim Jahnke	be39524717	Minor cleanup	2022-03-08 19:39:36 +01:00
Nassim Jahnke	b8616d84c8	Update Gradle wrapper to 7.4, adventure to 4.10.0	2022-03-05 12:14:01 +01:00
Nassim Jahnke	7515d95b82	Merge remote-tracking branch 'origin/dev' into adventure-support # Conflicts: # maintenance-core/src/main/resources/language-de.yml	2022-02-21 09:21:31 +01:00
Ceddix	2c0172d11e	fixed spelling issue that caused a message not to work (#75 )	2022-02-19 09:32:24 +01:00
Nassim Jahnke	920e3477ee	Update default config values	2022-01-19 18:59:21 +01:00
Nassim Jahnke	d8e0b6497a	Cleanup a bit of language file updating	2022-01-16 19:16:45 +01:00
Nassim Jahnke	113895b564	Fix multiline playercount hover	2022-01-16 16:49:07 +01:00
Nassim Jahnke	99fffb5056	Configurable singleServerMaintenanceListEntry, remove LuckPerm context for now	2022-01-16 15:50:29 +01:00
Nassim Jahnke	3d2aa0ba9c	Update language files, update config header	2022-01-16 15:01:04 +01:00
Nassim Jahnke	5486b9542a	Update copyright header	2022-01-09 22:31:16 +01:00
Nassim Jahnke	5c2ff9588f	Update Sponge module to API v8	2022-01-09 22:27:56 +01:00
Nassim Jahnke	3bcce2dfb9	Fixup dependencies	2022-01-01 14:58:27 +01:00
Nassim Jahnke	0db0d608e5	Improve language updating, add <prefix> placeholder	2021-12-31 16:43:40 +01:00
Nassim Jahnke	ae895f4db5	Update workflow	2021-12-28 18:14:43 +01:00
Nassim Jahnke	351d842f3a	Major version bump Convert project to Gradle Change API class names and split module into two Add adventure component support	2021-12-28 18:03:34 +01:00
Nassim Jahnke	44dc76f381	WIP LuckPerms contexts	2021-12-28 09:40:29 +01:00
Nassim Jahnke	48792413f7	Update dependencies	2021-12-27 12:12:24 +01:00
Slasherss	a81ea8d87d	Add polish translations (#73 )	2021-12-22 09:45:42 +01:00
Nassim Jahnke	ba142a1c31	Update language-es.yml (thanks to Jaximo)	2021-12-07 08:59:31 +01:00
Aurélien	f849724a8c	Remove extra point (#70 )	2021-08-19 22:18:25 +02:00
Aurélien	5e17e60921	Update language-fr.yml (#69 )	2021-08-19 22:13:55 +02:00
kennytv	fad98d7a14	Update language-pt.yml (thanks to JoaoPinto)	2021-08-18 17:37:25 +02:00
kennytv	31da57c9b2	Bump version to 3.0.8-SNAPSHOT, fix missing scheduletimer keys	2021-08-18 12:54:18 +02:00
Nassim Jahnke	c1a03a6733	3.0.7 Release	2021-08-17 12:58:42 +02:00
kennytv	92ab4574e8	Prepare for 3.0.7 Release	2021-08-17 12:57:36 +02:00
kennytv	f81851ad9a	Update copyright header, readme, and license format	2021-08-12 10:43:10 +02:00
kennytv	6fb153eb9c	Remove debug command from help list	2021-08-08 12:54:57 +02:00
kennytv	a6e7bfa793	Update workflow and dependencies	2021-08-07 12:37:18 +02:00
kennytv	75656be4f5	Add helpDump to language files	2021-07-23 10:26:44 +02:00
KennyTV	f09f95549a	Fix Velocity update message, update depend to 3.0.0-SNAPSHOT	2021-05-27 22:25:58 +02:00
KennyTV	78dc87e74a	Remove that	2021-05-23 14:23:33 +02:00
KennyTV	3503d02501	Shade mysql connector in Velocity module Fixes #61	2021-05-22 19:24:38 +02:00
KennyTV	f8ea89b0b9	Update ProtocolLib Maven repo	2021-05-10 08:48:02 +02:00
KennyTV	d0d672b76b	Do offline web lookup in whitelist add on proxies	2021-05-08 09:49:23 +02:00
KennyTV	616d4c7aba	Update changelog, update sponge repo url	2021-03-06 18:25:01 +01:00
KennyTV	4415d036a2	Have an extra broadcast key for schedule starts Closes #58	2021-03-06 16:44:58 +01:00
KennyTV	1f70247c1d	Add config options to dispatch commands on maintenance toggle	2021-03-06 16:02:09 +01:00
KennyTV	02ed575e3c	Fix inverted if condition	2021-02-18 09:15:33 +01:00
KennyTV	4e005bca17	Add "enable-pingmessages" config option Closes #57	2021-02-18 09:14:48 +01:00
Aurélien	dcf61a4036	Update language-fr.yml (#56 )	2021-02-17 10:48:35 +01:00
KennyTV	8e7b80bddf	Bump version 3.0.7-SNAPSHOT	2021-02-17 10:47:56 +01:00
KennyTV	16775bda54	Update changelog	2021-02-17 10:30:28 +01:00
Nassim	29d9fa2ec8	3.0.6 Release	2021-02-17 10:25:23 +01:00
KennyTV	ef2ce99746	Prepare for 3.0.6 Release	2021-02-17 10:24:56 +01:00
KennyTV	aa5437605f	Actually fire the MaintenanceReloadedEvent	2021-02-07 11:40:41 +01:00
KennyTV	22e1d53f81	Update copyright header	2021-02-07 11:32:00 +01:00
KennyTV	1359684c72	Add "maintenance schedule" command	2021-02-07 11:30:20 +01:00
KennyTV	22c53bd4ff	Add primitive debug mode (only implemented on Bungee)	2020-12-31 12:59:31 +01:00
KennyTV	c0e2586684	Hotfix dumps I will use paste.gg in the future, this is only to make it work at all again	2020-12-31 12:28:24 +01:00
KennyTV	2f095f32ca	Also replace online and max variable in the hover message	2020-11-20 22:38:10 +01:00
KennyTV	e1e4926f83	Properly register main command with permissions (instead of checking for them in the actual command)	2020-10-26 16:55:37 +01:00
KennyTV	55b5bf2714	Update Velocity API usage	2020-10-26 16:47:07 +01:00
KennyTV	5f8f885530	Update language-es.yml (thanks to Vixo_Ulises)	2020-10-26 16:38:38 +01:00
KennyTV	fc40b0230d	Rename GH build artifact	2020-10-01 09:40:29 +02:00
Nassim	6fb79d7051	Make artifacts work 😎	2020-08-25 14:55:20 +02:00
KennyTV	7bc522c1d3	Upload artifacts	2020-08-25 14:52:15 +02:00
Nassim	8d0d97c220	Create maven.yml	2020-08-25 14:14:56 +02:00
KennyTV	e7c8430909	Fix NPE in null pings	2020-08-22 09:48:21 +02:00
KennyTV	1646d4e417	Update Velocity API usage to 1.1.0-SNAPSHOT 🎉	2020-08-21 20:26:39 +02:00
KennyTV	f8384f4f99	Add whitelist add arg to manually add offline uuid+name	2020-08-19 09:44:57 +02:00
KennyTV	4fd6ba33ff	Fix linebreaks on Bungee in playercount hovermessage	2020-07-30 12:04:05 +02:00
KennyTV	94c146d0e9	Add MaintenanceReloadedEvent, also fire changed event for unregistered proxy servers	2020-07-29 14:17:49 +02:00
dependabot-preview[bot]	c624b18b8e	Bump junit-jupiter-engine from 5.6.1 to 5.6.2 Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.6.1 to 5.6.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.6.1...r5.6.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2020-07-27 18:39:05 +02:00
KennyTV	18a00f9054	Link to dev branch for Travis builds	2020-07-26 12:15:18 +02:00
KennyTV	9778a900a7	Add 'mt' command alias, add some braces	2020-07-26 11:08:25 +02:00
KennyTV	21fa6a3b7f	Formatting fix in changelog	2020-07-14 12:10:34 +02:00
KennyTV	c7980cbc86	Missing singleserver kick messages should not throw warnings	2020-06-25 11:28:36 +02:00
KennyTV	cdb6715744	Implement new methods for dummyprofile	2020-06-25 09:12:24 +02:00
KennyTV	d868f069cc	Add translators to the individual language files	2020-06-21 09:26:59 +02:00
Aurélien	c58b29a78f	Fixes for French translation (#42 )	2020-06-21 09:19:16 +02:00
KennyTV	5fb4f06f4c	Rename method to get server name of player, cleanup config in test	2020-06-18 15:43:39 +02:00
KennyTV	8a3afdd1a8	Version increase to 3.0.6-SNAPSHOT	2020-06-18 15:26:39 +02:00
KennyTV	36e561c413	Sneak a mysql fix in	2020-06-17 14:09:02 +02:00
KennyTV	4739176e9b	Update API jar to 3.0.5	2020-06-17 11:26:32 +02:00
Nassim	9546cc7b74	3.0.5 Release	2020-06-17 10:48:13 +02:00
KennyTV	740051dda5	Prepare for 3.0.5 release	2020-06-17 10:47:20 +02:00
KennyTV	e53f4f2518	Config test additions	2020-06-17 09:31:49 +02:00
KennyTV	03390d7be9	Config set cleanup	2020-06-16 17:49:45 +02:00
KennyTV	039c5a3d04	Use precondition in api getter util	2020-06-16 16:39:23 +02:00
KennyTV	4360eb03e3	Wrong nullable annotation	2020-06-16 16:20:18 +02:00
KennyTV	89691e8064	Minor code cleanup to version checking	2020-06-16 16:19:20 +02:00
KennyTV	8f4860ad56	Update changelog, bump Guava provided version Not that it matters, but want to get rid of the security alert	2020-06-16 09:51:25 +02:00
KennyTV	b8b231ce78	Remove config updating from 2.x See https://github.com/KennyTV/Maintenance/wiki/Updates#updating-from-2x on how to do that manually - virtually noone should be using such old versions anymore	2020-06-10 12:51:25 +02:00
KennyTV	fd8b47a9f5	Automatically move files to new dir on updating	2020-06-09 19:25:21 +02:00
KennyTV	10c0b5bab3	Update README	2020-06-01 13:21:21 +02:00
KennyTV	cece2b5813	Use higher proxy ping listener priority	2020-05-18 22:12:22 +02:00
KennyTV	aa9a686b8a	Replace newline variable in language file Note on why this even exists: Yaml will force save all strings containing line breaks in this rather chunky format: key: \|- First line text Second line text. ... This also happens to string lists, making those practically unreadable, as well as confusing for most users in general. Because of this, I replace %NEWLINE% manually, to spare users from these ugly breaks.	2020-05-15 13:38:41 +02:00
KennyTV	f29b38989c	Add option to set multiple fallback servers	2020-05-12 20:52:47 +02:00
KennyTV	ad9c989213	Add secret language option for server specific kick messages Closes #38	2020-05-12 20:27:59 +02:00
KennyTV	f01e96a32a	Implement deep get in config	2020-05-12 19:32:42 +02:00
KennyTV	e247f4ef10	Remove platform suffix from plugin identifier	2020-04-22 10:59:27 +02:00
KennyTV	b8e0f84d54	Don't hide playercount if custom playercount is disabled	2020-04-21 12:00:23 +02:00
KennyTV	424617c602	Respect custom playercount setting in Spigot ping	2020-04-21 08:36:28 +02:00
KennyTV	21ed266d3d	Fix use-ssl option inversion	2020-04-13 09:29:22 +02:00
KennyTV	a409ec5d66	Update copyright headers	2020-04-10 23:42:06 +02:00
KennyTV	66cba12fd3	Update Russian language file	2020-04-09 08:59:11 +02:00
KennyTV	f6d178d8d1	Add placeholder link to readme	2020-04-06 22:34:04 +02:00
KennyTV	d04749c835	Add Italian language file	2020-04-03 12:27:00 +02:00
KennyTV	eebbc4d532	Fix config loading with multiline strings, add small tests Fixes #37	2020-03-30 12:48:48 +02:00
KennyTV	335fe303b5	Throw around some nullable annotations	2020-03-30 11:02:35 +02:00
KennyTV	1c4b5e62a4	Add Chinese language file	2020-03-17 15:02:47 +01:00
KennyTV	d41fa5ab24	Version increase to 3.0.5-SNAPSHOT	2020-03-17 11:57:12 +01:00