aboutsummaryrefslogtreecommitdiff
path: root/azalea-protocol/src/packets/status
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2024-11-27 19:31:40 -0600
committerGitHub <noreply@github.com>2024-11-27 19:31:40 -0600
commit08958c2278b15ebeac8a964f392ebb792e479b61 (patch)
tree4ae3664cea38d7fd1a8f1e95ed06fac04ffe519e /azalea-protocol/src/packets/status
parent139d77d3c2b0922fba5e9d4fa2bd9819d78bd773 (diff)
downloadazalea-drasl-08958c2278b15ebeac8a964f392ebb792e479b61.tar.xz
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
Diffstat (limited to 'azalea-protocol/src/packets/status')
-rwxr-xr-xazalea-protocol/src/packets/status/c_pong_response.rs7
-rwxr-xr-xazalea-protocol/src/packets/status/c_status_response.rs (renamed from azalea-protocol/src/packets/status/clientbound_status_response_packet.rs)20
-rwxr-xr-xazalea-protocol/src/packets/status/clientbound_pong_response_packet.rs7
-rwxr-xr-xazalea-protocol/src/packets/status/mod.rs25
-rwxr-xr-xazalea-protocol/src/packets/status/s_ping_request.rs7
-rwxr-xr-xazalea-protocol/src/packets/status/s_status_request.rs5
-rwxr-xr-xazalea-protocol/src/packets/status/serverbound_ping_request_packet.rs7
-rwxr-xr-xazalea-protocol/src/packets/status/serverbound_status_request_packet.rs5
8 files changed, 40 insertions, 43 deletions
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/clientbound_status_response_packet.rs b/azalea-protocol/src/packets/status/c_status_response.rs
index 1316894e..b30c75be 100755
--- a/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs
+++ b/azalea-protocol/src/packets/status/c_status_response.rs
@@ -1,6 +1,6 @@
use std::io::{Cursor, Write};
-use azalea_buf::{BufReadError, McBufReadable, McBufWritable};
+use azalea_buf::{AzaleaRead, AzaleaWrite, BufReadError};
use azalea_chat::FormattedText;
use azalea_protocol_macros::ClientboundStatusPacket;
use serde::{Deserialize, Serialize};
@@ -28,7 +28,7 @@ pub struct Players {
// the entire packet is just json, which is why it has deserialize
#[derive(Clone, Debug, Serialize, Deserialize, ClientboundStatusPacket)]
-pub struct ClientboundStatusResponsePacket {
+pub struct ClientboundStatusResponse {
pub description: FormattedText,
#[serde(default)]
#[serde(skip_serializing_if = "Option::is_none")]
@@ -41,21 +41,21 @@ pub struct ClientboundStatusResponsePacket {
pub enforces_secure_chat: Option<bool>,
}
-impl McBufReadable for ClientboundStatusResponsePacket {
- fn read_from(buf: &mut Cursor<&[u8]>) -> Result<ClientboundStatusResponsePacket, BufReadError> {
- let status_string = String::read_from(buf)?;
+impl AzaleaRead for ClientboundStatusResponse {
+ fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<ClientboundStatusResponse, BufReadError> {
+ let status_string = String::azalea_read(buf)?;
let status_json: serde_json::Value = serde_json::from_str(status_string.as_str())?;
- Ok(ClientboundStatusResponsePacket::deserialize(status_json)?)
+ Ok(ClientboundStatusResponse::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)
+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.write_into(buf)?;
+ 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/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 {}