Merge branch 'main' into feat/feature-placement

.github/workflows/label-merge-conflicts.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Label conflicting PRs
-        uses: eps1lon/actions-label-merge-conflict@v3.0.0
+        uses: eps1lon/actions-label-merge-conflict@v3.0.1
         with:
           dirtyLabel: "unresolved-merge-conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

build.gradle.kts

@@ -7,7 +7,7 @@ import xyz.jpenilla.runpaper.task.RunServer
 
 plugins {
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
-    id("xyz.jpenilla.run-paper") version "2.2.4"
+    id("xyz.jpenilla.run-paper") version "2.3.0"
 }
 
 if (!File("$rootDir/.git").exists()) {
@@ -34,7 +34,7 @@ logger.lifecycle("""
 *******************************************
 """)
 
-var rootVersion by extra("2.9.3")
+var rootVersion by extra("2.10.1")
 var snapshot by extra("SNAPSHOT")
 var revision: String by extra("")
 var buildNumber by extra("")

buildSrc/src/main/kotlin/CommonJavaConfig.kt

@@ -61,7 +61,7 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean
                     "https://jd.advntr.dev/api/latest/",
                     "https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
                     "https://www.antlr.org/api/Java/",
-                    "https://jd.papermc.io/paper/1.20/",
+                    "https://jd.papermc.io/paper/1.20.6/",
                     "https://intellectualsites.github.io/fastasyncworldedit-javadocs/worldedit-core/"
             )
             docTitle = "${rootProject.name}-${project.description}" +  " " + "${rootProject.version}"

gradle/libs.versions.toml

@@ -14,14 +14,14 @@ mapmanager = "1.8.0-SNAPSHOT"
 griefprevention = "17.0.0"
 griefdefender = "2.1.0-SNAPSHOT"
 residence = "4.5._13.1"
-towny = "0.100.2.9"
+towny = "0.100.2.11"
 plotsquared = "7.3.8"
 
 # Third party
 bstats = "3.0.2"
 sparsebitset = "1.3"
 parallelgzip = "1.0.5"
-adventure = "4.16.0"
+adventure = "4.17.0"
 adventure-bukkit = "4.3.2"
 checkerqual = "3.43.0"
 truezip = "6.8.4"
@@ -35,7 +35,7 @@ jlibnoise = "1.0.0"
 jchronic = "0.2.4a"
 lz4-java = "1.8.0"
 lz4-stream = "1.0.0"
-commons-cli = "1.7.0"
+commons-cli = "1.8.0"
 paperlib = "1.0.8"
 paster = "1.1.6"
 vault = "1.7.1"
@@ -46,7 +46,7 @@ text = "3.0.4"
 piston = "0.5.10"
 
 # Tests
-mockito = "5.11.0"
+mockito = "5.12.0"
 
 # Gradle plugins
 pluginyml = "0.6.0"

worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_19_R3/PaperweightAdapter.java

@@ -558,7 +558,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public void sendFakeNBT(Player player, BlockVector3 pos, CompoundBinaryTag nbtData) {
         ((CraftPlayer) player).getHandle().connection.send(ClientboundBlockEntityDataPacket.create(
                 new StructureBlockEntity(
-                        new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()),
+                        new BlockPos(pos.x(), pos.y(), pos.z()),
                         Blocks.STRUCTURE_BLOCK.defaultBlockState()
                 ),
                 __ -> (net.minecraft.nbt.CompoundTag) fromNativeBinary(nbtData)
@@ -608,10 +608,10 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             return false;
         }
         fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, stack);
-        fakePlayer.absMoveTo(position.getBlockX(), position.getBlockY(), position.getBlockZ(),
+        fakePlayer.absMoveTo(position.x(), position.y(), position.z(),
                 (float) face.toVector().toYaw(), (float) face.toVector().toPitch());
 
-        final BlockPos blockPos = new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ());
+        final BlockPos blockPos = new BlockPos(position.x(), position.y(), position.z());
         final Vec3 blockVec = Vec3.atLowerCornerOf(blockPos);
         final net.minecraft.core.Direction enumFacing = adapt(face);
         BlockHitResult rayTrace = new BlockHitResult(blockVec, enumFacing, blockPos, false);
@@ -632,7 +632,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public boolean canPlaceAt(org.bukkit.World world, BlockVector3 position, BlockState blockState) {
         int internalId = BlockStateIdAccess.getBlockStateId(blockState);
         net.minecraft.world.level.block.state.BlockState blockData = Block.stateById(internalId);
-        return blockData.canSurvive(((CraftWorld) world).getHandle(), new BlockPos(position.getX(), position.getY(), position.getZ()));
+        return blockData.canSurvive(((CraftWorld) world).getHandle(), new BlockPos(position.x(), position.y(), position.z()));
     }
 
     @Override
@@ -752,7 +752,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
         }
 
         for (BlockVector3 vec : region) {
-            BlockPos pos = new BlockPos(vec.getBlockX(), vec.getBlockY(), vec.getBlockZ());
+            BlockPos pos = new BlockPos(vec.x(), vec.y(), vec.z());
             ChunkAccess chunk = chunks.get(new ChunkPos(pos));
             final net.minecraft.world.level.block.state.BlockState blockData = chunk.getBlockState(pos);
             int internalId = Block.getId(blockData);
@@ -765,7 +765,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             }
             extent.setBlock(vec, state.toBaseBlock());
             if (options.shouldRegenBiomes()) {
-                Biome origBiome = chunk.getNoiseBiome(vec.getX(), vec.getY(), vec.getZ()).value();
+                Biome origBiome = chunk.getNoiseBiome(vec.x(), vec.y(), vec.z()).value();
                 BiomeType adaptedBiome = adapt(serverWorld, origBiome);
                 if (adaptedBiome != null) {
                     extent.setBiome(vec, adaptedBiome);
@@ -784,7 +784,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
                 //noinspection unchecked
                 chunkLoadings.add(
                         ((CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>)
-                                getChunkFutureMethod.invoke(chunkManager, chunk.getX(), chunk.getZ(), ChunkStatus.FEATURES, true))
+                                getChunkFutureMethod.invoke(chunkManager, chunk.x(), chunk.z(), ChunkStatus.FEATURES, true))
                                 .thenApply(either -> either.left().orElse(null))
                 );
             } catch (IllegalAccessException | InvocationTargetException e) {
@@ -824,7 +824,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public boolean clearContainerBlockContents(org.bukkit.World world, BlockVector3 pt) {
         ServerLevel originalWorld = ((CraftWorld) world).getHandle();
 
-        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()));
+        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.x(), pt.y(), pt.z()));
         if (entity instanceof Clearable) {
             ((Clearable) entity).clearContent();
             return true;

worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightFaweAdapter.java

@@ -486,7 +486,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
         net.minecraft.world.level.block.state.BlockState blockState1 = Block.stateById(internalId);
         return blockState1.hasPostProcess(
                 getServerLevel(world),
-                new BlockPos(blockVector3.getX(), blockVector3.getY(), blockVector3.getZ())
+                new BlockPos(blockVector3.x(), blockVector3.y(), blockVector3.z())
         );
     }
 

worldedit-bukkit/adapters/adapter-1_19_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightGetBlocks.java

@@ -786,9 +786,9 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                         for (final Map.Entry<BlockVector3, CompoundTag> entry : tiles.entrySet()) {
                             final CompoundTag nativeTag = entry.getValue();
                             final BlockVector3 blockHash = entry.getKey();
-                            final int x = blockHash.getX() + bx;
+                            final int x = blockHash.x() + bx;
-                            final int y = blockHash.getY();
+                            final int y = blockHash.y();
-                            final int z = blockHash.getZ() + bz;
+                            final int z = blockHash.z() + bz;
                             final BlockPos pos = new BlockPos(x, y, z);
 
                             synchronized (nmsWorld) {

worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R1/PaperweightAdapter.java

@@ -591,7 +591,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public void sendFakeNBT(Player player, BlockVector3 pos, CompoundBinaryTag nbtData) {
         ((CraftPlayer) player).getHandle().connection.send(ClientboundBlockEntityDataPacket.create(
                 new StructureBlockEntity(
-                        new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()),
+                        new BlockPos(pos.x(), pos.y(), pos.z()),
                         Blocks.STRUCTURE_BLOCK.defaultBlockState()
                 ),
                 __ -> (net.minecraft.nbt.CompoundTag) fromNativeBinary(nbtData)
@@ -652,10 +652,10 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             return false;
         }
         fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, stack);
-        fakePlayer.absMoveTo(position.getBlockX(), position.getBlockY(), position.getBlockZ(),
+        fakePlayer.absMoveTo(position.x(), position.y(), position.z(),
                 (float) face.toVector().toYaw(), (float) face.toVector().toPitch());
 
-        final BlockPos blockPos = new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ());
+        final BlockPos blockPos = new BlockPos(position.x(), position.y(), position.z());
         final Vec3 blockVec = Vec3.atLowerCornerOf(blockPos);
         final net.minecraft.core.Direction enumFacing = adapt(face);
         BlockHitResult rayTrace = new BlockHitResult(blockVec, enumFacing, blockPos, false);
@@ -676,7 +676,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public boolean canPlaceAt(org.bukkit.World world, BlockVector3 position, BlockState blockState) {
         int internalId = BlockStateIdAccess.getBlockStateId(blockState);
         net.minecraft.world.level.block.state.BlockState blockData = Block.stateById(internalId);
-        return blockData.canSurvive(((CraftWorld) world).getHandle(), new BlockPos(position.getX(), position.getY(), position.getZ()));
+        return blockData.canSurvive(((CraftWorld) world).getHandle(), new BlockPos(position.x(), position.y(), position.z()));
     }
 
     @Override
@@ -797,7 +797,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
         }
 
         for (BlockVector3 vec : region) {
-            BlockPos pos = new BlockPos(vec.getBlockX(), vec.getBlockY(), vec.getBlockZ());
+            BlockPos pos = new BlockPos(vec.x(), vec.y(), vec.z());
             ChunkAccess chunk = chunks.get(new ChunkPos(pos));
             final net.minecraft.world.level.block.state.BlockState blockData = chunk.getBlockState(pos);
             int internalId = Block.getId(blockData);
@@ -810,7 +810,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             }
             extent.setBlock(vec, state.toBaseBlock());
             if (options.shouldRegenBiomes()) {
-                Biome origBiome = chunk.getNoiseBiome(vec.getX(), vec.getY(), vec.getZ()).value();
+                Biome origBiome = chunk.getNoiseBiome(vec.x(), vec.y(), vec.z()).value();
                 BiomeType adaptedBiome = adapt(serverWorld, origBiome);
                 if (adaptedBiome != null) {
                     extent.setBiome(vec, adaptedBiome);
@@ -829,7 +829,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
                 //noinspection unchecked
                 chunkLoadings.add(
                         ((CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>)
-                                getChunkFutureMethod.invoke(chunkManager, chunk.getX(), chunk.getZ(), ChunkStatus.FEATURES, true))
+                                getChunkFutureMethod.invoke(chunkManager, chunk.x(), chunk.z(), ChunkStatus.FEATURES, true))
                                 .thenApply(either -> either.left().orElse(null))
                 );
             } catch (IllegalAccessException | InvocationTargetException e) {
@@ -869,7 +869,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public boolean clearContainerBlockContents(org.bukkit.World world, BlockVector3 pt) {
         ServerLevel originalWorld = ((CraftWorld) world).getHandle();
 
-        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()));
+        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.x(), pt.y(), pt.z()));
         if (entity instanceof Clearable) {
             ((Clearable) entity).clearContent();
             return true;

worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightFaweAdapter.java

@@ -486,7 +486,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
         net.minecraft.world.level.block.state.BlockState blockState1 = Block.stateById(internalId);
         return blockState1.hasPostProcess(
                 getServerLevel(world),
-                new BlockPos(blockVector3.getX(), blockVector3.getY(), blockVector3.getZ())
+                new BlockPos(blockVector3.x(), blockVector3.y(), blockVector3.z())
         );
     }
 

worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightGetBlocks.java

@@ -784,9 +784,9 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                         for (final Map.Entry<BlockVector3, CompoundTag> entry : tiles.entrySet()) {
                             final CompoundTag nativeTag = entry.getValue();
                             final BlockVector3 blockHash = entry.getKey();
-                            final int x = blockHash.getX() + bx;
+                            final int x = blockHash.x() + bx;
-                            final int y = blockHash.getY();
+                            final int y = blockHash.y();
-                            final int z = blockHash.getZ() + bz;
+                            final int z = blockHash.z() + bz;
                             final BlockPos pos = new BlockPos(x, y, z);
 
                             synchronized (nmsWorld) {

worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java

@@ -558,7 +558,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public void sendFakeNBT(Player player, BlockVector3 pos, CompoundBinaryTag nbtData) {
         ((CraftPlayer) player).getHandle().connection.send(ClientboundBlockEntityDataPacket.create(
                 new StructureBlockEntity(
-                        new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()),
+                        new BlockPos(pos.x(), pos.y(), pos.z()),
                         Blocks.STRUCTURE_BLOCK.defaultBlockState()
                 ),
                 __ -> (net.minecraft.nbt.CompoundTag) fromNativeBinary(nbtData)
@@ -608,10 +608,10 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             return false;
         }
         fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, stack);
-        fakePlayer.absMoveTo(position.getBlockX(), position.getBlockY(), position.getBlockZ(),
+        fakePlayer.absMoveTo(position.x(), position.y(), position.z(),
                 (float) face.toVector().toYaw(), (float) face.toVector().toPitch());
 
-        final BlockPos blockPos = new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ());
+        final BlockPos blockPos = new BlockPos(position.x(), position.y(), position.z());
         final Vec3 blockVec = Vec3.atLowerCornerOf(blockPos);
         final net.minecraft.core.Direction enumFacing = adapt(face);
         BlockHitResult rayTrace = new BlockHitResult(blockVec, enumFacing, blockPos, false);
@@ -632,7 +632,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public boolean canPlaceAt(org.bukkit.World world, BlockVector3 position, BlockState blockState) {
         int internalId = BlockStateIdAccess.getBlockStateId(blockState);
         net.minecraft.world.level.block.state.BlockState blockData = Block.stateById(internalId);
-        return blockData.canSurvive(((CraftWorld) world).getHandle(), new BlockPos(position.getX(), position.getY(), position.getZ()));
+        return blockData.canSurvive(((CraftWorld) world).getHandle(), new BlockPos(position.x(), position.y(), position.z()));
     }
 
     @Override
@@ -753,7 +753,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
         }
 
         for (BlockVector3 vec : region) {
-            BlockPos pos = new BlockPos(vec.getBlockX(), vec.getBlockY(), vec.getBlockZ());
+            BlockPos pos = new BlockPos(vec.x(), vec.y(), vec.z());
             ChunkAccess chunk = chunks.get(new ChunkPos(pos));
             final net.minecraft.world.level.block.state.BlockState blockData = chunk.getBlockState(pos);
             int internalId = Block.getId(blockData);
@@ -766,7 +766,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             }
             extent.setBlock(vec, state.toBaseBlock());
             if (options.shouldRegenBiomes()) {
-                Biome origBiome = chunk.getNoiseBiome(vec.getX(), vec.getY(), vec.getZ()).value();
+                Biome origBiome = chunk.getNoiseBiome(vec.x(), vec.y(), vec.z()).value();
                 BiomeType adaptedBiome = adapt(serverWorld, origBiome);
                 if (adaptedBiome != null) {
                     extent.setBiome(vec, adaptedBiome);
@@ -785,7 +785,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
                 //noinspection unchecked
                 chunkLoadings.add(
                         ((CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>)
-                                getChunkFutureMethod.invoke(chunkManager, chunk.getX(), chunk.getZ(), ChunkStatus.FEATURES, true))
+                                getChunkFutureMethod.invoke(chunkManager, chunk.x(), chunk.z(), ChunkStatus.FEATURES, true))
                                 .thenApply(either -> either.left().orElse(null))
                 );
             } catch (IllegalAccessException | InvocationTargetException e) {
@@ -825,7 +825,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public boolean clearContainerBlockContents(org.bukkit.World world, BlockVector3 pt) {
         ServerLevel originalWorld = ((CraftWorld) world).getHandle();
 
-        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()));
+        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.x(), pt.y(), pt.z()));
         if (entity instanceof Clearable) {
             ((Clearable) entity).clearContent();
             return true;

worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightFaweAdapter.java

@@ -489,7 +489,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
         net.minecraft.world.level.block.state.BlockState blockState1 = Block.stateById(internalId);
         return blockState1.hasPostProcess(
                 getServerLevel(world),
-                new BlockPos(blockVector3.getX(), blockVector3.getY(), blockVector3.getZ())
+                new BlockPos(blockVector3.x(), blockVector3.y(), blockVector3.z())
         );
     }
 

worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java

@@ -771,9 +771,9 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                         for (final Map.Entry<BlockVector3, CompoundTag> entry : tiles.entrySet()) {
                             final CompoundTag nativeTag = entry.getValue();
                             final BlockVector3 blockHash = entry.getKey();
-                            final int x = blockHash.getX() + bx;
+                            final int x = blockHash.x() + bx;
-                            final int y = blockHash.getY();
+                            final int y = blockHash.y();
-                            final int z = blockHash.getZ() + bz;
+                            final int z = blockHash.z() + bz;
                             final BlockPos pos = new BlockPos(x, y, z);
 
                             synchronized (nmsWorld) {

worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R3/PaperweightAdapter.java

@@ -558,7 +558,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public void sendFakeNBT(Player player, BlockVector3 pos, CompoundBinaryTag nbtData) {
         ((CraftPlayer) player).getHandle().connection.send(ClientboundBlockEntityDataPacket.create(
                 new StructureBlockEntity(
-                        new BlockPos(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ()),
+                        new BlockPos(pos.x(), pos.y(), pos.z()),
                         Blocks.STRUCTURE_BLOCK.defaultBlockState()
                 ),
                 __ -> (net.minecraft.nbt.CompoundTag) fromNativeBinary(nbtData)
@@ -608,10 +608,10 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             return false;
         }
         fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, stack);
-        fakePlayer.absMoveTo(position.getBlockX(), position.getBlockY(), position.getBlockZ(),
+        fakePlayer.absMoveTo(position.x(), position.y(), position.z(),
                 (float) face.toVector().toYaw(), (float) face.toVector().toPitch());
 
-        final BlockPos blockPos = new BlockPos(position.getBlockX(), position.getBlockY(), position.getBlockZ());
+        final BlockPos blockPos = new BlockPos(position.x(), position.y(), position.z());
         final Vec3 blockVec = Vec3.atLowerCornerOf(blockPos);
         final net.minecraft.core.Direction enumFacing = adapt(face);
         BlockHitResult rayTrace = new BlockHitResult(blockVec, enumFacing, blockPos, false);
@@ -632,7 +632,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public boolean canPlaceAt(org.bukkit.World world, BlockVector3 position, BlockState blockState) {
         int internalId = BlockStateIdAccess.getBlockStateId(blockState);
         net.minecraft.world.level.block.state.BlockState blockData = Block.stateById(internalId);
-        return blockData.canSurvive(((CraftWorld) world).getHandle(), new BlockPos(position.getX(), position.getY(), position.getZ()));
+        return blockData.canSurvive(((CraftWorld) world).getHandle(), new BlockPos(position.x(), position.y(), position.z()));
     }
 
     @Override
@@ -753,7 +753,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
         }
 
         for (BlockVector3 vec : region) {
-            BlockPos pos = new BlockPos(vec.getBlockX(), vec.getBlockY(), vec.getBlockZ());
+            BlockPos pos = new BlockPos(vec.x(), vec.y(), vec.z());
             ChunkAccess chunk = chunks.get(new ChunkPos(pos));
             final net.minecraft.world.level.block.state.BlockState blockData = chunk.getBlockState(pos);
             int internalId = Block.getId(blockData);
@@ -766,7 +766,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             }
             extent.setBlock(vec, state.toBaseBlock());
             if (options.shouldRegenBiomes()) {
-                Biome origBiome = chunk.getNoiseBiome(vec.getX(), vec.getY(), vec.getZ()).value();
+                Biome origBiome = chunk.getNoiseBiome(vec.x(), vec.y(), vec.z()).value();
                 BiomeType adaptedBiome = adapt(serverWorld, origBiome);
                 if (adaptedBiome != null) {
                     extent.setBiome(vec, adaptedBiome);
@@ -785,7 +785,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
                 //noinspection unchecked
                 chunkLoadings.add(
                         ((CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>>)
-                                getChunkFutureMethod.invoke(chunkManager, chunk.getX(), chunk.getZ(), ChunkStatus.FEATURES, true))
+                                getChunkFutureMethod.invoke(chunkManager, chunk.x(), chunk.z(), ChunkStatus.FEATURES, true))
                                 .thenApply(either -> either.left().orElse(null))
                 );
             } catch (IllegalAccessException | InvocationTargetException e) {
@@ -825,7 +825,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public boolean clearContainerBlockContents(org.bukkit.World world, BlockVector3 pt) {
         ServerLevel originalWorld = ((CraftWorld) world).getHandle();
 
-        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()));
+        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.x(), pt.y(), pt.z()));
         if (entity instanceof Clearable) {
             ((Clearable) entity).clearContent();
             return true;

worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightFaweAdapter.java

@@ -489,7 +489,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
         net.minecraft.world.level.block.state.BlockState blockState1 = Block.stateById(internalId);
         return blockState1.hasPostProcess(
                 getServerLevel(world),
-                new BlockPos(blockVector3.getX(), blockVector3.getY(), blockVector3.getZ())
+                new BlockPos(blockVector3.x(), blockVector3.y(), blockVector3.z())
         );
     }
 

worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightGetBlocks.java

@@ -771,9 +771,9 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                         for (final Map.Entry<BlockVector3, CompoundTag> entry : tiles.entrySet()) {
                             final CompoundTag nativeTag = entry.getValue();
                             final BlockVector3 blockHash = entry.getKey();
-                            final int x = blockHash.getX() + bx;
+                            final int x = blockHash.x() + bx;
-                            final int y = blockHash.getY();
+                            final int y = blockHash.y();
-                            final int z = blockHash.getZ() + bz;
+                            final int z = blockHash.z() + bz;
                             final BlockPos pos = new BlockPos(x, y, z);
 
                             synchronized (nmsWorld) {

worldedit-bukkit/adapters/adapter-1_20_5/build.gradle.kts

@@ -12,6 +12,6 @@ repositories {
 
 dependencies {
     // url=https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/
-    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.6-R0.1-20240516.001739-55")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.20.6-R0.1-20240526.222003-87")
     compileOnly(libs.paperlib)
 }

worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightAdapter.java

@@ -577,7 +577,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     @Override
     public void sendFakeNBT(Player player, BlockVector3 pos, CompoundBinaryTag nbtData) {
         var structureBlock = new StructureBlockEntity(
-                new BlockPos(pos.getX(), pos.getY(), pos.getZ()),
+                new BlockPos(pos.x(), pos.y(), pos.z()),
                 Blocks.STRUCTURE_BLOCK.defaultBlockState()
         );
         structureBlock.setLevel(((CraftPlayer) player).getHandle().level());
@@ -644,11 +644,11 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             return false;
         }
         fakePlayer.setItemInHand(InteractionHand.MAIN_HAND, stack);
-        fakePlayer.absMoveTo(position.getX(), position.getY(), position.getZ(),
+        fakePlayer.absMoveTo(position.x(), position.y(), position.z(),
                 (float) face.toVector().toYaw(), (float) face.toVector().toPitch()
         );
 
-        final BlockPos blockPos = new BlockPos(position.getX(), position.getY(), position.getZ());
+        final BlockPos blockPos = new BlockPos(position.x(), position.y(), position.z());
         final Vec3 blockVec = Vec3.atLowerCornerOf(blockPos);
         final net.minecraft.core.Direction enumFacing = adapt(face);
         BlockHitResult rayTrace = new BlockHitResult(blockVec, enumFacing, blockPos, false);
@@ -674,7 +674,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
         net.minecraft.world.level.block.state.BlockState blockData = Block.stateById(internalId);
         return blockData.canSurvive(
                 ((CraftWorld) world).getHandle(),
-                new BlockPos(position.getX(), position.getY(), position.getZ())
+                new BlockPos(position.x(), position.y(), position.z())
         );
     }
 
@@ -802,7 +802,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
         }
 
         for (BlockVector3 vec : region) {
-            BlockPos pos = new BlockPos(vec.getBlockX(), vec.getBlockY(), vec.getBlockZ());
+            BlockPos pos = new BlockPos(vec.x(), vec.y(), vec.z());
             ChunkAccess chunk = chunks.get(new ChunkPos(pos));
             final net.minecraft.world.level.block.state.BlockState blockData = chunk.getBlockState(pos);
             int internalId = Block.getId(blockData);
@@ -815,7 +815,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
             }
             extent.setBlock(vec, state.toBaseBlock());
             if (options.shouldRegenBiomes()) {
-                Biome origBiome = chunk.getNoiseBiome(vec.getX(), vec.getY(), vec.getZ()).value();
+                Biome origBiome = chunk.getNoiseBiome(vec.x(), vec.y(), vec.z()).value();
                 BiomeType adaptedBiome = adapt(serverWorld, origBiome);
                 if (adaptedBiome != null) {
                     extent.setBiome(vec, adaptedBiome);
@@ -834,7 +834,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
                 //noinspection unchecked
                 chunkLoadings.add(
                         ((CompletableFuture<ChunkResult<ChunkAccess>>)
-                                getChunkFutureMethod.invoke(chunkManager, chunk.getX(), chunk.getZ(), ChunkStatus.FEATURES, true))
+                                getChunkFutureMethod.invoke(chunkManager, chunk.x(), chunk.z(), ChunkStatus.FEATURES, true))
                                 .thenApply(either -> either.orElse(null))
                 );
             } catch (IllegalAccessException | InvocationTargetException e) {
@@ -874,7 +874,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter<net.minecraft
     public boolean clearContainerBlockContents(org.bukkit.World world, BlockVector3 pt) {
         ServerLevel originalWorld = ((CraftWorld) world).getHandle();
 
-        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()));
+        BlockEntity entity = originalWorld.getBlockEntity(new BlockPos(pt.x(), pt.y(), pt.z()));
         if (entity instanceof Clearable) {
             ((Clearable) entity).clearContent();
             return true;

worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightFaweAdapter.java

@@ -497,7 +497,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
         net.minecraft.world.level.block.state.BlockState blockState1 = Block.stateById(internalId);
         return blockState1.hasPostProcess(
                 getServerLevel(world),
-                new BlockPos(blockVector3.getX(), blockVector3.getY(), blockVector3.getZ())
+                new BlockPos(blockVector3.x(), blockVector3.y(), blockVector3.z())
         );
     }
 

worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks.java

@@ -773,9 +773,9 @@ public class PaperweightGetBlocks extends CharGetBlocks implements BukkitGetBloc
                         for (final Map.Entry<BlockVector3, CompoundTag> entry : tiles.entrySet()) {
                             final CompoundTag nativeTag = entry.getValue();
                             final BlockVector3 blockHash = entry.getKey();
-                            final int x = blockHash.getX() + bx;
+                            final int x = blockHash.x() + bx;
-                            final int y = blockHash.getY();
+                            final int y = blockHash.y();
-                            final int z = blockHash.getZ() + bz;
+                            final int z = blockHash.z() + bz;
                             final BlockPos pos = new BlockPos(x, y, z);
 
                             synchronized (nmsWorld) {

worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightPlatformAdapter.java

@@ -345,10 +345,8 @@ public final class PaperweightPlatformAdapter extends NMSAdapter {
                     .getChunkSource()
                     .getChunkAtIfLoadedImmediately(chunkX, chunkZ);
         } else {
-            levelChunk = ((Optional<LevelChunk>) ((Either) chunkHolder
+            levelChunk = chunkHolder.getTickingChunkFuture()
-                    .getTickingChunkFuture() // method is not present with new paper chunk system
+                    .getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK).orElse(null);
-                    .getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left())
-                    .orElse(null);
         }
         if (levelChunk == null) {
             return;

worldedit-bukkit/build.gradle.kts

@@ -179,7 +179,7 @@ tasks.named<ShadowJar>("shadowJar") {
             include(dependency("org.lz4:lz4-java:1.8.0"))
         }
         relocate("net.kyori", "com.fastasyncworldedit.core.adventure") {
-            include(dependency("net.kyori:adventure-nbt:4.16.0"))
+            include(dependency("net.kyori:adventure-nbt:4.17.0"))
         }
         relocate("com.zaxxer", "com.fastasyncworldedit.core.math") {
             include(dependency("com.zaxxer:SparseBitSet:1.3"))

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/IBukkitAdapter.java

@@ -99,7 +99,7 @@ public interface IBukkitAdapter {
         checkNotNull(position);
         return new org.bukkit.Location(
                 world,
-                position.getX(), position.getY(), position.getZ()
+                position.x(), position.y(), position.z()
         );
     }
 
@@ -119,7 +119,7 @@ public interface IBukkitAdapter {
         checkNotNull(location);
         return new org.bukkit.Location(
                 world,
-                location.getX(), location.getY(), location.getZ(),
+                location.x(), location.y(), location.z(),
                 location.getYaw(),
                 location.getPitch()
         );

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/Regenerator.java

@@ -354,7 +354,7 @@ public abstract class Regenerator<IChunkAccess, ProtoChunk extends IChunkAccess,
 
         @Override
         public boolean apply(final Extent extent, final BlockVector3 get, final BlockVector3 set) throws WorldEditException {
-            return extent.setBlock(set.getX(), set.getY(), set.getZ(), source.getFullBlock(get.getX(), get.getY(), get.getZ()));
+            return extent.setBlock(set.x(), set.y(), set.z(), source.getFullBlock(get.x(), get.y(), get.z()));
         }
 
     }
@@ -374,8 +374,8 @@ public abstract class Regenerator<IChunkAccess, ProtoChunk extends IChunkAccess,
 
         @Override
         public boolean apply(final Extent extent, final BlockVector3 get, final BlockVector3 set) throws WorldEditException {
-            return extent.setBlock(set.getX(), set.getY(), set.getZ(), source.getFullBlock(get.getX(), get.getY(), get.getZ()))
+            return extent.setBlock(set.x(), set.y(), set.z(), source.getFullBlock(get.x(), get.y(), get.z()))
-                    && extent.setBiome(set.getX(), set.getY(), set.getZ(), biomeGetter.apply(get));
+                    && extent.setBiome(set.x(), set.y(), set.z(), biomeGetter.apply(get));
         }
 
     }
@@ -468,22 +468,22 @@ public abstract class Regenerator<IChunkAccess, ProtoChunk extends IChunkAccess,
     private long[] getChunkCoordsRegen(Region region, int border) { //needs to be square num of chunks
         BlockVector3 oldMin = region.getMinimumPoint();
         BlockVector3 newMin = BlockVector3.at(
-                (oldMin.getX() >> 4 << 4) - border * 16,
+                (oldMin.x() >> 4 << 4) - border * 16,
-                oldMin.getY(),
+                oldMin.y(),
-                (oldMin.getZ() >> 4 << 4) - border * 16
+                (oldMin.z() >> 4 << 4) - border * 16
         );
         BlockVector3 oldMax = region.getMaximumPoint();
         BlockVector3 newMax = BlockVector3.at(
-                (oldMax.getX() >> 4 << 4) + (border + 1) * 16 - 1,
+                (oldMax.x() >> 4 << 4) + (border + 1) * 16 - 1,
-                oldMax.getY(),
+                oldMax.y(),
-                (oldMax.getZ() >> 4 << 4) + (border + 1) * 16 - 1
+                (oldMax.z() >> 4 << 4) + (border + 1) * 16 - 1
         );
         Region adjustedRegion = new CuboidRegion(newMin, newMax);
         return adjustedRegion.getChunks().stream()
                 .sorted(Comparator
-                        .comparingInt(BlockVector2::getZ)
+                        .comparingInt(BlockVector2::z)
-                        .thenComparingInt(BlockVector2::getX)) //needed for RegionLimitedWorldAccess
+                        .thenComparingInt(BlockVector2::x)) //needed for RegionLimitedWorldAccess
-                .mapToLong(c -> MathMan.pairInt(c.getX(), c.getZ()))
+                .mapToLong(c -> MathMan.pairInt(c.x(), c.z()))
                 .toArray();
     }
 

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/WorldGuardFeature.java

@@ -56,7 +56,7 @@ public class WorldGuardFeature extends BukkitMaskManager implements Listener {
         if (region instanceof ProtectedPolygonalRegion casted) {
             BlockVector3 max = region.getMaximumPoint();
             BlockVector3 min = region.getMinimumPoint();
-            return new Polygonal2DRegion(null, casted.getPoints(), min.getBlockY(), max.getBlockY());
+            return new Polygonal2DRegion(null, casted.getPoints(), min.y(), max.y());
         }
         return new AdaptedRegion(region);
     }

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/plotsquared/FaweDelegateSchematicHandler.java

@@ -94,15 +94,15 @@ public class FaweDelegateSchematicHandler {
                 return;
             }
             BlockVector3 dimension = schematic.getClipboard().getDimensions();
-            final int WIDTH = dimension.getX();
+            final int WIDTH = dimension.x();
-            final int LENGTH = dimension.getZ();
+            final int LENGTH = dimension.z();
-            final int HEIGHT = dimension.getY();
+            final int HEIGHT = dimension.y();
             final int worldHeight = plot.getArea().getMaxGenHeight() - plot.getArea().getMinGenHeight() + 1;
             // Validate dimensions
             CuboidRegion region = plot.getLargestRegion();
             boolean sizeMismatch =
-                    ((region.getMaximumPoint().getX() - region.getMinimumPoint().getX() + xOffset + 1) < WIDTH) || (
+                    ((region.getMaximumPoint().x() - region.getMinimumPoint().x() + xOffset + 1) < WIDTH) || (
-                            (region.getMaximumPoint().getZ() - region.getMinimumPoint().getZ() + zOffset + 1) < LENGTH) || (HEIGHT
+                            (region.getMaximumPoint().z() - region.getMinimumPoint().z() + zOffset + 1) < LENGTH) || (HEIGHT
                             > worldHeight);
             if (!Settings.Schematics.PASTE_MISMATCHES && sizeMismatch) {
                 if (actor != null) {
@@ -111,8 +111,8 @@ public class FaweDelegateSchematicHandler {
                 TaskManager.runTask(whenDone);
                 return;
             }
-            if (((region.getMaximumPoint().getX() - region.getMinimumPoint().getX() + xOffset + 1) < WIDTH) || (
+            if (((region.getMaximumPoint().x() - region.getMinimumPoint().x() + xOffset + 1) < WIDTH) || (
-                    (region.getMaximumPoint().getZ() - region.getMinimumPoint().getZ() + zOffset + 1) < LENGTH) || (HEIGHT
+                    (region.getMaximumPoint().z() - region.getMinimumPoint().z() + zOffset + 1) < LENGTH) || (HEIGHT
                     > worldHeight)) {
                 if (whenDone != null) {
                     TaskManager.runTask(whenDone);
@@ -141,7 +141,7 @@ public class FaweDelegateSchematicHandler {
                         } else {
                             y_offset_actual = yOffset + pw.getMinBuildHeight() + editSession.getHighestTerrainBlock(region
                                     .getMinimumPoint()
-                                    .getX() + 1, region.getMinimumPoint().getZ() + 1, pw.getMinGenHeight(), pw.getMaxGenHeight()
+                                    .x() + 1, region.getMinimumPoint().z() + 1, pw.getMinGenHeight(), pw.getMaxGenHeight()
                             );
                         }
                     }
@@ -150,7 +150,7 @@ public class FaweDelegateSchematicHandler {
                 }
 
                 final BlockVector3 to = BlockVector3
-                        .at(region.getMinimumPoint().getX() + xOffset, y_offset_actual, region.getMinimumPoint().getZ() + zOffset);
+                        .at(region.getMinimumPoint().x() + xOffset, y_offset_actual, region.getMinimumPoint().z() + zOffset);
                 final Clipboard clipboard = schematic.getClipboard();
                 clipboard.setOrigin(clipboard.getRegion().getMinimumPoint());
                 clipboard.paste(editSession, to, true, false, true);

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/plotsquared/PlotSquaredFeature.java

@@ -159,8 +159,8 @@ public class PlotSquaredFeature extends FaweMaskManager {
             regions = WEManager.getMask(pp);
             if (regions.size() == 1) {
                 CuboidRegion region = regions.iterator().next();
-                if (region.getMinimumPoint().getX() == Integer.MIN_VALUE
+                if (region.getMinimumPoint().x() == Integer.MIN_VALUE
-                        && region.getMaximumPoint().getX() == Integer.MAX_VALUE) {
+                        && region.getMaximumPoint().x() == Integer.MAX_VALUE) {
                     regions.clear();
                 }
             }

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java

@@ -240,7 +240,7 @@ public enum BukkitAdapter {
         Vector3 position = location;
         return new org.bukkit.Location(
                 adapt((World) location.getExtent()),
-                position.getX(), position.getY(), position.getZ(),
+                position.x(), position.y(), position.z(),
                 location.getYaw(),
                 location.getPitch()
         );
@@ -258,7 +258,7 @@ public enum BukkitAdapter {
         checkNotNull(position);
         return new org.bukkit.Location(
                 world,
-                position.getX(), position.getY(), position.getZ()
+                position.x(), position.y(), position.z()
         );
     }
 
@@ -274,7 +274,7 @@ public enum BukkitAdapter {
         checkNotNull(position);
         return new org.bukkit.Location(
                 world,
-                position.getX(), position.getY(), position.getZ()
+                position.x(), position.y(), position.z()
         );
     }
 
@@ -290,7 +290,7 @@ public enum BukkitAdapter {
         checkNotNull(location);
         return new org.bukkit.Location(
                 world,
-                location.getX(), location.getY(), location.getZ(),
+                location.x(), location.y(), location.z(),
                 location.getYaw(),
                 location.getPitch()
         );

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitPlayer.java

@@ -242,9 +242,9 @@ public class BukkitPlayer extends AbstractPlayerActor {
         //FAWE end
         return TaskManager.taskManager().sync(() -> player.teleport(new Location(
                 finalWorld,
-                pos.getX(),
+                pos.x(),
-                pos.getY(),
+                pos.y(),
-                pos.getZ(),
+                pos.z(),
                 yaw,
                 pitch
         )));
@@ -422,7 +422,7 @@ public class BukkitPlayer extends AbstractPlayerActor {
 
     @Override
     public <B extends BlockStateHolder<B>> void sendFakeBlock(BlockVector3 pos, B block) {
-        Location loc = new Location(player.getWorld(), pos.getX(), pos.getY(), pos.getZ());
+        Location loc = new Location(player.getWorld(), pos.x(), pos.y(), pos.z());
         if (block == null) {
             player.sendBlockChange(loc, player.getWorld().getBlockAt(loc).getBlockData());
         } else {

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java

@@ -249,7 +249,7 @@ public class BukkitWorld extends AbstractWorld {
         //FAWE start - safe edit region
         testCoords(pt);
         //FAWE end
-        return getWorld().getBlockAt(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()).getLightLevel();
+        return getWorld().getBlockAt(pt.x(), pt.y(), pt.z()).getLightLevel();
     }
 
     @Override
@@ -286,7 +286,7 @@ public class BukkitWorld extends AbstractWorld {
             return false;
         }
 
-        Block block = getWorld().getBlockAt(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ());
+        Block block = getWorld().getBlockAt(pt.x(), pt.y(), pt.z());
         BlockState state = PaperLib.getBlockState(block, false).getState();
         if (!(state instanceof InventoryHolder)) {
             return false;
@@ -365,8 +365,8 @@ public class BukkitWorld extends AbstractWorld {
         //FAWE end
         World world = getWorld();
         //FAWE start
-        int X = pt.getBlockX() >> 4;
+        int X = pt.x() >> 4;
-        int Z = pt.getBlockZ() >> 4;
+        int Z = pt.z() >> 4;
         if (Fawe.isMainThread()) {
             world.getChunkAt(X, Z);
         } else if (PaperLib.isPaper()) {
@@ -415,7 +415,7 @@ public class BukkitWorld extends AbstractWorld {
     public void fixAfterFastMode(Iterable<BlockVector2> chunks) {
         World world = getWorld();
         for (BlockVector2 chunkPos : chunks) {
-            world.refreshChunk(chunkPos.getBlockX(), chunkPos.getBlockZ());
+            world.refreshChunk(chunkPos.x(), chunkPos.z());
         }
     }
 
@@ -497,13 +497,13 @@ public class BukkitWorld extends AbstractWorld {
         //FAWE start - safe edit region
         testCoords(pt);
         //FAWE end
-        getWorld().getBlockAt(pt.getBlockX(), pt.getBlockY(), pt.getBlockZ()).breakNaturally();
+        getWorld().getBlockAt(pt.x(), pt.y(), pt.z()).breakNaturally();
     }
 
     //FAWE start
     @Override
     public Collection<BaseItemStack> getBlockDrops(BlockVector3 position) {
-        return getWorld().getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ()).getDrops().stream()
+        return getWorld().getBlockAt(position.x(), position.y(), position.z()).getDrops().stream()
                 .map(BukkitAdapter::adapt).collect(Collectors.toList());
     }
     //FAWE end
@@ -560,7 +560,7 @@ public class BukkitWorld extends AbstractWorld {
             }
         }
         if (WorldEditPlugin.getInstance().getLocalConfiguration().unsupportedVersionEditing) {
-            Block bukkitBlock = getWorld().getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());
+            Block bukkitBlock = getWorld().getBlockAt(position.x(), position.y(), position.z());
             return BukkitAdapter.adapt(bukkitBlock.getBlockData());
         } else {
             throw new RuntimeException(new UnsupportedVersionEditException());
@@ -584,7 +584,7 @@ public class BukkitWorld extends AbstractWorld {
                 }
             }
         }
-        Block bukkitBlock = getWorld().getBlockAt(position.getBlockX(), position.getBlockY(), position.getBlockZ());
+        Block bukkitBlock = getWorld().getBlockAt(position.x(), position.y(), position.z());
         bukkitBlock.setBlockData(BukkitAdapter.adapt(block), sideEffects.doesApplyAny());
         return true;
     }
@@ -606,8 +606,8 @@ public class BukkitWorld extends AbstractWorld {
         if (!Settings.settings().REGION_RESTRICTIONS_OPTIONS.RESTRICT_TO_SAFE_RANGE) {
             return;
         }
-        int x = position.getX();
+        int x = position.x();
-        int z = position.getZ();
+        int z = position.z();
         if (x > 30000000 || z > 30000000 || x < -30000000 || z < -30000000) {
             throw FaweCache.OUTSIDE_SAFE_REGION;
         }
@@ -658,9 +658,9 @@ public class BukkitWorld extends AbstractWorld {
         testCoords(position);
         //FAWE end
         if (HAS_3D_BIOMES) {
-            return BukkitAdapter.adapt(getWorld().getBiome(position.getBlockX(), position.getBlockY(), position.getBlockZ()));
+            return BukkitAdapter.adapt(getWorld().getBiome(position.x(), position.y(), position.z()));
         } else {
-            return BukkitAdapter.adapt(getWorld().getBiome(position.getBlockX(), position.getBlockZ()));
+            return BukkitAdapter.adapt(getWorld().getBiome(position.x(), position.z()));
         }
     }
 
@@ -671,9 +671,9 @@ public class BukkitWorld extends AbstractWorld {
         testCoords(position);
         //FAWE end
         if (HAS_3D_BIOMES) {
-            getWorld().setBiome(position.getBlockX(), position.getBlockY(), position.getBlockZ(), BukkitAdapter.adapt(biome));
+            getWorld().setBiome(position.x(), position.y(), position.z(), BukkitAdapter.adapt(biome));
         } else {
-            getWorld().setBiome(position.getBlockX(), position.getBlockZ(), BukkitAdapter.adapt(biome));
+            getWorld().setBiome(position.x(), position.z(), BukkitAdapter.adapt(biome));
         }
         return true;
     }

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -120,7 +120,6 @@ public class WorldEditPlugin extends JavaPlugin {
     public void onLoad() {
 
         //FAWE start
-        this.bukkitConsoleCommandSender = new BukkitCommandSender(this, Bukkit.getConsoleSender());
         // This is already covered by Spigot, however, a more pesky warning with a proper explanation over "Ambiguous plugin name..." can't hurt.
         Plugin[] plugins = Bukkit.getServer().getPluginManager().getPlugins();
         for (Plugin p : plugins) {
@@ -138,6 +137,14 @@ public class WorldEditPlugin extends JavaPlugin {
         //noinspection ResultOfMethodCallIgnored
         getDataFolder().mkdirs();
 
+        //FAWE start - Modify WorldEdit config name
+        config = new BukkitConfiguration(new YAMLProcessor(new File(getDataFolder(), "worldedit-config.yml"), true), this);
+        // Load config before we say we've loaded platforms as it is used in listeners of the event
+        // Load config in onLoad to ensure it is loaded before FAWE settings to allow (inelegant) copying of values across
+        // where needed
+        config.load();
+        //FAWE end
+
         WorldEdit worldEdit = WorldEdit.getInstance();
 
         // Setup platform
@@ -148,14 +155,14 @@ public class WorldEditPlugin extends JavaPlugin {
         migrateLegacyConfig();
         //FAWE end
 
-        //FAWE start - Modify WorldEdit config name
-        config = new BukkitConfiguration(new YAMLProcessor(new File(getDataFolder(), "worldedit-config.yml"), true), this);
-        //FAWE end
-
         //FAWE start - Setup permission attachments
         permissionAttachmentManager = new BukkitPermissionAttachmentManager(this);
         //FAWE end
 
+        //FAWE start - initialise bukkitConsoleCommandSender later
+        this.bukkitConsoleCommandSender = new BukkitCommandSender(this, Bukkit.getConsoleSender());
+        //FAWE end
+
         Path delChunks = Paths.get(getDataFolder().getPath(), DELCHUNKS_FILE_NAME);
         if (Files.exists(delChunks)) {
             ChunkDeleter.runFromFile(delChunks, true);
@@ -189,8 +196,6 @@ public class WorldEditPlugin extends JavaPlugin {
         new FaweBukkit(this);
         //FAWE end
 
-        config.load(); // Load config before we say we've loaded platforms as it is used in listeners of the event
-
         WorldEdit.getInstance().getEventBus().post(new PlatformsRegisteredEvent());
 
         PermissionsResolverManager.initialize(this); // Setup permission resolver

worldedit-bukkit/src/main/resources/defaults/worldedit-config.yml

@@ -24,11 +24,13 @@ limits:
   max-polygonal-points:
     default: -1
     maximum: 20
+  # radius, superpickaxe, brush radius are ignored, use FAWE config limits
   max-radius: -1
   max-super-pickaxe-size: 5
   max-brush-radius: 100
   butcher-radius:
     default: -1
+    # Ignored, use FAWE config limits
     maximum: -1
   disallowed-blocks:
     - "minecraft:wheat"

worldedit-core/src/main/java/com/fastasyncworldedit/core/FaweAPI.java

@@ -339,11 +339,11 @@ public class FaweAPI {
         final BlockVector3 bot = selection.getMinimumPoint();
         final BlockVector3 top = selection.getMaximumPoint();
 
-        final int minX = bot.getBlockX() >> 4;
+        final int minX = bot.x() >> 4;
-        final int minZ = bot.getBlockZ() >> 4;
+        final int minZ = bot.z() >> 4;
 
-        final int maxX = top.getBlockX() >> 4;
+        final int maxX = top.x() >> 4;
-        final int maxZ = top.getBlockZ() >> 4;
+        final int maxZ = top.z() >> 4;
 
         int count = 0;
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/BlendBall.java

@@ -50,9 +50,9 @@ public class BlendBall implements Brush {
         final int outsetSize = (int) (size + 1);
         double brushSizeSquared = size * size;
 
-        int tx = position.getBlockX();
+        int tx = position.x();
-        int ty = position.getBlockY();
+        int ty = position.y();
-        int tz = position.getBlockZ();
+        int tz = position.z();
 
         int[] frequency = new int[BlockTypes.size()];
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/CatenaryBrush.java

@@ -81,9 +81,9 @@ public class CatenaryBrush implements Brush, ResettableTool {
             return pos1.add(pos2).divide(2).toBlockPoint();
         }
         double curveLen = pos1.distance(pos2) * lenPercent;
-        double dy = pos2.getY() - pos1.getY();
+        double dy = pos2.y() - pos1.y();
-        double dx = pos2.getX() - pos1.getX();
+        double dx = pos2.x() - pos1.x();
-        double dz = pos2.getZ() - pos1.getZ();
+        double dz = pos2.z() - pos1.z();
         double dh = Math.sqrt(dx * dx + dz * dz);
         double g = Math.sqrt(curveLen * curveLen - dy * dy) / 2;
         double a = 0.00001;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/CommandBrush.java

@@ -54,9 +54,9 @@ public class CommandBrush implements Brush {
                 position.subtract(radius, radius, radius),
                 position.add(radius, radius, radius)
         );
-        String replaced = command.replace("{x}", Integer.toString(position.getBlockX()))
+        String replaced = command.replace("{x}", Integer.toString(position.x()))
-                .replace("{y}", Integer.toString(position.getBlockY()))
+                .replace("{y}", Integer.toString(position.y()))
-                .replace("{z}", Integer.toString(position.getBlockZ()))
+                .replace("{z}", Integer.toString(position.z()))
                 .replace("{world}", editSession.getWorld().getName())
                 .replace("{size}", Integer.toString(radius));
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/CopyPastaBrush.java

@@ -65,11 +65,11 @@ public class CopyPastaBrush implements Brush, ResettableTool {
                 mask = Masks.alwaysTrue();
             }
             final ResizableClipboardBuilder builder = new ResizableClipboardBuilder(editSession.getWorld());
-            final int minY = position.getBlockY();
+            final int minY = position.y();
             mask = new AbstractDelegateMask(mask) {
                 @Override
                 public boolean test(BlockVector3 vector) {
-                    if (super.test(vector) && vector.getBlockY() >= minY) {
+                    if (super.test(vector) && vector.y() >= minY) {
                         BaseBlock block = editSession.getFullBlock(vector);
                         if (!block.getBlockType().getMaterial().isAir()) {
                             builder.add(vector, BlockTypes.AIR.getDefaultState().toBaseBlock(), block);

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/ErodeBrush.java

@@ -63,9 +63,9 @@ public class ErodeBrush implements Brush {
         Clipboard buffer1 = new CPUOptimizedClipboard(region);
         Clipboard buffer2 = new CPUOptimizedClipboard(region);
 
-        final int bx = target.getBlockX();
+        final int bx = target.x();
-        final int by = target.getBlockY();
+        final int by = target.y();
-        final int bz = target.getBlockZ();
+        final int bz = target.z();
 
         for (int x = -brushSize, relx = 0; x <= brushSize && relx < buffer1.getWidth(); x++, relx++) {
             int x0 = x + bx;
@@ -106,7 +106,7 @@ public class ErodeBrush implements Brush {
 
         for (BlockVector3 pos : finalBuffer) {
             BlockState block = pos.getBlock(finalBuffer);
-            es.setBlock(pos.getX() + bx - brushSize, pos.getY() + by - brushSize, pos.getZ() + bz - brushSize, block);
+            es.setBlock(pos.x() + bx - brushSize, pos.y() + by - brushSize, pos.z() + bz - brushSize, block);
         }
     }
 
@@ -139,9 +139,9 @@ public class ErodeBrush implements Brush {
                     int highest = 1;
                     for (BlockVector3 offs : FACES_TO_CHECK) {
                         BaseBlock next = current.getFullBlock(
-                                relx + offs.getBlockX(),
+                                relx + offs.x(),
-                                rely + offs.getBlockY(),
+                                rely + offs.y(),
-                                relz + offs.getBlockZ()
+                                relz + offs.z()
                         );
                         if (!next.getBlockType().getMaterial().isMovementBlocker()) {
                             continue;
@@ -190,9 +190,9 @@ public class ErodeBrush implements Brush {
                     int total = 0;
                     for (BlockVector3 offs : FACES_TO_CHECK) {
                         BaseBlock next = current.getFullBlock(
-                                relx + offs.getBlockX(),
+                                relx + offs.x(),
-                                rely + offs.getBlockY(),
+                                rely + offs.y(),
-                                relz + offs.getBlockZ()
+                                relz + offs.z()
                         );
                         if (next.getMaterial().isMovementBlocker()) {
                             continue;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/FallingSphere.java

@@ -12,9 +12,9 @@ public class FallingSphere implements Brush {
     @Override
     public void build(EditSession editSession, BlockVector3 position, Pattern pattern, double size) throws
             MaxChangedBlocksException {
-        int px = position.getBlockX();
+        int px = position.x();
-        int py = position.getBlockY();
+        int py = position.y();
-        int pz = position.getBlockZ();
+        int pz = position.z();
         int maxY = editSession.getMaxY();
         int minY = editSession.getMinY();
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/InspectBrush.java

@@ -14,7 +14,6 @@ import com.sk89q.worldedit.command.tool.BrushTool;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
-import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.util.Location;
@@ -25,7 +24,6 @@ import com.sk89q.worldedit.util.formatting.text.event.HoverEvent;
 import com.sk89q.worldedit.util.formatting.text.format.TextColor;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BlockState;
-import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -80,9 +78,9 @@ public class InspectBrush extends BrushTool {
                 return true;
             }
             BlockVector3 target = targetVector.toBlockPoint();
-            final int x = target.getBlockX();
+            final int x = target.x();
-            final int y = target.getBlockY();
+            final int y = target.y();
-            final int z = target.getBlockZ();
+            final int z = target.z();
             World world = player.getWorld();
             RollbackDatabase db = DBHandler.dbHandler().getDatabase(world);
             int count = 0;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/RecurseBrush.java

@@ -35,7 +35,7 @@ public record RecurseBrush(boolean dfs) implements Brush {
             DFSRecursiveVisitor visitor = new DFSRecursiveVisitor(mask, replace, Integer.MAX_VALUE, Integer.MAX_VALUE) {
                 @Override
                 public boolean isVisitable(BlockVector3 from, BlockVector3 to) {
-                    int y = to.getBlockY();
+                    int y = to.y();
                     return y < maxY && radMask.test(to) && super.isVisitable(from, to);
                 }
             };
@@ -45,7 +45,7 @@ public record RecurseBrush(boolean dfs) implements Brush {
             RecursiveVisitor visitor = new RecursiveVisitor(mask, replace, radius, editSession.getMinY(), editSession.getMaxY()) {
                 @Override
                 public boolean isVisitable(BlockVector3 from, BlockVector3 to) {
-                    int y = to.getBlockY();
+                    int y = to.y();
                     return y < maxY && super.isVisitable(from, to);
                 }
             };

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/RockBrush.java

@@ -19,15 +19,15 @@ public record RockBrush(double amplitude, double frequency, Vector3 radius) impl
         double seedY = ThreadLocalRandom.current().nextDouble();
         double seedZ = ThreadLocalRandom.current().nextDouble();
 
-        int px = position.getBlockX();
+        int px = position.x();
-        int py = position.getBlockY();
+        int py = position.y();
-        int pz = position.getBlockZ();
+        int pz = position.z();
 
         double distort = this.frequency / size;
 
-        double modX = 1D / radius.getX();
+        double modX = 1D / radius.x();
-        double modY = 1D / radius.getY();
+        double modY = 1D / radius.y();
-        double modZ = 1D / radius.getZ();
+        double modZ = 1D / radius.z();
 
         int radiusSqr = (int) (size * size);
         int sizeInt = (int) size * 2;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/ScatterBrush.java

@@ -67,15 +67,15 @@ public class ScatterBrush implements Brush {
         }
         BlockVector3 patternSize = pattern.size();
         BlockVector3Set placed = BlockVector3Set.getAppropriateVectorSet(patternSize.add(distance, distance, distance));
-        placed.setOffset(position.getX(), position.getY(), position.getZ());
+        placed.setOffset(position.x(), position.y(), position.z());
         int maxFails = 1000;
         for (int i = 0; i < count; i++) {
             int index = ThreadLocalRandom.current().nextInt(length);
             BlockVector3 pos = visited.get(index);
             if (pos != null && canApply(pos)) {
-                int x = pos.getBlockX();
+                int x = pos.x();
-                int y = pos.getBlockY();
+                int y = pos.y();
-                int z = pos.getBlockZ();
+                int z = pos.z();
                 if (placed.containsRadius(x, y, z, distance)) {
                     if (maxFails-- <= 0) {
                         break;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/ScatterCommand.java

@@ -45,9 +45,9 @@ public class ScatterCommand extends ScatterBrush {
                 position.subtract(radius, radius, radius),
                 position.add(radius, radius, radius)
         );
-        String replaced = command.replace("{x}", Integer.toString(position.getBlockX()))
+        String replaced = command.replace("{x}", Integer.toString(position.x()))
-                .replace("{y}", Integer.toString(position.getBlockY()))
+                .replace("{y}", Integer.toString(position.y()))
-                .replace("{z}", Integer.toString(position.getBlockZ()))
+                .replace("{z}", Integer.toString(position.z()))
                 .replace("{world}", editSession.getWorld().getName())
                 .replace("{size}", Integer.toString(radius));
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/ScatterOverlayBrush.java

@@ -16,9 +16,9 @@ public class ScatterOverlayBrush extends ScatterBrush {
     @Override
     public void apply(EditSession editSession, LocalBlockVectorSet placed, BlockVector3 pt, Pattern p, double size) throws
             MaxChangedBlocksException {
-        final int x = pt.getBlockX();
+        final int x = pt.x();
-        final int y = pt.getBlockY();
+        final int y = pt.y();
-        final int z = pt.getBlockZ();
+        final int z = pt.z();
         BlockVector3 dir = getDirection(pt);
         if (dir == null) {
             getDir:
@@ -37,7 +37,7 @@ public class ScatterOverlayBrush extends ScatterBrush {
                 return;
             }
         }
-        editSession.setBlock(x + dir.getBlockX(), y + dir.getBlockY(), z + dir.getBlockZ(), p);
+        editSession.setBlock(x + dir.x(), y + dir.y(), z + dir.z(), p);
     }
 
 }

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/ShatterBrush.java

@@ -80,13 +80,13 @@ public class ShatterBrush extends ScatterBrush {
                     }
                     for (int i1 = 0; i1 < BreadthFirstSearch.DIAGONAL_DIRECTIONS.length; i1++) {
                         BlockVector3 direction = BreadthFirstSearch.DIAGONAL_DIRECTIONS[i1];
-                        int x2 = x + direction.getBlockX();
+                        int x2 = x + direction.x();
-                        int y2 = y + direction.getBlockY();
+                        int y2 = y + direction.y();
-                        int z2 = z + direction.getBlockZ();
+                        int z2 = z + direction.z();
                         // Check boundary
-                        int dx = position.getBlockX() - x2;
+                        int dx = position.x() - x2;
-                        int dy = position.getBlockY() - y2;
+                        int dy = position.y() - y2;
-                        int dz = position.getBlockZ() - z2;
+                        int dz = position.z() - z2;
                         int dSqr = (dx * dx) + (dy * dy) + (dz * dz);
                         if (dSqr <= radius2) {
                             BlockVector3 bv = mutable.setComponents(x2, y2, z2);

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/SplineBrush.java

@@ -130,9 +130,9 @@ public class SplineBrush implements Brush, ResettableTool {
     private Vector3 getCentroid(Collection<BlockVector3> points) {
         MutableVector3 sum = new MutableVector3();
         for (BlockVector3 p : points) {
-            sum.mutX(sum.getX() + p.getX());
+            sum.mutX(sum.x() + p.x());
-            sum.mutY(sum.getY() + p.getY());
+            sum.mutY(sum.y() + p.y());
-            sum.mutZ(sum.getZ() + p.getZ());
+            sum.mutZ(sum.z() + p.z());
         }
         return sum.multiply(1.0 / points.size());
     }

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/brush/SurfaceSpline.java

@@ -38,16 +38,16 @@ public class SurfaceSpline implements Brush {
         int minY = editSession.getMinY();
         if (path.isEmpty() || !pos.equals(path.get(path.size() - 1))) {
             int max = editSession.getNearestSurfaceTerrainBlock(
-                    pos.getBlockX(),
+                    pos.x(),
-                    pos.getBlockZ(),
+                    pos.z(),
-                    pos.getBlockY(),
+                    pos.y(),
                     minY,
                     maxY
             );
             if (max == -1) {
                 return;
             }
-            path.add(BlockVector3.at(pos.getBlockX(), max, pos.getBlockZ()));
+            path.add(BlockVector3.at(pos.x(), max, pos.z()));
             if (editSession.getActor() != null) {
                 editSession.getActor().print(Caption.of("fawe.worldedit.brush.spline.primary.2"));
             }
@@ -69,9 +69,9 @@ public class SurfaceSpline implements Brush {
         LocalBlockVectorSet vset = new LocalBlockVectorSet();
         for (double loop = 0; loop <= 1; loop += 1D / splinelength / quality) {
             final Vector3 tipv = interpol.getPosition(loop);
-            final int tipx = MathMan.roundInt(tipv.getX());
+            final int tipx = MathMan.roundInt(tipv.x());
-            final int tipz = (int) tipv.getZ();
+            final int tipz = (int) tipv.z();
-            int tipy = MathMan.roundInt(tipv.getY());
+            int tipy = MathMan.roundInt(tipv.y());
             tipy = editSession.getNearestSurfaceTerrainBlock(tipx, tipz, tipy, minY, maxY, Integer.MIN_VALUE, Integer.MAX_VALUE);
             if (tipy == Integer.MIN_VALUE || tipy == Integer.MAX_VALUE) {
                 continue;
@@ -88,15 +88,15 @@ public class SurfaceSpline implements Brush {
             LocalBlockVectorSet newSet = new LocalBlockVectorSet();
             final int ceilrad = (int) Math.ceil(radius);
             for (BlockVector3 v : vset) {
-                final int tipx = v.getBlockX();
+                final int tipx = v.x();
-                final int tipz = v.getBlockZ();
+                final int tipz = v.z();
                 for (int loopx = tipx - ceilrad; loopx <= tipx + ceilrad; loopx++) {
                     for (int loopz = tipz - ceilrad; loopz <= tipz + ceilrad; loopz++) {
                         if (MathMan.hypot2(loopx - tipx, 0, loopz - tipz) <= radius2) {
                             int y = editSession.getNearestSurfaceTerrainBlock(
                                     loopx,
                                     loopz,
-                                    v.getBlockY(),
+                                    v.y(),
                                     minY,
                                     maxY,
                                     Integer.MIN_VALUE,

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollRange.java

@@ -13,7 +13,7 @@ public class ScrollRange extends Scroll {
 
     @Override
     public boolean increment(Player player, int amount) {
-        int max = WorldEdit.getInstance().getConfiguration().maxBrushRadius;
+        int max = player.getLimit().MAX_BRUSH_RADIUS;
         int newSize = MathMan.wrap(getTool().getRange() + amount, (int) (getTool().getSize() + 1), max);
         getTool().setRange(newSize);
         return true;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/scroll/ScrollSize.java

@@ -12,7 +12,7 @@ public class ScrollSize extends Scroll {
 
     @Override
     public boolean increment(Player player, int amount) {
-        int max = WorldEdit.getInstance().getConfiguration().maxRadius;
+        int max = player.getLimit().MAX_RADIUS;
         double newSize = Math.max(0, Math.min(max == -1 ? 4095 : max, getTool().getSize() + amount));
         getTool().setSize(newSize);
         return true;

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/sweep/ClipboardSpline.java

@@ -83,7 +83,7 @@ public class ClipboardSpline extends Spline {
         Region region = clipboard.getRegion();
         BlockVector3 origin = clipboard.getOrigin();
         //        center = region.getCenter().setY(origin.getY() - 1);
-        center = region.getCenter().withY(origin.getY() - 1).toBlockPoint();
+        center = region.getCenter().withY(origin.y() - 1).toBlockPoint();
         this.centerOffset = center.subtract(center.round());
         this.center = center.subtract(centerOffset);
         this.transform = transform;
@@ -108,15 +108,15 @@ public class ClipboardSpline extends Spline {
         clipboardHolder.setTransform(transform);
 
         BlockVector3 functionOffset = target.subtract(clipboard.getOrigin());
-        final int offX = functionOffset.getBlockX();
+        final int offX = functionOffset.x();
-        final int offY = functionOffset.getBlockY();
+        final int offY = functionOffset.y();
-        final int offZ = functionOffset.getBlockZ();
+        final int offZ = functionOffset.z();
 
         Operation operation = clipboardHolder
                 .createPaste(editSession)
                 .to(target)
                 .ignoreAirBlocks(true)
-                .filter(v -> buffer.add(v.getBlockX() + offX, v.getBlockY() + offY, v.getBlockZ() + offZ))
+                .filter(v -> buffer.add(v.x() + offX, v.y() + offY, v.z() + offZ))
                 .build();
         Operations.completeLegacy(operation);
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/sweep/Spline.java

@@ -121,7 +121,7 @@ public abstract class Spline {
      * 2 dimensional "cross" product. cross2D(v1, v2) = |v1|*|v2|*sin(theta) or v1 X v2 taking Y to be 0
      */
     private double cross2D(Vector2 v1, Vector2 v2) {
-        return v1.getX() * v2.getZ() - v2.getX() * v1.getZ();
+        return v1.x() * v2.z() - v2.x() * v1.z();
     }
 
     /**
@@ -144,7 +144,7 @@ public abstract class Spline {
         // Calculate rotation from spline
 
         Vector3 deriv = interpolation.get1stDerivative(position);
-        Vector2 deriv2D = Vector2.at(deriv.getX(), deriv.getZ()).normalize();
+        Vector2 deriv2D = Vector2.at(deriv.x(), deriv.z()).normalize();
         double angle = Math.toDegrees(
                 -Math.atan2(cross2D(direction, deriv2D), direction.dot(deriv2D))
         );

worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/sweep/SweepBrush.java

@@ -79,13 +79,13 @@ public class SweepBrush implements Brush, ResettableTool {
         Clipboard clipboard = holder.getClipboard();
 
         BlockVector3 dimensions = clipboard.getDimensions();
-        double quality = Math.max(dimensions.getBlockX(), dimensions.getBlockZ());
+        double quality = Math.max(dimensions.x(), dimensions.z());
 
         AffineTransform transform = new AffineTransform();
 
         ClipboardSpline spline = new ClipboardSpline(editSession, holder, interpol, transform, nodes.size());
 
-        if (dimensions.getBlockX() > dimensions.getBlockZ()) {
+        if (dimensions.x() > dimensions.z()) {
             spline.setDirection(Vector2.at(0, 1));
         }
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Config.java

@@ -189,7 +189,7 @@ public class Config {
     /**
      * Indicates that a field should be instantiated / created.
      *
-     * @since TODO
+     * @since 2.10.0
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.FIELD})

worldedit-core/src/main/java/com/fastasyncworldedit/core/configuration/Settings.java

@@ -2,6 +2,7 @@ package com.fastasyncworldedit.core.configuration;
 
 import com.fastasyncworldedit.core.limit.FaweLimit;
 import com.fastasyncworldedit.core.limit.PropertyRemap;
+import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.registry.state.Property;
 import com.sk89q.worldedit.world.block.BlockTypesCache;
@@ -140,8 +141,22 @@ public class Settings extends Config {
                 );
                 limit.MAX_FAILS = Math.max(limit.MAX_FAILS, newLimit.MAX_FAILS != -1 ? newLimit.MAX_FAILS : Integer.MAX_VALUE);
                 limit.MAX_ITERATIONS = Math.max(
-                        limit.MAX_ITERATIONS,
+                        limit.MAX_ITERATIONS, newLimit.MAX_ITERATIONS != -1 ? newLimit.MAX_ITERATIONS : Integer.MAX_VALUE);
-                        newLimit.MAX_ITERATIONS != -1 ? newLimit.MAX_ITERATIONS : Integer.MAX_VALUE
+                limit.MAX_RADIUS = Math.max(
+                        limit.MAX_RADIUS,
+                        newLimit.MAX_RADIUS != -1 ? newLimit.MAX_RADIUS : Integer.MAX_VALUE
+                );
+                limit.MAX_SUPER_PICKAXE_SIZE = Math.max(
+                        limit.MAX_SUPER_PICKAXE_SIZE,
+                        newLimit.MAX_SUPER_PICKAXE_SIZE != -1 ? newLimit.MAX_SUPER_PICKAXE_SIZE : Integer.MAX_VALUE
+                );
+                limit.MAX_BRUSH_RADIUS = Math.max(
+                        limit.MAX_BRUSH_RADIUS,
+                        newLimit.MAX_BRUSH_RADIUS != -1 ? newLimit.MAX_BRUSH_RADIUS : Integer.MAX_VALUE
+                );
+                limit.MAX_BUTCHER_RADIUS = Math.max(
+                        limit.MAX_BUTCHER_RADIUS,
+                        newLimit.MAX_BUTCHER_RADIUS != -1 ? newLimit.MAX_BUTCHER_RADIUS : Integer.MAX_VALUE
                 );
                 limit.MAX_HISTORY = Math.max(
                         limit.MAX_HISTORY,
@@ -352,6 +367,14 @@ public class Settings extends Config {
         public int MAX_ITERATIONS = 1000;
         @Comment("Max allowed entities (e.g. cows)")
         public int MAX_ENTITIES = 1337;
+        @Comment("Max allowed radius (e.g. for //sphere)")
+        public int MAX_RADIUS = LocalConfiguration.MAX_RADIUS;
+        @Comment("Max allowed superpickaxe size")
+        public int MAX_SUPER_PICKAXE_SIZE = LocalConfiguration.MAX_SUPER_RADIUS;
+        @Comment("Max allowed brush radius")
+        public int MAX_BRUSH_RADIUS = LocalConfiguration.MAX_BRUSH_RADIUS;
+        @Comment("Max allowed butcher radius")
+        public int MAX_BUTCHER_RADIUS = LocalConfiguration.MAX_BUTCHER_RADIUS;
         @Comment({
                 "Blockstates include Banner, Beacon, BrewingStand, Chest, CommandBlock, ",
                 "CreatureSpawner, Dispenser, Dropper, EndGateway, Furnace, Hopper, Jukebox, ",

worldedit-core/src/main/java/com/fastasyncworldedit/core/database/RollbackDatabase.java

@@ -179,13 +179,13 @@ public class RollbackDatabase extends AsyncNotifyQueue {
                 }
                 try (PreparedStatement stmt = connection.prepareStatement(stmtStr.formatted(this.prefix))) {
                     stmt.setInt(1, (int) (minTime / 1000));
-                    stmt.setInt(2, pos1.getBlockX());
+                    stmt.setInt(2, pos1.x());
-                    stmt.setInt(3, pos2.getBlockX());
+                    stmt.setInt(3, pos2.x());
-                    stmt.setInt(4, pos1.getBlockZ());
+                    stmt.setInt(4, pos1.z());
-                    stmt.setInt(5, pos2.getBlockZ());
+                    stmt.setInt(5, pos2.z());
                     // Keep 128 offset for backwards-compatibility
-                    stmt.setInt(6, pos1.getBlockY() - 128);
+                    stmt.setInt(6, pos1.y() - 128);
-                    stmt.setInt(7, pos2.getBlockY() - 128);
+                    stmt.setInt(7, pos2.y() - 128);
                     if (uuid != null) {
                         byte[] uuidBytes = toBytes(uuid);
                         stmt.setBytes(8, uuidBytes);
@@ -210,13 +210,13 @@ public class RollbackDatabase extends AsyncNotifyQueue {
                                 .array();
                         stmt.setBytes(1, uuidBytes);
                         stmt.setInt(2, (int) (minTime / 1000));
-                        stmt.setInt(3, pos1.getBlockX());
+                        stmt.setInt(3, pos1.x());
-                        stmt.setInt(4, pos2.getBlockX());
+                        stmt.setInt(4, pos2.x());
-                        stmt.setInt(5, pos1.getBlockZ());
+                        stmt.setInt(5, pos1.z());
-                        stmt.setInt(6, pos2.getBlockZ());
+                        stmt.setInt(6, pos2.z());
                         // Keep 128 offset for backwards-compatibility
-                        stmt.setInt(7, pos1.getBlockY() - 128);
+                        stmt.setInt(7, pos1.y() - 128);
-                        stmt.setInt(8, pos2.getBlockY() - 128);
+                        stmt.setInt(8, pos2.y() - 128);
                     }
                 }
                 return count;
@@ -262,13 +262,13 @@ public class RollbackDatabase extends AsyncNotifyQueue {
                 BlockVector3 pos1 = change.getMinimumPoint();
                 BlockVector3 pos2 = change.getMaximumPoint();
 
-                stmt.setInt(4, pos1.getX());
+                stmt.setInt(4, pos1.x());
-                stmt.setInt(5, pos2.getX());
+                stmt.setInt(5, pos2.x());
-                stmt.setInt(6, pos1.getZ());
+                stmt.setInt(6, pos1.z());
-                stmt.setInt(7, pos2.getZ());
+                stmt.setInt(7, pos2.z());
                 // Keep 128 offset for backwards-compatibility
-                stmt.setInt(8, pos1.getY() - 128);
+                stmt.setInt(8, pos1.y() - 128);
-                stmt.setInt(9, pos2.getY() - 128);
+                stmt.setInt(9, pos2.y() - 128);
                 stmt.setString(10, change.getCommand());
                 stmt.setInt(11, change.size());
                 stmt.executeUpdate();

worldedit-core/src/main/java/com/fastasyncworldedit/core/exception/BrushRadiusLimitException.java

@@ -0,0 +1,30 @@
+/*
+ * 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.fastasyncworldedit.core.exception;
+
+/**
+ * Thrown when a maximum radius for a brush is reached.
+ */
+public class BrushRadiusLimitException extends RadiusLimitException {
+
+    public BrushRadiusLimitException(int maxBrushRadius) {
+        super(maxBrushRadius);
+    }
+}

worldedit-core/src/main/java/com/fastasyncworldedit/core/exception/RadiusLimitException.java

@@ -0,0 +1,41 @@
+/*
+ * 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.fastasyncworldedit.core.exception;
+
+import com.sk89q.worldedit.WorldEditException;
+
+/**
+ * Thrown when a maximum radius is reached, such as, for example,
+ * in the case of a sphere command.
+ */
+public class RadiusLimitException extends WorldEditException {
+
+    private final int maxRadius;
+
+    public RadiusLimitException(int maxRadius) {
+        this.maxRadius = maxRadius;
+    }
+
+    public int getMaxRadius() {
+        return maxRadius;
+    }
+    //FAWE end
+
+}

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/BlockTranslateExtent.java

@@ -24,7 +24,7 @@ public class BlockTranslateExtent extends AbstractDelegateExtent {
 
     @Override
     public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 location, T block) throws WorldEditException {
-        return getExtent().setBlock(location.getX() + dx, location.getY() + dy, location.getZ() + dz, block);
+        return getExtent().setBlock(location.x() + dx, location.y() + dy, location.z() + dz, block);
     }
 
     @Override
@@ -49,7 +49,7 @@ public class BlockTranslateExtent extends AbstractDelegateExtent {
 
     @Override
     public BlockState getBlock(BlockVector3 location) {
-        return getBlock(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+        return getBlock(location.x(), location.y(), location.z());
     }
 
     @Override

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/FaweRegionExtent.java

@@ -64,11 +64,11 @@ public abstract class FaweRegionExtent extends ResettableExtent implements IBatc
 
     @Override
     public final boolean contains(BlockVector3 p) {
-        return contains(p.getBlockX(), p.getBlockY(), p.getBlockZ());
+        return contains(p.x(), p.y(), p.z());
     }
 
     public final boolean contains(BlockVector2 p) {
-        return contains(p.getBlockX(), p.getBlockZ());
+        return contains(p.x(), p.z());
     }
 
     @Override
@@ -96,7 +96,7 @@ public abstract class FaweRegionExtent extends ResettableExtent implements IBatc
 
     @Override
     public BiomeType getBiome(BlockVector3 position) {
-        return getBiomeType(position.getX(), position.getY(), position.getZ());
+        return getBiomeType(position.x(), position.y(), position.z());
     }
 
     @Override
@@ -112,7 +112,7 @@ public abstract class FaweRegionExtent extends ResettableExtent implements IBatc
 
     @Override
     public BaseBlock getFullBlock(BlockVector3 position) {
-        return getFullBlock(position.getX(), position.getY(), position.getZ());
+        return getFullBlock(position.x(), position.y(), position.z());
     }
 
     @Override
@@ -128,7 +128,7 @@ public abstract class FaweRegionExtent extends ResettableExtent implements IBatc
 
     @Override
     public BlockState getBlock(BlockVector3 position) {
-        return getBlock(position.getX(), position.getY(), position.getZ());
+        return getBlock(position.x(), position.y(), position.z());
     }
 
     @Override

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/HistoryExtent.java

@@ -66,7 +66,7 @@ public class HistoryExtent extends AbstractDelegateExtent {
 
     @Override
     public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 location, B block) throws WorldEditException {
-        return setBlock(location.getBlockX(), location.getBlockY(), location.getBlockZ(), block);
+        return setBlock(location.x(), location.y(), location.z(), block);
     }
 
     @Nullable
@@ -111,7 +111,7 @@ public class HistoryExtent extends AbstractDelegateExtent {
     public boolean setBiome(BlockVector3 position, BiomeType newBiome) {
         BiomeType oldBiome = this.getBiome(position);
         if (!oldBiome.getId().equals(newBiome.getId())) {
-            this.changeSet.addBiomeChange(position.getBlockX(), position.getBlockY(), position.getBlockZ(), oldBiome, newBiome);
+            this.changeSet.addBiomeChange(position.x(), position.y(), position.z(), oldBiome, newBiome);
             return getExtent().setBiome(position, newBiome);
         } else {
             return false;

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/LimitExtent.java

@@ -373,12 +373,12 @@ public class LimitExtent extends AbstractDelegateExtent {
             size = ((Collection<BlockVector3>) positions).size();
         } else if (positions instanceof Region) {
             BlockVector3 dim = ((Region) positions).getDimensions();
-            size = dim.getX() * dim.getY() * dim.getZ();
+            size = dim.x() * dim.y() * dim.z();
         } else if (positions instanceof Extent) {
             BlockVector3 min = ((Extent) positions).getMinimumPoint();
             BlockVector3 max = ((Extent) positions).getMinimumPoint();
             BlockVector3 dim = max.subtract(min).add(BlockVector3.ONE);
-            size = dim.getX() * dim.getY() * dim.getZ();
+            size = dim.x() * dim.y() * dim.z();
         } else {
             ExtentFilterBlock block = new ExtentFilterBlock(this);
             for (BlockVector3 pos : positions) {

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/PositionTransformExtent.java

@@ -38,9 +38,9 @@ public class PositionTransformExtent extends ResettableExtent {
         if (min == null) {
             min = pos;
         }
-        mutable.mutX(pos.getX() - min.getX());
+        mutable.mutX(pos.x() - min.x());
-        mutable.mutY(pos.getY() - min.getY());
+        mutable.mutY(pos.y() - min.y());
-        mutable.mutZ(pos.getZ() - min.getZ());
+        mutable.mutZ(pos.z() - min.z());
         MutableVector3 tmp = new MutableVector3(transform.apply(mutable.toVector3()));
         return min.add(tmp.roundHalfUp().toBlockPoint());
     }
@@ -49,9 +49,9 @@ public class PositionTransformExtent extends ResettableExtent {
         if (min == null) {
             min = BlockVector3.at(x, y, z);
         }
-        mutable.mutX(x - min.getX());
+        mutable.mutX(x - min.x());
-        mutable.mutY(y - min.getY());
+        mutable.mutY(y - min.y());
-        mutable.mutZ(z - min.getZ());
+        mutable.mutZ(z - min.z());
         MutableVector3 tmp = new MutableVector3(transform.apply(mutable.toVector3()));
         return min.add(tmp.roundHalfUp().toBlockPoint());
     }
@@ -73,10 +73,10 @@ public class PositionTransformExtent extends ResettableExtent {
 
     @Override
     public BiomeType getBiome(BlockVector3 position) {
-        mutable.mutX(position.getBlockX());
+        mutable.mutX(position.x());
-        mutable.mutZ(position.getBlockZ());
+        mutable.mutZ(position.z());
-        mutable.mutY(position.getBlockY());
+        mutable.mutY(position.y());
-        return super.getBiome(getPos(mutable.getX(), mutable.getY(), mutable.getZ()));
+        return super.getBiome(getPos(mutable.x(), mutable.y(), mutable.z()));
     }
 
     @Override
@@ -92,10 +92,10 @@ public class PositionTransformExtent extends ResettableExtent {
 
     @Override
     public boolean setBiome(BlockVector3 position, BiomeType biome) {
-        mutable.mutX(position.getBlockX());
+        mutable.mutX(position.x());
-        mutable.mutZ(position.getBlockZ());
+        mutable.mutZ(position.z());
-        mutable.mutY(position.getBlockY());
+        mutable.mutY(position.y());
-        return super.setBiome(getPos(mutable.getX(), mutable.getY(), mutable.getZ()), biome);
+        return super.setBiome(getPos(mutable.x(), mutable.y(), mutable.z()), biome);
     }
 
     public void setTransform(Transform transform) {

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/ProcessedWEExtent.java

@@ -80,12 +80,12 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
     @Override
     public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 location, B block)
             throws WorldEditException {
-        return setBlock(location.getBlockX(), location.getBlockY(), location.getBlockZ(), block);
+        return setBlock(location.x(), location.y(), location.z(), block);
     }
 
     @Override
     public BlockState getBlock(BlockVector3 location) {
-        return getBlock(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+        return getBlock(location.x(), location.y(), location.z());
     }
 
     @Override

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/SourceMaskExtent.java

@@ -41,8 +41,8 @@ public class SourceMaskExtent extends TemporalExtent {
 
     @Override
     public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 location, T block) throws WorldEditException {
-        set(location.getBlockX(), location.getBlockY(), location.getBlockZ(), block);
+        set(location.x(), location.y(), location.z(), block);
-        return mask.test(location) && super.setBlock(location.getX(), location.getY(), location.getZ(), block);
+        return mask.test(location) && super.setBlock(location.x(), location.y(), location.z(), block);
     }
 
     @Override

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/TemporalExtent.java

@@ -44,7 +44,7 @@ public class TemporalExtent extends PassthroughExtent {
 
     @Override
     public BlockState getBlock(BlockVector3 position) {
-        if (position.getX() == x && position.getY() == y && position.getZ() == z) {
+        if (position.x() == x && position.y() == y && position.z() == z) {
             return block.toImmutableState();
         }
         return super.getBlock(position);
@@ -60,7 +60,7 @@ public class TemporalExtent extends PassthroughExtent {
 
     @Override
     public BaseBlock getFullBlock(BlockVector3 position) {
-        if (position.getX() == x && position.getY() == y && position.getZ() == z) {
+        if (position.x() == x && position.y() == y && position.z() == z) {
             if (block instanceof BaseBlock) {
                 return (BaseBlock) block;
             } else {
@@ -72,7 +72,7 @@ public class TemporalExtent extends PassthroughExtent {
 
     @Override
     public BiomeType getBiome(BlockVector3 position) {
-        if (position.getX() == bx && position.getZ() == bz) {
+        if (position.x() == bx && position.z() == bz) {
             return biome;
         }
         return super.getBiome(position);

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/TransformExtent.java

@@ -55,13 +55,13 @@ public class TransformExtent extends BlockTransformExtent {
         if (min == null) {
             min = pos;
         }
-        mutable1.mutX(pos.getX() - min.getX());
+        mutable1.mutX(pos.x() - min.x());
-        mutable1.mutY(pos.getY() - min.getY());
+        mutable1.mutY(pos.y() - min.y());
-        mutable1.mutZ(pos.getZ() - min.getZ());
+        mutable1.mutZ(pos.z() - min.z());
         Vector3 tmp = getTransform().apply(mutable1);
-        mutable2.mutX(tmp.getX() + min.getX());
+        mutable2.mutX(tmp.x() + min.x());
-        mutable2.mutY(tmp.getY() + min.getY());
+        mutable2.mutY(tmp.y() + min.y());
-        mutable2.mutZ(tmp.getZ() + min.getZ());
+        mutable2.mutZ(tmp.z() + min.z());
         return mutable2;
     }
 
@@ -69,20 +69,20 @@ public class TransformExtent extends BlockTransformExtent {
         if (min == null) {
             min = BlockVector3.at(x, y, z);
         }
-        mutable1.mutX(x - min.getX());
+        mutable1.mutX(x - min.x());
-        mutable1.mutY(y - min.getY());
+        mutable1.mutY(y - min.y());
-        mutable1.mutZ(z - min.getZ());
+        mutable1.mutZ(z - min.z());
         Vector3 tmp = getTransform().apply(mutable1);
-        mutable2.mutX(tmp.getX() + min.getX());
+        mutable2.mutX(tmp.x() + min.x());
-        mutable2.mutY(tmp.getY() + min.getY());
+        mutable2.mutY(tmp.y() + min.y());
-        mutable2.mutZ(tmp.getZ() + min.getZ());
+        mutable2.mutZ(tmp.z() + min.z());
         return tmp.toBlockPoint();
     }
 
     @Override
     public BlockState getBlock(int x, int y, int z) {
         BlockVector3 p = getPos(x, y, z);
-        return transform(super.getBlock(p.getX(), p.getY(), p.getZ()));
+        return transform(super.getBlock(p.x(), p.y(), p.z()));
     }
 
     @Override
@@ -93,7 +93,7 @@ public class TransformExtent extends BlockTransformExtent {
     @Override
     public BiomeType getBiomeType(int x, int y, int z) {
         BlockVector3 p = getPos(x, y, z);
-        return super.getBiomeType(p.getX(), y, p.getZ());
+        return super.getBiomeType(p.x(), y, p.z());
     }
 
     @Override
@@ -114,7 +114,7 @@ public class TransformExtent extends BlockTransformExtent {
     @Override
     public boolean setBiome(int x, int y, int z, BiomeType biome) {
         BlockVector3 p = getPos(x, y, z);
-        return super.setBiome(p.getX(), p.getY(), p.getZ(), biome);
+        return super.setBiome(p.x(), p.y(), p.z(), biome);
     }
 
 }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/CPUOptimizedClipboard.java

@@ -41,7 +41,7 @@ public class CPUOptimizedClipboard extends LinearClipboard {
 
     @Override
     public boolean setBiome(BlockVector3 position, BiomeType biome) {
-        return setBiome(position.getX(), position.getY(), position.getZ(), biome);
+        return setBiome(position.x(), position.y(), position.z(), biome);
     }
 
     @Override
@@ -92,7 +92,7 @@ public class CPUOptimizedClipboard extends LinearClipboard {
 
     @Override
     public BiomeType getBiome(BlockVector3 position) {
-        return getBiome(getBiomeIndex(position.getX(), position.getY(), position.getZ()));
+        return getBiome(getBiomeIndex(position.x(), position.y(), position.z()));
     }
 
     public void convertTilesToIndex() {

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/DiskOptimizedClipboard.java

@@ -359,7 +359,7 @@ public class DiskOptimizedClipboard extends LinearClipboard {
 
     @Override
     public boolean setBiome(BlockVector3 position, BiomeType biome) {
-        return setBiome(position.getX(), position.getY(), position.getZ(), biome);
+        return setBiome(position.x(), position.y(), position.z(), biome);
     }
 
     @Override
@@ -417,7 +417,7 @@ public class DiskOptimizedClipboard extends LinearClipboard {
 
     @Override
     public BiomeType getBiome(BlockVector3 position) {
-        return getBiome(getBiomeIndex(position.getX(), position.getY(), position.getZ()));
+        return getBiome(getBiomeIndex(position.x(), position.y(), position.z()));
     }
 
     public BlockArrayClipboard toClipboard() {
@@ -438,9 +438,9 @@ public class DiskOptimizedClipboard extends LinearClipboard {
         super.setOrigin(origin);
         origin = origin.subtract(offset);
         try {
-            byteBuffer.putShort(10, (short) origin.getBlockX());
+            byteBuffer.putShort(10, (short) origin.x());
-            byteBuffer.putShort(12, (short) origin.getBlockY());
+            byteBuffer.putShort(12, (short) origin.y());
-            byteBuffer.putShort(14, (short) origin.getBlockZ());
+            byteBuffer.putShort(14, (short) origin.z());
         } catch (Throwable e) {
             e.printStackTrace();
         }
@@ -450,9 +450,9 @@ public class DiskOptimizedClipboard extends LinearClipboard {
     protected void setOffset(BlockVector3 offset) {
         super.setOffset(offset);
         try {
-            byteBuffer.putShort(16, (short) offset.getBlockX());
+            byteBuffer.putShort(16, (short) offset.x());
-            byteBuffer.putShort(18, (short) offset.getBlockY());
+            byteBuffer.putShort(18, (short) offset.y());
-            byteBuffer.putShort(20, (short) offset.getBlockZ());
+            byteBuffer.putShort(20, (short) offset.z());
         } catch (Throwable e) {
             e.printStackTrace();
         }
@@ -588,9 +588,9 @@ public class DiskOptimizedClipboard extends LinearClipboard {
                                 CompoundTag data = entity.getState().getNbtData();
                                 HashMap<String, Tag> value = new HashMap<>(data.getValue());
                                 List<DoubleTag> pos = new ArrayList<>(3);
-                                pos.add(new DoubleTag(entity.getLocation().getX()));
+                                pos.add(new DoubleTag(entity.getLocation().x()));
-                                pos.add(new DoubleTag(entity.getLocation().getX()));
+                                pos.add(new DoubleTag(entity.getLocation().x()));
-                                pos.add(new DoubleTag(entity.getLocation().getX()));
+                                pos.add(new DoubleTag(entity.getLocation().x()));
                                 value.put("Pos", new ListTag(DoubleTag.class, pos));
                                 nbtOS.writeTag(new CompoundTag(value));
                             }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/MemoryOptimizedClipboard.java

@@ -64,7 +64,7 @@ public class MemoryOptimizedClipboard extends LinearClipboard {
 
     @Override
     public boolean setBiome(BlockVector3 position, BiomeType biome) {
-        return setBiome(position.getX(), position.getY(), position.getZ(), biome);
+        return setBiome(position.x(), position.y(), position.z(), biome);
     }
 
     @Override
@@ -115,7 +115,7 @@ public class MemoryOptimizedClipboard extends LinearClipboard {
 
     @Override
     public BiomeType getBiome(BlockVector3 position) {
-        return getBiome(getBiomeIndex(position.getX(), position.getY(), position.getZ()));
+        return getBiome(getBiomeIndex(position.x(), position.y(), position.z()));
     }
 
     private int getOrdinal(int index) {

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/SimpleClipboard.java

@@ -70,17 +70,17 @@ public abstract class SimpleClipboard implements Clipboard {
 
     @Override
     public final int getWidth() {
-        return size.getBlockX();
+        return size.x();
     }
 
     @Override
     public final int getHeight() {
-        return size.getBlockY();
+        return size.y();
     }
 
     @Override
     public final int getLength() {
-        return size.getBlockZ();
+        return size.z();
     }
 
     @Override

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/WorldCopyClipboard.java

@@ -56,7 +56,7 @@ public class WorldCopyClipboard extends ReadOnlyClipboard {
 
     @Override
     public BiomeType getBiome(BlockVector3 position) {
-        return getExtent().getBiomeType(position.getX(), position.getY(), position.getZ());
+        return getExtent().getBiomeType(position.x(), position.y(), position.z());
     }
 
     @Override

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicReader.java

@@ -396,8 +396,8 @@ public class FastSchematicReader extends NBTSchematicReader {
                         int locY = loc.getBlockY();
                         int locZ = loc.getBlockZ();
                         BlockVector3 max = min.add(dimensions).subtract(BlockVector3.ONE);
-                        if (locX < min.getX() || locY < min.getY() || locZ < min.getZ()
+                        if (locX < min.x() || locY < min.y() || locZ < min.z()
-                                || locX > max.getX() || locY > max.getY() || locZ > max.getZ()) {
+                                || locX > max.x() || locY > max.y() || locZ > max.z()) {
                             for (Entity e : clipboard.getEntities()) {
                                 clipboard.removeEntity(e);
                             }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/FastSchematicWriter.java

@@ -114,15 +114,15 @@ public class FastSchematicWriter implements ClipboardWriter {
 
             // The Sponge format Offset refers to the 'min' points location in the world. That's our 'Origin'
             out.writeNamedTag("Offset", new int[]{
-                    min.getBlockX(),
+                    min.x(),
-                    min.getBlockY(),
+                    min.y(),
-                    min.getBlockZ(),
+                    min.z(),
             });
 
             out.writeLazyCompoundTag("Metadata", out1 -> {
-                out1.writeNamedTag("WEOffsetX", offset.getBlockX());
+                out1.writeNamedTag("WEOffsetX", offset.x());
-                out1.writeNamedTag("WEOffsetY", offset.getBlockY());
+                out1.writeNamedTag("WEOffsetY", offset.y());
-                out1.writeNamedTag("WEOffsetZ", offset.getBlockZ());
+                out1.writeNamedTag("WEOffsetZ", offset.z());
                 out1.writeNamedTag("FAWEVersion", Fawe.instance().getVersion().build);
             });
 
@@ -162,9 +162,9 @@ public class FastSchematicWriter implements ClipboardWriter {
                     // Dum.
                     values.remove("id");
                     values.put("Pos", new IntArrayTag(new int[]{
-                            pos.getX(),
+                            pos.x(),
-                            pos.getY(),
+                            pos.y(),
-                            pos.getZ()
+                            pos.z()
                     }));
                     numTiles++;
 
@@ -282,10 +282,10 @@ public class FastSchematicWriter implements ClipboardWriter {
         int length = clipboard.getRegion().getLength();
         MutableBlockVector3 mutable = new MutableBlockVector3();
         for (int z = 0, i = 0; z < length; z++) {
-            int z0 = min.getBlockZ() + z;
+            int z0 = min.z() + z;
             for (int x = 0; x < width; x++, i++) {
-                int x0 = min.getBlockX() + x;
+                int x0 = min.x() + x;
-                BiomeType biome = clipboard.getBiome(mutable.setComponents(x0, min.getY(), z0));
+                BiomeType biome = clipboard.getBiome(mutable.setComponents(x0, min.y(), z0));
                 task.applyInt(i, biome.getInternalId());
             }
         }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/schematic/MinecraftStructure.java

@@ -213,8 +213,8 @@ public class MinecraftStructure implements ClipboardReader, ClipboardWriter {
             if (block.getBlockType() != BlockTypes.STRUCTURE_VOID) {
                 int combined = block.getInternalId();
                 int index = indexes.get(combined);
-                List<Integer> pos = Arrays.asList(point.getX() - min.getX(),
+                List<Integer> pos = Arrays.asList(point.x() - min.x(),
-                        point.getY() - min.getY(), point.getZ() - min.getZ()
+                        point.y() - min.y(), point.z() - min.z()
                 );
                 if (!block.hasNbtData()) {
                     blocks.add(FaweCache.INSTANCE.asMap("state", index, "pos", pos));
@@ -231,7 +231,7 @@ public class MinecraftStructure implements ClipboardReader, ClipboardWriter {
         ArrayList<Map<String, Object>> entities = new ArrayList<>();
         for (Entity entity : clipboard.getEntities()) {
             Location loc = entity.getLocation();
-            List<Double> pos = Arrays.asList(loc.getX(), loc.getY(), loc.getZ());
+            List<Double> pos = Arrays.asList(loc.x(), loc.y(), loc.z());
             List<Integer> blockPos = Arrays.asList(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
             BaseEntity state = entity.getState();
             if (state != null) {

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/clipboard/io/schematic/PNGWriter.java

@@ -75,9 +75,9 @@ public class PNGWriter implements ClipboardWriter {
         MutableBlockVector3 mutableLeft = new MutableBlockVector3(0, 0, 0);
 
         BlockVector3 min = clipboard.getMinimumPoint();
-        int y0 = min.getBlockY();
+        int y0 = min.y();
-        int z0 = min.getBlockZ();
+        int z0 = min.z();
-        int x0 = min.getBlockX();
+        int x0 = min.x();
         for (int x = x0; x < x0 + width; x++) {
             mutable.mutX(x);
             mutableTop.mutX(x);

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/ArrayImageMask.java

@@ -20,7 +20,7 @@ public class ArrayImageMask implements FilterBlockMask {
 
     @Override
     public boolean applyBlock(FilterBlock block) {
-        int height = image.getRGB(block.getX(), block.getZ()) & 0xFF;
+        int height = image.getRGB(block.x(), block.z()) & 0xFF;
         return height == 255 || height > 0 && !white && random.nextInt(256) <= height;
     }
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/AbstractFilterBlock.java

@@ -31,18 +31,18 @@ public abstract class AbstractFilterBlock extends FilterBlock {
     public abstract Extent getExtent();
 
     @Override
-    public int getX() {
+    public int x() {
-        return getPosition().getX();
+        return getPosition().x();
     }
 
     @Override
-    public int getY() {
+    public int y() {
-        return getPosition().getY();
+        return getPosition().y();
     }
 
     @Override
-    public int getZ() {
+    public int z() {
-        return getPosition().getZ();
+        return getPosition().z();
     }
 
     @Override
@@ -72,12 +72,12 @@ public abstract class AbstractFilterBlock extends FilterBlock {
 
     @Override
     public BlockVector3 getMinimumPoint() {
-        return at(getX(), getY(), getZ());
+        return at(x(), y(), z());
     }
 
     @Override
     public BlockVector3 getMaximumPoint() {
-        return at(getX(), getY(), getZ());
+        return at(x(), y(), z());
     }
 
     @Override
@@ -88,7 +88,7 @@ public abstract class AbstractFilterBlock extends FilterBlock {
     @Override
     public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block)
             throws WorldEditException {
-        if (x == this.getX() && y == this.getY() && z == this.getZ()) {
+        if (x == this.x() && y == this.y() && z == this.z()) {
             setFullBlock(block.toBaseBlock());
             return true;
         }
@@ -97,7 +97,7 @@ public abstract class AbstractFilterBlock extends FilterBlock {
 
     @Override
     public boolean setBiome(int x, int y, int z, BiomeType biome) {
-        if (x == this.getX() && y == this.getY() && z == this.getZ()) {
+        if (x == this.x() && y == this.y() && z == this.z()) {
             setBiome(biome);
             return true;
         }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/AbstractSingleFilterBlock.java

@@ -83,18 +83,18 @@ public abstract class AbstractSingleFilterBlock extends FilterBlock {
 
     @Override
     public BlockVector3 getMinimumPoint() {
-        return at(getX(), getY(), getZ());
+        return at(x(), y(), z());
     }
 
     @Override
     public BlockVector3 getMaximumPoint() {
-        return at(getX(), getY(), getZ());
+        return at(x(), y(), z());
     }
 
     @Override
     public <T extends BlockStateHolder<T>> boolean setBlock(int x, int y, int z, T block)
             throws WorldEditException {
-        if (x == this.getX() && y == this.getY() && z == this.getZ()) {
+        if (x == this.x() && y == this.y() && z == this.z()) {
             setFullBlock(block.toBaseBlock());
             return true;
         }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/ArrayFilterBlock.java

@@ -80,17 +80,17 @@ public class ArrayFilterBlock extends AbstractExtentFilterBlock {
     }
 
     @Override
-    public int getX() {
+    public int x() {
         return x;
     }
 
     @Override
-    public int getY() {
+    public int y() {
         return (heights[index] & 0xFF) + yOffset;
     }
 
     @Override
-    public int getZ() {
+    public int z() {
         return z;
     }
 
@@ -112,12 +112,12 @@ public class ArrayFilterBlock extends AbstractExtentFilterBlock {
 
     @Override
     public void setBiome(final BiomeType biome) {
-        getExtent().setBiome(getX(), getY(), getZ(), biome);
+        getExtent().setBiome(x(), y(), z(), biome);
     }
 
     @Override
     public BiomeType getBiome() {
-        return getExtent().getBiomeType(getX(), getY(), getZ());
+        return getExtent().getBiomeType(x(), y(), z());
     }
 
 }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/CharFilterBlock.java

@@ -190,17 +190,17 @@ public class CharFilterBlock extends ChunkFilterBlock {
     }
 
     @Override
-    public final int getX() {
+    public final int x() {
         return xx + x;
     }
 
     @Override
-    public final int getY() {
+    public final int y() {
         return yy + y;
     }
 
     @Override
-    public final int getZ() {
+    public final int z() {
         return zz + z;
     }
 
@@ -304,7 +304,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
         if (z > 0) {
             return states[getArr[index - 16]];
         }
-        return getExtent().getBlock(getX(), getY(), getZ() - 1);
+        return getExtent().getBlock(x(), y(), z() - 1);
     }
 
     @Override
@@ -312,7 +312,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
         if (x < 15) {
             return states[getArr[index + 1]];
         }
-        return getExtent().getBlock(getX() + 1, getY(), getZ());
+        return getExtent().getBlock(x() + 1, y(), z());
     }
 
     @Override
@@ -320,7 +320,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
         if (z < 15) {
             return states[getArr[index + 16]];
         }
-        return getExtent().getBlock(getX(), getY(), getZ() + 1);
+        return getExtent().getBlock(x(), y(), z() + 1);
     }
 
     @Override
@@ -328,7 +328,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
         if (x > 0) {
             return states[getArr[index - 1]];
         }
-        return getExtent().getBlock(getX() - 1, getY(), getZ());
+        return getExtent().getBlock(x() - 1, y(), z());
     }
 
     @Override
@@ -401,7 +401,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
 
     @Override
     public boolean setBiome(BlockVector3 position, BiomeType biome) {
-        return setBiome(position.getX(), position.getY(), position.getBlockZ(), biome);
+        return setBiome(position.x(), position.y(), position.z(), biome);
     }
 
     @Override

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/FilterBlock.java

@@ -73,60 +73,60 @@ public abstract class FilterBlock extends BlockVector3 implements Extent, TileEn
     }
 
     public BlockState getBlockBelow() {
-        return getBlock(getX(), getY() - 1, getZ());
+        return getBlock(x(), y() - 1, z());
     }
 
     public BlockState getBlockAbove() {
-        return getBlock(getX(), getY() + 1, getZ());
+        return getBlock(x(), y() + 1, z());
     }
 
     public BlockState getBlockNorth() {
-        return getBlock(getX(), getY(), getZ() - 1);
+        return getBlock(x(), y(), z() - 1);
     }
 
     public BlockState getBlockEast() {
-        return getBlock(getX() + 1, getY(), getZ());
+        return getBlock(x() + 1, y(), z());
     }
 
     public BlockState getBlockSouth() {
-        return getBlock(getX(), getY(), getZ() + 1);
+        return getBlock(x(), y(), z() + 1);
     }
 
     public BlockState getBlockWest() {
-        return getBlock(getX() - 1, getY(), getZ());
+        return getBlock(x() - 1, y(), z());
     }
 
     public BlockState getBlockRelativeY(int y) {
-        return getBlock(getX(), getY() + y, getZ());
+        return getBlock(x(), y() + y, z());
     }
 
     @Override
-    public abstract int getX();
+    public abstract int x();
 
     @Override
-    public abstract int getY();
+    public abstract int y();
 
     @Override
-    public abstract int getZ();
+    public abstract int z();
 
     public int getLocalX() {
-        return getX() & 15;
+        return x() & 15;
     }
 
     public int getLocalY() {
-        return getY() & 15;
+        return y() & 15;
     }
 
     public int getLocalZ() {
-        return getZ() & 15;
+        return z() & 15;
     }
 
     public int getChunkX() {
-        return getX() >> 4;
+        return x() >> 4;
     }
 
     public int getChunkZ() {
-        return getZ() >> 4;
+        return z() >> 4;
     }
 
     /*
@@ -204,7 +204,7 @@ public abstract class FilterBlock extends BlockVector3 implements Extent, TileEn
 
     @Override
     public boolean setBiome(BlockVector3 position, BiomeType biome) {
-        return setBiome(position.getX(), position.getY(), position.getZ(), biome);
+        return setBiome(position.x(), position.y(), position.z(), biome);
     }
 
 }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/SingleFilterBlock.java

@@ -17,17 +17,17 @@ public class SingleFilterBlock extends AbstractSingleFilterBlock {
     }
 
     @Override
-    public int getX() {
+    public int x() {
         return x;
     }
 
     @Override
-    public int getY() {
+    public int y() {
         return y;
     }
 
     @Override
-    public int getZ() {
+    public int z() {
         return z;
     }
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/EntityInBlockRemovingProcessor.java

@@ -30,9 +30,9 @@ public class EntityInBlockRemovingProcessor implements IBatchProcessor {
                     continue;
                 }
                 BlockVector3 pos = tag.getEntityPosition().toBlockPoint();
-                int x = pos.getX() & 15;
+                int x = pos.x() & 15;
-                int y = pos.getY();
+                int y = pos.y();
-                int z = pos.getZ() & 15;
+                int z = pos.z() & 15;
                 if (!set.hasSection(y >> 4)) {
                     continue;
                 }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/processor/lighting/NMSRelighter.java

@@ -273,9 +273,9 @@ public class NMSRelighter implements Relighter {
             int lightLevel = (int) val[1];
 
             this.computeRemoveBlockLight(
-                    node.getX() - 1,
+                    node.x() - 1,
-                    node.getY(),
+                    node.y(),
-                    node.getZ(),
+                    node.z(),
                     lightLevel,
                     lightRemovalQueue,
                     lightPropagationQueue,
@@ -283,20 +283,20 @@ public class NMSRelighter implements Relighter {
                     visited
             );
             this.computeRemoveBlockLight(
-                    node.getX() + 1,
+                    node.x() + 1,
-                    node.getY(),
+                    node.y(),
-                    node.getZ(),
+                    node.z(),
                     lightLevel,
                     lightRemovalQueue,
                     lightPropagationQueue,
                     removalVisited,
                     visited
             );
-            if (node.getY() > minY) {
+            if (node.y() > minY) {
                 this.computeRemoveBlockLight(
-                        node.getX(),
+                        node.x(),
-                        node.getY() - 1,
+                        node.y() - 1,
-                        node.getZ(),
+                        node.z(),
                         lightLevel,
                         lightRemovalQueue,
                         lightPropagationQueue,
@@ -304,11 +304,11 @@ public class NMSRelighter implements Relighter {
                         visited
                 );
             }
-            if (node.getY() < maxY) {
+            if (node.y() < maxY) {
                 this.computeRemoveBlockLight(
-                        node.getX(),
+                        node.x(),
-                        node.getY() + 1,
+                        node.y() + 1,
-                        node.getZ(),
+                        node.z(),
                         lightLevel,
                         lightRemovalQueue,
                         lightPropagationQueue,
@@ -317,9 +317,9 @@ public class NMSRelighter implements Relighter {
                 );
             }
             this.computeRemoveBlockLight(
-                    node.getX(),
+                    node.x(),
-                    node.getY(),
+                    node.y(),
-                    node.getZ() - 1,
+                    node.z() - 1,
                     lightLevel,
                     lightRemovalQueue,
                     lightPropagationQueue,
@@ -327,9 +327,9 @@ public class NMSRelighter implements Relighter {
                     visited
             );
             this.computeRemoveBlockLight(
-                    node.getX(),
+                    node.x(),
-                    node.getY(),
+                    node.y(),
-                    node.getZ() + 1,
+                    node.z() + 1,
                     lightLevel,
                     lightRemovalQueue,
                     lightPropagationQueue,
@@ -340,27 +340,27 @@ public class NMSRelighter implements Relighter {
 
         while (!lightPropagationQueue.isEmpty()) {
             MutableBlockVector3 node = lightPropagationQueue.poll();
-            ChunkHolder<?> iChunk = (ChunkHolder<?>) queue.getOrCreateChunk(node.getX() >> 4, node.getZ() >> 4);
+            ChunkHolder<?> iChunk = (ChunkHolder<?>) queue.getOrCreateChunk(node.x() >> 4, node.z() >> 4);
             if (!iChunk.isInit()) {
-                iChunk.init(queue, node.getX() >> 4, node.getZ() >> 4);
+                iChunk.init(queue, node.x() >> 4, node.z() >> 4);
             }
-            int lightLevel = iChunk.getEmittedLight(node.getX() & 15, node.getY(), node.getZ() & 15);
+            int lightLevel = iChunk.getEmittedLight(node.x() & 15, node.y(), node.z() & 15);
-            BlockState state = this.queue.getBlock(node.getX(), node.getY(), node.getZ());
+            BlockState state = this.queue.getBlock(node.x(), node.y(), node.z());
             String id = state.getBlockType().getId().toLowerCase(Locale.ROOT);
             if (lightLevel <= 1) {
                 continue;
             }
             if (id.contains("slab")) {
                 boolean top = state.getState(slabHalf).equalsIgnoreCase("top");
-                computeSlab(node.getX(), node.getY(), node.getZ(), lightLevel, lightPropagationQueue, visited, top);
+                computeSlab(node.x(), node.y(), node.z(), lightLevel, lightPropagationQueue, visited, top);
             } else if (id.contains("stair")) {
                 boolean top = state.getState(stairHalf).equalsIgnoreCase("top");
                 Direction direction = getStairDir(state);
                 String shape = getStairShape(state);
                 computeStair(
-                        node.getX(),
+                        node.x(),
-                        node.getY(),
+                        node.y(),
-                        node.getZ(),
+                        node.z(),
                         lightLevel,
                         lightPropagationQueue,
                         visited,
@@ -369,7 +369,7 @@ public class NMSRelighter implements Relighter {
                         shape
                 );
             } else {
-                computeNormal(node.getX(), node.getY(), node.getZ(), lightLevel, lightPropagationQueue, visited);
+                computeNormal(node.x(), node.y(), node.z(), lightLevel, lightPropagationQueue, visited);
             }
         }
     }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/transform/OffsetTransform.java

@@ -30,9 +30,9 @@ public class OffsetTransform extends ResettableExtent {
 
     @Override
     public boolean setBiome(BlockVector3 location, BiomeType biome) {
-        int x = location.getX() + dx;
+        int x = location.x() + dx;
-        int y = location.getX() + dy;
+        int y = location.x() + dy;
-        int z = location.getX() + dz;
+        int z = location.x() + dz;
         if (!getExtent().contains(x, y, z)) {
             return false;
         }
@@ -53,9 +53,9 @@ public class OffsetTransform extends ResettableExtent {
     @Override
     public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 location, T block)
             throws WorldEditException {
-        int x = location.getX() + dx;
+        int x = location.x() + dx;
-        int y = location.getX() + dy;
+        int y = location.x() + dy;
-        int z = location.getX() + dz;
+        int z = location.x() + dz;
         if (!getExtent().contains(x, y, z)) {
             return false;
         }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/transform/RandomOffsetTransform.java

@@ -34,9 +34,9 @@ public class RandomOffsetTransform extends ResettableExtent {
 
     @Override
     public boolean setBiome(BlockVector3 position, BiomeType biome) {
-        int x = position.getBlockX() + random.nextInt(1 + (dx << 1)) - dx;
+        int x = position.x() + random.nextInt(1 + (dx << 1)) - dx;
-        int y = position.getBlockY() + random.nextInt(1 + (dy << 1)) - dy;
+        int y = position.y() + random.nextInt(1 + (dy << 1)) - dy;
-        int z = position.getBlockZ() + random.nextInt(1 + (dz << 1)) - dz;
+        int z = position.z() + random.nextInt(1 + (dz << 1)) - dz;
         if (!getExtent().contains(x, y, z)) {
             return false;
         }
@@ -57,9 +57,9 @@ public class RandomOffsetTransform extends ResettableExtent {
     @Override
     public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 pos, T block)
             throws WorldEditException {
-        int x = pos.getBlockX() + random.nextInt(1 + (dx << 1)) - dx;
+        int x = pos.x() + random.nextInt(1 + (dx << 1)) - dx;
-        int y = pos.getBlockY() + random.nextInt(1 + (dy << 1)) - dy;
+        int y = pos.y() + random.nextInt(1 + (dy << 1)) - dy;
-        int z = pos.getBlockZ() + random.nextInt(1 + (dz << 1)) - dz;
+        int z = pos.z() + random.nextInt(1 + (dz << 1)) - dz;
         if (!getExtent().contains(x, y, z)) {
             return false;
         }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/transform/ScaleTransform.java

@@ -55,9 +55,9 @@ public class ScaleTransform extends ResettableExtent {
         if (min == null) {
             min = pos;
         }
-        mutable.mutX(min.getX() + (pos.getX() - min.getX()) * dx);
+        mutable.mutX(min.x() + (pos.x() - min.x()) * dx);
-        mutable.mutY(min.getY() + (pos.getY() - min.getY()) * dy);
+        mutable.mutY(min.y() + (pos.y() - min.y()) * dy);
-        mutable.mutZ(min.getZ() + (pos.getZ() - min.getZ()) * dz);
+        mutable.mutZ(min.z() + (pos.z() - min.z()) * dz);
         return new MutableVector3(mutable);
     }
 
@@ -65,9 +65,9 @@ public class ScaleTransform extends ResettableExtent {
         if (min == null) {
             min = BlockVector3.at(x, y, z);
         }
-        mutable.mutX(min.getX() + (x - min.getX()) * dx);
+        mutable.mutX(min.x() + (x - min.x()) * dx);
-        mutable.mutY(min.getY() + (y - min.getY()) * dy);
+        mutable.mutY(min.y() + (y - min.y()) * dy);
-        mutable.mutZ(min.getZ() + (z - min.getZ()) * dz);
+        mutable.mutZ(min.z() + (z - min.z()) * dz);
         return new MutableVector3(mutable);
     }
 
@@ -77,15 +77,15 @@ public class ScaleTransform extends ResettableExtent {
         boolean result = false;
         MutableVector3 vector3 = getPos(location);
         MutableBlockVector3 pos = new MutableBlockVector3();
-        double sx = vector3.getX();
+        double sx = vector3.x();
-        double sy = vector3.getY();
+        double sy = vector3.y();
-        double sz = vector3.getZ();
+        double sz = vector3.z();
         double ex = sx + dx;
         double ey = Math.max(minY, Math.min(maxy, sy + dy));
         double ez = sz + dz;
-        for (pos.mutY(sy); pos.getY() < ey; pos.mutY(pos.getY() + 1)) {
+        for (pos.mutY(sy); pos.y() < ey; pos.mutY(pos.y() + 1)) {
-            for (pos.mutZ(sz); pos.getZ() < ez; pos.mutZ(pos.getZ() + 1)) {
+            for (pos.mutZ(sz); pos.z() < ez; pos.mutZ(pos.z() + 1)) {
-                for (pos.mutX(sx); pos.getX() < ex; pos.mutX(pos.getX() + 1)) {
+                for (pos.mutX(sx); pos.x() < ex; pos.mutX(pos.x() + 1)) {
                     if (!getExtent().contains(pos)) {
                         continue;
                     }
@@ -101,15 +101,15 @@ public class ScaleTransform extends ResettableExtent {
         boolean result = false;
         MutableVector3 vector3 = getPos(position);
         MutableBlockVector3 pos = new MutableBlockVector3();
-        double sx = vector3.getX();
+        double sx = vector3.x();
-        double sy = vector3.getY();
+        double sy = vector3.y();
-        double sz = vector3.getZ();
+        double sz = vector3.z();
         double ex = sx + dx;
         double ey = Math.max(minY, Math.min(maxy, sy + dy));
         double ez = sz + dz;
-        for (pos.mutY(sy); pos.getY() < ey; pos.mutY(pos.getY() + 1)) {
+        for (pos.mutY(sy); pos.y() < ey; pos.mutY(pos.y() + 1)) {
-            for (pos.mutZ(sz); pos.getZ() < ez; pos.mutZ(pos.getZ() + 1)) {
+            for (pos.mutZ(sz); pos.z() < ez; pos.mutZ(pos.z() + 1)) {
-                for (pos.mutX(sx); pos.getX() < ex; pos.mutX(pos.getX() + 1)) {
+                for (pos.mutX(sx); pos.x() < ex; pos.mutX(pos.x() + 1)) {
                     if (!getExtent().contains(pos)) {
                         continue;
                     }
@@ -126,15 +126,15 @@ public class ScaleTransform extends ResettableExtent {
         boolean result = false;
         MutableVector3 vector3 = getPos(x1, y1, z1);
         MutableBlockVector3 pos = new MutableBlockVector3();
-        double sx = vector3.getX();
+        double sx = vector3.x();
-        double sy = vector3.getY();
+        double sy = vector3.y();
-        double sz = vector3.getZ();
+        double sz = vector3.z();
-        double ex = vector3.getX() + dx;
+        double ex = vector3.x() + dx;
         double ey = Math.min(maxy, sy + dy);
-        double ez = vector3.getZ() + dz;
+        double ez = vector3.z() + dz;
-        for (pos.mutY(sy); pos.getY() < ey; pos.mutY(pos.getY() + 1)) {
+        for (pos.mutY(sy); pos.y() < ey; pos.mutY(pos.y() + 1)) {
-            for (pos.mutZ(sz); pos.getZ() < ez; pos.mutZ(pos.getZ() + 1)) {
+            for (pos.mutZ(sz); pos.z() < ez; pos.mutZ(pos.z() + 1)) {
-                for (pos.mutX(sx); pos.getX() < ex; pos.mutX(pos.getX() + 1)) {
+                for (pos.mutX(sx); pos.x() < ex; pos.mutX(pos.x() + 1)) {
                     if (!getExtent().contains(pos)) {
                         continue;
                     }
@@ -150,15 +150,15 @@ public class ScaleTransform extends ResettableExtent {
         boolean result = false;
         MutableVector3 vector3 = getPos(x1, y1, z1);
         MutableBlockVector3 pos = new MutableBlockVector3();
-        double sx = vector3.getX();
+        double sx = vector3.x();
-        double sy = vector3.getY();
+        double sy = vector3.y();
-        double sz = vector3.getZ();
+        double sz = vector3.z();
         double ex = sx + dx;
         double ey = Math.max(minY, Math.min(maxy, sy + dy));
         double ez = sz + dz;
-        for (pos.mutY(sy); pos.getY() < ey; pos.mutY(pos.getY() + 1)) {
+        for (pos.mutY(sy); pos.y() < ey; pos.mutY(pos.y() + 1)) {
-            for (pos.mutZ(sz); pos.getZ() < ez; pos.mutZ(pos.getZ() + 1)) {
+            for (pos.mutZ(sz); pos.z() < ez; pos.mutZ(pos.z() + 1)) {
-                for (pos.mutX(sx); pos.getX() < ex; pos.mutX(pos.getX() + 1)) {
+                for (pos.mutX(sx); pos.x() < ex; pos.mutX(pos.x() + 1)) {
                     if (!getExtent().contains(pos)) {
                         continue;
                     }

worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/transform/SelectTransform.java

@@ -27,11 +27,11 @@ public abstract class SelectTransform extends ResettableExtent {
     public abstract AbstractDelegateExtent getExtent(int x, int z);
 
     public Extent getExtent(BlockVector3 pos) {
-        return getExtent(pos.getBlockX(), pos.getBlockY(), pos.getBlockZ());
+        return getExtent(pos.x(), pos.y(), pos.z());
     }
 
     public Extent getExtent(BlockVector2 pos) {
-        return getExtent(pos.getBlockX(), pos.getBlockZ());
+        return getExtent(pos.x(), pos.z());
     }
 
     @Override

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/SurfaceRegionFunction.java

@@ -26,8 +26,8 @@ public class SurfaceRegionFunction implements FlatRegionFunction {
 
     @Override
     public boolean apply(BlockVector2 position) throws WorldEditException {
-        int x = position.getBlockX();
+        int x = position.x();
-        int z = position.getBlockZ();
+        int z = position.z();
         int layer = extent.getNearestSurfaceTerrainBlock(x, z, lastY, minY, maxY, false);
         if (layer != -1) {
             lastY = layer;

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/block/BiomeCopy.java

@@ -21,11 +21,11 @@ public class BiomeCopy implements RegionFunction {
 
     @Override
     public boolean apply(BlockVector3 position) throws WorldEditException {
-        int x = position.getBlockX();
+        int x = position.x();
-        int y = position.getBlockY();
+        int y = position.y();
-        int z = position.getBlockZ();
+        int z = position.z();
-        if (x != mutableVector.getBlockX() || z != mutableVector.getBlockZ() || y != mutableVector
+        if (x != mutableVector.x() || z != mutableVector.z() || y != mutableVector
-                .getBlockY()) {
+                .y()) {
             mutableVector.setComponents(x, y, z);
             return destination.setBiome(mutableVector, source.getBiome(mutableVector));
         }

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/generator/CavesGen.java

@@ -72,8 +72,8 @@ public class CavesGen extends GenBase {
             int maxAngle,
             double paramDouble4
     ) throws WorldEditException {
-        int bx = chunkPos.getBlockX() << 4;
+        int bx = chunkPos.x() << 4;
-        int bz = chunkPos.getBlockZ() << 4;
+        int bz = chunkPos.z() << 4;
         double real_x = bx + 7;
         double real_z = bz + 7;
 

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/generator/GenBase.java

@@ -26,8 +26,8 @@ public abstract class GenBase {
 
     public void generate(BlockVector2 chunkPos, Extent chunk) throws WorldEditException {
         int i = this.checkAreaSize;
-        int chunkX = chunkPos.getBlockX();
+        int chunkX = chunkPos.x();
-        int chunkZ = chunkPos.getBlockZ();
+        int chunkZ = chunkPos.z();
         for (int x = chunkX - i; x <= chunkX + i; x++) {
             for (int z = chunkZ - i; z <= chunkZ + i; z++) {
                 generateChunk(x, z, chunkPos, chunk);

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/generator/SchemGen.java

@@ -36,7 +36,7 @@ public class SchemGen implements Resource {
         int y = extent.getNearestSurfaceTerrainBlock(
                 x,
                 z,
-                mutable.getBlockY(),
+                mutable.y(),
                 this.extent.getMinY(),
                 this.extent.getMaxY(),
                 Integer.MIN_VALUE,

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/AdjacentAnyMask.java

@@ -44,9 +44,9 @@ public class AdjacentAnyMask extends AbstractMask implements ResettableMask {
     }
 
     public BlockVector3 direction(BlockVector3 v) {
-        int x = v.getBlockX();
+        int x = v.x();
-        int y = v.getBlockY();
+        int y = v.y();
-        int z = v.getBlockZ();
+        int z = v.z();
         if (mask.test(mutable.setComponents(x + 1, y, z))) {
             return mutable.setComponents(1, 0, 0);
         } else if (mask.test(mutable.setComponents(x - 1, y, z))) {

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/AdjacentMask.java

@@ -22,9 +22,9 @@ public class AdjacentMask extends AbstractMask {
     @Override
     public boolean test(BlockVector3 bv) {
         vector.setComponents(bv);
-        double x = bv.getX();
+        double x = bv.x();
-        double y = bv.getY();
+        double y = bv.y();
-        double z = bv.getZ();
+        double z = bv.z();
         vector.mutX(x + 1);
         int count = 0;
         if (mask.test(vector) && ++count == min && max >= 8) {

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/AngleMask.java

@@ -127,9 +127,9 @@ public class AngleMask extends AbstractExtentMask implements ResettableMask {
     }
 
     private boolean adjacentAir(Extent extent, MutableBlockVector3 mutable) {
-        int x = mutable.getBlockX();
+        int x = mutable.x();
-        int y = mutable.getBlockY();
+        int y = mutable.y();
-        int z = mutable.getBlockZ();
+        int z = mutable.z();
         if (!mask.test(extent, mutable.setComponents(x + 1, y, z))) {
             return true;
         }
@@ -154,23 +154,23 @@ public class AngleMask extends AbstractExtentMask implements ResettableMask {
         if (!mask.test(vector)) {
             return false;
         }
-        int y = vector.getBlockY();
+        int y = vector.y();
         if (overlay) {
             MutableBlockVector3 mutable = new MutableBlockVector3(vector);
             if (y < maxY && !adjacentAir(null, mutable)) {
                 return false;
             }
         }
-        int x = vector.getBlockX();
+        int x = vector.x();
-        int z = vector.getBlockZ();
+        int z = vector.z();
         return testSlope(getExtent(), x, y, z);
     }
 
     @Override
     public boolean test(final Extent extent, final BlockVector3 vector) {
-        int x = vector.getBlockX();
+        int x = vector.x();
-        int y = vector.getBlockY();
+        int y = vector.y();
-        int z = vector.getBlockZ();
+        int z = vector.z();
 
         if ((lastX == (lastX = x) & lastZ == (lastZ = z))) {
             int height = getHeight(extent, x, y, z);

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/CachedMask.java

@@ -60,9 +60,9 @@ public class CachedMask extends AbstractDelegateMask implements ResettableMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        int x = vector.getX();
+        int x = vector.x();
-        int y = vector.getY();
+        int y = vector.y();
-        int z = vector.getZ();
+        int z = vector.z();
         try {
             boolean check = cache_checked.add(x, y, z);
             if (!check) {
@@ -88,9 +88,9 @@ public class CachedMask extends AbstractDelegateMask implements ResettableMask {
         if (!hasExtent || !(extent instanceof AbstractExtentMask)) {
             return test(vector);
         }
-        int x = vector.getX();
+        int x = vector.x();
-        int y = vector.getY();
+        int y = vector.y();
-        int z = vector.getZ();
+        int z = vector.z();
         AbstractExtentMask mask = (AbstractExtentMask) getMask();
         try {
             boolean check = cache_checked.add(x, y, z);

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/ImageBrushMask.java

@@ -62,17 +62,17 @@ public class ImageBrushMask extends AbstractExtentMask {
     @Override
     public boolean test(BlockVector3 vector) {
         if (solid.test(vector)) {
-            int dx = vector.getBlockX() - center.getBlockX();
+            int dx = vector.x() - center.x();
-            int dy = vector.getBlockY() - center.getBlockY();
+            int dy = vector.y() - center.y();
-            int dz = vector.getBlockZ() - center.getBlockZ();
+            int dz = vector.z() - center.z();
 
             Vector3 pos1 = transform.apply(mutable.setComponents(dx - 0.5, dy - 0.5, dz - 0.5));
-            int x1 = (int) (pos1.getX() * scale + centerImageX);
+            int x1 = (int) (pos1.x() * scale + centerImageX);
-            int z1 = (int) (pos1.getZ() * scale + centerImageZ);
+            int z1 = (int) (pos1.z() * scale + centerImageZ);
 
             Vector3 pos2 = transform.apply(mutable.setComponents(dx + 0.5, dy + 0.5, dz + 0.5));
-            int x2 = (int) (pos2.getX() * scale + centerImageX);
+            int x2 = (int) (pos2.x() * scale + centerImageX);
-            int z2 = (int) (pos2.getZ() * scale + centerImageZ);
+            int z2 = (int) (pos2.z() * scale + centerImageZ);
             if (x2 < x1) {
                 int tmp = x1;
                 x1 = x2;

worldedit-core/src/main/java/com/fastasyncworldedit/core/function/mask/LayerBrushMask.java

@@ -40,20 +40,20 @@ public class LayerBrushMask extends AbstractExtentMask {
             BlockState previous2 = layers[depth - 2];
             for (BlockVector3 dir : BreadthFirstSearch.DEFAULT_DIRECTIONS) {
                 mutable.setComponents(
-                        pos.getBlockX() + dir.getBlockX(),
+                        pos.x() + dir.x(),
-                        pos.getBlockY() + dir.getBlockY(),
+                        pos.y() + dir.y(),
-                        pos.getBlockZ() + dir.getBlockZ()
+                        pos.z() + dir.z()
                 );
                 if (visitor.isVisited(mutable) && editSession.getBlock(
-                        mutable.getBlockX(),
+                        mutable.x(),
-                        mutable.getBlockY(),
+                        mutable.y(),
-                        mutable.getBlockZ()
+                        mutable.z()
                 ) == previous) {
-                    mutable.setComponents(pos.getBlockX() + dir.getBlockX() * 2, pos.getBlockY() + dir.getBlockY() * 2,
+                    mutable.setComponents(pos.x() + dir.x() * 2, pos.y() + dir.y() * 2,
-                            pos.getBlockZ() + dir.getBlockZ() * 2
+                            pos.z() + dir.z() * 2
                     );
                     if (visitor.isVisited(mutable)
-                            && editSession.getBlock(mutable.getBlockX(), mutable.getBlockY(), mutable.getBlockZ()) == previous2) {
+                            && editSession.getBlock(mutable.x(), mutable.y(), mutable.z()) == previous2) {
                         found = true;
                         break;
                     } else {