diff --git a/Cargo.lock b/Cargo.lock index 8cfbdaf68..ea661f73a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1445,7 +1445,6 @@ dependencies = [ name = "mchprs_text" version = "0.6.0-dev" dependencies = [ - "regex", "serde", "serde_json", ] diff --git a/crates/blocks/src/blocks/mod.rs b/crates/blocks/src/blocks/mod.rs index b47aba304..a0b04107a 100644 --- a/crates/blocks/src/blocks/mod.rs +++ b/crates/blocks/src/blocks/mod.rs @@ -135,19 +135,7 @@ impl Block { } pub fn can_place_block_in(self) -> bool { - matches!(self.get_id(), - 0 // Air - | 12958..=12959 // Void and Cave air - | 80..=95 // Water - | 96..=111 // Lava - | 2005 // Short Grass - | 2006 // Fern - | 2007 // Dead bush - | 2008 // Seagrass - | 2009..=2010 // Tall Seagrass - | 10755..=10756 // Tall Grass - | 10757..=10758 // Large Fern - ) + self == Block::Air } pub(crate) fn complex_rotate(&mut self, amt: RotateAmt) { diff --git a/crates/blocks/src/generated.rs b/crates/blocks/src/generated.rs index 453bb71af..2949411cf 100644 --- a/crates/blocks/src/generated.rs +++ b/crates/blocks/src/generated.rs @@ -883,6 +883,7 @@ impl Block { Block::OakWallSign { .. } => Item::OakSign, Block::BirchWallSign { .. } => Item::BirchSign, Block::WarpedWallSign { .. } => Item::WarpedSign, + Block::WaterCauldron { .. } => Item::Cauldron, _ => return None, }) } diff --git a/crates/blocks/src/items.rs b/crates/blocks/src/items.rs index 94386f500..ec8c50a44 100644 --- a/crates/blocks/src/items.rs +++ b/crates/blocks/src/items.rs @@ -1,7 +1,7 @@ use crate::block_entities::ContainerType; pub use crate::generated::Item; -#[derive(Clone, Debug)] +#[derive(Clone, Debug, PartialEq)] pub struct ItemStack { pub item_type: Item, pub count: u8, @@ -10,6 +10,12 @@ pub struct ItemStack { } impl ItemStack { + pub fn is_same_item(&self, other: &ItemStack) -> bool { + self.item_type == other.item_type + && self.nbt == other.nbt + && self.container_slots == other.container_slots + } + /// Create container item with specified signal strength pub fn container_with_ss(container_ty: ContainerType, ss: u8) -> ItemStack { let item = match container_ty { diff --git a/crates/core/src/interaction.rs b/crates/core/src/interaction.rs index 48464f3c7..fda67c0ea 100644 --- a/crates/core/src/interaction.rs +++ b/crates/core/src/interaction.rs @@ -487,7 +487,7 @@ pub fn use_item_on_block( } let can_place = item.item_type.is_block() && world.get_block(block_pos).can_place_block_in(); - if !ctx.player.crouching + if !ctx.player.skips_block_use() && on_use( use_block, world, diff --git a/crates/core/src/player.rs b/crates/core/src/player.rs index 3769f6525..62feb84b9 100644 --- a/crates/core/src/player.rs +++ b/crates/core/src/player.rs @@ -390,6 +390,11 @@ impl Player { } } + pub fn skips_block_use(&self) -> bool { + let main_hand = self.selected_slot as usize + 36; + self.crouching && (self.inventory[main_hand].is_some() || self.inventory[45].is_some()) + } + pub fn teleport(&mut self, pos: PlayerPos) { // Prevent from teleporting to Infinity or NaN if !pos.x.is_finite() || !pos.y.is_finite() || !pos.z.is_finite() { @@ -492,6 +497,10 @@ impl Player { pub fn set_gamemode(&mut self, gamemode: Gamemode) { self.gamemode = gamemode; + // The client starts flying when it becomes a spectator, without telling the server + if matches!(gamemode, Gamemode::Spectator) { + self.flying = true; + } let change_game_state = CGameEvent { reason: CGameEventType::ChangeGamemode, value: self.gamemode.get_id() as f32, @@ -556,6 +565,42 @@ impl Player { pub fn set_held_slot(&mut self, slot: u32) { let set_held_slot = CSetHeldSlot { slot: slot as i32 }.encode(); self.client.send_packet(&set_held_slot); + self.selected_slot = slot; + } + + pub fn pick_item(&mut self, item: ItemStack) { + let matching_slot = (36..45).chain(9..36).find(|&slot| { + self.inventory[slot as usize] + .as_ref() + .is_some_and(|stack| stack.is_same_item(&item)) + }); + if let Some(slot) = matching_slot + && slot >= 36 + { + self.set_held_slot(slot - 36); + return; + } + + let hotbar_slot = (0..9) + .map(|offset| (self.selected_slot + offset) % 9) + .find(|&slot| self.inventory[(36 + slot) as usize].is_none()) + .unwrap_or(self.selected_slot); + let replaced = self.inventory[(36 + hotbar_slot) as usize].take(); + match matching_slot { + Some(slot) => { + let picked = self.inventory[slot as usize].take(); + self.set_inventory_slot(slot, replaced); + self.set_inventory_slot(36 + hotbar_slot, picked); + } + None => { + let free_slot = (9..36).find(|&slot| self.inventory[slot as usize].is_none()); + if let (Some(free_slot), Some(replaced)) = (free_slot, replaced) { + self.set_inventory_slot(free_slot, Some(replaced)); + } + self.set_inventory_slot(36 + hotbar_slot, Some(item)); + } + } + self.set_held_slot(hotbar_slot); } pub fn spawn_packet(&self) -> CSpawnEntity { @@ -598,7 +643,7 @@ impl Player { CSetEntityMetadataEntry { index: 6, metadata_type: 21, - value: vec![if self.crouching { 5 } else { 0 }], + value: vec![if self.crouching && !self.flying { 5 } else { 0 }], }, CSetEntityMetadataEntry { index: 17, diff --git a/crates/core/src/plot/mod.rs b/crates/core/src/plot/mod.rs index c0f3e2d8d..551188764 100644 --- a/crates/core/src/plot/mod.rs +++ b/crates/core/src/plot/mod.rs @@ -347,6 +347,7 @@ impl Plot { fn change_player_gamemode(&mut self, player_idx: usize, gamemode: Gamemode) { self.players[player_idx].set_gamemode(gamemode); + self.send_metadata_to_others(player_idx); let _ = self.message_sender.send(Message::PlayerUpdateGamemode( self.players[player_idx].uuid, gamemode, @@ -565,7 +566,7 @@ impl Plot { if self.redpiler.is_active() { let block = self.world.get_block(block_pos); let lever_or_button = matches!(block, Block::Lever { .. } | Block::StoneButton { .. }); - if lever_or_button && !self.players[player].crouching { + if lever_or_button && !self.players[player].skips_block_use() { self.redpiler.on_use_block(block_pos); self.publish_world(); return; @@ -601,7 +602,7 @@ impl Plot { } let block = self.world.get_block(block_pos); - if !self.players[player].crouching { + if !self.players[player].skips_block_use() { interaction::on_use( block, &mut self.world, diff --git a/crates/core/src/plot/packet_handlers.rs b/crates/core/src/plot/packet_handlers.rs index aa97b0579..2bfd5b2e8 100644 --- a/crates/core/src/plot/packet_handlers.rs +++ b/crates/core/src/plot/packet_handlers.rs @@ -21,6 +21,39 @@ impl Plot { packet.handle(self, player); } } + + fn send_held_item_to_others(&mut self, player: usize) { + let held_item = + &self.players[player].inventory[self.players[player].selected_slot as usize + 36]; + let entity_equipment = CSetEquipment { + entity_id: self.players[player].entity_id as i32, + equipment: vec![CSetEquipmentEquipment { + slot: 0, // Main hand + item: held_item.as_ref().map(utils::encode_slot_data), + }], + } + .encode(); + for other_player in 0..self.players.len() { + if player == other_player { + continue; + }; + self.players[other_player] + .client + .send_packet(&entity_equipment); + } + } + + pub(super) fn send_metadata_to_others(&mut self, player: usize) { + let entity_metadata = self.players[player].metadata_packet().encode(); + for other_player in 0..self.players.len() { + if player == other_player { + continue; + }; + self.players[other_player] + .client + .send_packet(&entity_metadata); + } + } } impl ServerBoundPacketHandler for Plot { @@ -85,49 +118,38 @@ impl ServerBoundPacketHandler for Plot { creative_inventory_action: SSetCreativeModeSlot, player: usize, ) { - if let Some(slot_data) = creative_inventory_action.clicked_item { - if creative_inventory_action.slot < 0 || creative_inventory_action.slot >= 46 { - return; - } - - let item = item_stack_from_slot_data(&slot_data); - self.players[player].inventory[creative_inventory_action.slot as usize] = Some(item); - - if creative_inventory_action.slot as u32 == self.players[player].selected_slot + 36 { - let entity_equipment = CSetEquipment { - entity_id: self.players[player].entity_id as i32, - equipment: vec![CSetEquipmentEquipment { - slot: 0, // Main hand - item: self.players[player].inventory - [creative_inventory_action.slot as usize] - .as_ref() - .map(utils::encode_slot_data), - }], - } - .encode(); - for other_player in 0..self.players.len() { - if player == other_player { - continue; - }; - self.players[other_player] - .client - .send_packet(&entity_equipment); + if !(0..46).contains(&creative_inventory_action.slot) { + return; + } + let slot = creative_inventory_action.slot as u32; + + match creative_inventory_action.clicked_item { + Ok(clicked_item) => { + self.players[player].inventory[slot as usize] = + clicked_item.as_ref().map(item_stack_from_slot_data); + if slot == self.players[player].selected_slot + 36 { + self.send_held_item_to_others(player); } } - } else { - self.players[player].inventory[creative_inventory_action.slot as usize] = None; + Err(_) => { + self.players[player].send_error_message("The server couldn't read this item.") + } } // We wanna retrieve the item slot from the inventory // rather than re-using the value from the client, // to avoid getting out of sync if the server validates // or sanitizes data or something - let item = self.players[player].inventory[creative_inventory_action.slot as usize].clone(); - self.players[player].set_inventory_slot(creative_inventory_action.slot as u32, item); + let item = self.players[player].inventory[slot as usize].clone(); + self.players[player].set_inventory_slot(slot, item); } fn handle_player_abilities(&mut self, player_abilities: SPlayerAbilities, player: usize) { + if self.players[player].flying == player_abilities.is_flying { + return; + } self.players[player].flying = player_abilities.is_flying; + self.send_metadata_to_others(player); } fn handle_swing_arm(&mut self, animation: SSwingArm, player: usize) { @@ -208,11 +230,14 @@ impl ServerBoundPacketHandler for Plot { || (new.y - old.y).abs() > 8.0 || (new.z - old.z).abs() > 8.0 { - CTeleportEntity { + CEntityPositionSync { entity_id: self.players[player].entity_id as i32, x: new.x, y: new.y, z: new.z, + velocity_x: 0.0, + velocity_y: 0.0, + velocity_z: 0.0, yaw: self.players[player].yaw, pitch: self.players[player].pitch, on_ground: player_position.on_ground, @@ -259,11 +284,14 @@ impl ServerBoundPacketHandler for Plot { || (new.y - old.y).abs() > 8.0 || (new.z - old.z).abs() > 8.0 { - CTeleportEntity { + CEntityPositionSync { entity_id: self.players[player].entity_id as i32, x: new.x, y: new.y, z: new.z, + velocity_x: 0.0, + velocity_y: 0.0, + velocity_z: 0.0, yaw: self.players[player].yaw, pitch: self.players[player].pitch, on_ground: player_position_and_rotation.on_ground, @@ -348,6 +376,7 @@ impl ServerBoundPacketHandler for Plot { let selected_slot = self.players[player].selected_slot as usize + 36; if player_action.status == 3 { self.players[player].inventory[selected_slot] = None; + self.send_held_item_to_others(player); } else if player_action.status == 4 { let mut stack_empty = false; if let Some(item_stack) = &mut self.players[player].inventory[selected_slot] { @@ -356,6 +385,7 @@ impl ServerBoundPacketHandler for Plot { } if stack_empty { self.players[player].inventory[selected_slot] = None; + self.send_held_item_to_others(player); } } } @@ -363,44 +393,19 @@ impl ServerBoundPacketHandler for Plot { fn handle_player_command(&mut self, entity_action: SPlayerCommand, player: usize) { match entity_action.action_id { - 0 => self.players[player].crouching = true, - 1 => self.players[player].crouching = false, - 3 => self.players[player].sprinting = true, - 4 => self.players[player].sprinting = false, - _ => {} + SPlayerCommand::START_SPRINTING => self.players[player].sprinting = true, + SPlayerCommand::STOP_SPRINTING => self.players[player].sprinting = false, + _ => return, } - let mut bitfield = 0; - if self.players[player].crouching { - bitfield |= 0x02; - }; - if self.players[player].sprinting { - bitfield |= 0x08; - }; - let metadata_entries = vec![ - CSetEntityMetadataEntry { - index: 0, - metadata_type: 0, - value: vec![bitfield], - }, - CSetEntityMetadataEntry { - index: 6, - metadata_type: 21, - value: vec![if self.players[player].crouching { 5 } else { 0 }], - }, - ]; - let entity_metadata = CSetEntityMetadata { - entity_id: self.players[player].entity_id as i32, - metadata: metadata_entries, - } - .encode(); - for other_player in 0..self.players.len() { - if player == other_player { - continue; - }; - self.players[other_player] - .client - .send_packet(&entity_metadata); + self.send_metadata_to_others(player); + } + + fn handle_player_input(&mut self, player_input: SPlayerInput, player: usize) { + if self.players[player].crouching == player_input.shift { + return; } + self.players[player].crouching = player_input.shift; + self.send_metadata_to_others(player); } fn handle_set_held_item(&mut self, held_item_change: SSetHeldItem, player: usize) { @@ -460,26 +465,27 @@ impl ServerBoundPacketHandler for Plot { warn!("Could not pick item from block: `{}`.", block.get_name()); return; }; - let item_stack = ItemStack { + let mut item_stack = ItemStack { item_type: item, count: 1, nbt: None, container_slots: Default::default(), }; - - // Check to see if the item is already in the hotbar - for hotbar_slot in 0..9 { - if let Some(item_stack) = &self.players[player_idx].inventory[hotbar_slot + 36] - && item_stack.item_type == item - { - self.players[player_idx].set_held_slot(hotbar_slot as u32); - return; + if packet.include_data + && let Some(BlockEntity::Container { inventory, .. }) = + self.world.get_block_entity(block_pos) + { + for entry in inventory { + let slot = entry.slot as usize; + if item_stack.container_slots.len() <= slot { + item_stack.container_slots.resize(slot + 1, None); + } + item_stack.container_slots[slot] = Some(entry.get_item_stack()); } } - // Create the item in the hotbar - let selected_slot = 36 + self.players[player_idx].selected_slot; - self.players[player_idx].set_inventory_slot(selected_slot, Some(item_stack)); + self.players[player_idx].pick_item(item_stack); + self.send_held_item_to_others(player_idx); } } diff --git a/crates/network/src/packets/clientbound.rs b/crates/network/src/packets/clientbound.rs index 9833d85da..f0fae884c 100644 --- a/crates/network/src/packets/clientbound.rs +++ b/crates/network/src/packets/clientbound.rs @@ -1407,25 +1407,31 @@ impl ClientBoundPacket for CSoundEffect { } } -pub struct CTeleportEntity { +pub struct CEntityPositionSync { pub entity_id: i32, pub x: f64, pub y: f64, pub z: f64, + pub velocity_x: f64, + pub velocity_y: f64, + pub velocity_z: f64, pub yaw: f32, pub pitch: f32, pub on_ground: bool, } -impl ClientBoundPacket for CTeleportEntity { +impl ClientBoundPacket for CEntityPositionSync { fn encode(&self) -> PacketEncoder { let mut buf = Vec::new(); buf.write_varint(self.entity_id); buf.write_double(self.x); buf.write_double(self.y); buf.write_double(self.z); - buf.write_byte(((self.yaw / 360f32 * 256f32) as i32 % 256) as i8); - buf.write_byte(((self.pitch / 360f32 * 256f32) as i32 % 256) as i8); + buf.write_double(self.velocity_x); + buf.write_double(self.velocity_y); + buf.write_double(self.velocity_z); + buf.write_float(self.yaw); + buf.write_float(self.pitch); buf.write_bool(self.on_ground); PacketEncoder::new( buf, diff --git a/crates/network/src/packets/mod.rs b/crates/network/src/packets/mod.rs index e9693c8a7..dfedcb441 100644 --- a/crates/network/src/packets/mod.rs +++ b/crates/network/src/packets/mod.rs @@ -193,6 +193,9 @@ fn read_decompressed( packet_id!("play", "serverbound", "minecraft:player_command") => { Box::new(SPlayerCommand::decode(reader)?) } + packet_id!("play", "serverbound", "minecraft:player_input") => { + Box::new(SPlayerInput::decode(reader)?) + } packet_id!("play", "serverbound", "minecraft:set_carried_item") => { Box::new(SSetHeldItem::decode(reader)?) } @@ -375,16 +378,57 @@ pub trait PacketDecoderExt: Read + Sized { }) } - fn read_slot_data(&mut self, can_skip_components: bool) -> DecodeResult> { + /// Reads an item stack as the client sends it for creative inventory slots: its own + /// component values are prefixed with their length in bytes, those of nested items are not. + fn read_untrusted_slot_data(&mut self) -> DecodeResult> { let item_count = self.read_varint()?; - if item_count == 0 { + if item_count <= 0 { return Ok(None); } let item_id = self.read_varint()?; let num_components = self.read_varint()?; - // Num components removed - self.read_varint()?; + let num_removed_components = self.read_varint()?; + + let mut container_items = Vec::new(); + for _ in 0..num_components { + let component_ty = self.read_varint()?; + let value_len = self.read_varint()?; + let mut value = Cursor::new(self.read_bytes(value_len as usize)?); + if component_ty == protocol_id!("minecraft:data_component_type", "minecraft:container") + { + container_items = value.read_container_slots()?; + } + } + for _ in 0..num_removed_components { + self.read_varint()?; + } + + Ok(Some(SlotData { + item_count, + item_id, + container_items, + })) + } + + fn read_container_slots(&mut self) -> DecodeResult>> { + let num_slots = self.read_varint()?; + let mut slots = Vec::new(); + for _ in 0..num_slots { + slots.push(self.read_slot_data()?); + } + Ok(slots) + } + + fn read_slot_data(&mut self) -> DecodeResult> { + let item_count = self.read_varint()?; + if item_count <= 0 { + return Ok(None); + } + + let item_id = self.read_varint()?; + let num_components = self.read_varint()?; + let num_removed_components = self.read_varint()?; let mut container_items = Vec::new(); for _ in 0..num_components { @@ -465,21 +509,15 @@ pub trait PacketDecoderExt: Read + Sized { let _ = self.read_varint()?; } protocol_id!("minecraft:data_component_type", "minecraft:container") => { - let num_slots = self.read_varint()?; - for _ in 0..num_slots { - container_items.push(self.read_slot_data(false)?); - } - } - // If there's a component we can't handle, then there's no way to know how many bytes to skip to the next component, so we have to stop early - _ => { - if !can_skip_components { - return Err(PacketDecodeError::UnsupportedSlotComponent(component_ty)); - } else { - break; - } + container_items = self.read_container_slots()?; } + // If there's a component we can't handle, then there's no way to know how many bytes to skip to the next component + _ => return Err(PacketDecodeError::UnsupportedSlotComponent(component_ty)), } } + for _ in 0..num_removed_components { + self.read_varint()?; + } Ok(Some(SlotData { item_count, item_id, diff --git a/crates/network/src/packets/serverbound.rs b/crates/network/src/packets/serverbound.rs index ef412c94e..ea78169a3 100644 --- a/crates/network/src/packets/serverbound.rs +++ b/crates/network/src/packets/serverbound.rs @@ -41,6 +41,7 @@ pub trait ServerBoundPacketHandler { fn handle_player_abilities(&mut self, _packet: SPlayerAbilities, _player_idx: usize) {} fn handle_player_action(&mut self, _packet: SPlayerAction, _player_idx: usize) {} fn handle_player_command(&mut self, _packet: SPlayerCommand, _player_idx: usize) {} + fn handle_player_input(&mut self, _packet: SPlayerInput, _player_idx: usize) {} fn handle_swing_arm(&mut self, _packet: SSwingArm, _player_idx: usize) {} fn handle_use_item_on(&mut self, _packet: SUseItemOn, _player_idx: usize) {} fn handle_set_held_item(&mut self, _packet: SSetHeldItem, _player_idx: usize) {} @@ -371,6 +372,10 @@ impl ServerBoundPacket for SKeepAlive { } } +fn read_on_ground(decoder: &mut T) -> DecodeResult { + Ok(decoder.read_unsigned_byte()? & 0x01 != 0) +} + #[derive(Debug)] pub struct SSetPlayerPosition { pub x: f64, @@ -385,7 +390,7 @@ impl ServerBoundPacket for SSetPlayerPosition { x: decoder.read_double()?, y: decoder.read_double()?, z: decoder.read_double()?, - on_ground: decoder.read_bool()?, + on_ground: read_on_ground(decoder)?, }) } @@ -412,7 +417,7 @@ impl ServerBoundPacket for SSetPlayerPositionAndRotation { z: decoder.read_double()?, yaw: decoder.read_float()?, pitch: decoder.read_float()?, - on_ground: decoder.read_bool()?, + on_ground: read_on_ground(decoder)?, }) } @@ -433,7 +438,7 @@ impl ServerBoundPacket for SPlayerRotation { Ok(SPlayerRotation { yaw: decoder.read_float()?, pitch: decoder.read_float()?, - on_ground: decoder.read_bool()?, + on_ground: read_on_ground(decoder)?, }) } @@ -450,7 +455,7 @@ pub struct SSetPlayerOnGround { impl ServerBoundPacket for SSetPlayerOnGround { fn decode(decoder: &mut T) -> DecodeResult { Ok(SSetPlayerOnGround { - on_ground: decoder.read_bool()?, + on_ground: read_on_ground(decoder)?, }) } @@ -507,6 +512,36 @@ impl ServerBoundPacket for SPlayerAction { } } +#[derive(Debug)] +pub struct SPlayerInput { + pub forward: bool, + pub backward: bool, + pub left: bool, + pub right: bool, + pub jump: bool, + pub shift: bool, + pub sprint: bool, +} + +impl ServerBoundPacket for SPlayerInput { + fn decode(decoder: &mut T) -> DecodeResult { + let flags = decoder.read_unsigned_byte()?; + Ok(SPlayerInput { + forward: flags & 0x01 != 0, + backward: flags & 0x02 != 0, + left: flags & 0x04 != 0, + right: flags & 0x08 != 0, + jump: flags & 0x10 != 0, + shift: flags & 0x20 != 0, + sprint: flags & 0x40 != 0, + }) + } + + fn handle(self: Box, handler: &mut dyn ServerBoundPacketHandler, player_idx: usize) { + handler.handle_player_input(*self, player_idx); + } +} + #[derive(Debug)] pub struct SPlayerCommand { pub entity_id: i32, @@ -514,6 +549,11 @@ pub struct SPlayerCommand { pub jump_boost: i32, } +impl SPlayerCommand { + pub const START_SPRINTING: i32 = 1; + pub const STOP_SPRINTING: i32 = 2; +} + impl ServerBoundPacket for SPlayerCommand { fn decode(decoder: &mut T) -> DecodeResult { Ok(SPlayerCommand { @@ -611,13 +651,13 @@ impl ServerBoundPacket for SSetHeldItem { #[derive(Debug)] pub struct SSetCreativeModeSlot { pub slot: i16, - pub clicked_item: Option, + pub clicked_item: DecodeResult>, } impl ServerBoundPacket for SSetCreativeModeSlot { fn decode(decoder: &mut T) -> DecodeResult { let slot = decoder.read_short()?; - let clicked_item = decoder.read_slot_data(true)?; + let clicked_item = decoder.read_untrusted_slot_data(); Ok(SSetCreativeModeSlot { slot, clicked_item }) } diff --git a/crates/text/Cargo.toml b/crates/text/Cargo.toml index 28a058935..e071e4400 100644 --- a/crates/text/Cargo.toml +++ b/crates/text/Cargo.toml @@ -14,4 +14,3 @@ include.workspace = true [dependencies] serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -regex = { workspace = true } diff --git a/crates/text/src/lib.rs b/crates/text/src/lib.rs index 2bc6faae9..195f00069 100644 --- a/crates/text/src/lib.rs +++ b/crates/text/src/lib.rs @@ -1,15 +1,4 @@ -use regex::Regex; use serde::{Deserialize, Serialize}; -use std::sync::LazyLock; - -static URL_REGEX: LazyLock = LazyLock::new(|| { - Regex::new("([a-zA-Z0-9§\\-:/]+\\.[a-zA-Z/0-9§\\-:_#]+(\\.[a-zA-Z/0-9.§\\-:#\\?\\+=_]+)?)") - .unwrap() -}); - -fn is_valid_hex(ch: char) -> bool { - ch.is_numeric() || ('a'..='f').contains(&ch) || ('A'..='F').contains(&ch) -} #[derive(Serialize, Deserialize, Debug, Clone, Copy, Default)] #[serde(rename_all = "snake_case")] @@ -90,20 +79,6 @@ impl Into for ColorCode { } } -#[derive(Serialize, Deserialize, Debug, Clone)] -#[serde(rename_all = "snake_case")] -enum ClickEventType { - OpenUrl, - RunCommand, - SuggestCommand, -} - -#[derive(Serialize, Deserialize, Debug, Clone)] -pub struct ClickEvent { - action: ClickEventType, - value: String, -} - /// This is only used for `TextComponent` serialize #[allow(clippy::trivially_copy_pass_by_ref)] fn is_false(field: &bool) -> bool { @@ -168,9 +143,6 @@ pub struct TextComponent { pub obfuscated: bool, #[serde(skip_serializing_if = "Option::is_none")] pub color: Option, - #[serde(skip_serializing_if = "Option::is_none")] - #[serde(rename = "clickEvent")] - pub click_event: Option, #[serde(skip_serializing_if = "Vec::is_empty")] #[serde(default)] pub extra: Vec, @@ -202,7 +174,9 @@ impl TextComponent { _ => { components.push(cur_component); cur_component = Default::default(); - cur_component.color = Some(TextColor::ColorCode(color)); + if !matches!(color, ColorCode::Reset) { + cur_component.color = Some(TextColor::ColorCode(color)); + } } } continue; @@ -216,7 +190,7 @@ impl TextComponent { for _ in 0..6 { if let Some(c) = chars.next() { hex.push(c); - if !is_valid_hex(c) { + if !c.is_ascii_hexdigit() { cur_component.text += &hex; continue 'main_loop; } @@ -233,39 +207,8 @@ impl TextComponent { cur_component.text.push(c); } components.push(cur_component); - - // This code is stinky - // Find URLs and add click action - let mut new_components = Vec::with_capacity(components.len()); - for component in components { - let mut last = 0; - let text = &component.text; - - for match_ in URL_REGEX.find_iter(text) { - let index = match_.start(); - let matched = match_.as_str(); - if last != index { - let mut new = component.clone(); - new.text = String::from(&text[last..index]); - new_components.push(new); - } - let mut new = component.clone(); - new.text = matched.to_string(); - new.click_event = Some(ClickEvent { - action: ClickEventType::OpenUrl, - value: matched.to_string(), - }); - new_components.push(new); - last = index + matched.len(); - } - if last < text.len() { - let mut new = component.clone(); - new.text = String::from(&text[last..]); - new_components.push(new); - } - } - - new_components + components.retain(|component| !component.text.is_empty()); + components } pub fn encode_json(&self) -> String { @@ -280,7 +223,6 @@ impl TextComponent { && !self.obfuscated && self.extra.is_empty() && self.color.is_none() - && self.click_event.is_none() } } diff --git a/crates/world/src/storage.rs b/crates/world/src/storage.rs index 9f0e37ce9..feb2c4054 100644 --- a/crates/world/src/storage.rs +++ b/crates/world/src/storage.rs @@ -473,12 +473,12 @@ impl Chunk { block_count: 0, block_states: PalettedContainer { bits_per_entry: 0, - data_array: vec![0], + data_array: vec![], palette: Some(vec![0]), }, biomes: PalettedContainer { bits_per_entry: 0, - data_array: vec![0], + data_array: vec![], palette: Some(vec![0]), }, }) diff --git a/mc_data/gen_info.yaml b/mc_data/gen_info.yaml index 877a00a8a..23afbcdd6 100644 --- a/mc_data/gen_info.yaml +++ b/mc_data/gen_info.yaml @@ -268,3 +268,4 @@ block_to_item: "minecraft:bamboo_wall_sign": "minecraft:bamboo_sign" "minecraft:cherry_wall_sign": "minecraft:cherry_sign" "minecraft:mangrove_wall_sign": "minecraft:mangrove_sign" + "minecraft:water_cauldron": "minecraft:cauldron"