From 08958c2278b15ebeac8a964f392ebb792e479b61 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Wed, 27 Nov 2024 19:31:40 -0600
Subject: Refactor azalea-protocol (#190)

* start updating to 1.21.4

* fix block codegen and stop using block data from burger

* rename packet related modules and structs to be simpler

* ItemSlot -> ItemStack for more consistency with mojmap

* .get() -> .into_packet()

* simplify declare_state_packets by removing packet ids

* rename read_from and write_into to azalea_read and azalea_write

* rename McBufReadable and McBufWritable to AzaleaRead and AzaleaWrite

* McBuf -> AzBuf

* remove most uses of into_variant

* update codegen and use resourcelocation names for packets

* implement #[limit(i)] attribute for AzBuf derive macro

* fixes for 1.21.4

* fix examples

* update some physics code and fix ChatType

* remove unused imports in codegen

* re-add some things to migrate.py and update +mc version numbers automatically

* downgrade to 1.21.3 lol
---
 azalea-protocol/src/lib.rs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'azalea-protocol/src/lib.rs')

diff --git a/azalea-protocol/src/lib.rs b/azalea-protocol/src/lib.rs
index 1bbb80d4..fb271433 100644
--- a/azalea-protocol/src/lib.rs
+++ b/azalea-protocol/src/lib.rs
@@ -14,6 +14,7 @@
 
 use std::{fmt::Display, net::SocketAddr, str::FromStr};
 
+pub mod common;
 #[cfg(feature = "connecting")]
 pub mod connect;
 #[cfg(feature = "packets")]
@@ -108,8 +109,9 @@ mod tests {
 
     use crate::{
         packets::{
-            game::serverbound_chat_packet::{LastSeenMessagesUpdate, ServerboundChatPacket},
-            login::{serverbound_hello_packet::ServerboundHelloPacket, ServerboundLoginPacket},
+            game::s_chat::{LastSeenMessagesUpdate, ServerboundChat},
+            login::{s_hello::ServerboundHello, ServerboundLoginPacket},
+            Packet,
         },
         read::{compression_decoder, read_packet},
         write::{compression_encoder, serialize_packet, write_packet},
@@ -117,13 +119,12 @@ mod tests {
 
     #[tokio::test]
     async fn test_hello_packet() {
-        let packet = ServerboundHelloPacket {
+        let packet = ServerboundHello {
             name: "test".to_string(),
             profile_id: Uuid::nil(),
-        }
-        .get();
+        };
         let mut stream = Vec::new();
-        write_packet(&packet, &mut stream, None, &mut None)
+        write_packet(&packet.into_variant(), &mut stream, None, &mut None)
             .await
             .unwrap();
 
@@ -141,11 +142,11 @@ mod tests {
 
     #[tokio::test]
     async fn test_double_hello_packet() {
-        let packet = ServerboundHelloPacket {
+        let packet = ServerboundHello {
             name: "test".to_string(),
             profile_id: Uuid::nil(),
         }
-        .get();
+        .into_variant();
         let mut stream = Vec::new();
         write_packet(&packet, &mut stream, None, &mut None)
             .await
@@ -170,14 +171,14 @@ mod tests {
         let compression_threshold = 256;
 
         let buf = serialize_packet(
-            &ServerboundChatPacket {
+            &ServerboundChat {
                 message: "a".repeat(256),
                 timestamp: 0,
                 salt: 0,
                 signature: None,
                 last_seen_messages: LastSeenMessagesUpdate::default(),
             }
-            .get(),
+            .into_variant(),
         )
         .unwrap();
 
-- 
cgit v1.2.3