release: Version 2.1.3

README.md

@@ -14,7 +14,8 @@
   - MiniMOTD is compatible with Spigot, however many features will not work. It is recommended to use Paper for full compatibility.
 - [Sponge API 8](https://www.spongepowered.org/)
 - [Sponge API 7](https://www.spongepowered.org/)
-- [Fabric](https://fabricmc.net/) (requires [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api))
+- [Fabric](https://fabricmc.net/) (Minecraft 1.21.1, requires [Fabric API](https://modrinth.com/mod/fabric-api))
+- [NeoForge](https://neoforged.net/) (Minecraft 1.21.1)
 
 #### Proxy Platforms
 - [Velocity](https://velocitypowered.com/)

gradle.properties

@@ -1,5 +1,5 @@
 group=xyz.jpenilla
-version=2.1.2
+version=2.1.3
 description=Use MiniMessage text formatting in the server list MOTD.
 
 org.gradle.caching=true

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

@@ -31,5 +31,5 @@ val bukkitVersions = listOf(
   "1.18.2",
   "1.19.4",
   "1.20.6",
-  "1.21",
+  "1.21.1",
 )

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

@@ -18,9 +18,29 @@ indra {
   mitLicense()
 }
 
+repositories {
+  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() }
+  }
+}
+
 dependencies {
   testImplementation(libs.jupiterEngine)
-  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+  // TODO: work around archloom issue?
+  if (project.name != "minimotd-neoforge" && project.name != "minimotd-fabric") {
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+  }
 }
 
 tasks {

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

@@ -1,6 +1,6 @@
 plugins {
   id("minimotd.platform-conventions")
-  id("io.github.goooler.shadow")
+  id("com.gradleup.shadow")
 }
 
 tasks {

gradle/libs.versions.toml

@@ -6,28 +6,28 @@ 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"
+run-task = "2.3.1"
+mod-publish-plugin = "0.7.3"
 hangarPublishPlugin = "0.1.2"
 indra = "3.1.3"
-shadow = "8.1.7"
+shadow = "8.3.0"
 adventure = "4.17.0"
-adventurePlatform = "4.3.3"
-adventurePlatformFabric = "5.14.0"
+adventurePlatform = "4.3.4"
+adventurePlatformFabric = "5.14.1"
 configurate = "4.1.2"
-checkerQual = "3.44.0"
+checkerQual = "3.47.0"
 slf4j = "1.7.32"
 gson = "2.8.0"
-bstats = "3.0.2"
+bstats = "3.0.3"
 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"
+fabricApi = "0.103.0+1.21.1"
+fabricLoader = "0.16.5"
+minecraft = "1.21.1"
 spongeApi7 = "7.2.0"
 velocityApi = "3.3.0-SNAPSHOT"
-jupiterEngine = "5.10.2"
+jupiterEngine = "5.11.0"
 
 [libraries]
 adventureBom = { group = "net.kyori", name = "adventure-bom", version.ref = "adventure" }
@@ -37,6 +37,7 @@ adventureTextSerializerGson = { group = "net.kyori", name = "adventure-text-seri
 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" }
+adventurePlatformNeoforge = { group = "net.kyori", name = "adventure-platform-neoforge", version = "6.0.0" }
 adventurePlatformSpongeApi = { group = "net.kyori", name = "adventure-platform-spongeapi", version.ref = "adventurePlatform" }
 minimessage = { group = "net.kyori", name = "adventure-text-minimessage" }
 
@@ -63,6 +64,8 @@ fabricApi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.re
 fabricLoader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabricLoader" }
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
 
+neoforge = { module = "net.neoforged:neoforge", version = "21.1.42" }
+
 spongeApi7 = { group = "org.spongepowered", name = "spongeapi", version.ref = "spongeApi7" }
 
 velocityApi = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocityApi" }
@@ -72,7 +75,7 @@ jupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", ve
 # 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" }
+shadow = { group = "com.gradleup.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" }
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

platform/fabric/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-  id("quiet-fabric-loom")
+  id("xyz.jpenilla.quiet-architectury-loom")
   id("minimotd.platform-conventions")
-  id("io.github.goooler.shadow")
+  id("com.gradleup.shadow")
 }
 
 val shade: Configuration by configurations.creating
@@ -14,6 +14,7 @@ dependencies {
 
   shade(implementation(projects.minimotdCommon) {
     exclude("net.kyori")
+    exclude("com.google.errorprone")
   })
 
   modImplementation(libs.adventurePlatformFabric)

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

@@ -25,6 +25,6 @@
   "depends": {
     "fabricloader": ">=0.15.11",
     "fabric": "*",
-    "minecraft": "~1.21"
+    "minecraft": ">=1.21 <=1.21.1"
   }
 }

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

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8.4",
   "package": "xyz.jpenilla.minimotd.fabric.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_21",
   "mixins": [
     "ConnectionMixin",
     "ServerHandshakePacketListenerImplMixin",

platform/neoforge/build.gradle.kts

@@ -0,0 +1,58 @@
+plugins {
+  id("xyz.jpenilla.quiet-architectury-loom")
+  id("minimotd.platform-conventions")
+  id("com.gradleup.shadow")
+}
+
+val shade: Configuration by configurations.creating
+
+dependencies {
+  minecraft(libs.minecraft)
+  mappings(loom.officialMojangMappings())
+  neoForge(libs.neoforge)
+
+  shade(implementation(projects.minimotdCommon) {
+    exclude("net.kyori")
+    exclude("com.google.errorprone")
+  })
+
+  modImplementation(libs.adventurePlatformNeoforge)
+  include(libs.adventurePlatformNeoforge)
+}
+
+miniMOTDPlatform {
+  jarTask.set(tasks.remapJar)
+}
+
+indra {
+  javaVersions {
+    target(21)
+  }
+}
+
+tasks {
+  shadowJar {
+    configurations = listOf(shade)
+    commonConfiguration()
+    commonRelocation("io.leangen.geantyref")
+  }
+  remapJar {
+    archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")
+  }
+  processResources {
+    val replacements = mapOf(
+      "version" to project.version.toString(),
+      "description" to project.description.toString(),
+      "github_url" to Constants.GITHUB_URL
+    )
+    inputs.properties(replacements)
+    filesMatching("META-INF/neoforge.mods.toml") {
+      expand(replacements)
+    }
+  }
+}
+
+publishMods.modrinth {
+  modLoaders.add("neoforge")
+  minecraftVersions.addAll(minecraftVersion)
+}

platform/neoforge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

platform/neoforge/src/main/java/xyz/jpenilla/minimotd/neoforge/MiniMOTDNeoForge.java

@@ -0,0 +1,152 @@
+/*
+ * 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.neoforge;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.context.CommandContext;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.nio.file.Path;
+import java.util.concurrent.CompletableFuture;
+import javax.imageio.ImageIO;
+import net.kyori.adventure.platform.modcommon.MinecraftServerAudiences;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.protocol.status.ServerStatus;
+import net.minecraft.server.MinecraftServer;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.RegisterCommandsEvent;
+import net.neoforged.neoforge.event.server.ServerStartedEvent;
+import net.neoforged.neoforge.event.server.ServerStartingEvent;
+import net.neoforged.neoforge.event.server.ServerStoppedEvent;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.neoforge.access.ServerStatusFaviconAccess;
+
+import static net.minecraft.commands.Commands.literal;
+
+@Mod("minimotd")
+public final class MiniMOTDNeoForge implements MiniMOTDPlatform<ServerStatus.Favicon> {
+  private static MiniMOTDNeoForge instance = null;
+
+  private final Logger logger = LoggerFactory.getLogger(MiniMOTD.class);
+  private final Path dataDirectory = Path.of("config", "MiniMOTD");
+  private final MiniMOTD<ServerStatus.Favicon> miniMOTD = new MiniMOTD<>(this);
+
+  private MinecraftServer server;
+  private MinecraftServerAudiences audiences;
+
+  public MiniMOTDNeoForge() {
+    if (instance != null) {
+      throw new IllegalStateException("Cannot create a second instance of " + this.getClass().getName());
+    }
+    instance = this;
+
+    this.registerCommand();
+    NeoForge.EVENT_BUS.addListener((ServerStartingEvent event) -> {
+      this.server = event.getServer();
+      this.audiences = MinecraftServerAudiences.of(event.getServer());
+    });
+    NeoForge.EVENT_BUS.addListener((ServerStartedEvent event) -> {
+      if (this.miniMOTD.configManager().pluginSettings().updateChecker()) {
+        CompletableFuture.runAsync(() -> new UpdateChecker().checkVersion().forEach(this.logger()::info));
+      }
+    });
+    NeoForge.EVENT_BUS.addListener((ServerStoppedEvent event) -> {
+      this.server = null;
+      this.audiences = null;
+    });
+    this.miniMOTD.logger().info("Done initializing MiniMOTD");
+  }
+
+  public @NonNull MiniMOTD<ServerStatus.Favicon> miniMOTD() {
+    return this.miniMOTD;
+  }
+
+  private void registerCommand() {
+    final class WrappingExecutor implements Command<CommandSourceStack> {
+      private final CommandHandler.Executor handler;
+
+      WrappingExecutor(final CommandHandler.@NonNull Executor handler) {
+        this.handler = handler;
+      }
+
+      @Override
+      public int run(final @NonNull CommandContext<CommandSourceStack> context) {
+        this.handler.execute(MiniMOTDNeoForge.this.audiences().audience(context.getSource()));
+        return Command.SINGLE_SUCCESS;
+      }
+    }
+
+    final CommandHandler handler = new CommandHandler(this.miniMOTD);
+    NeoForge.EVENT_BUS.addListener((RegisterCommandsEvent event) -> {
+      event.getDispatcher().register(
+        literal("minimotd")
+          .requires(source -> source.hasPermission(4))
+          .then(literal("reload").executes(new WrappingExecutor(handler::reload)))
+          .then(literal("about").executes(new WrappingExecutor(handler::about)))
+          .then(literal("help").executes(new WrappingExecutor(handler::help)))
+      );
+    });
+  }
+
+  public @NonNull MinecraftServerAudiences audiences() {
+    return this.audiences;
+  }
+
+  public static @NonNull MiniMOTDNeoForge get() {
+    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;
+  }
+
+  @Override
+  public @NonNull Logger logger() {
+    return this.logger;
+  }
+
+  @Override
+  public ServerStatus.@NonNull Favicon loadIcon(final @NonNull BufferedImage bufferedImage) throws Exception {
+    final ByteArrayOutputStream out = new ByteArrayOutputStream();
+    ImageIO.write(bufferedImage, "PNG", out);
+    final ServerStatus.Favicon favicon = new ServerStatus.Favicon(out.toByteArray());
+    ((ServerStatusFaviconAccess) (Object) favicon).cacheEncodedIcon();
+    return favicon;
+  }
+}

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

@@ -0,0 +1,30 @@
+/*
+ * 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.neoforge.access;
+
+public interface ConnectionAccess {
+  void protocolVersion(int protocolVersion);
+
+  int protocolVersion();
+}

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

@@ -0,0 +1,32 @@
+/*
+ * This file is part of MiniMOTD, licensed under the MIT License.
+ *
+ * Copyright (c) 2020-2024 Jason Penilla
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package xyz.jpenilla.minimotd.neoforge.access;
+
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public interface ServerStatusFaviconAccess {
+  @Nullable String cachedEncodedIcon();
+
+  void cacheEncodedIcon();
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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.neoforge.mixin;
+
+import net.minecraft.network.Connection;
+import org.spongepowered.asm.mixin.Implements;
+import org.spongepowered.asm.mixin.Interface;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import xyz.jpenilla.minimotd.neoforge.access.ConnectionAccess;
+
+@Unique
+@Mixin(Connection.class)
+@Implements({@Interface(iface = ConnectionAccess.class, prefix = "miniMOTD$")})
+abstract class ConnectionMixin {
+  private int miniMOTD$protocolVersion = -1;
+
+  public void miniMOTD$protocolVersion(final int protocolVersion) {
+    this.miniMOTD$protocolVersion = protocolVersion;
+  }
+
+  public int miniMOTD$protocolVersion() {
+    return this.miniMOTD$protocolVersion;
+  }
+}

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

@@ -0,0 +1,45 @@
+/*
+ * 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.neoforge.mixin;
+
+import net.minecraft.network.Connection;
+import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
+import net.minecraft.server.network.ServerHandshakePacketListenerImpl;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import xyz.jpenilla.minimotd.neoforge.access.ConnectionAccess;
+
+@Mixin(ServerHandshakePacketListenerImpl.class)
+abstract class ServerHandshakePacketListenerImplMixin {
+  @Shadow @Final private Connection connection;
+
+  @Inject(method = "handleIntention", at = @At("HEAD"))
+  public void injectHandleIntention(final ClientIntentionPacket packet, final CallbackInfo ci) {
+    ((ConnectionAccess) this.connection).protocolVersion(packet.protocolVersion());
+  }
+}

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

@@ -0,0 +1,78 @@
+/*
+ * This file is part of MiniMOTD, licensed under the MIT License.
+ *
+ * Copyright (c) 2020-2024 Jason Penilla
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package xyz.jpenilla.minimotd.neoforge.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.neoforge.access.ServerStatusFaviconAccess;
+
+@Mixin(ServerStatus.Favicon.class)
+abstract class ServerStatusFaviconMixin implements ServerStatusFaviconAccess {
+  @Unique
+  private static Function<ServerStatus.Favicon, String> VANILLA_ENCODE_TO_STRING;
+
+  @Redirect(
+    method = "<clinit>",
+    at = @At(
+      target = "Lcom/mojang/serialization/codecs/PrimitiveCodec;comapFlatMap(Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;",
+      value = "INVOKE"
+    ),
+    remap = false
+  )
+  private static Codec<ServerStatus.Favicon> makeCodec(
+    final PrimitiveCodec<String> stringCodec,
+    final Function<String, DataResult<ServerStatus.Favicon>> decode,
+    final Function<ServerStatus.Favicon, String> encode
+  ) {
+    VANILLA_ENCODE_TO_STRING = encode;
+    return stringCodec.comapFlatMap(decode, favicon -> {
+      final @Nullable String encodedIcon = ((ServerStatusFaviconAccess) (Object) favicon).cachedEncodedIcon();
+      if (encodedIcon != null) {
+        return encodedIcon;
+      }
+      return encode.apply(favicon);
+    });
+  }
+
+  @Unique
+  private String encodedIcon;
+
+  @Override
+  public @Nullable String cachedEncodedIcon() {
+    return this.encodedIcon;
+  }
+
+  @Override
+  public void cacheEncodedIcon() {
+    this.encodedIcon = VANILLA_ENCODE_TO_STRING.apply((ServerStatus.Favicon) (Object) this);
+  }
+}

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

@@ -0,0 +1,94 @@
+/*
+ * 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.neoforge.mixin;
+
+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;
+import net.minecraft.server.network.ServerStatusPacketListenerImpl;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+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.MOTDConfig;
+import xyz.jpenilla.minimotd.common.util.ComponentColorDownsampler;
+import xyz.jpenilla.minimotd.neoforge.MiniMOTDNeoForge;
+import xyz.jpenilla.minimotd.neoforge.access.ConnectionAccess;
+import xyz.jpenilla.minimotd.neoforge.util.MutableServerStatus;
+
+@Mixin(ServerStatusPacketListenerImpl.class)
+abstract class ServerStatusPacketListenerImplMixin {
+  @Shadow @Final private Connection connection;
+
+  @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 MiniMOTDNeoForge miniMOTDNeoForge = MiniMOTDNeoForge.get();
+    final MinecraftServer minecraftServer = miniMOTDNeoForge.requireServer();
+    final ServerStatus vanillaStatus = Objects.requireNonNull(minecraftServer.getStatus(), "vanillaStatus");
+
+    final MiniMOTD<ServerStatus.Favicon> miniMOTD = miniMOTDNeoForge.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.description(miniMOTDNeoForge.audiences().asNative(motd));
+      } else {
+        modifiedStatus.description(miniMOTDNeoForge.audiences().asNative(ComponentColorDownsampler.downsampler().downsample(motd)));
+      }
+    });
+    response.icon(favicon -> modifiedStatus.favicon(Optional.of(favicon)));
+
+    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.toServerStatus();
+  }
+}

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

@@ -0,0 +1,99 @@
+/*
+ * 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.neoforge.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;
+  private boolean isModded; // NeoForge addition
+
+  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();
+    this.isModded = status.isModded(); // NeoForge addition
+  }
+
+  public ServerStatus toServerStatus() {
+    return new ServerStatus(this.description, this.players, this.version, this.favicon, this.enforcesSecureChat, this.isModded);
+  }
+
+  public Component description() {
+    return this.description;
+  }
+
+  public void description(final Component description) {
+    Objects.requireNonNull(description, "description");
+    this.description = description;
+  }
+
+  public Optional<ServerStatus.Players> players() {
+    return this.players;
+  }
+
+  public void players(final Optional<ServerStatus.Players> players) {
+    Objects.requireNonNull(players, "players");
+    this.players = players;
+  }
+
+  public Optional<ServerStatus.Version> version() {
+    return this.version;
+  }
+
+  public void version(final Optional<ServerStatus.Version> version) {
+    Objects.requireNonNull(version, "version");
+    this.version = version;
+  }
+
+  public Optional<ServerStatus.Favicon> favicon() {
+    return this.favicon;
+  }
+
+  public void favicon(final Optional<ServerStatus.Favicon> favicon) {
+    Objects.requireNonNull(favicon, "favicon");
+    this.favicon = favicon;
+  }
+
+  public boolean enforcesSecureChat() {
+    return this.enforcesSecureChat;
+  }
+
+  public void enforcesSecureChat(final boolean enforcesSecureChat) {
+    this.enforcesSecureChat = enforcesSecureChat;
+  }
+}

platform/neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,38 @@
+modLoader = "javafml"
+loaderVersion = "[1,)"
+license = "MIT"
+issueTrackerURL = "${github_url}/issues/"
+showAsResourcePack = false
+
+[[mods]]
+modId = "minimotd"
+version = "${version}"
+displayName = "MiniMOTD"
+displayURL = "${github_url}"
+authors = "jmp"
+description = "${description}"
+displayTest = "IGNORE_ALL_VERSION"
+
+[[dependencies.minimotd]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.0,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.minimotd]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21,1.21.2)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.minimotd]]
+modId = "adventure_platform_neoforge"
+type = "required"
+versionRange = "*"
+ordering = "AFTER"
+side = "BOTH"
+
+[[mixins]]
+config = "minimotd-neoforge.mixins.json"

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

@@ -0,0 +1,17 @@
+{
+  "required": true,
+  "minVersion": "0.8.4",
+  "package": "xyz.jpenilla.minimotd.neoforge.mixin",
+  "compatibilityLevel": "JAVA_21",
+  "mixins": [
+    "ConnectionMixin",
+    "ServerHandshakePacketListenerImplMixin",
+    "ServerStatusFaviconMixin",
+    "ServerStatusPacketListenerImplMixin"
+  ],
+  "client": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

platform/sponge8/build.gradle.kts

@@ -54,6 +54,6 @@ publishMods.modrinth {
     "1.18.2",
     "1.19.4",
     "1.20.6",
-    "1.21",
+    "1.21.1",
   )
 }

renovate.json

@@ -4,7 +4,7 @@
     "config:base"
   ],
   "ignoreDeps": [
-    "quiet-fabric-loom",
+    "xyz.jpenilla.quiet-architectury-loom",
     "com.mojang:minecraft",
     "com.google.code.gson:gson"
   ],
@@ -17,6 +17,11 @@
       "matchPackageNames": ["net.fabricmc.fabric-api:fabric-api", "net.fabricmc.fabric-api:fabric-api-deprecated"],
       "versioning": "regex:^(?<major>\\d+)(\\.(?<minor>\\d+))?(\\.(?<patch>\\d+))?(?:\\+(?<compatibility>.*))?$"
     },
+    {
+      "description": "Correct NeoForge version handling",
+      "matchPackageNames": ["net.neoforged:neoforge"],
+      "versioning": "regex:^(?<compatibility>(\\d+\\.){2})(?<minor>\\d+)(-beta)?$"
+    },
     {
       "matchManagers": ["github-actions", "gradle-wrapper"],
       "groupName": "gradle and github actions"

settings.gradle.kts

@@ -1,36 +1,18 @@
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-dependencyResolutionManagement {
-  repositories {
-    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() }
-    }
-  }
-  repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-}
-
 pluginManagement {
   repositories {
     gradlePluginPortal()
     maven("https://maven.fabricmc.net/")
+    maven("https://maven.neoforged.net/releases/")
+    maven("https://maven.architectury.dev/")
     maven("https://repo.jpenilla.xyz/snapshots/")
   }
   includeBuild("gradle/build-logic")
 }
 
 plugins {
-  id("quiet-fabric-loom") version "1.6-SNAPSHOT"
+  id("xyz.jpenilla.quiet-architectury-loom") version "1.7-SNAPSHOT" apply false
   id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
@@ -53,6 +35,7 @@ sequenceOf(
   "bungeecord",
   "velocity",
   "fabric",
+  "neoforge",
 ).forEach(::platform)
 
 dist("bukkit-bungeecord")