Merge branch 'version/7.3.x'

EngineHub · Feb 16, 2025 · 5f19fb4 · 5f19fb4
2 parents 222c090 + dc92f6f
commit 5f19fb4
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 17 deletions.
diff --git a/.../com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/PaperweightServerLevelDelegateProxy.java b/.../com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/PaperweightServerLevelDelegateProxy.java
@@ -28,7 +28,6 @@
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.concurrency.LazyReference;
-import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.world.entity.EntityTypes;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
@@ -37,6 +36,7 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
@@ -50,6 +50,7 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import java.util.function.Predicate;
 
 public class PaperweightServerLevelDelegateProxy implements InvocationHandler {
 
@@ -86,7 +87,11 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
     }
 
     private BlockState getBlockState(BlockPos blockPos) {
-        return adapter.adapt(this.editSession.getBlock(BlockVector3.at(blockPos.getX(), blockPos.getY(), blockPos.getZ())));
+        return adapter.adapt(this.editSession.getBlockWithBuffer(BlockVector3.at(blockPos.getX(), blockPos.getY(), blockPos.getZ())));
+    }
+
+    private boolean isStateAtPosition(BlockPos blockPos, Predicate<BlockState> predicate) {
+        return predicate.test(getBlockState(blockPos));
     }
 
     private boolean setBlock(BlockPos blockPos, BlockState blockState) {
@@ -98,11 +103,7 @@ private boolean setBlock(BlockPos blockPos, BlockState blockState) {
     }
 
     private boolean removeBlock(BlockPos blockPos) {
-        try {
-            return editSession.setBlock(BlockVector3.at(blockPos.getX(), blockPos.getY(), blockPos.getZ()), BlockTypes.AIR.getDefaultState());
-        } catch (MaxChangedBlocksException e) {
-            throw new RuntimeException(e);
-        }
+        return setBlock(blockPos, Blocks.AIR.defaultBlockState());
     }
 
     private boolean addEntity(Entity entity) {
@@ -144,6 +145,12 @@ private static void addMethodHandleToTable(
                 lookup.unreflect(PaperweightServerLevelDelegateProxy.class.getDeclaredMethod("getBlockState", BlockPos.class))
             );
 
+            addMethodHandleToTable(
+                    builder,
+                    StaticRefraction.IS_STATE_AT_POSITION,
+                    lookup.unreflect(PaperweightServerLevelDelegateProxy.class.getDeclaredMethod("isStateAtPosition", BlockPos.class, Predicate.class))
+            );
+
             MethodHandle addEntity = lookup.unreflect(PaperweightServerLevelDelegateProxy.class.getDeclaredMethod("addEntity", Entity.class));
             addMethodHandleToTable(
                 builder,

diff --git a/....21.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/StaticRefraction.java b/....21.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/StaticRefraction.java
@@ -37,6 +37,7 @@ public final class StaticRefraction {
     );
     public static final String NEXT_TICK_TIME = Refraction.pickName("nextTickTime", "e");
     public static final String GET_BLOCK_STATE = Refraction.pickName("getBlockState", "a_");
+    public static final String IS_STATE_AT_POSITION = Refraction.pickName("isStateAtPosition", "a");
     /**
      * {@code addFreshEntityWithPassengers(Entity entity)}.
      */

diff --git a/.../com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightServerLevelDelegateProxy.java b/.../com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightServerLevelDelegateProxy.java
@@ -53,6 +53,7 @@
 import java.lang.reflect.Proxy;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Predicate;
 
 public class PaperweightServerLevelDelegateProxy implements InvocationHandler, AutoCloseable {
 
@@ -99,7 +100,11 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
     }
 
     private BlockState getBlockState(BlockPos blockPos) {
-        return adapter.adapt(this.editSession.getBlock(adapt(blockPos)));
+        return adapter.adapt(this.editSession.getBlockWithBuffer(adapt(blockPos)));
+    }
+
+    private boolean isStateAtPosition(BlockPos blockPos, Predicate<BlockState> predicate) {
+        return predicate.test(getBlockState(blockPos));
     }
 
     private boolean setBlock(BlockPos blockPos, BlockState blockState) {
@@ -134,7 +139,7 @@ private void handleBlockEntity(BlockPos blockPos, BlockState blockState) {
         createdBlockEntities.remove(pos);
     }
 
-    private boolean removeBlock(BlockPos blockPos, boolean bl) {
+    private boolean removeBlock(BlockPos blockPos) {
         return setBlock(blockPos, Blocks.AIR.defaultBlockState());
     }
 
@@ -191,6 +196,12 @@ private static void addMethodHandleToTable(
                 lookup.unreflect(PaperweightServerLevelDelegateProxy.class.getDeclaredMethod("getBlockState", BlockPos.class))
             );
 
+            addMethodHandleToTable(
+                builder,
+                StaticRefraction.IS_STATE_AT_POSITION,
+                lookup.unreflect(PaperweightServerLevelDelegateProxy.class.getDeclaredMethod("isStateAtPosition", BlockPos.class, Predicate.class))
+            );
+
             MethodHandle addEntity = lookup.unreflect(PaperweightServerLevelDelegateProxy.class.getDeclaredMethod("addEntity", Entity.class));
             addMethodHandleToTable(
                 builder,

diff --git a/....21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/StaticRefraction.java b/....21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/StaticRefraction.java
@@ -37,6 +37,7 @@ public final class StaticRefraction {
     );
     public static final String NEXT_TICK_TIME = Refraction.pickName("nextTickTime", "e");
     public static final String GET_BLOCK_STATE = Refraction.pickName("getBlockState", "a_");
+    public static final String IS_STATE_AT_POSITION = Refraction.pickName("isStateAtPosition", "a");
     /**
      * {@code addFreshEntityWithPassengers(Entity entity)}.
      */

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -707,6 +707,30 @@ public BaseBlock getFullBlock(BlockVector3 position) {
         return world.getFullBlock(position);
     }
 
+    /**
+     * As with {@link #getBlock(BlockVector3)}, gets the block at the given position.
+     * However, this may return blocks not yet set to the world (i.e., buffered) by
+     * the current EditSession.
+     *
+     * @param position position of the block
+     * @return the block
+     */
+    public BlockState getBlockWithBuffer(BlockVector3 position) {
+        return this.bypassNone.getBlock(position);
+    }
+
+    /**
+     * As with {@link #getFullBlock(BlockVector3)}, gets the block at the given position,
+     * but as with {@link #getBlockWithBuffer(BlockVector3)}, this may return a block in
+     * the current EditSession's buffer rather than from the world.
+     *
+     * @param position position of the block
+     * @return the block
+     */
+    public BaseBlock getFullBlockWithBuffer(BlockVector3 position) {
+        return this.bypassNone.getFullBlock(position);
+    }
+
     /**
      * Returns the highest solid 'terrain' block.
      *

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java
@@ -32,9 +32,7 @@
 import com.sk89q.worldedit.extension.platform.Capability;
 import com.sk89q.worldedit.extension.platform.Locatable;
 import com.sk89q.worldedit.function.RegionFunction;
-import com.sk89q.worldedit.function.RegionMaskingFilter;
 import com.sk89q.worldedit.function.biome.BiomeReplace;
-import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.function.visitor.RegionVisitor;
 import com.sk89q.worldedit.math.BlockVector3;
@@ -173,7 +171,6 @@ public void setBiome(Actor actor, World world, LocalSession session, EditSession
                          @Switch(name = 'p', desc = "Use your current position")
                              boolean atPosition) throws WorldEditException {
         Region region;
-        Mask mask = editSession.getMask();
 
         if (atPosition) {
             if (actor instanceof Locatable) {
@@ -188,9 +185,6 @@ public void setBiome(Actor actor, World world, LocalSession session, EditSession
         }
 
         RegionFunction replace = new BiomeReplace(editSession, target);
-        if (mask != null) {
-            replace = new RegionMaskingFilter(mask, replace);
-        }
         RegionVisitor visitor = new RegionVisitor(region, replace);
         Operations.completeLegacy(visitor);
 

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/MaskingExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/MaskingExtent.java
@@ -22,6 +22,7 @@
 import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -69,4 +70,8 @@ public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 location, B
         return mask.test(location) && super.setBlock(location, block);
     }
 
+    @Override
+    public boolean setBiome(BlockVector3 location, BiomeType biome) {
+        return mask.test(location) && super.setBiome(location, biome);
+    }
 }
diff --git a/...ric/src/main/java/com/sk89q/worldedit/fabric/internal/FabricServerLevelDelegateProxy.java b/...ric/src/main/java/com/sk89q/worldedit/fabric/internal/FabricServerLevelDelegateProxy.java
@@ -41,6 +41,7 @@
 import java.lang.reflect.Proxy;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Predicate;
 
 public class FabricServerLevelDelegateProxy implements InvocationHandler, AutoCloseable {
 
@@ -81,7 +82,7 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
     }
 
     private BlockState getBlockState(BlockPos blockPos) {
-        return FabricAdapter.adapt(this.editSession.getBlock(FabricAdapter.adapt(blockPos)));
+        return FabricAdapter.adapt(this.editSession.getBlockWithBuffer(FabricAdapter.adapt(blockPos)));
     }
 
     private boolean setBlock(BlockPos blockPos, BlockState blockState) {
@@ -147,6 +148,13 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                     return getBlockState(blockPos);
                 }
             }
+            case "isStateAtPosition", "method_16358" -> {
+                if (args.length == 2 && args[0] instanceof BlockPos blockPos && args[1] instanceof Predicate) {
+                    @SuppressWarnings("unchecked")
+                    Predicate<BlockState> predicate = (Predicate<BlockState>) args[1];
+                    return predicate.test(getBlockState(blockPos));
+                }
+            }
             case "getBlockEntity", "method_8321" -> {
                 if (args.length == 1 && args[0] instanceof BlockPos blockPos) {
                     return getBlockEntity(blockPos);

diff --git a/...src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeServerLevelDelegateProxy.java b/...src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeServerLevelDelegateProxy.java
@@ -42,6 +42,7 @@
 import java.lang.reflect.Proxy;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Predicate;
 
 public class NeoForgeServerLevelDelegateProxy implements InvocationHandler, AutoCloseable {
 
@@ -82,7 +83,7 @@ private BlockEntity getBlockEntity(BlockPos blockPos) {
     }
 
     private BlockState getBlockState(BlockPos blockPos) {
-        return NeoForgeAdapter.adapt(this.editSession.getBlock(NeoForgeAdapter.adapt(blockPos)));
+        return NeoForgeAdapter.adapt(this.editSession.getBlockWithBuffer(NeoForgeAdapter.adapt(blockPos)));
     }
 
     private boolean setBlock(BlockPos blockPos, BlockState blockState) {
@@ -150,6 +151,13 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
                     return getBlockState(blockPos);
                 }
             }
+            case "isStateAtPosition", "m_7433_" -> {
+                if (args.length == 2 && args[0] instanceof BlockPos blockPos && args[1] instanceof Predicate) {
+                    @SuppressWarnings("unchecked")
+                    Predicate<BlockState> predicate = (Predicate<BlockState>) args[1];
+                    return predicate.test(getBlockState(blockPos));
+                }
+            }
             case "getBlockEntity", "m_7702_" -> {
                 if (args.length == 1 && args[0] instanceof BlockPos blockPos) {
                     return getBlockEntity(blockPos);