refactor: remove BlockFace#getBlockFaceByStairDirectionValue, some fi…

…elds in VoxelShapes are also made private now
AllayMC · Dec 30, 2024 · 8f0502e · 8f0502e
1 parent a232734
commit 8f0502e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/api/src/main/java/org/allaymc/api/block/data/BlockFace.java b/api/src/main/java/org/allaymc/api/block/data/BlockFace.java
@@ -32,7 +32,6 @@ public enum BlockFace {
 
     private static final BlockFace[] HORIZONTAL_BLOCK_FACES = {NORTH, EAST, SOUTH, WEST};
     private static final BlockFace[] VERTICAL_BLOCK_FACES = {UP, DOWN};
-    private static final BlockFace[] STAIR_DIRECTION_VALUE_TO_BLOCK_FACE = {EAST, WEST, SOUTH, NORTH};
 
     private final int horizontalIndex;
     private final Vector3ic offset;
@@ -74,10 +73,6 @@ public static BlockFace[] getVerticalBlockFaces() {
         return VERTICAL_BLOCK_FACES;
     }
 
-    public static BlockFace getBlockFaceByStairDirectionValue(int value) {
-        return STAIR_DIRECTION_VALUE_TO_BLOCK_FACE[value];
-    }
-
     /**
      * Add current block face offset to the given pos.
      *

diff --git a/api/src/main/java/org/allaymc/api/math/voxelshape/VoxelShapes.java b/api/src/main/java/org/allaymc/api/math/voxelshape/VoxelShapes.java
@@ -18,8 +18,9 @@
 public final class VoxelShapes {
 
     // Stairs
-    public static final Map<BlockFace, VoxelShape> UPWARDS_STAIR_SHAPES = new EnumMap<>(BlockFace.class);
-    public static final Map<BlockFace, VoxelShape> DOWNWARDS_STAIR_SHAPES = new EnumMap<>(BlockFace.class);
+    private static final BlockFace[] STAIR_DIRECTION_VALUE_TO_BLOCK_FACE = {BlockFace.EAST, BlockFace.WEST, BlockFace.SOUTH, BlockFace.NORTH};
+    private static final Map<BlockFace, VoxelShape> UPWARDS_STAIR_SHAPES = new EnumMap<>(BlockFace.class);
+    private static final Map<BlockFace, VoxelShape> DOWNWARDS_STAIR_SHAPES = new EnumMap<>(BlockFace.class);
 
     private static final VoxelShape UPWARDS_STAIR_SHAPE = VoxelShape.builder()
             .solid(0, 0, 0, 1, 1, 1)
@@ -39,7 +40,7 @@ public final class VoxelShapes {
 
     public static VoxelShape buildStairShape(BlockState stairBlockState) {
         var isDownwards = stairBlockState.getPropertyValue(BlockPropertyTypes.UPSIDE_DOWN_BIT);
-        var face = BlockFace.getBlockFaceByStairDirectionValue(stairBlockState.getPropertyValue(BlockPropertyTypes.WEIRDO_DIRECTION));
+        var face = STAIR_DIRECTION_VALUE_TO_BLOCK_FACE[stairBlockState.getPropertyValue(BlockPropertyTypes.WEIRDO_DIRECTION)];
         return isDownwards ? DOWNWARDS_STAIR_SHAPES.get(face) : UPWARDS_STAIR_SHAPES.get(face);
     }