Split clientbound and serverbound packets

7 files changed, 18 insertions, 18 deletions

diff --git a/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs b/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs
index 05310fb0..515fb089 100755
--- a/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs
@@ -1,9 +1,9 @@
 use azalea_buf::{McBuf, UnsizedByteArray};
 use azalea_core::ResourceLocation;
-use packet_macros::LoginPacket;
+use packet_macros::ClientboundLoginPacket;
 use std::hash::Hash;
 
-#[derive(Hash, Clone, Debug, McBuf, LoginPacket)]
+#[derive(Hash, Clone, Debug, McBuf, ClientboundLoginPacket)]
 pub struct ClientboundCustomQueryPacket {
     #[var]
     pub transaction_id: u32,
diff --git a/azalea-protocol/src/packets/login/clientbound_game_profile_packet.rs b/azalea-protocol/src/packets/login/clientbound_game_profile_packet.rs
index a06b999b..9d9ce35b 100755
--- a/azalea-protocol/src/packets/login/clientbound_game_profile_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_game_profile_packet.rs
@@ -1,6 +1,6 @@
 use std::io::{Read, Write};
 
-use super::LoginPacket;
+use super::ClientboundLoginPacket;
 use azalea_auth::game_profile::GameProfile;
 use azalea_buf::{McBufReadable, Readable, SerializableUuid, Writable};
 use uuid::Uuid;
@@ -12,8 +12,8 @@ pub struct ClientboundGameProfilePacket {
 
 // TODO: add derives to GameProfile and have an impl McBufReadable/Writable for GameProfile
 impl ClientboundGameProfilePacket {
-    pub fn get(self) -> LoginPacket {
-        LoginPacket::ClientboundGameProfilePacket(self)
+    pub fn get(self) -> ClientboundLoginPacket {
+        ClientboundLoginPacket::ClientboundGameProfilePacket(self)
     }
 
     pub fn write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
@@ -24,7 +24,7 @@ impl ClientboundGameProfilePacket {
         Ok(())
     }
 
-    pub fn read(buf: &mut impl Read) -> Result<LoginPacket, String> {
+    pub fn read(buf: &mut impl Read) -> Result<ClientboundLoginPacket, String> {
         let uuid = Uuid::read_from(buf)?;
         let name = buf.read_utf_with_len(16)?;
         Ok(ClientboundGameProfilePacket {
diff --git a/azalea-protocol/src/packets/login/clientbound_hello_packet.rs b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs
index f3724c18..06478691 100755
--- a/azalea-protocol/src/packets/login/clientbound_hello_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_hello_packet.rs
@@ -1,7 +1,7 @@
 use azalea_buf::McBuf;
-use packet_macros::LoginPacket;
+use packet_macros::ClientboundLoginPacket;
 
-#[derive(Clone, Debug, McBuf, LoginPacket)]
+#[derive(Clone, Debug, McBuf, ClientboundLoginPacket)]
 pub struct ClientboundHelloPacket {
     // TODO: make this len thing work
     // #[len(20)]
diff --git a/azalea-protocol/src/packets/login/clientbound_login_compression_packet.rs b/azalea-protocol/src/packets/login/clientbound_login_compression_packet.rs
index 19b2d58e..39314041 100755
--- a/azalea-protocol/src/packets/login/clientbound_login_compression_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_login_compression_packet.rs
@@ -5,7 +5,7 @@ use std::{
 
 use azalea_buf::{Readable, Writable};
 
-use super::LoginPacket;
+use super::ClientboundLoginPacket;
 
 #[derive(Hash, Clone, Debug)]
 pub struct ClientboundLoginCompressionPacket {
@@ -13,8 +13,8 @@ pub struct ClientboundLoginCompressionPacket {
 }
 
 impl ClientboundLoginCompressionPacket {
-    pub fn get(self) -> LoginPacket {
-        LoginPacket::ClientboundLoginCompressionPacket(self)
+    pub fn get(self) -> ClientboundLoginPacket {
+        ClientboundLoginPacket::ClientboundLoginCompressionPacket(self)
     }
 
     pub fn write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
@@ -22,7 +22,7 @@ impl ClientboundLoginCompressionPacket {
         Ok(())
     }
 
-    pub fn read(buf: &mut impl Read) -> Result<LoginPacket, String> {
+    pub fn read(buf: &mut impl Read) -> Result<ClientboundLoginPacket, String> {
         let compression_threshold = buf.read_varint()?;
 
         Ok(ClientboundLoginCompressionPacket {
diff --git a/azalea-protocol/src/packets/login/clientbound_login_disconnect_packet.rs b/azalea-protocol/src/packets/login/clientbound_login_disconnect_packet.rs
index acc68c82..bfcddc69 100644
--- a/azalea-protocol/src/packets/login/clientbound_login_disconnect_packet.rs
+++ b/azalea-protocol/src/packets/login/clientbound_login_disconnect_packet.rs
@@ -1,8 +1,8 @@
 use azalea_buf::McBuf;
 use azalea_chat::component::Component;
-use packet_macros::LoginPacket;
+use packet_macros::ClientboundLoginPacket;
 
-#[derive(Clone, Debug, McBuf, LoginPacket)]
+#[derive(Clone, Debug, McBuf, ClientboundLoginPacket)]
 pub struct ClientboundLoginDisconnectPacket {
     pub reason: Component,
 }
diff --git a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
index 0f6f9a50..7644beae 100755
--- a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
+++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
@@ -1,8 +1,8 @@
 use azalea_buf::McBuf;
-use packet_macros::LoginPacket;
+use packet_macros::ServerboundLoginPacket;
 use uuid::Uuid;
 
-#[derive(Clone, Debug, McBuf, LoginPacket)]
+#[derive(Clone, Debug, McBuf, ServerboundLoginPacket)]
 pub struct ServerboundHelloPacket {
     pub username: String,
     pub public_key: Option<ProfilePublicKeyData>,
diff --git a/azalea-protocol/src/packets/login/serverbound_key_packet.rs b/azalea-protocol/src/packets/login/serverbound_key_packet.rs
index 7a21736b..62dc6252 100644
--- a/azalea-protocol/src/packets/login/serverbound_key_packet.rs
+++ b/azalea-protocol/src/packets/login/serverbound_key_packet.rs
@@ -1,11 +1,11 @@
 use azalea_buf::McBuf;
 use azalea_crypto::SaltSignaturePair;
-use packet_macros::LoginPacket;
+use packet_macros::ServerboundLoginPacket;
 use std::io::{Read, Write};
 
 use azalea_buf::{McBufReadable, McBufWritable};
 
-#[derive(Clone, Debug, McBuf, LoginPacket)]
+#[derive(Clone, Debug, McBuf, ServerboundLoginPacket)]
 pub struct ServerboundKeyPacket {
     pub key_bytes: Vec<u8>,
     pub nonce_or_salt_signature: NonceOrSaltSignature,