Exclude CODEOWNERS from language statistics

Prefer AdvancedServerList-OG for Paper integration

.gitattributes

@@ -0,0 +1 @@
+.gitea/CODEOWNERS linguist-detectable=false

.gitea/CODEOWNERS

@@ -0,0 +1,3 @@
+# Pull requests request review from the eligible staff team(s).
+# One approval from either an Admin or Developer satisfies branch protection.
+*   @trueog/Admins @trueog/Developers

.gitignore

@@ -2,6 +2,7 @@
 build/
 .gradle
 bin/
+run/
 tmp/
 *.tmp
 *.bak

build-logic/build.gradle.kts

@@ -8,5 +8,5 @@ repositories {
 
 dependencies {
     // version must be manually kept in sync with the one in root project settings.gradle.kts
-    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.0")
+    implementation("com.gradleup.shadow", "shadow-gradle-plugin", "8.3.9")
 }

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

@@ -30,14 +30,11 @@ private fun Project.configurePublication(configurer: MavenPublication.() -> Unit
 }
 
 fun Project.latestCommitHash(): String {
-    val byteOut = ByteArrayOutputStream()
-    exec {
+    return providers.exec {
         commandLine = listOf("git", "rev-parse", "--short", "HEAD")
-        standardOutput = byteOut
-    }
-    return byteOut.toString(Charsets.UTF_8.name()).trim()
+    }.standardOutput.asBytes.get().toString(Charsets.UTF_8).trim()
 }
 
 fun JavaPluginExtension.javaTarget(version: Int) {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(version))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }

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

@@ -7,8 +7,10 @@ plugins {
 tasks {
     // Variable replacements
     processResources {
+        val ver = project.version.toString()
+        val desc = project.description
         filesMatching(listOf("plugin.yml", "bungee.yml", "META-INF/sponge_plugins.json")) {
-            expand("version" to project.version, "description" to project.description)
+            expand("version" to ver, "description" to desc)
         }
     }
     javadoc {

build.gradle.kts

@@ -2,6 +2,7 @@ import org.gradle.api.plugins.JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME
 
 plugins {
     base
+    id("eclipse")
     id("maintenance.build-logic")
 }
 
@@ -13,10 +14,9 @@ allprojects {
 
 val platforms = setOf(
     projects.maintenancePaper,
-    projects.maintenanceBungee,
     projects.maintenanceSponge,
     projects.maintenanceVelocity
-).map { it.dependencyProject }
+).map { it.path }
 
 val special = setOf(
     projects.maintenance,
@@ -25,11 +25,10 @@ val special = setOf(
     projects.adventure,
     projects.adventure.adventureApi,
     projects.adventure.adventurePlatformBukkit,
-    projects.adventure.adventurePlatformBungee,
-).map { it.dependencyProject }
+).map { it.path }
 
 subprojects {
-    when (this) {
+    when (path) {
         in platforms -> plugins.apply("maintenance.platform-conventions")
         in special -> plugins.apply("maintenance.base-conventions")
         else -> plugins.apply("maintenance.standard-conventions")
@@ -39,4 +38,4 @@ subprojects {
         TEST_IMPLEMENTATION_CONFIGURATION_NAME(rootProject.libs.bundles.junit)
         TEST_IMPLEMENTATION_CONFIGURATION_NAME(rootProject.libs.snakeyaml)
     }
-}
+}

bungee/build.gradle.kts

@@ -1,8 +0,0 @@
-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,47 +0,0 @@
-/*
- * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2024 kennytv (https://github.com/kennytv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package eu.kennytv.maintenance.bungee;
-
-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 MaintenanceBase {
-    private MaintenanceBungeePlugin maintenance;
-
-    @Override
-    public void onEnable() {
-        maintenance = new MaintenanceBungeePlugin(this);
-    }
-
-    @Override
-    public void onDisable() {
-        maintenance.disable();
-    }
-
-    @Override
-    public Maintenance getApi() {
-        return maintenance;
-    }
-
-    File getPluginFile() {
-        return getFile();
-    }
-}

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

@@ -1,279 +0,0 @@
-/*
- * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2024 kennytv (https://github.com/kennytv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package eu.kennytv.maintenance.bungee;
-
-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.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 java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-import javax.imageio.ImageIO;
-import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.Favicon;
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.plugin.Plugin;
-import net.md_5.bungee.api.plugin.PluginManager;
-import org.bstats.bungeecord.Metrics;
-import org.jetbrains.annotations.Nullable;
-
-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;
-
-        sendEnableMessage();
-
-        final PluginManager pm = getProxy().getPluginManager();
-        pm.registerListener(plugin, new ProxyPingListener(this, settingsProxy));
-        pm.registerListener(plugin, new ServerConnectListener(this, settingsProxy));
-        commandManager = new MaintenanceBungeeCommand(this, settingsProxy);
-        pm.registerCommand(plugin, new MaintenanceBungeeCommandBase(commandManager));
-
-        continueLastEndtimer();
-        new Metrics(plugin, 742);
-
-        final Plugin serverListPlus = pm.getPlugin("ServerListPlus");
-        if (serverListPlus != null) {
-            serverListPlusHook = new ServerListPlusHook(serverListPlus);
-            if (settings.isEnablePingMessages()) {
-                serverListPlusHook.setEnabled(!settingsProxy.isMaintenance());
-            }
-            plugin.getLogger().info("Enabled ServerListPlus integration!");
-        }
-
-        if (false && pm.getPlugin("LuckPerms") != null) {
-            LuckPermsProxyHook.<ProxiedPlayer>register(this, player -> {
-                final net.md_5.bungee.api.connection.Server server = player.getServer();
-                return server != null ? server.getInfo().getName() : null;
-            });
-            getLogger().info("Registered LuckPerms context");
-        }
-    }
-
-    public boolean isMaintenance(final ServerInfo serverInfo) {
-        return settingsProxy.isMaintenance(serverInfo.getName());
-    }
-
-    @Override
-    protected void kickPlayersFromProxy() {
-        for (final ProxiedPlayer player : getProxy().getPlayers()) {
-            if (!hasPermission(player, "bypass") && !settingsProxy.isWhitelisted(player.getUniqueId())) {
-                player.disconnect(ComponentUtil.toBadComponents(settingsProxy.getKickMessage()));
-            }
-        }
-    }
-
-    @Override
-    protected void kickPlayers(final Server server, final Server fallback) {
-        // Kick players from a proxied server
-        final ServerInfo fallbackServer = fallback != null ? ((BungeeServer) fallback).getServer() : null;
-        final boolean checkForFallback = fallbackServer != null && !isMaintenance(fallback);
-        for (final ProxiedPlayer player : ((BungeeServer) server).getServer().getPlayers()) {
-            if (!hasPermission(player, "bypass") && !settingsProxy.isWhitelisted(player.getUniqueId())) {
-                if (checkForFallback && fallbackServer.canAccess(player)) {
-                    audiences.player(player).sendMessage(settingsProxy.getMessage("singleMaintenanceActivated", "%SERVER%", server.getName()));
-                    player.connect(fallbackServer);
-                } else {
-                    player.disconnect(ComponentUtil.toBadComponents(settingsProxy.getFullServerKickMessage(server.getName())));
-                }
-            } else {
-                audiences.player(player).sendMessage(settingsProxy.getMessage("singleMaintenanceActivated", "%SERVER%", server.getName()));
-            }
-        }
-    }
-
-    @Override
-    protected void kickPlayersTo(final Server server) {
-        // Kick all players to a single waiting server
-        final ServerInfo serverInfo = ((BungeeServer) server).getServer();
-        // Notifications done in global method
-        for (final ProxiedPlayer player : getProxy().getPlayers()) {
-            if (hasPermission(player, "bypass") || settingsProxy.isWhitelisted(player.getUniqueId())) continue;
-            if (player.getServer() != null && player.getServer().getInfo().getName().equals(serverInfo.getName()))
-                continue;
-            if (serverInfo.canAccess(player) && !isMaintenance(serverInfo)) {
-                audiences.player(player).sendMessage(settingsProxy.getMessage("sentToWaitingServer", "%SERVER%", server.getName()));
-                player.connect(serverInfo);
-            } else {
-                player.disconnect(ComponentUtil.toBadComponents(settingsProxy.getKickMessage()));
-            }
-        }
-    }
-
-    @Override
-    public Task startMaintenanceRunnable(final Runnable runnable) {
-        return new BungeeTask(getProxy().getScheduler().schedule(plugin, runnable, 0, 1, TimeUnit.SECONDS).getId());
-    }
-
-    @Override
-    public CompletableFuture<@Nullable SenderInfo> getOfflinePlayer(final String name) {
-        final ProxiedPlayer player = getProxy().getPlayer(name);
-        if (player != null) {
-            return CompletableFuture.completedFuture(new BungeeSenderInfo(player));
-        }
-
-        return CompletableFuture.supplyAsync(() -> {
-            try {
-                final ProfileLookup profile = doUUIDLookup(name);
-                return new ProxyOfflineSenderInfo(profile.getUuid(), profile.getName());
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        });
-    }
-
-    @Override
-    public CompletableFuture<@Nullable SenderInfo> getOfflinePlayer(final UUID uuid) {
-        final ProxiedPlayer player = getProxy().getPlayer(uuid);
-        return CompletableFuture.completedFuture(player != null ? new BungeeSenderInfo(player) : null);
-    }
-
-    @Override
-    @Nullable
-    public Server getServer(final String server) {
-        final ServerInfo serverInfo = getProxy().getServerInfo(server);
-        return serverInfo != null ? new BungeeServer(serverInfo) : null;
-    }
-
-    @Override
-    public Set<String> getServers() {
-        return getProxy().getServers().keySet();
-    }
-
-    @Override
-    @Nullable
-    public String getServerNameOf(final SenderInfo sender) {
-        final ProxiedPlayer player = getProxy().getPlayer(sender.getUuid());
-        if (player == null || player.getServer() == null) return null;
-        return player.getServer().getInfo().getName();
-    }
-
-    @Override
-    public void async(final Runnable runnable) {
-        getProxy().getScheduler().runAsync(plugin, runnable);
-    }
-
-    @Override
-    protected void executeConsoleCommand(final String command) {
-        getProxy().getPluginManager().dispatchCommand(getProxy().getConsole(), command);
-    }
-
-    @Override
-    public void broadcast(final Component component) {
-        audiences.all().sendMessage(component);
-    }
-
-    @Override
-    public File getDataFolder() {
-        return plugin.getDataFolder();
-    }
-
-    @Override
-    public File getPluginFile() {
-        return plugin.getPluginFile();
-    }
-
-    @Override
-    protected int getOnlinePlayers() {
-        return getProxy().getOnlineCount();
-    }
-
-    @Override
-    protected int getMaxPlayers() {
-        return getProxy().getConfig().getPlayerLimit();
-    }
-
-    @Override
-    public InputStream getResource(final String name) {
-        return plugin.getResourceAsStream(name);
-    }
-
-    @Override
-    public Logger getLogger() {
-        return plugin.getLogger();
-    }
-
-    @Override
-    public String getServerVersion() {
-        return getProxy().getVersion();
-    }
-
-    @Override
-    public List<PluginDump> getPlugins() {
-        return getProxy().getPluginManager().getPlugins().stream().map(plugin ->
-                new PluginDump(plugin.getDescription().getName(), plugin.getDescription().getVersion(), Arrays.asList(plugin.getDescription().getAuthor()))).collect(Collectors.toList());
-    }
-
-    @Override
-    protected void loadIcon(final File file) throws IOException {
-        favicon = Favicon.create(ImageIO.read(file));
-    }
-
-    public boolean hasPermission(final CommandSender sender, final String permission) {
-        return sender.hasPermission("maintenance." + permission) || sender.hasPermission("maintenance.admin");
-    }
-
-    public ProxyServer getProxy() {
-        return plugin.getProxy();
-    }
-
-    public Favicon getFavicon() {
-        return favicon;
-    }
-
-    public BungeeAudiences audiences() {
-        return audiences;
-    }
-}

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

@@ -1,58 +0,0 @@
-/*
- * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2024 kennytv (https://github.com/kennytv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package eu.kennytv.maintenance.bungee.command;
-
-import eu.kennytv.maintenance.bungee.MaintenanceBungeePlugin;
-import eu.kennytv.maintenance.core.proxy.SettingsProxy;
-import eu.kennytv.maintenance.core.proxy.command.MaintenanceProxyCommand;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-
-public final class MaintenanceBungeeCommand extends MaintenanceProxyCommand {
-    private final MaintenanceBungeePlugin plugin;
-
-    public MaintenanceBungeeCommand(final MaintenanceBungeePlugin plugin, final SettingsProxy settings) {
-        super(plugin, settings);
-        this.plugin = plugin;
-        registerCommands();
-    }
-
-    @Override
-    public List<String> getServersCompletion(final String s) {
-        final List<String> list = new ArrayList<>();
-        for (final Map.Entry<String, ServerInfo> entry : plugin.getProxy().getServers().entrySet()) {
-            final String serverName = entry.getValue().getName();
-            if (entry.getKey().toLowerCase().startsWith(s) && !plugin.getSettingsProxy().getMaintenanceServers().contains(serverName)) {
-                list.add(serverName);
-            }
-        }
-        return list;
-    }
-
-    @Override
-    public List<String> getPlayersCompletion() {
-        final List<String> list = new ArrayList<>();
-        for (final ProxiedPlayer p : plugin.getProxy().getPlayers()) {
-            list.add(p.getName());
-        }
-        return list;
-    }
-}

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

@@ -1,48 +0,0 @@
-/*
- * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2024 kennytv (https://github.com/kennytv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package eu.kennytv.maintenance.bungee.command;
-
-import eu.kennytv.maintenance.bungee.util.BungeeSenderInfo;
-import eu.kennytv.maintenance.core.command.MaintenanceCommand;
-import net.md_5.bungee.api.CommandSender;
-import net.md_5.bungee.api.plugin.Command;
-import net.md_5.bungee.api.plugin.TabExecutor;
-
-public final class MaintenanceBungeeCommandBase extends Command implements TabExecutor {
-    private final MaintenanceCommand command;
-
-    public MaintenanceBungeeCommandBase(final MaintenanceCommand command) {
-        super("maintenance", "maintenance.command", "mt");
-        this.command = command;
-    }
-
-    @Override
-    public boolean hasPermission(final CommandSender sender) {
-        return sender.hasPermission("maintenance.admin") || sender.hasPermission("maintenance.command");
-    }
-
-    @Override
-    public void execute(final CommandSender sender, final String[] args) {
-        command.execute(new BungeeSenderInfo(sender), args);
-    }
-
-    @Override
-    public Iterable<String> onTabComplete(final CommandSender sender, final String[] args) {
-        return command.getSuggestions(new BungeeSenderInfo(sender), args);
-    }
-}

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

@@ -1,71 +0,0 @@
-/*
- * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2024 kennytv (https://github.com/kennytv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package eu.kennytv.maintenance.bungee.listener;
-
-import eu.kennytv.maintenance.bungee.MaintenanceBungeePlugin;
-import eu.kennytv.maintenance.bungee.util.ComponentUtil;
-import eu.kennytv.maintenance.core.proxy.SettingsProxy;
-import net.md_5.bungee.api.ServerPing;
-import net.md_5.bungee.api.event.ProxyPingEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-
-public final class ProxyPingListener implements Listener {
-    private final MaintenanceBungeePlugin plugin;
-    private final SettingsProxy settings;
-
-    public ProxyPingListener(final MaintenanceBungeePlugin plugin, final SettingsProxy settings) {
-        this.plugin = plugin;
-        this.settings = settings;
-    }
-
-    @EventHandler(priority = 80)
-    public void proxyPing(final ProxyPingEvent event) {
-        if (!settings.isMaintenance()) {
-            return;
-        }
-
-        final ServerPing ping = event.getResponse();
-        if (settings.hasCustomPlayerCountMessage()) {
-            ping.setVersion(new ServerPing.Protocol(settings.getLegacyParsedPlayerCountMessage(), 1));
-        }
-
-        if (settings.isEnablePingMessages()) {
-            ping.setDescriptionComponent(ComponentUtil.toBadComponents(settings.getRandomPingMessage()));
-        }
-
-        if (settings.hasCustomPlayerCountHoverMessage()) {
-            ServerPing.Players players = ping.getPlayers();
-            if (players == null) {
-                players = new ServerPing.Players(0, 0, null);
-                ping.setPlayers(players);
-            }
-
-            final String[] lines = settings.getLegacyParsedPlayerCountHoverLines();
-            final ServerPing.PlayerInfo[] samplePlayers = new ServerPing.PlayerInfo[lines.length];
-            for (int i = 0; i < lines.length; i++) {
-                samplePlayers[i] = new ServerPing.PlayerInfo(lines[i], "");
-            }
-            players.setSample(samplePlayers);
-        }
-
-        if (settings.hasCustomIcon() && plugin.getFavicon() != null) {
-            ping.setFavicon(plugin.getFavicon());
-        }
-    }
-}

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

@@ -1,119 +0,0 @@
-/*
- * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2024 kennytv (https://github.com/kennytv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package eu.kennytv.maintenance.bungee.listener;
-
-import eu.kennytv.maintenance.api.proxy.Server;
-import eu.kennytv.maintenance.bungee.MaintenanceBungeePlugin;
-import eu.kennytv.maintenance.bungee.util.BungeeSenderInfo;
-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.connection.ProxiedPlayer;
-import net.md_5.bungee.api.event.ServerConnectEvent;
-import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;
-
-public final class ServerConnectListener extends ProxyJoinListenerBase implements Listener {
-    private final MaintenanceBungeePlugin plugin;
-
-    public ServerConnectListener(final MaintenanceBungeePlugin plugin, final SettingsProxy settings) {
-        super(plugin, settings);
-        this.plugin = plugin;
-    }
-
-    @EventHandler
-    public void initialServerConnect(final ServerConnectEvent event) {
-        // Global maintenance check
-        if (event.isCancelled() || event.getReason() != ServerConnectEvent.Reason.JOIN_PROXY) return;
-
-        final BungeeSenderInfo player = new BungeeSenderInfo(event.getPlayer());
-        if (plugin.isDebug()) {
-            plugin.getLogger().info("Join permission check for " + event.getPlayer().getName()
-                    + " - Permission: " + player.hasMaintenancePermission("bypass") + ", whitelist: " + settings.isWhitelisted(player.getUuid()));
-        }
-
-        if (shouldKick(player)) {
-            final Server waitingServer = shouldConnectToWaitingServer(player);
-            if (waitingServer != null) {
-                event.setTarget(((BungeeServer) waitingServer).getServer());
-                player.send(settings.getMessage("sentToWaitingServer"));
-
-                if (plugin.isDebug()) {
-                    plugin.getLogger().info("Join to waiting server for " + event.getPlayer().getName());
-                }
-                return;
-            }
-
-            event.setCancelled(true);
-
-            player.disconnect(settings.getKickMessage());
-            if (settings.isJoinNotifications()) {
-                broadcastJoinNotification(player.getName());
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH)
-    public void serverConnect(final ServerConnectEvent event) {
-        // Server specific maintenance check
-        if (event.isCancelled()) return;
-
-        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 BungeeSenderInfo player = new BungeeSenderInfo(proxiedPlayer);
-        final ServerConnectResult connectResult = serverConnect(player, new BungeeServer(event.getTarget()), normalServerConnect);
-        if (plugin.isDebug()) {
-            plugin.getLogger().info("Connectresult for " + player.getName() + " to " + event.getTarget().getName() + ": " + connectResult);
-        }
-
-        if (connectResult.isCancelled()) {
-            event.setCancelled(true);
-
-            // Player has no server to connect to
-            if (proxiedPlayer.getServer() == null) {
-                player.disconnect(settings.getKickMessage());
-            }
-        } else if (connectResult.getTarget() != null) {
-            event.setTarget(((BungeeServer) connectResult.getTarget()).getServer());
-        }
-    }
-
-    @Override
-    protected void broadcastJoinNotification(final String name) {
-        sendJoinMessage(ProxyServer.getInstance().getPlayers(), name);
-    }
-
-    @Override
-    protected void broadcastJoinNotification(final String name, final Server server) {
-        sendJoinMessage(((BungeeServer) server).getServer().getPlayers(), name);
-    }
-
-    private void sendJoinMessage(final Iterable<ProxiedPlayer> players, final String name) {
-        final Component component = settings.getMessage("joinNotification", "%PLAYER%", name);
-        for (final ProxiedPlayer player : players) {
-            if (plugin.hasPermission(player, "joinnotification")) {
-                plugin.audiences().player(player).sendMessage(component);
-            }
-        }
-    }
-}

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

@@ -1,79 +0,0 @@
-/*
- * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2024 kennytv (https://github.com/kennytv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package eu.kennytv.maintenance.bungee.util;
-
-import eu.kennytv.maintenance.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;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-
-import java.util.UUID;
-
-public final class BungeeSenderInfo implements ProxySenderInfo {
-    private final CommandSender sender;
-
-    public BungeeSenderInfo(final CommandSender sender) {
-        this.sender = sender;
-    }
-
-    @Override
-    public UUID getUuid() {
-        return sender instanceof ProxiedPlayer ? ((ProxiedPlayer) sender).getUniqueId() : null;
-    }
-
-    @Override
-    public String getName() {
-        return sender.getName();
-    }
-
-    @Override
-    public boolean hasPermission(final String permission) {
-        return sender.hasPermission(permission);
-    }
-
-    @Override
-    public void send(final Component component) {
-        ((MaintenanceBungeePlugin) MaintenanceProvider.get()).audiences().sender(sender).sendMessage(component);
-    }
-
-    @Override
-    public boolean isPlayer() {
-        return sender instanceof ProxiedPlayer;
-    }
-
-    public void sendMessage(final TextComponent textComponent) {
-        sender.sendMessage(textComponent);
-    }
-
-    @Override
-    public boolean canAccess(final Server server) {
-        return ((BungeeServer) server).getServer().canAccess(sender);
-    }
-
-    @Override
-    public void disconnect(final Component component) {
-        if (sender instanceof Connection) {
-            ((Connection) sender).disconnect(ComponentUtil.toBadComponent(component));
-        }
-    }
-}

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

@@ -1,59 +0,0 @@
-/*
- * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2024 kennytv (https://github.com/kennytv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package eu.kennytv.maintenance.bungee.util;
-
-import eu.kennytv.maintenance.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.config.ServerInfo;
-import net.md_5.bungee.api.connection.ProxiedPlayer;
-
-public final class BungeeServer implements Server {
-    private final ServerInfo server;
-
-    public BungeeServer(final ServerInfo server) {
-        this.server = server;
-    }
-
-    @Override
-    public String getName() {
-        return server.getName();
-    }
-
-    @Override
-    public boolean hasPlayers() {
-        return !server.getPlayers().isEmpty();
-    }
-
-    @Override
-    public void broadcast(final Component component) {
-        final BaseComponent[] components = ComponentUtil.toBadComponent(component);
-        for (final ProxiedPlayer player : server.getPlayers()) {
-            player.sendMessage(components);
-        }
-    }
-
-    @Override
-    public boolean isRegisteredServer() {
-        return true;
-    }
-
-    public ServerInfo getServer() {
-        return server;
-    }
-}

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

@@ -1,34 +0,0 @@
-/*
- * This file is part of Maintenance - https://github.com/kennytv/Maintenance
- * Copyright (C) 2018-2024 kennytv (https://github.com/kennytv)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package eu.kennytv.maintenance.bungee.util;
-
-import eu.kennytv.maintenance.core.util.Task;
-import net.md_5.bungee.api.ProxyServer;
-
-public final class BungeeTask implements Task {
-    private final int id;
-
-    public BungeeTask(final int id) {
-        this.id = id;
-    }
-
-    @Override
-    public void cancel() {
-        ProxyServer.getInstance().getScheduler().cancel(id);
-    }
-}

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

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

bungee/src/main/resources/bungee.yml

@@ -1,7 +0,0 @@
-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/src/main/java/eu/kennytv/maintenance/core/config/ConfigSerializer.java

@@ -146,6 +146,11 @@ public final class ConfigSerializer {
                 multiLineValue = false;
             }
 
+            // YAML list items are values, not keys - skip without touching key/indent state
+            if (line.length() > indent && line.charAt(indent) == '-') {
+                continue;
+            }
+
             // Check if this is a level lower
             if (indents <= currentIndents) {
                 final String[] array = key.split(PATH_SEPARATOR_QUOTED);

core/src/main/resources/config.yml

@@ -18,17 +18,16 @@
 language: en
 
 # Enables maintenance mode.
-maintenance-enabled: false
+maintenance-enabled: true
 
 # Enables maintenance on certain servers managed by your proxy instance(s).
 proxied-maintenance-servers:
-  - PaperServer1
-# - AnotherServer
+# - AServer
 
 # If maintenance is enabled on a proxied server with players on it, they will be sent to the fallback server instead of being kicked off the network.
 # If the fallback server is not reachable/not set, they will just be kicked off the network.
 # This can also be set to an array to set multiple fallback servers, in case one server is not always reachable: 'fallback: [s1, s2, s3, ...]'
-fallback: lobby
+fallback: unreachable
 
 # If maintenance is enabled globally, you can define a "waiting" lobby for players to be sent to instead of being kicked.
 # Leave this empty to disable.
@@ -40,12 +39,12 @@ waiting-server: ""
 ping-message:
   enabled: true
   messages:
-    - "<red>Currently under maintenance<br><gradient:#fbffc2:#0fffff>We will be back soon!"
+    - "<bold><green>True<red>OG</bold> <yellow>Network</yellow> <aqua>》<red> Updating... </red><aqua>《 <gold>[1.8.0-1.21.11]<br><yellow>⚠ <dark_red>Maintenance in progress! <yellow>We'll be back <dark_aqua>soon™"
   # If set to true and an endtimer is currently running, a message from this pool will be chosen
   # instead of the ones above, so you can have different messages for when an endtimer is running/not running.
   enable-timer-specific-messages: true
   timer-messages:
-    - "<red>Currently under maintenance<br><gradient:#fbffc2:#fffff>Come back in:</gradient> <color:#aa55ee>%TIMER%"
+    - "<bold><green>True<red>OG</bold> <yellow>Network</yellow> <aqua>》<red>Maintenance Mode</red><aqua>《 <gold>[1.8.0-1.21.11]<br><dark_red>Maintenance ends in <yellow>%TIMER% <gray>| <green>Thanks for waiting!"
 
 # If enabled, the message below will be shown in the top right corner of the server in the server list, where the player count would normally be displayed.
 # You can use '%ONLINE%' and '%MAX%' if you want to include the player count in a custom message (e.g. "Maintenance %ONLINE%/%MAX%").
@@ -54,7 +53,7 @@ player-count-message:
   enabled: true
   message: "<dark_red>Maintenance"
   # If set to true and an endtimer is currently running, the timer message will be used instead of the normal one.
-  enable-timer-specific-message: false
+  enable-timer-specific-message: true
   timer-message: "<dark_red>Come back in: <yellow>%TIMER%"
 
 # Is shown when you move your mouse above the text in the top right corner of the server in the server list, where the player count would normally be displayed.
@@ -63,7 +62,7 @@ player-list-hover-message:
   enabled: true
   message: "<red>Currently under<br><red>maintenance"
   # If set to true and an endtimer is currently running, the timer message will be used instead of the normal one.
-  enable-timer-specific-message: false
+  enable-timer-specific-message: true
   timer-message: "<red>Come back in:<br><red><yellow>%TIMER%"
 
 # Any extra commands inside the arrays will be executed when maintenance is enabled/disabled.
@@ -85,7 +84,7 @@ custom-maintenance-icon: false
 
 # If set to true, players with the 'maintenance.joinnotification' permission will receive a message,
 # that a player tried to join the server while maintenance is enabled.
-send-join-notification: false
+send-join-notification: true
 
 # Set this to false if you do not want players to be kicked when you enable maintenance (new connections will still be blocked).
 kick-online-players: true
@@ -125,7 +124,7 @@ mysql:
 # If disabled, you will no longer receive any messages if there is an update.
 # Not recommended to disable, as new versions generally tend to run better and with fewer bugs.
 # However, you can always check for updates manually using the '/maintenance update' command.
-update-checks: true
+update-checks: false
 
 # Used for autoupdating the config, do not change this value.
 config-version: 9

gradle.properties

@@ -1,6 +1,7 @@
-projectVersion=4.3.0
+projectVersion=4.2.1
 
 # Gradle properties
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
+org.gradle.configuration-cache=true

gradle/libs.versions.toml

@@ -21,11 +21,12 @@ luckperms = "5.3"
 serverlistplus = "3.5.0"
 
 paper = "1.16.5-R0.1-SNAPSHOT"
-bungee = "1.20-R0.1-SNAPSHOT"
+bungee = "1.19.4-R0.1-SNAPSHOT"
 sponge = "8.0.0"
 velocity = "3.1.0"
 
 junitVer = "5.11.0"
+protocollibJarPath = "libs/ProtocolLib-5.0.jar"
 
 
 [libraries]
@@ -66,3 +67,4 @@ jupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", ve
 
 adventure = ["adventureApi", "adventureTextMinimessage", "adventureTextSerializerGson", "adventureTextSerializerLegacy"]
 junit = ["jupiterApi", "jupiterEngine"]
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

libs/License.txt

@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 2 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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

paper/build.gradle.kts

@@ -1,3 +1,5 @@
+val protocollibJar = rootProject.layout.projectDirectory.file(libs.versions.protocollibJarPath.get()).asFile
+
 dependencies {
     implementation(projects.maintenanceCore)
     implementation(projects.adventure.adventurePlatformBukkit) {
@@ -6,5 +8,6 @@ dependencies {
     implementation(libs.bstatsBukkit)
     compileOnly(libs.paper)
     compileOnly(libs.authlib)
-    compileOnly(libs.protocollib)
-}
+    compileOnly(files(protocollibJar))
+}
+

paper/src/main/java/eu/kennytv/maintenance/paper/MaintenancePaperPlugin.java

@@ -88,13 +88,16 @@ public final class MaintenancePaperPlugin extends MaintenancePlugin {
         continueLastEndtimer();
         new Metrics(plugin, 2205);
 
-        final Plugin serverListPlus = pm.getPlugin("ServerListPlus");
-        if (pm.isPluginEnabled(serverListPlus)) {
-            serverListPlusHook = new ServerListPlusHook(serverListPlus);
+        Plugin serverListPlugin = pm.getPlugin("AdvancedServerList-OG");
+        if (serverListPlugin == null) {
+            serverListPlugin = pm.getPlugin("ServerListPlus");
+        }
+        if (pm.isPluginEnabled(serverListPlugin)) {
+            serverListPlusHook = new ServerListPlusHook(serverListPlugin);
             if (settings.isEnablePingMessages()) {
                 serverListPlusHook.setEnabled(!settings.isMaintenance());
             }
-            plugin.getLogger().info("Enabled ServerListPlus integration");
+            plugin.getLogger().info("Enabled server list plugin integration");
         }
 
         if (false && pm.isPluginEnabled("LuckPerms")) {

paper/src/main/java/eu/kennytv/maintenance/paper/listener/PaperServerListPingListener.java

@@ -19,18 +19,12 @@ package eu.kennytv.maintenance.paper.listener;
 
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
 import com.destroystokyo.paper.profile.PlayerProfile;
-import com.destroystokyo.paper.profile.ProfileProperty;
-import com.mojang.authlib.GameProfile;
 import eu.kennytv.maintenance.core.Settings;
 import eu.kennytv.maintenance.paper.MaintenancePaperPlugin;
 import eu.kennytv.maintenance.paper.util.ComponentUtil;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 import java.util.UUID;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -67,7 +61,8 @@ public final class PaperServerListPingListener implements Listener {
             final List<PlayerProfile> sample = event.getPlayerSample();
             sample.clear();
             for (final String string : settings.getLegacyParsedPlayerCountHoverLines()) {
-                sample.add(new DummyProfile(string));
+                // Use Bukkit.createProfile so Paper's internal cast to CraftPlayerProfile succeeds.
+                sample.add(Bukkit.createProfile(UUID.randomUUID(), string));
             }
         }
 
@@ -75,98 +70,4 @@ public final class PaperServerListPingListener implements Listener {
             event.setServerIcon(plugin.getFavicon());
         }
     }
-
-    // Less unnecessary object creation :>
-    private static final class DummyProfile implements PlayerProfile {
-        private final String name;
-
-        private DummyProfile(final String name) {
-            this.name = name;
-        }
-
-        @Nullable
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public String setName(@Nullable final String name) {
-            return this.name;
-        }
-
-        @Override
-        public UUID getId() {
-            return UUID.randomUUID();
-        }
-
-        @Override
-        public UUID setId(@Nullable final UUID uuid) {
-            return null;
-        }
-
-        @Nonnull
-        @Override
-        public Set<ProfileProperty> getProperties() {
-            return Collections.emptySet();
-        }
-
-        @Override
-        public boolean hasProperty(final String property) {
-            return false;
-        }
-
-        @Override
-        public void setProperty(final ProfileProperty property) {
-        }
-
-        @Override
-        public void setProperties(final Collection<ProfileProperty> properties) {
-        }
-
-        @Override
-        public boolean removeProperty(final String property) {
-            return false;
-        }
-
-        @Override
-        public void clearProperties() {
-        }
-
-        @Override
-        public boolean isComplete() {
-            return false;
-        }
-
-        @Override
-        public boolean completeFromCache() {
-            return false;
-        }
-
-        @Override
-        public boolean completeFromCache(final boolean b) {
-            return false;
-        }
-
-        @Override
-        public boolean completeFromCache(final boolean b, final boolean b1) {
-            return false;
-        }
-
-        @Override
-        public boolean complete(final boolean textures) {
-            return false;
-        }
-
-        @Override
-        public boolean complete(final boolean b, final boolean b1) {
-            return false;
-        }
-
-        // Keep this here for backwards compatibility
-        @SuppressWarnings("unused")
-        public GameProfile getGameProfile() {
-            return null;
-        }
-    }
 }

paper/src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ version: ${version}
 main: eu.kennytv.maintenance.paper.MaintenancePaperBase
 author: kennytv
 description: ${description}
-softdepend: [ProtocolLib, ServerListPlus, ProtocolSupport, LuckPerms]
+softdepend: [ProtocolLib, AdvancedServerList-OG, ProtocolSupport, LuckPerms]
 website: https://hangar.papermc.io/kennytv/Maintenance
 api-version: 1.13
 folia-supported: true

settings.gradle.kts

@@ -15,8 +15,8 @@ dependencyResolutionManagement {
 pluginManagement {
     plugins {
         id("net.kyori.blossom") version "2.1.0"
-        id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7"
-        id("com.gradleup.shadow") version "8.3.0"
+        id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.9"
+        id("com.gradleup.shadow") version "8.3.9"
     }
 }
 
@@ -33,7 +33,6 @@ subproject("core")
 subproject("core-proxy")
 subproject("paper")
 subproject("sponge")
-subproject("bungee")
 subproject("velocity")
 
 setupSubproject("maintenance") {

universal/build.gradle.kts

@@ -7,8 +7,7 @@ plugins {
 // Not actually universal:tm:
 val platforms = setOf(
     rootProject.projects.maintenancePaper,
-    rootProject.projects.maintenanceBungee,
-).map { it.dependencyProject }
+).map { it.path }
 
 tasks {
     shadowJar {
@@ -19,10 +18,11 @@ tasks {
         archiveFileName.set("Maintenance-${project.version}.jar")
         destinationDirectory.set(rootProject.projectDir.resolve("build/libs"))
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-        platforms.forEach { platform ->
-            val shadowJarTask = platform.tasks.named<ShadowJar>("shadowJar").get()
+        platforms.forEach { platformPath ->
+            val platformProject = project(platformPath)
+            val shadowJarTask = platformProject.tasks.named<ShadowJar>("shadowJar").get()
             dependsOn(shadowJarTask)
-            dependsOn(platform.tasks.withType<Jar>())
+            dependsOn(platformProject.tasks.withType<Jar>())
             from(zipTree(shadowJarTask.archiveFile))
         }
     }