Update changelog title

The repository is not available and thus breaks building...

.github/CHANGELOG.md

@@ -1,6 +1,58 @@
 # 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.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

.github/workflows/gradle.yml

@@ -0,0 +1,26 @@
+name: Build
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: 'temurin'
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: Maintenance Files
+          path: build/libs

.github/workflows/maven.yml

@@ -1,36 +0,0 @@
-name: Build
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2.3.4
-
-      - uses: actions/cache@v2.1.6
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2.1.0
-        with:
-          java-version: 11
-          distribution: 'adopt'
-
-      - name: Build with Maven
-        run: mvn -B package --file pom.xml
-
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v2.2.4
-        with:
-          name: MaintenanceFiles
-          path: |
-            **/Maintenance.jar
-            **/MaintenanceSpigot.jar
-            **/MaintenanceBungee.jar
-            **/MaintenanceVelocity.jar
-            **/MaintenanceSponge.jar

.gitignore

@@ -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

.travis.yml

@@ -1,7 +0,0 @@
-language: java
-jdk:
-  - oraclejdk8
-dist: trusty
-cache:
-  directories:
-    - '$HOME/.m2/repository'

README.md

@@ -1,9 +1,8 @@
 # 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)
+[![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 the most customizable free maintenance plugin for your Minecraft server you can find. It runs on Spigot, BungeeCord, Sponge, as well as Velocity.
 
@@ -16,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.
+* [Hangar Downloads](https://hangar.papermc.io/kennytv/Maintenance)
 * [Wiki](https://github.com/kennytv/Maintenance/wiki) (configuration, permissions, API usage)
-* [Downloads](https://github.com/kennytv/Maintenance/releases) (GitHub)
 * [Changelogs](https://github.com/kennytv/Maintenance/blob/master/.github/CHANGELOG.md)
 * [Issue tracker/bug reports](https://github.com/kennytv/Maintenance/issues)
 * [Discord](https://discord.gg/vGCUzHq)
-* [PlaceholderAPI addon](https://github.com/kennytv/Maintenance/wiki/MaintenanceAddon)
+* [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`).
 
 ## License
 This project is licensed under the [GNU General Public License v3](LICENSE.txt).

adventure/adventure-api/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
+
+// Shade and relocate adventure in an extra module, so that common/the rest can directly depend on a
+// relocated adventure without breaking native platform's adventure usage with project wide relocation
+tasks {
+    shadowJar {
+        relocate("net.kyori", "eu.kennytv.maintenance.lib.kyori")
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+}
+
+dependencies {
+    api(libs.bundles.adventure) {
+        exclude("net.kyori", "adventure-api")
+        exclude("net.kyori", "adventure-bom")
+        exclude("com.google.code.gson", "gson")
+    }
+}
+
+publishShadowJar()

adventure/adventure-platform-bukkit/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
+
+tasks {
+    shadowJar {
+        relocate("net.kyori", "eu.kennytv.maintenance.lib.kyori")
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+}
+
+dependencies {
+    api(libs.adventurePlatformBukkit) {
+        exclude("net.kyori", "adventure-api")
+    }
+}
+
+publishShadowJar()

adventure/adventure-platform-bungee/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    id("com.github.johnrengelman.shadow")
+}
+
+tasks {
+    shadowJar {
+        relocate("net.kyori", "eu.kennytv.maintenance.lib.kyori")
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+}
+
+dependencies {
+    api(libs.adventurePlatformBungee) {
+        exclude("net.kyori", "adventure-api")
+    }
+}
+
+publishShadowJar()

api-proxy/build.gradle.kts

@@ -0,0 +1,14 @@
+plugins {
+    id("maintenance.shadow-conventions")
+}
+
+dependencies {
+    api(projects.maintenanceApi)
+    compileOnly(projects.adventure.adventureApi) {
+        targetConfiguration = "shadow"
+    }
+}
+
+java {
+    withJavadocJar()
+}

api-proxy/src/main/java/eu/kennytv/maintenance/api/event/proxy/ServerMaintenanceChangedEvent.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,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;

api-proxy/src/main/java/eu/kennytv/maintenance/api/proxy/MaintenanceProxy.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,16 +17,12 @@
  */
 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.
@@ -63,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
      */

api-proxy/src/main/java/eu/kennytv/maintenance/api/proxy/Server.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,12 +17,11 @@
  */
 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 {
 
@@ -39,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.

api/build.gradle.kts

@@ -0,0 +1,11 @@
+plugins {
+    id("maintenance.shadow-conventions")
+}
+
+dependencies {
+    compileOnlyApi(libs.jetbrainsAnnotations)
+}
+
+java {
+    withJavadocJar()
+}

api/src/main/java/eu/kennytv/maintenance/api/Maintenance.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,13 +17,9 @@
  */
 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.
@@ -53,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

api/src/main/java/eu/kennytv/maintenance/api/MaintenanceProvider.java

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,11 +20,7 @@ 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
@@ -88,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);
 

api/src/main/java/eu/kennytv/maintenance/api/event/MaintenanceChangedEvent.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,9 +21,6 @@ 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;

api/src/main/java/eu/kennytv/maintenance/api/event/MaintenanceReloadedEvent.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,17 +17,15 @@
  */
 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
+ * @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 {
 }

api/src/main/java/eu/kennytv/maintenance/api/event/manager/EventListener.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,6 @@ 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> {
 

api/src/main/java/eu/kennytv/maintenance/api/event/manager/EventManager.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,11 +17,7 @@
  */
 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.

api/src/main/java/eu/kennytv/maintenance/api/event/manager/MaintenanceEvent.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,9 +19,6 @@ package eu.kennytv.maintenance.api.event.manager;
 
 /**
  * Dummy interface representing a maintenance event.
- *
- * @author kennytv
- * @since 3.0.1
  */
 public interface MaintenanceEvent {
 }

build-logic/build.gradle.kts

@@ -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.github.johnrengelman", "shadow", "8.1.1")
+}

build-logic/src/main/kotlin/extensions.kt

@@ -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))
+}

build-logic/src/main/kotlin/maintenance.base-conventions.gradle.kts

@@ -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")
+            }
+        }
+    }
+}

build-logic/src/main/kotlin/maintenance.platform-conventions.gradle.kts

@@ -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"))
+    }
+}

build-logic/src/main/kotlin/maintenance.shadow-conventions.gradle.kts

@@ -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.github.johnrengelman.shadow")
+}
+
+tasks {
+    named<Jar>("jar") {
+        archiveClassifier.set("unshaded")
+        from(project.rootProject.file("LICENSE.txt"))
+    }
+    val shadowJar = named<ShadowJar>("shadowJar") {
+        archiveClassifier.set("")
+        configureRelocations()
+    }
+    named("build") {
+        dependsOn(shadowJar)
+    }
+}
+
+publishShadowJar()
+
+fun ShadowJar.configureRelocations() {
+    relocate("com.zaxxer.hikari", "eu.kennytv.maintenance.lib.hikari")
+    relocate("org.bstats", "eu.kennytv.maintenance.lib.bstats")
+}

build-logic/src/main/kotlin/maintenance.standard-conventions.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("maintenance.base-conventions")
+}
+
+publishJavaComponents()

build.gradle.kts

@@ -0,0 +1,42 @@
+import org.gradle.api.plugins.JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME
+
+plugins {
+    base
+    id("maintenance.build-logic")
+}
+
+allprojects {
+    group = "eu.kennytv.maintenance"
+    version = property("projectVersion") as String // from gradle.properties
+    description = "Enable maintenance mode with a custom maintenance motd and icon."
+}
+
+val platforms = setOf(
+    projects.maintenanceSpigot,
+    projects.maintenanceBungee,
+    projects.maintenanceSponge,
+    projects.maintenanceVelocity
+).map { it.dependencyProject }
+
+val special = setOf(
+    projects.maintenance,
+    projects.maintenanceApi,
+    projects.maintenanceApiProxy,
+    projects.adventure,
+    projects.adventure.adventureApi,
+    projects.adventure.adventurePlatformBukkit,
+    projects.adventure.adventurePlatformBungee,
+).map { it.dependencyProject }
+
+subprojects {
+    when (this) {
+        in platforms -> plugins.apply("maintenance.platform-conventions")
+        in special -> plugins.apply("maintenance.base-conventions")
+        else -> plugins.apply("maintenance.standard-conventions")
+    }
+
+    dependencies {
+        TEST_IMPLEMENTATION_CONFIGURATION_NAME(rootProject.libs.bundles.junit)
+        TEST_IMPLEMENTATION_CONFIGURATION_NAME(rootProject.libs.snakeyaml)
+    }
+}

bungee/build.gradle.kts

@@ -0,0 +1,8 @@
+dependencies {
+    implementation(projects.maintenanceCoreProxy)
+    implementation(projects.adventure.adventurePlatformBungee) {
+        targetConfiguration = "shadow"
+    }
+    implementation(libs.bstatsBungee)
+    compileOnly(libs.bungee)
+}

bungee/src/main/java/eu/kennytv/maintenance/bungee/MaintenanceBungeeBase.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,13 +17,13 @@
  */
 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
@@ -37,7 +37,7 @@ public final class MaintenanceBungeeBase extends Plugin implements IMaintenanceB
     }
 
     @Override
-    public IMaintenance getApi() {
+    public Maintenance getApi() {
         return maintenance;
     }
 

bungee/src/main/java/eu/kennytv/maintenance/bungee/MaintenanceBungeePlugin.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,26 +17,27 @@
  */
 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 eu.kennytv.maintenance.lib.kyori.adventure.platform.bungeecord.BungeeAudiences;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.Favicon;
 import net.md_5.bungee.api.ProxyServer;
@@ -44,10 +45,12 @@ import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.chat.hover.content.Text;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.plugin.PluginManager;
+import org.bstats.bungeecord.Metrics;
 import org.jetbrains.annotations.Nullable;
 
 import javax.imageio.ImageIO;
@@ -56,22 +59,22 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-/**
- * @author kennytv
- * @since 1.0
- */
 public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
     private final MaintenanceBungeeBase plugin;
+    private final BungeeAudiences audiences;
     private Favicon favicon;
 
     MaintenanceBungeePlugin(final MaintenanceBungeeBase plugin) {
         super(plugin.getDescription().getVersion(), ServerType.BUNGEE);
         this.plugin = plugin;
+        this.audiences = BungeeAudiences.create(plugin);
 
         settingsProxy = new SettingsProxy(this);
         settings = settingsProxy;
@@ -85,9 +88,8 @@ 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);
@@ -96,20 +98,23 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
             }
             plugin.getLogger().info("Enabled ServerListPlus integration!");
         }
-    }
 
-    @Deprecated
-    public static IMaintenanceProxy getAPI() {
-        return MaintenanceBungeeAPI.getAPI();
+        if (false && pm.getPlugin("LuckPerms") != null) {
+            LuckPermsProxyHook.<ProxiedPlayer>register(this, player -> {
+                final net.md_5.bungee.api.connection.Server server = player.getServer();
+                return server != null ? server.getInfo().getName() : null;
+            });
+            getLogger().info("Registered LuckPerms context");
+        }
     }
 
     @Override
     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 tc2 = new TextComponent(TextComponent.fromLegacyText("§cDownload it at: §6" + HANGAR_URL));
         final TextComponent click = new TextComponent(TextComponent.fromLegacyText(" §7§l§o(CLICK ME)"));
-        click.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://www.spigotmc.org/resources/maintenance.40699/"));
-        click.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("§aDownload the latest version").create()));
+        click.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, HANGAR_URL));
+        click.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(new ComponentBuilder("§aDownload the latest version").create())));
         tc1.addExtra(tc2);
         tc1.addExtra(click);
         ((BungeeSenderInfo) sender).sendMessage(tc1);
@@ -121,9 +126,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()));
             }
         }
     }
@@ -136,13 +141,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()));
             }
         }
     }
@@ -157,10 +162,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()));
             }
         }
     }
@@ -170,6 +175,31 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
         return new BungeeTask(getProxy().getScheduler().schedule(plugin, runnable, 0, 1, TimeUnit.SECONDS).getId());
     }
 
+    @Override
+    public void getOfflinePlayer(final String name, final Consumer<@Nullable SenderInfo> consumer) {
+        final ProxiedPlayer player = getProxy().getPlayer(name);
+        if (player != null) {
+            consumer.accept(new BungeeSenderInfo(player));
+            return;
+        }
+
+        getProxy().getScheduler().runAsync(plugin, () -> {
+            try {
+                final ProfileLookup profile = doUUIDLookup(name);
+                consumer.accept(new ProxyOfflineSenderInfo(profile.getUuid(), profile.getName()));
+            } catch (final IOException e) {
+                e.printStackTrace();
+                consumer.accept(null);
+            }
+        });
+    }
+
+    @Override
+    public void getOfflinePlayer(final UUID uuid, final Consumer<@Nullable SenderInfo> consumer) {
+        final ProxiedPlayer player = getProxy().getPlayer(uuid);
+        consumer.accept(player != null ? new BungeeSenderInfo(player) : null);
+    }
+
     @Override
     @Nullable
     public Server getServer(final String server) {
@@ -178,28 +208,8 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
     }
 
     @Override
-    @Nullable
-    public SenderInfo getOfflinePlayer(final String name) {
-        final ProxiedPlayer player = getProxy().getPlayer(name);
-        if (player != null) {
-            return new BungeeSenderInfo(player);
-        }
-
-        final ProfileLookup profile;
-        try {
-            profile = doUUIDLookup(name);
-        } catch (final IOException e) {
-            e.printStackTrace();
-            return null;
-        }
-        return new ProxyOfflineSenderInfo(profile.getUuid(), profile.getName());
-    }
-
-    @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
@@ -221,8 +231,8 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
     }
 
     @Override
-    public void broadcast(final String message) {
-        getProxy().broadcast(message);
+    public void broadcast(final Component component) {
+        audiences.all().sendMessage(component);
     }
 
     @Override
@@ -282,4 +292,8 @@ public final class MaintenanceBungeePlugin extends MaintenanceProxyPlugin {
     public Favicon getFavicon() {
         return favicon;
     }
+
+    public BungeeAudiences audiences() {
+        return audiences;
+    }
 }

bungee/src/main/java/eu/kennytv/maintenance/bungee/command/MaintenanceBungeeCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

bungee/src/main/java/eu/kennytv/maintenance/bungee/command/MaintenanceBungeeCommandBase.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,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;
     }
 

bungee/src/main/java/eu/kennytv/maintenance/bungee/listener/ProxyPingListener.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 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;
@@ -35,28 +36,33 @@ public final class ProxyPingListener implements Listener {
 
     @EventHandler(priority = 80)
     public void proxyPing(final ProxyPingEvent event) {
-        if (!settings.isMaintenance() || !settings.isEnablePingMessages()) 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.getPlayerCountMessage(), 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.getPlayerCountHoverLines();
+            final ServerPing.PlayerInfo[] samplePlayers = new ServerPing.PlayerInfo[lines.length];
+            for (int i = 0; i < lines.length; i++) {
+                samplePlayers[i] = new ServerPing.PlayerInfo(lines[i], "");
+            }
+            players.setSample(samplePlayers);
         }
-        players.setSample(samplePlayers);
 
         if (settings.hasCustomIcon() && plugin.getFavicon() != null) {
             ping.setFavicon(plugin.getFavicon());

bungee/src/main/java/eu/kennytv/maintenance/bungee/listener/ServerConnectListener.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,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;
@@ -46,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());
@@ -65,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());
             }
         }
     }
@@ -77,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);
         }
@@ -89,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) {
@@ -108,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);
             }
         }
     }

bungee/src/main/java/eu/kennytv/maintenance/bungee/util/BungeeSenderInfo.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,11 @@
  */
 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;
@@ -49,10 +52,16 @@ public final class BungeeSenderInfo implements ProxySenderInfo {
     }
 
     @Override
+    @Deprecated
     public void sendMessage(final String message) {
         sender.sendMessage(message);
     }
 
+    @Override
+    public void send(final Component component) {
+        ((MaintenanceBungeePlugin) MaintenanceProvider.get()).audiences().sender(sender).sendMessage(component);
+    }
+
     @Override
     public boolean isPlayer() {
         return sender instanceof ProxiedPlayer;
@@ -68,9 +77,9 @@ public final class BungeeSenderInfo implements ProxySenderInfo {
     }
 
     @Override
-    public void disconnect(final String message) {
+    public void disconnect(final Component component) {
         if (sender instanceof Connection) {
-            ((Connection) sender).disconnect(message);
+            ((Connection) sender).disconnect(ComponentUtil.toBadComponent(component));
         }
     }
 }

bungee/src/main/java/eu/kennytv/maintenance/bungee/util/BungeeServer.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
 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;
 
@@ -41,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);
         }
     }
 

bungee/src/main/java/eu/kennytv/maintenance/bungee/util/BungeeTask.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

bungee/src/main/java/eu/kennytv/maintenance/bungee/util/ComponentUtil.java

@@ -0,0 +1,35 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.bungee.util;
+
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.chat.ComponentSerializer;
+
+public final class ComponentUtil {
+
+    public static BaseComponent[] toBadComponent(final Component component) {
+        return ComponentSerializer.parse(GsonComponentSerializer.gson().serialize(component));
+    }
+
+    public static BaseComponent toBadComponents(final Component component) {
+        return new TextComponent(ComponentSerializer.parse(GsonComponentSerializer.gson().serialize(component)));
+    }
+}

bungee/src/main/resources/bungee.yml

@@ -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

core-proxy/build.gradle.kts

@@ -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()
+}

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/MaintenanceProxyPlugin.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ 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;
@@ -36,8 +36,8 @@ 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.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -51,7 +51,7 @@ import java.util.concurrent.TimeUnit;
  * @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;
 
@@ -83,11 +83,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;
     }
 
@@ -105,7 +117,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);
@@ -177,7 +189,7 @@ public abstract class MaintenanceProxyPlugin extends MaintenancePlugin implement
 
     protected ProfileLookup doUUIDLookup(final String name) throws IOException {
         final URL url = new URL("https://api.ashcon.app/mojang/v2/user/" + name);
-        final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+        final URLConnection connection = url.openConnection();
         try (final InputStream in = connection.getInputStream()) {
             final String output = CharStreams.toString(new InputStreamReader(in));
             final JsonObject json = GSON.fromJson(output, JsonObject.class);

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/SettingsProxy.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,13 +21,17 @@ 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,6 +40,8 @@ public final class SettingsProxy extends Settings {
     private List<String> fallbackServers;
     private String waitingServer;
 
+    private Map<String, List<String>> commandsOnMaintenanceEnable;
+    private Map<String, List<String>> commandsOnMaintenanceDisable;
     private String mySQLTable;
     private String serverTable;
     private String maintenanceQuery;
@@ -51,7 +57,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) {
@@ -98,6 +104,18 @@ public final class SettingsProxy extends Settings {
             waitingServer = null;
         }
 
+        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();
             maintenanceServers = loadMaintenanceServersFromSQL();
@@ -149,21 +167,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() {
@@ -261,6 +279,24 @@ public final class SettingsProxy extends Settings {
         return waitingServer;
     }
 
+    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;

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/MaintenanceProxyCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,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;

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/ProxyCommandInfo.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/AbortSingleTimerCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,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

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/SingleEndtimerCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
 import eu.kennytv.maintenance.core.proxy.command.ProxyCommandInfo;
 import eu.kennytv.maintenance.core.runnable.MaintenanceRunnableBase;
 import eu.kennytv.maintenance.core.util.SenderInfo;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -43,34 +42,38 @@ public final class SingleEndtimerCommand extends ProxyCommandInfo {
         if (args.length == 2) {
             if (checkPermission(sender, "timer")) return;
             if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-                sender.sendMessage(getHelpMessage());
+                sender.send(getHelpMessage());
                 return;
             }
             if (!plugin.isMaintenance()) {
-                sender.sendMessage(getMessage("alreadyDisabled"));
+                sender.send(getMessage("alreadyDisabled"));
                 return;
             }
 
             plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, false);
-            sender.sendMessage(getMessage("endtimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+            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());
+                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()));
+            sender.send(getMessage(
+                    "singleEndtimerStarted",
+                    "%TIME%", runnable.getTime(),
+                    "%SERVER%", server.getName()
+            ));
         } else {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
         }
     }
 

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/SingleScheduleTimerCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
 import eu.kennytv.maintenance.core.proxy.command.ProxyCommandInfo;
 import eu.kennytv.maintenance.core.runnable.MaintenanceRunnableBase;
 import eu.kennytv.maintenance.core.util.SenderInfo;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -44,35 +43,46 @@ public final class SingleScheduleTimerCommand extends ProxyCommandInfo {
             if (checkPermission(sender, "timer")) return;
             if (plugin.getCommandManager().checkTimerArgs(sender, args[1])
                     || plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
-                sender.sendMessage(getHelpMessage());
+                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()));
+            final int duration = Integer.parseInt(args[2]);
+            plugin.scheduleMaintenanceRunnable(Integer.parseInt(args[1]), duration, TimeUnit.MINUTES);
+            sender.send(getMessage(
+                    "scheduletimerStarted",
+                    "%TIME%", plugin.getRunnable().getTime(),
+                    "%DURATION%", plugin.getFormattedTime(duration * 60)
+            ));
         } 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());
+                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 int duration = Integer.parseInt(args[3]);
+            final MaintenanceRunnableBase runnable = plugin.scheduleSingleMaintenanceRunnable(server, Integer.parseInt(args[2]), duration, TimeUnit.MINUTES);
+            sender.send(getMessage(
+                    "singleScheduletimerStarted",
+                    "%TIME%", runnable.getTime(),
+                    "%DURATION%", plugin.getFormattedTime(duration * 60),
+                    "%SERVER%", server.getName()
+            ));
         } else {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
         }
     }
 

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/SingleStarttimerCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,6 @@ import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
 import eu.kennytv.maintenance.core.proxy.command.ProxyCommandInfo;
 import eu.kennytv.maintenance.core.runnable.MaintenanceRunnableBase;
 import eu.kennytv.maintenance.core.util.SenderInfo;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -43,34 +42,38 @@ public final class SingleStarttimerCommand extends ProxyCommandInfo {
         if (args.length == 2) {
             if (checkPermission(sender, "timer")) return;
             if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-                sender.sendMessage(getHelpMessage());
+                sender.send(getHelpMessage());
                 return;
             }
             if (plugin.isMaintenance()) {
-                sender.sendMessage(getMessage("alreadyEnabled"));
+                sender.send(getMessage("alreadyEnabled"));
                 return;
             }
 
             plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, true);
-            sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+            sender.send(getMessage("starttimerStarted", "%TIME%", plugin.getRunnable().getTime()));
         } else if (args.length == 3) {
             if (checkPermission(sender, "singleserver.timer")) return;
             if (plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
-                sender.sendMessage(getHelpMessage());
+                sender.send(getHelpMessage());
                 return;
             }
 
             final Server server = plugin.getCommandManager().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()));
+            sender.send(getMessage(
+                    "singleStarttimerStarted",
+                    "%TIME%", runnable.getTime(),
+                    "%SERVER%", server.getName()
+            ));
         } else {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
         }
     }
 

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/SingleToggleCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,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;
             }
 
@@ -54,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());
         }
     }
 

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/command/subcommand/StatusCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,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));
         }
     }
 }

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/hook/LuckPermsProxyHook.java

@@ -0,0 +1,78 @@
+/*
+ * This file is part of Maintenance - https://github.com/kennytv/Maintenance
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package eu.kennytv.maintenance.core.proxy.hook;
+
+import eu.kennytv.maintenance.core.hook.LuckPermsHook;
+import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
+import net.luckperms.api.LuckPermsProvider;
+import net.luckperms.api.context.ContextCalculator;
+import net.luckperms.api.context.ContextConsumer;
+import net.luckperms.api.context.ContextSet;
+import net.luckperms.api.context.ImmutableContextSet;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Function;
+
+public final class LuckPermsProxyHook {
+
+    public static <T> void register(final MaintenanceProxyPlugin plugin, final Function<T, String> function) {
+        LuckPermsProvider.get().getContextManager().registerCalculator(new MaintenanceProxyCalculator<>(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();
+        }
+    }
+}

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/listener/ProxyJoinListenerBase.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,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);
         }
 
@@ -80,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;
         }
 

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/mysql/MySQL.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/runnable/SingleMaintenanceRunnable.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,11 +17,12 @@
  */
 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;
@@ -32,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());
     }
 }

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/runnable/SingleMaintenanceScheduleRunnable.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@ import eu.kennytv.maintenance.api.proxy.Server;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.proxy.MaintenanceProxyPlugin;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 
 import java.util.concurrent.TimeUnit;
 
@@ -39,8 +40,9 @@ public final class SingleMaintenanceScheduleRunnable extends SingleMaintenanceRu
     }
 
     @Override
-    protected String getStartMessage() {
-        return settings.getMessage("singleScheduletimerBroadcast").replace("%SERVER%", server.getName())
-                .replace("%TIME%", getTime()).replace("%DURATION%", plugin.getFormattedTime(maintenanceDuration));
+    protected Component getStartMessage() {
+        return settings.getMessage("singleScheduletimerBroadcast",
+                "%SERVER%", server.getName(),
+                "%TIME%", getTime(), "%DURATION%", plugin.getFormattedTime(maintenanceDuration));
     }
 }

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/server/DummyServer.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 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;
@@ -37,7 +38,7 @@ public final class DummyServer implements Server {
     }
 
     @Override
-    public void broadcast(final String s) {
+    public void broadcast(final Component component) {
     }
 
     @Override

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/util/ProfileLookup.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/util/ProxyOfflineSenderInfo.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 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;
 
@@ -36,7 +37,7 @@ public final class ProxyOfflineSenderInfo implements ProxySenderInfo {
     }
 
     @Override
-    public void disconnect(final String message) {
+    public void disconnect(final Component component) {
     }
 
     @Override
@@ -55,9 +56,14 @@ public final class ProxyOfflineSenderInfo implements ProxySenderInfo {
     }
 
     @Override
+    @Deprecated
     public void sendMessage(final String message) {
     }
 
+    @Override
+    public void send(final Component component) {
+    }
+
     @Override
     public boolean isPlayer() {
         return true;

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/util/ProxySenderInfo.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,10 +19,11 @@ 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);
 }

core-proxy/src/main/java/eu/kennytv/maintenance/core/proxy/util/ServerConnectResult.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

core/build.gradle.kts

@@ -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()
+}

core/src/main/java-templates/eu/kennytv/maintenance/core/util/MaintenanceVersion.java

@@ -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;
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,18 +15,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;
+package eu.kennytv.maintenance.core;
 
-/**
- * @author kennytv
- * @since 2.2.2
- */
-public interface IMaintenanceBase {
+import eu.kennytv.maintenance.api.Maintenance;
+
+@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();
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,19 +17,18 @@
  */
 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,13 @@ import eu.kennytv.maintenance.core.util.SenderInfo;
 import eu.kennytv.maintenance.core.util.ServerType;
 import eu.kennytv.maintenance.core.util.Task;
 import eu.kennytv.maintenance.core.util.Version;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.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,16 +51,21 @@ 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.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public abstract class MaintenancePlugin implements IMaintenance {
+public abstract class MaintenancePlugin implements Maintenance {
     public static final Gson GSON = new GsonBuilder().create();
-    protected final EventManager eventManager;
+    public static final String HANGAR_URL = "https://hangar.papermc.io/kennytv/Maintenance";
+    protected final eu.kennytv.maintenance.core.event.EventManager eventManager;
     protected final Version version;
     protected Settings settings;
     protected ServerListPlusHook serverListPlusHook;
@@ -77,7 +80,8 @@ public abstract class MaintenancePlugin implements IMaintenance {
         this.version = new Version(version);
         this.serverType = serverType;
         this.prefix = "§8[§eMaintenance" + serverType + "§8] ";
-        this.eventManager = new EventManager();
+        this.eventManager = new eu.kennytv.maintenance.core.event.EventManager();
+        MaintenanceProvider.setMaintenance(this);
     }
 
     public void disable() {
@@ -120,28 +124,27 @@ 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 String getFormattedTime(final int timeSeconds) {
@@ -161,7 +164,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
         if (builder.length() != 0) {
             builder.append(' ');
         }
-        builder.append(time).append(' ').append(settings.getMessage(time == 1 ? timeUnit : timeUnit + "s"));
+        builder.append(time).append(' ').append(settings.language.getString(time == 1 ? timeUnit : timeUnit + "s"));
     }
 
     public void startMaintenanceRunnable(final long duration, final TimeUnit unit, final boolean enable) {
@@ -179,7 +182,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
     public boolean updateAvailable() {
         try {
             checkNewestVersion();
-            return version.compareTo(newestVersion) == -1;
+            return version.compareTo(newestVersion) < 0;
         } catch (final Exception e) {
             return false;
         }
@@ -210,14 +213,14 @@ 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) {
+            if (compare < 0) {
+                //TODO mmmmmmmm legacy chat
                 getLogger().info("§cNewest version available: §aVersion " + newestVersion + "§c, you're on §a" + version);
-            } else if (compare == 1) {
+            } 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)");
                 } else {
@@ -227,27 +230,32 @@ public abstract class MaintenancePlugin implements IMaintenance {
         });
     }
 
-    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 {
@@ -256,13 +264,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/kennytv/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)) {
@@ -336,7 +343,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;
@@ -368,7 +375,7 @@ public abstract class MaintenancePlugin implements IMaintenance {
     }
 
     @Override
-    public IEventManager getEventManager() {
+    public EventManager getEventManager() {
         return eventManager;
     }
 
@@ -428,28 +435,28 @@ public abstract class MaintenancePlugin implements IMaintenance {
 
     protected abstract void executeConsoleCommand(String command);
 
-    public abstract void broadcast(String message);
+    public abstract void broadcast(Component component);
 
     public abstract void sendUpdateNotification(SenderInfo sender);
 
     public abstract Task startMaintenanceRunnable(Runnable runnable);
 
     /**
-     * Returns offline sender info of a player.
+     * Gets the offline sender info of a player.
      * This method may do a web lookup.
      *
      * @param name name of the player
-     * @return sender info if found, else null
      */
-    @Nullable
-    public abstract SenderInfo getOfflinePlayer(String name);
+    public abstract void getOfflinePlayer(String name, Consumer<@Nullable SenderInfo> consumer);
 
-    @Nullable
-    public abstract SenderInfo getOfflinePlayer(UUID uuid);
+    public abstract void getOfflinePlayer(UUID uuid, Consumer<@Nullable SenderInfo> consumer);
 
     public abstract File getDataFolder();
 
-    public abstract InputStream getResource(String name);
+    @Nullable
+    public InputStream getResource(final String name) {
+        return this.getClass().getClassLoader().getResourceAsStream(name);
+    }
 
     public abstract Logger getLogger();
 

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,27 +17,26 @@
  */
 package eu.kennytv.maintenance.core;
 
-import eu.kennytv.maintenance.api.ISettings;
 import eu.kennytv.maintenance.api.event.MaintenanceReloadedEvent;
 import eu.kennytv.maintenance.core.config.Config;
 import eu.kennytv.maintenance.core.config.ConfigSection;
 import eu.kennytv.maintenance.core.util.ServerType;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.TextComponent;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.minimessage.MiniMessage;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
-public class Settings implements ISettings {
-    private static final int CURRENT_CONFIG_VERSION = 5;
+public class Settings implements eu.kennytv.maintenance.api.Settings {
+    public static final String NEW_LINE_REPLACEMENT = "<br>";
+    private static final int CONFIG_VERSION = 7;
+    private static final int LANGUAGE_VERSION = 1;
     private static final Random RANDOM = new Random();
     protected final MaintenancePlugin plugin;
     private final Map<UUID, String> whitelistedPlayers = new HashMap<>();
@@ -49,10 +48,12 @@ public class Settings implements ISettings {
     private List<String> commandsOnMaintenanceEnable;
     private List<String> commandsOnMaintenanceDisable;
     private String playerCountMessage;
-    private String playerCountHoverMessage;
+    private List<String> playerCountHoverLines;
+    private String prefixString;
     private String languageName;
     private boolean enablePingMessages;
     private boolean customPlayerCountMessage;
+    private boolean customPlayerCountHoverMessage;
     private boolean customMaintenanceIcon;
     private boolean joinNotifications;
     private boolean updateChecks;
@@ -87,8 +88,8 @@ public class Settings implements ISettings {
             config.resetAwesomeHeader();
             whitelist = new Config(new File(plugin.getDataFolder(), "WhitelistedPlayers.yml"));
             whitelist.load();
-        } catch (final IOException e) {
-            throw new RuntimeException("Unable to load Maintenance files!", e);
+        } catch (final Exception e) {
+            throw new RuntimeException("Unable to load Maintenance files - probably a malformed config file", e);
         }
 
         loadSettings();
@@ -98,27 +99,21 @@ public class Settings implements ISettings {
             language = new Config(new File(plugin.getDataFolder(), "language-" + languageName + ".yml"));
             language.load();
         } catch (final IOException e) {
-            throw new RuntimeException("Unable to load Maintenance language file!", e);
+            throw new RuntimeException("Unable to load Maintenance language file - probably a malformed file", e);
         }
 
-        updateLanguageFile();
+        try {
+            updateLanguageFile();
+        } catch (final IOException e) {
+            plugin.getLogger().severe("Couldn't update language file");
+            e.printStackTrace();
+        }
 
-        // Directly cache colored messages - this should not be saved!
-        transformColoredMessages(language.getValues());
+        prefixString = language.getString("prefix");
 
         plugin.getEventManager().callEvent(new MaintenanceReloadedEvent());
     }
 
-    private void transformColoredMessages(final Map<String, Object> map) {
-        for (final Map.Entry<String, Object> entry : map.entrySet()) {
-            if (entry.getValue() instanceof Map) {
-                transformColoredMessages((Map<String, Object>) entry.getValue());
-            } else if (entry.getValue() instanceof String) {
-                entry.setValue(getColoredString(replaceNewlineVar((String) entry.getValue())));
-            }
-        }
-    }
-
     public void saveConfig() {
         try {
             config.save();
@@ -173,22 +168,27 @@ public class Settings implements ISettings {
         updateConfig();
 
         enablePingMessages = config.getBoolean("enable-pingmessages", true);
-        pingMessages = config.getStringList("pingmessages");
+        pingMessages = loadPingMessages("pingmessages");
         if (config.getBoolean("enable-timerspecific-messages")) {
-            timerSpecificPingMessages = config.getStringList("timerspecific-pingmessages");
+            timerSpecificPingMessages = loadPingMessages("timerspecific-pingmessages");
         }
         maintenance = config.getBoolean("maintenance-enabled");
         commandsOnMaintenanceEnable = config.getStringList("commands-on-maintenance-enable");
         commandsOnMaintenanceDisable = config.getStringList("commands-on-maintenance-disable");
         customPlayerCountMessage = config.getBoolean("enable-playercountmessage");
+        customPlayerCountHoverMessage = config.getBoolean("enable-playercounthovermessage");
         customMaintenanceIcon = config.getBoolean("custom-maintenance-icon");
         joinNotifications = config.getBoolean("send-join-notification");
         broadcastIntervals = new HashSet<>(config.getIntList("timer-broadcast-for-seconds"));
         if (plugin.getServerType() != ServerType.SPONGE) {
-            playerCountMessage = getColoredString(getConfigString("playercountmessage"));
+            playerCountMessage = getConfigMessage("playercountmessage");
         }
-        playerCountHoverMessage = replaceNewlineVar(getColoredString(getConfigString("playercounthovermessage")));
-        languageName = getConfigString("language").toLowerCase();
+
+        playerCountHoverLines = new ArrayList<>();
+        final String playerHoverMessage = config.getString("playercounthovermessage");
+        Collections.addAll(playerCountHoverLines, playerHoverMessage.split("<br>"));
+
+        languageName = config.getString("language").toLowerCase();
         kickOnlinePlayers = config.getBoolean("kick-online-players", true);
         updateChecks = config.getBoolean("update-checks", true);
         debug = config.getBoolean("debug");
@@ -215,14 +215,15 @@ public class Settings implements ISettings {
 
     private void updatePluginDirectory() {
         // All plugin identifiers were changed to 'Maintenance' ('maintenance' for Sponge and Velocity) in 3.0.5
-        // Don't worry, this is only checked if no plugin folder is found
         String oldDirName = "Maintenance" + plugin.getServerType();
         if (plugin.getServerType() == ServerType.SPONGE || plugin.getServerType() == ServerType.VELOCITY) {
             oldDirName = oldDirName.toLowerCase();
         }
 
         final File oldDir = new File(plugin.getDataFolder().getParentFile(), oldDirName);
-        if (!oldDir.exists()) return;
+        if (!oldDir.exists()) {
+            return;
+        }
 
         try {
             Files.move(oldDir.toPath(), plugin.getDataFolder().toPath());
@@ -234,11 +235,17 @@ public class Settings implements ISettings {
     }
 
     private void updateConfig() {
-        boolean changed = false;
+        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")));
+            }
 
-        // Update config to latest version (config version included since 3.0.1)
-        if (config.getInt("config-version") != CURRENT_CONFIG_VERSION) {
-            plugin.getLogger().info("Updating config to latest version...");
             createFile("config-new.yml", "config.yml");
             final File file = new File(plugin.getDataFolder(), "config-new.yml");
             final Config tempConfig = new Config(file, unsupportedFields);
@@ -249,114 +256,133 @@ public class Settings implements ISettings {
             }
 
             config.addMissingFields(tempConfig.getValues(), tempConfig.getComments());
-            config.set("config-version", CURRENT_CONFIG_VERSION);
+            config.set("config-version", CONFIG_VERSION);
 
             file.delete();
             tempConfig.clear();
 
-            changed = true;
-        }
-
-        if (changed) {
             saveConfig();
             plugin.getLogger().info("Done! Updated config!");
         }
     }
 
-    private void updateLanguageFile() {
-        final String filePrefix = "language-" + languageName;
-        try {
-            createFile(filePrefix + "-new.yml", filePrefix + ".yml");
-        } catch (final NullPointerException e) {
-            plugin.getLogger().info("Not checking for updated language strings, since there is no " + filePrefix + ".yml in the resource files (if your file is self translated and up to date, you can ignore this).");
-            return;
-        } catch (final Exception e) {
-            plugin.getLogger().warning("Couldn't update language file, as the " + filePrefix + ".yml could not be loaded from the resource files!");
-            e.printStackTrace();
+    private void updateLanguageFile() throws IOException {
+        final int version = language.getInt("language-version");
+        if (version == LANGUAGE_VERSION) {
             return;
         }
 
+        plugin.getLogger().info("Updating language file to the latest version...");
+        if (version < 1) {
+            for (final Map.Entry<String, Object> entry : language.getValues().entrySet()) {
+                if (!(entry.getValue() instanceof String)) {
+                    continue;
+                }
+
+                String value = (String) entry.getValue();
+                value = value.replace("&8[&eMaintenance&8] ", "<prefix>");
+                value = legacyToMinimessage(value);
+                value = value.replace("%NEWLINE%", NEW_LINE_REPLACEMENT);
+                language.set(entry.getKey(), value);
+            }
+        }
+
+        final String filePrefix = "language-" + languageName;
+        createFile(filePrefix + "-new.yml", filePrefix + ".yml");
+
         final File file = new File(plugin.getDataFolder(), filePrefix + "-new.yml");
         final Config tempConfig = new Config(file);
         try {
             tempConfig.load();
-        } catch (final IOException e) {
-            e.printStackTrace();
-            return;
+        } finally {
+            file.delete();
         }
 
-        final boolean updated = language.addMissingFields(tempConfig.getValues(), tempConfig.getComments());
+        language.addMissingFields(tempConfig.getValues(), tempConfig.getComments());
         tempConfig.clear();
-        file.delete();
-        if (updated) {
-            try {
-                language.save();
-                plugin.getLogger().info("Updated language file!");
-            } catch (final IOException e) {
-                e.printStackTrace();
-            }
-        }
+
+        language.set("language-version", LANGUAGE_VERSION);
+
+        language.save();
+        plugin.getLogger().info("Updated language file!");
     }
 
-    private static final String ALL_CODES = "0123456789AaBbCcDdEeFfKkLlMmNnOoRr";
-
-    public String getColoredString(final String s) {
-        // Method taken from Bungee
-        final char[] b = s.toCharArray();
-        for (int i = 0; i < b.length - 1; i++) {
-            if (b[i] == '&' && ALL_CODES.indexOf(b[i + 1]) > -1) {
-                b[i] = '§';
-                b[i + 1] = Character.toLowerCase(b[i + 1]);
-            }
-        }
-        return new String(b);
+    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_]+>", "");
     }
 
-    public String getConfigString(final String path) {
+    public String getConfigMessage(final String path) {
         final String s = config.getString(path);
         if (s == null) {
-            plugin.getLogger().warning("The config is missing the following string: " + path);
-            return "null";
+            plugin.getLogger().warning("The config file is missing the following string: " + path);
+            return path;
         }
-        return s;
+        return replaceNewlineVar(s);
     }
 
-    public String getMessage(final String path) {
-        return getMessage(path, "null");
-    }
-
-    public String getMessage(final String path, final String def) {
-        final String s = language.getString(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 def;
+            return path;
         }
-        return s;
+        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 String getRandomPingMessage() {
+    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));
+    }
+
+    public Component getRandomPingMessage() {
         if (plugin.isTaskRunning() && !plugin.getRunnable().shouldEnable()
                 && hasTimerSpecificPingMessages() && !timerSpecificPingMessages.isEmpty()) {
             return getPingMessage(timerSpecificPingMessages);
         }
-        return pingMessages.isEmpty() ? "" : getPingMessage(pingMessages);
+        return pingMessages.isEmpty() ? Component.empty() : getPingMessage(pingMessages);
     }
 
-    private String getPingMessage(final List<String> list) {
-        final String s = list.size() == 1 ? list.get(0) : list.get(RANDOM.nextInt(list.size()));
-        return getColoredString(replaceNewlineVar(plugin.replacePingVariables(s)));
+    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 String path) {
+        final List<String> list = config.getStringList(path);
+        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.containsKey(uuid)) return false;
-        whitelistedPlayers.remove(uuid);
+        if (whitelistedPlayers.remove(uuid) == null) {
+            return false;
+        }
+
         whitelist.remove(uuid.toString());
         saveWhitelistedPlayers();
         return true;
     }
 
-    @Deprecated
     @Override
     public boolean removeWhitelistedPlayer(final String name) {
         UUID uuid = null;
@@ -367,7 +393,9 @@ public class Settings implements ISettings {
             }
         }
 
-        if (uuid == null) return false;
+        if (uuid == null) {
+            return false;
+        }
 
         whitelistedPlayers.remove(uuid);
         whitelist.remove(uuid.toString());
@@ -377,11 +405,10 @@ public class Settings implements ISettings {
 
     @Override
     public boolean addWhitelistedPlayer(final UUID uuid, final String name) {
-        final boolean contains = !whitelistedPlayers.containsKey(uuid);
-        whitelistedPlayers.put(uuid, name);
+        final boolean added = whitelistedPlayers.put(uuid, name) == null;
         whitelist.set(uuid.toString(), name);
         saveWhitelistedPlayers();
-        return contains;
+        return added;
     }
 
     @Override
@@ -444,7 +471,10 @@ public class Settings implements ISettings {
     }
 
     public void setSavedEndtimer(final long millis) {
-        if (savedEndtimer == millis) return;
+        if (savedEndtimer == millis) {
+            return;
+        }
+
         this.savedEndtimer = millis;
         config.getSection("continue-endtimer-after-restart").set("end", millis);
         saveConfig();
@@ -454,7 +484,6 @@ public class Settings implements ISettings {
         return config;
     }
 
-    // The ping messages still contain the %NEWLINE% (if they have 2 lines)
     public List<String> getPingMessages() {
         return pingMessages;
     }
@@ -476,16 +505,23 @@ public class Settings implements ISettings {
         return broadcastIntervals;
     }
 
+    // Yikeseroo
     public String getPlayerCountMessage() {
-        return plugin.replacePingVariables(playerCountMessage);
+        return LegacyComponentSerializer.legacySection().serialize(parse(plugin.replacePingVariables(playerCountMessage)));
     }
 
-    public String getPlayerCountHoverMessage() {
-        return plugin.replacePingVariables(playerCountHoverMessage);
+    // Yikeseroo x2
+    public String[] getPlayerCountHoverLines() {
+        final String[] lines = new String[playerCountHoverLines.size()];
+        for (int i = 0; i < playerCountHoverLines.size(); i++) {
+            final String component = plugin.replacePingVariables(playerCountHoverLines.get(i));
+            lines[i] = LegacyComponentSerializer.legacySection().serialize(parse(component));
+        }
+        return lines;
     }
 
-    public String getKickMessage() {
-        return plugin.replacePingVariables(getMessage("kickmessage"));
+    public Component getKickMessage() {
+        return parse(plugin.replacePingVariables(getLanguageString("kickmessage")));
     }
 
     public String getLanguage() {
@@ -496,6 +532,14 @@ public class Settings implements ISettings {
         return customPlayerCountMessage;
     }
 
+    public boolean hasCustomPlayerCountHoverMessage() {
+        return customPlayerCountHoverMessage;
+    }
+
+    protected Component parse(final String s) {
+        return MiniMessage.miniMessage().deserialize(s);
+    }
+
     /*
      * Note on why this even exists: Yaml will force save all strings containing line breaks '\n' in this rather chunky format:
      *   key: |-
@@ -503,11 +547,11 @@ public class Settings implements ISettings {
      *      Second line text.
      *      ...
      *
-     * This also happens to string lists, making those practically unreadable (in partciular the motd list), as well as confusing for most users in general.
-     * Because of this, I replace %NEWLINE% manually, to spare users from these ugly breaks.
+     * 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("%NEWLINE%", "\n");
+        return s.replace(NEW_LINE_REPLACEMENT, "\n");
     }
 
     protected void loadExtraSettings() {

core/src/main/java/eu/kennytv/maintenance/core/command/CommandInfo.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@ 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;
@@ -51,7 +52,7 @@ public abstract class CommandInfo {
         return visible;
     }
 
-    public String getHelpMessage() {
+    public Component getHelpMessage() {
         return getMessage(helpMessageKey);
     }
 
@@ -63,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;
@@ -71,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() {

core/src/main/java/eu/kennytv/maintenance/core/command/MaintenanceCommand.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,8 +36,6 @@ import eu.kennytv.maintenance.core.command.subcommand.WhitelistAddCommand;
 import eu.kennytv.maintenance.core.command.subcommand.WhitelistCommand;
 import eu.kennytv.maintenance.core.command.subcommand.WhitelistRemoveCommand;
 import eu.kennytv.maintenance.core.util.SenderInfo;
-import eu.kennytv.maintenance.core.util.ServerType;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -85,7 +83,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) {
@@ -99,7 +97,7 @@ public abstract class MaintenanceCommand {
             return;
         }
         if (!command.hasPermission(sender)) {
-            sender.sendMessage(settings.getMessage("noPermission"));
+            sender.send(settings.getMessage("noPermission"));
             return;
         }
 
@@ -129,14 +127,14 @@ public abstract class MaintenanceCommand {
         if (!plugin.isNumeric(time)) return true;
         if (taskCheck) {
             if (plugin.isTaskRunning()) {
-                sender.sendMessage(settings.getMessage("timerAlreadyRunning"));
+                sender.send(settings.getMessage("timerAlreadyRunning"));
                 return true;
             }
         }
 
         final int minutes = Integer.parseInt(time);
         if (minutes > 40320) {
-            sender.sendMessage(settings.getMessage("timerTooLong"));
+            sender.send(settings.getMessage("timerTooLong"));
             return true;
         }
         if (minutes < 1) {
@@ -162,13 +160,8 @@ public abstract class MaintenanceCommand {
     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");
-            }
+            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() + "§aYou already have the latest version of the plugin!");
     }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,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"));
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,15 +33,15 @@ public final class EndtimerCommand extends CommandInfo {
     public void execute(final SenderInfo sender, final String[] args) {
         if (checkArgs(sender, args, 2)) return;
         if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
             return;
         }
         if (!plugin.isMaintenance()) {
-            sender.sendMessage(getMessage("alreadyDisabled"));
+            sender.send(getMessage("alreadyDisabled"));
             return;
         }
 
         plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, false);
-        sender.sendMessage(getMessage("endtimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+        sender.send(getMessage("endtimerStarted", "%TIME%", plugin.getRunnable().getTime()));
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@ 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;
@@ -35,7 +36,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;
         }
 
@@ -45,7 +46,7 @@ public final class HelpCommand extends CommandInfo {
         }
 
         if (!plugin.isNumeric(args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
             return;
         }
 
@@ -59,35 +60,37 @@ public final class HelpCommand extends CommandInfo {
 
     public void sendUsage(final SenderInfo sender, final int page) {
         Preconditions.checkArgument(page > 0);
-        final List<String> commands = new ArrayList<>();
+        final List<Component> commands = new ArrayList<>();
         for (final CommandInfo cmd : plugin.getCommandManager().getCommands()) {
             if (cmd.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.sendMessage(header);
-        sender.sendMessage("");
+        sender.send(header);
+        sender.send(Component.empty());
     }
 
     private int getDivide(final int size) {

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,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");
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,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"));
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,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;
             }
 
@@ -46,28 +46,31 @@ public final class RemoveMotdCommand extends CommandInfo {
         }
         if (checkArgs(sender, args, 2)) return;
         if (!plugin.isNumeric(args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
             return;
         }
 
         final Settings settings = getSettings();
-        final List<String> pingMessages = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        final List<String> pingMessages = settings.getConfig().getStringList(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages");
         if (pingMessages.size() < 2) {
-            sender.sendMessage(getMessage("removeMotdError"));
+            sender.send(getMessage("removeMotdError"));
             return;
         }
 
         final int index = Integer.parseInt(args[1]);
         if (index == 0 || index > pingMessages.size()) {
-            sender.sendMessage(getMessage("setMotdIndexError").replace("%MOTDS%", Integer.toString(pingMessages.size()))
-                    .replace("%NEWAMOUNT%", Integer.toString(pingMessages.size())));
+            sender.send(getMessage("setMotdIndexError",
+                    "%MOTDS%", Integer.toString(pingMessages.size()),
+                    "%NEWAMOUNT%", Integer.toString(pingMessages.size())));
             return;
         }
 
+        final List<String> pingComponents = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        pingComponents.remove(index - 1);
         pingMessages.remove(index - 1);
         settings.getConfig().set(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages", pingMessages);
         settings.saveConfig();
-        sender.sendMessage(getMessage("removedMotd").replace("%INDEX%", args[1]));
+        sender.send(getMessage("removedMotd", "%INDEX%", args[1]));
     }
 
     @Override

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@ package eu.kennytv.maintenance.core.command.subcommand;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.command.CommandInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;
-
 import java.util.concurrent.TimeUnit;
 
 public final class ScheduleTimerCommand extends CommandInfo {
@@ -34,15 +33,20 @@ public final class ScheduleTimerCommand extends CommandInfo {
         if (checkArgs(sender, args, 3)) return;
         if (plugin.getCommandManager().checkTimerArgs(sender, args[1])
                 || plugin.getCommandManager().checkTimerArgs(sender, args[2], false)) {
-            sender.sendMessage(getHelpMessage());
+            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()));
+        final int duration = Integer.parseInt(args[2]);
+        plugin.scheduleMaintenanceRunnable(Integer.parseInt(args[1]), duration, TimeUnit.MINUTES);
+        sender.send(getMessage(
+                "scheduletimerStarted",
+                "%TIME%", plugin.getRunnable().getTime(),
+                "%DURATION%", plugin.getFormattedTime(duration * 60)
+        ));
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,12 +21,13 @@ import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.command.CommandInfo;
 import eu.kennytv.maintenance.core.util.SenderInfo;
-
 import 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) {
@@ -38,7 +39,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;
             }
 
@@ -47,27 +48,29 @@ public final class SetMotdCommand extends CommandInfo {
             timerPingMessages = true;
         }
         if (args.length < 4 || !plugin.isNumeric(args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
             return;
         }
 
         final Settings settings = getSettings();
-        final List<String> pingMessages = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        final List<String> pingComponents = timerPingMessages ? settings.getTimerSpecificPingMessages() : settings.getPingMessages();
+        final List<String> pingMessages = settings.getConfig().getStringList(timerPingMessages ? "timerspecific-pingmessages" : "pingmessages");
         final int index = Integer.parseInt(args[1]);
         if (index == 0 || index > pingMessages.size() + 1) {
-            sender.sendMessage(getMessage("setMotdIndexError").replace("%MOTDS%", Integer.toString(pingMessages.size()))
-                    .replace("%NEWAMOUNT%", Integer.toString(pingMessages.size() + 1)));
+            sender.send(getMessage("setMotdIndexError",
+                    "%MOTDS%", Integer.toString(pingMessages.size()),
+                    "%NEWAMOUNT%", Integer.toString(pingMessages.size() + 1)));
             return;
         }
 
         if (!plugin.isNumeric(args[2])) {
-            sender.sendMessage(getMessage("setMotdLineError"));
+            sender.send(getMessage("setMotdLineError"));
             return;
         }
 
         final int line = Integer.parseInt(args[2]);
         if (line != 1 && line != 2) {
-            sender.sendMessage(getMessage("setMotdLineError"));
+            sender.send(getMessage("setMotdLineError"));
             return;
         }
 
@@ -75,23 +78,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);
         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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,15 +33,15 @@ public final class StarttimerCommand extends CommandInfo {
     public void execute(final SenderInfo sender, final String[] args) {
         if (checkArgs(sender, args, 2)) return;
         if (plugin.getCommandManager().checkTimerArgs(sender, args[1])) {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
             return;
         }
         if (plugin.isMaintenance()) {
-            sender.sendMessage(getMessage("alreadyEnabled"));
+            sender.send(getMessage("alreadyEnabled"));
             return;
         }
 
         plugin.startMaintenanceRunnable(Integer.parseInt(args[1]), TimeUnit.MINUTES, true);
-        sender.sendMessage(getMessage("starttimerStarted").replace("%TIME%", plugin.getRunnable().getTime()));
+        sender.send(getMessage("starttimerStarted", "%TIME%", plugin.getRunnable().getTime()));
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,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;
         }
 

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@ 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.core.util.ServerType;
 
 public final class UpdateCommand extends CommandInfo {
 
@@ -33,23 +32,24 @@ public final class UpdateCommand extends CommandInfo {
         if (checkArgs(sender, args, 1)) return;
         if (args[0].equalsIgnoreCase("update")) {
             plugin.async(() -> plugin.getCommandManager().checkForUpdate(sender));
-        } else {
-            if (!plugin.updateAvailable()) {
-                sender.sendMessage(plugin.getPrefix() + "§aYou already have the latest version of the plugin!");
-                return;
-            }
-            // Ore very sad :(
-            if (plugin.getServerType() == ServerType.SPONGE) {
-                sender.sendMessage(plugin.getPrefix() + "§cSorry, automated downloading of the plugin is not supported on Sponge! Please download the latest version manually! :(");
-                return;
-            }
+            return;
+        }
 
-            sender.sendMessage(getMessage("updateDownloading"));
+        if (!plugin.updateAvailable()) {
+            sender.sendMessage(plugin.getPrefix() + "§aYou already have the latest version of the plugin!");
+            return;
+        }
+
+        sender.send(getMessage("updateDownloading"));
+        try {
             if (plugin.installUpdate()) {
-                sender.sendMessage(getMessage("updateFinished"));
+                sender.send(getMessage("updateFinished"));
             } else {
-                sender.sendMessage(getMessage("updateFailed"));
+                sender.send(getMessage("updateFailed"));
             }
+        } catch (Exception e) {
+            sender.send(getMessage("updateFailed"));
+            e.printStackTrace();
         }
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@ public final class WhitelistAddCommand extends CommandInfo {
             }
         } else if (args.length == 3) {
             if (args[1].length() != 36) {
-                sender.sendMessage(getHelpMessage());
+                sender.send(getHelpMessage());
                 return;
             }
 
@@ -54,7 +54,7 @@ public final class WhitelistAddCommand extends CommandInfo {
                 addPlayerToWhitelist(sender, new DummySenderInfo(uuid, args[2]));
             }
         } else {
-            sender.sendMessage(getHelpMessage());
+            sender.send(getHelpMessage());
         }
     }
 
@@ -64,30 +64,32 @@ public final class WhitelistAddCommand extends CommandInfo {
     }
 
     private void addPlayerToWhitelist(final SenderInfo sender, final String name) {
-        final SenderInfo selected = plugin.getOfflinePlayer(name);
-        if (selected == null) {
-            sender.sendMessage(getMessage("playerNotOnline"));
-            return;
-        }
+        plugin.getOfflinePlayer(name, selected -> {
+            if (selected == null) {
+                sender.send(getMessage("playerNotOnline"));
+                return;
+            }
 
-        addPlayerToWhitelist(sender, selected);
+            addPlayerToWhitelist(sender, selected);
+        });
     }
 
     private void addPlayerToWhitelist(final SenderInfo sender, final UUID uuid) {
-        final SenderInfo selected = plugin.getOfflinePlayer(uuid);
-        if (selected == null) {
-            sender.sendMessage(getMessage("playerNotFoundUuid"));
-            return;
-        }
+        plugin.getOfflinePlayer(uuid, selected -> {
+            if (selected == null) {
+                sender.send(getMessage("playerNotFoundUuid"));
+                return;
+            }
 
-        addPlayerToWhitelist(sender, selected);
+            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()));
         }
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@ 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;
@@ -36,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());
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,33 +59,35 @@ public final class WhitelistRemoveCommand extends CommandInfo {
     }
 
     private void removePlayerFromWhitelist(final SenderInfo sender, final String name) {
-        final SenderInfo selected = plugin.getOfflinePlayer(name);
-        if (selected == null) {
-            if (getSettings().removeWhitelistedPlayer(name)) {
-                sender.sendMessage(getMessage("whitelistRemoved").replace("%PLAYER%", name));
-            } else {
-                sender.sendMessage(getMessage("whitelistNotFound"));
+        plugin.getOfflinePlayer(name, selected -> {
+            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, selected -> {
+            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"));
         }
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * 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
@@ -41,16 +41,18 @@ import java.util.Set;
 public final class Config extends ConfigSection {
 
     private static final String AWESOME_HEADER =
-            "#######################################################################################################################\n" +
-                    "#   __  __       _       _                                    _             _  __                     _______     __  #\n" +
-                    "#  |  \\/  | __ _(_)_ __ | |_ ___ _ __   __ _ _ __   ___ ___  | |__  _   _  | |/ /___ _ __  _ __  _   |_   _\\ \\   / /  #\n" +
-                    "#  | |\\/| |/ _` | | '_ \\| __/ _ \\ '_ \\ / _` | '_ \\ / __/ _ \\ | '_ \\| | | | | ' // _ \\ '_ \\| '_ \\| | | || |  \\ \\ / /   #\n" +
-                    "#  | |  | | (_| | | | | | ||  __/ | | | (_| | | | | (_|  __/ | |_) | |_| | | . \\  __/ | | | | | | |_| || |   \\ V /    #\n" +
-                    "#  |_|  |_|\\__,_|_|_| |_|\\__\\___|_| |_|\\__,_|_| |_|\\___\\___| |_.__/ \\__, | |_|\\_\\___|_| |_|_| |_|\\__, ||_|    \\_/     #\n" +
-                    "#                                                                   |___/                        |___/                #\n" +
-                    "#######################################################################################################################\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";
+                    "# 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;

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * 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
  */

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ 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

core/src/main/java/eu/kennytv/maintenance/core/dump/MaintenanceDump.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,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;

core/src/main/java/eu/kennytv/maintenance/core/dump/PluginDump.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@ 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;

core/src/main/java/eu/kennytv/maintenance/core/dump/ServerDump.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@ 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;

core/src/main/java/eu/kennytv/maintenance/core/event/EventManager.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,6 @@
 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;
@@ -26,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

core/src/main/java/eu/kennytv/maintenance/core/hook/LuckPermsHook.java

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

core/src/main/java/eu/kennytv/maintenance/core/hook/ServerListPlusHook.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

core/src/main/java/eu/kennytv/maintenance/core/listener/JoinListenerBase.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,7 +60,9 @@ public abstract class JoinListenerBase {
         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());

core/src/main/java/eu/kennytv/maintenance/core/runnable/MaintenanceRunnable.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@ package eu.kennytv.maintenance.core.runnable;
 
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 
 public class MaintenanceRunnable extends MaintenanceRunnableBase {
 
@@ -32,12 +33,12 @@ public class MaintenanceRunnable extends MaintenanceRunnableBase {
     }
 
     @Override
-    protected String getStartMessage() {
-        return settings.getMessage("starttimerBroadcast").replace("%TIME%", getTime());
+    protected Component getStartMessage() {
+        return settings.getMessage("starttimerBroadcast", "%TIME%", getTime());
     }
 
     @Override
-    protected String getEndMessage() {
-        return settings.getMessage("endtimerBroadcast").replace("%TIME%", getTime());
+    protected Component getEndMessage() {
+        return settings.getMessage("endtimerBroadcast", "%TIME%", getTime());
     }
 }

core/src/main/java/eu/kennytv/maintenance/core/runnable/MaintenanceRunnableBase.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2021 kennytv (https://github.com/kennytv)
+ * Copyright (C) 2018-2022 kennytv (https://github.com/kennytv)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,12 +20,13 @@ package eu.kennytv.maintenance.core.runnable;
 import eu.kennytv.maintenance.core.MaintenancePlugin;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.core.util.Task;
+import eu.kennytv.maintenance.lib.kyori.adventure.text.Component;
 
 public abstract class MaintenanceRunnableBase implements Runnable {
     protected final MaintenancePlugin plugin;
     protected final Settings settings;
+    protected final boolean enable;
     private final Task task;
-    protected boolean enable;
     protected int seconds;
 
     protected MaintenanceRunnableBase(final MaintenancePlugin plugin, final Settings settings, final int seconds, final boolean enable) {
@@ -63,13 +64,13 @@ public abstract class MaintenanceRunnableBase implements Runnable {
         return task;
     }
 
-    protected void broadcast(final String message) {
+    protected void broadcast(final Component message) {
         plugin.broadcast(message);
     }
 
     protected abstract void finish();
 
-    protected abstract String getStartMessage();
+    protected abstract Component getStartMessage();
 
-    protected abstract String getEndMessage();
+    protected abstract Component getEndMessage();
 }