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 --- .../src/packets/status/c_pong_response.rs | 7 +++ .../src/packets/status/c_status_response.rs | 61 ++++++++++++++++++++++ .../status/clientbound_pong_response_packet.rs | 7 --- .../status/clientbound_status_response_packet.rs | 61 ---------------------- azalea-protocol/src/packets/status/mod.rs | 25 ++++----- .../src/packets/status/s_ping_request.rs | 7 +++ .../src/packets/status/s_status_request.rs | 5 ++ .../status/serverbound_ping_request_packet.rs | 7 --- .../status/serverbound_status_request_packet.rs | 5 -- 9 files changed, 91 insertions(+), 94 deletions(-) create mode 100755 azalea-protocol/src/packets/status/c_pong_response.rs create mode 100755 azalea-protocol/src/packets/status/c_status_response.rs delete mode 100755 azalea-protocol/src/packets/status/clientbound_pong_response_packet.rs delete mode 100755 azalea-protocol/src/packets/status/clientbound_status_response_packet.rs create mode 100755 azalea-protocol/src/packets/status/s_ping_request.rs create mode 100755 azalea-protocol/src/packets/status/s_status_request.rs delete mode 100755 azalea-protocol/src/packets/status/serverbound_ping_request_packet.rs delete mode 100755 azalea-protocol/src/packets/status/serverbound_status_request_packet.rs (limited to 'azalea-protocol/src/packets/status') diff --git a/azalea-protocol/src/packets/status/c_pong_response.rs b/azalea-protocol/src/packets/status/c_pong_response.rs new file mode 100755 index 00000000..34a5e73b --- /dev/null +++ b/azalea-protocol/src/packets/status/c_pong_response.rs @@ -0,0 +1,7 @@ +use azalea_buf::AzBuf; +use azalea_protocol_macros::ClientboundStatusPacket; + +#[derive(Clone, Debug, AzBuf, ClientboundStatusPacket)] +pub struct ClientboundPongResponse { + pub time: u64, +} diff --git a/azalea-protocol/src/packets/status/c_status_response.rs b/azalea-protocol/src/packets/status/c_status_response.rs new file mode 100755 index 00000000..b30c75be --- /dev/null +++ b/azalea-protocol/src/packets/status/c_status_response.rs @@ -0,0 +1,61 @@ +use std::io::{Cursor, Write}; + +use azalea_buf::{AzaleaRead, AzaleaWrite, BufReadError}; +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 ClientboundStatusResponse { + 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 AzaleaRead for ClientboundStatusResponse { + fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result { + let status_string = String::azalea_read(buf)?; + let status_json: serde_json::Value = serde_json::from_str(status_string.as_str())?; + + Ok(ClientboundStatusResponse::deserialize(status_json)?) + } +} + +impl AzaleaWrite for ClientboundStatusResponse { + fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { + let status_string = ClientboundStatusResponse::serialize(self, Serializer) + .unwrap() + .to_string(); + status_string.azalea_write(buf)?; + Ok(()) + } +} diff --git a/azalea-protocol/src/packets/status/clientbound_pong_response_packet.rs b/azalea-protocol/src/packets/status/clientbound_pong_response_packet.rs deleted file mode 100755 index 8c8a7bb1..00000000 --- a/azalea-protocol/src/packets/status/clientbound_pong_response_packet.rs +++ /dev/null @@ -1,7 +0,0 @@ -use azalea_buf::McBuf; -use azalea_protocol_macros::ClientboundStatusPacket; - -#[derive(Clone, Debug, McBuf, ClientboundStatusPacket)] -pub struct ClientboundPongResponsePacket { - pub time: u64, -} 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(()) - } -} diff --git a/azalea-protocol/src/packets/status/mod.rs b/azalea-protocol/src/packets/status/mod.rs index 3c70c9b1..335600e3 100755 --- a/azalea-protocol/src/packets/status/mod.rs +++ b/azalea-protocol/src/packets/status/mod.rs @@ -1,18 +1,15 @@ -pub mod clientbound_pong_response_packet; -pub mod clientbound_status_response_packet; -pub mod serverbound_ping_request_packet; -pub mod serverbound_status_request_packet; +// NOTE: This file is generated automatically by codegen/packet.py. +// Don't edit it directly! use azalea_protocol_macros::declare_state_packets; -declare_state_packets!( - StatusPacket, - Serverbound => { - 0x00: serverbound_status_request_packet::ServerboundStatusRequestPacket, - 0x01: serverbound_ping_request_packet::ServerboundPingRequestPacket, - }, - Clientbound => { - 0x00: clientbound_status_response_packet::ClientboundStatusResponsePacket, - 0x01: clientbound_pong_response_packet::ClientboundPongResponsePacket, - } +declare_state_packets!(StatusPacket, + Clientbound => [ + status_response, + pong_response, + ], + Serverbound => [ + status_request, + ping_request, + ] ); diff --git a/azalea-protocol/src/packets/status/s_ping_request.rs b/azalea-protocol/src/packets/status/s_ping_request.rs new file mode 100755 index 00000000..34f2e062 --- /dev/null +++ b/azalea-protocol/src/packets/status/s_ping_request.rs @@ -0,0 +1,7 @@ +use azalea_buf::AzBuf; +use azalea_protocol_macros::ServerboundStatusPacket; + +#[derive(Clone, Debug, AzBuf, ServerboundStatusPacket)] +pub struct ServerboundPingRequest { + pub time: u64, +} diff --git a/azalea-protocol/src/packets/status/s_status_request.rs b/azalea-protocol/src/packets/status/s_status_request.rs new file mode 100755 index 00000000..662d74bf --- /dev/null +++ b/azalea-protocol/src/packets/status/s_status_request.rs @@ -0,0 +1,5 @@ +use azalea_buf::AzBuf; +use azalea_protocol_macros::ServerboundStatusPacket; + +#[derive(Clone, Debug, AzBuf, ServerboundStatusPacket)] +pub struct ServerboundStatusRequest {} diff --git a/azalea-protocol/src/packets/status/serverbound_ping_request_packet.rs b/azalea-protocol/src/packets/status/serverbound_ping_request_packet.rs deleted file mode 100755 index c546081c..00000000 --- a/azalea-protocol/src/packets/status/serverbound_ping_request_packet.rs +++ /dev/null @@ -1,7 +0,0 @@ -use azalea_buf::McBuf; -use azalea_protocol_macros::ServerboundStatusPacket; - -#[derive(Clone, Debug, McBuf, ServerboundStatusPacket)] -pub struct ServerboundPingRequestPacket { - pub time: u64, -} diff --git a/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs b/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs deleted file mode 100755 index 27fce3bf..00000000 --- a/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs +++ /dev/null @@ -1,5 +0,0 @@ -use azalea_buf::McBuf; -use azalea_protocol_macros::ServerboundStatusPacket; - -#[derive(Clone, Debug, McBuf, ServerboundStatusPacket)] -pub struct ServerboundStatusRequestPacket {} -- cgit v1.2.3