Skip to content

Improve //hollow command #2960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TomyLobo wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Improve //hollow command #2960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f2cd858
Merge branch 'version/7.4.x' of github.com:EngineHub/WorldEdit
TomyLobo May 8, 2026
aacc119
Add BlockState.getMaterial()
TomyLobo Apr 19, 2026
9f893f8
Add ShapeType parameter to BlockMaterial.isFullCube
TomyLobo May 3, 2026
af07d5c
Add BlockMaterial.isFullFace
TomyLobo Apr 24, 2026
2cb3233
Only iterate once, after queueing all blocks
TomyLobo Apr 24, 2026
56ba5be
Use Queue interface instead of a concrete type
TomyLobo Apr 25, 2026
2fa0dae
Determine "visible" instead of "outside" blocks
TomyLobo Apr 25, 2026
9c2338b
//hollow: Limit thickness to >= 1
TomyLobo Apr 25, 2026
62a7a5e
Rename recurseDirections to CARDINAL_UPRIGHT_OFFSETS and determine it…
TomyLobo Apr 25, 2026
89846a7
Improve //hollow command
TomyLobo Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions verification/src/changes/accepted-bukkit-public-api-changes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,15 @@
"ANNOTATION_REMOVED"
]
}
],
"Replaced by default method": [
{
"type": "com.sk89q.worldedit.bukkit.BukkitBlockRegistry",
"member": "Method com.sk89q.worldedit.bukkit.BukkitBlockRegistry.getMaterial(com.sk89q.worldedit.world.block.BlockType)",
"changes": [
"METHOD_REMOVED",
"ANNOTATION_REMOVED"
]
}
]
}
16 changes: 16 additions & 0 deletions verification/src/changes/accepted-core-public-api-changes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@
"changes": [
"METHOD_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.EditSession",
"member": "Method com.sk89q.worldedit.EditSession.makeCuboidFaces(com.sk89q.worldedit.regions.Region,int,com.sk89q.worldedit.function.pattern.Pattern)",
"changes": [
"METHOD_NOW_FINAL"
]
}
],
"Why on earth is this even an issue?": [
{
"type": "com.sk89q.worldedit.world.registry.BlockMaterial",
"member": "Method com.sk89q.worldedit.world.registry.BlockMaterial.isFullCube()",
"changes": [
"METHOD_ABSTRACT_NOW_DEFAULT"
]
}
]
}
16 changes: 16 additions & 0 deletions verification/src/changes/accepted-sponge-public-api-changes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
{
"Replaced by default method": [
{
"type": "com.sk89q.worldedit.sponge.SpongeBlockRegistry",
"member": "Method com.sk89q.worldedit.sponge.SpongeBlockRegistry.getMaterial(com.sk89q.worldedit.world.block.BlockType)",
"changes": [
"METHOD_REMOVED"
]
},
{
"type": "com.sk89q.worldedit.sponge.SpongeBlockMaterial",
"member": "Method com.sk89q.worldedit.sponge.SpongeBlockMaterial.isFullCube()",
"changes": [
"METHOD_REMOVED"
]
}
]
}
7 changes: 6 additions & 1 deletion ...11/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ public void setBiome(Location location, BiomeType biome) {
return new PaperweightWorldNativeAccess(this, new WeakReference<>(((CraftWorld) world).getHandle()));
}

private static net.minecraft.core.Direction adapt(Direction face) {
public static net.minecraft.core.Direction adapt(Direction face) {
return switch (face) {
case NORTH -> net.minecraft.core.Direction.NORTH;
case SOUTH -> net.minecraft.core.Direction.SOUTH;
Expand Down Expand Up @@ -586,6 +586,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
return new PaperweightBlockMaterial(mcBlockState);
}

@Override
public BlockMaterial getBlockMaterial(BlockState blockState) {
return new PaperweightBlockMaterial(adapt(blockState));
}

@SuppressWarnings({ "unchecked", "rawtypes" })
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
@Override
Expand Down
25 changes: 21 additions & 4 deletions .../main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_11/PaperweightBlockMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,20 @@

package com.sk89q.worldedit.bukkit.adapter.impl.v1_21_11;

import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.blocks.ShapeType;
import com.sk89q.worldedit.internal.block.AbstractBlockMaterial;
import com.sk89q.worldedit.util.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.Clearable;
import net.minecraft.world.level.EmptyBlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.EntityBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;

public class PaperweightBlockMaterial implements BlockMaterial {
public class PaperweightBlockMaterial extends AbstractBlockMaterial<VoxelShape> {

private final BlockState block;

Expand All @@ -42,8 +46,21 @@ public boolean isAir() {
}

@Override
public boolean isFullCube() {
return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
protected VoxelShape getShape(ShapeType shapeType) {
return switch (shapeType) {
case SHAPE -> block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
case VISUAL_SHAPE -> block.getVisualShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
};
}

@Override
protected boolean isShapeFullBlock(VoxelShape shape) {
return Block.isShapeFullBlock(shape);
}

@Override
protected boolean isFaceFull(VoxelShape shape, Direction face) {
return Block.isFaceFull(shape, PaperweightAdapter.adapt(face));
}

@Override
Expand Down
7 changes: 6 additions & 1 deletion ...1.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ public void setBiome(Location location, BiomeType biome) {
return new PaperweightWorldNativeAccess(this, new WeakReference<>(((CraftWorld) world).getHandle()));
}

private static net.minecraft.core.Direction adapt(Direction face) {
public static net.minecraft.core.Direction adapt(Direction face) {
return switch (face) {
case NORTH -> net.minecraft.core.Direction.NORTH;
case SOUTH -> net.minecraft.core.Direction.SOUTH;
Expand Down Expand Up @@ -567,6 +567,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
return new PaperweightBlockMaterial(mcBlockState);
}

@Override
public BlockMaterial getBlockMaterial(BlockState blockState) {
return new PaperweightBlockMaterial(adapt(blockState));
}

@SuppressWarnings({ "unchecked", "rawtypes" })
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
@Override
Expand Down
25 changes: 21 additions & 4 deletions ...c/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightBlockMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,20 @@

package com.sk89q.worldedit.bukkit.adapter.impl.v1_21_4;

import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.blocks.ShapeType;
import com.sk89q.worldedit.internal.block.AbstractBlockMaterial;
import com.sk89q.worldedit.util.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.Clearable;
import net.minecraft.world.level.EmptyBlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.EntityBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;

public class PaperweightBlockMaterial implements BlockMaterial {
public class PaperweightBlockMaterial extends AbstractBlockMaterial<VoxelShape> {

private final BlockState block;

Expand All @@ -42,8 +46,21 @@ public boolean isAir() {
}

@Override
public boolean isFullCube() {
return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
protected VoxelShape getShape(ShapeType shapeType) {
return switch (shapeType) {
case SHAPE -> block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
case VISUAL_SHAPE -> block.getVisualShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
};
}

@Override
protected boolean isShapeFullBlock(VoxelShape shape) {
return Block.isShapeFullBlock(shape);
}

@Override
protected boolean isFaceFull(VoxelShape shape, Direction face) {
return Block.isFaceFull(shape, PaperweightAdapter.adapt(face));
}

@Override
Expand Down
7 changes: 6 additions & 1 deletion ...1.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ public void setBiome(Location location, BiomeType biome) {
return new PaperweightWorldNativeAccess(this, new WeakReference<>(((CraftWorld) world).getHandle()));
}

private static net.minecraft.core.Direction adapt(Direction face) {
public static net.minecraft.core.Direction adapt(Direction face) {
return switch (face) {
case NORTH -> net.minecraft.core.Direction.NORTH;
case SOUTH -> net.minecraft.core.Direction.SOUTH;
Expand Down Expand Up @@ -565,6 +565,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
return new PaperweightBlockMaterial(mcBlockState);
}

@Override
public BlockMaterial getBlockMaterial(BlockState blockState) {
return new PaperweightBlockMaterial(adapt(blockState));
}

@SuppressWarnings({ "unchecked", "rawtypes" })
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
@Override
Expand Down
25 changes: 21 additions & 4 deletions ...c/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightBlockMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,20 @@

package com.sk89q.worldedit.bukkit.adapter.impl.v1_21_5;

import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.blocks.ShapeType;
import com.sk89q.worldedit.internal.block.AbstractBlockMaterial;
import com.sk89q.worldedit.util.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.Clearable;
import net.minecraft.world.level.EmptyBlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.EntityBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;

public class PaperweightBlockMaterial implements BlockMaterial {
public class PaperweightBlockMaterial extends AbstractBlockMaterial<VoxelShape> {

private final BlockState block;

Expand All @@ -42,8 +46,21 @@ public boolean isAir() {
}

@Override
public boolean isFullCube() {
return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
protected VoxelShape getShape(ShapeType shapeType) {
return switch (shapeType) {
case SHAPE -> block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
case VISUAL_SHAPE -> block.getVisualShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
};
}

@Override
protected boolean isShapeFullBlock(VoxelShape shape) {
return Block.isShapeFullBlock(shape);
}

@Override
protected boolean isFaceFull(VoxelShape shape, Direction face) {
return Block.isFaceFull(shape, PaperweightAdapter.adapt(face));
}

@Override
Expand Down
7 changes: 6 additions & 1 deletion ...1.6/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ public void setBiome(Location location, BiomeType biome) {
return new PaperweightWorldNativeAccess(this, new WeakReference<>(((CraftWorld) world).getHandle()));
}

private static net.minecraft.core.Direction adapt(Direction face) {
public static net.minecraft.core.Direction adapt(Direction face) {
return switch (face) {
case NORTH -> net.minecraft.core.Direction.NORTH;
case SOUTH -> net.minecraft.core.Direction.SOUTH;
Expand Down Expand Up @@ -587,6 +587,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
return new PaperweightBlockMaterial(mcBlockState);
}

@Override
public BlockMaterial getBlockMaterial(BlockState blockState) {
return new PaperweightBlockMaterial(adapt(blockState));
}

@SuppressWarnings({ "unchecked", "rawtypes" })
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
@Override
Expand Down
25 changes: 21 additions & 4 deletions ...c/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_6/PaperweightBlockMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,20 @@

package com.sk89q.worldedit.bukkit.adapter.impl.v1_21_6;

import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.blocks.ShapeType;
import com.sk89q.worldedit.internal.block.AbstractBlockMaterial;
import com.sk89q.worldedit.util.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.Clearable;
import net.minecraft.world.level.EmptyBlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.EntityBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;

public class PaperweightBlockMaterial implements BlockMaterial {
public class PaperweightBlockMaterial extends AbstractBlockMaterial<VoxelShape> {

private final BlockState block;

Expand All @@ -42,8 +46,21 @@ public boolean isAir() {
}

@Override
public boolean isFullCube() {
return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
protected VoxelShape getShape(ShapeType shapeType) {
return switch (shapeType) {
case SHAPE -> block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
case VISUAL_SHAPE -> block.getVisualShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
};
}

@Override
protected boolean isShapeFullBlock(VoxelShape shape) {
return Block.isShapeFullBlock(shape);
}

@Override
protected boolean isFaceFull(VoxelShape shape, Direction face) {
return Block.isFaceFull(shape, PaperweightAdapter.adapt(face));
}

@Override
Expand Down
7 changes: 6 additions & 1 deletion ...1.9/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ public void setBiome(Location location, BiomeType biome) {
return new PaperweightWorldNativeAccess(this, new WeakReference<>(((CraftWorld) world).getHandle()));
}

private static net.minecraft.core.Direction adapt(Direction face) {
public static net.minecraft.core.Direction adapt(Direction face) {
return switch (face) {
case NORTH -> net.minecraft.core.Direction.NORTH;
case SOUTH -> net.minecraft.core.Direction.SOUTH;
Expand Down Expand Up @@ -586,6 +586,11 @@ public BlockMaterial getBlockMaterial(BlockType blockType) {
return new PaperweightBlockMaterial(mcBlockState);
}

@Override
public BlockMaterial getBlockMaterial(BlockState blockState) {
return new PaperweightBlockMaterial(adapt(blockState));
}

@SuppressWarnings({ "unchecked", "rawtypes" })
private static final LoadingCache<net.minecraft.world.level.block.state.properties.Property, Property<?>> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() {
@Override
Expand Down
25 changes: 21 additions & 4 deletions ...c/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_9/PaperweightBlockMaterial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,20 @@

package com.sk89q.worldedit.bukkit.adapter.impl.v1_21_9;

import com.sk89q.worldedit.world.registry.BlockMaterial;
import com.sk89q.worldedit.blocks.ShapeType;
import com.sk89q.worldedit.internal.block.AbstractBlockMaterial;
import com.sk89q.worldedit.util.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.Clearable;
import net.minecraft.world.level.EmptyBlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.EntityBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;

public class PaperweightBlockMaterial implements BlockMaterial {
public class PaperweightBlockMaterial extends AbstractBlockMaterial<VoxelShape> {

private final BlockState block;

Expand All @@ -42,8 +46,21 @@ public boolean isAir() {
}

@Override
public boolean isFullCube() {
return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
protected VoxelShape getShape(ShapeType shapeType) {
return switch (shapeType) {
case SHAPE -> block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
case VISUAL_SHAPE -> block.getVisualShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO, CollisionContext.empty());
};
}

@Override
protected boolean isShapeFullBlock(VoxelShape shape) {
return Block.isShapeFullBlock(shape);
}

@Override
protected boolean isFaceFull(VoxelShape shape, Direction face) {
return Block.isFaceFull(shape, PaperweightAdapter.adapt(face));
}

@Override
Expand Down
Loading
Loading