Merge branch 'version/7.3.x'

CHANGELOG.txt

@@ -1,3 +1,9 @@
+7.3.5
+- [Bukkit] Utilise new Bukkit registry API, allowing WorldEdit to work with Commodore disabled (`paper.disableOldApiSupport` flag on Paper)
+- Fix queryRel not behaving correctly in //deform and the deform brush
+- Shutdown the executor service on disable, to prevent waiting on async tasks before shutting down
+- Remove legacy code for pre-1.16 //drawsel handling
+
 7.3.4
 - Added support for 1.21
 - Fixed an issue where //drawsel can prevent using //world overrides in some situation

build-logic/build.gradle.kts

@@ -8,10 +8,6 @@ repositories {
         name = "EngineHub Repository"
         url = uri("https://maven.enginehub.org/repo/")
     }
-    maven {
-        name = "SpongePowered"
-        url = uri("https://repo.spongepowered.org/repository/maven-public/")
-    }
 }
 
 dependencies {

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

@@ -12,6 +12,21 @@ configure<buildlogic.CommonJavaExtension> {
     banSlf4j = false
 }
 
+paperweight {
+    injectPaperRepository = false
+}
+
+repositories {
+    maven {
+        name = "EngineHub"
+        url = uri("https://maven.enginehub.org/repo/")
+    }
+    mavenCentral()
+    afterEvaluate {
+        killNonEngineHubRepositories()
+    }
+}
+
 dependencies {
     "implementation"(project(":worldedit-bukkit"))
     constraints {

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

@@ -9,14 +9,6 @@ plugins {
 group = rootProject.group
 version = rootProject.version
 
-repositories {
-    mavenCentral()
-    maven {
-        name = "EngineHub"
-        url = uri("https://maven.enginehub.org/repo/")
-    }
-}
-
 configurations.all {
     resolutionStrategy {
         cacheChangingModulesFor(1, TimeUnit.DAYS)

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

@@ -0,0 +1,37 @@
+import org.gradle.api.artifacts.dsl.RepositoryHandler
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository
+import org.gradle.api.logging.Logging
+
+// The primary point of this is repository up-time. We replace most other repositories with EngineHub's repository.
+// This is because we have stronger up-time guarantees for our repository. However, Maven Central and Sonatype are
+// clearly even better, so we allow those as well. We also allow Gradle's plugin repository.
+private val ALLOWED_PREFIXES = listOf(
+    "https://maven.enginehub.org",
+    "https://repo.maven.apache.org/maven2/",
+    "https://s01.oss.sonatype.org/content/repositories/snapshots/",
+    "https://plugins.gradle.org",
+    "file:"
+)
+private val LOGGER = Logging.getLogger("repositoriesHelper")
+
+fun RepositoryHandler.killNonEngineHubRepositories() {
+    val toRemove = mutableListOf<MavenArtifactRepository>()
+    for (repo in this) {
+        if (repo is MavenArtifactRepository && !ALLOWED_PREFIXES.any { repo.url.toString().startsWith(it) }) {
+            LOGGER.info("Removing non-EngineHub repository: {}", repo.url)
+            toRemove.add(repo)
+        }
+    }
+    toRemove.forEach { remove(it) }
+}
+
+fun RepositoryHandler.verifyEngineHubRepositories() {
+    for (repo in this) {
+        if (repo is MavenArtifactRepository) {
+            val urlString = repo.url.toString()
+            check(ALLOWED_PREFIXES.any { urlString.startsWith(it) }) {
+                "Only EngineHub/Central repositories are allowed: ${repo.url} found"
+            }
+        }
+    }
+}

gradle.properties

@@ -3,3 +3,6 @@ version=7.4.0-SNAPSHOT
 
 org.gradle.jvmargs=-Xmx1500M
 org.gradle.parallel=true
+
+loom_fabric_repository=https://maven.enginehub.org/artifactory/fabricmc/
+loom_libraries_base=https://maven.enginehub.org/artifactory/minecraft/

gradle/libs.versions.toml

@@ -47,7 +47,7 @@ jfrog-buildinfo = "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"
 
 fabric-mixin = "net.fabricmc:sponge-mixin:0.13.3+mixin.0.8.5"
 
-paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.7.1"
+paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.7.2"
 
 linBus-bom = "org.enginehub.lin-bus:lin-bus-bom:0.1.0"
 linBus-common.module = "org.enginehub.lin-bus:lin-bus-common"

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

settings.gradle.kts

@@ -5,14 +5,50 @@ pluginManagement {
             name = "EngineHub"
             url = uri("https://maven.enginehub.org/repo/")
         }
-        maven {
-            name = "SpongePowered"
-            url = uri("https://repo.spongepowered.org/repository/maven-public/")
-        }
     }
 }
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("fabric-loom") version "1.6.12"
+}
+dependencyResolutionManagement {
+    repositories {
+        maven {
+            name = "EngineHub"
+            url = uri("https://maven.enginehub.org/repo/")
+        }
+        ivy {
+            url = uri("https://repo.enginehub.org/language-files/")
+            name = "EngineHub Language Files"
+            patternLayout {
+                artifact("[organisation]/[module]/[revision]/[artifact]-[revision](+[classifier])(.[ext])")
+                setM2compatible(true)
+            }
+            metadataSources {
+                artifact()
+            }
+            content {
+                includeModuleByRegex(".*", "worldedit-lang")
+            }
+        }
+        gradle.settingsEvaluated {
+            // Duplicates repositoriesHelper.kt, since we can't import it
+            val allowedPrefixes = listOf(
+                "https://maven.enginehub.org",
+                "https://repo.maven.apache.org/maven2/",
+                "file:"
+            )
+
+            for (repo in this@repositories) {
+                if (repo is MavenArtifactRepository) {
+                    val urlString = repo.url.toString()
+                    check(allowedPrefixes.any { urlString.startsWith(it) }) {
+                        "Only EngineHub/Central repositories are allowed: ${repo.url} found"
+                    }
+                }
+            }
+        }
+    }
 }
 
 logger.lifecycle("""

verification/build.gradle.kts

@@ -11,21 +11,6 @@ plugins {
     id("me.champeau.gradle.japicmp")
 }
 
-repositories {
-    maven {
-        name = "EngineHub Repository (Releases Only)"
-        url = uri("https://maven.enginehub.org/artifactory/libs-release-local/")
-    }
-    maven {
-        name = "EngineHub Repository (Snapshots Only)"
-        url = uri("https://maven.enginehub.org/artifactory/libs-snapshot-local/")
-        content {
-            excludeGroup("com.sk89q.worldedit")
-        }
-    }
-    mavenCentral()
-}
-
 val resetAcceptedApiChangesFiles by tasks.registering {
     group = "API Compatibility"
     description = "Resets ALL the accepted API changes files"

worldedit-bukkit/adapters/adapter-1.21/build.gradle.kts

@@ -6,5 +6,5 @@ plugins {
 
 dependencies {
     // https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21-R0.1-20240618.005323-5")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21-R0.1-20240807.125219-129")
 }

worldedit-bukkit/adapters/adapter-1.21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21/PaperweightAdapter.java

@@ -217,8 +217,8 @@ public PaperweightAdapter() throws NoSuchFieldException, NoSuchMethodException {
         CraftServer.class.cast(Bukkit.getServer());
 
         int dataVersion = CraftMagicNumbers.INSTANCE.getDataVersion();
-        if (dataVersion != 3953) {
-            throw new UnsupportedClassVersionError("Not 1.21!");
+        if (dataVersion != 3953 && dataVersion != 3955) {
+            throw new UnsupportedClassVersionError("Not 1.21(.1)!");
         }
 
         serverWorldsField = CraftServer.class.getDeclaredField("worlds");

worldedit-bukkit/build.gradle.kts

@@ -11,13 +11,6 @@ platform {
     includeClasspath = true
 }
 
-repositories {
-    maven {
-        name = "Spigot"
-        url = uri("https://hub.spigotmc.org/nexus/content/groups/public")
-    }
-}
-
 val localImplementation = configurations.create("localImplementation") {
     description = "Dependencies used locally, but provided by the runtime Bukkit implementation"
     isCanBeConsumed = false

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java

@@ -82,6 +82,7 @@ private BukkitAdapter() {
 
     static {
         TO_BLOCK_CONTEXT.setRestricted(false);
+        TO_BLOCK_CONTEXT.setTryLegacy(false);
     }
 
     /**
@@ -334,7 +335,8 @@ public static Entity adapt(org.bukkit.entity.Entity entity) {
      */
     public static Material adapt(ItemType itemType) {
         checkNotNull(itemType);
-        return Material.matchMaterial(itemType.id());
+        NamespacedKey key = checkNotNull(NamespacedKey.fromString(itemType.id()), "Item type key is invalid");
+        return Registry.MATERIAL.get(key);
     }
 
     /**
@@ -345,7 +347,8 @@ public static Material adapt(ItemType itemType) {
      */
     public static Material adapt(BlockType blockType) {
         checkNotNull(blockType);
-        return Material.matchMaterial(blockType.id());
+        NamespacedKey key = checkNotNull(NamespacedKey.fromString(blockType.id()), "Block type key is invalid");
+        return Registry.MATERIAL.get(key);
     }
 
     /**

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -216,8 +216,9 @@ private void initializeRegistries() {
         });
         // Block & Item
         Registry.MATERIAL.forEach(material -> {
+            String key = material.getKey().toString();
             if (material.isBlock()) {
-                BlockType.REGISTRY.register(material.getKey().toString(), new BlockType(material.getKey().toString(), blockState -> {
+                BlockType.REGISTRY.register(key, new BlockType(key, blockState -> {
                     // TODO Use something way less hacky than this.
                     ParserContext context = new ParserContext();
                     context.setPreferringWildcard(true);
@@ -234,13 +235,13 @@ private void initializeRegistries() {
                         }
                         return defaultState;
                     } catch (InputParseException e) {
-                        getLogger().log(Level.WARNING, "Error loading block state for " + material.getKey(), e);
+                        getLogger().log(Level.WARNING, "Error loading block state for " + key, e);
                         return blockState;
                     }
                 }));
             }
             if (material.isItem()) {
-                ItemType.REGISTRY.register(material.getKey().toString(), new ItemType(material.getKey().toString()));
+                ItemType.REGISTRY.register(key, new ItemType(key));
             }
         });
         // Entity
@@ -262,10 +263,12 @@ private void initializeRegistries() {
     private void setupTags() {
         // Tags
         for (Tag<Material> blockTag : Bukkit.getTags(Tag.REGISTRY_BLOCKS, Material.class)) {
-            BlockCategory.REGISTRY.register(blockTag.getKey().toString(), new BlockCategory(blockTag.getKey().toString()));
+            String key = blockTag.getKey().toString();
+            BlockCategory.REGISTRY.register(key, new BlockCategory(key));
         }
         for (Tag<Material> itemTag : Bukkit.getTags(Tag.REGISTRY_ITEMS, Material.class)) {
-            ItemCategory.REGISTRY.register(itemTag.getKey().toString(), new ItemCategory(itemTag.getKey().toString()));
+            String key = itemTag.getKey().toString();
+            ItemCategory.REGISTRY.register(key, new ItemCategory(key));
         }
     }
 
@@ -324,7 +327,6 @@ public void onDisable() {
             config.unload();
         }
         this.getServer().getScheduler().cancelTasks(this);
-        worldEdit.getExecutorService().shutdown();
     }
 
     /**

worldedit-cli/src/main/java/com/sk89q/worldedit/cli/CLIWorldEdit.java

@@ -213,7 +213,6 @@ public void onStopped() {
         WorldEdit worldEdit = WorldEdit.getInstance();
         worldEdit.getSessionManager().unload();
         worldEdit.getPlatformManager().unregister(platform);
-        WorldEdit.getInstance().getExecutorService().shutdown();
     }
 
     public FileRegistries getFileRegistries() {

worldedit-core/build.gradle.kts

@@ -7,20 +7,6 @@ plugins {
     id("buildlogic.core-and-platform")
 }
 
-repositories {
-    ivy {
-        url = uri("https://repo.enginehub.org/language-files/")
-        name = "EngineHub Language Files"
-        patternLayout {
-            artifact("[organisation]/[module]/[revision]/[artifact]-[revision](+[classifier])(.[ext])")
-            setM2compatible(true)
-        }
-        metadataSources {
-            artifact()
-        }
-    }
-}
-
 configurations {
     register("languageFiles")
 }