Swap to using an MC utility function for full block detection

EngineHub · Jan 9, 2025 · 11dc4a3 · 11dc4a3
1 parent 7429399
commit 11dc4a3
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 63 deletions.
diff --git a/.../main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightBlockMaterial.java b/.../main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R2/PaperweightBlockMaterial.java
@@ -23,17 +23,13 @@
 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.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class PaperweightBlockMaterial implements BlockMaterial {
 
-    private static final AABB FULL_CUBE = AABB.unitCubeFromLowerCorner(Vec3.ZERO);
-
     private final BlockState block;
 
     public PaperweightBlockMaterial(BlockState block) {
@@ -47,8 +43,7 @@ public boolean isAir() {
 
     @Override
     public boolean isFullCube() {
-        VoxelShape vs = block.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-        return !vs.isEmpty() && vs.bounds().equals(FULL_CUBE);
+        return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
     }
 
     @Override

diff --git a/.../main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightBlockMaterial.java b/.../main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R3/PaperweightBlockMaterial.java
@@ -23,17 +23,13 @@
 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.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class PaperweightBlockMaterial implements BlockMaterial {
 
-    private static final AABB FULL_CUBE = AABB.unitCubeFromLowerCorner(Vec3.ZERO);
-
     private final BlockState block;
 
     public PaperweightBlockMaterial(BlockState block) {
@@ -47,8 +43,7 @@ public boolean isAir() {
 
     @Override
     public boolean isFullCube() {
-        VoxelShape vs = block.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-        return !vs.isEmpty() && vs.bounds().equals(FULL_CUBE);
+        return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
     }
 
     @Override

diff --git a/.../main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R4/PaperweightBlockMaterial.java b/.../main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_20_R4/PaperweightBlockMaterial.java
@@ -23,17 +23,13 @@
 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.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class PaperweightBlockMaterial implements BlockMaterial {
 
-    private static final AABB FULL_CUBE = AABB.unitCubeFromLowerCorner(Vec3.ZERO);
-
     private final BlockState block;
 
     public PaperweightBlockMaterial(BlockState block) {
@@ -47,8 +43,7 @@ public boolean isAir() {
 
     @Override
     public boolean isFullCube() {
-        VoxelShape vs = block.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-        return !vs.isEmpty() && vs.bounds().equals(FULL_CUBE);
+        return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
     }
 
     @Override

diff --git a/...c/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/PaperweightBlockMaterial.java b/...c/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/PaperweightBlockMaterial.java
@@ -23,17 +23,13 @@
 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.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class PaperweightBlockMaterial implements BlockMaterial {
 
-    private static final AABB FULL_CUBE = AABB.unitCubeFromLowerCorner(Vec3.ZERO);
-
     private final BlockState block;
 
     public PaperweightBlockMaterial(BlockState block) {
@@ -47,8 +43,7 @@ public boolean isAir() {
 
     @Override
     public boolean isFullCube() {
-        VoxelShape vs = block.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-        return !vs.isEmpty() && vs.bounds().equals(FULL_CUBE);
+        return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
     }
 
     @Override

diff --git a/...c/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightBlockMaterial.java b/...c/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightBlockMaterial.java
@@ -23,17 +23,13 @@
 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.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class PaperweightBlockMaterial implements BlockMaterial {
 
-    private static final AABB FULL_CUBE = AABB.unitCubeFromLowerCorner(Vec3.ZERO);
-
     private final BlockState block;
 
     public PaperweightBlockMaterial(BlockState block) {
@@ -47,8 +43,7 @@ public boolean isAir() {
 
     @Override
     public boolean isFullCube() {
-        VoxelShape vs = block.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-        return !vs.isEmpty() && vs.bounds().equals(FULL_CUBE);
+        return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
     }
 
     @Override

diff --git a/...src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21/PaperweightBlockMaterial.java b/...src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21/PaperweightBlockMaterial.java
@@ -23,17 +23,13 @@
 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.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 public class PaperweightBlockMaterial implements BlockMaterial {
 
-    private static final AABB FULL_CUBE = AABB.unitCubeFromLowerCorner(Vec3.ZERO);
-
     private final BlockState block;
 
     public PaperweightBlockMaterial(BlockState block) {
@@ -47,8 +43,7 @@ public boolean isAir() {
 
     @Override
     public boolean isFullCube() {
-        VoxelShape vs = block.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-        return !vs.isEmpty() && vs.bounds().equals(FULL_CUBE);
+        return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
     }
 
     @Override

diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockMaterial.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricBlockMaterial.java
@@ -23,12 +23,10 @@
 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.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 /**
  * Fabric block material that pulls as much info as possible from the Minecraft
@@ -37,8 +35,6 @@
  */
 public class FabricBlockMaterial implements BlockMaterial {
 
-    private static final AABB FULL_CUBE = AABB.unitCubeFromLowerCorner(Vec3.ZERO);
-
     private final BlockState block;
 
     public FabricBlockMaterial(BlockState block) {
@@ -52,8 +48,7 @@ public boolean isAir() {
 
     @Override
     public boolean isFullCube() {
-        VoxelShape vs = block.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-        return !vs.isEmpty() && vs.bounds().equals(FULL_CUBE);
+        return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
     }
 
     @Override

diff --git a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeBlockMaterial.java b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/NeoForgeBlockMaterial.java
@@ -23,12 +23,10 @@
 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.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 /**
  * Forge block material that pulls as much info as possible from the Minecraft
@@ -37,8 +35,6 @@
  */
 public class NeoForgeBlockMaterial implements BlockMaterial {
 
-    private static final AABB FULL_CUBE = AABB.unitCubeFromLowerCorner(Vec3.ZERO);
-
     private final BlockState block;
 
     public NeoForgeBlockMaterial(BlockState block) {
@@ -52,8 +48,7 @@ public boolean isAir() {
 
     @Override
     public boolean isFullCube() {
-        VoxelShape vs = block.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-        return !vs.isEmpty() && vs.bounds().equals(FULL_CUBE);
+        return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
     }
 
     @Override

diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java
@@ -23,12 +23,10 @@
 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.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
 
 /**
  * Sponge block material that pulls as much info as possible from the Minecraft
@@ -37,8 +35,6 @@
  */
 public class SpongeBlockMaterial implements BlockMaterial {
 
-    private static final AABB FULL_CUBE = AABB.unitCubeFromLowerCorner(Vec3.ZERO);
-
     private final BlockState block;
 
     public SpongeBlockMaterial(BlockState block) {
@@ -52,8 +48,7 @@ public boolean isAir() {
 
     @Override
     public boolean isFullCube() {
-        VoxelShape vs = block.getCollisionShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-        return !vs.isEmpty() && vs.bounds().equals(FULL_CUBE);
+        return Block.isShapeFullBlock(block.getShape(EmptyBlockGetter.INSTANCE, BlockPos.ZERO));
     }
 
     @Override