Add flag to /hollow for blocks to ignore

Author: TomyLobo

worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

@@ -2709,12 +2709,12 @@ private Direction[] getBlockedDirections(BlockVector3 position) {
      *
      * @return number of blocks affected
      * @throws MaxChangedBlocksException thrown if too many blocks are changed
-     * @deprecated Use {@link EditSession#hollowOutRegion(Region, int, Pattern, boolean, Collection, boolean)} instead.
+     * @deprecated Use {@link EditSession#hollowOutRegion(Region, int, Pattern, boolean, Collection, boolean, Mask)} instead.
      */
-    @InlineMe(replacement = "this.hollowOutRegion(region, thickness, pattern, true, null, false)")
+    @InlineMe(replacement = "this.hollowOutRegion(region, thickness, pattern, true, null, false, Masks.alwaysTrue())", imports = "com.sk89q.worldedit.function.mask.Masks")
     @Deprecated
     public final int hollowOutRegion(Region region, int thickness, Pattern pattern) throws MaxChangedBlocksException {
-        return hollowOutRegion(region, thickness, pattern, true, null, false);
+        return hollowOutRegion(region, thickness, pattern, true, null, false, Masks.alwaysTrue());
     }
 
     /**
@@ -2727,10 +2727,11 @@ public final int hollowOutRegion(Region region, int thickness, Pattern pattern)
      * @param openSides         Open up faces touching the bounding box. This matches the legacy behaviour.
      * @param startingPositions Positions to consider as 'outside'. If null, use the selection bounding box
      * @param useBlockGeometry  Consider block geometry for visibility calculation
+     * @param includeMask       Mask of blocks eligible for shell detection
      * @return number of blocks affected
      * @throws MaxChangedBlocksException thrown if too many blocks are changed
      */
-    public int hollowOutRegion(Region region, int thickness, Pattern pattern, boolean openSides, Collection<BlockVector3> startingPositions, boolean useBlockGeometry) throws MaxChangedBlocksException {
+    public int hollowOutRegion(Region region, int thickness, Pattern pattern, boolean openSides, Collection<BlockVector3> startingPositions, boolean useBlockGeometry, Mask includeMask) throws MaxChangedBlocksException {
         if (startingPositions == null) {
             // If no startingPositions are specified, use the selection bounding box
             startingPositions = new ArrayList<>();
@@ -2785,7 +2786,9 @@ public int hollowOutRegion(Region region, int thickness, Pattern pattern, boolea
             final BlockVector3 current = queue.poll();
 
             Direction[] blockedDirections;
-            if (useBlockGeometry) {
+            if (!includeMask.test(current)) {
+                blockedDirections = NO_DIRECTIONS;
+            } else if (useBlockGeometry) {
                 // Get blocked directions for this block
                 blockedDirections = getBlockedDirections(current);
 
@@ -2829,11 +2832,13 @@ public int hollowOutRegion(Region region, int thickness, Pattern pattern, boolea
                         continue;
                     }
 
-                    // Check if we can actually enter the block from here
-                    Direction oppositeDirection = Direction.findClosest(direction.toVector().multiply(-1), Direction.Flag.ALL);
-                    for (Direction blockedDirection : getBlockedDirections(neighbor)) {
-                        if (blockedDirection == oppositeDirection) {
-                            continue outer; // skip this direction
+                    if (includeMask.test(neighbor)) {
+                        // Check if we can actually enter the block from here
+                        Direction oppositeDirection = Direction.findClosest(direction.toVector().multiply(-1), Direction.Flag.ALL);
+                        for (Direction blockedDirection : getBlockedDirections(neighbor)) {
+                            if (blockedDirection == oppositeDirection) {
+                                continue outer; // skip this direction
+                            }
                         }
                     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java

@@ -43,6 +43,7 @@
 import com.sk89q.worldedit.function.mask.ExistingBlockMask;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.mask.MaskIntersection;
+import com.sk89q.worldedit.function.mask.Masks;
 import com.sk89q.worldedit.function.mask.NoiseFilter2D;
 import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.function.pattern.Pattern;
@@ -562,7 +563,9 @@ public int hollow(Actor actor, EditSession editSession, LocalSession session,
                       @Switch(name = 'p', desc = "Consider placement position as 'outside' instead of the selection bounding box. Overrides -o.")
                           boolean usePlacementPosition,
                       @Switch(name = 'g', desc = "Consider block geometry for visibility calculation")
-                          boolean useBlockGeometry) throws WorldEditException {
+                          boolean useBlockGeometry,
+                      @ArgFlag(name = 'm', desc = "Set the mask of blocks eligible for shell detection")
+                          Mask includeMask) throws WorldEditException {
         checkCommandArgument(thickness >= 1, "Thickness must be >= 1");
 
         final Collection<BlockVector3> startingPositions;
@@ -580,7 +583,10 @@ public int hollow(Actor actor, EditSession editSession, LocalSession session,
         } else {
             startingPositions = null;
         }
-        int affected = editSession.hollowOutRegion(region, thickness, pattern, openSides, startingPositions, useBlockGeometry);
+        if (includeMask == null) {
+            includeMask = Masks.alwaysTrue();
+        }
+        int affected = editSession.hollowOutRegion(region, thickness, pattern, openSides, startingPositions, useBlockGeometry, includeMask);
         actor.printInfo(TranslatableComponent.of("worldedit.hollow.changed", TextComponent.of(affected)));
         return affected;
     }