Merge branch 'version/7.3.x'

CHANGELOG.txt

@@ -1,3 +1,9 @@
+7.3.1
+- Added support for 1.20.5/1.20.6
+- Improved warnings when run on unsupported platforms
+- Removed some old data that was inflating the jar size
+- Disable chunk batching by default. We don't feel it makes sense in modern MC outside of potentially niche situations
+
 7.3.0
 - Added an `//update [sideEffect]` command to apply side effects to a selection
 - Added a schematic sharing system and corresponding API, with `/schem share`

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

@@ -10,6 +10,7 @@ group = rootProject.group
 version = rootProject.version
 
 repositories {
+ mavenCentral()
  maven {
  name = "EngineHub"
  url = uri("https://maven.enginehub.org/repo/")

gradle/libs.versions.toml

@@ -34,7 +34,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.6.0"
+paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.7.1"
 
 linBus-bom = "org.enginehub.lin-bus:lin-bus-bom:0.1.0-SNAPSHOT"
 linBus-common.module = "org.enginehub.lin-bus:lin-bus-common"
@@ -59,9 +59,9 @@ mockito-junit-jupiter.module = "org.mockito:mockito-junit-jupiter"
 
 commonsCli = "commons-cli:commons-cli:1.4"
 
-spigot = "org.spigotmc:spigot-api:1.20.1-R0.1-20230921.163938-66"
-paperApi = "io.papermc.paper:paper-api:1.20.1-R0.1-20230921.165944-178"
-paperLib = "io.papermc:paperlib:1.0.7"
+spigot = "org.spigotmc:spigot-api:1.20.2-R0.1-20231205.164257-71"
+paperApi = "io.papermc.paper:paper-api:1.20.2-R0.1-20231203.034718-122"
+paperLib = "io.papermc:paperlib:1.0.8"
 
 dummypermscompat = "com.sk89q:dummypermscompat:1.10"
 bstats-bukkit = "org.bstats:bstats-bukkit:2.2.1"
@@ -73,7 +73,7 @@ jlibnoise = "com.sk89q.lib:jlibnoise:1.0.0"
 
 fabric-minecraft = "com.mojang:minecraft:1.20.6"
 fabric-loader = "net.fabricmc:fabric-loader:0.15.10"
-fabric-permissions-api = "me.lucko:fabric-permissions-api:0.1-SNAPSHOT"
+fabric-permissions-api = "me.lucko:fabric-permissions-api:0.3.1"
 
 neoforge = "net.neoforged:neoforge:20.6.42-beta"
 

settings.gradle.kts

@@ -31,7 +31,7 @@ includeBuild("build-logic")
 
 include("worldedit-libs")
 
-listOf("1.19.4", "1.20", "1.20.2", "1.20.4", "1.20.5").forEach {
+listOf("1.20.2", "1.20.4", "1.20.5").forEach {
  include("worldedit-bukkit:adapters:adapter-$it")
 }
 

verification/build.gradle.kts

@@ -54,6 +54,7 @@ for (projectFragment in listOf("bukkit", "cli", "core", "fabric", "neoforge")) {
  val resetChangeFileTask = tasks.register("reset${capitalizedFragment}AcceptedApiChangesFile") {
  group = "API Compatibility"
  description = "Reset the accepted API changes file for $projectFragment"
+ outputs.file(changeFile)
 
  doFirst {
  Files.newBufferedWriter(changeFile, StandardCharsets.UTF_8).use {
@@ -90,6 +91,7 @@ for (projectFragment in listOf("bukkit", "cli", "core", "fabric", "neoforge")) {
  val checkApi = tasks.register<JapicmpTask>("check${capitalizedFragment}ApiCompatibility") {
  group = "API Compatibility"
  description = "Check API compatibility for $capitalizedFragment API"
+ inputs.file(changeFile)
  richReport {
  addSetupRule(
  AcceptingSetupRule::class.java, AcceptingSetupRule.createParams(

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

@@ -1,11 +1,2 @@
 {
- "Incorrect removal detection due to problems with classpath": [
- {
- "type": "com.sk89q.worldedit.fabric.FabricWorld",
- "member": "Method com.sk89q.worldedit.fabric.FabricWorld.getId()",
- "changes": [
- "METHOD_REMOVED"
- ]
- }
- ]
-}
+}

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

@@ -0,0 +1,2 @@
+{
+}