[~] Create x Frame compat

starfish-studios · May 21, 2024 · 3fd0b01 · 3fd0b01
1 parent 9838a0a
commit 3fd0b01
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 46 deletions.
diff --git a/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java b/src/main/java/com/starfish_studios/bbb/block/FrameBlock.java
@@ -97,6 +97,7 @@ public void attack(BlockState blockState, Level level, BlockPos blockPos, Player
         }
     }
 
+    @Override
     public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) {
         return switch (blockState.getValue(FACING)) {
             case EAST -> EAST;
@@ -106,6 +107,7 @@ public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, Block
         };
     }
 
+    @Override
     public VoxelShape getCollisionShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) {
         return switch (blockState.getValue(FACING)) {
             case NORTH -> Shapes.or(blockState.getValue(TOP) ? TOP_NORTH_AABB : Shapes.empty(), blockState.getValue(BOTTOM) ? BOTTOM_NORTH_AABB : Shapes.empty());
@@ -209,7 +211,12 @@ public BlockState getConnections(BlockState state, LevelAccessor level, BlockPos
     }
 
     public boolean validConnection(BlockState state) {
-        if (state.isSolid()) {
+        if (state.isFaceSturdy(null, null, Direction.UP) ||
+                state.isFaceSturdy(null, null, Direction.DOWN) ||
+                state.isFaceSturdy(null, null, Direction.NORTH) ||
+                state.isFaceSturdy(null, null, Direction.EAST) ||
+                state.isFaceSturdy(null, null, Direction.SOUTH) ||
+                state.isFaceSturdy(null, null, Direction.WEST)) {
             return true;
         }
         return state.is(BBBTags.BBBBlockTags.FRAMES);