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-client/src/chunks.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'azalea-client/src/chunks.rs')

diff --git a/azalea-client/src/chunks.rs b/azalea-client/src/chunks.rs
index 40e295aa..7056efa4 100644
--- a/azalea-client/src/chunks.rs
+++ b/azalea-client/src/chunks.rs
@@ -10,8 +10,8 @@ use std::{
 
 use azalea_core::position::ChunkPos;
 use azalea_protocol::packets::game::{
-    clientbound_level_chunk_with_light_packet::ClientboundLevelChunkWithLightPacket,
-    serverbound_chunk_batch_received_packet::ServerboundChunkBatchReceivedPacket,
+    c_level_chunk_with_light::ClientboundLevelChunkWithLight,
+    s_chunk_batch_received::ServerboundChunkBatchReceived,
 };
 use bevy_app::{App, Plugin, Update};
 use bevy_ecs::prelude::*;
@@ -51,7 +51,7 @@ impl Plugin for ChunkPlugin {
 #[derive(Event)]
 pub struct ReceiveChunkEvent {
     pub entity: Entity,
-    pub packet: ClientboundLevelChunkWithLightPacket,
+    pub packet: ClientboundLevelChunkWithLight,
 }
 
 #[derive(Component, Clone, Debug)]
@@ -159,13 +159,12 @@ pub fn handle_chunk_batch_finished_event(
         if let Ok(mut chunk_batch_info) = query.get_mut(event.entity) {
             chunk_batch_info.batch_finished(event.batch_size);
             let desired_chunks_per_tick = chunk_batch_info.desired_chunks_per_tick();
-            send_packets.send(SendPacketEvent {
-                entity: event.entity,
-                packet: ServerboundChunkBatchReceivedPacket {
+            send_packets.send(SendPacketEvent::new(
+                event.entity,
+                ServerboundChunkBatchReceived {
                     desired_chunks_per_tick,
-                }
-                .get(),
-            });
+                },
+            ));
         }
     }
 }
-- 
cgit v1.2.3