Merge branch 'version/7.3.x'

me4502 · me4502 · commit 2b54302bb098 · 2025-04-03T20:55:54.000+10:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -1,5 +1,5 @@
 name: Gradle Build
-on: [push, pull_request]
+on: [push, pull_request, merge_group]
 
 jobs:
   build:
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,14 @@
+7.3.11
+- Added //mirror as an alias for //flip
+- Fixed an issue where tree generation can get incorrect world state, impacting generation
+- Fixed masks for biome operations only applying to //setbiome
+- Fixed some bugs in the snapshot system
+- Fixed CUI packets being sent to clients unnecessarily
+- Fixed cone generation with negative heights
+- Fixed world height off-by-one discrepancy since change in Minecraft 1.21.3
+- Fixed cases where the task executor would not be shut down correctly
+- [NeoForge] Fixed legacy blocks failing to load in some instances
+
 7.3.10
 - Added support for 1.21.4
 - Improved a few translation lines relating to URLs and newlines
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -48,7 +48,7 @@ jfrog-buildinfo = "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"
 # https://maven.fabricmc.net/net/fabricmc/sponge-mixin/
 fabric-mixin = "net.fabricmc:sponge-mixin:0.15.3+mixin.0.8.7"
 
-paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.7.5"
+paperweight = "io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:2.0.0-beta.16"
 
 linBus-bom = "org.enginehub.lin-bus:lin-bus-bom:0.2.0"
 linBus-common.module = "org.enginehub.lin-bus:lin-bus-common"
@@ -75,7 +75,8 @@ mockito-junit-jupiter.module = "org.mockito:mockito-junit-jupiter"
 
 commonsCli = "commons-cli:commons-cli:1.4"
 
-paperApi = "io.papermc.paper:paper-api:1.21.4-R0.1-20250118.134032-116"
+# https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/paper-api/
+paperApi = "io.papermc.paper:paper-api:1.21.4-R0.1-20250327.133756-218"
 paperLib = "io.papermc:paperlib:1.0.8"
 
 dummypermscompat = "com.sk89q:dummypermscompat:1.10"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
 }
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-    id("fabric-loom") version "1.8.10"
+    id("fabric-loom") version "1.10.1"
 }
 dependencyResolutionManagement {
     repositories {
diff --git a/worldedit-bukkit/adapters/adapter-1.21.3/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1.21.3/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.3-R0.1-20241025.163321-1")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.3-R0.1-20250328.155925-87")
 }
diff --git a/worldedit-bukkit/adapters/adapter-1.21.4/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1.21.4/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.4-R0.1-20241205.222346-7")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.4-R0.1-20250327.133756-218")
 }
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java
@@ -102,7 +102,7 @@ public boolean isBurnable() {
             return material.isBurnable();
         }
 
-        @SuppressWarnings("deprecation")
+        @SuppressWarnings("removal")
         @Override
         public boolean isTranslucent() {
             return super.isTranslucent() || material.isTransparent();
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/QueryTool.java
@@ -30,6 +30,7 @@
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
+import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
 import com.sk89q.worldedit.util.formatting.text.event.HoverEvent;
 import com.sk89q.worldedit.util.formatting.text.format.TextColor;
 import com.sk89q.worldedit.world.World;
@@ -58,8 +59,13 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla
         TextComponent.Builder builder = TextComponent.builder();
         builder.append(TextComponent.of("@" + clicked.toVector().toBlockPoint() + ": ", TextColor.BLUE));
         builder.append(block.getBlockType().getRichName().color(TextColor.YELLOW));
-        builder.append(TextComponent.of(" (" + block + ") ", TextColor.GRAY)
-            .hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TranslatableComponent.of("worldedit.tool.info.blockstate.hover"))));
+
+        String blockStateString = block.toString();
+        TextComponent blockStateComponent = TextComponent.of(" (" + blockStateString + ") ", TextColor.GRAY)
+            .hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TranslatableComponent.of("worldedit.tool.info.blockstate.hover")))
+            .clickEvent(ClickEvent.of(ClickEvent.Action.COPY_TO_CLIPBOARD, blockStateString));
+        builder.append(blockStateComponent);
+
         final int internalId = BlockStateIdAccess.getBlockStateId(block.toImmutableState());
         if (BlockStateIdAccess.isValidInternalId(internalId)) {
             builder.append(TextComponent.of(" (" + internalId + ") ", TextColor.DARK_GRAY)
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/BlockArrayClipboard.java
@@ -40,15 +40,25 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * Stores block data as a multi-dimensional array of {@link BaseBlock}s and
+ * Stores block data as an array of {@link BaseBlock}s and
  * other data as lists or maps.
  */
 public class BlockArrayClipboard implements Clipboard {
 
     private final Region region;
     private BlockVector3 origin;
-    private final BaseBlock[][][] blocks;
-    private BiomeType[][][] biomes = null;
+    /**
+     * Stride for y-index, for faster access to blocks/biomes array.
+     */
+    private final int yStride;
+    /**
+     * Stride for z-index, for faster access to blocks/biomes array.
+     */
+    private final int zStride;
+    // Laid out in x-y-z order, as that's how we currently loop over positions.
+    private final BaseBlock[] blocks;
+    // Laid out in x-y-z order, as that's how we currently loop over positions.
+    private BiomeType[] biomes = null;
     private final List<ClipboardEntity> entities = new ArrayList<>();
 
     /**
@@ -64,7 +74,13 @@ public BlockArrayClipboard(Region region) {
         this.origin = region.getMinimumPoint();
 
         BlockVector3 dimensions = getDimensions();
-        blocks = new BaseBlock[dimensions.x()][dimensions.y()][dimensions.z()];
+        blocks = new BaseBlock[dimensions.x() * dimensions.y() * dimensions.z()];
+        yStride = dimensions.x();
+        zStride = yStride * dimensions.y();
+    }
+
+    private int indexBlockVecBasedArray(BlockVector3 v) {
+        return v.x() + (v.y() * yStride) + (v.z() * zStride);
     }
 
     @Override
@@ -125,7 +141,7 @@ public Entity createEntity(Location location, BaseEntity entity) {
     public BlockState getBlock(BlockVector3 position) {
         if (region.contains(position)) {
             BlockVector3 v = position.subtract(region.getMinimumPoint());
-            BaseBlock block = blocks[v.x()][v.y()][v.z()];
+            BaseBlock block = blocks[indexBlockVecBasedArray(v)];
             if (block != null) {
                 return block.toImmutableState();
             }
@@ -138,7 +154,7 @@ public BlockState getBlock(BlockVector3 position) {
     public BaseBlock getFullBlock(BlockVector3 position) {
         if (region.contains(position)) {
             BlockVector3 v = position.subtract(region.getMinimumPoint());
-            BaseBlock block = blocks[v.x()][v.y()][v.z()];
+            BaseBlock block = blocks[indexBlockVecBasedArray(v)];
             if (block != null) {
                 return block;
             }
@@ -151,7 +167,7 @@ public BaseBlock getFullBlock(BlockVector3 position) {
     public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position, B block) {
         if (region.contains(position)) {
             BlockVector3 v = position.subtract(region.getMinimumPoint());
-            blocks[v.x()][v.y()][v.z()] = block.toBaseBlock();
+            blocks[indexBlockVecBasedArray(v)] = block.toBaseBlock();
             return true;
         } else {
             return false;
@@ -168,7 +184,7 @@ public BiomeType getBiome(BlockVector3 position) {
         if (biomes != null
                 && position.containedWithin(getMinimumPoint(), getMaximumPoint())) {
             BlockVector3 v = position.subtract(region.getMinimumPoint());
-            BiomeType biomeType = biomes[v.x()][v.y()][v.z()];
+            BiomeType biomeType = biomes[indexBlockVecBasedArray(v)];
             if (biomeType != null) {
                 return biomeType;
             }
@@ -182,9 +198,10 @@ public boolean setBiome(BlockVector3 position, BiomeType biome) {
         if (position.containedWithin(getMinimumPoint(), getMaximumPoint())) {
             BlockVector3 v = position.subtract(region.getMinimumPoint());
             if (biomes == null) {
-                biomes = new BiomeType[region.getWidth()][region.getHeight()][region.getLength()];
+                BlockVector3 dimensions = getDimensions();
+                biomes = new BiomeType[dimensions.x() * dimensions.y() * dimensions.z()];
             }
-            biomes[v.x()][v.y()][v.z()] = biome;
+            biomes[indexBlockVecBasedArray(v)] = biome;
             return true;
         }
         return false;
diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json
@@ -313,7 +313,7 @@
     "worldedit.tool.tree.equip": "Tree tool bound to {0}.",
     "worldedit.tool.tree.obstructed": "A tree can't go there.",
     "worldedit.tool.info.equip": "Info tool bound to {0}.",
-    "worldedit.tool.info.blockstate.hover": "Block state",
+    "worldedit.tool.info.blockstate.hover": "Block state (click to copy)",
     "worldedit.tool.info.internalid.hover": "Internal ID",
     "worldedit.tool.info.legacy.hover": "Legacy id:data",
     "worldedit.tool.info.light.hover": "Block Light/Light Above",
diff --git a/worldedit-fabric/build.gradle.kts b/worldedit-fabric/build.gradle.kts
@@ -1,6 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import net.fabricmc.loom.api.LoomGradleExtensionAPI
-import net.fabricmc.loom.configuration.FabricApiExtension
 import net.fabricmc.loom.task.RemapJarTask
 import net.fabricmc.loom.task.RunGameTask
 
@@ -52,7 +50,7 @@ dependencies {
         .toSet()
     // [2] Request the matching dependency from fabric-loom
     for (wantedDependency in wantedDependencies) {
-        val dep = project.the<FabricApiExtension>().module(wantedDependency, libs.versions.fabric.api.get())
+        val dep = fabricApi.module(wantedDependency, libs.versions.fabric.api.get())
         "include"(dep)
         "modImplementation"(dep)
     }
diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricDataFixer.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricDataFixer.java
@@ -595,7 +595,7 @@ private static void convertItems(net.minecraft.nbt.CompoundTag nbttagcompound, S
             ListTag nbttaglist = nbttagcompound.getList(key, 10);
 
             for (int j = 0; j < nbttaglist.size(); ++j) {
-                nbttaglist.add(j, convert(LegacyType.ITEM_INSTANCE, nbttaglist.getCompound(j), sourceVer, targetVer));
+                nbttaglist.set(j, convert(LegacyType.ITEM_INSTANCE, nbttaglist.getCompound(j), sourceVer, targetVer));
             }
         }
 
diff --git a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeDataFixer.java b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeDataFixer.java
@@ -595,7 +595,7 @@ private static void convertItems(net.minecraft.nbt.CompoundTag nbttagcompound, S
             ListTag nbttaglist = nbttagcompound.getList(key, 10);
 
             for (int j = 0; j < nbttaglist.size(); ++j) {
-                nbttaglist.add(j, convert(LegacyType.ITEM_INSTANCE, nbttaglist.getCompound(j), sourceVer, targetVer));
+                nbttaglist.set(j, convert(LegacyType.ITEM_INSTANCE, nbttaglist.getCompound(j), sourceVer, targetVer));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ pluginManagement {`
`9`	`9`	`}`
`10`	`10`	`plugins {`
`11`	`11`	`id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"`
`12`		`- id("fabric-loom") version "1.8.10"`
	`12`	`+ id("fabric-loom") version "1.10.1"`
`13`	`13`	`}`
`14`	`14`	`dependencyResolutionManagement {`
`15`	`15`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ plugins {`
`6`	`6`
`7`	`7`	`dependencies {`
`8`	`8`	`// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/`
`9`		`- the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.3-R0.1-20241025.163321-1")`
	`9`	`+ the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.3-R0.1-20250328.155925-87")`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public boolean isBurnable() {`
`102`	`102`	`return material.isBurnable();`
`103`	`103`	`}`
`104`	`104`
`105`		`- @SuppressWarnings("deprecation")`
	`105`	`+ @SuppressWarnings("removal")`
`106`	`106`	`@Override`
`107`	`107`	`public boolean isTranslucent() {`
`108`	`108`	`return super.isTranslucent() \|\| material.isTransparent();`