release: Version 2.1.7

.gitignore

@@ -117,3 +117,5 @@ run/
 
 # Ignore Gradle build output directory
 build/
+
+.kotlin/

dist/bukkit-bungeecord/build.gradle.kts

@@ -9,17 +9,26 @@ tasks.jar {
 val platforms = setOf(
   projects.minimotdBukkit,
   projects.minimotdBungeecord,
-).map { it.dependencyProject }
+)
+
+val platformsConfig = configurations.register("platforms") {
+  attributes.attribute(productionJarAttribute, "true")
+  isCanBeConsumed = false
+  isCanBeResolved = true
+}
+
+dependencies {
+  for (platform in platforms) {
+    platformsConfig.name(platform)
+  }
+}
 
 val dist = tasks.register<Jar>("bukkitAndBungeeJar") {
   artifacts.add("archives", this)
   archiveClassifier.set(null as String?)
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
-  for (platform in platforms) {
-    val jarTask = platform.miniMOTDPlatform.jarTask
-    from(zipTree(jarTask.flatMap { it.archiveFile }))
-  }
+  from(platformsConfig.flatMap { it.elements }.map { it.map { e -> zipTree(e) } })
 }
 
 miniMOTDPlatform {

gradle.properties

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

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

@@ -1,6 +1,7 @@
 import net.kyori.indra.git.IndraGitExtension
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
+import org.gradle.api.attributes.Attribute
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.getByType
 
@@ -31,5 +32,7 @@ val bukkitVersions = listOf(
   "1.18.2",
   "1.19.4",
   "1.20.6",
-  "1.21.4",
+  "1.21.8",
 )
+
+val productionJarAttribute = Attribute.of("minimotd.productionJar", String::class.java)

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

@@ -22,17 +22,18 @@ repositories {
   mavenCentral {
     mavenContent { releasesOnly() }
   }
-  maven("https://oss.sonatype.org/content/repositories/snapshots/") {
-    mavenContent { snapshotsOnly() }
+  maven("https://repo.jpenilla.xyz/snapshots/") {
+    mavenContent {
+      snapshotsOnly()
+      includeGroup("xyz.jpenilla")
+      includeGroup("net.kyori") // TODO adventure-platform and adventure-platform-mod snapshots
+    }
   }
-  maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
+  maven("https://central.sonatype.com/repository/maven-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 {

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

@@ -32,3 +32,10 @@ if (name != "minimotd-bukkit-bungeecord") {
     }
   }
 }
+
+configurations.consumable("productionJar") {
+  outgoing {
+    artifact(platformExtension.jarTask)
+  }
+  attributes.attribute(productionJarAttribute, "true")
+}

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [plugins]
 blossom = { id = "net.kyori.blossom", version = "2.1.0" }
-sponge-gradle-plugin = { id = "org.spongepowered.gradle.plugin", 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", version.ref = "run-task" }
 run-waterfall = { id = "xyz.jpenilla.run-waterfall", version.ref = "run-task" }
@@ -8,26 +8,27 @@ run-waterfall = { id = "xyz.jpenilla.run-waterfall", version.ref = "run-task" }
 [versions]
 run-task = "2.3.1"
 mod-publish-plugin = "0.8.4"
-hangarPublishPlugin = "0.1.2"
+hangarPublishPlugin = "0.1.3"
 indra = "3.1.3"
-shadow = "8.3.5"
-adventure = "4.17.0"
-adventurePlatform = "4.3.4"
-adventurePlatformMod = "6.2.0"
-configurate = "4.1.2"
-checkerQual = "3.48.2"
+shadow = "8.3.8"
+adventure = "4.23.0"
+adventurePlatform = "4.4.1-SNAPSHOT"
+adventurePlatformMod = "6.5.0-SNAPSHOT"
+configurate = "4.2.0"
+checkerQual = "3.49.5"
 slf4j = "1.7.32"
 gson = "2.8.0"
 bstats = "3.1.0"
 paperApi = "1.16.5-R0.1-SNAPSHOT"
 paperlib = "1.0.8"
 waterfallApi = "1.16-R0.5-SNAPSHOT"
-fabricApi = "0.114.0+1.21.4"
-fabricLoader = "0.16.9"
-minecraft = "1.21.4"
+fabricApi = "0.129.0+1.21.8"
+fabricLoader = "0.16.14"
+minecraft = "1.21.8"
 spongeApi7 = "7.2.0"
 velocityApi = "3.4.0-SNAPSHOT"
-jupiterEngine = "5.11.4"
+jupiterEngine = "5.13.3"
+neoforge = "21.8.1-beta"
 
 [libraries]
 adventureBom = { group = "net.kyori", name = "adventure-bom", version.ref = "adventure" }
@@ -64,7 +65,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.4.47-beta" }
+# for renovate
+zNeoforge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
 
 spongeApi7 = { group = "org.spongepowered", name = "spongeapi", version.ref = "spongeApi7" }
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

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

platform/fabric/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("xyz.jpenilla.quiet-architectury-loom")
+  id("quiet-fabric-loom")
   id("minimotd.platform-conventions")
   id("com.gradleup.shadow")
 }

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

@@ -23,8 +23,9 @@
     "minimotd-fabric.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.16.7",
-    "fabric": "*",
-    "minecraft": ">=1.21.3 <1.22-"
+    "fabricloader": ">=0.16.14",
+    "fabric-api": "*",
+    "minecraft": "1.21.8",
+    "adventure-platform-fabric": "*"
   }
 }

platform/neoforge/build.gradle.kts

@@ -1,27 +1,25 @@
 plugins {
-  id("xyz.jpenilla.quiet-architectury-loom")
+  id("net.neoforged.moddev")
   id("minimotd.platform-conventions")
   id("com.gradleup.shadow")
 }
 
+neoForge {
+  enable {
+    version = libs.versions.neoforge.get()
+  }
+}
+
 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)
+  implementation(libs.adventurePlatformNeoforge)
+  jarJar(libs.adventurePlatformNeoforge)
 }
 
 indra {
@@ -36,9 +34,6 @@ tasks {
     commonConfiguration()
     commonRelocation("io.leangen.geantyref")
   }
-  remapJar {
-    archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")
-  }
   processResources {
     val replacements = mapOf(
       "version" to project.version.toString(),
@@ -52,6 +47,17 @@ tasks {
   }
 }
 
+val productionJar = tasks.register<Zip>("productionJar") {
+  archiveFileName = "${project.name}-mc$minecraftVersion-${project.version}.jar"
+  destinationDirectory = layout.buildDirectory.dir("libs")
+  from(zipTree(tasks.shadowJar.flatMap { it.archiveFile }))
+  from(tasks.jarJar.flatMap { it.outputDirectory })
+}
+
+miniMOTDPlatform {
+  jarTask.set(productionJar)
+}
+
 publishMods.modrinth {
   modLoaders.add("neoforge")
   minecraftVersions.addAll(minecraftVersion)

platform/neoforge/gradle.properties

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

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.3,1.22)"
+versionRange = "[1.21.8,1.22)"
 ordering = "NONE"
 side = "BOTH"
 

platform/sponge8/build.gradle.kts

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

renovate.json

@@ -1,10 +1,10 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
+    "config:recommended"
   ],
   "ignoreDeps": [
-    "xyz.jpenilla.quiet-architectury-loom",
+    "quiet-fabric-loom",
     "com.mojang:minecraft",
     "com.google.code.gson:gson"
   ],
@@ -14,24 +14,37 @@
   "packageRules": [
     {
       "description": "Correct Fabric API version handling",
-      "matchPackageNames": ["net.fabricmc.fabric-api:fabric-api", "net.fabricmc.fabric-api:fabric-api-deprecated"],
+      "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"],
+      "matchPackageNames": [
+        "net.neoforged:neoforge"
+      ],
       "versioning": "regex:^(?<compatibility>(\\d+\\.){2})(?<minor>\\d+)(-beta)?$"
     },
     {
-      "matchManagers": ["github-actions", "gradle-wrapper"],
+      "matchManagers": [
+        "github-actions",
+        "gradle-wrapper"
+      ],
       "groupName": "gradle and github actions"
     },
     {
-      "matchDepTypes": ["plugin"],
+      "matchDepTypes": [
+        "plugin"
+      ],
       "groupName": "gradle and github actions"
     },
     {
-      "matchPaths": ["build-logic/*", "buildSrc/*"],
+      "matchFileNames": [
+        "build-logic/*",
+        "buildSrc/*"
+      ],
       "groupName": "gradle and github actions"
     }
   ],

settings.gradle.kts

@@ -4,16 +4,20 @@ 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/")
+    maven("https://maven.neoforged.net/releases/") {
+      mavenContent { releasesOnly() }
+    }
+    maven("https://repo.jpenilla.xyz/snapshots/") {
+      mavenContent { snapshotsOnly() }
+    }
   }
   includeBuild("gradle/build-logic")
 }
 
 plugins {
-  id("xyz.jpenilla.quiet-architectury-loom") version "1.7-SNAPSHOT" apply false
-  id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+  id("net.neoforged.moddev.repositories") version "2.0.103" apply false
+  id("quiet-fabric-loom") version "1.11-SNAPSHOT" apply false
+  id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 rootProject.name = "MiniMOTD"