Exclude CODEOWNERS from language statistics

closes #161

Co-authored-by: ens-gijs <ens.gijs@gmail.com>

.gitattributes

@@ -4,3 +4,4 @@
 # These are explicitly windows files and should use crlf
 *.bat           text eol=crlf
 
+.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

.github/workflows/build.yml

@@ -0,0 +1,20 @@
+name: "build"
+
+on:
+  push:
+    branches: [ "**" ]
+    tags-ignore: [ "**" ]
+  pull_request:
+  release:
+    types: [ released ]
+
+jobs:
+  call-build:
+    uses: "jpenilla/actions/.github/workflows/shared-ci.yml@master"
+    secrets: inherit
+    with:
+      artifacts-path: 'build/libs/*.jar'
+      modrinth-publish: true
+      hangar-publish: true
+      loom: true
+      jdk-version: 21

.github/workflows/minimotd.yml

@@ -1,22 +0,0 @@
-name: Build MiniMOTD
-on: [ push, pull_request ]
-jobs:
-  build:
-    # Only run on PRs if the source branch is on someone else's repo
-    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: gradle/wrapper-validation-action@v1
-    - name: Set up JDK
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'adopt'
-        java-version: '16'
-    - name: Build with Gradle
-      run: ./gradlew build
-    - run: mkdir staging && cp build/libs/*.jar staging
-    - uses: actions/upload-artifact@v2
-      with:
-        name: Package
-        path: staging

build-logic/settings.gradle.kts

@@ -1,12 +0,0 @@
-import ca.stellardrift.build.configurate.ConfigFormats
-import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension
-
-enableFeaturePreview("VERSION_CATALOGS")
-
-plugins {
-  id("ca.stellardrift.polyglot-version-catalogs") version "5.0.0"
-}
-
-extensions.configure<PolyglotVersionCatalogExtension> {
-  from(ConfigFormats.YAML, file("../gradle/libs.versions.yml"))
-}

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

@@ -1,10 +0,0 @@
-import net.kyori.indra.git.IndraGitExtension
-import org.gradle.accessors.dm.LibrariesForLibs
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.the
-
-fun Project.lastCommitHash(): String =
-  the<IndraGitExtension>().commit()?.name?.substring(0, 7) ?: "unknown"
-
-val Project.libs: LibrariesForLibs
-  get() = the()

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

@@ -1,8 +0,0 @@
-import org.gradle.api.Project
-import org.gradle.api.provider.Property
-import org.gradle.api.tasks.bundling.AbstractArchiveTask
-import org.gradle.kotlin.dsl.property
-
-open class MiniMOTDPlatformExtension(private val project: Project) {
-  val jarTask: Property<AbstractArchiveTask> = project.objects.property()
-}

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

@@ -1,43 +0,0 @@
-import com.adarshr.gradle.testlogger.theme.ThemeType
-
-plugins {
-  id("java-library")
-  id("net.kyori.indra")
-  id("net.kyori.indra.publishing")
-  id("net.kyori.indra.checkstyle")
-  id("net.kyori.indra.license-header")
-  id("com.adarshr.test-logger")
-}
-
-version = (version as String)
-  .run { if (this.endsWith("-SNAPSHOT")) "$this+${lastCommitHash()}" else this }
-
-indra {
-  javaVersions {
-    target(8)
-  }
-  github(Constants.GITHUB_USER, Constants.GITHUB_REPO)
-  mitLicense()
-}
-
-testlogger {
-  theme = ThemeType.MOCHA_PARALLEL
-  showPassed = false
-}
-
-dependencies {
-  testImplementation(libs.jupiterEngine)
-}
-
-tasks {
-  tasks {
-    withType<JavaCompile> {
-      options.compilerArgs.add("-Xlint:-processing")
-    }
-    sequenceOf(javadocJar, javadoc).forEach {
-      it.configure {
-        onlyIf { false }
-      }
-    }
-  }
-}

build-logic/src/main/kotlin/minimotd.build-logic.gradle.kts

@@ -1,3 +0,0 @@
-plugins {
-  id("base")
-}

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

@@ -1,18 +0,0 @@
-plugins {
-  id("minimotd.base-conventions")
-  id("net.kyori.indra.git")
-}
-
-val platformExtension = extensions.create<MiniMOTDPlatformExtension>("miniMOTDPlatform", project)
-
-tasks {
-  val copyJar = register<FileCopyTask>("copyJar") {
-    fileToCopy.set(platformExtension.jarTask.flatMap { it.archiveFile })
-    destination.set(rootProject.layout.buildDirectory.dir("libs").flatMap {
-      it.file(fileToCopy.map { file -> file.asFile.name })
-    })
-  }
-  build {
-    dependsOn(copyJar)
-  }
-}

build.gradle.kts

@@ -1,7 +1,3 @@
 plugins {
   id("minimotd.build-logic")
 }
-
-group = "xyz.jpenilla"
-version = "2.0.3"
-description = "Use MiniMessage text formatting in the server list MOTD."

bukkit/build.gradle.kts

@@ -1,44 +0,0 @@
-plugins {
-  id("minimotd.shadow-platform")
-  id("net.minecrell.plugin-yml.bukkit")
-  id("xyz.jpenilla.run-paper")
-}
-
-dependencies {
-  implementation(projects.minimotdCommon)
-  implementation(libs.slf4jJdk14)
-  implementation(libs.adventurePlatformBukkit)
-  implementation(libs.bstatsBukkit)
-  compileOnly(libs.paperApi)
-}
-
-tasks {
-  runServer {
-    minecraftVersion("1.17")
-  }
-  generateBukkitPluginDescription {
-    mustRunAfter(clean)
-  }
-  shadowJar {
-    commonRelocation("org.slf4j")
-    commonRelocation("io.leangen.geantyref")
-    commonRelocation("net.kyori")
-    commonRelocation("org.bstats")
-  }
-}
-
-bukkit {
-  name = rootProject.name
-  main = "xyz.jpenilla.minimotd.bukkit.MiniMOTDPlugin"
-  apiVersion = "1.13"
-  website = Constants.GITHUB_URL
-  authors = listOf("jmp")
-  softDepend = listOf("ViaVersion")
-  commands {
-    create("minimotd") {
-      description = "MiniMOTD Command"
-      usage = "/minimotd help"
-      permission = "minimotd.admin"
-    }
-  }
-}

bungeecord/build.gradle.kts

@@ -1,30 +0,0 @@
-plugins {
-  id("minimotd.shadow-platform")
-  id("net.minecrell.plugin-yml.bungee")
-}
-
-dependencies {
-  implementation(projects.minimotdCommon)
-  implementation(libs.slf4jJdk14)
-  implementation(libs.adventurePlatformBungeecord)
-  implementation(libs.bstatsBungeecord)
-  compileOnly(libs.waterfallApi)
-}
-
-tasks {
-  generateBungeePluginDescription {
-    mustRunAfter(clean)
-  }
-  shadowJar {
-    commonRelocation("org.slf4j")
-    commonRelocation("io.leangen.geantyref")
-    commonRelocation("net.kyori")
-    commonRelocation("org.bstats")
-  }
-}
-
-bungee {
-  name = rootProject.name
-  main = "xyz.jpenilla.minimotd.bungee.MiniMOTDPlugin"
-  author = "jmp"
-}

common/build.gradle.kts

@@ -1,16 +1,15 @@
 plugins {
-  id("net.kyori.blossom")
+  alias(libs.plugins.blossom)
   id("minimotd.base-conventions")
 }
 
 tasks.jar {
   from(rootProject.file("license.txt")) {
-    rename { "license_${rootProject.name.toLowerCase()}.txt" }
+    rename { "license_${rootProject.name.lowercase()}.txt" }
   }
 }
 
 dependencies {
-  api(libs.slf4jApi)
   api(libs.configurateHocon)
   api(platform(libs.adventureBom))
   api(libs.adventureApi)
@@ -19,21 +18,20 @@ dependencies {
     exclude("com.google.code.gson", "gson")
   }
   api(libs.minimessage)
+  compileOnlyApi(libs.slf4jApi)
   compileOnlyApi(libs.checkerQual)
   compileOnlyApi(libs.gson)
   testImplementation(libs.gson)
-  compileOnlyApi(libs.guava)
 }
 
-blossom {
-  val file = "src/main/java/xyz/jpenilla/minimotd/common/Constants.java"
-  mapOf(
-    "PLUGIN_NAME" to rootProject.name,
-    "PLUGIN_VERSION" to project.version.toString(),
-    "PLUGIN_WEBSITE" to Constants.GITHUB_URL,
-    "GITHUB_USER" to Constants.GITHUB_USER,
-    "GITHUB_REPO" to Constants.GITHUB_REPO
-  ).forEach { (k, v) ->
-    replaceToken("\${$k}", v, file)
+sourceSets.main {
+  blossom {
+    javaSources {
+      property("PLUGIN_NAME", rootProject.name)
+      property("PLUGIN_VERSION", project.version.toString())
+      property("PLUGIN_WEBSITE", Constants.GITHUB_URL)
+      property("GITHUB_USER", Constants.GITHUB_USER)
+      property("GITHUB_REPO", Constants.GITHUB_REPO)
+    }
   }
 }

common/src/main/java-templates/xyz/jpenilla/minimotd/common/Constants.java.peb

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,15 +34,15 @@ public final class Constants {
     private PluginMetadata() {
     }
 
-    public static final String NAME = "${PLUGIN_NAME}";
-    public static final String VERSION = "${PLUGIN_VERSION}";
-    public static final String WEBSITE = "${PLUGIN_WEBSITE}";
-    public static final String GITHUB_USER = "${GITHUB_USER}";
-    public static final String GITHUB_REPO = "${GITHUB_REPO}";
+    public static final String NAME = "{{ PLUGIN_NAME }}";
+    public static final String VERSION = "{{ PLUGIN_VERSION }}";
+    public static final String WEBSITE = "{{ PLUGIN_WEBSITE }}";
+    public static final String GITHUB_USER = "{{ GITHUB_USER }}";
+    public static final String GITHUB_REPO = "{{ GITHUB_REPO }}";
     public static final String GITHUB_REPO_URL = "https://github.com/" + GITHUB_USER + "/" + GITHUB_REPO;
   }
 
   public static final int MINECRAFT_1_16_PROTOCOL_VERSION = 735;
 
-  public static final Component COMMAND_PREFIX = MiniMessage.get().parse("<white>[</white><gradient:#0047AB:#ADD8E6>" + PluginMetadata.NAME + "<white>]</white>");
+  public static final Component COMMAND_PREFIX = MiniMessage.miniMessage().deserialize("<white>[</white><gradient:#0047AB:#ADD8E6>" + PluginMetadata.NAME + "</gradient><white>]</white>");
 }

common/src/main/java/xyz/jpenilla/minimotd/common/CommandHandler.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@ package xyz.jpenilla.minimotd.common;
 import java.util.stream.Stream;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;
@@ -38,6 +37,7 @@ import static net.kyori.adventure.text.event.ClickEvent.openUrl;
 import static net.kyori.adventure.text.event.ClickEvent.runCommand;
 import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
 import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
+import static net.kyori.adventure.text.format.NamedTextColor.RED;
 import static net.kyori.adventure.text.format.NamedTextColor.WHITE;
 import static net.kyori.adventure.text.format.TextColor.color;
 import static net.kyori.adventure.text.format.TextDecoration.STRIKETHROUGH;
@@ -72,8 +72,19 @@ public final class CommandHandler {
   }
 
   public void reload(final Audience audience) {
-    this.miniMOTD.reload();
-    audience.sendMessage(TextComponent.ofChildren(
+    try {
+      this.miniMOTD.reload();
+    } catch (final Exception ex) {
+      this.miniMOTD.logger().warn("Failed to reload MiniMOTD. Ensure there are no errors in your config files.", ex);
+      audience.sendMessage(Component.textOfChildren(
+        Constants.COMMAND_PREFIX,
+        space(),
+        text("Failed to reload MiniMOTD. Ensure there are no errors in your config files. See console for more details.", RED)
+      ));
+      return;
+    }
+
+    audience.sendMessage(Component.textOfChildren(
       Constants.COMMAND_PREFIX,
       space(),
       text("Done reloading configuration.", GREEN)
@@ -109,7 +120,7 @@ public final class CommandHandler {
   }
 
   private static Component miniMessage(final String message) {
-    return MiniMessage.get().parse(message);
+    return MiniMessage.miniMessage().deserialize(message);
   }
 
   @FunctionalInterface

common/src/main/java/xyz/jpenilla/minimotd/common/IconManager.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,9 +28,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Stream;
 import javax.imageio.ImageIO;
@@ -38,7 +38,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class IconManager<I> {
-  private final Map<String, I> icons = new HashMap<>();
+  private final Map<String, I> icons = new ConcurrentHashMap<>();
   private final MiniMOTD<I> miniMOTD;
   private final Path iconsDirectory;
 

common/src/main/java/xyz/jpenilla/minimotd/common/MiniMOTD.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,14 +26,15 @@ package xyz.jpenilla.minimotd.common;
 import java.nio.file.Path;
 import java.util.concurrent.ThreadLocalRandom;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.framework.qual.DefaultQualifier;
 import org.slf4j.Logger;
 import xyz.jpenilla.minimotd.common.config.ConfigManager;
-import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;
 
 import static net.kyori.adventure.text.Component.newline;
 
@@ -45,32 +46,37 @@ public final class MiniMOTD<I> {
 
   public MiniMOTD(final MiniMOTDPlatform<I> platform) {
     this.platform = platform;
-    this.iconManager = new IconManager<>(this);
-    this.configManager = new ConfigManager(this);
-    this.configManager.loadConfigs();
+
+    try {
+      this.iconManager = new IconManager<>(this);
+      this.configManager = new ConfigManager(this);
+      this.configManager.loadConfigs();
+    } catch (final Exception ex) {
+      throw new IllegalStateException("Failed to load MiniMOTD. Ensure your config files are without errors.", ex);
+    }
   }
 
   public MiniMOTDPlatform<I> platform() {
     return this.platform;
   }
 
-  public final Path dataDirectory() {
+  public Path dataDirectory() {
     return this.platform.dataDirectory();
   }
 
-  public final IconManager<I> iconManager() {
+  public IconManager<I> iconManager() {
     return this.iconManager;
   }
 
-  public final Logger logger() {
+  public Logger logger() {
     return this.platform.logger();
   }
 
-  public final ConfigManager configManager() {
+  public ConfigManager configManager() {
     return this.configManager;
   }
 
-  public final PingResponse<I> createMOTD(final MiniMOTDConfig config, final int onlinePlayers, final int maxPlayers) {
+  public PingResponse<I> createMOTD(final MOTDConfig config, final int onlinePlayers, final int maxPlayers) {
     final PingResponse.PlayerCount count = config.modifyPlayerCount(onlinePlayers, maxPlayers);
     final PingResponse.Builder<I> response = PingResponse.<I>builder()
       .playerCount(count)
@@ -83,8 +89,8 @@ public final class MiniMOTD<I> {
         throw new IllegalStateException("MOTD is enabled, but there are no MOTDs in the config file?");
       }
       final int index = config.motds().size() == 1 ? 0 : ThreadLocalRandom.current().nextInt(config.motds().size());
-      final MiniMOTDConfig.MOTD motdConfig = config.motds().get(index);
-      final Component motd = TextComponent.ofChildren(
+      final MOTDConfig.MOTD motdConfig = config.motds().get(index);
+      final Component motd = Component.textOfChildren(
         parse(motdConfig.line1(), count),
         newline(),
         parse(motdConfig.line2(), count)
@@ -103,10 +109,9 @@ public final class MiniMOTD<I> {
   private static Component parse(final String input, final PingResponse.PlayerCount count) {
     final String online = Integer.toString(count.onlinePlayers());
     final String max = Integer.toString(count.maxPlayers());
-    return MiniMessage.get().parse(
+    return MiniMessage.miniMessage().deserialize(
       replacePlayerCount(input, online, max),
-      "online_players", online,
-      "max_players", max
+      TagResolver.resolver(Placeholder.unparsed("online_players", online), Placeholder.unparsed("max_players", max))
     );
   }
 
@@ -114,7 +119,7 @@ public final class MiniMOTD<I> {
     return input.replace("{onlinePlayers}", online).replace("{maxPlayers}", max);
   }
 
-  public void reload() {
+  public synchronized void reload() {
     this.iconManager.loadIcons();
     this.configManager.loadConfigs();
     this.platform.onReload();

common/src/main/java/xyz/jpenilla/minimotd/common/MiniMOTDPlatform.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

common/src/main/java/xyz/jpenilla/minimotd/common/PingResponse.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -60,7 +60,7 @@ public final class PingResponse<I> {
 
   /**
    * If {@link #icon()} is non-null, the provided {@link Consumer} will be called using
-   * it's return value. If {@link #icon()} is {@code null}, do nothing.
+   * its return value. If {@link #icon()} is {@code null}, do nothing.
    *
    * @param iconConsumer icon consumer
    */
@@ -76,7 +76,7 @@ public final class PingResponse<I> {
 
   /**
    * If {@link #motd()} is non-null, the provided {@link Consumer} will be called using
-   * it's return value. If {@link #motd()} is {@code null}, do nothing.
+   * its return value. If {@link #motd()} is {@code null}, do nothing.
    *
    * @param motdConsumer motd consumer
    */

common/src/main/java/xyz/jpenilla/minimotd/common/config/ConfigLoader.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,9 +23,14 @@
  */
 package xyz.jpenilla.minimotd.common.config;
 
+import java.lang.reflect.Method;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationOptions;
@@ -34,27 +39,31 @@ import org.spongepowered.configurate.objectmapping.ObjectMapper;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializerCollection;
 
+@DefaultQualifier(NonNull.class)
 public final class ConfigLoader<C> {
   private static final TypeSerializerCollection SERIALIZERS;
 
   static {
-    SERIALIZERS = TypeSerializerCollection.defaults()
-      .childBuilder()
+    SERIALIZERS = TypeSerializerCollection.builder()
       .register(PlayerCountModifier.serializer())
       .build();
   }
 
   private final HoconConfigurationLoader loader;
   private final ObjectMapper<C> mapper;
+  private final List<Consumer<C>> postProcess;
 
   public ConfigLoader(
-    final @NonNull Class<C> configClass,
-    final @NonNull Path configPath,
-    final @NonNull ConfigurationOptions options
+    final Class<C> configClass,
+    final Path configPath,
+    final UnaryOperator<ConfigurationOptions> optionsModifier
   ) {
+    this.postProcess = this.findPostProcessors(configClass);
     this.loader = HoconConfigurationLoader.builder()
       .path(configPath)
-      .defaultOptions(options.serializers(SERIALIZERS))
+      .defaultOptions(options ->
+        optionsModifier.apply(options)
+          .serializers(builder -> builder.registerAll(SERIALIZERS)))
       .build();
     try {
       this.mapper = ObjectMapper.factory().get(configClass);
@@ -66,24 +75,38 @@ public final class ConfigLoader<C> {
     }
   }
 
-  public ConfigLoader(
-    final @NonNull Class<C> configClass,
-    final @NonNull Path configPath,
-    final @NonNull UnaryOperator<ConfigurationOptions> options
-  ) {
-    this(configClass, configPath, options.apply(ConfigurationOptions.defaults()));
+  private List<Consumer<C>> findPostProcessors(final Class<C> configClass) {
+    final List<Consumer<C>> ret = new ArrayList<>();
+    for (final Method method : configClass.getDeclaredMethods()) {
+      if (method.getAnnotation(PostProcessor.class) == null) {
+        continue;
+      }
+      ret.add(config -> {
+        try {
+          method.setAccessible(true);
+          method.invoke(config);
+        } catch (final ReflectiveOperationException ex) {
+          throw new RuntimeException("Failed to invoke post processor method", ex);
+        }
+      });
+    }
+    return ret;
   }
 
   public ConfigLoader(
     final @NonNull Class<C> configClass,
     final @NonNull Path configPath
   ) {
-    this(configClass, configPath, ConfigurationOptions.defaults());
+    this(configClass, configPath, options -> options);
   }
 
   public @NonNull C load() throws ConfigurateException {
     final CommentedConfigurationNode node = this.loader.load();
-    return this.mapper.load(node);
+    final C config = this.mapper.load(node);
+    for (final Consumer<C> processor : this.postProcess) {
+      processor.accept(config);
+    }
+    return config;
   }
 
   public void save(final @NonNull C config) throws ConfigurateException {

common/src/main/java/xyz/jpenilla/minimotd/common/config/ConfigManager.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,12 @@
  */
 package xyz.jpenilla.minimotd.common.config;
 
-import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -45,18 +46,18 @@ public final class ConfigManager {
 
   private final MiniMOTD<?> miniMOTD;
 
-  private final ConfigLoader<MiniMOTDConfig> mainConfigLoader;
-  private MiniMOTDConfig mainConfig;
+  private final ConfigLoader<MOTDConfig> mainConfigLoader;
+  private MOTDConfig mainConfig;
 
   private final ConfigLoader<PluginSettings> pluginSettingsLoader;
   private PluginSettings pluginSettings;
 
-  private final Map<String, MiniMOTDConfig> extraConfigs = new HashMap<>();
+  private final Map<String, MOTDConfig> extraConfigs = new HashMap<>();
 
   public ConfigManager(final @NonNull MiniMOTD<?> miniMOTD) {
     this.miniMOTD = miniMOTD;
     this.mainConfigLoader = new ConfigLoader<>(
-      MiniMOTDConfig.class,
+      MOTDConfig.class,
       this.miniMOTD.dataDirectory().resolve("main.conf"),
       options -> options.header("MiniMOTD Main Configuration")
     );
@@ -93,12 +94,12 @@ public final class ConfigManager {
             continue;
           }
           final String name = path.getFileName().toString().replace(".conf", "");
-          final ConfigLoader<MiniMOTDConfig> loader = new ConfigLoader<>(
-            MiniMOTDConfig.class,
+          final ConfigLoader<MOTDConfig> loader = new ConfigLoader<>(
+            MOTDConfig.class,
             path,
             options -> options.header(String.format("Extra MiniMOTD config '%s'", name))
           );
-          final MiniMOTDConfig config = loader.load();
+          final MOTDConfig config = loader.load();
           loader.save(config);
           this.extraConfigs.put(name, config);
         }
@@ -109,20 +110,20 @@ public final class ConfigManager {
   }
 
   private void createDefaultExtraConfigs(final @NonNull Path extraConfigsDir) throws ConfigurateException {
-    final List<Pair<Path, MiniMOTDConfig.MOTD>> defaults = ImmutableList.of(
-      pair(extraConfigsDir.resolve("skyblock.conf"), new MiniMOTDConfig.MOTD("<green><italic>Skyblock</green>", "<bold><rainbow>MiniMOTD Skyblock Server")),
-      pair(extraConfigsDir.resolve("survival.conf"), new MiniMOTDConfig.MOTD("<gradient:blue:red>Survival Mode Hardcore", "<green><bold>MiniMOTD Survival Server"))
-    );
-    for (final Pair<Path, MiniMOTDConfig.MOTD> pair : defaults) {
-      final ConfigLoader<MiniMOTDConfig> loader = new ConfigLoader<>(
-        MiniMOTDConfig.class,
+    final List<Pair<Path, MOTDConfig.MOTD>> defaults = Collections.unmodifiableList(Arrays.asList(
+      pair(extraConfigsDir.resolve("skyblock.conf"), new MOTDConfig.MOTD("<green><italic>Skyblock</green>", "<bold><rainbow>MiniMOTD Skyblock Server")),
+      pair(extraConfigsDir.resolve("survival.conf"), new MOTDConfig.MOTD("<gradient:blue:red>Survival Mode Hardcore", "<green><bold>MiniMOTD Survival Server"))
+    ));
+    for (final Pair<Path, MOTDConfig.MOTD> pair : defaults) {
+      final ConfigLoader<MOTDConfig> loader = new ConfigLoader<>(
+        MOTDConfig.class,
         pair.left()
       );
-      loader.save(new MiniMOTDConfig(pair.right()));
+      loader.save(new MOTDConfig(pair.right()));
     }
   }
 
-  public @NonNull MiniMOTDConfig mainConfig() {
+  public @NonNull MOTDConfig mainConfig() {
     if (this.mainConfig == null) {
       throw new IllegalStateException("Config has not yet been loaded");
     }
@@ -136,15 +137,14 @@ public final class ConfigManager {
     return this.pluginSettings;
   }
 
-  public @NonNull MiniMOTDConfig resolveConfig(final @Nullable InetSocketAddress address) {
+  public @NonNull MOTDConfig resolveConfig(final @Nullable InetSocketAddress address) {
     if (address == null) {
       return this.mainConfig();
     }
-    final String hostString = address.getHostString() + ":" + address.getPort();
-    final String configString = this.pluginSettings().proxySettings().findConfigStringForHost(hostString);
+    final String configString = this.pluginSettings().proxySettings().findConfigStringForHost(address.getHostString(), address.getPort());
 
     if (this.pluginSettings().proxySettings().virtualHostTestMode()) {
-      this.miniMOTD.platform().logger().info("[virtual-host-debug] Virtual Host: '{}', Selected Config: '{}'", hostString, configString == null ? "default" : configString);
+      this.miniMOTD.platform().logger().info("[virtual-host-debug] Virtual Host: '{}:{}', Selected Config: '{}'", address.getHostString(), address.getPort(), configString == null ? "default" : configString);
     }
 
     if (configString == null) {
@@ -153,11 +153,11 @@ public final class ConfigManager {
     return this.resolveConfig(configString);
   }
 
-  public @NonNull MiniMOTDConfig resolveConfig(final @NonNull String name) {
+  public @NonNull MOTDConfig resolveConfig(final @NonNull String name) {
     if ("default".equals(name)) {
       return this.mainConfig();
     }
-    final MiniMOTDConfig cfg = this.extraConfigs.get(name);
+    final MOTDConfig cfg = this.extraConfigs.get(name);
     if (cfg != null) {
       return cfg;
     }

common/src/main/java/xyz/jpenilla/minimotd/common/config/MOTDConfig.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,22 +34,22 @@ import xyz.jpenilla.minimotd.common.PingResponse;
 import static xyz.jpenilla.minimotd.common.PingResponse.PlayerCount.playerCount;
 
 @ConfigSerializable
-public final class MiniMOTDConfig {
+public final class MOTDConfig {
 
-  public MiniMOTDConfig() {
+  public MOTDConfig() {
     this(
       new MOTD(),
       new MOTD("<blue>Another <bold><red>MOTD", "<italic><underlined><gradient:red:green>much wow")
     );
   }
 
-  public MiniMOTDConfig(final @NonNull MOTD @NonNull ... defaults) {
+  public MOTDConfig(final @NonNull MOTD @NonNull ... defaults) {
     this.motds.addAll(Arrays.asList(defaults));
   }
 
   @Comment("The list of MOTDs to display\n"
     + "\n"
-    + " - Supported placeholders: {onlinePlayers}, {maxPlayers}\n"
+    + " - Supported placeholders: <online_players>, <max_players>\n"
     + " - Putting more than one will cause one to be randomly chosen each refresh")
   private final List<MOTD> motds = new ArrayList<>();
 
@@ -123,6 +123,11 @@ public final class MiniMOTDConfig {
       + "If false, the online player count will be capped at the maximum player count")
     private boolean allowExceedingMaximum = false;
 
+    @Comment("The list of server names that affect player counts/listing.\n"
+      + "Only applicable when running the plugin on a proxy (Velocity or Waterfall/Bungeecord).\n"
+      + "When set to an empty list, the default count & list as determined by the proxy will be used.")
+    private final List<String> servers = new ArrayList<>();
+
     @ConfigSerializable
     public static final class JustXMore {
 
@@ -157,6 +162,10 @@ public final class MiniMOTDConfig {
 
   }
 
+  public List<String> targetServers() {
+    return this.playerCountSettings.servers;
+  }
+
   public boolean iconEnabled() {
     return this.iconEnabled;
   }

common/src/main/java/xyz/jpenilla/minimotd/common/config/PlayerCountModifier.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -46,7 +46,7 @@ public final class PlayerCountModifier implements Int2IntFunction {
     return this.function.apply(actualPlayers);
   }
 
-  public final @NonNull String input() {
+  public @NonNull String input() {
     return this.input;
   }
 

common/src/main/java/xyz/jpenilla/minimotd/common/config/PluginSettings.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,8 +23,10 @@
  */
 package xyz.jpenilla.minimotd.common.config;
 
-import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Locale;
 import java.util.Map;
+import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.configurate.objectmapping.ConfigSerializable;
@@ -49,22 +51,83 @@ public final class PluginSettings {
       this.virtualHostConfigs.put("skyblock.example.com:25565", "skyblock");
     }
 
+    public ProxySettings(final Map<String, String> virtualHostConfigs) {
+      this.virtualHostConfigs.putAll(virtualHostConfigs);
+    }
+
     @Comment("Here you can assign configs in the 'extra-configs' folder to specific virtual hosts\n"
       + "Either use the name of the config in 'extra-configs', or use \"default\" to use the configuration in main.conf\n"
       + "\n"
-      + "Format is \"hostname:port\"=\"configName|default\"")
-    private final Map<String, String> virtualHostConfigs = new HashMap<>();
+      + "Format is \"hostname:port\"=\"configName|default\"\n"
+      + "Parts of domains can be substituted for wildcards, i.e. \"*.mydomain.com:25565\". Wildcard-containing configs are\n"
+      + "checked in the order they are declared if there are no exact matches.")
+    private final Map<String, String> virtualHostConfigs = new LinkedHashMap<>();
+
+    private transient @MonotonicNonNull Map<String[], String> splitVirtualHostConfigs;
 
     @Comment("Set whether to enable virtual host testing mode.\n"
       + "When enabled, MiniMOTD will print virtual host debug info to the console on each server ping.")
-    private final boolean virtualHostTestMode = false;
+    private boolean virtualHostTestMode = false;
 
     public boolean virtualHostTestMode() {
       return this.virtualHostTestMode;
     }
 
-    public @Nullable String findConfigStringForHost(final @NonNull String host) {
-      return this.virtualHostConfigs.get(host);
+    public @Nullable String findConfigStringForHost(@NonNull String host, final int port) {
+      host = processTcpShieldHostname(host).toLowerCase(Locale.ENGLISH) + ':' + port;
+
+      final @Nullable String exactMatch = this.virtualHostConfigs.get(host);
+      if (exactMatch != null) {
+        return exactMatch;
+      }
+
+      if (this.splitVirtualHostConfigs.isEmpty()) {
+        return null;
+      }
+
+      final String[] splitHost = host.split("\\.");
+
+      configs:
+      for (final Map.Entry<String[], String> e : this.splitVirtualHostConfigs.entrySet()) {
+        final String[] splitKey = e.getKey();
+        if (splitKey.length != splitHost.length) {
+          continue;
+        }
+        for (int i = 0; i < splitHost.length; i++) {
+          final String keyPart = splitKey[i];
+          if (!keyPart.equals(splitHost[i]) && !keyPart.equals("*")) {
+            continue configs;
+          }
+        }
+        return e.getValue();
+      }
+
+      return null;
+    }
+
+    private static String processTcpShieldHostname(final String hostname) {
+      if (hostname.contains("///")) {
+        final String[] split = hostname.split("///");
+        if (split.length == 4) {
+          // <actual hostname>///<user-ip>:<user-port>///<unix timestamp>///<signature>
+          return split[0];
+        }
+      }
+      return hostname;
+    }
+
+    public void processVirtualHosts() {
+      final Map<String, String> virtualHosts = new LinkedHashMap<>(this.virtualHostConfigs);
+      this.virtualHostConfigs.clear();
+      virtualHosts.forEach((host, config) -> this.virtualHostConfigs.put(host.toLowerCase(Locale.ENGLISH), config));
+
+      this.splitVirtualHostConfigs = new LinkedHashMap<>();
+      this.virtualHostConfigs.forEach((host, config) -> {
+        if (!host.contains("*")) {
+          return;
+        }
+        this.splitVirtualHostConfigs.put(host.split("\\."), config);
+      });
     }
   }
 
@@ -76,4 +139,8 @@ public final class PluginSettings {
     return this.updateChecker;
   }
 
+  @PostProcessor
+  private void processVirtualHosts() {
+    this.proxySettings.processVirtualHosts();
+  }
 }

common/src/main/java/xyz/jpenilla/minimotd/common/config/PostProcessor.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of MiniMOTD, licensed under the MIT License.
+ *
+ * Copyright (c) 2020-2024 Jason Penilla
+ *
+ * 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 xyz.jpenilla.minimotd.common.config;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface PostProcessor {
+}

common/src/main/java/xyz/jpenilla/minimotd/common/util/ComponentColorDownsampler.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

common/src/main/java/xyz/jpenilla/minimotd/common/util/Int2IntFunction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

common/src/main/java/xyz/jpenilla/minimotd/common/util/Pair.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

common/src/main/java/xyz/jpenilla/minimotd/common/util/UpdateChecker.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,14 +23,14 @@
  */
 package xyz.jpenilla.minimotd.common.util;
 
-import com.google.common.base.Charsets;
-import com.google.common.collect.ImmutableList;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonParser;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -45,7 +45,7 @@ public final class UpdateChecker {
   public @NonNull List<String> checkVersion() {
     final JsonArray result;
     final String url = String.format("https://api.github.com/repos/%s/%s/releases", Constants.PluginMetadata.GITHUB_USER, Constants.PluginMetadata.GITHUB_REPO);
-    try (final InputStream is = new URL(url).openStream(); InputStreamReader reader = new InputStreamReader(is, Charsets.UTF_8)) {
+    try (final InputStream is = new URL(url).openStream(); InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
       result = this.parser.parse(reader).getAsJsonArray();
     } catch (final IOException ex) {
       return Collections.singletonList("Cannot look for updates: " + ex.getMessage());
@@ -58,13 +58,13 @@ public final class UpdateChecker {
       return Collections.emptyList(); // Up to date, do nothing
     }
     if (currentVersion.contains("SNAPSHOT")) {
-      return ImmutableList.of(
+      return Arrays.asList(
         "This server is running a development build of " + Constants.PluginMetadata.NAME + "! (" + currentVersion + ")",
         "The latest official release is " + versionList.get(0)
       );
     }
     final int versionsBehind = versionList.indexOf(currentVersion);
-    return ImmutableList.of(
+    return Arrays.asList(
       "There is an update available for " + Constants.PluginMetadata.NAME + "!",
       "This server is running version " + currentVersion + ", which is " + (versionsBehind == -1 ? "UNKNOWN" : versionsBehind) + " versions outdated.",
       "Download the latest version, " + versionList.get(0) + " from GitHub at the link below:",

common/src/test/java/xyz/jpenilla/minimotd/common/VirtualHostMatchingTest.java

@@ -0,0 +1,56 @@
+/*
+ * This file is part of MiniMOTD, licensed under the MIT License.
+ *
+ * Copyright (c) 2020-2024 Jason Penilla
+ *
+ * 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 xyz.jpenilla.minimotd.common;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import xyz.jpenilla.minimotd.common.config.PluginSettings;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+class VirtualHostMatchingTest {
+  @Test
+  void testMatching() {
+    final Map<String, String> map = new LinkedHashMap<>();
+    map.put("abc.xyz:25565", "1");
+    map.put("subdomain.abc.xyz:25565", "2");
+    map.put("*.abc.xyz:25565", "3");
+    map.put("abc.*.*.domain.com:25565", "4");
+    map.put("*.*.*.domain.com:25565", "5");
+    final PluginSettings.ProxySettings proxySettings = new PluginSettings.ProxySettings(map);
+    proxySettings.processVirtualHosts();
+
+    assertEquals("1", proxySettings.findConfigStringForHost("abc.xyz", 25565));
+    assertEquals("2", proxySettings.findConfigStringForHost("subdomain.abc.xyz", 25565));
+    assertEquals("3", proxySettings.findConfigStringForHost("other_subdomain.abc.xyz", 25565));
+    assertEquals("4", proxySettings.findConfigStringForHost("abc.2.3.domain.com", 25565));
+    assertEquals("5", proxySettings.findConfigStringForHost("1.2.3.domain.com", 25565));
+    // TCPShield-mangled hostname
+    assertEquals("5", proxySettings.findConfigStringForHost("1.2.3.domain.com///127.0.0.1:25565///1681016669///MGQCMAW5X13a9cF5ysnWdrBLovH4wfVu60l7eBUwWsCI8vw0cuZ9aj+UM7+y1wC//qGHngIwRsCke7eCpO99HTHOVdvZKjx9G0E51ALqRFGWH7kxMhVKYNF2IfMaT1FfbS0/D0du", 25565));
+    assertNull(proxySettings.findConfigStringForHost("subdomain.subdomain.abc.xyz", 25565));
+    assertNull(proxySettings.findConfigStringForHost("google.com", 25565));
+  }
+}

common/src/test/java/xyz/jpenilla/minimotd/common/util/ComponentColorDownsamplerTest.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +24,6 @@
 package xyz.jpenilla.minimotd.common.util;
 
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.format.TextColor;
 import org.junit.jupiter.api.Test;
 
@@ -42,14 +41,14 @@ class ComponentColorDownsamplerTest {
 
   @Test
   void testColorDownsampling() {
-    final Component fullColor = TextComponent.ofChildren(
+    final Component fullColor = Component.textOfChildren(
       text("Green ", GREEN),
       text("Orange Yellow ", ORANGE_YELLOW),
       text("Pink ", PINK),
       text("Blue ", BLUE),
       text("Lime Green", LIME_GREEN)
     );
-    final Component expectedDownsample = TextComponent.ofChildren(
+    final Component expectedDownsample = Component.textOfChildren(
       text("Green ", nearestTo(GREEN)),
       text("Orange Yellow ", nearestTo(ORANGE_YELLOW)),
       text("Pink ", nearestTo(PINK)),

dist/bukkit-bungeecord/build.gradle.kts

@@ -9,13 +9,9 @@ tasks.jar {
 val platforms = setOf(
   projects.minimotdBukkit,
   projects.minimotdBungeecord,
-  projects.minimotdVelocity,
-  projects.minimotdFabric,
-  projects.minimotdSponge7,
-  //projects.minimotdSponge8
 ).map { it.dependencyProject }
 
-val universal = tasks.register<Jar>("universal") {
+val dist = tasks.register<Jar>("bukkitAndBungeeJar") {
   artifacts.add("archives", this)
   archiveClassifier.set(null as String?)
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -23,10 +19,9 @@ val universal = tasks.register<Jar>("universal") {
   for (platform in platforms) {
     val jarTask = platform.miniMOTDPlatform.jarTask
     from(zipTree(jarTask.flatMap { it.archiveFile }))
-    dependsOn(jarTask) // todo: remove when updating Gradle to 7.1 (https://github.com/gradle/gradle/issues/15569)
   }
 }
 
 miniMOTDPlatform {
-  jarTask.set(universal)
+  jarTask.set(dist)
 }

gradle.properties

@@ -1,3 +1,8 @@
+group=xyz.jpenilla
+version=2.1.2-SNAPSHOT
+description=Use MiniMessage text formatting in the server list MOTD.
+
+org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true

gradle/build-logic/build.gradle.kts

@@ -8,8 +8,10 @@ repositories {
 
 dependencies {
   implementation(libs.indraCommon)
+  implementation(libs.indraLicenser)
   implementation(libs.shadow)
-  implementation(libs.testLoggerPlugin)
+  implementation(libs.mod.publish.plugin)
+  implementation(libs.hangarPublishPlugin)
 
   // https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
   implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))

gradle/build-logic/settings.gradle.kts

@@ -0,0 +1,9 @@
+rootProject.name = "build-logic"
+
+dependencyResolutionManagement {
+  versionCatalogs {
+    create("libs") {
+      from(files("../libs.versions.toml"))
+    }
+  }
+}

gradle/build-logic/src/main/kotlin/FileCopyTask.kt

@@ -1,17 +1,18 @@
 import org.gradle.api.DefaultTask
+import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 
 abstract class FileCopyTask : DefaultTask() {
-  @InputFile
-  val fileToCopy = project.objects.fileProperty()
+  @get:InputFile
+  abstract val fileToCopy: RegularFileProperty
 
-  @OutputFile
-  val destination = project.objects.fileProperty()
+  @get:OutputFile
+  abstract val destination: RegularFileProperty
 
   @TaskAction
-  private fun copyFile() {
+  fun copyFile() {
     destination.get().asFile.parentFile.mkdirs()
     fileToCopy.get().asFile.copyTo(destination.get().asFile, overwrite = true)
   }

gradle/build-logic/src/main/kotlin/MiniMOTDPlatformExtension.kt

@@ -0,0 +1,7 @@
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.bundling.AbstractArchiveTask
+
+interface MiniMOTDPlatformExtension {
+  val jarTask: Property<AbstractArchiveTask>
+  val hangar: Property<Boolean>
+}

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

@@ -0,0 +1,35 @@
+import net.kyori.indra.git.IndraGitExtension
+import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.api.Project
+import org.gradle.api.provider.Provider
+import org.gradle.kotlin.dsl.getByType
+
+fun Project.lastCommitHash(): String =
+  extensions.getByType<IndraGitExtension>().commit()?.name?.substring(0, 7) ?: "unknown"
+
+val Project.libs: LibrariesForLibs
+  get() = extensions.getByType()
+
+val Project.releaseNotes: Provider<String>
+  get() = providers.environmentVariable("RELEASE_NOTES")
+
+val Project.minecraftVersion: String
+  get() = libs.versions.minecraft.get()
+
+val bukkitVersions = listOf(
+  "1.8.8",
+  "1.8.9",
+  "1.9.4",
+  "1.10.2",
+  "1.11.2",
+  "1.12.2",
+  "1.13.2",
+  "1.14.4",
+  "1.15.2",
+  "1.16.5",
+  "1.17.1",
+  "1.18.2",
+  "1.19.4",
+  "1.20.6",
+  "1.21",
+)

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

@@ -0,0 +1,40 @@
+plugins {
+  id("java-library")
+  id("net.kyori.indra")
+  id("net.kyori.indra.git")
+  id("net.kyori.indra.checkstyle")
+  id("net.kyori.indra.licenser.spotless")
+}
+
+version = (version as String)
+  .run { if (this.endsWith("-SNAPSHOT")) "$this+${lastCommitHash()}" else this }
+
+indra {
+  javaVersions {
+    minimumToolchain(17)
+    target(8)
+  }
+  github(Constants.GITHUB_USER, Constants.GITHUB_REPO)
+  mitLicense()
+}
+
+dependencies {
+  testImplementation(libs.jupiterEngine)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+}
+
+tasks {
+  withType<JavaCompile> {
+    options.compilerArgs.add("-Xlint:-processing")
+  }
+  listOf(javadocJar, javadoc).forEach {
+    it.configure {
+      onlyIf { false }
+    }
+  }
+  test {
+    testLogging {
+      events("passed")
+    }
+  }
+}

gradle/build-logic/src/main/kotlin/minimotd.build-logic.gradle.kts

@@ -0,0 +1,33 @@
+plugins {
+  base
+  id("io.papermc.hangar-publish-plugin")
+}
+
+fun jar(platform: String) = project(":minimotd-$platform")
+  .extensions.getByType<MiniMOTDPlatformExtension>().jarTask.flatMap { it.archiveFile }
+
+hangarPublish.publications.register("plugin") {
+  version.set(project.version as String)
+  id.set("MiniMOTD")
+  channel.set("Release")
+  changelog.set(releaseNotes)
+  apiKey.set(providers.environmentVariable("HANGAR_UPLOAD_KEY"))
+  platforms {
+    paper {
+      jar.set(jar("bukkit"))
+      val vers = bukkitVersions.toMutableList()
+      vers -= "1.8.8"
+      vers -= "1.8.9"
+      vers += "1.8"
+      platformVersions.addAll(vers)
+    }
+    velocity {
+      jar.set(jar("velocity"))
+      platformVersions.addAll("3.2")
+    }
+    waterfall {
+      jar.set(jar("bungeecord"))
+      platformVersions.addAll("1.20")
+    }
+  }
+}

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

@@ -0,0 +1,34 @@
+import me.modmuss50.mpp.ModPublishExtension
+
+plugins {
+  id("minimotd.base-conventions")
+  id("net.kyori.indra.git")
+}
+
+val platformExtension = extensions.create<MiniMOTDPlatformExtension>("miniMOTDPlatform")
+
+tasks {
+  val copyJar = register<FileCopyTask>("copyJar") {
+    fileToCopy.set(platformExtension.jarTask.flatMap { it.archiveFile })
+    destination.set(rootProject.layout.buildDirectory.dir("libs").flatMap {
+      it.file(fileToCopy.map { file -> file.asFile.name })
+    })
+  }
+  build {
+    dependsOn(copyJar)
+  }
+}
+
+if (name != "minimotd-bukkit-bungeecord") {
+  plugins.apply("me.modmuss50.mod-publish-plugin")
+
+  extensions.configure(ModPublishExtension::class) {
+    modrinth {
+      projectId.set("16vhQOQN")
+      type = STABLE
+      file.set(platformExtension.jarTask.flatMap { it.archiveFile })
+      changelog.set(releaseNotes)
+      accessToken.set(providers.environmentVariable("MODRINTH_TOKEN"))
+    }
+  }
+}

gradle/build-logic/src/main/kotlin/minimotd.shadow-platform.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("minimotd.platform-conventions")
-  id("com.github.johnrengelman.shadow")
+  id("io.github.goooler.shadow")
 }
 
 tasks {
@@ -14,5 +14,5 @@ tasks {
 }
 
 extensions.configure<MiniMOTDPlatformExtension> {
-  jarTask.set(tasks.named<AbstractArchiveTask>("shadowJar"))
+  jarTask.set(tasks.shadowJar)
 }

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

@@ -1,4 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.internal.DependencyFilter
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 fun ShadowJar.commonRelocation(pkg: String) {
@@ -9,13 +8,6 @@ fun ShadowJar.platformRelocation(platform: String, pkg: String) {
   relocate(pkg, "${Constants.RELOCATION_BASE_PACKAGE}.platform_$platform.$pkg")
 }
 
-fun ShadowJar.configureForNativeAdventurePlatform() {
-  platformRelocation("kyori", "net.kyori.adventure.text.minimessage")
-  dependencies {
-    excludeAdventureExceptMiniMessage()
-  }
-}
-
 fun ShadowJar.commonConfiguration() {
   commonRelocation("org.spongepowered.configurate")
   commonRelocation("com.typesafe.config")
@@ -25,9 +17,8 @@ fun ShadowJar.commonConfiguration() {
   }
 }
 
-private fun DependencyFilter.excludeAdventureExceptMiniMessage() {
-  exclude { dependency ->
-    dependency.moduleGroup == "net.kyori"
-      && dependency.moduleName != "adventure-text-minimessage"
+fun ShadowJar.configureForNativeAdventurePlatform() {
+  dependencies {
+    exclude { dependency -> dependency.moduleGroup == "net.kyori" }
   }
 }

gradle/libs.versions.toml

@@ -0,0 +1,79 @@
+[plugins]
+blossom = { id = "net.kyori.blossom", version = "2.1.0" }
+sponge-gradle-plugin = { id = "org.spongepowered.gradle.plugin", version = "2.2.0" }
+run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-task" }
+run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-task" }
+run-waterfall = { id = "xyz.jpenilla.run-waterfall", version.ref = "run-task" }
+
+[versions]
+run-task = "2.3.0"
+mod-publish-plugin = "0.5.1"
+hangarPublishPlugin = "0.1.2"
+indra = "3.1.3"
+shadow = "8.1.7"
+adventure = "4.17.0"
+adventurePlatform = "4.3.3"
+adventurePlatformFabric = "5.14.0-SNAPSHOT"
+configurate = "4.1.2"
+checkerQual = "3.43.0"
+slf4j = "1.7.32"
+gson = "2.8.0"
+bstats = "3.0.2"
+paperApi = "1.16.5-R0.1-SNAPSHOT"
+paperlib = "1.0.8"
+waterfallApi = "1.16-R0.5-SNAPSHOT"
+fabricApi = "0.100.3+1.21"
+fabricLoader = "0.15.11"
+minecraft = "1.21"
+spongeApi7 = "7.2.0"
+velocityApi = "3.3.0-SNAPSHOT"
+jupiterEngine = "5.10.2"
+
+[libraries]
+adventureBom = { group = "net.kyori", name = "adventure-bom", version.ref = "adventure" }
+adventureApi = { group = "net.kyori", name = "adventure-api" }
+adventureTextSerializerPlain = { group = "net.kyori", name = "adventure-text-serializer-plain" }
+adventureTextSerializerGson = { group = "net.kyori", name = "adventure-text-serializer-gson" }
+adventurePlatformBungeecord = { group = "net.kyori", name = "adventure-platform-bungeecord", version.ref = "adventurePlatform" }
+adventurePlatformBukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventurePlatform" }
+adventurePlatformFabric = { group = "net.kyori", name = "adventure-platform-fabric", version.ref = "adventurePlatformFabric" }
+adventurePlatformSpongeApi = { group = "net.kyori", name = "adventure-platform-spongeapi", version.ref = "adventurePlatform" }
+minimessage = { group = "net.kyori", name = "adventure-text-minimessage" }
+
+configurateHocon = { group = "org.spongepowered", name = "configurate-hocon", version.ref = "configurate" }
+
+checkerQual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerQual" }
+
+slf4jApi = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
+slf4jJdk14 = { group = "org.slf4j", name = "slf4j-jdk14", version.ref = "slf4j" }
+
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+
+bstatsBukkit = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
+bstatsBungeecord = { group = "org.bstats", name = "bstats-bungeecord", version.ref = "bstats" }
+bstatsVelocity = { group = "org.bstats", name = "bstats-velocity", version.ref = "bstats" }
+bstatsSponge = { group = "org.bstats", name = "bstats-sponge", version.ref = "bstats" }
+
+paperApi = { group = "com.destroystokyo.paper", name = "paper-api", version.ref = "paperApi" }
+paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" }
+
+waterfallApi = { group = "io.github.waterfallmc", name = "waterfall-api", version.ref = "waterfallApi" }
+
+fabricApi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabricApi" }
+fabricLoader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabricLoader" }
+minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
+
+spongeApi7 = { group = "org.spongepowered", name = "spongeapi", version.ref = "spongeApi7" }
+
+velocityApi = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocityApi" }
+
+jupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiterEngine" }
+
+# build-logic
+indraCommon = { group = "net.kyori", name = "indra-common", version.ref = "indra" }
+indraLicenser = { group = "net.kyori", name = "indra-licenser-spotless", version.ref = "indra" }
+shadow = { group = "io.github.goooler.shadow", name = "shadow-gradle-plugin", version.ref = "shadow" }
+mod-publish-plugin = { module = "me.modmuss50:mod-publish-plugin", version.ref = "mod-publish-plugin" }
+hangarPublishPlugin = { group = "io.papermc", name = "hangar-publish-plugin", version.ref = "hangarPublishPlugin" }
+
+[bundles]

gradle/libs.versions.yml

@@ -1,173 +0,0 @@
-metadata:
-  format: { version: 1.0 }
-  polyglot-extensions:
-    - plugins
-
-plugins:
-  net.kyori.blossom: 1.3.0
-  org.spongepowered.gradle.plugin: 1.1.1
-  net.minecrell.plugin-yml.bungee: &plugin-yml 0.4.0
-  net.minecrell.plugin-yml.bukkit: *plugin-yml
-  xyz.jpenilla.run-paper: 1.0.3
-
-versions:
-  indra: 2.0.5
-  shadow: 7.0.0
-  testLoggerPlugin: 3.0.0
-  adventure: 4.8.1
-  adventurePlatform: 4.0.0-SNAPSHOT
-  adventurePlatformFabric: 4.1.0-SNAPSHOT
-  minimessage: 4.2.0-SNAPSHOT
-  configurate: 4.1.1
-  checkerQual: 3.14.0
-  slf4j: 1.7.30
-  log4jSlf4jImpl: 2.8.1
-  gson: 2.8.0
-  guava: 21.0
-  bstats: 2.2.1
-  paperApi: 1.16.5-R0.1-SNAPSHOT
-  waterfallApi: 1.16-R0.4-SNAPSHOT
-  fabricApi: 0.34.9+1.17
-  fabricLoader: 0.11.3
-  fabricMinecraft: 1.17
-  spongeApi7: 7.2.0
-  velocityApi: 1.1.7
-  jupiterEngine: 5.7.0
-
-dependencies:
-  adventureBom:
-    group: net.kyori
-    name: adventure-bom
-    version: { ref: adventure }
-  adventureApi:
-    group: net.kyori
-    name: adventure-api
-  adventureTextSerializerPlain:
-    group: net.kyori
-    name: adventure-text-serializer-plain
-  adventureTextSerializerGson:
-    group: net.kyori
-    name: adventure-text-serializer-gson
-  adventurePlatformBungeecord:
-    group: net.kyori
-    name: adventure-platform-bungeecord
-    version: { ref: adventurePlatform }
-  adventurePlatformBukkit:
-    group: net.kyori
-    name: adventure-platform-bukkit
-    version: { ref: adventurePlatform }
-  adventurePlatformFabric:
-    group: net.kyori
-    name: adventure-platform-fabric
-    version: { ref: adventurePlatformFabric }
-  adventurePlatformSpongeApi:
-    group: net.kyori
-    name: adventure-platform-spongeapi
-    version: { ref: adventurePlatform }
-  minimessage:
-    group: net.kyori
-    name: adventure-text-minimessage
-    version: { ref: minimessage }
-
-  configurateHocon:
-    group: org.spongepowered
-    name: configurate-hocon
-    version: { ref: configurate }
-
-  checkerQual:
-    group: org.checkerframework
-    name: checker-qual
-    version: { ref: checkerQual }
-
-  slf4jApi:
-    group: org.slf4j
-    name: slf4j-api
-    version: { ref: slf4j }
-  slf4jJdk14:
-    group: org.slf4j
-    name: slf4j-jdk14
-    version: { ref: slf4j }
-  log4jSlf4jImpl:
-    group: org.apache.logging.log4j
-    name: log4j-slf4j-impl
-    version: { ref: log4jSlf4jImpl }
-
-  gson:
-    group: com.google.code.gson
-    name: gson
-    version: { ref: gson }
-  guava:
-    group: com.google.guava
-    name: guava
-    version: { ref: guava }
-
-  bstatsBukkit:
-    group: org.bstats
-    name: bstats-bukkit
-    version: { ref: bstats }
-  bstatsBungeecord:
-    group: org.bstats
-    name: bstats-bungeecord
-    version: { ref: bstats }
-  bstatsVelocity:
-    group: org.bstats
-    name: bstats-velocity
-    version: { ref: bstats }
-  bstatsSponge:
-    group: org.bstats
-    name: bstats-sponge
-    version: { ref: bstats }
-
-  paperApi:
-    group: com.destroystokyo.paper
-    name: paper-api
-    version: { ref: paperApi }
-
-  waterfallApi:
-    group: io.github.waterfallmc
-    name: waterfall-api
-    version: { ref: waterfallApi }
-
-  fabricApi:
-    group: net.fabricmc.fabric-api
-    name: fabric-api
-    version: { ref: fabricApi }
-  fabricLoader:
-    group: net.fabricmc
-    name: fabric-loader
-    version: { ref: fabricLoader }
-  fabricMinecraft:
-    group: com.mojang
-    name: minecraft
-    version: { ref: fabricMinecraft }
-
-  spongeApi7:
-    group: org.spongepowered
-    name: spongeapi
-    version: { ref: spongeApi7 }
-
-  velocityApi:
-    group: com.velocitypowered
-    name: velocity-api
-    version: { ref: velocityApi }
-
-  jupiterEngine:
-    group: org.junit.jupiter
-    name: junit-jupiter-engine
-    version: { ref: jupiterEngine }
-
-  # build-logic
-  indraCommon:
-    group: net.kyori
-    name: indra-common
-    version: { ref: indra }
-  shadow:
-    group: gradle.plugin.com.github.jengelman.gradle.plugins
-    name: shadow
-    version: { ref: shadow }
-  testLoggerPlugin:
-    group: com.adarshr
-    name: gradle-test-logger-plugin
-    version: { ref: testLoggerPlugin }
-
-bundles:

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+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,
+#     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.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

license.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Jason Penilla
+Copyright (c) 2020-2024 Jason Penilla
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

license_header.txt

@@ -1,6 +1,6 @@
 This file is part of MiniMOTD, licensed under the MIT License.
 
-Copyright (c) 2021 Jason Penilla
+Copyright (c) 2020-2024 Jason Penilla
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

platform/bukkit/build.gradle.kts

@@ -0,0 +1,48 @@
+plugins {
+  id("minimotd.shadow-platform")
+  alias(libs.plugins.run.paper)
+}
+
+dependencies {
+  implementation(projects.minimotdCommon)
+  implementation(libs.slf4jJdk14)
+  implementation(libs.adventurePlatformBukkit)
+  implementation(libs.bstatsBukkit)
+  implementation(libs.paperlib)
+  compileOnly(libs.paperApi)
+}
+
+tasks {
+  runServer {
+    minecraftVersion(minecraftVersion)
+  }
+  shadowJar {
+    platformRelocation("bukkit", "xyz.jpenilla.minimotd.common")
+    commonRelocation("org.slf4j")
+    commonRelocation("io.leangen.geantyref")
+    commonRelocation("net.kyori")
+    commonRelocation("org.bstats")
+    commonRelocation("io.papermc.lib")
+    manifest {
+      attributes("paperweight-mappings-namespace" to "mojang")
+    }
+  }
+  processResources {
+    val props = mapOf(
+      "version" to project.version,
+      "website" to Constants.GITHUB_URL,
+      "description" to project.description
+    )
+    inputs.properties(props)
+    filesMatching("plugin.yml") {
+      expand(props)
+    }
+  }
+}
+
+runPaper.folia.registerTask()
+
+publishMods.modrinth {
+  modLoaders.addAll("paper", "folia")
+  minecraftVersions.addAll(bukkitVersions)
+}

platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/BukkitCommand.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,8 +23,10 @@
  */
 package xyz.jpenilla.minimotd.bukkit;
 
+import io.papermc.lib.PaperLib;
 import java.awt.image.BufferedImage;
 import java.nio.file.Path;
+import java.util.concurrent.CompletableFuture;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.command.PluginCommand;
@@ -44,24 +46,18 @@ public final class MiniMOTDPlugin extends JavaPlugin implements MiniMOTDPlatform
   private Logger logger;
   private MiniMOTD<CachedServerIcon> miniMOTD;
   private BukkitAudiences audiences;
-  private String serverPackageName;
-  private String serverApiVersion;
-  private int majorMinecraftVersion;
 
   @Override
   public void onEnable() {
     this.logger = LoggerFactory.getLogger(this.getName());
     this.miniMOTD = new MiniMOTD<>(this);
     this.audiences = BukkitAudiences.create(this);
-    this.serverPackageName = this.getServer().getClass().getPackage().getName();
-    this.serverApiVersion = this.serverPackageName.substring(this.serverPackageName.lastIndexOf('.') + 1);
-    this.majorMinecraftVersion = Integer.parseInt(this.serverApiVersion.split("_")[1]);
 
     if (PAPER_PING_EVENT_EXISTS) {
-      this.getServer().getPluginManager().registerEvents(new PaperPingListener(this, this.miniMOTD), this);
+      this.getServer().getPluginManager().registerEvents(new PaperPingListener(this.miniMOTD), this);
     } else {
-      this.getServer().getPluginManager().registerEvents(new PingListener(this, this.miniMOTD), this);
-      if (this.majorMinecraftVersion >= 12) { // PaperServerListPingEvent was added in 1.12
+      this.getServer().getPluginManager().registerEvents(new PingListener(this.miniMOTD), this);
+      if (PaperLib.getMinecraftVersion() >= 12) { // PaperServerListPingEvent was added in 1.12
         this.suggestPaper();
       }
     }
@@ -76,8 +72,17 @@ public final class MiniMOTDPlugin extends JavaPlugin implements MiniMOTDPlatform
     final Metrics metrics = new Metrics(this, 8132);
 
     if (this.miniMOTD.configManager().pluginSettings().updateChecker()) {
-      this.getServer().getScheduler().runTaskAsynchronously(this, () ->
-        new UpdateChecker().checkVersion().forEach(this.logger::info));
+      try {
+        Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
+        CompletableFuture.runAsync(() -> new UpdateChecker().checkVersion().forEach(this.logger::info)).whenComplete(($, thr) -> {
+          if (thr != null) {
+            this.logger.warn("Exception checking for updates", thr);
+          }
+        });
+      } catch (final ReflectiveOperationException ex) {
+        this.getServer().getScheduler().runTaskAsynchronously(this, () ->
+          new UpdateChecker().checkVersion().forEach(this.logger::info));
+      }
     }
   }
 
@@ -100,10 +105,6 @@ public final class MiniMOTDPlugin extends JavaPlugin implements MiniMOTDPlatform
     return this.getServer().loadServerIcon(image);
   }
 
-  public int majorMinecraftVersion() {
-    return this.majorMinecraftVersion;
-  }
-
   public @NonNull BukkitAudiences audiences() {
     return this.audiences;
   }

platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/PaperPingListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,7 @@
 package xyz.jpenilla.minimotd.bukkit;
 
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
+import io.papermc.lib.PaperLib;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -32,27 +33,25 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import xyz.jpenilla.minimotd.common.Constants;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.PingResponse;
-import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;
 
-final class PaperPingListener implements Listener {
-  private final MiniMOTDPlugin plugin;
+public final class PaperPingListener implements Listener {
   private final LegacyComponentSerializer unusualHexSerializer = LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build();
   private final MiniMOTD<CachedServerIcon> miniMOTD;
 
-  PaperPingListener(final @NonNull MiniMOTDPlugin plugin, final @NonNull MiniMOTD<CachedServerIcon> miniMOTD) {
+  PaperPingListener(final @NonNull MiniMOTD<CachedServerIcon> miniMOTD) {
     this.miniMOTD = miniMOTD;
-    this.plugin = plugin;
   }
 
   @EventHandler
   public void handlePing(final @NonNull PaperServerListPingEvent event) {
-    final MiniMOTDConfig cfg = this.miniMOTD.configManager().mainConfig();
+    final MOTDConfig cfg = this.miniMOTD.configManager().mainConfig();
 
     final PingResponse<CachedServerIcon> response = this.miniMOTD.createMOTD(cfg, event.getNumPlayers(), event.getMaxPlayers());
 
     response.playerCount().applyCount(event::setNumPlayers, event::setMaxPlayers);
     response.motd(motd -> {
-      if (event.getClient().getProtocolVersion() < Constants.MINECRAFT_1_16_PROTOCOL_VERSION || this.plugin.majorMinecraftVersion() < 16) {
+      if (event.getClient().getProtocolVersion() < Constants.MINECRAFT_1_16_PROTOCOL_VERSION || PaperLib.getMinecraftVersion() < 16) {
         event.setMotd(LegacyComponentSerializer.legacySection().serialize(motd));
       } else {
         event.setMotd(this.unusualHexSerializer.serialize(motd));

platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/PingListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,7 @@
  */
 package xyz.jpenilla.minimotd.bukkit;
 
+import io.papermc.lib.PaperLib;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -31,32 +32,35 @@ import org.bukkit.util.CachedServerIcon;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.PingResponse;
-import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;
 
-final class PingListener implements Listener {
+public final class PingListener implements Listener {
   private final MiniMOTD<CachedServerIcon> miniMOTD;
   private final LegacyComponentSerializer unusualHexSerializer = LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build();
-  private final MiniMOTDPlugin plugin;
 
-  PingListener(final @NonNull MiniMOTDPlugin plugin, final @NonNull MiniMOTD<CachedServerIcon> miniMOTD) {
-    this.plugin = plugin;
+  PingListener(final @NonNull MiniMOTD<CachedServerIcon> miniMOTD) {
     this.miniMOTD = miniMOTD;
   }
 
   @EventHandler
   public void handlePing(final @NonNull ServerListPingEvent event) {
-    final MiniMOTDConfig cfg = this.miniMOTD.configManager().mainConfig();
+    final MOTDConfig cfg = this.miniMOTD.configManager().mainConfig();
 
     final PingResponse<CachedServerIcon> response = this.miniMOTD.createMOTD(cfg, event.getNumPlayers(), event.getMaxPlayers());
 
     event.setMaxPlayers(response.playerCount().maxPlayers());
     response.motd(motd -> {
-      if (this.plugin.majorMinecraftVersion() > 15) {
+      if (PaperLib.getMinecraftVersion() > 15) {
         event.setMotd(this.unusualHexSerializer.serialize(motd));
       } else {
         event.setMotd(LegacyComponentSerializer.legacySection().serialize(motd));
       }
     });
-    response.icon(event::setServerIcon);
+    response.icon(icon -> {
+      try {
+        event.setServerIcon(icon);
+      } catch (final UnsupportedOperationException ignore) {
+      }
+    });
   }
 }

platform/bukkit/src/main/resources/plugin.yml

@@ -0,0 +1,16 @@
+name: MiniMOTD
+version: $version
+main: xyz.jpenilla.minimotd.bukkit.MiniMOTDPlugin
+folia-supported: true
+description: $description
+authors:
+  - jmp
+website: $website
+commands:
+  minimotd:
+    description: MiniMOTD Command
+    permission: minimotd.admin
+    usage: /minimotd help
+api-version: 1.13
+softdepend:
+  - ViaVersion

platform/bungeecord/build.gradle.kts

@@ -0,0 +1,38 @@
+plugins {
+  id("minimotd.shadow-platform")
+  alias(libs.plugins.run.waterfall)
+}
+
+dependencies {
+  implementation(projects.minimotdCommon)
+  implementation(libs.adventurePlatformBungeecord)
+  implementation(libs.bstatsBungeecord)
+  compileOnly(libs.waterfallApi)
+}
+
+tasks {
+  shadowJar {
+    platformRelocation("bungee", "xyz.jpenilla.minimotd.common")
+    commonRelocation("io.leangen.geantyref")
+    commonRelocation("net.kyori")
+    commonRelocation("org.bstats")
+  }
+  runWaterfall {
+    waterfallVersion("1.20")
+  }
+  processResources {
+    val props = mapOf(
+      "version" to project.version,
+      "description" to project.description
+    )
+    inputs.properties(props)
+    filesMatching("bungee.yml") {
+      expand(props)
+    }
+  }
+}
+
+publishMods.modrinth {
+  modLoaders.add("waterfall")
+  minecraftVersions.addAll(minecraftVersion)
+}

platform/bungeecord/src/main/java/xyz/jpenilla/minimotd/bungee/BungeeCommand.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

platform/bungeecord/src/main/java/xyz/jpenilla/minimotd/bungee/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -39,6 +39,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.MiniMOTDPlatform;
+import xyz.jpenilla.minimotd.common.PingResponse;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;
 import xyz.jpenilla.minimotd.common.util.UpdateChecker;
 
 public final class MiniMOTDPlugin extends Plugin implements MiniMOTDPlatform<Favicon> {
@@ -65,6 +67,9 @@ public final class MiniMOTDPlugin extends Plugin implements MiniMOTDPlatform<Fav
       this.getProxy().getScheduler().runAsync(this, () ->
         new UpdateChecker().checkVersion().forEach(this.logger::info));
     }
+
+    // preload some stuff, so the first ping is as fast as the rest
+    this.preload();
   }
 
   @Override
@@ -109,4 +114,10 @@ public final class MiniMOTDPlugin extends Plugin implements MiniMOTDPlatform<Fav
       return null;
     }
   }
+
+  private void preload() {
+    final MOTDConfig cfg = this.miniMOTD.configManager().mainConfig();
+    final PingResponse<Favicon> mini = this.miniMOTD.createMOTD(cfg, 0, 0);
+    mini.motd(motd -> BungeeComponentSerializer.get().serialize(motd));
+  }
 }

platform/bungeecord/src/main/java/xyz/jpenilla/minimotd/bungee/PingListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import xyz.jpenilla.minimotd.common.Constants;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.PingResponse;
-import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;
 
 public final class PingListener implements Listener {
   private final MiniMOTD<Favicon> miniMOTD;
@@ -52,7 +52,7 @@ public final class PingListener implements Listener {
     }
 
     final ServerPing.Players players = response.getPlayers();
-    final MiniMOTDConfig cfg = this.miniMOTD.configManager().resolveConfig(e.getConnection().getVirtualHost());
+    final MOTDConfig cfg = this.miniMOTD.configManager().resolveConfig(e.getConnection().getVirtualHost());
     final PingResponse<Favicon> mini = this.miniMOTD.createMOTD(cfg, players.getOnline(), players.getMax());
 
     if (mini.hidePlayerCount()) {

platform/bungeecord/src/main/resources/bungee.yml

@@ -0,0 +1,5 @@
+name: MiniMOTD
+main: xyz.jpenilla.minimotd.bungee.MiniMOTDPlugin
+version: $version
+author: jmp
+description: $description

platform/fabric/build.gradle.kts

@@ -1,28 +1,23 @@
 plugins {
+  id("quiet-fabric-loom")
   id("minimotd.platform-conventions")
-  id("com.github.johnrengelman.shadow")
-  id("fabric-loom")
+  id("io.github.goooler.shadow")
 }
 
 val shade: Configuration by configurations.creating
 
-val minecraftVersion = libs.versions.fabricMinecraft.get()
-
 dependencies {
-  minecraft(libs.fabricMinecraft)
-  mappings(minecraft.officialMojangMappings())
+  minecraft(libs.minecraft)
+  mappings(loom.officialMojangMappings())
   modImplementation(libs.fabricLoader)
   modImplementation(libs.fabricApi)
 
   shade(implementation(projects.minimotdCommon) {
     exclude("net.kyori")
-    exclude("org.slf4j")
   })
 
   modImplementation(libs.adventurePlatformFabric)
   include(libs.adventurePlatformFabric)
-  implementation(libs.minimessage)
-  include(libs.minimessage)
 }
 
 miniMOTDPlatform {
@@ -31,22 +26,17 @@ miniMOTDPlatform {
 
 indra {
   javaVersions {
-    target(16)
+    target(21)
   }
 }
 
 tasks {
-  runServer {
-    standardInput = System.`in`
-  }
   shadowJar {
     configurations = listOf(shade)
     commonConfiguration()
     commonRelocation("io.leangen.geantyref")
-    platformRelocation("fabric", "xyz.jpenilla.minimotd.common")
   }
   remapJar {
-    input.set(shadowJar.flatMap { it.archiveFile })
     archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")
   }
   processResources {
@@ -63,3 +53,8 @@ tasks {
     }
   }
 }
+
+publishMods.modrinth {
+  modLoaders.add("fabric")
+  minecraftVersions.addAll(minecraftVersion)
+}

platform/fabric/src/main/java/xyz/jpenilla/minimotd/fabric/MiniMOTDFabric.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,22 +25,19 @@ package xyz.jpenilla.minimotd.fabric;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufOutputStream;
-import io.netty.buffer.Unpooled;
 import java.awt.image.BufferedImage;
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
+import java.io.ByteArrayOutputStream;
 import java.nio.file.Path;
-import java.util.Base64;
 import java.util.concurrent.CompletableFuture;
 import javax.imageio.ImageIO;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.kyori.adventure.platform.fabric.FabricServerAudiences;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.protocol.status.ServerStatus;
+import net.minecraft.server.MinecraftServer;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,16 +45,18 @@ import xyz.jpenilla.minimotd.common.CommandHandler;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.MiniMOTDPlatform;
 import xyz.jpenilla.minimotd.common.util.UpdateChecker;
+import xyz.jpenilla.minimotd.fabric.access.ServerStatusFaviconAccess;
 
 import static net.minecraft.commands.Commands.literal;
 
-public final class MiniMOTDFabric implements ModInitializer, MiniMOTDPlatform<String> {
+public final class MiniMOTDFabric implements ModInitializer, MiniMOTDPlatform<ServerStatus.Favicon> {
   private static MiniMOTDFabric instance = null;
 
   private final Logger logger = LoggerFactory.getLogger(MiniMOTD.class);
   private final Path dataDirectory = FabricLoader.getInstance().getConfigDir().resolve("MiniMOTD");
-  private final MiniMOTD<String> miniMOTD = new MiniMOTD<>(this);
+  private final MiniMOTD<ServerStatus.Favicon> miniMOTD = new MiniMOTD<>(this);
 
+  private MinecraftServer server;
   private FabricServerAudiences audiences;
 
   public MiniMOTDFabric() {
@@ -67,19 +66,26 @@ public final class MiniMOTDFabric implements ModInitializer, MiniMOTDPlatform<St
     instance = this;
   }
 
-  public @NonNull MiniMOTD<String> miniMOTD() {
+  public @NonNull MiniMOTD<ServerStatus.Favicon> miniMOTD() {
     return this.miniMOTD;
   }
 
   @Override
   public void onInitialize() {
     this.registerCommand();
-    ServerLifecycleEvents.SERVER_STARTED.register(minecraftServer -> {
+    ServerLifecycleEvents.SERVER_STARTING.register(minecraftServer -> {
+      this.server = minecraftServer;
       this.audiences = FabricServerAudiences.of(minecraftServer);
+    });
+    ServerLifecycleEvents.SERVER_STARTED.register(minecraftServer -> {
       if (this.miniMOTD.configManager().pluginSettings().updateChecker()) {
         CompletableFuture.runAsync(() -> new UpdateChecker().checkVersion().forEach(this.logger()::info));
       }
     });
+    ServerLifecycleEvents.SERVER_STOPPED.register($ -> {
+      this.server = null;
+      this.audiences = null;
+    });
     this.miniMOTD.logger().info("Done initializing MiniMOTD");
   }
 
@@ -93,13 +99,13 @@ public final class MiniMOTDFabric implements ModInitializer, MiniMOTDPlatform<St
 
       @Override
       public int run(final @NonNull CommandContext<CommandSourceStack> context) {
-        this.handler.execute(MiniMOTDFabric.this.audiences.audience(context.getSource()));
+        this.handler.execute(context.getSource());
         return Command.SINGLE_SUCCESS;
       }
     }
 
     final CommandHandler handler = new CommandHandler(this.miniMOTD);
-    CommandRegistrationCallback.EVENT.register((dispatcher, $) -> dispatcher.register(
+    CommandRegistrationCallback.EVENT.register((dispatcher, commandBuildContext, commandSelection) -> dispatcher.register(
       literal("minimotd")
         .requires(source -> source.hasPermission(4))
         .then(literal("reload").executes(new WrappingExecutor(handler::reload)))
@@ -116,6 +122,13 @@ public final class MiniMOTDFabric implements ModInitializer, MiniMOTDPlatform<St
     return instance;
   }
 
+  public @NonNull MinecraftServer requireServer() {
+    if (this.server == null) {
+      throw new IllegalStateException("Server requested before started");
+    }
+    return this.server;
+  }
+
   @Override
   public @NonNull Path dataDirectory() {
     return this.dataDirectory;
@@ -127,16 +140,11 @@ public final class MiniMOTDFabric implements ModInitializer, MiniMOTDPlatform<St
   }
 
   @Override
-  public @NonNull String loadIcon(final @NonNull BufferedImage bufferedImage) throws Exception {
-    final ByteBuf byteBuf = Unpooled.buffer();
-    final String icon;
-    try {
-      ImageIO.write(bufferedImage, "PNG", new ByteBufOutputStream(byteBuf));
-      final ByteBuffer base64 = Base64.getEncoder().encode(byteBuf.nioBuffer());
-      icon = "data:image/png;base64," + StandardCharsets.UTF_8.decode(base64);
-    } finally {
-      byteBuf.release();
-    }
-    return icon;
+  public ServerStatus.@NonNull Favicon loadIcon(final @NonNull BufferedImage bufferedImage) throws Exception {
+    final ByteArrayOutputStream out = new ByteArrayOutputStream();
+    ImageIO.write(bufferedImage, "PNG", out);
+    final ServerStatus.Favicon favicon = new ServerStatus.Favicon(out.toByteArray());
+    ((ServerStatusFaviconAccess) (Object) favicon).cacheEncodedIcon();
+    return favicon;
   }
 }

platform/fabric/src/main/java/xyz/jpenilla/minimotd/fabric/access/ConnectionAccess.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

platform/fabric/src/main/java/xyz/jpenilla/minimotd/fabric/access/ServerStatusFaviconAccess.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of MiniMOTD, licensed under the MIT License.
+ *
+ * Copyright (c) 2020-2024 Jason Penilla
+ *
+ * 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 xyz.jpenilla.minimotd.fabric.access;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public interface ServerStatusFaviconAccess {
+  @Nullable String cachedEncodedIcon();
+
+  void cacheEncodedIcon();
+}

platform/fabric/src/main/java/xyz/jpenilla/minimotd/fabric/mixin/ConnectionMixin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

platform/fabric/src/main/java/xyz/jpenilla/minimotd/fabric/mixin/ServerHandshakePacketListenerImplMixin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -40,6 +40,6 @@ abstract class ServerHandshakePacketListenerImplMixin {
 
   @Inject(method = "handleIntention", at = @At("HEAD"))
   public void injectHandleIntention(final ClientIntentionPacket packet, final CallbackInfo ci) {
-    ((ConnectionAccess) this.connection).protocolVersion(packet.getProtocolVersion());
+    ((ConnectionAccess) this.connection).protocolVersion(packet.protocolVersion());
   }
 }

platform/fabric/src/main/java/xyz/jpenilla/minimotd/fabric/mixin/ServerStatusFaviconMixin.java

@@ -0,0 +1,78 @@
+/*
+ * This file is part of MiniMOTD, licensed under the MIT License.
+ *
+ * Copyright (c) 2020-2024 Jason Penilla
+ *
+ * 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 xyz.jpenilla.minimotd.fabric.mixin;
+
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.DataResult;
+import com.mojang.serialization.codecs.PrimitiveCodec;
+import java.util.function.Function;
+import net.minecraft.network.protocol.status.ServerStatus;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import xyz.jpenilla.minimotd.fabric.access.ServerStatusFaviconAccess;
+
+@Mixin(ServerStatus.Favicon.class)
+abstract class ServerStatusFaviconMixin implements ServerStatusFaviconAccess {
+  @Unique
+  private static Function<ServerStatus.Favicon, String> VANILLA_ENCODE_TO_STRING;
+
+  @Redirect(
+    method = "<clinit>",
+    at = @At(
+      target = "Lcom/mojang/serialization/codecs/PrimitiveCodec;comapFlatMap(Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;",
+      value = "INVOKE"
+    ),
+    remap = false
+  )
+  private static Codec<ServerStatus.Favicon> makeCodec(
+    final PrimitiveCodec<String> stringCodec,
+    final Function<String, DataResult<ServerStatus.Favicon>> decode,
+    final Function<ServerStatus.Favicon, String> encode
+  ) {
+    VANILLA_ENCODE_TO_STRING = encode;
+    return stringCodec.comapFlatMap(decode, favicon -> {
+      final @Nullable String encodedIcon = ((ServerStatusFaviconAccess) (Object) favicon).cachedEncodedIcon();
+      if (encodedIcon != null) {
+        return encodedIcon;
+      }
+      return encode.apply(favicon);
+    });
+  }
+
+  @Unique
+  private String encodedIcon;
+
+  @Override
+  public @Nullable String cachedEncodedIcon() {
+    return this.encodedIcon;
+  }
+
+  @Override
+  public void cacheEncodedIcon() {
+    this.encodedIcon = VANILLA_ENCODE_TO_STRING.apply((ServerStatus.Favicon) (Object) this);
+  }
+}

platform/fabric/src/main/java/xyz/jpenilla/minimotd/fabric/mixin/ServerStatusPacketListenerImplMixin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,9 @@
  */
 package xyz.jpenilla.minimotd.fabric.mixin;
 
-import com.mojang.authlib.GameProfile;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Optional;
 import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.status.ServerStatus;
 import net.minecraft.server.MinecraftServer;
@@ -36,50 +38,57 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 import xyz.jpenilla.minimotd.common.Constants;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.PingResponse;
-import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;
 import xyz.jpenilla.minimotd.common.util.ComponentColorDownsampler;
 import xyz.jpenilla.minimotd.fabric.MiniMOTDFabric;
 import xyz.jpenilla.minimotd.fabric.access.ConnectionAccess;
+import xyz.jpenilla.minimotd.fabric.util.MutableServerStatus;
 
 @Mixin(ServerStatusPacketListenerImpl.class)
 abstract class ServerStatusPacketListenerImplMixin {
   @Shadow @Final private Connection connection;
 
-  @Redirect(method = "handleStatusRequest", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;getStatus()Lnet/minecraft/network/protocol/status/ServerStatus;"))
-  public ServerStatus injectHandleStatusRequest(final MinecraftServer minecraftServer) {
-    final ServerStatus vanillaStatus = minecraftServer.getStatus();
-
-    final ServerStatus modifiedStatus = new ServerStatus();
-    modifiedStatus.setDescription(vanillaStatus.getDescription());
-    modifiedStatus.setFavicon(vanillaStatus.getFavicon());
-    modifiedStatus.setVersion(vanillaStatus.getVersion());
-
+  @Redirect(
+    method = "handleStatusRequest",
+    at = @At(value = "FIELD", target = "Lnet/minecraft/server/network/ServerStatusPacketListenerImpl;status:Lnet/minecraft/network/protocol/status/ServerStatus;")
+  )
+  public ServerStatus injectHandleStatusRequest(final ServerStatusPacketListenerImpl instance) {
     final MiniMOTDFabric miniMOTDFabric = MiniMOTDFabric.get();
-    final MiniMOTD<String> miniMOTD = miniMOTDFabric.miniMOTD();
-    final MiniMOTDConfig config = miniMOTD.configManager().mainConfig();
+    final MinecraftServer minecraftServer = miniMOTDFabric.requireServer();
+    final ServerStatus vanillaStatus = Objects.requireNonNull(minecraftServer.getStatus(), "vanillaStatus");
 
-    final PingResponse<String> response = miniMOTD.createMOTD(config, minecraftServer.getPlayerCount(), vanillaStatus.getPlayers().getMaxPlayers());
+    final MiniMOTD<ServerStatus.Favicon> miniMOTD = miniMOTDFabric.miniMOTD();
+    final MOTDConfig config = miniMOTD.configManager().mainConfig();
 
+    final PingResponse<ServerStatus.Favicon> response = miniMOTD.createMOTD(
+      config,
+      minecraftServer.getPlayerCount(),
+      vanillaStatus.players().map(ServerStatus.Players::max).orElseGet(minecraftServer::getMaxPlayers)
+    );
+
+    final MutableServerStatus modifiedStatus = new MutableServerStatus(vanillaStatus);
     response.motd(motd -> {
       if (((ConnectionAccess) this.connection).protocolVersion() >= Constants.MINECRAFT_1_16_PROTOCOL_VERSION) {
-        modifiedStatus.setDescription(miniMOTDFabric.audiences().toNative(motd));
+        modifiedStatus.description(miniMOTDFabric.audiences().toNative(motd));
       } else {
-        modifiedStatus.setDescription(miniMOTDFabric.audiences().toNative(ComponentColorDownsampler.downsampler().downsample(motd)));
+        modifiedStatus.description(miniMOTDFabric.audiences().toNative(ComponentColorDownsampler.downsampler().downsample(motd)));
       }
     });
-    response.icon(modifiedStatus::setFavicon);
+    response.icon(favicon -> modifiedStatus.favicon(Optional.of(favicon)));
 
-    if (!response.hidePlayerCount()) {
-      final GameProfile[] oldSample = vanillaStatus.getPlayers().getSample();
-      final ServerStatus.Players newPlayers = new ServerStatus.Players(response.playerCount().maxPlayers(), response.playerCount().onlinePlayers());
-      if (response.disablePlayerListHover()) {
-        newPlayers.setSample(new GameProfile[]{});
-      } else {
-        newPlayers.setSample(oldSample);
-      }
-      modifiedStatus.setPlayers(newPlayers);
+    if (response.hidePlayerCount()) {
+      modifiedStatus.players(Optional.empty());
+    } else {
+      final ServerStatus.Players newPlayers = new ServerStatus.Players(
+        response.playerCount().maxPlayers(),
+        response.playerCount().onlinePlayers(),
+        response.disablePlayerListHover()
+          ? Collections.emptyList()
+          : vanillaStatus.players().map(ServerStatus.Players::sample).orElse(Collections.emptyList())
+      );
+      modifiedStatus.players(Optional.of(newPlayers));
     }
 
-    return modifiedStatus;
+    return modifiedStatus.toServerStatus();
   }
 }

platform/fabric/src/main/java/xyz/jpenilla/minimotd/fabric/util/MutableServerStatus.java

@@ -0,0 +1,97 @@
+/*
+ * This file is part of MiniMOTD, licensed under the MIT License.
+ *
+ * Copyright (c) 2020-2024 Jason Penilla
+ *
+ * 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 xyz.jpenilla.minimotd.fabric.util;
+
+import java.util.Objects;
+import java.util.Optional;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.status.ServerStatus;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
+
+@SuppressWarnings({"OptionalUsedAsFieldOrParameterType", "unused"})
+@DefaultQualifier(NonNull.class)
+public final class MutableServerStatus {
+  private Component description;
+  private Optional<ServerStatus.Players> players;
+  private Optional<ServerStatus.Version> version;
+  private Optional<ServerStatus.Favicon> favicon;
+  private boolean enforcesSecureChat;
+
+  public MutableServerStatus(final ServerStatus status) {
+    this.description = status.description();
+    this.players = status.players();
+    this.version = status.version();
+    this.favicon = status.favicon();
+    this.enforcesSecureChat = status.enforcesSecureChat();
+  }
+
+  public ServerStatus toServerStatus() {
+    return new ServerStatus(this.description, this.players, this.version, this.favicon, this.enforcesSecureChat);
+  }
+
+  public Component description() {
+    return this.description;
+  }
+
+  public void description(final Component description) {
+    Objects.requireNonNull(description, "description");
+    this.description = description;
+  }
+
+  public Optional<ServerStatus.Players> players() {
+    return this.players;
+  }
+
+  public void players(final Optional<ServerStatus.Players> players) {
+    Objects.requireNonNull(players, "players");
+    this.players = players;
+  }
+
+  public Optional<ServerStatus.Version> version() {
+    return this.version;
+  }
+
+  public void version(final Optional<ServerStatus.Version> version) {
+    Objects.requireNonNull(version, "version");
+    this.version = version;
+  }
+
+  public Optional<ServerStatus.Favicon> favicon() {
+    return this.favicon;
+  }
+
+  public void favicon(final Optional<ServerStatus.Favicon> favicon) {
+    Objects.requireNonNull(favicon, "favicon");
+    this.favicon = favicon;
+  }
+
+  public boolean enforcesSecureChat() {
+    return this.enforcesSecureChat;
+  }
+
+  public void enforcesSecureChat(final boolean enforcesSecureChat) {
+    this.enforcesSecureChat = enforcesSecureChat;
+  }
+}

platform/fabric/src/main/resources/fabric.mod.json

@@ -23,8 +23,8 @@
     "minimotd-fabric.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.11.1",
-    "fabric": ">=0.31.0",
-    "minecraft": "1.17.x"
+    "fabricloader": ">=0.15.11",
+    "fabric": "*",
+    "minecraft": "~1.21"
   }
 }

platform/fabric/src/main/resources/minimotd-fabric.mixins.json

@@ -1,11 +1,12 @@
 {
   "required": true,
-  "minVersion": "0.8",
+  "minVersion": "0.8.4",
   "package": "xyz.jpenilla.minimotd.fabric.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
     "ConnectionMixin",
     "ServerHandshakePacketListenerImplMixin",
+    "ServerStatusFaviconMixin",
     "ServerStatusPacketListenerImplMixin"
   ],
   "client": [

platform/sponge7/build.gradle.kts

@@ -3,9 +3,7 @@ plugins {
 }
 
 dependencies {
-  implementation(projects.minimotdCommon) {
-    exclude("org.slf4j", "slf4j-api")
-  }
+  implementation(projects.minimotdCommon)
   implementation(libs.adventurePlatformSpongeApi)
   compileOnly(libs.spongeApi7)
   implementation(libs.bstatsSponge)
@@ -14,7 +12,7 @@ dependencies {
 tasks {
   processResources {
     val replacements = mapOf(
-      "modid" to project.name,
+      "modid" to rootProject.name.lowercase(),
       "name" to rootProject.name,
       "version" to project.version.toString(),
       "description" to project.description.toString(),
@@ -31,3 +29,8 @@ tasks {
     commonRelocation("org.bstats")
   }
 }
+
+publishMods.modrinth {
+  modLoaders.add("sponge")
+  minecraftVersions.add("1.12.2")
+}

platform/sponge7/src/main/java/xyz/jpenilla/minimotd/sponge7/ClientPingServerEventListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,7 +31,7 @@ import org.spongepowered.api.event.server.ClientPingServerEvent;
 import org.spongepowered.api.network.status.Favicon;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.PingResponse;
-import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;
 
 final class ClientPingServerEventListener implements EventListener<ClientPingServerEvent> {
   private final MiniMOTD<Favicon> miniMOTD;
@@ -58,7 +58,7 @@ final class ClientPingServerEventListener implements EventListener<ClientPingSer
       }
     }
 
-    final MiniMOTDConfig config = this.miniMOTD.configManager().mainConfig();
+    final MOTDConfig config = this.miniMOTD.configManager().mainConfig();
 
     final PingResponse<Favicon> mini = this.miniMOTD.createMOTD(config, players.getOnline(), players.getMax());
     mini.playerCount().applyCount(players::setOnline, players::setMax);

platform/sponge7/src/main/java/xyz/jpenilla/minimotd/sponge7/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -101,7 +101,11 @@ public final class MiniMOTDPlugin implements MiniMOTDPlatform<Favicon> {
 
   @Listener
   public void reloaded(final @NonNull GameReloadEvent event) {
-    this.miniMOTD.reload();
+    try {
+      this.miniMOTD.reload();
+    } catch (final Exception ex) {
+      this.miniMOTD.logger().warn("Failed to reload MiniMOTD.", ex);
+    }
   }
 
   private void registerCommands() {

platform/sponge8/build.gradle.kts

@@ -1,25 +1,26 @@
 import org.spongepowered.gradle.plugin.config.PluginLoaders
-import org.spongepowered.plugin.metadata.PluginDependency
+import org.spongepowered.plugin.metadata.model.PluginDependency
 
 plugins {
   id("minimotd.shadow-platform")
-  id("org.spongepowered.gradle.plugin")
+  alias(libs.plugins.sponge.gradle.plugin)
 }
 
 dependencies {
   implementation(projects.minimotdCommon)
-  implementation(libs.log4jSlf4jImpl) {
-    isTransitive = false
-  }
 }
 
 sponge {
   injectRepositories(false)
-  apiVersion("8.0.0")
-  plugin(project.name) {
-    loader(PluginLoaders.JAVA_PLAIN)
+  apiVersion("8.1.0-SNAPSHOT")
+  plugin(rootProject.name.lowercase()) {
+    loader {
+      name(PluginLoaders.JAVA_PLAIN)
+      version("1.0")
+    }
+    license("MIT")
     displayName(rootProject.name)
-    mainClass("xyz.jpenilla.minimotd.sponge8.MiniMOTDPlugin")
+    entrypoint("xyz.jpenilla.minimotd.sponge8.MiniMOTDPlugin")
     description(project.description)
     links {
       homepage(Constants.GITHUB_URL)
@@ -39,11 +40,20 @@ sponge {
 tasks {
   shadowJar {
     configureForNativeAdventurePlatform()
-    commonRelocation("org.apache.logging.slf4j")
-    platformRelocation("log4j", "org.slf4j")
-    platformRelocation("sponge8", "xyz.jpenilla.minimotd.common")
     dependencies {
       exclude(dependency("io.leangen.geantyref:geantyref"))
     }
   }
 }
+
+publishMods.modrinth {
+  modLoaders.add("sponge")
+  minecraftVersions.addAll(
+    "1.16.5",
+    "1.17.1",
+    "1.18.2",
+    "1.19.4",
+    "1.20.6",
+    "1.21",
+  )
+}

platform/sponge8/src/main/java/xyz/jpenilla/minimotd/sponge8/ClientPingServerEventListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,6 @@ package xyz.jpenilla.minimotd.sponge8;
 
 import com.google.inject.Inject;
 import java.lang.reflect.Method;
-import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.spongepowered.api.MinecraftVersion;
 import org.spongepowered.api.event.EventListener;
@@ -34,12 +33,22 @@ import org.spongepowered.api.network.status.Favicon;
 import xyz.jpenilla.minimotd.common.Constants;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.PingResponse;
-import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;
 import xyz.jpenilla.minimotd.common.util.ComponentColorDownsampler;
 
 final class ClientPingServerEventListener implements EventListener<ClientPingServerEvent> {
+  private static final Method GET_PROTOCOL;
+
+  static {
+    try {
+      final Class<?> protocolMinecraftVersion = Class.forName("org.spongepowered.common.ProtocolMinecraftVersion");
+      GET_PROTOCOL = protocolMinecraftVersion.getMethod("getProtocol");
+    } catch (final ReflectiveOperationException ex) {
+      throw new RuntimeException(ex);
+    }
+  }
+
   private final MiniMOTD<Favicon> miniMOTD;
-  private @MonotonicNonNull Method SpongeMinecraftVersion_getProtocol;
 
   @Inject
   private ClientPingServerEventListener(final @NonNull MiniMOTD<Favicon> miniMOTD) {
@@ -63,7 +72,7 @@ final class ClientPingServerEventListener implements EventListener<ClientPingSer
       }
     }
 
-    final MiniMOTDConfig config = this.miniMOTD.configManager().mainConfig();
+    final MOTDConfig config = this.miniMOTD.configManager().mainConfig();
 
     final PingResponse<Favicon> mini = this.miniMOTD.createMOTD(config, players.online(), players.max());
     mini.playerCount().applyCount(players::setOnline, players::setMax);
@@ -86,11 +95,8 @@ final class ClientPingServerEventListener implements EventListener<ClientPingSer
 
   private boolean legacy(final @NonNull MinecraftVersion version) {
     try {
-      if (!version.isLegacy() && this.SpongeMinecraftVersion_getProtocol == null) {
-        this.SpongeMinecraftVersion_getProtocol = version.getClass().getMethod("getProtocol");
-      }
       return version.isLegacy()
-        || (int) this.SpongeMinecraftVersion_getProtocol.invoke(version) < Constants.MINECRAFT_1_16_PROTOCOL_VERSION;
+        || (int) GET_PROTOCOL.invoke(version) < Constants.MINECRAFT_1_16_PROTOCOL_VERSION;
     } catch (final ReflectiveOperationException e) {
       throw new IllegalStateException("Failed to get protocol version", e);
     }

platform/sponge8/src/main/java/xyz/jpenilla/minimotd/sponge8/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,9 @@ import org.spongepowered.api.command.CommandExecutor;
 import org.spongepowered.api.command.CommandResult;
 import org.spongepowered.api.command.parameter.CommandContext;
 import org.spongepowered.api.config.ConfigDir;
+import org.spongepowered.api.event.EventListenerRegistration;
 import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.Order;
 import org.spongepowered.api.event.lifecycle.LoadedGameEvent;
 import org.spongepowered.api.event.lifecycle.RefreshGameEvent;
 import org.spongepowered.api.event.lifecycle.RegisterCommandEvent;
@@ -46,7 +48,7 @@ import org.spongepowered.api.event.server.ClientPingServerEvent;
 import org.spongepowered.api.network.status.Favicon;
 import org.spongepowered.api.scheduler.Task;
 import org.spongepowered.plugin.PluginContainer;
-import org.spongepowered.plugin.jvm.Plugin;
+import org.spongepowered.plugin.builtin.jvm.Plugin;
 import org.spongepowered.plugin.metadata.PluginMetadata;
 import xyz.jpenilla.minimotd.common.CommandHandler;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
@@ -81,9 +83,11 @@ public final class MiniMOTDPlugin implements MiniMOTDPlatform<Favicon> {
       }
     });
     Sponge.eventManager().registerListener(
-      pluginContainer,
-      ClientPingServerEvent.class,
-      this.injector.getInstance(ClientPingServerEventListener.class)
+      EventListenerRegistration.builder(ClientPingServerEvent.class)
+        .plugin(pluginContainer)
+        .listener(this.injector.getInstance(ClientPingServerEventListener.class))
+        .order(Order.DEFAULT)
+        .build()
     );
   }
 
@@ -137,7 +141,11 @@ public final class MiniMOTDPlugin implements MiniMOTDPlatform<Favicon> {
 
   @Listener
   public void onRefresh(final @NonNull RefreshGameEvent event) {
-    this.miniMOTD.reload();
+    try {
+      this.miniMOTD.reload();
+    } catch (final Exception ex) {
+      this.miniMOTD.logger().warn("Failed to reload MiniMOTD.", ex);
+    }
   }
 
   @Override

platform/velocity/build.gradle.kts

@@ -0,0 +1,39 @@
+plugins {
+  id("minimotd.shadow-platform")
+  alias(libs.plugins.run.velocity)
+}
+
+dependencies {
+  implementation(projects.minimotdCommon)
+  implementation(libs.bstatsVelocity)
+  compileOnly(libs.velocityApi)
+}
+
+java.disableAutoTargetJvm()
+
+tasks {
+  shadowJar {
+    configureForNativeAdventurePlatform()
+    commonRelocation("io.leangen.geantyref")
+    commonRelocation("org.bstats")
+  }
+  runVelocity {
+    velocityVersion(libs.versions.velocityApi.get())
+  }
+  processResources {
+    val props = mapOf(
+      "description" to project.description as String,
+      "url" to Constants.GITHUB_URL,
+      "version" to project.version,
+    )
+    inputs.properties(props)
+    filesMatching("velocity-plugin.json") {
+      expand(props)
+    }
+  }
+}
+
+publishMods.modrinth {
+  modLoaders.add("velocity")
+  minecraftVersions.addAll(minecraftVersion)
+}

platform/velocity/src/main/java/xyz/jpenilla/minimotd/velocity/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -36,7 +36,6 @@ import com.velocitypowered.api.command.CommandManager;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
-import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.util.Favicon;
@@ -47,19 +46,10 @@ import org.bstats.velocity.Metrics;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.slf4j.Logger;
 import xyz.jpenilla.minimotd.common.CommandHandler;
-import xyz.jpenilla.minimotd.common.Constants;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.MiniMOTDPlatform;
 import xyz.jpenilla.minimotd.common.util.UpdateChecker;
 
-@Plugin(
-  id = "${project.name}",
-  name = Constants.PluginMetadata.NAME,
-  version = Constants.PluginMetadata.VERSION,
-  description = "${description}",
-  url = "${url}",
-  authors = {"jmp"}
-)
 public final class MiniMOTDPlugin implements MiniMOTDPlatform<Favicon> {
   private static final Set<Class<?>> LISTENER_CLASSES = ImmutableSet.of(
     PingListener.class

platform/velocity/src/main/java/xyz/jpenilla/minimotd/velocity/PingListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * Copyright (c) 2020-2024 Jason Penilla
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,29 +24,64 @@
 package xyz.jpenilla.minimotd.velocity;
 
 import com.google.inject.Inject;
+import com.velocitypowered.api.event.EventTask;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
+import com.velocitypowered.api.proxy.ProxyServer;
+import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.Favicon;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.checkerframework.framework.qual.DefaultQualifier;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.PingResponse;
-import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;
 
+@DefaultQualifier(NonNull.class)
 public final class PingListener {
   private final MiniMOTD<Favicon> miniMOTD;
+  private final ProxyServer proxy;
 
   @Inject
-  private PingListener(final @NonNull MiniMOTD<Favicon> miniMOTD) {
+  private PingListener(final MiniMOTD<Favicon> miniMOTD, final ProxyServer proxy) {
     this.miniMOTD = miniMOTD;
+    this.proxy = proxy;
   }
 
   @Subscribe
-  public void handlePing(final @NonNull ProxyPingEvent event) {
-    final MiniMOTDConfig config = this.miniMOTD.configManager().resolveConfig(event.getConnection().getVirtualHost().orElse(null));
+  public EventTask onProxyPingEvent(final ProxyPingEvent event) {
+    return EventTask.async(() -> this.handle(event));
+  }
+
+  private void handle(final ProxyPingEvent event) {
+    final MOTDConfig config = this.miniMOTD.configManager().resolveConfig(event.getConnection().getVirtualHost().orElse(null));
     final ServerPing.Builder pong = event.getPing().asBuilder();
 
-    final PingResponse<Favicon> response = this.miniMOTD.createMOTD(config, pong.getOnlinePlayers(), pong.getMaximumPlayers());
+    final List<String> targetServers = config.targetServers();
+    int playersCount = 0;
+    if (targetServers.isEmpty()) {
+      playersCount = pong.getOnlinePlayers();
+    } else {
+      final Set<ServerPing.SamplePlayer> players = new HashSet<>();
+      for (final String serverName : targetServers) {
+        final @Nullable RegisteredServer server = this.proxy.getServer(serverName).orElse(null);
+        if (server != null) {
+          playersCount += server.getPlayersConnected().size();
+          players.addAll(server.getPlayersConnected().stream()
+            .map(p -> new ServerPing.SamplePlayer(p.getGameProfile().getName(), p.getUniqueId()))
+            .collect(Collectors.toList()));
+        }
+      }
+      pong.clearSamplePlayers();
+      pong.samplePlayers(players.toArray(new ServerPing.SamplePlayer[0]));
+    }
+
+    final PingResponse<Favicon> response = this.miniMOTD.createMOTD(config, playersCount, pong.getMaximumPlayers());
     response.icon(pong::favicon);
     response.motd(pong::description);
     response.playerCount().applyCount(pong::onlinePlayers, pong::maximumPlayers);

platform/velocity/src/main/resources/velocity-plugin.json

@@ -0,0 +1,12 @@
+{
+  "id": "minimotd-velocity",
+  "name": "MiniMOTD",
+  "version": "$version",
+  "description": "$description",
+  "url": "$url",
+  "authors": [
+    "jmp"
+  ],
+  "dependencies": [],
+  "main": "xyz.jpenilla.minimotd.velocity.MiniMOTDPlugin"
+}

renovate.json

@@ -1,5 +1,35 @@
 {
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base"
-  ]
+  ],
+  "ignoreDeps": [
+    "quiet-fabric-loom",
+    "com.mojang:minecraft",
+    "com.google.code.gson:gson"
+  ],
+  "labels": [
+    "dependencies"
+  ],
+  "packageRules": [
+    {
+      "description": "Correct Fabric API version handling",
+      "matchPackageNames": ["net.fabricmc.fabric-api:fabric-api", "net.fabricmc.fabric-api:fabric-api-deprecated"],
+      "versioning": "regex:^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(?:\\+(?<compatibility>.*))?$"
+    },
+    {
+      "matchManagers": ["github-actions", "gradle-wrapper"],
+      "groupName": "gradle and github actions"
+    },
+    {
+      "matchDepTypes": ["plugin"],
+      "groupName": "gradle and github actions"
+    },
+    {
+      "matchPaths": ["build-logic/*", "buildSrc/*"],
+      "groupName": "gradle and github actions"
+    }
+  ],
+  "semanticCommitType": "build",
+  "commitMessagePrefix": "chore(deps): "
 }

settings.gradle.kts

@@ -1,15 +1,21 @@
-enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {
   repositories {
-    //mavenLocal()
-    mavenCentral()
-    maven("https://oss.sonatype.org/content/repositories/snapshots/")
-    maven("https://papermc.io/repo/repository/maven-public/")
-    maven("https://nexus.velocitypowered.com/repository/maven-public/")
+    mavenCentral {
+      mavenContent { releasesOnly() }
+    }
+    maven("https://oss.sonatype.org/content/repositories/snapshots/") {
+      mavenContent { snapshotsOnly() }
+    }
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
+      mavenContent { snapshotsOnly() }
+    }
+    maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://repo.spongepowered.org/repository/maven-public/")
-    maven("https://repo.jpenilla.xyz/snapshots/")
+    maven("https://repo.jpenilla.xyz/snapshots/") {
+      mavenContent { snapshotsOnly() }
+    }
   }
   repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
 }
@@ -18,27 +24,35 @@ pluginManagement {
   repositories {
     gradlePluginPortal()
     maven("https://maven.fabricmc.net/")
+    maven("https://repo.jpenilla.xyz/snapshots/")
   }
-  includeBuild("build-logic")
+  includeBuild("gradle/build-logic")
 }
 
 plugins {
-  id("ca.stellardrift.polyglot-version-catalogs") version "5.0.0"
-  id("fabric-loom") version "0.8-SNAPSHOT"
+  id("quiet-fabric-loom") version "1.6-SNAPSHOT"
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 rootProject.name = "MiniMOTD"
 
+fun setup(name: String, dir: String) {
+  include(name)
+  project(":$name").projectDir = file(dir)
+}
+
+fun platform(name: String) = setup("minimotd-$name", "platform/$name")
+fun dist(name: String) = setup("minimotd-$name", "dist/$name")
+
+setup("minimotd-common", "common")
+
 sequenceOf(
-  "common",
   "bukkit",
   "sponge8",
   "sponge7",
   "bungeecord",
   "velocity",
   "fabric",
-  "universal"
-).forEach {
-  include("minimotd-$it")
-  project(":minimotd-$it").projectDir = file(it)
-}
+).forEach(::platform)
+
+dist("bukkit-bungeecord")

velocity/build.gradle.kts

@@ -1,33 +0,0 @@
-plugins {
-  id("minimotd.shadow-platform")
-  id("net.kyori.blossom")
-}
-
-dependencies {
-  implementation(projects.minimotdCommon) {
-    exclude("org.slf4j", "slf4j-api")
-  }
-  implementation(libs.bstatsVelocity)
-  compileOnly(libs.velocityApi)
-  annotationProcessor(libs.velocityApi)
-}
-
-tasks {
-  shadowJar {
-    configureForNativeAdventurePlatform()
-    commonRelocation("io.leangen.geantyref")
-    platformRelocation("velocity", "xyz.jpenilla.minimotd.common")
-    commonRelocation("org.bstats")
-  }
-}
-
-blossom {
-  val file = "src/main/java/xyz/jpenilla/minimotd/velocity/MiniMOTDPlugin.java"
-  mapOf(
-    "project.name" to project.name,
-    "description" to description as String,
-    "url" to Constants.GITHUB_URL
-  ).forEach { (k, v) ->
-    replaceToken("\${$k}", v, file)
-  }
-}