release: Version 2.0.14

Quiltflower is succeeded by Vineflower which is on Maven Central.

build-logic/build.gradle.kts

@@ -10,7 +10,6 @@ dependencies {
   implementation(libs.indraCommon)
   implementation(libs.indraLicenser)
   implementation(libs.shadow)
-  implementation(libs.testLogger)
   implementation(libs.minotaur)
   implementation(libs.hangarPublishPlugin)
 

build-logic/settings.gradle.kts

@@ -2,7 +2,7 @@ import ca.stellardrift.build.configurate.ConfigFormats
 import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension
 
 plugins {
-  id("ca.stellardrift.polyglot-version-catalogs") version "6.0.1"
+  id("ca.stellardrift.polyglot-version-catalogs") version "6.1.0"
 }
 
 extensions.configure<PolyglotVersionCatalogExtension> {

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

@@ -29,5 +29,6 @@ val bukkitVersions = listOf(
   "1.16.5",
   "1.17.1",
   "1.18.2",
-  "1.19.4"
+  "1.19.4",
+  "1.20.2"
 )

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

@@ -1,12 +1,9 @@
-import com.adarshr.gradle.testlogger.theme.ThemeType
-
 plugins {
   id("java-library")
   id("net.kyori.indra")
   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")
+  }
+  sequenceOf(javadocJar, javadoc).forEach {
+    it.configure {
+      onlyIf { false }
     }
-    sequenceOf(javadocJar, javadoc).forEach {
-      it.configure {
-        onlyIf { false }
-      }
+  }
+  test {
+    testLogging {
+      events("passed")
     }
   }
 }

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

@@ -10,7 +10,7 @@ fun jar(platform: String) = project(":minimotd-$platform")
 
 hangarPublish.publications.register("plugin") {
   version.set(project.version as String)
-  namespace("jmp", "MiniMOTD")
+  id.set("MiniMOTD")
   channel.set("Release")
   changelog.set(releaseNotes)
   apiKey.set(providers.environmentVariable("HANGAR_UPLOAD_KEY"))
@@ -29,7 +29,7 @@ hangarPublish.publications.register("plugin") {
     }
     register(Platforms.WATERFALL) {
       jar.set(jar("bungeecord"))
-      platformVersions.addAll("1.19")
+      platformVersions.addAll("1.20")
     }
   }
 }

common/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 
 tasks.jar {
   from(rootProject.file("license.txt")) {
-    rename { "license_${rootProject.name.toLowerCase()}.txt" }
+    rename { "license_${rootProject.name.lowercase()}.txt" }
   }
 }
 
@@ -25,15 +25,14 @@ dependencies {
   compileOnlyApi(libs.guava)
 }
 
-blossom {
-  val file = "src/main/java/xyz/jpenilla/minimotd/common/Constants.java"
-  mapOf(
-    "PLUGIN_NAME" to rootProject.name,
-    "PLUGIN_VERSION" to project.version.toString(),
-    "PLUGIN_WEBSITE" to Constants.GITHUB_URL,
-    "GITHUB_USER" to Constants.GITHUB_USER,
-    "GITHUB_REPO" to Constants.GITHUB_REPO
-  ).forEach { (k, v) ->
-    replaceToken("\${$k}", v, file)
+sourceSets.main {
+  blossom {
+    javaSources {
+      property("PLUGIN_NAME", rootProject.name)
+      property("PLUGIN_VERSION", project.version.toString())
+      property("PLUGIN_WEBSITE", Constants.GITHUB_URL)
+      property("GITHUB_USER", Constants.GITHUB_USER)
+      property("GITHUB_REPO", Constants.GITHUB_REPO)
+    }
   }
 }

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

@@ -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;
   }
 

gradle.properties

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

gradle/libs.versions.yml

@@ -4,37 +4,36 @@ metadata:
     - plugins
 
 plugins:
-  net.kyori.blossom: 1.3.0
-  org.spongepowered.gradle.plugin: 2.1.1
+  net.kyori.blossom: 2.0.1
+  org.spongepowered.gradle.plugin: 2.2.0
   net.minecrell.plugin-yml.bungee: 0.5.3
-  xyz.jpenilla.run-paper: &run-task 2.1.0
+  xyz.jpenilla.run-paper: &run-task 2.2.0
   xyz.jpenilla.run-velocity: *run-task
   xyz.jpenilla.run-waterfall: *run-task
 
 versions:
   minotaur: 2.7.5
-  hangarPublishPlugin: 0.0.5
-  indra: 3.0.1
+  hangarPublishPlugin: 0.1.0
+  indra: 3.1.3
   shadow: 8.1.1
-  testLoggerPlugin: 3.2.0
   adventure: 4.14.0
-  adventurePlatform: 4.3.0
-  adventurePlatformFabric: 5.10.0-SNAPSHOT
+  adventurePlatform: 4.3.1
+  adventurePlatformFabric: 5.10.0
   configurate: 4.1.2
-  checkerQual: 3.35.0
+  checkerQual: 3.38.0
   slf4j: 1.7.32
   gson: 2.8.0
   guava: 21.0
-  bstats: 3.0.0
+  bstats: 3.0.2
   paperApi: 1.16.5-R0.1-SNAPSHOT
   paperlib: 1.0.8-SNAPSHOT
   waterfallApi: 1.16-R0.4-SNAPSHOT
-  fabricApi: 0.83.0+1.20.1
-  fabricLoader: 0.14.19
-  minecraft: 1.20.1
+  fabricApi: 0.89.2+1.20.2
+  fabricLoader: 0.14.22
+  minecraft: 1.20.2
   spongeApi7: 7.2.0
   velocityApi: 3.1.2-SNAPSHOT
-  jupiterEngine: 5.9.2
+  jupiterEngine: 5.10.0
 
 dependencies:
   adventureBom:
@@ -164,16 +163,12 @@ dependencies:
     version: { ref: indra }
   indraLicenser:
     group: net.kyori
-    name: indra-licenser-cadix
+    name: indra-licenser-spotless
     version: { ref: indra }
   shadow:
     group: com.github.johnrengelman
     name: shadow
     version: { ref: shadow }
-  testLogger:
-    group: com.adarshr
-    name: gradle-test-logger-plugin
-    version: { ref: testLoggerPlugin }
   minotaur:
     group: com.modrinth.minotaur
     name: Minotaur

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

platform/bukkit/build.gradle.kts

@@ -40,5 +40,6 @@ tasks {
 runPaper.folia.registerTask()
 
 modrinth {
+  loaders.set(listOf("paper", "folia"))
   gameVersions.addAll(bukkitVersions)
 }

platform/bungeecord/build.gradle.kts

@@ -19,7 +19,7 @@ tasks {
     commonRelocation("org.bstats")
   }
   runWaterfall {
-    waterfallVersion("1.19")
+    waterfallVersion("1.20")
   }
 }
 

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

@@ -40,6 +40,6 @@ abstract class ServerHandshakePacketListenerImplMixin {
 
   @Inject(method = "handleIntention", at = @At("HEAD"))
   public void injectHandleIntention(final ClientIntentionPacket packet, final CallbackInfo ci) {
-    ((ConnectionAccess) this.connection).protocolVersion(packet.getProtocolVersion());
+    ((ConnectionAccess) this.connection).protocolVersion(packet.protocolVersion());
   }
 }

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

@@ -25,6 +25,6 @@
   "depends": {
     "fabricloader": ">=0.14.6",
     "fabric": "*",
-    "minecraft": ">=1.20.1"
+    "minecraft": "~1.20.2"
   }
 }

platform/sponge7/build.gradle.kts

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

platform/sponge8/build.gradle.kts

@@ -1,6 +1,5 @@
 import org.spongepowered.gradle.plugin.config.PluginLoaders
 import org.spongepowered.plugin.metadata.model.PluginDependency
-import java.util.Locale
 
 plugins {
   id("minimotd.shadow-platform")
@@ -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")
@@ -52,6 +51,7 @@ modrinth {
     "1.16.5",
     "1.17.1",
     "1.18.2",
-    "1.19.4"
+    "1.19.4",
+    "1.20.2"
   )
 }

platform/velocity/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
   id("minimotd.shadow-platform")
-  id("net.kyori.blossom")
   id("xyz.jpenilla.run-velocity")
 }
 
@@ -8,7 +7,6 @@ dependencies {
   implementation(projects.minimotdCommon)
   implementation(libs.bstatsVelocity)
   compileOnly(libs.velocityApi)
-  annotationProcessor(libs.velocityApi)
 }
 
 tasks {
@@ -20,16 +18,16 @@ tasks {
   runVelocity {
     velocityVersion(libs.versions.velocityApi.get())
   }
-}
-
-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)
+  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)
+    }
   }
 }
 

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

@@ -36,7 +36,6 @@ import com.velocitypowered.api.command.CommandManager;
 import com.velocitypowered.api.command.CommandSource;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
-import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.util.Favicon;
@@ -47,19 +46,10 @@ import org.bstats.velocity.Metrics;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.slf4j.Logger;
 import xyz.jpenilla.minimotd.common.CommandHandler;
-import xyz.jpenilla.minimotd.common.Constants;
 import xyz.jpenilla.minimotd.common.MiniMOTD;
 import xyz.jpenilla.minimotd.common.MiniMOTDPlatform;
 import xyz.jpenilla.minimotd.common.util.UpdateChecker;
 
-@Plugin(
-  id = "${project.name}",
-  name = Constants.PluginMetadata.NAME,
-  version = Constants.PluginMetadata.VERSION,
-  description = "${description}",
-  url = "${url}",
-  authors = {"jmp"}
-)
 public final class MiniMOTDPlugin implements MiniMOTDPlatform<Favicon> {
   private static final Set<Class<?>> LISTENER_CLASSES = ImmutableSet.of(
     PingListener.class

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

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

settings.gradle.kts

@@ -19,15 +19,14 @@ pluginManagement {
   repositories {
     gradlePluginPortal()
     maven("https://maven.fabricmc.net/")
-    maven("https://maven.quiltmc.org/repository/release/")
     maven("https://repo.jpenilla.xyz/snapshots/")
   }
   includeBuild("build-logic")
 }
 
 plugins {
-  id("ca.stellardrift.polyglot-version-catalogs") version "6.0.1"
-  id("quiet-fabric-loom") version "1.2-SNAPSHOT"
+  id("ca.stellardrift.polyglot-version-catalogs") version "6.1.0"
+  id("quiet-fabric-loom") version "1.3-SNAPSHOT"
 }
 
 rootProject.name = "MiniMOTD"