fix some packets

azalea-client/src/connect.rs

@@ -200,12 +200,12 @@ impl Client {
 
                 let mut state = state.lock().await;
 
-                // write p into login.txt
-                std::io::Write::write_all(
-                    &mut std::fs::File::create("login.txt").unwrap(),
-                    format!("{:#?}", p).as_bytes(),
-                )
-                .unwrap();
+                // // write p into login.txt
+                // std::io::Write::write_all(
+                //     &mut std::fs::File::create("login.txt").unwrap(),
+                //     format!("{:#?}", p).as_bytes(),
+                // )
+                // .unwrap();
 
                 state.player.entity.id = p.player_id;
 
@@ -444,6 +444,9 @@ impl Client {
             GamePacket::ClientboundLevelParticlesPacket(p) => {
                 println!("Got level particles packet {:?}", p);
             }
+            GamePacket::ClientboundServerDataPacket(p) => {
+                println!("Got server data packet {:?}", p);
+            }
             _ => panic!("Unexpected packet {:?}", packet),
         }
     }

azalea-protocol/packet-macros/src/lib.rs

@@ -354,7 +354,7 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
         });
     }
     for PacketIdPair { id, module, name } in input.clientbound.packets {
-        let name_litstr = syn::LitStr::new(&name.to_string(), name.span());
+        // let name_litstr = syn::LitStr::new(&name.to_string(), name.span());
         enum_contents.extend(quote! {
             #name(#module::#name),
         });
@@ -365,10 +365,7 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
             #state_name::#name(packet) => packet.write(buf),
         });
         clientbound_read_match_contents.extend(quote! {
-            #id => {
-                println!("reading packet {}", #name_litstr);
-                #module::#name::read(buf)?
-            },
+            #id => #module::#name::read(buf)?,
         });
     }
 

azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs

@@ -4,9 +4,9 @@ use uuid::Uuid;
 #[derive(Clone, Debug, McBuf, GamePacket)]
 pub struct ClientboundAddEntityPacket {
     #[var]
-    pub id: i32,
+    pub id: u32,
     pub uuid: Uuid,
-    // TODO: have an entity type struct
+    // TODO: have an entity type enum/struct
     #[var]
     pub entity_type: i32,
     pub x: f64,
@@ -14,9 +14,10 @@ pub struct ClientboundAddEntityPacket {
     pub z: f64,
     pub x_rot: i8,
     pub y_rot: i8,
-    // pub y_head_rot: i8,
+    pub y_head_rot: i8,
+    #[var]
     pub data: i32,
-    pub x_vel: u16,
-    pub y_vel: u16,
-    pub z_vel: u16,
+    pub x_vel: i16,
+    pub y_vel: i16,
+    pub z_vel: i16,
 }