Draft: Adventure: Introduce WorldEdit to an adventure

build-logic/src/main/kotlin/buildlogic.common.gradle.kts

@@ -49,6 +49,7 @@ license {
     header(rootProject.file("HEADER.txt"))
     include("**/*.java")
     include("**/*.kt")
+    exclude("**/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java")
 }
 
 plugins.withId("idea") {

build-logic/src/main/kotlin/buildlogic.libs.gradle.kts

@@ -25,6 +25,9 @@ configurations {
 group = "${rootProject.group}.worldedit-libs"
 
 val relocations = mapOf(
+    "net.kyori.adventure" to "com.sk89q.worldedit.util.adventure",
+    "net.kyori.examination" to "com.sk89q.worldedit.util.examination",
+    "net.kyori.option" to "com.sk89q.worldedit.util.option",
     "net.kyori.text" to "com.sk89q.worldedit.util.formatting.text",
     "net.kyori.minecraft" to "com.sk89q.worldedit.util.kyori",
 )

gradle/libs.versions.toml

@@ -5,8 +5,11 @@ sponge-spongegradle = "org.spongepowered.gradle.plugin:2.2.0"
 sponge-vanillagradle = { id = "org.spongepowered.gradle.vanilla", version.ref = "sponge-vanillagradle" }
 
 [versions]
+adventureText = "4.21.0-SNAPSHOT"
+adventureBukkit = "4.3.5-SNAPSHOT"
 kyoriText = "3.0.4"
-piston = "0.5.10"
+piston = "0.6.0-SNAPSHOT"
+#piston = "0.5.10"
 autoValue = "1.10.4"
 antlr = "4.13.1"
 
@@ -17,7 +20,7 @@ neoforge-minecraft = "1.21.5"
 
 sponge-minecraft = "1.21.4"
 # https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/spongeapi/
-sponge-api = "14.0.0-20241229.134205-2"
+sponge-api = "14.0.0-20250114.224746-4"
 sponge-api-major = "14"
 
 # https://parchmentmc.org/docs/getting-started; note that we use older MC versions some times which is OK
@@ -107,6 +110,30 @@ fastutil = "it.unimi.dsi:fastutil:8.5.15!!"
 # may not be the same as the ones in the latest Bukkit API.
 snakeyaml = "org.yaml:snakeyaml:2.0"
 
+[libraries.adventureText-api]
+module = "net.kyori:adventure-api"
+version.ref = "adventureText"
+
+[libraries.adventureText-serializer-gson]
+module = "net.kyori:adventure-text-serializer-gson"
+version.ref = "adventureText"
+
+[libraries.adventureText-serializer-legacy]
+module = "net.kyori:adventure-text-serializer-legacy"
+version.ref = "adventureText"
+
+[libraries.adventureText-serializer-plain]
+module = "net.kyori:adventure-text-serializer-plain"
+version.ref = "adventureText"
+
+[libraries.adventureText-serializer-ansi]
+module = "net.kyori:adventure-text-serializer-ansi"
+version.ref = "adventureText"
+
+[libraries.adventureText-adapter-bukkit]
+module = "net.kyori:adventure-platform-bukkit"
+version.ref = "adventureBukkit"
+
 [libraries.kyoriText-api]
 module = "net.kyori:text-api"
 version.ref = "kyoriText"

settings.gradle.kts

@@ -75,7 +75,7 @@ listOf("1.21.3", "1.21.4", "1.21.5").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
 
-listOf("bukkit", "core", "fabric", "neoforge", "sponge", "cli").forEach {
+listOf("bukkit", "core", "fabric", "neoforge", "sponge").forEach {
     include("worldedit-libs:$it")
     include("worldedit-$it")
 }

verification/build.gradle.kts

@@ -28,7 +28,7 @@ tasks.check {
 // Generic setup for all tasks
 // Pull the version before our current version.
 val baseVersion = "(,${rootProject.version.toString().substringBefore("-SNAPSHOT")}["
-for (projectFragment in listOf("bukkit", "cli", "core", "fabric", "neoforge", "sponge")) {
+for (projectFragment in listOf("bukkit", "core", "fabric", "neoforge", "sponge")) {
     val capitalizedFragment =
         projectFragment.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() }
     val proj = project(":worldedit-$projectFragment")

verification/src/changes/accepted-bukkit-public-api-changes.json

@@ -21,5 +21,98 @@
                 "METHOD_REMOVED"
             ]
         }
+    ],
+    "Moved to super class": [
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitBlockCommandSender",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitBlockCommandSender.print(java.lang.String)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitBlockCommandSender",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitBlockCommandSender.print(com.sk89q.worldedit.util.formatting.text.Component)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitBlockCommandSender",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitBlockCommandSender.printDebug(java.lang.String)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitBlockCommandSender",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitBlockCommandSender.printError(java.lang.String)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitBlockRegistry",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitBlockRegistry.getRichName(com.sk89q.worldedit.world.block.BlockType)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitCommandSender",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitCommandSender.print(java.lang.String)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitCommandSender",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitCommandSender.print(com.sk89q.worldedit.util.formatting.text.Component)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitCommandSender",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitCommandSender.printDebug(java.lang.String)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitCommandSender",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitCommandSender.printError(java.lang.String)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitPlayer",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitPlayer.print(java.lang.String)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitPlayer",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitPlayer.print(com.sk89q.worldedit.util.formatting.text.Component)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitPlayer",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitPlayer.printDebug(java.lang.String)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.bukkit.BukkitPlayer",
+            "member": "Method com.sk89q.worldedit.bukkit.BukkitPlayer.printError(java.lang.String)",
+            "changes": [
+                "METHOD_REMOVED"
+            ]
+        }
     ]
 }

verification/src/changes/accepted-core-public-api-changes.json

@@ -64,6 +64,73 @@
             "changes": [
                 "FIELD_REMOVED_IN_SUPERCLASS"
             ]
+        },
+        {
+            "type": "com.sk89q.worldedit.function.operation.Operation",
+            "member": "Method com.sk89q.worldedit.function.operation.Operation.getMessages()",
+            "changes": [
+                "METHOD_NEW_DEFAULT"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.regions.RegionSelector",
+            "member": "Method com.sk89q.worldedit.regions.RegionSelector.getSelectionInformationLines()",
+            "changes": [
+                "METHOD_NEW_DEFAULT"
+            ]
+        }
+    ],
+    "Moved to super class": [
+        {
+            "type": "com.sk89q.worldedit.extension.platform.Actor",
+            "member": "Method com.sk89q.worldedit.extension.platform.Actor.print(java.lang.String)",
+            "changes": [
+                "METHOD_ABSTRACT_NOW_DEFAULT"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.extension.platform.Actor",
+            "member": "Method com.sk89q.worldedit.extension.platform.Actor.printDebug(java.lang.String)",
+            "changes": [
+                "METHOD_ABSTRACT_NOW_DEFAULT"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.extension.platform.Actor",
+            "member": "Method com.sk89q.worldedit.extension.platform.Actor.printError(java.lang.String)",
+            "changes": [
+                "METHOD_ABSTRACT_NOW_DEFAULT"
+            ]
+        }
+    ],
+    "New API": [
+        {
+            "type": "com.sk89q.worldedit.extension.platform.Actor",
+            "member": "Method com.sk89q.worldedit.extension.platform.Actor.printDebug(com.sk89q.worldedit.util.adventure.text.Component)",
+            "changes": [
+                "METHOD_NEW_DEFAULT"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.extension.platform.Actor",
+            "member": "Method com.sk89q.worldedit.extension.platform.Actor.printError(com.sk89q.worldedit.util.adventure.text.Component)",
+            "changes": [
+                "METHOD_NEW_DEFAULT"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.extension.platform.Actor",
+            "member": "Method com.sk89q.worldedit.extension.platform.Actor.printInfo(com.sk89q.worldedit.util.adventure.text.Component)",
+            "changes": [
+                "METHOD_NEW_DEFAULT"
+            ]
+        },
+        {
+            "type": "com.sk89q.worldedit.world.registry.ItemRegistry",
+            "member": "Method com.sk89q.worldedit.world.registry.ItemRegistry.getDisplayName(com.sk89q.worldedit.blocks.BaseItemStack)",
+            "changes": [
+                "METHOD_NEW_DEFAULT"
+            ]
         }
     ]
 }

verification/src/changes/accepted-fabric-public-api-changes.json

@@ -1,2 +1,46 @@
 {
+  "Default implementation in interface added": [
+    {
+      "type": "com.sk89q.worldedit.fabric.FabricBlockCommandSender",
+      "member": "Method com.sk89q.worldedit.fabric.FabricBlockCommandSender.print(com.sk89q.worldedit.util.formatting.text.Component)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.fabric.FabricBlockRegistry",
+      "member": "Method com.sk89q.worldedit.fabric.FabricBlockRegistry.getRichName(com.sk89q.worldedit.world.block.BlockType)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.fabric.FabricCommandSender",
+      "member": "Method com.sk89q.worldedit.fabric.FabricCommandSender.print(com.sk89q.worldedit.util.formatting.text.Component)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.fabric.FabricItemRegistry",
+      "member": "Method com.sk89q.worldedit.fabric.FabricItemRegistry.getRichName(com.sk89q.worldedit.world.item.ItemType)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.fabric.FabricItemRegistry",
+      "member": "Method com.sk89q.worldedit.fabric.FabricItemRegistry.getRichName(com.sk89q.worldedit.blocks.BaseItemStack)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.fabric.FabricPlayer",
+      "member": "Method com.sk89q.worldedit.fabric.FabricPlayer.print(com.sk89q.worldedit.util.formatting.text.Component)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    }
+  ]
 }

verification/src/changes/accepted-neoforge-public-api-changes.json

@@ -1,2 +1,60 @@
 {
+  "Default implementation in interface added": [
+    {
+      "type": "com.sk89q.worldedit.forge.ForgeBlockCommandSender",
+      "member": "Method com.sk89q.worldedit.forge.ForgeBlockCommandSender.print(com.sk89q.worldedit.util.formatting.text.Component)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.forge.ForgeBlockRegistry",
+      "member": "Method com.sk89q.worldedit.forge.ForgeBlockRegistry.getRichName(com.sk89q.worldedit.world.block.BlockType)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.forge.ForgeCommandSender",
+      "member": "Method com.sk89q.worldedit.forge.ForgeCommandSender.print(com.sk89q.worldedit.util.formatting.text.Component)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.forge.ForgeItemRegistry",
+      "member": "Method com.sk89q.worldedit.forge.ForgeItemRegistry.getRichName(com.sk89q.worldedit.world.item.ItemType)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.forge.ForgeItemRegistry",
+      "member": "Method com.sk89q.worldedit.forge.ForgeItemRegistry.getRichName(com.sk89q.worldedit.blocks.BaseItemStack)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.forge.ForgePlayer",
+      "member": "Method com.sk89q.worldedit.forge.ForgePlayer.print(com.sk89q.worldedit.util.formatting.text.Component)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.forge.WorldEditFakePlayer",
+      "member": "Method com.sk89q.worldedit.forge.WorldEditFakePlayer.m_36391_(boolean)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    },
+    {
+      "type": "com.sk89q.worldedit.forge.WorldEditFakePlayer",
+      "member": "Method com.sk89q.worldedit.forge.WorldEditFakePlayer.m_5893_(net.minecraft.world.MenuProvider)",
+      "changes": [
+        "METHOD_REMOVED"
+      ]
+    }
+  ]
 }