Follow up to 1ee4de0edf

gradle/libs.versions.toml

@@ -45,8 +45,8 @@ jchronic = "0.2.4a"
 lz4-java = "1.8.0"
 lz4-stream = "1.0.0"
 ## Internal
-minimessage-text = "4.1.0-SNAPSHOT"
-adapter-text = "3.0.6"
+adventure-text-minimessage = "4.1.0-SNAPSHOT"
+text-adapter = "3.0.6"
 text = "3.0.4"
 piston = "0.5.7"
 
@@ -54,6 +54,9 @@ piston = "0.5.7"
 mockito = "3.11.2"
 checker-qual = "3.16.0"
 
+# Gradle plugins
+pluginyml = "0.4.0"
+
 [libraries]
 # Minecraft expectations
 fastutil = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fastutil" }
@@ -109,8 +112,8 @@ lz4JavaStream = { group = "net.jpountz", name = "lz4-java-stream", version.ref =
 
 # Internal
 ## Text
-adventureTextAdapter = { group = "net.kyori", name = "text-adapter-bukkit", version.ref = "adapter-text" }
-adventureMiniMessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "minimessage-text" }
+adventureTextAdapterBukkit = { group = "net.kyori", name = "text-adapter-bukkit", version.ref = "text-adapter" }
+adventureTextMiniMessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure-text-minimessage" }
 adventureTextApi = { group = "net.kyori", name = "text-api", version.ref = "text" }
 adventureTextSerializerGson = { group = "net.kyori", name = "text-serializer-gson", version.ref = "text" }
 adventureTextSerializerLegacy = { group = "net.kyori", name = "text-serializer-legacy", version.ref = "text" }
@@ -126,3 +129,6 @@ pistonRuntime = { group = "org.enginehub.piston.core-ap", name = "runtime", vers
 mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
 checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checker-qual" }
 log4jCore = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
+
+[plugins]
+pluginyml = { id = "net.minecrell.plugin-yml.bukkit", version.ref = "pluginyml" }

worldedit-cli/build.gradle.kts

@@ -2,7 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     `java-library`
-    id("net.minecrell.plugin-yml.bukkit") version "0.4.0"
+
+    alias(libs.plugins.pluginyml)
 }
 
 project.description = "CLI"

worldedit-core/build.gradle.kts

@@ -51,7 +51,7 @@ dependencies {
     implementation(libs.rhino)
     compileOnly(libs.adventure)
     compileOnlyApi(libs.adventureNbt)
-    compileOnlyApi(libs.adventureMiniMessage)
+    compileOnlyApi(libs.adventureTextMiniMessage)
     implementation(libs.zstd)
     api(libs.paster)
     compileOnly(libs.lz4Java) { isTransitive = false }

worldedit-libs/bukkit/build.gradle.kts

@@ -9,5 +9,5 @@ repositories {
 }
 
 dependencies {
-    "shade"(libs.adventureTextAdapter)
+    "shade"(libs.adventureTextAdapterBukkit)
 }