From 08958c2278b15ebeac8a964f392ebb792e479b61 Mon Sep 17 00:00:00 2001 From: mat <27899617+mat-1@users.noreply.github.com> Date: Wed, 27 Nov 2024 19:31:40 -0600 Subject: Refactor azalea-protocol (#190) * start updating to 1.21.4 * fix block codegen and stop using block data from burger * rename packet related modules and structs to be simpler * ItemSlot -> ItemStack for more consistency with mojmap * .get() -> .into_packet() * simplify declare_state_packets by removing packet ids * rename read_from and write_into to azalea_read and azalea_write * rename McBufReadable and McBufWritable to AzaleaRead and AzaleaWrite * McBuf -> AzBuf * remove most uses of into_variant * update codegen and use resourcelocation names for packets * implement #[limit(i)] attribute for AzBuf derive macro * fixes for 1.21.4 * fix examples * update some physics code and fix ChatType * remove unused imports in codegen * re-add some things to migrate.py and update +mc version numbers automatically * downgrade to 1.21.3 lol --- .../status/clientbound_status_response_packet.rs | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100755 azalea-protocol/src/packets/status/clientbound_status_response_packet.rs (limited to 'azalea-protocol/src/packets/status/clientbound_status_response_packet.rs') diff --git a/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs b/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs deleted file mode 100755 index 1316894e..00000000 --- a/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs +++ /dev/null @@ -1,61 +0,0 @@ -use std::io::{Cursor, Write}; - -use azalea_buf::{BufReadError, McBufReadable, McBufWritable}; -use azalea_chat::FormattedText; -use azalea_protocol_macros::ClientboundStatusPacket; -use serde::{Deserialize, Serialize}; -use serde_json::value::Serializer; - -#[derive(Clone, Debug, Serialize, Deserialize)] -pub struct Version { - pub name: String, - pub protocol: i32, -} - -#[derive(Clone, Debug, Serialize, Deserialize)] -pub struct SamplePlayer { - pub id: String, - pub name: String, -} - -#[derive(Clone, Debug, Serialize, Deserialize)] -pub struct Players { - pub max: i32, - pub online: i32, - #[serde(default)] - pub sample: Vec, -} - -// the entire packet is just json, which is why it has deserialize -#[derive(Clone, Debug, Serialize, Deserialize, ClientboundStatusPacket)] -pub struct ClientboundStatusResponsePacket { - pub description: FormattedText, - #[serde(default)] - #[serde(skip_serializing_if = "Option::is_none")] - pub favicon: Option, - pub players: Players, - pub version: Version, - #[serde(default)] - #[serde(skip_serializing_if = "Option::is_none")] - #[serde(rename = "enforcesSecureChat")] - pub enforces_secure_chat: Option, -} - -impl McBufReadable for ClientboundStatusResponsePacket { - fn read_from(buf: &mut Cursor<&[u8]>) -> Result { - let status_string = String::read_from(buf)?; - let status_json: serde_json::Value = serde_json::from_str(status_string.as_str())?; - - Ok(ClientboundStatusResponsePacket::deserialize(status_json)?) - } -} - -impl McBufWritable for ClientboundStatusResponsePacket { - fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { - let status_string = ClientboundStatusResponsePacket::serialize(self, Serializer) - .unwrap() - .to_string(); - status_string.write_into(buf)?; - Ok(()) - } -} -- cgit v1.2.3