Merge AzaleaRead and AzaleaWrite (#305)

2 files changed, 3 insertions, 6 deletions

diff --git a/azalea-protocol/src/packets/login/c_login_disconnect.rs b/azalea-protocol/src/packets/login/c_login_disconnect.rs
index 950d5e5c..e6e6b33a 100644
--- a/azalea-protocol/src/packets/login/c_login_disconnect.rs
+++ b/azalea-protocol/src/packets/login/c_login_disconnect.rs
@@ -1,6 +1,6 @@
 use std::io::{self, Cursor, Write};
 
-use azalea_buf::{AzaleaRead, AzaleaWrite, BufReadError};
+use azalea_buf::{AzBuf, BufReadError};
 use azalea_chat::FormattedText;
 use azalea_protocol_macros::ClientboundLoginPacket;
 use serde::{Deserialize, Serialize};
@@ -11,7 +11,7 @@ pub struct ClientboundLoginDisconnect {
     pub reason: FormattedText,
 }
 
-impl AzaleaRead for ClientboundLoginDisconnect {
+impl AzBuf for ClientboundLoginDisconnect {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<ClientboundLoginDisconnect, BufReadError> {
         let disconnect_string = String::azalea_read(buf)?;
         trace!("Got disconnect packet with string: {disconnect_string:?}");
@@ -29,9 +29,6 @@ impl AzaleaRead for ClientboundLoginDisconnect {
             reason: FormattedText::deserialize(disconnect_json)?,
         })
     }
-}
-
-impl AzaleaWrite for ClientboundLoginDisconnect {
     fn azalea_write(&self, buf: &mut impl Write) -> io::Result<()> {
         let status_string = FormattedText::serialize(&self.reason, serde_json::value::Serializer)
             .unwrap()
diff --git a/azalea-protocol/src/packets/login/s_hello.rs b/azalea-protocol/src/packets/login/s_hello.rs
index a7a9f4ee..075cd99c 100644
--- a/azalea-protocol/src/packets/login/s_hello.rs
+++ b/azalea-protocol/src/packets/login/s_hello.rs
@@ -13,7 +13,7 @@ pub struct ServerboundHello {
 mod tests {
     use std::io::Cursor;
 
-    use azalea_buf::{AzaleaRead, AzaleaWrite};
+    use azalea_buf::AzBuf;
 
     use super::*;