aboutsummaryrefslogtreecommitdiff
path: root/azalea-protocol/src/packets/status
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-07-29 02:59:40 -0500
committermat <github@matdoes.dev>2022-07-29 02:59:40 -0500
commit4ee4687053b7442f518823b08099c156f4da4e83 (patch)
tree11bb56330ed172a961d0a19069a086798d0aa804 /azalea-protocol/src/packets/status
parentaadf2de3cb751d563e743599a7fb345c08010f5a (diff)
downloadazalea-drasl-4ee4687053b7442f518823b08099c156f4da4e83.tar.xz
Split clientbound and serverbound packets
Diffstat (limited to 'azalea-protocol/src/packets/status')
-rwxr-xr-xazalea-protocol/src/packets/status/clientbound_status_response_packet.rs15
-rwxr-xr-xazalea-protocol/src/packets/status/serverbound_status_request_packet.rs4
2 files changed, 8 insertions, 11 deletions
diff --git a/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs b/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs
index e7fb4f2b..2e4116fa 100755
--- a/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs
+++ b/azalea-protocol/src/packets/status/clientbound_status_response_packet.rs
@@ -1,12 +1,9 @@
-use std::io::{Read, Write};
-
+use super::ClientboundStatusPacket;
+use azalea_buf::Readable;
use azalea_chat::component::Component;
use serde::Deserialize;
use serde_json::Value;
-
-use azalea_buf::Readable;
-
-use super::StatusPacket;
+use std::io::{Read, Write};
#[derive(Clone, Debug, Deserialize)]
pub struct Version {
@@ -37,15 +34,15 @@ pub struct ClientboundStatusResponsePacket {
}
impl ClientboundStatusResponsePacket {
- pub fn get(self) -> StatusPacket {
- StatusPacket::ClientboundStatusResponsePacket(self)
+ pub fn get(self) -> ClientboundStatusPacket {
+ ClientboundStatusPacket::ClientboundStatusResponsePacket(self)
}
pub fn write(&self, _buf: &mut impl Write) -> Result<(), std::io::Error> {
Ok(())
}
- pub fn read(buf: &mut impl Read) -> Result<StatusPacket, String> {
+ pub fn read(buf: &mut impl Read) -> Result<ClientboundStatusPacket, String> {
let status_string = buf.read_utf()?;
let status_json: Value =
serde_json::from_str(status_string.as_str()).expect("Server status isn't valid JSON");
diff --git a/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs b/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs
index c19d7795..26885d6b 100755
--- a/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs
+++ b/azalea-protocol/src/packets/status/serverbound_status_request_packet.rs
@@ -1,5 +1,5 @@
use azalea_buf::McBuf;
-use packet_macros::StatusPacket;
+use packet_macros::ServerboundStatusPacket;
-#[derive(Clone, Debug, McBuf, StatusPacket)]
+#[derive(Clone, Debug, McBuf, ServerboundStatusPacket)]
pub struct ServerboundStatusRequestPacket {}