Merge pull request #13 from mat-1/split-clientbound-serverbound

Split clientbound and serverbound packets

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 {}