Introduce 26.2 support

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,6 +27,7 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
+        - '26.2'
         - '26.1.2'
         - '1.21.11'
         - '1.21.10'

build.gradle.kts

@@ -94,7 +94,7 @@ allprojects {
 }
 
 val supportedVersions: List<String> = listOf("1.21", "1.21.1", "1.21.4", "1.21.5",
-        "1.21.8", "1.21.10", "1.21.11", "26.1.2")
+        "1.21.8", "1.21.10", "1.21.11", "26.1.2", "26.2")
 
 tasks {
     supportedVersions.forEach {

settings.gradle.kts

@@ -55,7 +55,7 @@ includeBuild("build-logic")
 
 include("worldedit-libs")
 
-listOf("1_21", "1_21_4", "1_21_5", "1_21_6", "1_21_9", "1_21_11", "26.1").forEach {
+listOf("1_21", "1_21_4", "1_21_5", "1_21_6", "1_21_9", "1_21_11", "26.1", "26.2").forEach {
     include("worldedit-bukkit:adapters:adapter-$it")
 }
 

worldedit-bukkit/adapters/adapter-1_21_11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_11/PaperweightChunkAccessProxy.java

@@ -213,7 +213,7 @@ public BlockEntity getBlockEntity(final @Nonnull BlockPos pos) {
 
     @Override
     public @Nonnull SWMRNibbleArray[] starlight$getSkyNibbles() {
-        return parent.starlight$getBlockNibbles();
+        return parent.starlight$getSkyNibbles();
     }
 
     @Override

worldedit-bukkit/adapters/adapter-1_21_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightChunkAccessProxy.java

@@ -213,7 +213,7 @@ public BlockEntity getBlockEntity(final @Nonnull BlockPos pos) {
 
     @Override
     public @Nonnull SWMRNibbleArray[] starlight$getSkyNibbles() {
-        return parent.starlight$getBlockNibbles();
+        return parent.starlight$getSkyNibbles();
     }
 
     @Override

worldedit-bukkit/adapters/adapter-1_21_6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_6/PaperweightChunkAccessProxy.java

@@ -213,7 +213,7 @@ public BlockEntity getBlockEntity(final @Nonnull BlockPos pos) {
 
     @Override
     public @Nonnull SWMRNibbleArray[] starlight$getSkyNibbles() {
-        return parent.starlight$getBlockNibbles();
+        return parent.starlight$getSkyNibbles();
     }
 
     @Override

worldedit-bukkit/adapters/adapter-1_21_9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_9/PaperweightChunkAccessProxy.java

@@ -213,7 +213,7 @@ public BlockEntity getBlockEntity(final @Nonnull BlockPos pos) {
 
     @Override
     public @Nonnull SWMRNibbleArray[] starlight$getSkyNibbles() {
-        return parent.starlight$getBlockNibbles();
+        return parent.starlight$getSkyNibbles();
     }
 
     @Override

worldedit-bukkit/adapters/adapter-26.1/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v26_1/PaperweightChunkAccessProxy.java

@@ -213,7 +213,7 @@ public BlockEntity getBlockEntity(final @Nonnull BlockPos pos) {
 
     @Override
     public @Nonnull SWMRNibbleArray[] starlight$getSkyNibbles() {
-        return parent.starlight$getBlockNibbles();
+        return parent.starlight$getSkyNibbles();
     }
 
     @Override

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

@@ -0,0 +1,19 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
+plugins {
+    id("buildlogic.adapter")
+}
+
+// workaround LeafPile providing wrong snakeyaml version
+configurations.named("testRuntimeClasspath") {
+    exclude(group = "org.yaml", module = "snakeyaml")
+}
+
+dependencies {
+    // https://artifactory.papermc.io/ui/native/universe/io/papermc/paper/dev-bundle/
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("26.2.build.+")
+    compileOnly(libs.paperLib)
+    testRuntimeOnly(libs.snakeyaml) {
+        because("Keep adapter tests on Bukkit's SnakeYaml while excluding LeafPile's conflicting transitive version")
+    }
+}

worldedit-bukkit/adapters/adapter-26.2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v26_2/FaweBlockStateListPopulator.java

@@ -0,0 +1,229 @@
+package com.sk89q.worldedit.bukkit.adapter.impl.fawe.v26_2;
+
+import com.fastasyncworldedit.core.util.MathMan;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.core.SectionPos;
+import net.minecraft.core.particles.ParticleOptions;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.flag.FeatureFlagSet;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeManager;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.border.WorldBorder;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkSource;
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.world.level.material.FluidState;
+import org.bukkit.craftbukkit.util.BlockStateListPopulator;
+import org.jetbrains.annotations.NotNull;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.List;
+
+public class FaweBlockStateListPopulator extends BlockStateListPopulator {
+
+    private final Long2ObjectOpenHashMap<PaperweightChunkAccessProxy> chunkProxies = new Long2ObjectOpenHashMap<>();
+    private final ServerLevel world;
+
+    public FaweBlockStateListPopulator(ServerLevel world) {
+        super(world);
+        this.world = world;
+    }
+
+    @Override
+    public long getSeed() {
+        return world.getSeed();
+    }
+
+    @Override
+    @Nonnull
+    public ServerLevel getLevel() {
+        return world.getLevel();
+    }
+
+    @Override
+    @Nonnull
+    public DifficultyInstance getCurrentDifficultyAt(final BlockPos pos) {
+        return world.getCurrentDifficultyAt(pos);
+    }
+
+    @Override
+    public MinecraftServer getServer() {
+        return world.getServer();
+    }
+
+    @Override
+    @Nonnull
+    public ChunkSource getChunkSource() {
+        return world.getChunkSource();
+    }
+
+    @Override
+    @Nonnull
+    public RandomSource getRandom() {
+        return world.getRandom();
+    }
+
+    @Override
+    public void playSound(
+            final Entity source,
+            final BlockPos pos,
+            final SoundEvent sound,
+            final SoundSource category,
+            final float volume,
+            final float pitch
+    ) {
+        // don't for now
+    }
+
+    @Override
+    public void addParticle(
+            final ParticleOptions parameters,
+            final double x,
+            final double y,
+            final double z,
+            final double velocityX,
+            final double velocityY,
+            final double velocityZ
+    ) {
+        // definitely don't
+    }
+
+    @Override
+    public @NotNull List<? extends Player> players() {
+        return world.players();
+    }
+
+    @Override
+    public ChunkAccess getChunk(final int chunkX, final int chunkZ, final ChunkStatus leastStatus, final boolean create) {
+        ChunkAccess worldChunk = world.getChunk(chunkX, chunkZ, leastStatus, create);
+        PaperweightChunkAccessProxy proxy = chunkProxies.compute(
+                MathMan.pairInt(chunkX, chunkZ),
+                (k, v) -> v == null ? PaperweightChunkAccessProxy.getInstance() : v
+        );
+        proxy.parent = worldChunk;
+        return proxy;
+    }
+
+    @Override
+    @Nonnull
+    public BiomeManager getBiomeManager() {
+        return world.getBiomeManager();
+    }
+
+    @Override
+    @Nonnull
+    public Holder<Biome> getUncachedNoiseBiome(final int biomeX, final int biomeY, final int biomeZ) {
+        return world.getUncachedNoiseBiome(biomeX, biomeY, biomeZ);
+    }
+
+    @Override
+    public int getSeaLevel() {
+        return world.getSeaLevel();
+    }
+
+    @Override
+    public @Nonnull ChunkAccess getChunk(final @Nonnull BlockPos pos) {
+        ChunkAccess worldChunk = world.getChunk(pos);
+        PaperweightChunkAccessProxy proxy = chunkProxies.compute(
+                MathMan.pairInt(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ())),
+                (k, v) -> v == null ? PaperweightChunkAccessProxy.getInstance() : v
+        );
+        proxy.parent = worldChunk;
+        return proxy;
+    }
+
+    @Override
+    public @Nonnull ChunkAccess getChunk(final int chunkX, final int chunkZ) {
+        ChunkAccess worldChunk = world.getChunk(chunkX, chunkZ);
+        PaperweightChunkAccessProxy proxy = chunkProxies.compute(
+                MathMan.pairInt(chunkX, chunkZ),
+                (k, v) -> v == null ? PaperweightChunkAccessProxy.getInstance() : v
+        );
+        proxy.parent = worldChunk;
+        return proxy;
+    }
+
+    @Override
+    public @Nonnull ChunkAccess getChunk(final int chunkX, final int chunkZ, final @Nonnull ChunkStatus chunkStatus) {
+        ChunkAccess worldChunk = world.getChunk(chunkX, chunkZ, chunkStatus);
+        PaperweightChunkAccessProxy proxy = chunkProxies.compute(
+                MathMan.pairInt(chunkX, chunkZ),
+                (k, v) -> v == null ? PaperweightChunkAccessProxy.getInstance() : v
+        );
+        proxy.parent = worldChunk;
+        return proxy;
+    }
+
+    @Override
+    @Nonnull
+    public FeatureFlagSet enabledFeatures() {
+        return world.enabledFeatures();
+    }
+
+    @Override
+    @Nonnull
+    public LevelLightEngine getLightEngine() {
+        return world.getLightEngine();
+    }
+
+    @Nullable
+    @Override
+    public ChunkAccess getChunkIfLoadedImmediately(final int x, final int z) {
+        return world.getChunkIfLoadedImmediately(x, z);
+    }
+
+    @Override
+    public BlockState getBlockStateIfLoaded(final BlockPos blockposition) {
+        return world.getBlockStateIfLoaded(blockposition);
+    }
+
+    @Override
+    public FluidState getFluidIfLoaded(final BlockPos blockposition) {
+        return world.getFluidIfLoaded(blockposition);
+    }
+
+    @Override
+    @Nonnull
+    public WorldBorder getWorldBorder() {
+        return world.getWorldBorder();
+    }
+
+    @Override
+    public boolean setBlock(final BlockPos pos, final BlockState state, final int flags, final int maxUpdateDepth) {
+        return world.setBlock(pos, state, flags, maxUpdateDepth);
+    }
+
+    @Override
+    public boolean removeBlock(final BlockPos pos, final boolean move) {
+        return world.removeBlock(pos, move);
+    }
+
+    @Override
+    public boolean destroyBlock(final BlockPos pos, final boolean drop, final Entity breakingEntity, final int maxUpdateDepth) {
+        return world.destroyBlock(pos, drop, breakingEntity, maxUpdateDepth);
+    }
+
+    @Override
+    @Nonnull
+    public BlockState getBlockState(final BlockPos pos) {
+        return world.getBlockState(pos);
+    }
+
+    @Override
+    public boolean setBlock(final BlockPos pos, final BlockState state, final int flags) {
+        return world.setBlock(pos, state, flags);
+    }
+
+}