Implementation of cross sliding rail

Anvil-Dev · Dec 17, 2024 · 578730b · 578730b
1 parent 8e49bea
commit 578730b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/src/generated/resources/assets/anvilcraft/blockstates/sliding_rail.json b/src/generated/resources/assets/anvilcraft/blockstates/sliding_rail.json
@@ -5,7 +5,7 @@
       "y": 90
     },
     "axis=y": {
-      "model": "anvilcraft:block/sliding_rail"
+      "model": "anvilcraft:block/sliding_rail_cross"
     },
     "axis=z": {
       "model": "anvilcraft:block/sliding_rail"

diff --git a/src/main/java/dev/dubhe/anvilcraft/block/SlidingRailBlock.java b/src/main/java/dev/dubhe/anvilcraft/block/SlidingRailBlock.java
@@ -63,6 +63,14 @@ public class SlidingRailBlock extends Block implements IHammerChangeable, IHamme
             Block.box(0, 12, 0, 5, 16, 16),
             Block.box(11, 6, 0, 14, 12, 16)
         ).reduce((v1, v2) -> Shapes.join(v1, v2, BooleanOp.OR)).get();
+    public static final VoxelShape AABB_Y =
+        Stream.of(
+            Block.box(0, 0, 0, 16, 6, 16),
+            Block.box(11, 6, 11, 16, 16, 16),
+            Block.box(0, 6, 11, 5, 16, 16),
+            Block.box(0, 6, 0, 5, 16, 5),
+            Block.box(11, 6, 0, 16, 16, 5)
+        ).reduce((v1, v2) -> Shapes.join(v1, v2, BooleanOp.OR)).get();
     public static final EnumProperty<Direction.Axis> AXIS = BlockStateProperties.AXIS;
     public static final HashMap<BlockPos, PistonPushInfo> MOVING_PISTON_MAP = new HashMap<>();
 
@@ -99,8 +107,9 @@ public VoxelShape getShape(
             case X:
                 yield AABB_X;
             case Z:
-            default:
                 yield AABB_Z;
+            case Y:
+                yield AABB_Y;
         };
     }
 

diff --git a/src/main/java/dev/dubhe/anvilcraft/data/recipe/BlockCompressRecipeLoader.java b/src/main/java/dev/dubhe/anvilcraft/data/recipe/BlockCompressRecipeLoader.java
@@ -44,6 +44,11 @@ public static void init(RegistrateRecipeProvider provider) {
             .input(Blocks.DIRT)
             .result(Blocks.MYCELIUM)
             .save(provider);
+        BlockCompressRecipe.builder()
+            .input(ModBlocks.VOID_MATTER_BLOCK.get())
+            .input(ModBlocks.SUPERCRITICAL_NESTING_SHULKER_BOX.get())
+            .result(ModBlocks.SPACE_OVERCOMPRESSOR.get())
+            .save(provider);
     }
 
     private static void blockCompress(RegistrateRecipeProvider provider, Block block1, Block block2, Block result) {

diff --git a/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java b/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java
@@ -1335,7 +1335,9 @@ public class ModBlocks {
                         .modelFile(DangerUtil.genModModelFile("block/sliding_rail").get())
                         .rotationY(90)
                         .buildLast()};
-                case Z, Y -> DangerUtil.genConfiguredModel("block/sliding_rail")
+                case Z -> DangerUtil.genConfiguredModel("block/sliding_rail")
+                    .get();
+                case Y -> DangerUtil.genConfiguredModel("block/sliding_rail_cross")
                     .get();
             });
         })