implement iron trapdoor placement (#78)

MCHPR · Oct 23, 2022 · 1f4e5c0 · 1f4e5c0
1 parent 47f6b24
commit 1f4e5c0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/crates/blocks/src/items.rs b/crates/blocks/src/items.rs
@@ -347,6 +347,12 @@ items! {
         from_id(_id): 221 => {},
         block: true,
     },
+    IronTrapdoor {
+        props: {},
+        get_id: 640,
+        from_id(_id): 640 => {},
+        block: true,
+    },
     Unknown {
         props: {
             id: u32

diff --git a/crates/core/src/blocks/mod.rs b/crates/core/src/blocks/mod.rs
@@ -374,6 +374,13 @@ impl Block {
             Item::StainedGlass { color } => Block::StainedGlass { color },
             Item::SmoothStoneSlab {} => Block::SmoothStoneSlab {},
             Item::QuartzSlab {} => Block::QuartzSlab {},
+            Item::IronTrapdoor {} => {
+                match context.block_face {
+                    BlockFace::Bottom => Block::IronTrapdoor { facing: context.player.get_direction().opposite(), half: TrapdoorHalf::Top, powered: false },
+                    BlockFace::Top => Block::IronTrapdoor { facing: context.player.get_direction().opposite(), half: TrapdoorHalf::Bottom, powered: false },
+                    _ => Block::IronTrapdoor { facing: context.block_face.to_direction(), half: if context.cursor_y > 0.5 {TrapdoorHalf::Top} else {TrapdoorHalf::Bottom} , powered: false }
+                }
+            },
             _ => Block::Air {},
         };
         if block.is_valid_position(world, pos) {
@@ -1671,7 +1678,7 @@ blocks! {
     },
     IronTrapdoor {
         props: {
-            facing: BlockFacing,
+            facing: BlockDirection,
             half: TrapdoorHalf,
             powered: bool
         },
@@ -1683,7 +1690,7 @@ blocks! {
         },
         from_id_offset: 7788,
         from_id(id): 7788..=7850 => {
-            facing: BlockFacing::from_id(id >> 4),
+            facing: BlockDirection::from_id(id >> 4),
             half: TrapdoorHalf::from_id((id >> 3) & 1),
             powered: ((id >> 1) & 1) == 0
         },

diff --git a/crates/core/src/items.rs b/crates/core/src/items.rs
@@ -23,6 +23,7 @@ pub struct UseOnBlockContext<'a> {
     pub block_pos: BlockPos,
     pub block_face: BlockFace,
     pub player: &'a mut Player,
+    pub cursor_y: f32,
 }
 
 /// returns true if cancelled

diff --git a/crates/core/src/plot/packet_handlers.rs b/crates/core/src/plot/packet_handlers.rs
@@ -249,6 +249,7 @@ impl ServerBoundPacketHandler for Plot {
                     block_face,
                     block_pos,
                     player: &mut self.players[player],
+                    cursor_y: player_block_placement.cursor_y,
                 },
             );
             if cancelled {