chore(deps): Update dependency org.spongepowered:spongeapi to v7.4.0

Update dependencies for Minecraft 1.21
Fix mc versions metadata
2024-06-20 05:37:16 +00:00 · 2024-06-19 22:36:15 -07:00 · 2024-06-02 00:27:42 -07:00 · 2024-06-02 00:21:17 -07:00 · 2024-06-02 00:17:52 -07:00 · 2024-06-01 20:55:47 -07:00
85 changed files with 1153 additions and 636 deletions
@@ -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
@@ -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@v3
-    - uses: gradle/wrapper-validation-action@v1
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Build with Gradle
-      run: ./gradlew build
-    - run: mkdir staging && cp build/libs/*.jar staging
-    - uses: actions/upload-artifact@v3
-      with:
-        name: Package
-        path: staging
@@ -1,10 +0,0 @@
-import ca.stellardrift.build.configurate.ConfigFormats
-import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension
-
-plugins {
-  id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
-}
-
-extensions.configure<PolyglotVersionCatalogExtension> {
-  from(ConfigFormats.YAML, file("../gradle/libs.versions.yml"))
-}
@@ -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
-
-abstract class MiniMOTDPlatformExtension(project: Project) {
-  val jarTask: Property<AbstractArchiveTask> = project.objects.property()
-}
@@ -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()
@@ -1,3 +0,0 @@
-plugins {
-  base
-}
@@ -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)
-  }
-}
@@ -1,43 +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)
-  implementation(libs.paperlib)
-  compileOnly(libs.paperApi)
-}
-
-tasks {
-  runServer {
-    minecraftVersion("1.18.2")
-  }
-  shadowJar {
-    commonRelocation("org.slf4j")
-    commonRelocation("io.leangen.geantyref")
-    commonRelocation("net.kyori")
-    commonRelocation("org.bstats")
-    commonRelocation("io.papermc.lib")
-  }
-}
-
-bukkit {
-  name = rootProject.name
-  main = "xyz.jpenilla.minimotd.bukkit.MiniMOTDPlugin"
-  apiVersion = "1.13"
-  website = Constants.GITHUB_URL
-  authors = listOf("jmp")
-  softDepend = listOf("ViaVersion")
-  commands {
-    register("minimotd") {
-      description = "MiniMOTD Command"
-      usage = "/minimotd help"
-      permission = "minimotd.admin"
-    }
-  }
-}
@@ -1,25 +0,0 @@
-plugins {
-  id("minimotd.shadow-platform")
-  id("net.minecrell.plugin-yml.bungee")
-}
-
-dependencies {
-  implementation(projects.minimotdCommon)
-  implementation(libs.adventurePlatformBungeecord)
-  implementation(libs.bstatsBungeecord)
-  compileOnly(libs.waterfallApi)
-}
-
-tasks {
-  shadowJar {
-    commonRelocation("io.leangen.geantyref")
-    commonRelocation("net.kyori")
-    commonRelocation("org.bstats")
-  }
-}
-
-bungee {
-  name = rootProject.name
-  main = "xyz.jpenilla.minimotd.bungee.MiniMOTDPlugin"
-  author = "jmp"
-}
@@ -1,11 +1,11 @@
 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" }
  }
 }

@@ -22,18 +22,16 @@ dependencies {
  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)
+    }
  }
 }
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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,11 +34,11 @@ 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;
  }

@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -29,7 +29,6 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.framework.qual.DefaultQualifier;
-import xyz.jpenilla.minimotd.common.util.Components;

 import static net.kyori.adventure.text.Component.space;
 import static net.kyori.adventure.text.Component.text;
@@ -77,7 +76,7 @@ public final class CommandHandler {
      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(Components.ofChildren(
+      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)
@@ -85,7 +84,7 @@ public final class CommandHandler {
      return;
    }

-    audience.sendMessage(Components.ofChildren(
+    audience.sendMessage(Component.textOfChildren(
      Constants.COMMAND_PREFIX,
      space(),
      text("Done reloading configuration.", GREEN)
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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,8 +34,7 @@ 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.util.Components;
+import xyz.jpenilla.minimotd.common.config.MOTDConfig;

 import static net.kyori.adventure.text.Component.newline;

@@ -77,7 +76,7 @@ public final class MiniMOTD<I> {
    return this.configManager;
  }

-  public 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)
@@ -90,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 = Components.ofChildren(
+      final MOTDConfig.MOTD motdConfig = config.motds().get(index);
+      final Component motd = Component.textOfChildren(
        parse(motdConfig.line1(), count),
        newline(),
        parse(motdConfig.line2(), count)
@@ -120,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();
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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,6 +39,7 @@ 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;

@@ -45,12 +51,14 @@ public final class ConfigLoader<C> {

  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 UnaryOperator<ConfigurationOptions> optionsModifier
+    final Class<C> configClass,
+    final Path configPath,
+    final UnaryOperator<ConfigurationOptions> optionsModifier
  ) {
+    this.postProcess = this.findPostProcessors(configClass);
    this.loader = HoconConfigurationLoader.builder()
      .path(configPath)
      .defaultOptions(options ->
@@ -67,6 +75,24 @@ public final class ConfigLoader<C> {
    }
  }

+  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
@@ -76,7 +102,11 @@ public final class ConfigLoader<C> {

  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 {
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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;
    }
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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,16 +34,16 @@ 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));
  }

@@ -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;
  }
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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,11 +51,19 @@ 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.")
@@ -63,8 +73,61 @@ public final class PluginSettings {
      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();
+  }
 }
@@ -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 {
+}
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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:",
@@ -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));
+  }
+}
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -41,14 +41,14 @@ class ComponentColorDownsamplerTest {

  @Test
  void testColorDownsampling() {
-    final Component fullColor = Components.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 = Components.ofChildren(
+    final Component expectedDownsample = Component.textOfChildren(
      text("Green ", nearestTo(GREEN)),
      text("Orange Yellow ", nearestTo(ORANGE_YELLOW)),
      text("Pink ", nearestTo(PINK)),
@@ -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
@@ -27,5 +23,5 @@ val universal = tasks.register<Jar>("universal") {
 }

 miniMOTDPlatform {
-  jarTask.set(universal)
+  jarTask.set(dist)
 }
@@ -1,5 +1,5 @@
 group=xyz.jpenilla
-version=2.0.7
+version=2.1.2-SNAPSHOT
 description=Use MiniMessage text formatting in the server list MOTD.

 org.gradle.caching=true
@@ -8,8 +8,10 @@ repositories {

 dependencies {
  implementation(libs.indraCommon)
+  implementation(libs.indraLicenser)
  implementation(libs.shadow)
-  implementation(libs.testLogger)
+  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))
@@ -0,0 +1,9 @@
+rootProject.name = "build-logic"
+
+dependencyResolutionManagement {
+  versionCatalogs {
+    create("libs") {
+      from(files("../libs.versions.toml"))
+    }
+  }
+}
@@ -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>
+}
@@ -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",
+)
@@ -1,12 +1,9 @@
-import com.adarshr.gradle.testlogger.theme.ThemeType
-
 plugins {
  id("java-library")
  id("net.kyori.indra")
-  id("net.kyori.indra.publishing")
+  id("net.kyori.indra.git")
  id("net.kyori.indra.checkstyle")
-  id("net.kyori.indra.license-header")
-  id("com.adarshr.test-logger")
+  id("net.kyori.indra.licenser.spotless")
 }

 version = (version as String)
@@ -21,24 +18,23 @@ indra {
  mitLicense()
 }

-testlogger {
-  theme = ThemeType.MOCHA_PARALLEL
-  showPassed = false
-}
-
 dependencies {
  testImplementation(libs.jupiterEngine)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

 tasks {
-  tasks {
-    withType<JavaCompile> {
-      options.compilerArgs.add("-Xlint:-processing")
+  withType<JavaCompile> {
+    options.compilerArgs.add("-Xlint:-processing")
+  }
+  listOf(javadocJar, javadoc).forEach {
+    it.configure {
+      onlyIf { false }
    }
-    sequenceOf(javadocJar, javadoc).forEach {
-      it.configure {
-        onlyIf { false }
-      }
+  }
+  test {
+    testLogging {
+      events("passed")
    }
  }
 }
@@ -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")
+    }
+  }
+}
@@ -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"))
+    }
+  }
+}
@@ -1,6 +1,6 @@
 plugins {
  id("minimotd.platform-conventions")
-  id("com.github.johnrengelman.shadow")
+  id("io.github.goooler.shadow")
 }

 tasks {
@@ -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.4.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]
@@ -1,171 +0,0 @@
-metadata:
-  format: { version: 1.0 }
-  polyglot-extensions:
-    - plugins
-
-plugins:
-  net.kyori.blossom: 1.3.0
-  org.spongepowered.gradle.plugin: 2.0.1
-  net.minecrell.plugin-yml.bungee: &plugin-yml 0.5.1
-  net.minecrell.plugin-yml.bukkit: *plugin-yml
-  xyz.jpenilla.run-paper: 1.0.6
-
-versions:
-  indra: 2.1.1
-  shadow: 7.1.2
-  testLoggerPlugin: 3.2.0
-  adventure: 4.10.1
-  adventurePlatform: 4.1.0
-  adventurePlatformFabric: 5.2.1
-  configurate: 4.1.2
-  checkerQual: 3.22.0
-  slf4j: 1.7.32
-  gson: 2.8.0
-  guava: 21.0
-  bstats: 2.2.1
-  paperApi: 1.16.5-R0.1-SNAPSHOT
-  paperlib: 1.0.8-SNAPSHOT
-  waterfallApi: 1.16-R0.4-SNAPSHOT
-  fabricApi: 0.51.0+1.18.2
-  fabricLoader: 0.14.4
-  fabricMinecraft: 1.18.2
-  spongeApi7: 7.2.0
-  velocityApi: 3.1.2-SNAPSHOT
-  jupiterEngine: 5.8.2
-
-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
-
-  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 }
-  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 }
-  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 }
-  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.johnrengelman
-    name: shadow
-    version: { ref: shadow }
-  testLogger:
-    group: com.adarshr
-    name: gradle-test-logger-plugin
-    version: { ref: testLoggerPlugin }
-
-bundles:
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.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
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -80,13 +80,11 @@ do
    esac
 done

-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${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"'
+# 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
@@ -133,22 +131,29 @@ 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.
+    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" && ! "$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
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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" \
@@ -205,6 +214,12 @@ set -- \
        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.
@@ -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
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2020-2022 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
@@ -1,6 +1,6 @@
 This file is part of MiniMOTD, licensed under the MIT License.

-Copyright (c) 2020-2022 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
@@ -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)
+}
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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,6 +26,7 @@ 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;
@@ -71,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));
+      }
    }
  }

@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -33,7 +33,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 PaperPingListener implements Listener {
  private final LegacyComponentSerializer unusualHexSerializer = LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build();
@@ -45,7 +45,7 @@ public final class PaperPingListener implements Listener {

  @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());

@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -32,7 +32,7 @@ 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;

 public final class PingListener implements Listener {
  private final MiniMOTD<CachedServerIcon> miniMOTD;
@@ -44,7 +44,7 @@ public final class PingListener implements Listener {

  @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());

@@ -56,6 +56,11 @@ public final class PingListener implements Listener {
        event.setMotd(LegacyComponentSerializer.legacySection().serialize(motd));
      }
    });
-    response.icon(event::setServerIcon);
+    response.icon(icon -> {
+      try {
+        event.setServerIcon(icon);
+      } catch (final UnsupportedOperationException ignore) {
+      }
+    });
  }
 }
@@ -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
@@ -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)
+}
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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));
+  }
 }
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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()) {
@@ -0,0 +1,5 @@
+name: MiniMOTD
+main: xyz.jpenilla.minimotd.bungee.MiniMOTDPlugin
+version: $version
+author: jmp
+description: $description
@@ -1,15 +1,13 @@
 plugins {
-  id("minimotd.platform-conventions")
-  id("com.github.johnrengelman.shadow")
  id("quiet-fabric-loom")
+  id("minimotd.platform-conventions")
+  id("io.github.goooler.shadow")
 }

 val shade: Configuration by configurations.creating

-val minecraftVersion = libs.versions.fabricMinecraft.get()
-
 dependencies {
-  minecraft(libs.fabricMinecraft)
+  minecraft(libs.minecraft)
  mappings(loom.officialMojangMappings())
  modImplementation(libs.fabricLoader)
  modImplementation(libs.fabricApi)
@@ -28,20 +26,15 @@ miniMOTDPlatform {

 indra {
  javaVersions {
-    target(17)
+    target(21)
  }
 }

-loom {
-  serverOnlyMinecraftJar()
-}
-
 tasks {
  shadowJar {
    configurations = listOf(shade)
    commonConfiguration()
    commonRelocation("io.leangen.geantyref")
-    platformRelocation("fabric", "xyz.jpenilla.minimotd.common")
  }
  remapJar {
    archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")
@@ -60,3 +53,8 @@ tasks {
    }
  }
 }
+
+publishMods.modrinth {
+  modLoaders.add("fabric")
+  minecraftVersions.addAll(minecraftVersion)
+}
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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;
  }
 }
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -21,27 +21,12 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
 */
-package xyz.jpenilla.minimotd.common.util;
+package xyz.jpenilla.minimotd.fabric.access;

-import net.kyori.adventure.text.ComponentLike;
-import net.kyori.adventure.text.TextComponent;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.framework.qual.DefaultQualifier;
+import org.checkerframework.checker.nullness.qual.Nullable;

-import static net.kyori.adventure.text.Component.empty;
-import static net.kyori.adventure.text.Component.text;
+public interface ServerStatusFaviconAccess {
+  @Nullable String cachedEncodedIcon();

-@DefaultQualifier(NonNull.class)
-public final class Components {
-  private Components() {
-    throw new IllegalStateException();
-  }
-
-  public static TextComponent ofChildren(final ComponentLike... children) {
-    if (children.length == 0) {
-      return empty();
-    }
-
-    return text().append(children).build();
-  }
+  void cacheEncodedIcon();
 }
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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());
  }
 }
@@ -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);
+  }
+}
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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();
  }
 }
@@ -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;
+  }
+}
@@ -23,8 +23,8 @@
    "minimotd-fabric.mixins.json"
  ],
  "depends": {
-    "fabricloader": ">=0.12.8",
-    "fabric": ">=0.31.0",
-    "minecraft": ">=1.18"
+    "fabricloader": ">=0.15.11",
+    "fabric": "*",
+    "minecraft": "~1.21"
  }
 }
@@ -6,6 +6,7 @@
  "mixins": [
    "ConnectionMixin",
    "ServerHandshakePacketListenerImplMixin",
+    "ServerStatusFaviconMixin",
    "ServerStatusPacketListenerImplMixin"
  ],
  "client": [
@@ -1,5 +1,3 @@
-import java.util.Locale
-
 plugins {
  id("minimotd.shadow-platform")
 }
@@ -14,7 +12,7 @@ dependencies {
 tasks {
  processResources {
    val replacements = mapOf(
-      "modid" to rootProject.name.toLowerCase(Locale.ENGLISH),
+      "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")
+}
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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);
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,10 +1,9 @@
 import org.spongepowered.gradle.plugin.config.PluginLoaders
 import org.spongepowered.plugin.metadata.model.PluginDependency
-import java.util.Locale

 plugins {
  id("minimotd.shadow-platform")
-  id("org.spongepowered.gradle.plugin")
+  alias(libs.plugins.sponge.gradle.plugin)
 }

 dependencies {
@@ -14,7 +13,7 @@ dependencies {
 sponge {
  injectRepositories(false)
  apiVersion("8.1.0-SNAPSHOT")
-  plugin(rootProject.name.toLowerCase(Locale.ENGLISH)) {
+  plugin(rootProject.name.lowercase()) {
    loader {
      name(PluginLoaders.JAVA_PLAIN)
      version("1.0")
@@ -41,9 +40,20 @@ sponge {
 tasks {
  shadowJar {
    configureForNativeAdventurePlatform()
-    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",
+  )
+}
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -33,7 +33,7 @@ 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> {
@@ -72,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);
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -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)
+}
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -1,7 +1,7 @@
 /*
 * This file is part of MiniMOTD, licensed under the MIT License.
 *
- * Copyright (c) 2020-2022 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
@@ -27,21 +27,30 @@ 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 MiniMOTD<Favicon> miniMOTD) {
+  private PingListener(final MiniMOTD<Favicon> miniMOTD, final ProxyServer proxy) {
    this.miniMOTD = miniMOTD;
+    this.proxy = proxy;
  }

  @Subscribe
@@ -50,10 +59,29 @@ public final class PingListener {
  }

  private void handle(final ProxyPingEvent event) {
-    final MiniMOTDConfig config = this.miniMOTD.configManager().resolveConfig(event.getConnection().getVirtualHost().orElse(null));
+    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);
@@ -0,0 +1,12 @@
+{
+  "id": "minimotd-velocity",
+  "name": "MiniMOTD",
+  "version": "$version",
+  "description": "$description",
+  "url": "$url",
+  "authors": [
+    "jmp"
+  ],
+  "dependencies": [],
+  "main": "xyz.jpenilla.minimotd.velocity.MiniMOTDPlugin"
+}
@@ -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): "
 }
@@ -2,8 +2,16 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

 dependencyResolutionManagement {
  repositories {
-    mavenCentral()
-    maven("https://papermc.io/repo/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/") {
      mavenContent { snapshotsOnly() }
@@ -16,29 +24,35 @@ pluginManagement {
  repositories {
    gradlePluginPortal()
    maven("https://maven.fabricmc.net/")
-    maven("https://maven.quiltmc.org/repository/release/")
    maven("https://repo.jpenilla.xyz/snapshots/")
  }
-  includeBuild("build-logic")
+  includeBuild("gradle/build-logic")
 }

 plugins {
-  id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
-  id("quiet-fabric-loom") version "0.11-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")
@@ -1,31 +0,0 @@
-plugins {
-  id("minimotd.shadow-platform")
-  id("net.kyori.blossom")
-}
-
-dependencies {
-  implementation(projects.minimotdCommon)
-  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)
-  }
-}
Author	SHA1	Message	Date
renovate[bot]	b6296c2e93	chore(deps): Update dependency org.spongepowered:spongeapi to v7.4.0	2024-06-20 05:37:16 +00:00
Jason Penilla	8c66bcd408	Update dependencies for Minecraft 1.21	2024-06-19 22:36:15 -07:00
Jason Penilla	2d47e73d3b	Fix mc versions metadata	2024-06-02 00:27:42 -07:00
Jason Penilla	f500c9fb8f	2.1.2-SNAPSHOT	2024-06-02 00:21:17 -07:00
Jason Penilla	922079cc7d	release: Version 2.1.1	2024-06-02 00:17:52 -07:00
renovate[bot]	798946390b	chore(deps): Update gradle and github actions	2024-06-01 20:55:47 -07:00
renovate[bot]	743a149f3b	chore(deps): Update dependency org.checkerframework:checker-qual to v3.43.0	2024-06-01 20:54:59 -07:00
renovate[bot]	316945b30f	chore(deps): Update dependency net.fabricmc.fabric-api:fabric-api to v0.99.4+1.20.6	2024-06-01 20:54:50 -07:00
renovate[bot]	c8bf42463c	chore(deps): Update adventurePlatform to v4.3.3	2024-06-01 20:54:41 -07:00
Jason Penilla	a9bf505028	Update dependencies	2024-05-10 17:41:09 -07:00
Jason Penilla	60bfb21444	Opt-out of remapping on Paper 1.20.5+	2024-05-02 14:35:06 -07:00
Jason Penilla	fb13022642	feat(fabric): Initial 1.20.6 update	2024-04-29 21:45:58 -07:00
Jason Penilla	1bbf3abd9a	build updates	2024-04-29 21:32:37 -07:00
renovate[bot]	1967d9802f	chore(deps): Update dependency net.fabricmc:fabric-loader to v0.15.10	2024-04-29 21:25:12 -07:00
renovate[bot]	6b3d7aeab6	chore(deps): Update dependency me.modmuss50:mod-publish-plugin to v0.5.1	2024-02-26 22:12:54 -07:00
renovate[bot]	267c0426fe	chore(deps): Update dependency net.kyori:adventure-bom to v4.16.0	2024-02-26 22:12:43 -07:00
renovate[bot]	c3d5afa680	chore(deps): Update dependency net.kyori:adventure-platform-fabric to v5.12.0	2024-02-26 22:12:13 -07:00
renovate[bot]	2009684fb5	chore(deps): Update dependency org.junit.jupiter:junit-jupiter-engine to v5.10.2	2024-02-05 18:23:42 -07:00
renovate[bot]	56202f3f26	chore(deps): Update dependency io.papermc:hangar-publish-plugin to v0.1.2	2024-02-02 16:45:09 -07:00
renovate[bot]	f2be2062e5	chore(deps): Update dependency net.kyori:adventure-platform-fabric to v5.11.0	2024-01-21 10:19:46 -07:00
Jason Penilla	4cbe7d4bf9	Use adventure textOfChildren method	2024-01-13 21:03:33 -07:00
renovate[bot]	fd20b5e583	chore(deps): Update dependency io.github.waterfallmc:waterfall-api to v1.16-R0.5-SNAPSHOT	2024-01-13 20:29:52 -07:00
Jason Penilla	e495e76a2d	2.1.1-SNAPSHOT	2024-01-13 20:17:46 -07:00
Jason Penilla	a37e7d8b7c	release: Version 2.1.0	2024-01-13 20:15:30 -07:00
Jason Penillaandens-gijs	b97ebcbbd6	Filter player lists with counts closes #161 Co-authored-by: ens-gijs <ens.gijs@gmail.com>	2024-01-13 20:09:17 -07:00
Jason Penilla	2abf0c1eba	Rename MiniMOTDConfig to avoid confusion	2024-01-13 20:05:04 -07:00
renovate[bot]	80df7d0500	chore(deps): Update dependency net.fabricmc.fabric-api:fabric-api to v0.93.1+1.20.4	2024-01-13 20:01:37 -07:00
Jason Penilla	b7318a1ac8	Support basic star matching and TCPShield hostnames for virtual host configs (#167 ) * Allow using single star for parts of domains in virtual host config * pre-split host strings * Extract real hostname from TCPShield hostnames * fix style * Update config comment * Add test for virtual host matching	2024-01-13 14:14:15 -07:00
Jason PenillaandddPn08	b5e5848bd9	Add server filtering for player counts (Velocity) (#171 ) * Add feature to show number of players per server * fixup * remove star syntax; it could be used for other purposes in the future * remove unused import --------- Co-authored-by: ddPn08 <pyn.g.1125@gmail.com>	2024-01-12 21:08:40 -07:00
renovate[bot]	22064b8576	chore(deps): Update plugin org.gradle.toolchains.foojay-resolver-convention to v0.8.0	2024-01-12 12:59:31 -07:00
Jason Penilla	aac6cab5f6	Update license	2024-01-06 16:47:31 -07:00
Jason Penilla	7197cf9100	Update loom, apply foojay resolver conventions, move build-logic dir	2024-01-06 16:20:37 -07:00
Jason Penilla	b3c448136d	Update dependencies for 1.20.4	2024-01-06 16:07:55 -07:00
renovate[bot]	25ad706ebf	chore(deps): Update dependency net.kyori:adventure-bom to v4.15.0	2023-12-21 12:55:40 -08:00
renovate[bot]	3c04370488	chore(deps): Update adventurePlatform to v4.3.2	2023-12-21 12:52:44 -08:00
renovate[bot]	5a3c52481a	chore(deps): Update gradle and github actions	2023-11-29 09:09:53 -08:00
renovate[bot]	2eb0ba1e98	chore(deps): Update dependency net.kyori:adventure-platform-fabric to v5.10.1	2023-11-17 11:56:29 -07:00
Jason Penilla	b38e08daa0	build: switch from minotaur to mod-publish-plugin for modrinth publishing	2023-11-14 21:48:13 -07:00
renovate[bot]	3c61a2d24b	chore(deps): Update dependency net.fabricmc.fabric-api:fabric-api to v0.90.7+1.20.2	2023-11-12 21:07:21 -07:00
renovate[bot]	611772f4bb	chore(deps): Update dependency org.checkerframework:checker-qual to v3.40.0	2023-11-12 21:04:44 -07:00
renovate[bot]	118cef163a	chore(deps): Update dependency net.fabricmc:fabric-loader to v0.14.24	2023-11-12 21:04:34 -07:00
renovate[bot]	d17e4af825	chore(deps): Update dependency org.junit.jupiter:junit-jupiter-engine to v5.10.1	2023-11-12 21:04:26 -07:00
renovate[bot]	19a21d988f	chore(deps): Update plugin blossom to v2.1.0	2023-11-12 21:04:17 -07:00
Jason Penilla	0cd04574f9	Remove plugin-yml-bungee	2023-11-12 20:58:04 -07:00
renovate[bot]	5acc5d285d	chore(deps): Update dependency io.papermc:paperlib to v1.0.8	2023-11-12 20:49:22 -07:00
Jason Penilla	3d9e90d7bf	Update gradle wrapper	2023-11-12 20:46:59 -07:00
Jason Penilla	c39cad4017	Update loom to 1.4	2023-11-12 20:45:35 -07:00
Jason Penilla	9c9c67776b	Remove guava dependency	2023-11-12 20:41:55 -07:00
Jason Penilla	2858de84ae	Convert version catalog to toml and configure renovate	2023-11-12 20:39:43 -07:00
Jason Penilla	64b023fad7	2.0.15-SNAPSHOT	2023-09-30 12:20:22 -07:00
Jason Penilla	f59de86c5e	release: Version 2.0.14	2023-09-30 12:15:26 -07:00
Jason Penilla	0f1c69f8b2	update run-paper and adventure-platform	2023-09-30 12:12:31 -07:00
Jason Penilla	f8deb9b7fb	build updates	2023-09-23 21:17:36 -07:00
Jason Penilla	8428e2b124	1.20.2	2023-09-23 21:10:19 -07:00
Jason Penilla	8f91a1b445	bump SpongeGradle	2023-09-09 16:47:30 -07:00
Jason Penilla	0ca1f8f19d	build updates	2023-09-09 15:34:03 -07:00
Jason Penilla	2fd3d41cbd	build: Remove quilt repo Quiltflower is succeeded by Vineflower which is on Maven Central.	2023-07-13 11:01:31 -07:00
Jason Penilla	ce201ba89e	build updates	2023-06-27 22:02:55 -07:00
Jason Penilla	e33135d3c6	2.0.14-SNAPSHOT	2023-06-27 22:01:51 -07:00
Jason Penilla	5f6e2789e2	release: Version 2.0.13	2023-06-27 21:40:49 -07:00
Jason Penilla	add32b31e7	fabric: 1.20.1	2023-06-17 10:08:41 -07:00
Jason Penilla	b2b2801907	2.0.13-SNAPSHOT	2023-05-07 14:52:36 -07:00
Jason Penilla	c919c40a59	release: Version 2.0.12	2023-05-07 14:35:19 -07:00
Jason Penilla	b3cc4bce5c	Fix style and add remap=false to favicon codec mixin	2023-05-07 13:54:36 -07:00
Jason Penilla	6fdf75dd3d	Update license headers	2023-05-07 13:50:04 -07:00
Jason Penilla	a8c2b0f23e	Improve Folia detection	2023-05-07 13:49:21 -07:00
Jason Penilla	0ee99d90f2	fabric: Bring back caching of encoded server icons	2023-05-07 13:47:58 -07:00
renovate[bot]	6623a5928e	chore(deps): update dependency gradle to v8.1.1	2023-05-07 13:18:43 -07:00
Jason Penilla	6532c03706	Add error handler to future	2023-03-27 21:21:15 -07:00
Jason Penilla	0bf3bfba7f	Add Folia support	2023-03-27 21:17:18 -07:00
Jason Penilla	f7094e0a77	2.0.12-SNAPSHOT	2023-03-18 13:21:57 -07:00
Jason Penilla	563da7f255	release: Version 2.0.11	2023-03-18 13:03:56 -07:00
Jason Penilla	51e599838d	build: Setup automatic Hangar and Modrinth publishing	2023-03-18 12:57:17 -07:00
Jason Penilla	e4970016e4	fabric: Update fabric.mod.json	2023-03-18 10:26:25 -07:00
Jason Penilla	2a04d0b2c8	fabric: Adjust lifecycle listeners	2023-03-18 10:22:44 -07:00
Jason Penilla	f8c6c2db6f	fabric: Update for Minecraft 1.19.4	2023-03-18 10:11:33 -07:00
Jason Penilla	9e25b68d00	Build and dependency updates	2023-01-31 14:22:26 -07:00
Jason Penilla	96b7d12743	Update loom	2023-01-31 14:17:39 -07:00
Jason Penilla	328ad6cd39	Preload some stuff on bungee Avoids misleading and annoying log spam	2023-01-31 14:07:27 -07:00
Jason Penilla	c0ee968e5b	2.0.11-SNAPSHOT	2022-12-09 10:18:17 -07:00
Jason Penilla	bc4d1e3cdd	release: Version 2.0.10	2022-12-09 10:07:42 -07:00
Jason Penilla	2626ed4551	Update testing Paper	2022-12-09 10:06:57 -07:00
Jason Penilla	a1f51db093	Update for Minecraft 1.19.3	2022-12-08 22:03:20 -07:00
Jason Penilla	59ab61825b	Update actions	2022-12-08 22:02:47 -07:00
Jason Penilla	5d7f79ce8a	Update gradle wrapper files	2022-11-25 10:31:32 -07:00
renovate[bot]	a5145384f6	chore(deps): update dependency gradle to v7.6	2022-11-25 09:58:39 -07:00
Jason Penilla	fba4066522	Rename uploaded artifact	2022-11-22 20:18:02 -07:00
Jason Penilla	3c9261a92d	Update actions	2022-11-22 20:09:06 -07:00
Jason Penilla	ab409537ac	Update jupiter engine	2022-11-15 12:26:46 -07:00
Jason Penilla	98a5bba407	Update adventure-platform-fabric	2022-11-15 12:26:38 -07:00
Jason Penilla	87bec5315b	build: Update `run-paper`, apply `run-velocity` and `run-waterfall` to respective platforms	2022-11-15 12:26:15 -07:00
Jason Penilla	bf9d92150c	build: Update loom	2022-09-01 18:50:49 -07:00
Jason Penilla	4cad4d461b	Remove universal jar and add bukkit/bungee jar for spigot resources, also reorganize project directory structure	2022-08-28 13:41:48 -07:00
Jason Penilla	fc7b78f7a8	2.0.10-SNAPSHOT	2022-08-26 15:17:38 -07:00
Jason Penilla	15cffc2d71	release: Version 2.0.9	2022-08-26 14:39:08 -07:00
Jason Penilla	28cb91a40c	Bump fabric loader	2022-08-26 14:38:19 -07:00
Jason Penilla	4ab6567fd2	Make virtual hosts case-insensitive (fixes #115 )	2022-08-26 14:35:34 -07:00
Jason Penilla	bdac395c2d	Bump dependencies	2022-08-26 14:16:37 -07:00
Jason Penilla	ffb475f529	Update gradle wrapper	2022-08-26 14:14:58 -07:00
renovate[bot]	d690104a9e	chore(deps): update dependency gradle to v7.5.1	2022-08-05 18:52:06 -07:00
Jason Penilla	efa0c69840	Handle Bukkit/Spigot throwing UnsupportedOperationException in setServerIcon for legacy pings this change does not affect Paper users	2022-07-21 20:19:12 -07:00
renovate[bot]	369e387a39	chore(deps): update dependency gradle to v7.5	2022-07-14 16:15:21 -07:00
Jason Penilla	2f98e67a93	build: Don't apply indra publishing, we don't have anything to publish	2022-06-19 00:11:26 -07:00
Jason Penilla	e2894e211c	2.0.9-SNAPSHOT	2022-06-19 00:09:44 -07:00
Jason Penilla	58ff03aa95	release: Version 2.0.8	2022-06-18 23:51:55 -07:00
Jason Penilla	4155249878	Dependency updates	2022-06-18 23:51:25 -07:00
Jason Penilla	de0936c5d2	Update for Minecraft 1.19	2022-06-13 19:28:31 -07:00
Jason Penilla	a8e5e910ee	fabric: update loom to 0.12	2022-05-29 19:49:41 -07:00
Jason Penilla	0d48b46621	Update SpongeGradle	2022-05-07 13:08:42 -07:00
Jason Penilla	2a18bc156d	2.0.8-SNAPSHOT	2022-05-03 18:15:53 -07:00