start adding packet macros

3 files changed, 12 insertions, 46 deletions

diff --git a/azalea-protocol/src/packets/game/clientbound_custom_payload_packet.rs b/azalea-protocol/src/packets/game/clientbound_custom_payload_packet.rs
index 63047801..24220a83 100644
--- a/azalea-protocol/src/packets/game/clientbound_custom_payload_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_custom_payload_packet.rs
@@ -1,30 +1,10 @@
-use super::GamePacket;
 use crate::mc_buf::{Readable, Writable};
-use azalea_core::{game_type::GameType, resource_location::ResourceLocation};
+use crate::packets::game::GamePacket;
+use azalea_core::resource_location::ResourceLocation;
+use packet_macros::GamePacket;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, GamePacket)]
 pub struct ClientboundCustomPayloadPacket {
     pub identifier: ResourceLocation,
     pub data: Vec<u8>,
 }
-
-impl ClientboundCustomPayloadPacket {
-    pub fn get(self) -> GamePacket {
-        GamePacket::ClientboundCustomPayloadPacket(self)
-    }
-
-    pub fn write(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
-        buf.write_resource_location(&self.identifier)?;
-        buf.write_bytes(&self.data)?;
-        Ok(())
-    }
-
-    pub async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
-        buf: &mut T,
-    ) -> Result<GamePacket, String> {
-        let identifier = buf.read_resource_location().await?;
-        let data = buf.read_bytes().await?;
-
-        Ok(ClientboundCustomPayloadPacket { identifier, data }.get())
-    }
-}
diff --git a/azalea-protocol/src/packets/game/clientbound_update_view_distance_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_view_distance_packet.rs
index 562f8fc2..f6028e6c 100644
--- a/azalea-protocol/src/packets/game/clientbound_update_view_distance_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_update_view_distance_packet.rs
@@ -2,27 +2,10 @@
 
 use super::GamePacket;
 use crate::mc_buf::{Readable, Writable};
+use packet_macros::GamePacket;
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, GamePacket)]
 pub struct ClientboundUpdateViewDistancePacket {
+    #[varint]
     pub view_distance: i32,
 }
-
-impl ClientboundUpdateViewDistancePacket {
-    pub fn get(self) -> GamePacket {
-        GamePacket::ClientboundUpdateViewDistancePacket(self)
-    }
-
-    pub fn write(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
-        buf.write_varint(self.view_distance)?;
-        Ok(())
-    }
-
-    pub async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
-        buf: &mut T,
-    ) -> Result<GamePacket, String> {
-        let view_distance = buf.read_varint().await?;
-
-        Ok(ClientboundUpdateViewDistancePacket { view_distance }.get())
-    }
-}
diff --git a/azalea-protocol/src/packets/game/mod.rs b/azalea-protocol/src/packets/game/mod.rs
index ab5ca7e8..43b3ca3d 100644
--- a/azalea-protocol/src/packets/game/mod.rs
+++ b/azalea-protocol/src/packets/game/mod.rs
@@ -30,7 +30,9 @@ impl ProtocolPacket for GamePacket {
         }
     }
 
-    fn write(&self, _buf: &mut Vec<u8>) {}
+    fn write(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
+        Ok(())
+    }
 
     /// Read a packet by its id, ConnectionProtocol, and flow
     async fn read<T: tokio::io::AsyncRead + std::marker::Unpin + std::marker::Send>(
@@ -48,7 +50,8 @@ impl ProtocolPacket for GamePacket {
                 0x4a => clientbound_update_view_distance_packet::ClientboundUpdateViewDistancePacket
                     ::read(buf)
                     .await?,
-                _ => return Err(format!("Unknown ServerToClient game packet id: {}", id)),
+                // _ => return Err(format!("Unknown ServerToClient game packet id: {}", id)),
+                _ => panic!("Unknown ServerToClient game packet id: {}", id),
             },
             PacketFlow::ClientToServer => match id {
                 // 0x00 => serverbound_hello_packet::ServerboundHelloPacket::read(buf).await?,