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/read.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs
index 67ea9aee..d75e3bad 100755
--- a/azalea-protocol/src/read.rs
+++ b/azalea-protocol/src/read.rs
@@ -6,8 +6,8 @@ use std::{
     io::{Cursor, Read},
 };
 
+use azalea_buf::AzaleaReadVar;
 use azalea_buf::BufReadError;
-use azalea_buf::McBufVarReadable;
 use azalea_crypto::Aes128CfbDec;
 use bytes::Buf;
 use bytes::BytesMut;
@@ -86,7 +86,7 @@ fn parse_frame(buffer: &mut BytesMut) -> Result<BytesMut, FrameSplitterError> {
     // the packet is all good we read it fully
     let mut buffer_copy = Cursor::new(&buffer[..]);
     // Packet Length
-    let length = match u32::var_read_from(&mut buffer_copy) {
+    let length = match u32::azalea_read_var(&mut buffer_copy) {
         Ok(length) => length as usize,
         Err(err) => match err {
             BufReadError::Io { source } => return Err(FrameSplitterError::Io { source }),
@@ -134,7 +134,7 @@ pub fn deserialize_packet<P: ProtocolPacket + Debug>(
 ) -> Result<P, Box<ReadPacketError>> {
     // Packet ID
     let packet_id =
-        u32::var_read_from(stream).map_err(|e| ReadPacketError::ReadPacketId { source: e })?;
+        u32::azalea_read_var(stream).map_err(|e| ReadPacketError::ReadPacketId { source: e })?;
     P::read(packet_id, stream)
 }
 
@@ -171,7 +171,7 @@ pub fn compression_decoder(
     compression_threshold: u32,
 ) -> Result<Vec<u8>, DecompressionError> {
     // Data Length
-    let n = u32::var_read_from(stream)?;
+    let n = u32::azalea_read_var(stream)?;
     if n == 0 {
         // no data size, no compression
         let mut buf = vec![];
@@ -351,7 +351,7 @@ where
     }
 
     if log::log_enabled!(log::Level::Trace) {
-        const DO_NOT_CUT_OFF_PACKET_LOGS: bool = false;
+        const DO_NOT_CUT_OFF_PACKET_LOGS: bool = true;
 
         let buf_string: String = {
             if !DO_NOT_CUT_OFF_PACKET_LOGS && buf.len() > 500 {
-- 
cgit v1.2.3