[WIP] Update WorldEdit to Sponge 8

buildSrc/build.gradle.kts

@@ -18,7 +18,7 @@ repositories {
     }
     maven {
         name = "sponge"
-        url = uri("https://repo.spongepowered.org/maven")
+        url = uri("https://repo.spongepowered.org/repository/maven-public/")
     }
     maven {
         name = "EngineHub Repository"
@@ -43,6 +43,7 @@ dependencies {
     implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21")
     implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.19.0")
     implementation("org.spongepowered:SpongeGradle:0.11.5")
+    implementation("org.spongepowered:vanillagradle:0.1")
     implementation("net.minecraftforge.gradle:ForgeGradle:4.0.9")
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")

worldedit-core/build.gradle.kts

@@ -29,18 +29,18 @@ configurations {
 }
 
 dependencies {
-    constraints {
-        "implementation"( "org.yaml:snakeyaml") {
-            version { strictly("1.26") }
-            because("Bukkit provides SnakeYaml")
-        }
-    }
+//    constraints {
+//        "implementation"( "org.yaml:snakeyaml") {
+//            version { strictly("1.26") }
+//            because("Bukkit provides SnakeYaml")
+//        }
+//    }
 
     "api"(project(":worldedit-libs:core"))
     "implementation"("de.schlichtherle:truezip:6.8.4")
     "implementation"("net.java.truevfs:truevfs-profile-default_2.13:0.12.1")
     "implementation"("org.mozilla:rhino-runtime:1.7.13")
-    "implementation"("org.yaml:snakeyaml")
+    "implementation"("org.yaml:snakeyaml:1.27")
     "implementation"("com.google.guava:guava")
     "implementation"("com.google.code.findbugs:jsr305:1.3.9")
     "implementation"("com.google.code.gson:gson")

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/Actor.java

@@ -24,6 +24,7 @@
 import com.sk89q.worldedit.util.Identifiable;
 import com.sk89q.worldedit.util.auth.Subject;
 import com.sk89q.worldedit.util.formatting.text.Component;
+import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.format.TextColor;
 
 import java.io.File;
@@ -57,7 +58,9 @@ default String getDisplayName() {
      * @deprecated Use component-based functions (print)
      */
     @Deprecated
-    void printRaw(String msg);
+    default void printRaw(String msg) {
+        print(TextComponent.of(msg));
+    }
 
     /**
      * Print a WorldEdit message.
@@ -66,7 +69,9 @@ default String getDisplayName() {
      * @deprecated Use component-based functions (printDebug)
      */
     @Deprecated
-    void printDebug(String msg);
+    default void printDebug(String msg) {
+        printDebug(TextComponent.of(msg));
+    }
 
     /**
      * Print a WorldEdit message.
@@ -75,7 +80,9 @@ default String getDisplayName() {
      * @deprecated Use component-based functions (printInfo)
      */
     @Deprecated
-    void print(String msg);
+    default void print(String msg) {
+        printInfo(TextComponent.of(msg));
+    }
 
     /**
      * Print a WorldEdit error.
@@ -84,7 +91,9 @@ default String getDisplayName() {
      * @deprecated Use component-based functions (printError)
      */
     @Deprecated
-    void printError(String msg);
+    default void printError(String msg) {
+        printError(TextComponent.of(msg));
+    }
 
     /**
      * Print a WorldEdit error.

worldedit-libs/sponge/build.gradle.kts

@@ -4,6 +4,10 @@ constrainDependenciesToLibsCore()
 repositories {
     maven {
         name = "Sponge"
+        url = uri("https://repo-new.spongepowered.org/maven")
+    }
+    maven {
+        name = "Sponge-Old"
         url = uri("https://repo.spongepowered.org/maven")
     }
 }

worldedit-sponge/build.gradle.kts

@@ -1,7 +1,9 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
+    `java-library`
     id("org.spongepowered.gradle.plugin")
+    id("org.spongepowered.gradle.vanilla")
 }
 
 applyPlatformAndCoreConfiguration()
@@ -15,34 +17,51 @@ convention.getPlugin(JavaPluginConvention::class.java).apply {
 
 repositories {
     maven { url = uri("https://repo.codemc.org/repository/maven-public") }
+    maven { url = uri("https://repo.spongepowered.org/repository/maven-public/") }
 }
 
 dependencies {
-    api(project(":worldedit-core"))
-    api(project(":worldedit-libs:sponge"))
-    api("org.spongepowered:spongeapi:7.1.0")
-    api("org.bstats:bstats-sponge:1.7")
-    testImplementation("org.mockito:mockito-core:1.9.0-rc1")
+    "api"(project(":worldedit-core"))
+    "api"(project(":worldedit-libs:sponge"))
+    "api"("org.spongepowered:spongeapi:8.0.0-SNAPSHOT")
+//    "implementation"("org.bstats:bstats-sponge:1.7")
+    "implementation"("org.apache.logging.log4j:log4j-slf4j-impl:2.11.2")
+    "implementation"("it.unimi.dsi:fastutil:${Versions.FAST_UTIL}")
+    "testImplementation"("org.mockito:mockito-core:1.9.0-rc1")
 }
 
+minecraft {
+    version("1.16.5")
+    injectRepositories(false)
+}
+
+//sponge {
+//    plugin {
+//        id = "worldedit"
+//    }
+//}
+
 addJarManifest(includeClasspath = true)
 
 tasks.named<ShadowJar>("shadowJar") {
     dependencies {
-        relocate ("org.bstats", "com.sk89q.worldedit.sponge.bstats") {
-            include(dependency("org.bstats:bstats-sponge:1.7"))
+        relocate("org.slf4j", "com.sk89q.worldedit.slf4j")
+        relocate("org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge")
+        relocate("org.antlr.v4", "com.sk89q.worldedit.antlr4")
+
+        include(dependency(":worldedit-core"))
+        include(dependency("org.slf4j:slf4j-api"))
+        include(dependency("org.apache.logging.log4j:log4j-slf4j-impl"))
+        include(dependency("org.antlr:antlr4-runtime"))
+//        relocate ("org.bstats", "com.sk89q.worldedit.sponge.bstats") {
+//            include(dependency("org.bstats:bstats-sponge:1.7"))
+//        }
+        relocate("it.unimi.dsi.fastutil", "com.sk89q.worldedit.sponge.fastutil") {
+            include(dependency("it.unimi.dsi:fastutil"))
         }
     }
 }
 
-if (project.hasProperty("signing")) {
-    apply(plugin = "signing")
-
-    configure<SigningExtension> {
-        sign("shadowJar")
-    }
-
-    tasks.named("build").configure {
-        dependsOn("signShadowJar")
-    }
+tasks.named("assemble").configure {
+    dependsOn("shadowJar")
 }

worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/CUIChannelHandler.java

@@ -20,36 +20,35 @@
 package com.sk89q.worldedit.sponge;
 
 import com.sk89q.worldedit.LocalSession;
-import org.spongepowered.api.Platform;
-import org.spongepowered.api.Sponge;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.network.ChannelBinding;
-import org.spongepowered.api.network.ChannelBuf;
-import org.spongepowered.api.network.PlayerConnection;
-import org.spongepowered.api.network.RawDataListener;
-import org.spongepowered.api.network.RemoteConnection;
+import org.spongepowered.api.ResourceKey;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.event.lifecycle.RegisterChannelEvent;
+import org.spongepowered.api.network.EngineConnection;
+import org.spongepowered.api.network.ServerPlayerConnection;
+import org.spongepowered.api.network.channel.ChannelBuf;
+import org.spongepowered.api.network.channel.raw.RawDataChannel;
+import org.spongepowered.api.network.channel.raw.play.RawPlayDataHandler;
 
 import java.nio.charset.StandardCharsets;
 
-public class CUIChannelHandler implements RawDataListener {
-    public static final String CUI_PLUGIN_CHANNEL = "worldedit:cui";
+public class CUIChannelHandler implements RawPlayDataHandler<EngineConnection> {
+    public static final ResourceKey CUI_PLUGIN_CHANNEL = ResourceKey.of("worldedit", "cui");
 
-    private static ChannelBinding.RawDataChannel channel;
+    private static RawDataChannel channel;
 
-    public static void init() {
-        channel = Sponge.getChannelRegistrar().createRawChannel(SpongeWorldEdit.inst(), CUI_PLUGIN_CHANNEL);
-        channel.addListener(Platform.Type.SERVER, new CUIChannelHandler());
+    public static void init(RegisterChannelEvent event) {
+        channel = event.register(CUI_PLUGIN_CHANNEL, RawDataChannel.class);
+        channel.play().addHandler(new CUIChannelHandler());
     }
 
-
-    public static ChannelBinding.RawDataChannel getActiveChannel() {
+    public static RawDataChannel getActiveChannel() {
         return channel;
     }
 
     @Override
-    public void handlePayload(ChannelBuf data, RemoteConnection connection, Platform.Type side) {
-        if (connection instanceof PlayerConnection) {
-            Player player = ((PlayerConnection) connection).getPlayer();
+    public void handlePayload(ChannelBuf data, EngineConnection connection) {
+        if (connection instanceof ServerPlayerConnection) {
+            ServerPlayer player = ((ServerPlayerConnection) connection).getPlayer();
 
             LocalSession session = SpongeWorldEdit.inst().getSession(player);
 

worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/CommandAdapter.java

@@ -19,52 +19,64 @@
 
 package com.sk89q.worldedit.sponge;
 
+import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.util.PermissionCondition;
+import com.sk89q.worldedit.util.formatting.WorldEditText;
+import net.kyori.adventure.text.Component;
 import org.enginehub.piston.Command;
-import org.spongepowered.api.command.CommandCallable;
-import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.text.Text;
+import org.spongepowered.api.command.CommandCause;
+import org.spongepowered.api.entity.living.player.Player;
 
 import java.util.Collections;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
 
 import static com.sk89q.worldedit.sponge.SpongeTextAdapter.convert;
 
-public abstract class CommandAdapter implements CommandCallable {
+public abstract class CommandAdapter implements org.spongepowered.api.command.Command.Raw {
     private final Command command;
 
     protected CommandAdapter(Command command) {
         this.command = command;
     }
 
     @Override
-    public boolean testPermission(CommandSource source) {
+    public boolean canExecute(CommandCause source) {
         Set<String> permissions = command.getCondition().as(PermissionCondition.class)
             .map(PermissionCondition::getPermissions)
             .orElseGet(Collections::emptySet);
         for (String perm : permissions) {
-            if (source.hasPermission(perm)) {
+            if (source.getSubject().hasPermission(perm)) {
                 return true;
             }
         }
         return false;
     }
 
     @Override
-    public Optional<Text> getShortDescription(CommandSource source) {
+    public Optional<Component> getShortDescription(CommandCause source) {
+        Locale locale = source.getAudience() instanceof Player
+            ? ((Player) source.getAudience()).getLocale()
+            : WorldEdit.getInstance().getConfiguration().defaultLocale;
         return Optional.of(command.getDescription())
-            .map(desc -> SpongeTextAdapter.convert(desc, source.getLocale()));
+            .map(desc -> SpongeTextAdapter.convert(WorldEditText.format(desc, locale)));
     }
 
     @Override
-    public Optional<Text> getHelp(CommandSource source) {
+    public Optional<Component> getHelp(CommandCause source) {
+        Locale locale = source.getAudience() instanceof Player
+            ? ((Player) source.getAudience()).getLocale()
+            : WorldEdit.getInstance().getConfiguration().defaultLocale;
         return Optional.of(command.getFullHelp())
-            .map(help -> SpongeTextAdapter.convert(help, source.getLocale()));
+            .map(help -> SpongeTextAdapter.convert(WorldEditText.format(help, locale)));
     }
 
     @Override
-    public Text getUsage(CommandSource source) {
-        return convert(command.getUsage(), source.getLocale());
+    public Component getUsage(CommandCause source) {
+        Locale locale = source.getAudience() instanceof Player
+            ? ((Player) source.getAudience()).getLocale()
+            : WorldEdit.getInstance().getConfiguration().defaultLocale;
+        return convert(WorldEditText.format(command.getUsage(), locale));
     }
 }