4.3.0 Release

New Crowdin updates (#138 )
New Crowdin updates (#133 )
2024-09-17 10:51:56 +02:00 · 2024-09-15 11:49:45 +02:00 · 2024-09-13 17:39:34 +02:00 · 2024-09-13 17:36:13 +02:00 · 2024-09-13 16:20:02 +02:00 · 2024-09-13 15:00:50 +02:00
205 changed files with 6201 additions and 5031 deletions
@@ -1,6 +1,97 @@
 # 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.3.0 - September 17th 2024
+### Changed
+* Added alternative player count and player list hover message for when endtimers are running, similar to the existing ping messages setting. They are disabled by default and can be found in their `player-count-message` and `player-list-hover-message` config sections
+* All timer commands now accept durations like `2h30m`, `1h30m5s`, or `90s`. The default behavior without units will still be in minutes
+  * The language defaults will *not* automatically update the command help messages
+* Slightly reorganized the configuration file (it will be automatically migrated on startup, but new sections will be slapped at the bottom of the file)
+* The `fallback` field now also accepts null values next to an empty array for disabling the feature
+* Updated language files from [Crowdin](https://crowdin.com/translate/maintenance)
+
+### Fixed
+* Fixed the `/maintenance dump` command
+* Fixed the original player sample not being cleared in Velocity
+* Velocity: Fixed the console getting broadcasts twice
+* Velocity: Don't log legacy color codes to the console
+* Paper: Fixed the player count messages on Paper 1.21
+---
+## 4.2.1 - May 17th 2024
+### Changed
+* The proxied maintenance status is now also shown for forced hosts (thanks to alec-jensen)
+* Offline player fetching improvements (thanks to EpicPlayerA10)
+  * Added the setting `fallback-to-offline-uuid` to use offline player uuids in maintenance whitelist commands (defaults to false)
+* Maintenance now skips the plugin remapping process on 1.20.5+ Paper servers
+* Small optimizations
+* Updated language files from [Crowdin](https://crowdin.com/translate/maintenance)
+  * Massive thank you to all the contributors! These include: vortix22, xdalul, CodeZhangBorui, jesusskye, Doc94,
+    Texider_, marvin2k0, leonard.bausenwein, pro.timeo.kerjean, meviper, troev5, Murka124, jhqwqmc, Pryzinho,
+    raysetratyboy, Kolja07, and rikunightcore
+---
+## 4.2.0 - September 17th 2023
+### Changed
+* Velocity/Bungee: Added `commands-on-single-maintenance-enable` and `commands-on-single-maintenance-disable` config options to define commands to be executed after maintenance has been toggled on a proxied server
+  * Commands inside the `all` list will be executed for any proxied server, but you can also define commands for specific servers by adding arrays with the server names as keys
+  * You can use the placeholder `%SERVER%` in commands to be replaced with the server name
+* Start-, end-, and schedule timers for proxied servers now also include the server in the feedback message
+* Updated language files from [Crowdin](https://crowdin.com/translate/maintenance) (including new language files for Danish, Japanese, Korean, and Hungarian)
+---
+## 4.1.0 - April 17th 2023
+### Changed
+* Added config option `enable-playercounthovermessage` to be able to toggle the player count hover message
+* Removed platform specific command aliases (e.g. `maintenancevelocity`)
+* Translations
+  * Moved translation editing to [Crowdin](https://crowdin.com/translate/maintenance)
+  * Added Turkish translation file (thanks to Proomp)
+  * Added Swedish translation file (thanks to Sup33r)
+  * Added Ukrainian translation file (thanks to Mrlucke)
+  * Added Japanese translation file (thanks to yu-solt)
+* Added bStats metrics to Velocity and Sponge modules
+
+### Fixed
+* Fixed disabling the `enable-pingmessages` setting not working on Paper servers
+* Fixed variable replacement in messages with gradients
+* Fixed the message for cancelling proxied server timers not replacing the server argument
+* Setting `enable-pingmessages` to `false` no longer disables custom player and player hover messages
+---
+## 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
@@ -13,7 +104,7 @@ This file contains update logs for this project. The top may contain a `Unreleas
 * 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.0.4](https://github.com/KennyTV/MaintenanceAddon/releases)
+  * 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
@@ -28,7 +119,7 @@ This file contains update logs for this project. The top may contain a `Unreleas
 * 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)
+* Added Italian language file
 * 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
@@ -8,7 +8,7 @@ about: Report a bug to have it fixed
 **How does the problem occur/what are the steps to reproduce it?**

 ## Error
-**Is there an error? Save it via https://pastebin.com/ and link paste the link.**
+**Is there an error? Save it via https://mclo.gs/ and link paste the link.**

 ## Server information
 **Type '/maintenance dump' and paste the given link here**
@@ -0,0 +1,26 @@
+name: Build
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/wrapper-validation@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'temurin'
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Maintenance Files
+          path: build/libs
@@ -1,35 +0,0 @@
-name: Build
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/cache@v2.1.1
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
-
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-
-      - name: Build with Maven
-        run: mvn -B package --file pom.xml
-
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.1.4
-        with:
-          name: MaintenanceFiles
-          path: |
-            **/Maintenance.jar
-            **/MaintenanceSpigot.jar
-            **/MaintenanceBungee.jar
-            **/MaintenanceVelocity.jar
-            **/MaintenanceSponge.jar
@@ -1,4 +1,6 @@
 .metadata
+build/
+.gradle
 bin/
 tmp/
 *.tmp
@@ -13,7 +15,6 @@ local.properties
 .externalToolBuilders/
 *.launch
 *.pydevproject
-*.jar
 .cproject
 .classpath
 .factorypath
@@ -93,3 +94,4 @@ $RECYCLE.BIN/
 *.lnk
 !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,10 @@
 # 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)
+[![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)
+[![Crowdin](https://badges.crowdin.net/maintenance/localized.svg)](https://crowdin.com/project/maintenance)
 [![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)
-Maintenance is probably the most customizable free maintenance plugin for your Minecraft server you can find. It runs on 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 Paper (also Spigot, but with limited functionality), 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 +15,25 @@ 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://hangar.papermc.io/kennytv/MaintenanceAddon) (for Velocity and 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) (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)
+* [Hangar Downloads](https://hangar.papermc.io/kennytv/Maintenance)
+* [Wiki](https://github.com/kennytv/Maintenance/wiki) (configuration, permissions, API usage)
+* [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)
+* [PlaceholderAPI addon](https://hangar.papermc.io/kennytv/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)
+
+## Localization
+The English base language file is localized using Crodwin. You can see and update translations here: https://crowdin.com/project/maintenance
+
+Join [our Discord](https://discord.gg/vGCUzHq) if you want to get the proofreader or translator role on the project.
+Adding translations for languages not yet listed is always appreciated as well!

 ## 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.gradleup.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.gradleup.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.gradleup.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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,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.
@@ -64,6 +59,13 @@ public interface IMaintenanceProxy extends IMaintenance {
    @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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,9 +38,9 @@ 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.
@@ -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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,18 +49,18 @@ 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
@@ -0,0 +1,49 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,20 +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.api.event;

-import eu.kennytv.maintenance.api.IMaintenance;
+import eu.kennytv.maintenance.api.Maintenance;
 import eu.kennytv.maintenance.api.event.manager.MaintenanceEvent;
-import eu.kennytv.maintenance.api.proxy.IMaintenanceProxy;

 /**
 * Notification event fired when Maintenance configuration is reloaded.
 *
- * @author KennyTV
- * @see IMaintenance#isMaintenance() for the new maintenance status
- * @see IMaintenanceProxy#getMaintenanceServers() for the new list of servers under maintenance
- * @since 3.0.6
+ * @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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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.
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.0")
+}
@@ -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,71 @@
+plugins {
+    `java-library`
+    `maven-publish`
+    signing
+}
+
+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()
+}
+
+signing {
+    useGpgCmd()
+    sign(publishing.publications)
+}
+
+publishing {
+    publications.create<MavenPublication>("mavenJava") {
+        groupId = rootProject.group as String
+        artifactId = project.name
+        version = rootProject.version as String
+        pom {
+            name.set("Maintenance")
+            description.set("Paper plugin to enable maintenance mode on your Minecraft server.")
+            url.set("https://github.com/kennytv/Maintenance")
+            licenses {
+                license {
+                    name.set("GNU GPLv3")
+                    url.set("https://www.gnu.org/licenses/gpl-3.0.html")
+                }
+            }
+            developers {
+                developer {
+                    id.set("kennytv")
+                    name.set("Nassim Jahnke")
+                }
+            }
+        }
+    }
+
+    if (!name.startsWith("adventure")) {
+        repositories.maven {
+            name = "OSSRH"
+            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+            credentials {
+                username = System.getenv("OSSRH_USERNAME")
+                password = System.getenv("OSSRH_PASSWORD")
+            }
+        }
+    }
+}
@@ -0,0 +1,12 @@
+import java.util.*
+
+plugins {
+    id("maintenance.shadow-conventions")
+}
+
+tasks {
+    shadowJar {
+        archiveFileName.set("Maintenance-${project.name.substringAfter("maintenance-").replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}-${project.version}.jar")
+        destinationDirectory.set(rootProject.layout.buildDirectory.dir("libs"))
+    }
+}
@@ -0,0 +1,29 @@
+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.gradleup.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")
+    relocate("org.bstats", "eu.kennytv.maintenance.lib.bstats")
+}
@@ -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.maintenancePaper,
+    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,8 @@
+dependencies {
+    implementation(projects.maintenanceCoreProxy)
+    implementation(projects.adventure.adventurePlatformBungee) {
+        targetConfiguration = "shadow"
+    }
+    implementation(libs.bstatsBungee)
+    compileOnly(libs.bungee)
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,62 +15,60 @@
 * 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;
 import eu.kennytv.maintenance.bungee.listener.ProxyPingListener;
 import eu.kennytv.maintenance.bungee.listener.ServerConnectListener;
-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 net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.Favicon;
-import net.md_5.bungee.api.ProxyServer;
-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.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 eu.kennytv.maintenance.lib.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 import java.io.File;
 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.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import javax.imageio.ImageIO;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.Favicon;
+import net.md_5.bungee.api.ProxyServer;
+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.bstats.bungeecord.Metrics;
+import org.jetbrains.annotations.Nullable;

-/**
- * @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;
@@ -84,32 +82,24 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
        pm.registerCommand(plugin, new MaintenanceBungeeCommandBase(commandManager));

        continueLastEndtimer();
-        new MetricsLite(plugin);
+        new Metrics(plugin, 742);

-        // 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();
-    }
-
-    @Override
-    public void sendUpdateNotification(final SenderInfo sender) {
-        final TextComponent tc1 = new TextComponent(TextComponent.fromLegacyText(getPrefix()));
-        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()));
-        tc1.addExtra(tc2);
-        tc1.addExtra(click);
-        ((BungeeSenderInfo) sender).sendMessage(tc1);
+        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");
+        }
    }

    public boolean isMaintenance(final ServerInfo serverInfo) {
@@ -118,9 +108,9 @@ 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()));
            }
        }
    }
@@ -133,13 +123,13 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
        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.getFullServerKickMessage(server.getName()));
+                    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()));
            }
        }
    }
@@ -154,10 +144,10 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
            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()));
            }
        }
    }
@@ -167,6 +157,29 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
        return new BungeeTask(getProxy().getScheduler().schedule(plugin, runnable, 0, 1, TimeUnit.SECONDS).getId());
    }

+    @Override
+    public CompletableFuture<@Nullable SenderInfo> getOfflinePlayer(final String name) {
+        final ProxiedPlayer player = getProxy().getPlayer(name);
+        if (player != null) {
+            return CompletableFuture.completedFuture(new BungeeSenderInfo(player));
+        }
+
+        return CompletableFuture.supplyAsync(() -> {
+            try {
+                final ProfileLookup profile = doUUIDLookup(name);
+                return new ProxyOfflineSenderInfo(profile.getUuid(), profile.getName());
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+    }
+
+    @Override
+    public CompletableFuture<@Nullable SenderInfo> getOfflinePlayer(final UUID uuid) {
+        final ProxiedPlayer player = getProxy().getPlayer(uuid);
+        return CompletableFuture.completedFuture(player != null ? new BungeeSenderInfo(player) : null);
+    }
+
    @Override
    @Nullable
    public Server getServer(final String server) {
@@ -175,17 +188,8 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
    }

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

    @Override
@@ -202,8 +206,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
@@ -263,4 +272,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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,23 +15,16 @@
 * 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;
-import eu.kennytv.maintenance.bungee.util.BungeeSenderInfo;
 import eu.kennytv.maintenance.core.proxy.SettingsProxy;
 import eu.kennytv.maintenance.core.proxy.command.MaintenanceProxyCommand;
-import eu.kennytv.maintenance.core.util.SenderInfo;
-import net.md_5.bungee.api.chat.ClickEvent;
-import net.md_5.bungee.api.chat.HoverEvent;
-import net.md_5.bungee.api.chat.TextComponent;
-import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;

 public final class MaintenanceBungeeCommand extends MaintenanceProxyCommand {
    private final MaintenanceBungeePlugin plugin;
@@ -42,15 +35,6 @@ public final class MaintenanceBungeeCommand extends MaintenanceProxyCommand {
        registerCommands();
    }

-    @Override
-    protected void sendUpdateMessage(final SenderInfo sender) {
-        final TextComponent tc = new TextComponent("§6× §8[§aUpdate§8]");
-        tc.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/maintenance forceupdate"));
-        tc.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText("§aClick here to update the plugin")));
-        tc.addExtra(" §8< §7Or use the command §c/maintenance forceupdate");
-        ((BungeeSenderInfo) sender).sendMessage(tc);
-    }
-
    @Override
    public List<String> getServersCompletion(final String s) {
        final List<String> list = new ArrayList<>();
@@ -63,15 +47,6 @@ public final class MaintenanceBungeeCommand extends MaintenanceProxyCommand {
        return list;
    }

-    @Override
-    public void sendDumpMessage(final SenderInfo sender, final String url) {
-        final BungeeSenderInfo bungeeSender = ((BungeeSenderInfo) sender);
-        final TextComponent clickText = new TextComponent(plugin.getPrefix() + "§7Click here to copy the link");
-        clickText.setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, url));
-        clickText.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText("§aClick here to copy the link")));
-        bungeeSender.sendMessage(clickText);
-    }
-
    @Override
    public List<String> getPlayersCompletion() {
        final List<String> list = new ArrayList<>();
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,7 +27,7 @@ public final class MaintenanceBungeeCommandBase extends Command implements TabEx
    private final MaintenanceCommand command;

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

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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.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;
@@ -36,28 +36,33 @@ public final class ProxyPingListener implements Listener {

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

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

-        ping.setDescription(settings.getRandomPingMessage());
-
-        final String[] split = settings.getPlayerCountHoverMessage().split("\n");
-        final ServerPing.PlayerInfo[] samplePlayers = new ServerPing.PlayerInfo[split.length];
-        for (int i = 0; i < split.length; i++) {
-            samplePlayers[i] = new ServerPing.PlayerInfo(split[i], "");
+        if (settings.isEnablePingMessages()) {
+            ping.setDescriptionComponent(ComponentUtil.toBadComponents(settings.getRandomPingMessage()));
+        }
+
+        if (settings.hasCustomPlayerCountHoverMessage()) {
+            ServerPing.Players players = ping.getPlayers();
+            if (players == null) {
+                players = new ServerPing.Players(0, 0, null);
+                ping.setPlayers(players);
+            }
+
+            final String[] lines = settings.getLegacyParsedPlayerCountHoverLines();
+            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);
        }
-        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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,17 +45,17 @@ 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());
+        final BungeeSenderInfo player = new BungeeSenderInfo(event.getPlayer());
        if (plugin.isDebug()) {
            plugin.getLogger().info("Join permission check for " + event.getPlayer().getName()
-                    + " - Permission: " + sender.hasMaintenancePermission("bypass") + ", whitelist: " + settings.isWhitelisted(sender.getUuid()));
+                    + " - Permission: " + player.hasMaintenancePermission("bypass") + ", whitelist: " + settings.isWhitelisted(player.getUuid()));
        }

-        if (shouldKick(sender)) {
-            final Server waitingServer = shouldConnectToWaitingServer(sender);
+        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());
@@ -66,9 +64,10 @@ public final class ServerConnectListener extends ProxyJoinListenerBase implement
            }

            event.setCancelled(true);
-            event.getPlayer().disconnect(settings.getKickMessage());
+
+            player.disconnect(settings.getKickMessage());
            if (settings.isJoinNotifications()) {
-                broadcastJoinNotification(sender.getName());
+                broadcastJoinNotification(player.getName());
            }
        }
    }
@@ -78,10 +77,11 @@ 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);
        }
@@ -90,7 +90,7 @@ public final class ServerConnectListener extends ProxyJoinListenerBase implement
            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) {
@@ -109,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);
            }
        }
    }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,8 +52,8 @@ public final class BungeeSenderInfo implements ProxySenderInfo {
    }

    @Override
-    public void sendMessage(final String message) {
-        sender.sendMessage(message);
+    public void send(final Component component) {
+        ((MaintenanceBungeePlugin) MaintenanceProvider.get()).audiences().sender(sender).sendMessage(component);
    }

    @Override
@@ -69,9 +71,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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,10 +41,10 @@ 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);
        }
    }

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2024 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://hangar.papermc.io/kennytv/Maintenance
@@ -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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,35 +15,45 @@
 * 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.runnable.SingleMaintenanceScheduleRunnable;
+import eu.kennytv.maintenance.core.proxy.util.ProfileLookup;
 import eu.kennytv.maintenance.core.runnable.MaintenanceRunnableBase;
+import eu.kennytv.maintenance.core.util.RateLimitedException;
 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.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 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.concurrent.TimeUnit;
+import java.util.UUID;
+import org.jetbrains.annotations.Blocking;
+import org.jetbrains.annotations.Nullable;

 /**
- * @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;

@@ -75,11 +85,23 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
    @Override
    public boolean setMaintenanceToServer(final Server server, final boolean maintenance) {
        if (maintenance) {
-            if (!settingsProxy.addMaintenanceServer(server.getName())) return false;
-        } else {
-            if (!settingsProxy.removeMaintenanceServer(server.getName())) return false;
+            if (!settingsProxy.addMaintenanceServer(server.getName())) {
+                return false;
+            }
+        } else if (!settingsProxy.removeMaintenanceServer(server.getName())) {
+            return false;
        }
+
        serverActions(server, maintenance);
+
+        for (final String command : (maintenance ? settingsProxy.getCommandsOnMaintenanceEnable(server) : settingsProxy.getCommandsOnMaintenanceDisable(server))) {
+            try {
+                executeConsoleCommand(command.replace("%SERVER%", server.getName()));
+            } catch (final Exception e) {
+                getLogger().severe("Error while executing extra maintenance " + (maintenance ? "enable" : "disable") + " command: " + command);
+                e.printStackTrace();
+            }
+        }
        return true;
    }

@@ -97,7 +119,7 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
                }
                kickPlayers(server, fallback);
            } else {
-                server.broadcast(settingsProxy.getMessage("singleMaintenanceDeactivated").replace("%SERVER%", server.getName()));
+                server.broadcast(settingsProxy.getMessage("singleMaintenanceDeactivated", "%SERVER%", server.getName()));
            }

            cancelSingleTask(server);
@@ -123,15 +145,15 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
        }
    }

-    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);
+    public MaintenanceRunnableBase startSingleMaintenanceRunnable(final Server server, final Duration duration, final boolean enable) {
+        final MaintenanceRunnableBase runnable = new SingleMaintenanceRunnable(this, settingsProxy, (int) duration.getSeconds(), 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) {
+    public MaintenanceRunnableBase scheduleSingleMaintenanceRunnable(final Server server, final Duration enableIn, final Duration maintenanceDuration) {
        final MaintenanceRunnableBase runnable = new SingleMaintenanceScheduleRunnable(this, settingsProxy,
-                (int) unit.toSeconds(duration), (int) unit.toSeconds(maintenanceDuration), server);
+                (int) enableIn.getSeconds(), (int) maintenanceDuration.getSeconds(), server);
        serverTasks.put(server.getName(), runnable.getTask());
        return runnable;
    }
@@ -167,6 +189,84 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
        kickPlayersFromProxy();
    }

+    @Blocking
+    @Nullable
+    protected ProfileLookup doUUIDLookup(final String name) throws IOException {
+        ProfileLookup profileLookup;
+        try {
+            profileLookup = doUUIDLookupMojangAPI(name);
+        } catch (RateLimitedException e) {
+            // Use fallback API if rate limit is reached
+            profileLookup = doUUIDLookupAshconAPI(name);
+        }
+
+        if (settingsProxy.isFallbackToOfflineUUID() && profileLookup == null) {
+            // Use offline uuid
+            return new ProfileLookup(UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8)), name);
+        }
+
+        return profileLookup;
+    }
+
+    /**
+     * Official Mojang API
+     */
+    @Nullable
+    private ProfileLookup doUUIDLookupMojangAPI(final String name) throws IOException {
+        final URL url = new URL("https://api.mojang.com/users/profiles/minecraft/" + name);
+        final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("GET");
+
+        int status = connection.getResponseCode();
+        if (status == 429) {
+            throw new RateLimitedException();
+        }
+        if (status == 404) {
+            // Return null if profile not found
+            return null;
+        }
+
+        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 = fromStringUUIDWithoutDashes(json.getAsJsonPrimitive("id").getAsString());
+            final String username = json.getAsJsonPrimitive("name").getAsString();
+            return new ProfileLookup(uuid, username);
+        }
+    }
+
+    /**
+     * Fallback API (Ashcon API)
+     */
+    @Nullable
+    private ProfileLookup doUUIDLookupAshconAPI(final String name) throws IOException {
+        final URL url = new URL("https://api.ashcon.app/mojang/v2/user/" + name);
+        final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+        if (connection.getResponseCode() == 403) {
+            // Return null if profile not found
+            return null;
+        }
+
+        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);
+        }
+    }
+
+    private UUID fromStringUUIDWithoutDashes(String undashedUUID) {
+        return UUID.fromString(
+                undashedUUID.substring(0, 8) + "-" + undashedUUID.substring(8, 12) + "-" +
+                        undashedUUID.substring(12, 16) + "-" + undashedUUID.substring(16, 20) + "-" +
+                        undashedUUID.substring(20, 32)
+        );
+    }
+
    public SettingsProxy getSettingsProxy() {
        return settingsProxy;
    }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,20 +15,23 @@
 * 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.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Set;

 public final class SettingsProxy extends Settings {
@@ -36,7 +39,10 @@ public final class SettingsProxy extends Settings {
    private Set<String> maintenanceServers;
    private List<String> fallbackServers;
    private String waitingServer;
+    private boolean fallbackToOfflineUUID;

+    private Map<String, List<String>> commandsOnMaintenanceEnable;
+    private Map<String, List<String>> commandsOnMaintenanceDisable;
    private String mySQLTable;
    private String serverTable;
    private String maintenanceQuery;
@@ -52,7 +58,7 @@ public final class SettingsProxy extends Settings {
        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) {
@@ -92,12 +98,25 @@ public final class SettingsProxy extends Settings {
        }

        final Object fallback = config.getObject("fallback");
-        fallbackServers = fallback instanceof String ? Collections.singletonList((String) fallback) : config.getStringList("fallback");
+        fallbackServers = fallback instanceof String ? Collections.singletonList((String) fallback) : config.getStringList("fallback", Collections.emptyList());

        waitingServer = config.getString("waiting-server", "");
        if (waitingServer.isEmpty() || waitingServer.equalsIgnoreCase("none")) {
            waitingServer = null;
        }
+        fallbackToOfflineUUID = config.getBoolean("fallback-to-offline-uuid", false);
+
+        commandsOnMaintenanceEnable = new HashMap<>();
+        final ConfigSection enableCommandsSection = config.getSection("commands-on-single-maintenance-enable");
+        for (final String key : enableCommandsSection.getKeys()) {
+            commandsOnMaintenanceEnable.put(key.toLowerCase(Locale.ROOT), enableCommandsSection.getStringList(key));
+        }
+
+        commandsOnMaintenanceDisable = new HashMap<>();
+        final ConfigSection disableCommandsSection = config.getSection("commands-on-single-maintenance-disable");
+        for (final String key : disableCommandsSection.getKeys()) {
+            commandsOnMaintenanceDisable.put(key.toLowerCase(Locale.ROOT), disableCommandsSection.getStringList(key));
+        }

        if (hasMySQL()) {
            maintenance = loadMaintenance();
@@ -150,21 +169,21 @@ public final class SettingsProxy extends Settings {
        return maintenanceServers.contains(serverName);
    }

-    public String getServerKickMessage(final String server) {
-        String message = language.getString("singleMaintenanceKicks." + server);
+    public Component getServerKickMessage(final String server) {
+        String message = getLanguageStringOrNull("singleMaintenanceKicks." + server, "%SERVER%", server);
        if (message == null) {
-            message = getMessage("singleMaintenanceKick");
+            message = getLanguageString("singleMaintenanceKick", "%SERVER%", server);
        }
-        return plugin.replacePingVariables(message).replace("%SERVER%", server);
+        return parse(plugin.replacePingVariables(message));
    }

    // Full = being kicked from the proxy, not just a proxied server
-    public String getFullServerKickMessage(final String server) {
-        String message = language.getString("singleMaintenanceKicksComplete." + server);
+    public Component getFullServerKickMessage(final String server) {
+        String message = getLanguageStringOrNull("singleMaintenanceKicksComplete." + server, "%SERVER%", server);
        if (message == null) {
-            message = getMessage("singleMaintenanceKickComplete");
+            message = getLanguageString("singleMaintenanceKickComplete", "%SERVER%", server);
        }
-        return plugin.replacePingVariables(message).replace("%SERVER%", server);
+        return parse(plugin.replacePingVariables(message));
    }

    public boolean hasMySQL() {
@@ -262,6 +281,28 @@ public final class SettingsProxy extends Settings {
        return waitingServer;
    }

+    public boolean isFallbackToOfflineUUID() {
+        return fallbackToOfflineUUID;
+    }
+
+    public List<String> getCommandsOnMaintenanceEnable(final Server server) {
+        final List<String> enableCommands = commandsOnMaintenanceEnable.getOrDefault("all", new ArrayList<>());
+        final List<String> serverEnableCommands = commandsOnMaintenanceEnable.get(server.getName().toLowerCase(Locale.ROOT));
+        if (serverEnableCommands != null) {
+            enableCommands.addAll(serverEnableCommands);
+        }
+        return enableCommands;
+    }
+
+    public List<String> getCommandsOnMaintenanceDisable(final Server server) {
+        final List<String> disableCommands = commandsOnMaintenanceDisable.getOrDefault("all", new ArrayList<>());
+        final List<String> serverDisableCommands = commandsOnMaintenanceDisable.get(server.getName().toLowerCase(Locale.ROOT));
+        if (serverDisableCommands != null) {
+            disableCommands.addAll(serverDisableCommands);
+        }
+        return disableCommands;
+    }
+
    @Nullable
    MySQL getMySQL() {
        return mySQL;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -63,11 +62,11 @@ public abstract class MaintenanceProxyCommand extends MaintenanceCommand {
    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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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", "%SERVER%", server.getName()));
        } else
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
    }

    @Override
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -23,10 +22,9 @@ 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.time.Duration;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.TimeUnit;

 public final class SingleEndtimerCommand extends ProxyCommandInfo {

@@ -43,35 +41,43 @@ public final class SingleEndtimerCommand extends ProxyCommandInfo {
    public void execute(final SenderInfo sender, final String[] args) {
        if (args.length == 2) {
            if (checkPermission(sender, "timer")) return;
-            if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-                sender.sendMessage(getHelpMessage());
+
+            final Duration duration = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[1]);
+            if (duration == null) {
+                sender.send(getHelpMessage());
                return;
            }
            if (!plugin.isMaintenance()) {
-                sender.sendMessage(getMessage("alreadyDisabled"));
+                sender.send(getMessage("alreadyDisabled"));
                return;
            }

-            plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, false);
-            sender.sendMessage(getMessage("endtimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+            plugin.startMaintenanceRunnable(duration, 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.sendMessage(getHelpMessage());
+
+            final Duration duration = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[2], false);
+            if (duration == null) {
+                sender.send(getHelpMessage());
                return;
            }

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

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

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -23,10 +22,9 @@ 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.time.Duration;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.TimeUnit;

 public final class SingleScheduleTimerCommand extends ProxyCommandInfo {

@@ -43,37 +41,50 @@ public final class SingleScheduleTimerCommand extends ProxyCommandInfo {
    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.sendMessage(getHelpMessage());
+
+            final Duration enableIn = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[1]);
+            final Duration duration = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[2], false);
+            if (enableIn == null || duration == null) {
+                sender.send(getHelpMessage());
                return;
            }
            if (plugin.isMaintenance()) {
-                sender.sendMessage(getMessage("alreadyEnabled"));
+                sender.send(getMessage("alreadyEnabled"));
                return;
            }

-            plugin.scheduleMaintenanceRunnable(Integer.parseInt(args[1]), Integer.parseInt(args[2]), TimeUnit.MINUTES);
-            sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+            plugin.scheduleMaintenanceRunnable(duration, enableIn);
+            sender.send(getMessage(
+                    "scheduletimerStarted",
+                    "%TIME%", plugin.getRunnable().getTime(),
+                    "%DURATION%", plugin.getFormattedTime((int) duration.getSeconds())
+            ));
        } 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.sendMessage(getHelpMessage());
+
+            final Duration enableIn = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[2], false);
+            final Duration duration = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[3], false);
+            if (enableIn == null || duration == null) {
+                sender.send(getHelpMessage());
                return;
            }

            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.scheduleSingleMaintenanceRunnable(server, Integer.parseInt(args[2]), Integer.parseInt(args[3]), TimeUnit.MINUTES);
-            sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", runnable.getTime()));
+            final MaintenanceRunnableBase runnable = plugin.scheduleSingleMaintenanceRunnable(server, enableIn, duration);
+            sender.send(getMessage(
+                    "singleScheduletimerStarted",
+                    "%TIME%", runnable.getTime(),
+                    "%DURATION%", plugin.getFormattedTime((int) duration.getSeconds()),
+                    "%SERVER%", server.getName()
+            ));
        } else {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
        }
    }

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -23,10 +22,9 @@ 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.time.Duration;
 import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.TimeUnit;

 public final class SingleStarttimerCommand extends ProxyCommandInfo {

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

-            plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, true);
-            sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+            plugin.startMaintenanceRunnable(duration, 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());
+
+            final Duration duration = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[2], false);
+            if (duration == null) {
+                sender.send(getHelpMessage());
                return;
            }

            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]), TimeUnit.MINUTES, true);
-            sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", runnable.getTime()));
+            final MaintenanceRunnableBase runnable = plugin.startSingleMaintenanceRunnable(server, duration, true);
+            sender.send(getMessage(
+                    "singleStarttimerStarted",
+                    "%TIME%", runnable.getTime(),
+                    "%SERVER%", server.getName()
+            ));
        } else {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
        }
    }

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,26 @@ 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.getServerNameOf(sender))) {
-                    sender.sendMessage(getMessage(maintenance ? "singleMaintenanceActivated" : "singleMaintenanceDeactivated").replace("%SERVER%", server.getName()));
+                    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());
+            sender.send(getHelpMessage());
        }
    }

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,13 +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"));
+            sender.send(getMessage("singleServerMaintenanceListEmpty"));
            return;
        }

-        sender.sendMessage(getMessage("singleServerMaintenanceList"));
+        sender.send(getMessage("singleServerMaintenanceList"));
        for (final String server : getSettings().getMaintenanceServers()) {
-            sender.sendMessage("§8- §b" + server);
+            sender.send(getMessage("singleServerMaintenanceListEntry", "%SERVER%", server));
        }
    }
 }
@@ -0,0 +1,78 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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<>(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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -61,11 +60,11 @@ public abstract class ProxyJoinListenerBase extends JoinListenerBase {
            // Player already is on the waiting server
            final String currentServer = plugin.getServerNameOf(sender);
            if (waitingServer.getName().equals(currentServer)) {
-                sender.sendMessage(settings.getMessage("forceWaitingServer"));
+                sender.send(settings.getMessage("forceWaitingServer"));
                return DENIED;
            }

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

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

        if (normalServerConnect) {
-            sender.sendMessage(settings.getServerKickMessage(target.getName()));
+            sender.send(settings.getServerKickMessage(target.getName()));
            return DENIED;
        }

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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.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;
@@ -49,10 +49,22 @@ public final class MySQL {
        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)) {
@@ -79,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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,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.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 class SingleMaintenanceRunnable extends MaintenanceRunnableBase {
    protected final Server server;
@@ -33,22 +33,26 @@ public 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 getStartMessage() {
-        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 getEndMessage() {
-        return settings.getMessage("singleEndtimerBroadcast").replace("%TIME%", getTime()).replace("%SERVER%", server.getName());
+    protected Component getEndMessage() {
+        return settings.getMessage("singleEndtimerBroadcast",
+                "%TIME%", getTime(),
+                "%SERVER%", server.getName());
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,27 +15,33 @@
 * 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 java.util.concurrent.TimeUnit;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import java.time.Duration;

 public final class SingleMaintenanceScheduleRunnable extends SingleMaintenanceRunnable {
-    private final int maintenanceDuration;
+    private final int maintenanceDurationSeconds;

    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;
+        this.maintenanceDurationSeconds = maintenanceDuration;
    }

    @Override
    protected void finish() {
        super.finish();
-        ((MaintenanceProxyPlugin) plugin).startSingleMaintenanceRunnable(server, maintenanceDuration, TimeUnit.SECONDS, false);
+        ((MaintenanceProxyPlugin) plugin).startSingleMaintenanceRunnable(server, Duration.ofSeconds(maintenanceDurationSeconds), false);
+    }
+
+    @Override
+    protected Component getStartMessage() {
+        return settings.getMessage("singleScheduletimerBroadcast",
+                "%SERVER%", server.getName(),
+                "%TIME%", getTime(), "%DURATION%", plugin.getFormattedTime(maintenanceDurationSeconds));
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,7 +38,7 @@ public final class DummyServer implements Server {
    }

    @Override
-    public void broadcast(final String s) {
+    public void broadcast(final Component component) {
    }

    @Override
@@ -0,0 +1,38 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,66 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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
+    public void send(final Component component) {
+    }
+
+    @Override
+    public boolean isPlayer() {
+        return true;
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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.util;

 import eu.kennytv.maintenance.api.proxy.Server;
@@ -0,0 +1,31 @@
+plugins {
+    id("net.kyori.blossom")
+    id("org.jetbrains.gradle.plugin.idea-ext")
+}
+
+sourceSets {
+    main {
+        blossom {
+            javaSources {
+                property("version", project.version.toString())
+                property("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()
+}
@@ -0,0 +1,37 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2023 ViaVersion and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package eu.kennytv.maintenance.core.util;
+
+public final class MaintenanceVersion {
+
+    public static final String VERSION = "{{ version }}";
+    private static final String IMPLEMENTATION_VERSION = "{{ impl_version }}";
+
+    public static String getVersion() {
+        return VERSION;
+    }
+
+    public static String getImplementationVersion() {
+        return IMPLEMENTATION_VERSION;
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,21 +15,20 @@
 * 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;
@@ -37,14 +36,12 @@ 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 org.jetbrains.annotations.Nullable;
-
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.format.NamedTextColor;
 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;
@@ -53,21 +50,31 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
+import org.jetbrains.annotations.Nullable;

-public abstract class MaintenancePlugin implements IMaintenance {
+public abstract class MaintenancePlugin implements Maintenance {
+    public static final Gson GSON = new GsonBuilder().create();
+    public static final String HANGAR_URL = "https://hangar.papermc.io/kennytv/Maintenance";
+    private static final Pattern INT_PATTERN = Pattern.compile("[0-9]+");
    protected final EventManager eventManager;
    protected final Version version;
    protected Settings settings;
    protected ServerListPlusHook serverListPlusHook;
    protected MaintenanceRunnable runnable;
    protected MaintenanceCommand commandManager;
-    private final String prefix;
+    private final Component prefix;
    private final ServerType serverType;
    private Version newestVersion;
    private boolean debug;
@@ -75,8 +82,14 @@ public abstract class MaintenancePlugin implements IMaintenance {
    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.prefix = Component.text()
+                .append(Component.text().content("[").color(NamedTextColor.DARK_GRAY))
+                .append(Component.text().content("Maintenance").color(NamedTextColor.YELLOW))
+                .append(Component.text().content("]").color(NamedTextColor.DARK_GRAY))
+                .append(Component.text(" "))
+                .build();
+        this.eventManager = new eu.kennytv.maintenance.core.event.EventManager();
+        MaintenanceProvider.setMaintenance(this);
    }

    public void disable() {
@@ -88,13 +101,21 @@ 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().log(Level.SEVERE, "Error while executing extra maintenance " + (maintenance ? "enable" : "disable") + " command: " + command, e);
+            }
+        }
    }

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

@@ -110,46 +131,65 @@ public abstract class MaintenancePlugin implements IMaintenance {
        eventManager.callEvent(new MaintenanceChangedEvent(maintenance));
    }

-    public String replacePingVariables(String s) {
-        if (s.contains("%TIMER%")) {
-            s = s.replace("%TIMER%", getTimerMessage());
+    public String replacePingVariables(String component) {
+        if (component.contains("%TIMER%")) {
+            component = component.replace("%TIMER%", getTimerMessage());
        }
-        if (s.contains("%ONLINE%")) {
-            s = s.replace("%ONLINE%", Integer.toString(getOnlinePlayers()));
-        }
-        if (s.contains("%MAX%")) {
-            s = s.replace("%MAX%", Integer.toString(getMaxPlayers()));
-        }
-        return s;
+        component = component.replace("%ONLINE%", String.valueOf(getOnlinePlayers()));
+        component = component.replace("%MAX%", String.valueOf(getMaxPlayers()));
+        return component;
    }

    public String getTimerMessage() {
-        if (!isTaskRunning()) return settings.getMessage("motdTimerNotRunning", "-");
+        if (!isTaskRunning()) {
+            return settings.getLanguageString("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.getLanguageString("motdTimer",
+                "%HOURS%", String.format("%02d", preHours / 60),
+                "%MINUTES%", String.format("%02d", minutes),
+                "%SECONDS%", String.format("%02d", seconds));
    }

-    public void startMaintenanceRunnable(final long duration, final TimeUnit unit, final boolean enable) {
-        runnable = new MaintenanceRunnable(this, settings, (int) unit.toSeconds(duration), 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();
+    }
+
+    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 Duration duration, final boolean enable) {
+        runnable = new MaintenanceRunnable(this, settings, (int) duration.getSeconds(), 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 void scheduleMaintenanceRunnable(final Duration enableIn, final Duration maintenanceDuration) {
+        runnable = new MaintenanceScheduleRunnable(this, settings, (int) enableIn.getSeconds(), (int) maintenanceDuration.getSeconds());
    }

    public boolean updateAvailable() {
        try {
            checkNewestVersion();
-            return version.compareTo(newestVersion) == -1;
+            return version.compareTo(newestVersion) < 0;
        } catch (final Exception e) {
            return false;
        }
@@ -169,7 +209,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
            setMaintenance(false);
            settings.setSavedEndtimer(0);
        } else {
-            startMaintenanceRunnable(settings.getSavedEndtimer() - current, TimeUnit.MILLISECONDS, false);
+            startMaintenanceRunnable(Duration.ofMillis(settings.getSavedEndtimer() - current), false);
            getLogger().info("The timer has been continued - maintenance will be disabled in: " + getTimerMessage());
        }
    }
@@ -180,44 +220,48 @@ public abstract class MaintenancePlugin implements IMaintenance {
            try {
                checkNewestVersion();
            } catch (final Exception e) {
-                getLogger().warning("An error occured during update checking!");
                return;
            }

            final int compare = version.compareTo(newestVersion);
-            if (compare == -1) {
-                getLogger().info("§cNewest version available: §aVersion " + newestVersion + "§c, you're on §a" + version);
-            } else if (compare == 1) {
+            if (compare < 0) {
+                getLogger().warning("Newest version available: Version " + newestVersion + ", you're on " + version);
+            } else if (compare > 0) {
                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("You'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!");
+                    getLogger().info("You're running a version, that doesn't exist!");
                }
            }
        });
    }

-    public boolean installUpdate() {
-        // Ore sad :(
-        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();
-            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();
-            if (newlength < 10000) {
-                file.delete();
-                return false;
-            }
+    public boolean installUpdate() throws Exception {
+        // Sponge and Velocity need their own jar
+        final String platformInfix = serverType == ServerType.VELOCITY ? "Velocity-" : serverType == ServerType.SPONGE ? "Sponge-" : "";
+        final String fileName = "Maintenance-" + platformInfix + newestVersion + ".jar";
+        final Path tempFilePath = Paths.get(getPluginFolder() + "Maintenance.tmp");
+        final URLConnection connection = new URL("https://github.com/kennytv/Maintenance/releases/download/" + newestVersion + "/" + fileName).openConnection();
+        try (final BufferedInputStream is = new BufferedInputStream(connection.getInputStream());
+             final BufferedOutputStream os = new BufferedOutputStream(Files.newOutputStream(tempFilePath))) {
+            writeFile(is, os);
+        }

-            writeFile(new FileInputStream(file), new BufferedOutputStream(new FileOutputStream(getPluginFile())));
+        final File file = tempFilePath.toFile();
+        final long newlength = file.length();
+        if (newlength < 10_000) {
+            // Sanity check the file length
            file.delete();
-            return true;
-        } catch (final Exception e) {
-            e.printStackTrace();
            return false;
        }
+
+        try (final InputStream is = Files.newInputStream(file.toPath());
+             final BufferedOutputStream os = new BufferedOutputStream(Files.newOutputStream(getPluginFile().toPath()))) {
+            writeFile(is, os);
+        }
+
+        file.delete();
+        return true;
    }

    private void writeFile(final InputStream is, final OutputStream os) throws IOException {
@@ -226,13 +270,12 @@ public abstract class MaintenancePlugin implements IMaintenance {
        while ((chunkSize = is.read(chunk)) != -1) {
            os.write(chunk, 0, chunkSize);
        }
-        is.close();
-        os.close();
    }

    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 URLConnection connection = new URL("https://hangar.papermc.io/api/v1/projects/Maintenance/latestrelease").openConnection();
+        connection.setRequestProperty("User-Agent", "Maintenance/" + getVersion());
+        try (final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
            final String newVersionString = reader.readLine();
            final Version newVersion = new Version(newVersionString);
            if (!newVersion.equals(version)) {
@@ -244,36 +287,33 @@ public abstract class MaintenancePlugin implements IMaintenance {
    public String pasteDump() {
        final MaintenanceDump dump = new MaintenanceDump(this, settings);
        try {
-            final HttpURLConnection connection = (HttpURLConnection) new URL("https://hastebin.com/documents").openConnection();
+            final HttpURLConnection connection = (HttpURLConnection) new URL("https://api.pastes.dev/post").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, hastebin.com down?");
+                getLogger().warning("Could not paste dump, pastes.dev 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();
+            getLogger().log(Level.WARNING, "Could not paste dump :(", e);
            return null;
        }
    }
@@ -308,7 +348,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
        try {
            uuid = UUID.fromString(s);
        } catch (final Exception e) {
-            sender.sendMessage(settings.getMessage("invalidUuid"));
+            sender.send(settings.getMessage("invalidUuid"));
            return null;
        }
        return uuid;
@@ -321,7 +361,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
    }

    public boolean isNumeric(final String string) {
-        return string.matches("[0-9]+");
+        return INT_PATTERN.matcher(string).matches();
    }

    @Override
@@ -340,7 +380,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
    }

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

@@ -372,7 +412,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
        return newestVersion;
    }

-    public String getPrefix() {
+    public Component prefix() {
        return prefix;
    }

@@ -398,21 +438,28 @@ 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 sendUpdateNotification(SenderInfo sender);
+    public abstract void broadcast(Component component);

    public abstract Task startMaintenanceRunnable(Runnable runnable);

-    @Nullable
-    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 CompletableFuture<@Nullable SenderInfo> getOfflinePlayer(String name);

-    @Nullable
-    public abstract SenderInfo getOfflinePlayer(UUID uuid);
+    public abstract CompletableFuture<@Nullable SenderInfo> getOfflinePlayer(UUID uuid);

    public abstract File getDataFolder();

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

    public abstract Logger getLogger();

@@ -0,0 +1,616 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
+
+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.minimessage.MiniMessage;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
+import java.util.logging.Level;
+import org.jetbrains.annotations.Nullable;
+
+public class Settings implements eu.kennytv.maintenance.api.Settings {
+    public static final String NEW_LINE_REPLACEMENT = "<br>";
+    private static final int CONFIG_VERSION = 9;
+    private static final int LANGUAGE_VERSION = 2;
+    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 List<String> commandsOnMaintenanceEnable;
+    private List<String> commandsOnMaintenanceDisable;
+    private String legacyParsedPlayerCountMessage;
+    private String legacyParsedTimerPlayerCountMessage;
+    private List<String> legacyParsedPlayerCountHoverLines;
+    private List<String> legacyParsedTimerPlayerCountHoverLines;
+    private String prefixString;
+    private String languageName;
+    private boolean enablePingMessages;
+    private boolean customPlayerCountMessage;
+    private boolean customPlayerCountHoverMessage;
+    private boolean customMaintenanceIcon;
+    private boolean joinNotifications;
+    private boolean updateChecks;
+    private boolean saveEndtimerOnStop;
+    private boolean kickOnlinePlayers;
+    private boolean debug;
+    private long savedEndtimer;
+
+    protected Config config;
+    protected Config language;
+    protected Config whitelist;
+
+    public Settings(final MaintenancePlugin plugin, final String... unsupportedFields) {
+        this.plugin = plugin;
+        this.unsupportedFields = unsupportedFields;
+        if (!plugin.getDataFolder().exists()) {
+            updatePluginDirectory();
+            plugin.getDataFolder().mkdirs();
+        }
+
+        createFile("config.yml");
+        createFile("WhitelistedPlayers.yml");
+
+        reloadConfigs();
+    }
+
+    @Override
+    public void reloadConfigs() {
+        try {
+            config = new Config(new File(plugin.getDataFolder(), "config.yml"), unsupportedFields);
+            config.load();
+            config.resetAwesomeHeader();
+            whitelist = new Config(new File(plugin.getDataFolder(), "WhitelistedPlayers.yml"));
+            whitelist.load();
+        } catch (final Exception e) {
+            throw new RuntimeException("Unable to load Maintenance files - probably a malformed config file", e);
+        }
+
+        loadSettings();
+        createLanguageFile();
+
+        try {
+            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 - probably a malformed file", e);
+        }
+
+        try {
+            updateLanguageFile();
+        } catch (final IOException e) {
+            plugin.getLogger().log(Level.SEVERE, "Couldn't update language file", e);
+        }
+
+        prefixString = language.getString("prefix");
+
+        plugin.getEventManager().callEvent(new MaintenanceReloadedEvent());
+    }
+
+    public void saveConfig() {
+        try {
+            config.save();
+        } catch (final IOException e) {
+            plugin.getLogger().log(Level.SEVERE, "Couldn't save the config file!", e);
+        }
+    }
+
+    // Public, as it is used in the MaintenanceAddon
+    public void createFile(final String name) {
+        createFile(name, name);
+    }
+
+    private void createFile(final String name, final String from) {
+        final File file = new File(plugin.getDataFolder(), name);
+        if (!file.exists()) {
+            try (final InputStream in = plugin.getResource(from)) {
+                Files.copy(in, file.toPath());
+            } catch (final IOException e) {
+                throw new RuntimeException("Unable to create " + name + " file for Maintenance!", e);
+            }
+        }
+    }
+
+    private void saveWhitelistedPlayers() {
+        try {
+            whitelist.save();
+        } catch (final IOException e) {
+            plugin.getLogger().log(Level.SEVERE, "Couldn't save the whitelisted players file!", e);
+        }
+    }
+
+    private void createLanguageFile() {
+        final String fileName = "language-" + languageName + ".yml";
+        final File file = new File(plugin.getDataFolder(), fileName);
+        if (file.exists()) return;
+
+        try (final InputStream in = plugin.getResource(fileName)) {
+            Files.copy(in, file.toPath());
+        } catch (final IOException e) {
+            plugin.getLogger().warning("Unable to provide language " + languageName);
+            // Fall back to English language (if not already selected)
+            if (!languageName.equals("en")) {
+                plugin.getLogger().warning("Falling back to default language: en");
+                languageName = "en";
+                createLanguageFile();
+            }
+        }
+    }
+
+    private void loadSettings() {
+        updateConfig();
+
+        final ConfigSection pingMessageSection = config.getSection("ping-message");
+        enablePingMessages = pingMessageSection.getBoolean("enabled", true);
+        // Can't store this pre-parsed as components because gradients will break replacements
+        pingMessages = loadPingMessages(pingMessageSection.getStringList("messages"));
+        if (pingMessageSection.getBoolean("enable-timer-specific-messages")) {
+            timerSpecificPingMessages = loadPingMessages(pingMessageSection.getStringList("timer-messages"));
+        } else {
+            timerSpecificPingMessages = null;
+        }
+
+        maintenance = config.getBoolean("maintenance-enabled");
+        commandsOnMaintenanceEnable = config.getStringList("commands-on-maintenance-enable");
+        commandsOnMaintenanceDisable = config.getStringList("commands-on-maintenance-disable");
+        customMaintenanceIcon = config.getBoolean("custom-maintenance-icon");
+        joinNotifications = config.getBoolean("send-join-notification");
+        broadcastIntervals = new HashSet<>(config.getIntList("timer-broadcast-for-seconds"));
+
+        // Player count and player list hover messages are only accepted and rendered as legacy chat
+        if (plugin.getServerType() != ServerType.SPONGE) {
+            final ConfigSection playerCountMessageSection = config.getSection("player-count-message");
+            customPlayerCountMessage = playerCountMessageSection.getBoolean("enabled");
+            legacyParsedPlayerCountMessage = toLegacy(parse(getConfigMessage(playerCountMessageSection, "message")));
+            if (playerCountMessageSection.getBoolean("enable-timer-specific-message")) {
+                legacyParsedTimerPlayerCountMessage = toLegacy(parse(getConfigMessage(playerCountMessageSection, "timer-message")));
+            } else {
+                legacyParsedTimerPlayerCountMessage = null;
+            }
+        }
+
+        final ConfigSection listHoverMessageSection = config.getSection("player-list-hover-message");
+        customPlayerCountHoverMessage = listHoverMessageSection.getBoolean("enabled");
+        legacyParsedPlayerCountHoverLines = new ArrayList<>();
+        for (final String line : listHoverMessageSection.getString("message").split("<br>")) {
+            legacyParsedPlayerCountHoverLines.add(toLegacy(parse(line)));
+        }
+        if (listHoverMessageSection.getBoolean("enable-timer-specific-message")) {
+            legacyParsedTimerPlayerCountHoverLines = new ArrayList<>();
+            for (final String line : listHoverMessageSection.getString("timer-message").split("<br>")) {
+                legacyParsedTimerPlayerCountHoverLines.add(toLegacy(parse(line)));
+            }
+        } else {
+            legacyParsedTimerPlayerCountHoverLines = null;
+        }
+
+        languageName = config.getString("language").toLowerCase();
+        kickOnlinePlayers = config.getBoolean("kick-online-players", true);
+        updateChecks = config.getBoolean("update-checks", true);
+        debug = config.getBoolean("debug");
+
+        final ConfigSection section = config.getSection("continue-endtimer-after-restart");
+        saveEndtimerOnStop = section.getBoolean("enabled");
+        savedEndtimer = section.getLong("end");
+
+        if (customMaintenanceIcon) {
+            plugin.loadMaintenanceIcon();
+        }
+
+        whitelistedPlayers.clear();
+        for (final Map.Entry<String, Object> entry : whitelist.getValues().entrySet()) {
+            try {
+                whitelistedPlayers.put(UUID.fromString(entry.getKey()), String.valueOf(entry.getValue()));
+            } catch (final IllegalArgumentException e) {
+                plugin.getLogger().warning("Invalid WhitelistedPlayers entry: " + entry.getKey());
+            }
+        }
+
+        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(Locale.ROOT);
+        } else if (plugin.getServerType() == ServerType.SPIGOT) {
+            oldDirName = "MaintenanceSpigot";
+        }
+
+        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().log(Level.SEVERE, "Error while copying " + oldDirName + " to new " + plugin.getDataFolder().getName() + " directory!", e);
+        }
+    }
+
+    private void updateConfig() {
+        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
+                config.getStringList("pingmessages").replaceAll(this::legacyToMinimessage);
+                config.getStringList("timerspecific-pingmessages").replaceAll(this::legacyToMinimessage);
+                config.set("playercounthovermessage", legacyToMinimessage(config.getString("playercounthovermessage")));
+                config.set("playercountmessage", legacyToMinimessage(config.getString("playercountmessage")));
+            }
+            if (version < 9) {
+                config.move("enable-pingmessages", "ping-message.enabled");
+                config.move("pingmessages", "ping-message.messages");
+                config.move("enable-timerspecific-messages", "ping-message.enable-timer-specific-messages");
+                config.move("timerspecific-pingmessages", "ping-message.timer-messages");
+
+                config.move("enable-playercountmessage", "player-count-message.enabled");
+                config.move("playercountmessage", "player-count-message.message");
+
+                config.move("enable-playercounthovermessage", "player-list-hover-message.enabled");
+                config.move("playercounthovermessage", "player-list-hover-message.message");
+            }
+
+            createFile("config-new.yml", "config.yml");
+            final File file = new File(plugin.getDataFolder(), "config-new.yml");
+            final Config tempConfig = new Config(file, unsupportedFields);
+            try {
+                tempConfig.load();
+            } catch (final IOException e) {
+                e.printStackTrace();
+            }
+
+            config.addMissingFields(tempConfig);
+            config.replaceComments(tempConfig);
+            config.set("config-version", CONFIG_VERSION);
+
+            file.delete();
+            tempConfig.clear();
+
+            saveConfig();
+            plugin.getLogger().info("Done! Updated config!");
+        }
+    }
+
+    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();
+        } finally {
+            file.delete();
+        }
+
+        language.addMissingFields(tempConfig);
+        language.replaceComments(tempConfig);
+        tempConfig.clear();
+
+        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 String getConfigMessage(final ConfigSection section, final String path) {
+        final String s = section.getString(path);
+        if (s == null) {
+            plugin.getLogger().warning("The config file is missing the following string: " + path);
+            return path;
+        }
+        return replaceNewlineVar(s);
+    }
+
+    public String getConfigMessage(final String path) {
+        return getConfigMessage(config, path);
+    }
+
+    public String getLanguageString(final String path, final String... replacements) {
+        String s = language.getString(path);
+        if (s == null) {
+            plugin.getLogger().warning("The language file is missing the following string: " + path);
+            return 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 replaceNewlineVar(s).replace("<prefix>", prefixString);
+    }
+
+    public @Nullable String getLanguageStringOrNull(final String path, final String... replacements) {
+        return language.contains(path) ? getLanguageString(path, replacements) : null;
+    }
+
+    public Component getMessage(final String path, final String... replacements) {
+        return parse(getLanguageString(path, replacements));
+    }
+
+    // TODO Cache platform components if there are no replacements
+    public Component getRandomPingMessage() {
+        if (plugin.isTaskRunning() && !plugin.getRunnable().shouldEnable()
+                && hasTimerSpecificPingMessages() && !timerSpecificPingMessages.isEmpty()) {
+            return getPingMessage(timerSpecificPingMessages);
+        }
+        return pingMessages.isEmpty() ? Component.empty() : getPingMessage(pingMessages);
+    }
+
+    private Component getPingMessage(final List<String> list) {
+        final String component = list.size() == 1 ? list.get(0) : list.get(RANDOM.nextInt(list.size()));
+        return parse(plugin.replacePingVariables(component));
+    }
+
+    private List<String> loadPingMessages(final List<String> list) {
+        final List<String> components = new ArrayList<>(list.size());
+        for (final String s : list) {
+            components.add(replaceNewlineVar(s));
+        }
+        return components;
+    }
+
+    @Override
+    public boolean removeWhitelistedPlayer(final UUID uuid) {
+        if (whitelistedPlayers.remove(uuid) == null) {
+            return false;
+        }
+
+        whitelist.remove(uuid.toString());
+        saveWhitelistedPlayers();
+        return true;
+    }
+
+    @Override
+    public boolean removeWhitelistedPlayer(final String name) {
+        UUID uuid = null;
+        for (final Map.Entry<UUID, String> e : whitelistedPlayers.entrySet()) {
+            if (e.getValue().equalsIgnoreCase(name)) {
+                uuid = e.getKey();
+                break;
+            }
+        }
+
+        if (uuid == null) {
+            return false;
+        }
+
+        whitelistedPlayers.remove(uuid);
+        whitelist.remove(uuid.toString());
+        saveWhitelistedPlayers();
+        return true;
+    }
+
+    @Override
+    public boolean addWhitelistedPlayer(final UUID uuid, final String name) {
+        final boolean added = whitelistedPlayers.put(uuid, name) == null;
+        whitelist.set(uuid.toString(), name);
+        saveWhitelistedPlayers();
+        return added;
+    }
+
+    @Override
+    public Map<UUID, String> getWhitelistedPlayers() {
+        return whitelistedPlayers;
+    }
+
+    @Override
+    public boolean isWhitelisted(final UUID uuid) {
+        return whitelistedPlayers.containsKey(uuid);
+    }
+
+    @Override
+    public boolean isMaintenance() {
+        return maintenance;
+    }
+
+    public void setMaintenance(final boolean maintenance) {
+        this.maintenance = maintenance;
+    }
+
+    @Override
+    public boolean isEnablePingMessages() {
+        return enablePingMessages;
+    }
+
+    @Override
+    public boolean isJoinNotifications() {
+        return joinNotifications;
+    }
+
+    @Override
+    public boolean hasCustomIcon() {
+        return customMaintenanceIcon;
+    }
+
+    @Override
+    public boolean debugEnabled() {
+        return debug;
+    }
+
+    public boolean hasUpdateChecks() {
+        return updateChecks;
+    }
+
+    public boolean isSaveEndtimerOnStop() {
+        return saveEndtimerOnStop;
+    }
+
+    public boolean hasTimerSpecificPingMessages() {
+        return timerSpecificPingMessages != null;
+    }
+
+    public boolean isKickOnlinePlayers() {
+        return kickOnlinePlayers;
+    }
+
+    public long getSavedEndtimer() {
+        return savedEndtimer;
+    }
+
+    public void setSavedEndtimer(final long millis) {
+        if (savedEndtimer == millis) {
+            return;
+        }
+
+        this.savedEndtimer = millis;
+        config.getSection("continue-endtimer-after-restart").set("end", millis);
+        saveConfig();
+    }
+
+    public Config getConfig() {
+        return config;
+    }
+
+    public List<String> getPingMessages() {
+        return pingMessages;
+    }
+
+    public List<String> getCommandsOnMaintenanceEnable() {
+        return commandsOnMaintenanceEnable;
+    }
+
+    public List<String> getCommandsOnMaintenanceDisable() {
+        return commandsOnMaintenanceDisable;
+    }
+
+    public @Nullable List<String> getTimerSpecificPingMessages() {
+        return timerSpecificPingMessages;
+    }
+
+    public Set<Integer> getBroadcastIntervals() {
+        return broadcastIntervals;
+    }
+
+    public String getLegacyParsedPlayerCountMessage() {
+        final String message = timerDependent(legacyParsedPlayerCountMessage, legacyParsedTimerPlayerCountMessage);
+        return plugin.replacePingVariables(message);
+    }
+
+    public String[] getLegacyParsedPlayerCountHoverLines() {
+        final List<String> lines = timerDependent(legacyParsedPlayerCountHoverLines, legacyParsedTimerPlayerCountHoverLines);
+        final String[] parsedLines = new String[lines.size()];
+        for (int i = 0; i < lines.size(); i++) {
+            parsedLines[i] = plugin.replacePingVariables(lines.get(i));
+        }
+        return parsedLines;
+    }
+
+    private <T> T timerDependent(final T normal, final @Nullable T timerSpecific) {
+        return timerSpecific != null && plugin.isTaskRunning() && !plugin.getRunnable().shouldEnable() ? timerSpecific : normal;
+    }
+
+    public Component getKickMessage() {
+        return parse(plugin.replacePingVariables(getLanguageString("kickmessage")));
+    }
+
+    public String getLanguage() {
+        return languageName;
+    }
+
+    public boolean hasCustomPlayerCountMessage() {
+        return customPlayerCountMessage;
+    }
+
+    public boolean hasCustomPlayerCountHoverMessage() {
+        return customPlayerCountHoverMessage;
+    }
+
+    protected Component parse(final String s) {
+        return MiniMessage.miniMessage().deserialize(s);
+    }
+
+    protected String toLegacy(final Component component) {
+        return LegacyComponentSerializer.legacySection().serialize(component);
+    }
+
+    /*
+     * 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;

 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;
@@ -30,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, @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);
    }

@@ -54,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;
@@ -62,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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;

 import eu.kennytv.maintenance.core.MaintenancePlugin;
@@ -37,15 +36,19 @@ 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.time.Duration;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.jetbrains.annotations.Nullable;

 public abstract class MaintenanceCommand {
+    private static final long MAX_TASK_DURATION_SECONDS = TimeUnit.DAYS.toSeconds(28);
    protected final MaintenancePlugin plugin;
    protected final Settings settings;
    private final Map<String, CommandInfo> commandExecutors = new LinkedHashMap<>();
@@ -86,7 +89,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) {
@@ -100,7 +103,7 @@ public abstract class MaintenanceCommand {
            return;
        }
        if (!command.hasPermission(sender)) {
-            sender.sendMessage(settings.getMessage("noPermission"));
+            sender.send(settings.getMessage("noPermission"));
            return;
        }

@@ -114,7 +117,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);
                }
            }
@@ -125,29 +129,41 @@ public abstract class MaintenanceCommand {
        return info != null && info.hasPermission(sender) ? info.getTabCompletion(sender, args) : Collections.emptyList();
    }

-    public boolean checkTimerArgs(final SenderInfo sender, final String time, final boolean taskCheck) {
-        if (!plugin.isNumeric(time)) return true;
-        if (taskCheck) {
-            if (plugin.isTaskRunning()) {
-                sender.sendMessage(settings.getMessage("timerAlreadyRunning"));
-                return true;
+    public @Nullable Duration parseDurationAndCheckTask(final SenderInfo sender, final String time, final boolean taskCheck) {
+        final Duration duration;
+        if (plugin.isNumeric(time)) {
+            // Assume minutes by default as per old command behavior
+            duration = Duration.ofMinutes(Integer.parseInt(time));
+        } else {
+            try {
+                // Only accept hours, minutes, and seconds
+                duration = Duration.parse("PT" + time.toUpperCase(Locale.ROOT));
+            } catch (final DateTimeParseException e) {
+                return null;
            }
        }

-        final int minutes = Integer.parseInt(time);
-        if (minutes > 40320) {
-            sender.sendMessage(settings.getMessage("timerTooLong"));
-            return true;
+        if (taskCheck) {
+            if (plugin.isTaskRunning()) {
+                sender.send(settings.getMessage("timerAlreadyRunning"));
+                return null;
+            }
        }
-        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.");
-            return true;
+
+        final long seconds = duration.getSeconds();
+        if (seconds > MAX_TASK_DURATION_SECONDS) {
+            sender.send(settings.getMessage("timerTooLong"));
+            return null;
        }
-        return false;
+        if (seconds < 1) {
+            sender.sendRich("<i><dark_gray>[kennytv whispers to you] <gray>Think about running a timer for a negative amount of minutes. Doesn't work <b>that</b> <gray>well.");
+            return null;
+        }
+        return duration;
    }

-    public boolean checkTimerArgs(final SenderInfo sender, final String time) {
-        return checkTimerArgs(sender, time, true);
+    public @Nullable Duration parseDurationAndCheckTask(final SenderInfo sender, final String time) {
+        return parseDurationAndCheckTask(sender, time, true);
    }

    protected void addToggleAndTimerCommands() {
@@ -159,24 +175,6 @@ public abstract class MaintenanceCommand {
        add(new AbortTimerCommand(plugin), "aborttimer", "abort");
    }

-    public void checkForUpdate(final SenderInfo sender) {
-        if (plugin.updateAvailable()) {
-            sender.sendMessage(plugin.getPrefix() + "§cNewest version available: §aVersion " + plugin.getNewestVersion() + "§c, you're on §a" + plugin.getVersion());
-            // Ore sad :(
-            if (plugin.getServerType() != ServerType.SPONGE) {
-                sender.sendMessage(plugin.getPrefix() + "§c§lWARNING: §cYou will have to restart the server to prevent further issues and to complete the update! If you can't do that, don't update!");
-                sendUpdateMessage(sender);
-            } else {
-                sender.sendMessage(plugin.getPrefix() + "§aDownload the latest version on the Ore plugin page: §bhttps://ore.spongepowered.org/KennyTV/Maintenance");
-            }
-        } else
-            sender.sendMessage(plugin.getPrefix() + "§aYou already have the latest version of the plugin!");
-    }
-
-    protected void sendUpdateMessage(final SenderInfo sender) {
-        sender.sendMessage(plugin.getPrefix() + "§eUse §c§l/maintenance forceupdate §eto update!");
-    }
-
    public List<String> getServersCompletion(final String s) {
        return null;
    }
@@ -189,8 +187,6 @@ public abstract class MaintenanceCommand {
        return null;
    }

-    public abstract void sendDumpMessage(final SenderInfo sender, final String url);
-
    public List<CommandInfo> getCommands() {
        return commands;
    }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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"));
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -25,15 +24,14 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 public final class DebugCommand extends CommandInfo {

    public DebugCommand(final MaintenancePlugin plugin) {
-        super(plugin, "debug");
+        super(plugin, "debug", false);
    }

    @Override
    public void execute(final SenderInfo sender, final String[] args) {
        if (checkArgs(sender, args, 1)) return;

-        //TODO put this and the help message into language files
        plugin.setDebug(!plugin.isDebug());
-        sender.sendMessage("Debug mode is now " + (plugin.isDebug() ? "enabled" : "disabled"));
+        sender.sendPrefixedRich("<gray>Debug mode is now " + (plugin.isDebug() ? "<green>enabled" : "<red>disabled"));
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,16 @@
 * 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.TextComponent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.event.ClickEvent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.event.HoverEvent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.format.NamedTextColor;
 import java.util.concurrent.TimeUnit;

 public final class DumpCommand extends CommandInfo {
@@ -35,25 +38,29 @@ public final class DumpCommand extends CommandInfo {
    public void execute(final SenderInfo sender, final String[] args) {
        if (checkArgs(sender, args, 1)) return;
        if (System.currentTimeMillis() - lastDump < TimeUnit.MINUTES.toMillis(5)) {
-            sender.sendMessage(plugin.getPrefix() + "§cYou can only create a dump every 5 minutes!");
+            sender.sendPrefixedRich("<red>You can only create a dump every 5 minutes!");
            return;
        }

        lastDump = System.currentTimeMillis();
-        sender.sendMessage(plugin.getPrefix() + "§7The dump is being created, this might take a moment.");
+        sender.sendPrefixedRich("<gray>The dump is being created, this might take a moment.");
        plugin.async(() -> {
            final String key = plugin.pasteDump();
            if (key == null) {
                if (sender.isPlayer()) {
-                    sender.sendMessage(plugin.getPrefix() + "§cCould not paste dump (see the console for details)");
+                    sender.sendPrefixedRich("<red>Could not paste dump (see the console for details)");
                }
                return;
            }

-            final String url = "https://hastebin.com/" + key;
-            sender.sendMessage(plugin.getPrefix() + "§c" + url);
+            final String url = "https://pastes.dev/" + key;
+            sender.sendPrefixedRich("<red><click:open_url:'" + url + "'>" + url + "</click>");
            if (sender.isPlayer()) {
-                plugin.getCommandManager().sendDumpMessage(sender, url);
+                final TextComponent text = Component.text().content("Click here to copy the link").color(NamedTextColor.GRAY)
+                        .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, url))
+                        .hoverEvent(HoverEvent.showText(Component.text("Click here to copy the link to your clipboard").color(NamedTextColor.GREEN)))
+                        .build();
+                sender.send(plugin.prefix().append(text));
            }
        });
    }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,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 java.util.concurrent.TimeUnit;
+import java.time.Duration;

 public final class EndtimerCommand extends CommandInfo {

@@ -33,16 +32,18 @@ public final class EndtimerCommand extends CommandInfo {
    @Override
    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());
+
+        final Duration duration = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[1]);
+        if (duration == null) {
+            sender.send(getHelpMessage());
            return;
        }
        if (!plugin.isMaintenance()) {
-            sender.sendMessage(getMessage("alreadyDisabled"));
+            sender.send(getMessage("alreadyDisabled"));
            return;
        }

-        plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, false);
-        sender.sendMessage(getMessage("endtimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+        plugin.startMaintenanceRunnable(duration, false);
+        sender.send(getMessage("endtimerStarted", "%TIME%", plugin.getRunnable().getTime()));
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,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,7 +35,7 @@ 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;
        }

@@ -46,7 +45,7 @@ public final class HelpCommand extends CommandInfo {
        }

        if (!plugin.isNumeric(args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
            return;
        }

@@ -60,35 +59,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 = commands.subList((page - 1) * COMMANDS_PER_PAGE, Math.min(page * COMMANDS_PER_PAGE, commands.size()));
+        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)));
+            sender.send(getMessage("helpNextPage", "%PAGE%", Integer.toString(page + 1)));
        } else {
-            sender.sendMessage("§8× §eVersion " + plugin.getVersion() + " §7by §bKennyTV");
+            sender.sendRich("<dark_gray>× <yellow>Version: " + plugin.getVersion() + " <gray>by <aqua>kennytv");
        }

-        sender.sendMessage(header);
-        sender.sendMessage("");
+        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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -37,35 +36,35 @@ 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());
+            sender.send(getHelpMessage());
        }
    }

    private void sendList(final SenderInfo sender, final List<String> 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.sendRich("<aqua>" + (i + 1) + "<dark_gray><st>---------");
+            sender.sendRich(list.get(i));
        }
-        sender.sendMessage("§8§m----------");
+        sender.sendRich("<dark_gray><st>----------");
    }

    @Override
    public List<String> getTabCompletion(final SenderInfo sender, final String[] args) {
-        if (args.length != 2 || !getSettings().hasTimerSpecificPingMessages()) return Collections.emptyList();
+        if (args.length != 2 || !getSettings().hasTimerSpecificPingMessages()) {
+            return Collections.emptyList();
+        }
        return Collections.singletonList("timer");
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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.Settings;
 import eu.kennytv.maintenance.core.command.CommandInfo;
+import eu.kennytv.maintenance.core.config.ConfigSection;
 import eu.kennytv.maintenance.core.util.SenderInfo;

 import java.util.ArrayList;
@@ -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,32 @@ 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 ConfigSection section = settings.getConfig().getSection("ping-message");
+        final List<String> pingMessages = section.getStringList(timerPingMessages ? "timer-messages" : "messages");
        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<String> pingComponents = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        pingComponents.remove(index - 1);
        pingMessages.remove(index - 1);
-        settings.getConfig().set(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages", pingMessages);
+        section.set(timerPingMessages ? "timer-messages" : "messages", pingMessages);
        settings.saveConfig();
-        sender.sendMessage(getMessage("removedMotd").replace("%INDEX%", args[1]));
+        sender.send(getMessage("removedMotd", "%INDEX%", args[1]));
    }

    @Override
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,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 java.util.concurrent.TimeUnit;
+import java.time.Duration;

 public final class ScheduleTimerCommand extends CommandInfo {

@@ -33,17 +31,23 @@ public final class ScheduleTimerCommand extends CommandInfo {
    @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.sendMessage(getHelpMessage());
+
+        final Duration enableIn = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[1]);
+        final Duration maintenanceDuration = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[2], false);
+        if (enableIn == null || maintenanceDuration == null) {
+            sender.send(getHelpMessage());
            return;
        }
        if (plugin.isMaintenance()) {
-            sender.sendMessage(getMessage("alreadyEnabled"));
+            sender.send(getMessage("alreadyEnabled"));
            return;
        }

-        plugin.scheduleMaintenanceRunnable(Integer.parseInt(args[1]), Integer.parseInt(args[2]), TimeUnit.MINUTES);
-        sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+        plugin.scheduleMaintenanceRunnable(enableIn, maintenanceDuration);
+        sender.send(getMessage(
+                "scheduletimerStarted",
+                "%TIME%", plugin.getRunnable().getTime(),
+                "%DURATION%", plugin.getFormattedTime((int) maintenanceDuration.getSeconds())
+        ));
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,20 @@
 * 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.config.ConfigSection;
 import eu.kennytv.maintenance.core.util.SenderInfo;
-
 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 +40,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 +49,30 @@ 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<String> pingComponents = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        final ConfigSection section = settings.getConfig().getSection("ping-message");
+        final List<String> pingMessages = section.getStringList(timerPingMessages ? "timer-messages" : "messages");
        final int index = Integer.parseInt(args[1]);
        if (index == 0 || index > pingMessages.size() + 1) {
-            sender.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,23 +80,31 @@ 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;
        }

+        // Replace component in config and the cached list
+        final String componentString = newMessage.replace(NEW_LINE_REPLACEMENT, "\n");
        if (index > pingMessages.size()) {
            pingMessages.add(newMessage);
+            pingComponents.add(componentString);
        } else {
            pingMessages.set(index - 1, newMessage);
+            pingComponents.set(index - 1, componentString);
        }

-        settings.getConfig().set(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages", pingMessages);
+        section.set(timerPingMessages ? "timer-messages" : "messages", 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],
+                "%MOTD%", componentString
+        ));
    }

    @Override
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,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 java.util.concurrent.TimeUnit;
+import java.time.Duration;

 public final class StarttimerCommand extends CommandInfo {

@@ -33,16 +32,18 @@ public final class StarttimerCommand extends CommandInfo {
    @Override
    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());
+
+        final Duration duration = plugin.getCommandManager().parseDurationAndCheckTask(sender, args[1]);
+        if (duration == null) {
+            sender.send(getHelpMessage());
            return;
        }
        if (plugin.isMaintenance()) {
-            sender.sendMessage(getMessage("alreadyEnabled"));
+            sender.send(getMessage("alreadyEnabled"));
            return;
        }

-        plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, true);
-        sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+        plugin.startMaintenanceRunnable(duration, true);
+        sender.send(getMessage("starttimerStarted", "%TIME%", plugin.getRunnable().getTime()));
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
        }

@@ -0,0 +1,76 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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 eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.event.ClickEvent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.event.HoverEvent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.format.NamedTextColor;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.minimessage.MiniMessage;
+
+public final class UpdateCommand extends CommandInfo {
+
+    public UpdateCommand(final MaintenancePlugin plugin) {
+        super(plugin, "update");
+    }
+
+    @Override
+    public void execute(final SenderInfo sender, final String[] args) {
+        if (checkArgs(sender, args, 1)) return;
+        if (args[0].equalsIgnoreCase("update")) {
+            plugin.async(() -> checkForUpdate(sender));
+            return;
+        }
+
+        if (!plugin.updateAvailable()) {
+            sender.sendPrefixedRich("<green>You already have the latest version of the plugin!");
+            return;
+        }
+
+        sender.send(getMessage("updateDownloading"));
+        try {
+            if (plugin.installUpdate()) {
+                sender.send(getMessage("updateFinished"));
+            } else {
+                sender.send(getMessage("updateFailed"));
+            }
+        } catch (final Exception e) {
+            sender.send(getMessage("updateFailed"));
+            e.printStackTrace();
+        }
+    }
+
+    private void checkForUpdate(final SenderInfo sender) {
+        if (!plugin.updateAvailable()) {
+            sender.sendPrefixedRich("<green>You already have the latest version of the plugin!");
+            return;
+        }
+
+        sender.sendPrefixedRich("<red>Newest version available: <green>Version " + plugin.getNewestVersion() + "<red>, you're on <green>" + plugin.getVersion());
+        sender.sendPrefixedRich("<b><red>WARNING: <red>You will have to restart the server to prevent further issues and to complete the update! If you can't do that, don't update!");
+
+        sender.send(Component.text().append(MiniMessage.miniMessage().deserialize("<gold>× <dark_gray>[<green>Update<dark_gray>]"))
+                .clickEvent(ClickEvent.runCommand("/maintenance forceupdate"))
+                .hoverEvent(HoverEvent.showText(Component.text().content("Click here to update the plugin").color(NamedTextColor.GREEN)))
+                .append(Component.text().content(", or manually run ").color(NamedTextColor.GRAY))
+                .append(Component.text().content("/maintenance forceupdate").color(NamedTextColor.RED)).build());
+    }
+}
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -26,6 +25,7 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
+import java.util.logging.Level;

 public final class WhitelistAddCommand extends CommandInfo {

@@ -46,7 +46,7 @@ public final class WhitelistAddCommand extends CommandInfo {
            }
        } else if (args.length == 3) {
            if (args[1].length() != 36) {
-                sender.sendMessage(getHelpMessage());
+                sender.send(getHelpMessage());
                return;
            }

@@ -55,7 +55,7 @@ public final class WhitelistAddCommand extends CommandInfo {
                addPlayerToWhitelist(sender, new DummySenderInfo(uuid, args[2]));
            }
        } else {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
        }
    }

@@ -65,30 +65,44 @@ 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).whenComplete((selected, ex) -> {
+            if (ex != null) {
+                plugin.getLogger().log(Level.SEVERE, "Error while fetching offline player", ex);
+                sender.send(getMessage("offlinePlayerFetchError"));
+                return;
+            }

-        addPlayerToWhitelist(sender, selected);
+            if (selected == null) {
+                sender.send(getMessage("playerNotOnline"));
+                return;
+            }
+
+            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).whenComplete((selected, ex) -> {
+            if (ex != null) {
+                plugin.getLogger().log(Level.SEVERE, "Error while fetching offline player", ex);
+                sender.send(getMessage("offlinePlayerFetchError"));
+                return;
+            }

-        addPlayerToWhitelist(sender, selected);
+            if (selected == null) {
+                sender.send(getMessage("playerNotFoundUuid"));
+                return;
+            }
+
+            addPlayerToWhitelist(sender, selected);
+        });
    }

    private void addPlayerToWhitelist(final SenderInfo sender, final SenderInfo selected) {
        if (getSettings().addWhitelistedPlayer(selected.getUuid(), selected.getName())) {
-            sender.sendMessage(getMessage("whitelistAdded").replace("%PLAYER%", selected.getName()));
+            sender.send(getMessage("whitelistAdded", "%PLAYER%", selected.getName()));
        } else {
-            sender.sendMessage(getMessage("whitelistAlreadyAdded").replace("%PLAYER%", selected.getName()));
+            sender.send(getMessage("whitelistAlreadyAdded", "%PLAYER%", selected.getName()));
        }
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,16 +37,17 @@ public final class WhitelistCommand extends CommandInfo {

        final Map<UUID, String> players = getSettings().getWhitelistedPlayers();
        if (players.isEmpty()) {
-            sender.sendMessage(getMessage("whitelistEmpty"));
+            sender.send(getMessage("whitelistEmpty"));
            return;
        }

-        sender.sendMessage(getMessage("whitelistedPlayers"));
-        final String format = getMessage("whitelistedPlayersFormat");
+        sender.send(getMessage("whitelistedPlayers"));
+        final Component 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.send(format.replaceText(builder -> builder.matchLiteral("%NAME%").replacement(entry.getValue()))
+                    .replaceText(builder -> builder.matchLiteral("%UUID%").replacement(entry.getKey().toString())));
        }

-        sender.sendMessage("");
+        sender.send(Component.empty());
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -51,8 +50,9 @@ public final class WhitelistRemoveCommand extends CommandInfo {
        if (args.length != 2) return Collections.emptyList();

        final List<String> list = new ArrayList<>();
+        String matchNameLowerCase = args[1].toLowerCase();
        for (final String name : getSettings().getWhitelistedPlayers().values()) {
-            if (name.toLowerCase().startsWith(args[1])) {
+            if (name.toLowerCase().startsWith(matchNameLowerCase)) {
                list.add(name);
            }
        }
@@ -60,33 +60,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"));
+        plugin.getOfflinePlayer(name).whenComplete((selected, ex) -> {
+            if (selected == null) {
+                if (getSettings().removeWhitelistedPlayer(name)) {
+                    sender.send(getMessage("whitelistRemoved", "%PLAYER%", name));
+                } else {
+                    sender.send(getMessage("whitelistNotFound"));
+                }
+                return;
            }
-            return;
-        }

-        removePlayerFromWhitelist(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) {
-            removePlayerFromWhitelist(sender, uuid, uuid.toString());
-        } else {
-            removePlayerFromWhitelist(sender, selected.getUuid(), selected.getName());
-        }
+        plugin.getOfflinePlayer(uuid).whenComplete((selected, ex) -> {
+            if (selected == null) {
+                removePlayerFromWhitelist(sender, uuid, uuid.toString());
+            } else {
+                removePlayerFromWhitelist(sender, selected.getUuid(), selected.getName());
+            }
+        });
    }

    private void removePlayerFromWhitelist(final SenderInfo sender, final UUID uuid, final String toReplace) {
        if (getSettings().removeWhitelistedPlayer(uuid)) {
-            sender.sendMessage(getMessage("whitelistRemoved").replace("%PLAYER%", toReplace));
+            sender.send(getMessage("whitelistRemoved", "%PLAYER%", toReplace));
        } else {
-            sender.sendMessage(getMessage("whitelistNotFound"));
+            sender.send(getMessage("whitelistNotFound"));
        }
    }
 }
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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.core.config;

 import com.google.common.collect.Sets;
-import org.jetbrains.annotations.Nullable;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -32,26 +27,31 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
+import org.jetbrains.annotations.Nullable;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;

 /**
- * Further modified version of the SimpleConfig project of PSandro (https://github.com/PSandro/SimpleConfig).
+ * Further modified version of the <a href="https://github.com/PSandro/SimpleConfig">SimpleConfig</a>SimpleConfig project of PSandro.
 *
 * @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;
@@ -109,30 +109,8 @@ public final class Config extends ConfigSection {
        Files.write(file.toPath(), bytes);
    }

-    public boolean addMissingFields(final Map<String, Object> fields, final Map<String, String[]> comments) {
-        // Note: Only scans for the first two levels
-        boolean changed = false;
-        for (final Map.Entry<String, Object> entry : fields.entrySet()) {
-            final Object o = values.get(entry.getKey());
-            if (o != null) {
-                final Object o2 = entry.getValue();
-                if (!(o instanceof Map) || !(o2 instanceof Map)) continue;
-
-                final Map<String, Object> deepMap = (Map<String, Object>) o2;
-                for (final Map.Entry<String, Object> deepEntry : ((Map<String, Object>) o2).entrySet()) {
-                    if (deepMap.containsKey(deepEntry.getKey())) continue;
-                    deepMap.put(deepEntry.getKey(), deepEntry.getValue());
-                    changed = true;
-                }
-                continue;
-            }
-
-            values.put(entry.getKey(), entry.getValue());
-            changed = true;
-        }
-
-        this.comments = new HashMap<>(comments);
-        return changed;
+    public void replaceComments(final Config fromConfig) {
+        this.comments = new HashMap<>(fromConfig.comments);
    }

    private static Yaml createYaml() {
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,20 +15,19 @@
 * 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.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.jetbrains.annotations.Nullable;

 /**
- * Further modified version of the SimpleConfig project of PSandro (https://github.com/PSandro/SimpleConfig).
+ * Further modified version of the <a href="https://github.com/PSandro/SimpleConfig">SimpleConfig</a>SimpleConfig project of PSandro.
 *
- * @author KennyTV
+ * @author kennytv
 */
 public class ConfigSection {

@@ -64,15 +63,15 @@ public class ConfigSection {

    @Nullable
    public Object getObject(final String key, final Object def) {
-        int i1 = -1;
-        int i2;
+        int nextSeparatorIndex = -1;
+        int sectionStartIndex;
        ConfigSection section = this;
-        while ((i1 = key.indexOf('.', i2 = i1 + 1)) != -1) {
-            section = section.getSection(key.substring(i2, i1));
+        while ((nextSeparatorIndex = key.indexOf('.', sectionStartIndex = nextSeparatorIndex + 1)) != -1) {
+            section = section.getSection(key.substring(sectionStartIndex, nextSeparatorIndex));
            if (section == null) return def;
        }

-        final String subKey = key.substring(i2);
+        final String subKey = key.substring(sectionStartIndex);
        if (section == this) {
            final Object result = values.get(subKey);
            return result != null ? result : def;
@@ -98,17 +97,41 @@ public class ConfigSection {
        return new ConfigSection(getRoot(), getFullKeyInPath(key), (Map<String, Object>) o);
    }

+    public ConfigSection getOrCreateSection(final String key) {
+        final Object o = getObject(key);
+        if (!(o instanceof Map)) {
+            set(key, new LinkedHashMap<>());
+            return getSection(key);
+        }
+        return new ConfigSection(getRoot(), getFullKeyInPath(key), (Map<String, Object>) o);
+    }
+
    public boolean contains(final String key) {
        return getObject(key) != null;
    }

    public void set(final String key, @Nullable final Object value) {
-        //TODO go deep if necessary
+        int nextSeparatorIndex = -1;
+        int sectionStartIndex;
+        ConfigSection section = this;
+        while ((nextSeparatorIndex = key.indexOf('.', sectionStartIndex = nextSeparatorIndex + 1)) != -1) {
+            section = section.getOrCreateSection(key.substring(sectionStartIndex, nextSeparatorIndex));
+        }
+
+        final String sectionKey = key.substring(sectionStartIndex);
        if (value == null) {
-            values.remove(key);
+            section.values.remove(sectionKey);
            getRoot().getComments().remove(getFullKeyInPath(key));
        } else {
-            values.put(key, value);
+            section.values.put(sectionKey, value);
+        }
+    }
+
+    public void move(final String key, final String toKey) {
+        final Object o = getObject(key);
+        if (o != null) {
+            remove(key);
+            set(toKey, o);
        }
    }

@@ -193,6 +216,28 @@ public class ConfigSection {
        return list != null ? list : def;
    }

+    public boolean addMissingFields(final ConfigSection fromSection) {
+        boolean changed = false;
+        for (final Map.Entry<String, Object> entry : fromSection.values.entrySet()) {
+            final String key = entry.getKey();
+            final Object value = this.values.get(key);
+            if (value != null) {
+                // Go deeper for sections
+                final Object newValue = entry.getValue();
+                if (!(value instanceof Map) || !(newValue instanceof Map)) {
+                    continue;
+                }
+
+                changed |= this.getSection(key).addMissingFields(fromSection.getSection(key));
+            } else {
+                // Value is missing
+                this.values.put(key, entry.getValue());
+                changed = true;
+            }
+        }
+        return changed;
+    }
+
    /**
     * @return root config
     */
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -27,10 +26,10 @@ import java.util.Map;
 import java.util.regex.Pattern;

 /**
- * Further modified version of the SimpleConfig project of PSandro (https://github.com/PSandro/SimpleConfig).
+ * Further modified version of the <a href="https://github.com/PSandro/SimpleConfig">SimpleConfig</a>SimpleConfig project of PSandro.
 *
 * @author PSandro on 26.01.19
- * @author KennyTV
+ * @author kennytv
 */
 public final class ConfigSerializer {

@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -27,6 +25,7 @@ import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.Map;

+@SuppressWarnings({"FieldCanBeLocal", "unused"})
 public final class MaintenanceDump {
    private final ServerDump general;
    private final Map<String, Object> configuration;
@@ -46,7 +45,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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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.dump;

 import java.util.List;

+@SuppressWarnings({"FieldCanBeLocal", "unused"})
 public final class PluginDump {
    private final String name;
    private final String version;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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.dump;

 import java.util.List;

+@SuppressWarnings({"FieldCanBeLocal", "unused"})
 public final class ServerDump {
    private final String pluginVersion;
    private final String platform;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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
@@ -0,0 +1,53 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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;
@@ -1,6 +1,6 @@
 /*
- * Maintenance - https://git.io/maintenancemode
- * Copyright (C) 2018-2021 KennyTV (https://github.com/KennyTV)
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2024 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,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.listener;

 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 eu.kennytv.maintenance.lib.kyori.adventure.text.TextComponent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.event.ClickEvent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.event.HoverEvent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.format.NamedTextColor;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.format.TextDecoration;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
@@ -29,7 +34,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,18 +63,23 @@ 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;
+            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);
+            sender.sendPrefixedRich("<red>There is a newer version available: <green>Version " + plugin.getNewestVersion() + "<red>, you're on <green>" + plugin.getVersion());
+
+            final TextComponent text = Component.text().content("Download it at: ").color(NamedTextColor.RED)
+                    .append(Component.text().content(MaintenancePlugin.HANGAR_URL).color(NamedTextColor.GOLD))
+                    .append(Component.text().content(" (CLICK ME)").color(NamedTextColor.GRAY).decorate(TextDecoration.BOLD))
+                    .clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, MaintenancePlugin.HANGAR_URL))
+                    .hoverEvent(HoverEvent.showText(Component.text("Download the latest version").color(NamedTextColor.GREEN)))
+                    .build();
+            sender.send(plugin.prefix().append(text));
        });
    }
Author	SHA1	Message	Date
Nassim Jahnke	a9d052eabb	4.3.0 Release	2024-09-17 10:51:56 +02:00
Maintenancer	10c661e849	New Crowdin updates (#138 )	2024-09-15 11:49:45 +02:00
Maintenancer	695f3872a0	New Crowdin updates (#133 )	2024-09-13 17:39:34 +02:00
Nassim Jahnke	05af3d3db2	Accept time durations in timer commands Closes #134	2024-09-13 17:36:13 +02:00
Nassim Jahnke	f9396fa369	Put ping, player count, and player list hover messages into sections	2024-09-13 16:20:02 +02:00
Nassim Jahnke	ddc43fb1eb	Fix dummy sample player profiles on 1.21 Paper	2024-09-13 15:00:50 +02:00
Nassim Jahnke	5c51dd86b6	Add timer-specific player count and player sample messages Closes #131	2024-09-13 14:50:17 +02:00
Nassim Jahnke	dcb5f64449	Don't send broadcasts to the console twice Fixes #129	2024-09-13 14:15:28 +02:00
Nassim Jahnke	c0b991932c	Remove all leftover legacy chat usage	2024-09-13 13:23:18 +02:00
Nassim Jahnke	3b9ef8b006	Clear sample players in Velocity ping listener	2024-09-13 12:47:05 +02:00
Nassim Jahnke	c73e18acf1	Upgrade Gradle wrapper	2024-09-13 12:45:42 +02:00
Maintenancer	55576dce4a	New Crowdin updates (#124 ) * New translations language-en.yml (Vietnamese) * New translations language-en.yml (French) * New translations language-en.yml (Russian) * New translations language-en.yml (Hungarian) * New translations language-en.yml (Spanish) * New translations language-en.yml (German)	2024-08-29 13:37:28 +02:00
Nassim Jahnke	aa1c77c230	Update actions	2024-08-27 22:01:30 +02:00
Nassim Jahnke	72b5f38e63	Default to empty list if fallback field is missing/null	2024-08-27 21:51:09 +02:00
Nassim Jahnke	3e8cc06aa7	Don't log color codes, more message cleanups	2024-08-27 12:06:21 +02:00
Nassim Jahnke	0f375adce6	Rename Paper module, replace dump and update message sending with adventure components	2024-08-26 22:56:07 +02:00
Nassim Jahnke	9c5e8182cc	Fix maintenance dump command	2024-08-26 22:18:39 +02:00
Nassim Jahnke	1b94594fc1	Update dependencies	2024-08-26 22:12:21 +02:00
Nassim Jahnke	67bdc8261a	Update shadow	2024-08-08 10:05:44 +02:00
Nassim Jahnke	e255529f78	Update Hangar latest release endpoint	2024-07-31 18:14:01 +02:00
Maintenancer	5b7ab9fe42	New Crowdin updates (#121 ) * New translations language-en.yml (Portuguese) * New translations language-en.yml (Spanish) * New translations language-en.yml (Italian) * New translations language-en.yml (English) * Update source file language-en.yml * New translations language-en.yml (Vietnamese)	2024-06-13 16:33:37 +02:00
Nassim Jahnke	cfa30cea79	Bump version to 4.2.2-SNAPSHOT	2024-06-13 16:32:30 +02:00
Nassim Jahnke	c59b784e48	Update Gradle wrapper	2024-06-01 17:10:15 +02:00
Nassim Jahnke	864fee66fa	4.2.1 Release	2024-05-17 15:39:28 +02:00
Maintenancer	3c810d7ed3	New Crowdin updates (#120 ) * New translations language-en.yml (Chinese Simplified) * New translations language-en.yml (Russian)	2024-05-17 15:25:26 +02:00
Maintenancer	e24806694e	New Crowdin updates (#119 )	2024-04-30 00:10:43 +02:00
Nassim Jahnke	fa7effe8f3	Add paperweight-mappings-namespace attribute	2024-04-28 03:53:56 +02:00
EpicPlayerA10	26802cbe1a	Offline player fetching improvements (#117 )	2024-03-24 18:40:20 +01:00
Alec Jensen	1cb35abccb	Show proxied maintenance status in ping for forced hosts (#118 )	2024-03-24 10:57:56 +01:00
Nassim Jahnke	1f2d0bba2a	Update Gradle wrapper	2024-03-24 10:30:34 +01:00
Maintenancer	a7e577554c	New Crowdin updates (#114 ) * New translations language-en.yml (Russian) * New translations language-en.yml (Chinese Simplified)	2024-03-02 20:35:26 +01:00
Maintenancer	c0b3ea22b9	New Crowdin updates (#113 )	2024-02-04 17:25:28 +01:00
Maintenancer	0adf767b5e	New translations language-en.yml (French) by Kertie2_ (#112 )	2024-01-14 17:45:55 +01:00
Maintenancer	3cc21504f0	New Crowdin updates (#110 ) * New translations language-en.yml (Italian) * New translations language-en.yml (Hungarian) * New translations language-en.yml (Chinese Simplified) * New translations language-en.yml (Spanish) * New translations language-en.yml (Turkish) * New translations language-en.yml (German) * New translations language-en.yml (Russian)	2024-01-14 17:39:41 +01:00
Nassim Jahnke	cdebac351f	Update copyright headers	2024-01-01 21:45:25 +01:00
Nassim Jahnke	8941b55362	Don't keep converting player count and count hover messages	2024-01-01 21:44:08 +01:00
Nassim Jahnke	fa225ad5f0	Bump version to 4.2.1-SNAPSHOT	2023-12-31 16:26:22 +01:00
Nassim Jahnke	dea7fc9032	Update Gradle wrapper	2023-12-13 22:47:27 +01:00
Nassim Jahnke	ced1651c05	Update changelog title	2023-09-17 19:43:53 +10:00
Nassim Jahnke	6be27d05bb	4.2.0 Release	2023-09-17 18:31:33 +10:00
Maintenancer	c39bb44e42	New Crowdin updates (#109 )	2023-09-17 18:19:30 +10:00
Nassim Jahnke	b71e1ce25d	Add server specific timer command messages	2023-09-17 13:25:38 +10:00
Nassim Jahnke	b5cfc47524	Update Blossom	2023-09-17 12:50:37 +10:00
Nassim Jahnke	c32698fc76	Update maven repo for SLP and readd hook	2023-09-11 13:35:19 +10:00
Nassim Jahnke	b177c5e2f8	Don't publish adventure modules	2023-09-10 15:14:57 +10:00
Nassim Jahnke	d0e0aff78e	Configure (manual) publishing	2023-09-10 14:47:48 +10:00
Nassim Jahnke	9f5ecd590e	Remove SLP dependency for now The repository is not available and thus breaks building...	2023-09-10 14:11:41 +10:00
Nassim Jahnke	bc93f1f36d	Update Gradle wrapper	2023-09-10 13:44:08 +10:00
Maintenancer	3c1c1e48fb	New translations language-en.yml (Japanese) (#108 )	2023-09-08 11:05:24 +10:00
Maintenancer JaeWoong Suh Jan CHristensen	c8e14e1d74	New Crowdin updates (#105 ) * New translations language-en.yml (Portuguese) * New translations language-en.yml (Danish) * New translations language-en.yml (Korean) Co-authored-by: JaeWoong Suh <90325840+SuhJae@users.noreply.github.com> Co-authored-by: Jan CHristensen <skrivtiljan@gmail.com>	2023-08-08 17:04:49 +10:00
Maintenancer	29300d5fe2	Hungarian translation file (thanks to Kende)	2023-06-26 11:46:40 +02:00
Nassim Jahnke	7da9365e23	Add config options for commands on single server maintenance enable/disable	2023-06-15 13:08:28 +02:00
Nassim Jahnke	ded84cd1c9	Update gradle wrapper	2023-06-15 12:30:01 +02:00
Maintenancer	62cc71675b	New Crowdin updates (#99 )	2023-06-15 11:41:00 +02:00
Nassim Jahnke	0752d3dc93	Update dependencies	2023-06-15 11:39:38 +02:00
Nassim Jahnke	d352e44e50	Send user-agent to Hangar API	2023-06-15 11:36:28 +02:00
Nassim Jahnke	83877a6c3a	Bump version to 4.2.0-SNAPSHOT	2023-06-15 11:34:24 +02:00
Nassim Jahnke	199eb2e67d	4.1.0 Release	2023-04-17 09:57:04 +02:00
Nassim Jahnke	0683450c2d	Update version checker endpoint to Hangar	2023-04-17 09:57:04 +02:00
Nassim Jahnke	dbdd7d18d0	Update Gradle wrapper	2023-04-15 11:17:25 +02:00
Maintenancer	cf4ae33ca7	New translations language-en.yml (Japanese) (#98 ) Thanks to yu-solt	2023-04-15 11:15:24 +02:00
Nassim Jahnke	ba8c574e79	Update Folia class check	2023-03-30 08:45:52 +02:00
Nassim Jahnke	225fe4b15a	Add preliminary Folia support	2023-03-10 12:53:44 +01:00
Nassim Jahnke	de203244c3	Add `enable-playercounthovermessage` option, don't disable playercount messages when disabling pingmessages	2023-03-08 15:01:12 +01:00
Nassim Jahnke	167065eef5	Update Gradle wrapper and shadow	2023-03-08 15:00:25 +01:00
Maintenancer	25503f6196	New Crowdin updates (#95 ) * New translations language-en.yml (Spanish) * New translations language-en.yml (Polish) * New translations language-en.yml (Russian)	2023-03-08 14:54:39 +01:00
Nassim Jahnke	23bfe7ef8f	Small cleanup	2023-02-25 11:44:13 +01:00
Nassim Jahnke	31e721f443	Fix variable replacement with gradients	2023-02-25 10:42:24 +01:00
Nassim Jahnke	158680e6ca	Update Gradle wrapper, dependencies	2023-02-25 10:41:10 +01:00
Nassim Jahnke	b6c9c1bd5e	Update workflow	2023-02-22 16:36:59 +01:00
Maintenancer	370b9d9eb8	New Crowdin updates (#94 )	2023-02-07 13:33:40 +01:00
Nassim Jahnke	339136c1f2	New Crowdin updates (#93 )	2023-02-07 13:24:49 +01:00
Nassim Jahnke	4f0e158435	Update README	2023-02-07 13:06:58 +01:00
Nassim Jahnke	c6efc58242	New Crowdin updates (#91 )	2023-02-07 12:39:00 +01:00
Nassim Jahnke	6aed091356	Update Crowdin configuration file	2023-02-07 12:01:13 +01:00
Nassim Jahnke	d343c75eb6	Remove platform specific aliases	2023-02-07 09:24:48 +01:00
Nassim Jahnke	9cbe2597d0	Update download url	2023-01-28 12:06:20 +01:00
Nassim Jahnke	912d094d6d	Add Ukrainian translation file (thanks to Mrlucke)	2023-01-01 13:52:19 +01:00
Nassim Jahnke	6d942f87ce	Fix Velocity startup Closes #87	2022-12-19 17:26:35 +01:00
Nassim Jahnke	30380604da	Thank you gradle, very cool	2022-12-09 11:20:06 +01:00
Nassim Jahnke	f2c07f1fd4	Update Gradle wrapper	2022-12-08 10:36:29 +01:00
Nassim Jahnke	36f14a6b30	Relocate bstats	2022-10-01 13:43:12 +02:00
Nassim Jahnke	871bd0882c	Fix the message for cancelling proxied server timers not replacing the server argument	2022-10-01 13:41:28 +02:00
Nassim Jahnke	fbc9fc47e2	Update deps, add bstats to Velocity and Sponge modules	2022-09-25 12:18:55 +02:00
Super	ccd5eab475	Create language-se.yml (#84 )	2022-08-30 15:46:49 +02:00
Nassim Jahnke	5d0fbb310e	Add turkish translation file	2022-08-05 09:48:36 +02:00
Nassim Jahnke	09d2e03c0c	Fix disabling `enable-pingmessages` not being respected on Paper servers	2022-04-27 16:40:01 +02:00
Nassim Jahnke	57da60a669	Bump version to 4.0.2-SNAPSHOT	2022-04-27 16:39:48 +02:00
original-codematrix	63dafb05b6	Switch from assert to Assertions class from JUnit (#77 )	2022-04-27 16:06:16 +02:00
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