release: Version 2.2.4

- Minecraft 26.1.2 -> 26.2
- fabric-api 0.145.4+26.1.2 -> 0.153.0+26.2
- fabric-loader 0.19.1 -> 0.19.3
- neoforge 26.1.2.7-beta -> 26.2.0.7-beta
- adventure-platform-mod 6.9.0 -> 7.1.0
- shadow 9.4.1 -> 9.4.3
- junit-jupiter 6.0.3 -> 6.1.0
- miniplaceholders-api 3.1.0 -> 3.2.0
- spongeapi 7.2.0 -> 7.4.0
- Gradle wrapper 9.4.1 -> 9.6.1
- quiet-fabric-loom 1.15-SNAPSHOT -> 1.17-SNAPSHOT

.github/workflows/build.yml

@@ -17,4 +17,4 @@ jobs:
       modrinth-publish: true
       hangar-publish: true
       loom: true
-      jdk-version: 21
+      jdk-version: 25

README.md

@@ -4,8 +4,8 @@
 
 ### MiniMOTD is a basic server list MOTD plugin/mod for Minecraft servers and proxies
 
-- MiniMOTD supports RGB colors and gradients through [MiniMessage](https://github.com/KyoriPowered/adventure-text-minimessage), which is also where MiniMOTD gets it's name.
-- For more detailed info on formatting text, refer to the [MiniMessage docs](https://docs.adventure.kyori.net/minimessage.html).
+- MiniMOTD supports RGB colors and gradients through [MiniMessage](https://docs.papermc.io/adventure/minimessage/), which is also where MiniMOTD gets its name.
+- For more detailed info on formatting text, refer to the [MiniMessage docs](https://docs.papermc.io/adventure/minimessage/format/).
 - RGB colors are automatically downsampled for outdated clients.
 - RGB colors are only able to be sent by proxies and 1.16+ servers, and can only be seen by 1.16+ clients.
 

common/build.gradle.kts

@@ -9,10 +9,6 @@ tasks.jar {
   }
 }
 
-java {
-  disableAutoTargetJvm()
-}
-
 dependencies {
   api(libs.configurateHocon)
   api(platform(libs.adventureBom))

gradle.properties

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

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

@@ -6,7 +6,7 @@ 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"
+  extensions.getByType<IndraGitExtension>().commit().orNull?.name?.substring(0, 7) ?: "unknown"
 
 val Project.libs: LibrariesForLibs
   get() = extensions.getByType()
@@ -45,6 +45,13 @@ val bukkitVersions = listOf(
 
 val paperVersions = listOf(
   "1.21.8",
+  "1.21.9",
+  "1.21.10",
+  "1.21.11",
+  "26.1",
+  "26.1.1",
+  "26.1.2",
+  "26.2",
 )
 
 val productionJarAttribute = Attribute.of("minimotd.productionJar", String::class.java)

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

@@ -11,13 +11,16 @@ version = (version as String)
 
 indra {
   javaVersions {
-    minimumToolchain(21)
-    target(8)
+    target(17)
+    minimumToolchain(25)
+    testWith(17, 21, 25)
   }
   github(Constants.GITHUB_USER, Constants.GITHUB_REPO)
   mitLicense()
 }
 
+java.disableAutoTargetJvm()
+
 repositories {
   mavenCentral {
     mavenContent { releasesOnly() }
@@ -36,11 +39,8 @@ repositories {
 }
 
 dependencies {
-  testImplementation(libs.jupiterEngine)
-  // TODO: work around archloom issue?
-  if (project.name != "minimotd-neoforge" && project.name != "minimotd-fabric") {
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-  }
+  testImplementation(libs.junitJupiter)
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 tasks {

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

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.api.file.DuplicatesStrategy
 
 fun ShadowJar.commonRelocation(pkg: String) {
   relocate(pkg, "${Constants.RELOCATION_BASE_PACKAGE}.$pkg")
@@ -6,6 +7,11 @@ fun ShadowJar.commonRelocation(pkg: String) {
 
 fun ShadowJar.commonConfiguration() {
   mergeServiceFiles()
+  // Needed for mergeServiceFiles to work properly in Shadow 9+
+  filesMatching("META-INF/services/**") {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+  }
+
   commonRelocation("org.spongepowered.configurate")
   commonRelocation("com.typesafe.config")
   dependencies {

gradle/libs.versions.toml

@@ -1,31 +1,30 @@
 [versions]
-run-task = "3.0.0-beta.1"
-resource-factory = "1.3.0"
-mod-publish-plugin = "0.8.4"
-hangarPublishPlugin = "0.1.3"
-indra = "3.2.0"
-shadow = "9.0.2"
-adventure = "4.24.0"
+run-task = "3.0.2"
+resource-factory = "1.3.1"
+mod-publish-plugin = "2.1.1"
+hangarPublishPlugin = "0.1.4"
+indra = "4.0.0"
+shadow = "9.4.3"
+adventure = "4.26.1"
 adventurePlatform = "4.4.1"
-adventurePlatformMod = "6.6.0"
+adventurePlatformMod = "7.1.0"
 configurate = "4.2.0"
-slf4j = "1.7.32"
+slf4j = "1.7.36"
 gson = "2.8.0"
-bstats = "3.1.0"
+bstats = "3.2.1"
 paperApiLegacy = "1.16.5-R0.1-SNAPSHOT"
-paperApi = "1.21.8-R0.1-SNAPSHOT"
+paperApi = "1.21.11-R0.1-SNAPSHOT"
 paperlib = "1.0.8"
 waterfallApi = "1.16-R0.5-SNAPSHOT"
-fabricApi = "0.131.0+1.21.8"
-fabricLoader = "0.16.14"
-minecraft = "1.21.8"
-spongeApi7 = "7.2.0"
-velocityApi = "3.4.0-SNAPSHOT"
-jupiterEngine = "5.13.4"
-neoforge = "21.8.29"
+fabricApi = "0.153.0+26.2"
+fabricLoader = "0.19.3"
+minecraft = "26.2"
+spongeApi7 = "7.4.0"
+velocityApi = "3.4.0"
+neoforge = "26.2.0.7-beta"
 
 [plugins]
-blossom = { id = "net.kyori.blossom", version = "2.1.0" }
+blossom = { id = "net.kyori.blossom", version = "2.2.0" }
 sponge-gradle-plugin = { id = "org.spongepowered.gradle.plugin", version = "2.3.0" }
 run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-task" }
 run-velocity = { id = "xyz.jpenilla.run-velocity" }
@@ -45,7 +44,7 @@ adventurePlatformFabric = { group = "net.kyori", name = "adventure-platform-fabr
 adventurePlatformNeoforge = { group = "net.kyori", name = "adventure-platform-neoforge", version.ref = "adventurePlatformMod" }
 adventurePlatformSpongeApi = { group = "net.kyori", name = "adventure-platform-spongeapi", version.ref = "adventurePlatform" }
 minimessage = { group = "net.kyori", name = "adventure-text-minimessage" }
-miniplaceholders = "io.github.miniplaceholders:miniplaceholders-api:3.0.1"
+miniplaceholders = "io.github.miniplaceholders:miniplaceholders-api:3.2.0"
 
 brigadier = "com.mojang:brigadier:1.3.10"
 
@@ -80,7 +79,7 @@ spongeApi7 = { group = "org.spongepowered", name = "spongeapi", version.ref = "s
 
 velocityApi = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocityApi" }
 
-jupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "jupiterEngine" }
+junitJupiter = "org.junit.jupiter:junit-jupiter:6.1.0"
 
 # build-logic
 indraCommon = { group = "net.kyori", name = "indra-common", version.ref = "indra" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/.
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
         -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 

gradlew.bat

@@ -19,12 +19,12 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ 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
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,30 +65,18 @@ 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
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
 
 
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-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!
-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
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

platform/fabric/build.gradle.kts

@@ -1,5 +1,7 @@
+import me.modmuss50.mpp.platforms.modrinth.ModrinthEnvironment
+
 plugins {
-  id("quiet-fabric-loom")
+  id("xyz.jpenilla.quiet-fabric-loom")
   id("minimotd.platform-conventions")
   id("com.gradleup.shadow")
 }
@@ -8,38 +10,35 @@ val shade: Configuration by configurations.creating
 
 dependencies {
   minecraft(libs.minecraft)
-  mappings(loom.officialMojangMappings())
-  modImplementation(libs.fabricLoader)
-  modImplementation(libs.fabricApi)
+  implementation(libs.fabricLoader)
+  implementation(libs.fabricApi)
 
   shade(implementation(projects.minimotdCommon) {
     exclude("net.kyori")
     exclude("com.google.errorprone")
   })
 
-  modImplementation(libs.adventurePlatformFabric)
+  implementation(libs.adventurePlatformFabric)
   include(libs.adventurePlatformFabric)
 }
 
 miniMOTDPlatform {
-  jarTask.set(tasks.remapJar)
+  jarTask.set(tasks.shadowJar)
 }
 
 indra {
   javaVersions {
-    target(21)
+    target(25)
   }
 }
 
 tasks {
   shadowJar {
+    archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")
     configurations = listOf(shade)
     commonConfiguration()
     commonRelocation("io.leangen.geantyref")
   }
-  remapJar {
-    archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")
-  }
   processResources {
     val replacements = mapOf(
       "modid" to project.name,
@@ -56,6 +55,7 @@ tasks {
 }
 
 publishMods.modrinth {
+  environment = ModrinthEnvironment.DEDICATED_SERVER_ONLY
   modLoaders.add("fabric")
   minecraftVersions.addAll(minecraftVersion)
   optional("miniplaceholders")

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

@@ -108,7 +108,7 @@ public final class MiniMOTDFabric implements ModInitializer, MiniMOTDPlatform<Se
       BrigadierUtil.buildTree(
         new CommandHandler(this.miniMOTD),
         sourceStack -> this.audiences().audience(sourceStack),
-        sourceStack -> sourceStack.hasPermission(Commands.LEVEL_ADMINS)
+        Commands.hasPermission(Commands.LEVEL_ADMINS)
       )
     ));
   }

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

@@ -23,9 +23,9 @@
     "minimotd-fabric.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.16.14",
+    "fabricloader": ">=0.19.3",
     "fabric-api": "*",
-    "minecraft": "1.21.8",
+    "minecraft": ">=26.2",
     "adventure-platform-fabric": "*"
   }
 }

platform/neoforge/build.gradle.kts

@@ -1,3 +1,5 @@
+import me.modmuss50.mpp.platforms.modrinth.ModrinthEnvironment
+
 plugins {
   id("net.neoforged.moddev")
   id("minimotd.platform-conventions")
@@ -24,7 +26,7 @@ dependencies {
 
 indra {
   javaVersions {
-    target(21)
+    target(25)
   }
 }
 
@@ -59,6 +61,7 @@ miniMOTDPlatform {
 }
 
 publishMods.modrinth {
+  environment = ModrinthEnvironment.DEDICATED_SERVER_ONLY
   modLoaders.add("neoforge")
   minecraftVersions.addAll(minecraftVersion)
   optional("miniplaceholders")

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

@@ -92,7 +92,7 @@ public final class MiniMOTDNeoForge implements MiniMOTDPlatform<ServerStatus.Fav
         BrigadierUtil.buildTree(
           new CommandHandler(this.miniMOTD),
           sourceStack -> this.audiences().audience(sourceStack),
-          sourceStack -> sourceStack.hasPermission(Commands.LEVEL_ADMINS)
+          Commands.hasPermission(Commands.LEVEL_ADMINS)
         )
       );
     });

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

@@ -23,7 +23,7 @@ side = "BOTH"
 [[dependencies.minimotd]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21.8,1.22)"
+versionRange = "[26.2,)"
 ordering = "NONE"
 side = "BOTH"
 

platform/sponge8/build.gradle.kts

@@ -55,11 +55,18 @@ 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",
+    "1.21.3",
+    "1.21.4",
+    "1.21.5",
     "1.21.8",
+    "1.21.10",
+    "1.21.11",
+    "26.1.2",
+    "26.2",
   )
   optional("miniplaceholders")
 }

platform/velocity/build.gradle.kts

@@ -10,7 +10,11 @@ dependencies {
   compileOnly(libs.velocityApi)
 }
 
-java.disableAutoTargetJvm()
+indra {
+  javaVersions {
+    target(21)
+  }
+}
 
 tasks {
   shadowJar {

renovate.json

@@ -4,7 +4,7 @@
     "config:recommended"
   ],
   "ignoreDeps": [
-    "quiet-fabric-loom",
+    "xyz.jpenilla.quiet-fabric-loom",
     "com.mojang:minecraft",
     "com.google.code.gson:gson"
   ],

settings.gradle.kts

@@ -7,16 +7,14 @@ pluginManagement {
     maven("https://maven.neoforged.net/releases/") {
       mavenContent { releasesOnly() }
     }
-    maven("https://repo.jpenilla.xyz/snapshots/") {
-      mavenContent { snapshotsOnly() }
-    }
+    maven("https://repo.jpenilla.xyz/snapshots/")
   }
   includeBuild("gradle/build-logic")
 }
 
 plugins {
-  id("net.neoforged.moddev.repositories") version "2.0.107" apply false
-  id("quiet-fabric-loom") version "1.11-SNAPSHOT" apply false
+  id("net.neoforged.moddev.repositories") version "2.0.141" apply false
+  id("xyz.jpenilla.quiet-fabric-loom") version "1.17-SNAPSHOT" apply false
   id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }