From 7b3e2e4bf793466a351510c7fbbd08234e93bb0e Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Thu, 21 Sep 2023 11:16:29 -0500
Subject: 1.20.2 (#99)

* add configuration state

* start updating to 23w31a

* implement a bit more of 23w31a

* chunk batching

* start adding configuration state

* ioasfhjgsd

* almost works

* configuration state mostly implemented

* handle other packets in configuration state and fix keepalive

* cleanup, fix warnings

* 23w32a

* fix some doctests

* 23w33a

* 23w35a

* 1.20.2-pre2

* fix system conflicts

* 1.20.2-pre4

* make tests compile

* tests pass

* 1.20.2-rc2

* 1.20.2

* Revert "1.20.2"

This reverts commit dd152fd265332ead333c919e585ded6d609d7468.

* didn't mean to commit that code

---------

Co-authored-by: mat <git@matdoes.dev>
---
 azalea/src/accept_resource_packs.rs | 8 ++++++--
 azalea/src/auto_respawn.rs          | 6 ++++--
 azalea/src/container.rs             | 4 ++--
 azalea/src/pathfinder/simulation.rs | 3 ++-
 azalea/src/swarm/events.rs          | 4 ++--
 5 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'azalea/src')

diff --git a/azalea/src/accept_resource_packs.rs b/azalea/src/accept_resource_packs.rs
index 67d8aa65..c7891f92 100644
--- a/azalea/src/accept_resource_packs.rs
+++ b/azalea/src/accept_resource_packs.rs
@@ -1,5 +1,7 @@
 use crate::app::{App, Plugin};
-use azalea_client::packet_handling::{death_event_on_0_health, ResourcePackEvent};
+use azalea_client::chunk_batching::handle_chunk_batch_finished_event;
+use azalea_client::inventory::InventorySet;
+use azalea_client::packet_handling::{death_event_on_0_health, game::ResourcePackEvent};
 use azalea_client::respawn::perform_respawn;
 use azalea_client::SendPacketEvent;
 use azalea_protocol::packets::game::serverbound_resource_pack_packet::{
@@ -17,7 +19,9 @@ impl Plugin for AcceptResourcePacksPlugin {
             Update,
             accept_resource_pack
                 .before(perform_respawn)
-                .after(death_event_on_0_health),
+                .after(death_event_on_0_health)
+                .after(handle_chunk_batch_finished_event)
+                .after(InventorySet),
         );
     }
 }
diff --git a/azalea/src/auto_respawn.rs b/azalea/src/auto_respawn.rs
index 7034c86b..67e28b51 100644
--- a/azalea/src/auto_respawn.rs
+++ b/azalea/src/auto_respawn.rs
@@ -1,6 +1,8 @@
 use crate::app::{App, Plugin};
-use azalea_client::packet_handling::{death_event_on_0_health, DeathEvent};
-use azalea_client::respawn::{perform_respawn, PerformRespawnEvent};
+use azalea_client::{
+    packet_handling::{death_event_on_0_health, game::DeathEvent},
+    respawn::{perform_respawn, PerformRespawnEvent},
+};
 use bevy_app::Update;
 use bevy_ecs::prelude::*;
 
diff --git a/azalea/src/container.rs b/azalea/src/container.rs
index 2261469d..56770524 100644
--- a/azalea/src/container.rs
+++ b/azalea/src/container.rs
@@ -2,7 +2,7 @@ use std::fmt::Formatter;
 
 use azalea_client::{
     inventory::{CloseContainerEvent, ContainerClickEvent, InventoryComponent},
-    packet_handling::PacketEvent,
+    packet_handling::game::PacketEvent,
     Client,
 };
 use azalea_core::BlockPos;
@@ -36,7 +36,7 @@ impl ContainerClientExt for Client {
     /// let target_pos = bot
     ///     .world()
     ///     .read()
-    ///     .find_block(bot.position(), &azalea::Block::Chest.into());
+    ///     .find_block(bot.position(), &azalea::registry::Block::Chest.into());
     /// let Some(target_pos) = target_pos else {
     ///     bot.chat("no chest found");
     ///     return;
diff --git a/azalea/src/pathfinder/simulation.rs b/azalea/src/pathfinder/simulation.rs
index b077b04d..e0f82433 100644
--- a/azalea/src/pathfinder/simulation.rs
+++ b/azalea/src/pathfinder/simulation.rs
@@ -74,7 +74,8 @@ impl Simulation {
                 .iter()
                 .cloned()
                 .collect(),
-        });
+        })
+        .add_event::<azalea_client::SendPacketEvent>();
 
         app.edit_schedule(bevy_app::Main, |schedule| {
             schedule.set_executor_kind(bevy_ecs::schedule::ExecutorKind::SingleThreaded);
diff --git a/azalea/src/swarm/events.rs b/azalea/src/swarm/events.rs
index 3b290608..d6f69157 100644
--- a/azalea/src/swarm/events.rs
+++ b/azalea/src/swarm/events.rs
@@ -1,4 +1,4 @@
-use azalea_client::LocalPlayer;
+use azalea_client::InstanceHolder;
 use azalea_world::MinecraftEntityId;
 use bevy_app::{App, Plugin, Update};
 use bevy_ecs::prelude::*;
@@ -21,7 +21,7 @@ pub struct SwarmReadyEvent;
 struct IsSwarmReady(bool);
 
 fn check_ready(
-    query: Query<Option<&MinecraftEntityId>, With<LocalPlayer>>,
+    query: Query<Option<&MinecraftEntityId>, With<InstanceHolder>>,
     mut is_swarm_ready: ResMut<IsSwarmReady>,
     mut ready_events: EventWriter<SwarmReadyEvent>,
 ) {
-- 
cgit v1.2.3