Merge branch 'version/7.4.x'

Author: octylFractal

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

@@ -8,3 +8,10 @@ plugins {
 paperweight {
     reobfArtifactConfiguration = ReobfArtifactConfiguration.MOJANG_PRODUCTION
 }
+
+tasks
+    .withType<JavaCompile>()
+    .matching { it.name == "compileJava" || it.name == "compileTestJava" }
+    .configureEach {
+        options.release.set(25)
+    }

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

@@ -6,8 +6,24 @@ plugins {
 
 paperweight {
     reobfArtifactConfiguration = ReobfArtifactConfiguration.REOBF_PRODUCTION
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
 tasks.named("assemble") {
     dependsOn("reobfJar")
 }
+
+java {
+    // Required when we de-sync release option and declared Java versions.
+    disableAutoTargetJvm()
+}
+
+tasks
+    .withType<JavaCompile>()
+    .matching { it.name == "compileJava" || it.name == "compileTestJava" }
+    .configureEach {
+        // We use Java 21 for most of the pre-existing adapters.
+        options.release.set(21)
+    }

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

@@ -9,19 +9,6 @@ plugins {
     id("io.papermc.paperweight.userdev")
 }
 
-java {
-    // Required when we de-sync release option and declared Java versions.
-    disableAutoTargetJvm()
-}
-
-tasks
-    .withType<JavaCompile>()
-    .matching { it.name == "compileJava" || it.name == "compileTestJava" }
-    .configureEach {
-        // We use Java 21 for most of the pre-existing adapters.
-        options.release.set(21)
-    }
-
 repositories {
     maven {
         name = "Minecraft Libraries"

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

@@ -14,9 +14,8 @@ tasks
     .withType<JavaCompile>()
     .matching { it.name == "compileJava" || it.name == "compileTestJava" }
     .configureEach {
-        // TODO: re-enable this-escape when ANTLR suppresses it properly
         val disabledLint = listOf(
-            "processing", "path", "fallthrough", "serial", "overloads", "this-escape",
+            "processing", "path", "fallthrough", "serial", "overloads",
         )
         options.release.set(25)
         options.compilerArgs.addAll(listOf("-Xlint:all") + disabledLint.map { "-Xlint:-$it" })

build-logic/src/main/kotlin/buildlogic.expose-resources.gradle.kts

@@ -0,0 +1,10 @@
+// "Publish" (only to local projects) a resources variant for other projects to consume
+configurations.consumable("resourcesVariant") {
+    // Similar to mainSourceElements
+    attributes {
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category::class, Category.VERIFICATION))
+        attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling::class, Bundling.EXTERNAL))
+        attribute(VerificationType.VERIFICATION_TYPE_ATTRIBUTE, objects.named(VerificationType::class, "resources"))
+    }
+    outgoing.artifact(tasks.named("processResources"))
+}

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

@@ -28,6 +28,7 @@ tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJ
         include(project(":worldedit-libs:core"))
         include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}"))
         include(project(":worldedit-core"))
+        include(project(":worldedit-core-mc"))
         include(dependency(jchronic))
         linBusDeps.forEach {
             include(dependency(it))

build-logic/src/main/kotlin/buildlogic/GradleExtras.kt

@@ -34,9 +34,5 @@ fun RepositoryHandler.addEngineHubRepository() {
     maven {
         name = "EngineHub (Non-Mirrored)"
         url = URI.create("https://repo.enginehub.org/libs-release/")
-        metadataSources {
-            mavenPom()
-            artifact()
-        }
     }
 }

gradle/libs.versions.toml

@@ -48,7 +48,7 @@ errorprone-core = { module = "com.google.errorprone:error_prone_core", version.r
 errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
 
 # https://maven.fabricmc.net/net/fabricmc/sponge-mixin/
-fabric-mixin = "net.fabricmc:sponge-mixin:0.17.0+mixin.0.8.7"
+fabric-mixin = "net.fabricmc:sponge-mixin:0.17.1+mixin.0.8.7"
 
 paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:2.0.0-beta.21"
 

gradle/shared-scripts/repo-reconfiguration.settings.gradle.kts

@@ -1,16 +1,13 @@
 // This file is responsible for reconfiguring repositories to use EngineHub's mirrors
 // In addition, it configures content filtering to speed up dependency resolution
 
-import org.gradle.api.artifacts.dsl.RepositoryHandler
-import org.gradle.api.artifacts.repositories.UrlArtifactRepository
-import org.gradle.api.logging.Logging
 import java.net.URI
 
 data class RepositoryReconfiguration(
     val newUri: URI,
-    val contentConfiguration: (MavenRepositoryContentDescriptor.() -> Unit)? = null,
+    val contentConfiguration: (MavenArtifactRepository.() -> Unit)? = null,
 ) {
-    constructor(newUri: String, contentConfiguration: (MavenRepositoryContentDescriptor.() -> Unit)? = null) :
+    constructor(newUri: String, contentConfiguration: (MavenArtifactRepository.() -> Unit)? = null) :
             this(URI.create(newUri), contentConfiguration)
 }
 
@@ -30,67 +27,97 @@ object Isolated {
     private val REPO_RECONFIGURATIONS = listOf(
         "https://repo.maven.apache.org/maven2/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/maven-central-proxy/") {
-                    releasesOnly()
+                    mavenContent {
+                        releasesOnly()
+                    }
                 },
         "https://plugins.gradle.org/m2" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/plugin-portal-proxy/") {
-                    releasesOnly()
+                    mavenContent {
+                        releasesOnly()
+                    }
                 },
         "https://libraries.minecraft.net/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/minecraft/") {
-                    releasesOnly()
+                    mavenContent {
+                        releasesOnly()
+                    }
                 },
         "https://maven.neoforged.net/releases/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/neoforged/") {
+                    mavenContent {
                     releasesOnly()
                     includeGroupAndSubgroups("net.minecraftforge")
-                    includeGroupAndSubgroups("net.neoforged")
+                        includeGroupAndSubgroups("net.neoforged")
+                    }
                 },
         "https://maven.minecraftforge.net/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/forge/") {
+                    mavenContent {
                     releasesOnly()
-                    includeGroupAndSubgroups("net.minecraftforge")
+                        includeGroupAndSubgroups("net.minecraftforge")
+                    }
                 },
         "https://maven.parchmentmc.org/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/parchment/") {
+                    mavenContent {
                     releasesOnly()
-                    includeGroup("org.parchmentmc.data")
+                        includeGroup("org.parchmentmc.data")
+                    }
                 },
         "https://repo.papermc.io/repository/maven-public/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/papermc-proxy/") {
+                    mavenContent {
                     includeGroupAndSubgroups("io.papermc")
                     includeGroupAndSubgroups("com.velocitypowered")
                     includeGroupAndSubgroups("ca.spottedleaf")
                     includeGroupAndSubgroups("me.lucko")
-                    includeModule("net.md-5", "bungeecord-chat")
+                        includeModule("net.md-5", "bungeecord-chat")
+                    }
                 },
         "https://maven.fabricmc.net/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/fabricmc/") {
+                    mavenContent {
                     releasesOnly()
                     includeGroupAndSubgroups("fabric-loom")
                     includeGroupAndSubgroups("net.fabricmc")
-                    excludeModule("net.fabricmc", "yarn")
+                        excludeModule("net.fabricmc", "yarn")
+                    }
                 },
         "https://maven.fabricmc.net/#yarn-only" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/fabricmc-yarn/") {
+                    mavenContent {
                     releasesOnly()
-                    includeModule("net.fabricmc", "yarn")
+                        includeModule("net.fabricmc", "yarn")
+                    }
                 },
         "https://repo.spongepowered.org/repository/maven-releases/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/spongepowered-releases/") {
+                    mavenContent {
                     releasesOnly()
-                    includeGroupAndSubgroups("org.spongepowered")
+                        includeGroupAndSubgroups("org.spongepowered")
+                    }
                 },
         "https://repo.spongepowered.org/repository/maven-snapshots/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/internal/spongepowered-snapshots/") {
+                    mavenContent {
                     snapshotsOnly()
-                    includeGroupAndSubgroups("org.spongepowered")
+                        includeGroupAndSubgroups("org.spongepowered")
+                    }
                 },
         "https://repo.enginehub.org/libs-release/" to
                 RepositoryReconfiguration("https://repo.enginehub.org/libs-release/") {
-                    releasesOnly()
-                    includeGroupAndSubgroups("com.sk89q")
-                    includeGroupAndSubgroups("org.enginehub")
+                    mavenContent {
+                        releasesOnly()
+                        includeGroupAndSubgroups("com.sk89q")
+                        includeGroupAndSubgroups("org.enginehub")
+                    }
+
+                    metadataSources {
+                        gradleMetadata()
+                        mavenPom()
+                        artifact()
+                    }
                 },
     ).associate { (k, v) -> URI.create(k) to v }
     private val LOGGER = Logging.getLogger("enginehub-reconfiguring-repositories")
@@ -119,9 +146,7 @@ object Isolated {
                 if (!(repo is MavenArtifactRepository)) {
                     error("Cannot configure content on non-Maven repository: ${repo.name} ${repo.url}")
                 }
-                repo.mavenContent {
-                    reconfiguration.contentConfiguration.invoke(this)
-                }
+                repo.run(reconfiguration.contentConfiguration)
             }
         }
     }

settings.gradle.kts

@@ -35,11 +35,6 @@ dependencyResolutionManagement {
         maven {
             name = "EngineHub (Non-Mirrored)"
             url = URI.create("https://repo.enginehub.org/libs-release/")
-            metadataSources {
-                gradleMetadata()
-                mavenPom()
-                artifact()
-            }
         }
         ivy {
             url = uri("https://repo.enginehub.org/language-files/")
@@ -87,7 +82,7 @@ listOf("1.21.4", "1.21.5", "1.21.6", "1.21.9", "1.21.11", "26.1").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
 
-listOf("bukkit", "core", "fabric", "neoforge", "sponge", "cli").forEach {
+listOf("bukkit", "core", "core-mc", "fabric", "neoforge", "sponge", "cli").forEach {
     include("worldedit-libs:$it")
     include("worldedit-$it")
 }