Merge pull request #188 from Theobl08/1.20-main

Fix block rotation for hull blocks and catwalk railling

Author: talrey

common/src/main/java/com/github/talrey/createdeco/blocks/CatwalkRailingBlock.java

@@ -14,6 +14,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -218,4 +219,40 @@ public static boolean isEmpty (BlockState state) {
   public FluidState getFluidState(BlockState state) {
     return state.getValue(BlockStateProperties.WATERLOGGED) ? Fluids.WATER.getSource(false) : Fluids.EMPTY.defaultFluidState();
   }
+
+  @Override
+  public BlockState rotate(BlockState state, Rotation rotation) {
+    boolean north = state.getValue(NORTH_FENCE);
+    boolean south = state.getValue(SOUTH_FENCE);
+    boolean east = state.getValue(EAST_FENCE);
+    boolean west = state.getValue(WEST_FENCE);
+    switch (rotation){
+      case CLOCKWISE_90 -> {
+        north = state.getValue(WEST_FENCE);
+        south = state.getValue(EAST_FENCE);
+        east = state.getValue(NORTH_FENCE);
+        west = state.getValue(SOUTH_FENCE);
+      }
+      case CLOCKWISE_180 -> {
+        north = state.getValue(SOUTH_FENCE);
+        south = state.getValue(NORTH_FENCE);
+        east = state.getValue(WEST_FENCE);
+        west = state.getValue(EAST_FENCE);
+      }
+      case COUNTERCLOCKWISE_90 -> {
+        north = state.getValue(EAST_FENCE);
+        south = state.getValue(WEST_FENCE);
+        east = state.getValue(SOUTH_FENCE);
+        west = state.getValue(NORTH_FENCE);
+      }
+      case NONE -> {
+        north = state.getValue(NORTH_FENCE);
+        south = state.getValue(SOUTH_FENCE);
+        east = state.getValue(EAST_FENCE);
+        west = state.getValue(WEST_FENCE);
+      }
+    }
+    BlockState newState = defaultBlockState().setValue(NORTH_FENCE, north).setValue(SOUTH_FENCE, south).setValue(EAST_FENCE, east).setValue(WEST_FENCE, west);
+    return newState;
+  }
 }

common/src/main/java/com/github/talrey/createdeco/blocks/HullBlock.java

@@ -5,6 +5,7 @@
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.DirectionalBlock;
+import net.minecraft.world.level.block.Rotation;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.phys.shapes.BooleanOp;
@@ -48,4 +49,9 @@ public BlockState getStateForPlacement (BlockPlaceContext ctx) {
   public VoxelShape getShape (BlockState state, BlockGetter reader, BlockPos pos, CollisionContext ctx) {
     return CUBE;
   }
+
+  @Override
+  public BlockState rotate(BlockState state, Rotation rotation) {
+    return state.setValue(FACING, rotation.rotate(state.getValue(FACING)));
+  }
 }