majjo/Pumpkin
1
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Pumpkin.git synced 2026-08-30 20:14:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

add logic for placing blocks

Browse Source
This commit is contained in:
Edvin Bryntesson
2024-08-20 12:32:05 +02:00
parent 1b1300e194
commit c18cbdc06b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pumpkin-world/src/lib.rs
View File

@@ -4,7 +4,7 @@ pub const WORLD_HEIGHT: usize = 384;
pub const WORLD_Y_START_AT: i32 = -64;
pub const DIRECT_PALETTE_BITS: u32 = 15;
pub mod block;
mod global_registry;
pub mod global_registry;
pub mod item;
pub mod radial_chunk_iterator;
pub mod vector3;

10
pumpkin/src/client/player_packet.rs
View File

@@ -17,7 +17,7 @@ use pumpkin_protocol::{
};
use pumpkin_text::TextComponent;
use pumpkin_world::block::BlockFace;
use pumpkin_world::global_registry;
use crate::{
commands::{handle_command, CommandSender},
entity::player::{ChatMode, GameMode, Hand},
@@ -322,10 +322,12 @@ impl Client {
let location = use_item_on.location;
let face = BlockFace::from_i32(use_item_on.face.0).unwrap();
let location = WorldPosition(location.0 + face.to_offset());
// TODO:
// TODO:
// - Add checking for if used item is a block
if let Some(item) = self.player.as_ref().unwrap().inventory.held_item() {
server.broadcast_packet(self, &CBlockUpdate::new(location, item.item_id.into()));
let id = global_registry::find_minecraft_id(global_registry::ITEM_REGISTRY,item.item_id).unwrap();
let block_state_id = pumpkin_world::block::block_registry::block_id_and_properties_to_block_state_id(id,None).expect("Id should exist");
server.broadcast_packet(self, &CBlockUpdate::new(location, (block_state_id as i32).into()));
}
}
@@ -342,7 +344,7 @@ impl Client {
let inventory = &mut self.player.as_mut()
.unwrap()
.inventory;
inventory.set_slot(packet.slot as usize, packet.clicked_item.to_item(), false);
}
}