Merge remote-tracking branch 'origin/version/7.2.x' into chore/merging-to-master

.github/workflows/gradle.yml

@@ -19,7 +19,7 @@ jobs:
         cache: 'gradle'
         distribution: 'temurin'
     - name: Build with Gradle
-      run: ./gradlew build -s --no-daemon
+      run: ./gradlew build -s
     - uses: actions/upload-artifact@v2.2.4
       name: Archive Reports
       if: always()

buildSrc/build.gradle.kts

@@ -55,5 +55,5 @@
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")
     implementation("org.enginehub.gradle:gradle-codecov-plugin:0.1.0")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.0")
+    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.3")
 }

buildSrc/src/main/kotlin/Versions.kt

@@ -10,6 +10,7 @@
     const val FAST_UTIL = "8.5.6"
     const val GUAVA = "31.0.1-jre"
     const val GSON = "2.8.8"
+    const val LOG4J = "2.15.0"
 }
 
 // Properties that need a project reference to resolve:

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

@@ -1,17 +1,5 @@
-// TODO await https://github.com/PaperMC/paperweight/issues/116
-//applyPaperweightAdapterConfiguration(javaRelease = 16)
-//
-//dependencies {
-//    paperDevBundle("1.17.1-R0.1-20211120.192557-194")
-//}
+applyPaperweightAdapterConfiguration(javaRelease = 16)
 
-// Until the above issue is resolved, we are bundling old versions using their last assembled JAR.
-// Technically this means we cannot really update them, but that is is the price we pay for supporting older versions.
-
-plugins {
-    base
-}
-
-artifacts {
-    add("default", file("./src/main/resources/worldedit-adapter-1.17.1.jar"))
+dependencies {
+    paperDevBundle("1.17.1-R0.1-20211219.175449-201")
 }

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

@@ -1,5 +1,6 @@
 applyPaperweightAdapterConfiguration(javaRelease = 17)
 
 dependencies {
-    paperDevBundle("1.18-R0.1-20211130.173143-6")
+    // https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
+    paperDevBundle("1.18.1-R0.1-20211221.093324-19")
 }

worldedit-bukkit/build.gradle.kts

@@ -40,7 +40,7 @@
         exclude("junit", "junit")
     }
 
-    "localImplementation"(platform("org.apache.logging.log4j:log4j-bom:2.14.1") {
+    "localImplementation"(platform("org.apache.logging.log4j:log4j-bom:${Versions.LOG4J}") {
         because("Spigot provides Log4J (sort of, not in API, implicitly part of server)")
     })
     "localImplementation"("org.apache.logging.log4j:log4j-api")

worldedit-cli/build.gradle.kts

@@ -19,7 +19,7 @@
     "annotationProcessor"(project(":worldedit-libs:core:ap"))
     "annotationProcessor"("com.google.guava:guava:${Versions.GUAVA}")
     "api"(project(":worldedit-core"))
-    "implementation"(platform("org.apache.logging.log4j:log4j-bom:2.14.1") {
+    "implementation"(platform("org.apache.logging.log4j:log4j-bom:${Versions.LOG4J}") {
         because("We control Log4J on this platform")
     })
     "implementation"("org.apache.logging.log4j:log4j-api")

worldedit-core/build.gradle.kts

@@ -42,8 +42,8 @@
     "implementation"("com.google.code.findbugs:jsr305:1.3.9")
     "implementation"("com.google.code.gson:gson")
 
-    "implementation"("org.apache.logging.log4j:log4j-api:2.14.1") {
-        because("Mojang provides Log4J 2.14.1")
+    "implementation"("org.apache.logging.log4j:log4j-api:${Versions.LOG4J}") {
+        because("Mojang provides Log4J")
     }
 
     "implementation"("it.unimi.dsi:fastutil")
@@ -61,7 +61,7 @@
 
     "languageFiles"("${project.group}:worldedit-lang:7.2.6:355@zip")
 
-    "testRuntimeOnly"("org.apache.logging.log4j:log4j-core:2.14.1")
+    "testRuntimeOnly"("org.apache.logging.log4j:log4j-core:${Versions.LOG4J}")
 }
 
 tasks.named<Test>("test") {

worldedit-core/src/main/java/com/sk89q/worldedit/internal/Constants.java

@@ -72,4 +72,8 @@ private Constants() {
      */
     public static final int DATA_VERSION_MC_1_17 = 2724;
 
+    /**
+     * The DataVersion for Minecraft 1.18
+     */
+    public static final int DATA_VERSION_MC_1_18 = 2860;
 }

worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk16.java

@@ -26,7 +26,7 @@
 import com.sk89q.worldedit.world.storage.InvalidFormatException;
 
 /**
- * The chunk format for Minecraft 1.16 and newer
+ * The chunk format for Minecraft 1.16 and 1.17
  */
 public class AnvilChunk16 extends AnvilChunk13 {
 

worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/AnvilChunk18.java

@@ -0,0 +1,222 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.world.chunk;
+
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.jnbt.IntTag;
+import com.sk89q.jnbt.ListTag;
+import com.sk89q.jnbt.LongArrayTag;
+import com.sk89q.jnbt.NBTUtils;
+import com.sk89q.jnbt.Tag;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.registry.state.Property;
+import com.sk89q.worldedit.world.DataException;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
+import com.sk89q.worldedit.world.storage.InvalidFormatException;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Nullable;
+
+/**
+ * The chunk format for Minecraft 1.18 and newer
+ */
+public class AnvilChunk18 implements Chunk {
+
+    private final CompoundTag rootTag;
+    private final Int2ObjectOpenHashMap<BlockState[]> blocks;
+    private final int rootX;
+    private final int rootZ;
+
+    private Map<BlockVector3, Map<String, Tag>> tileEntities;
+
+    /**
+     * Construct the chunk with a compound tag.
+     *
+     * @param tag the tag to read
+     * @throws DataException on a data error
+     */
+    public AnvilChunk18(CompoundTag tag) throws DataException {
+        rootTag = tag;
+
+        rootX = NBTUtils.getChildTag(rootTag.getValue(), "xPos", IntTag.class).getValue();
+        rootZ = NBTUtils.getChildTag(rootTag.getValue(), "zPos", IntTag.class).getValue();
+
+        List<Tag> sections = NBTUtils.getChildTag(rootTag.getValue(), "sections", ListTag.class).getValue();
+        blocks = new Int2ObjectOpenHashMap<>(sections.size());
+
+        for (Tag rawSectionTag : sections) {
+            if (!(rawSectionTag instanceof CompoundTag)) {
+                continue;
+            }
+
+            CompoundTag sectionTag = (CompoundTag) rawSectionTag;
+            Object yValue = sectionTag.getValue().get("Y").getValue(); // sometimes a byte, sometimes an int
+            if (!(yValue instanceof Number)) {
+                throw new InvalidFormatException("Y is not numeric: " + yValue);
+            }
+            int y = ((Number) yValue).intValue();
+
+            Tag rawBlockStatesTag = sectionTag.getValue().get("block_states"); // null for sections outside of the world limits
+            if (rawBlockStatesTag instanceof CompoundTag) {
+                CompoundTag blockStatesTag = (CompoundTag) rawBlockStatesTag;
+
+                // parse palette
+                List<CompoundTag> paletteEntries = blockStatesTag.getList("palette", CompoundTag.class);
+                int paletteSize = paletteEntries.size();
+                if (paletteSize == 0) {
+                    continue;
+                }
+                BlockState[] palette = new BlockState[paletteSize];
+                for (int paletteEntryId = 0; paletteEntryId < paletteSize; paletteEntryId++) {
+                    CompoundTag paletteEntry = paletteEntries.get(paletteEntryId);
+                    BlockType type = BlockTypes.get(paletteEntry.getString("Name"));
+                    if (type == null) {
+                        throw new InvalidFormatException("Invalid block type: " + paletteEntry.getString("Name"));
+                    }
+                    BlockState blockState = type.getDefaultState();
+                    if (paletteEntry.containsKey("Properties")) {
+                        CompoundTag properties = NBTUtils.getChildTag(paletteEntry.getValue(), "Properties", CompoundTag.class);
+                        for (Property<?> property : blockState.getStates().keySet()) {
+                            if (properties.containsKey(property.getName())) {
+                                String value = properties.getString(property.getName());
+                                try {
+                                    blockState = getBlockStateWith(blockState, property, value);
+                                } catch (IllegalArgumentException e) {
+                                    throw new InvalidFormatException("Invalid block state for " + blockState.getBlockType().getId() + ", " + property.getName() + ": " + value);
+                                }
+                            }
+                        }
+                    }
+                    palette[paletteEntryId] = blockState;
+                }
+                if (paletteSize == 1) {
+                    // the same block everywhere
+                    blocks.put(y, palette);
+                    continue;
+                }
+
+                // parse block states
+                long[] blockStatesSerialized = NBTUtils.getChildTag(blockStatesTag.getValue(), "data", LongArrayTag.class).getValue();
+
+                BlockState[] chunkSectionBlocks = new BlockState[16 * 16 * 16];
+                blocks.put(y, chunkSectionBlocks);
+
+                readBlockStates(palette, blockStatesSerialized, chunkSectionBlocks);
+            }
+        }
+    }
+
+    protected void readBlockStates(BlockState[] palette, long[] blockStatesSerialized, BlockState[] chunkSectionBlocks) throws InvalidFormatException {
+        PackedIntArrayReader reader = new PackedIntArrayReader(blockStatesSerialized);
+        for (int blockPos = 0; blockPos < chunkSectionBlocks.length; blockPos++) {
+            int index = reader.get(blockPos);
+            if (index >= palette.length) {
+                throw new InvalidFormatException("Invalid block state table entry: " + index);
+            }
+            chunkSectionBlocks[blockPos] = palette[index];
+        }
+    }
+
+    private <T> BlockState getBlockStateWith(BlockState source, Property<T> property, String value) {
+        return source.with(property, property.getValueFor(value));
+    }
+
+    /**
+     * Used to load the tile entities.
+     */
+    private void populateTileEntities() throws DataException {
+        tileEntities = new HashMap<>();
+        if (!rootTag.getValue().containsKey("block_entities")) {
+            return;
+        }
+        List<Tag> tags = NBTUtils.getChildTag(rootTag.getValue(),
+                "block_entities", ListTag.class).getValue();
+
+        for (Tag tag : tags) {
+            if (!(tag instanceof CompoundTag)) {
+                throw new InvalidFormatException("CompoundTag expected in block_entities");
+            }
+
+            CompoundTag t = (CompoundTag) tag;
+
+            Map<String, Tag> values = new HashMap<>(t.getValue());
+            int x = ((IntTag) values.get("x")).getValue();
+            int y = ((IntTag) values.get("y")).getValue();
+            int z = ((IntTag) values.get("z")).getValue();
+
+            BlockVector3 vec = BlockVector3.at(x, y, z);
+            tileEntities.put(vec, values);
+        }
+    }
+
+    /**
+     * Get the map of tags keyed to strings for a block's tile entity data. May
+     * return null if there is no tile entity data. Not public yet because
+     * what this function returns isn't ideal for usage.
+     *
+     * @param position the position
+     * @return the compound tag for that position, which may be null
+     * @throws DataException thrown if there is a data error
+     */
+    @Nullable
+    private CompoundTag getBlockTileEntity(BlockVector3 position) throws DataException {
+        if (tileEntities == null) {
+            populateTileEntities();
+        }
+
+        Map<String, Tag> values = tileEntities.get(position);
+        if (values == null) {
+            return null;
+        }
+
+        return new CompoundTag(values);
+    }
+
+    @Override
+    public BaseBlock getBlock(BlockVector3 position) throws DataException {
+        int x = position.getX() - rootX * 16;
+        int y = position.getY();
+        int z = position.getZ() - rootZ * 16;
+
+        int section = y >> 4;
+        int yIndex = y & 0x0F;
+
+        BlockState[] sectionBlocks = blocks.get(section);
+        if (sectionBlocks == null) {
+            return BlockTypes.AIR.getDefaultState().toBaseBlock();
+        }
+        BlockState state = sectionBlocks[sectionBlocks.length == 1 ? 0 : ((yIndex << 8) | (z << 4) | x)];
+
+        CompoundTag tileEntity = getBlockTileEntity(position);
+
+        if (tileEntity != null) {
+            return state.toBaseBlock(tileEntity);
+        }
+
+        return state.toBaseBlock();
+    }
+
+}

worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/ChunkStoreHelper.java

@@ -32,6 +32,7 @@
 import com.sk89q.worldedit.world.chunk.AnvilChunk;
 import com.sk89q.worldedit.world.chunk.AnvilChunk13;
 import com.sk89q.worldedit.world.chunk.AnvilChunk16;
+import com.sk89q.worldedit.world.chunk.AnvilChunk18;
 import com.sk89q.worldedit.world.chunk.Chunk;
 import com.sk89q.worldedit.world.chunk.OldChunk;
 
@@ -69,6 +70,25 @@ public static CompoundTag readCompoundTag(ChunkDataInputSupplier input) throws D
      * @throws DataException if the rootTag is not valid chunk data
      */
     public static Chunk getChunk(CompoundTag rootTag) throws DataException {
+        int dataVersion = rootTag.getInt("DataVersion");
+        if (dataVersion == 0) {
+            dataVersion = -1;
+        }
+
+        final Platform platform = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING);
+        final int currentDataVersion = platform.getDataVersion();
+        if ((dataVersion > 0 || hasLevelSections(rootTag)) && dataVersion < currentDataVersion) { // only fix up MCA format, DFU doesn't support MCR chunks
+            final DataFixer dataFixer = platform.getDataFixer();
+            if (dataFixer != null) {
+                rootTag = (CompoundTag) AdventureNBTConverter.fromAdventure(dataFixer.fixUp(DataFixer.FixTypes.CHUNK, rootTag.asBinaryTag(), dataVersion));
+                dataVersion = currentDataVersion;
+            }
+        }
+
+        if (dataVersion >= Constants.DATA_VERSION_MC_1_18) {
+            return new AnvilChunk18(rootTag);
+        }
+
         Map<String, Tag> children = rootTag.getValue();
         CompoundTag tag = null;
 
@@ -88,19 +108,6 @@ public static Chunk getChunk(CompoundTag rootTag) throws DataException {
             throw new ChunkStoreException("Missing root 'Level' tag");
         }
 
-        int dataVersion = rootTag.getInt("DataVersion");
-        if (dataVersion == 0) {
-            dataVersion = -1;
-        }
-        final Platform platform = WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.WORLD_EDITING);
-        final int currentDataVersion = platform.getDataVersion();
-        if (tag.getValue().containsKey("Sections") && dataVersion < currentDataVersion) { // only fix up MCA format, DFU doesn't support MCR chunks
-            final DataFixer dataFixer = platform.getDataFixer();
-            if (dataFixer != null) {
-                tag = (CompoundTag) ((CompoundTag) AdventureNBTConverter.fromAdventure(dataFixer.fixUp(DataFixer.FixTypes.CHUNK, rootTag.asBinaryTag(), dataVersion))).getValue().get("Level");
-                dataVersion = currentDataVersion;
-            }
-        }
         if (dataVersion >= Constants.DATA_VERSION_MC_1_16) {
             return new AnvilChunk16(tag);
         }
@@ -116,6 +123,15 @@ public static Chunk getChunk(CompoundTag rootTag) throws DataException {
         return new OldChunk(tag);
     }
 
+    private static boolean hasLevelSections(CompoundTag rootTag) {
+        Map<String, Tag> children = rootTag.getValue();
+        Tag levelTag = children.get("Level");
+        if (levelTag instanceof CompoundTag) {
+            return ((CompoundTag) levelTag).getValue().containsKey("Sections");
+        }
+        return false;
+    }
+
     private ChunkStoreHelper() {
     }
 }

worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/TrueZipMcRegionChunkStore.java

@@ -106,7 +106,7 @@ protected InputStream getInputStream(String name, String worldName) throws IOExc
                             endIndex = entryName.lastIndexOf('\\');
                         }
                         folder = entryName.substring(0, endIndex);
-                        if (folder.endsWith("poi")) {
+                        if (folder.endsWith("poi") || folder.endsWith("entities")) {
                             continue;
                         }
                         name = folder + "/" + name;

worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/ZippedMcRegionChunkStore.java

@@ -93,7 +93,7 @@ protected InputStream getInputStream(String name, String worldName) throws IOExc
                             endIndex = entryName.lastIndexOf('\\');
                         }
                         folder = entryName.substring(0, endIndex);
-                        if (folder.endsWith("poi")) {
+                        if (folder.endsWith("poi") || folder.endsWith("entities")) {
                             continue;
                         }
                         name = folder + "/" + name;

worldedit-fabric/build.gradle.kts

@@ -39,8 +39,8 @@
 
 dependencies {
     "api"(project(":worldedit-core"))
-    "implementation"(platform("org.apache.logging.log4j:log4j-bom:2.14.1") {
-        because("Mojang provides Log4J at 2.14.1")
+    "implementation"(platform("org.apache.logging.log4j:log4j-bom:${Versions.LOG4J}") {
+        because("Mojang provides Log4J")
     })
 
     "minecraft"("com.mojang:minecraft:$minecraftVersion")

worldedit-forge/build.gradle.kts

@@ -11,11 +11,11 @@
 applyPlatformAndCoreConfiguration(javaRelease = 17)
 applyShadowConfiguration()
 
-val minecraftVersion = "1.18"
+val minecraftVersion = "1.18.1"
 val nextMajorMinecraftVersion: String = minecraftVersion.split('.').let { (useless, major) ->
     "$useless.${major.toInt() + 1}"
 }
-val forgeVersion = "38.0.10"
+val forgeVersion = "39.0.0"
 
 val apiClasspath = configurations.create("apiClasspath") {
     isCanBeResolved = true
@@ -24,8 +24,8 @@
 
 dependencies {
     "api"(project(":worldedit-core"))
-    "implementation"(platform("org.apache.logging.log4j:log4j-bom:2.14.1") {
-        because("Mojang provides Log4J at 2.14.1")
+    "implementation"(platform("org.apache.logging.log4j:log4j-bom:${Versions.LOG4J}") {
+        because("Mojang provides Log4J")
     })
 
     "minecraft"("net.minecraftforge:forge:$minecraftVersion-$forgeVersion")

worldedit-sponge/build.gradle.kts

@@ -23,8 +23,8 @@
     api("org.spongepowered:spongeapi:7.1.0") {
         exclude(group = "org.slf4j", module = "slf4j-api")
     }
-    implementation(platform("org.apache.logging.log4j:log4j-bom:2.14.1") {
-        because("Sponge 8 (will?) provides Log4J at 2.14.1")
+    implementation(platform("org.apache.logging.log4j:log4j-bom:${Versions.LOG4J}") {
+        because("Sponge 8 (will?) provides Log4J")
     })
     api("org.apache.logging.log4j:log4j-api")
     api("org.bstats:bstats-sponge:1.7")