diff options
Diffstat (limited to 'azalea')
| -rw-r--r-- | azalea/examples/steal.rs | 4 | ||||
| -rw-r--r-- | azalea/examples/testbot.rs | 15 | ||||
| -rw-r--r-- | azalea/src/accept_resource_packs.rs | 8 | ||||
| -rw-r--r-- | azalea/src/auto_respawn.rs | 6 | ||||
| -rw-r--r-- | azalea/src/container.rs | 4 | ||||
| -rw-r--r-- | azalea/src/pathfinder/simulation.rs | 3 | ||||
| -rw-r--r-- | azalea/src/swarm/events.rs | 4 |
7 files changed, 25 insertions, 19 deletions
diff --git a/azalea/examples/steal.rs b/azalea/examples/steal.rs index 9bbda945..ce5b7d21 100644 --- a/azalea/examples/steal.rs +++ b/azalea/examples/steal.rs @@ -38,7 +38,7 @@ async fn handle(mut bot: Client, event: Event, state: State) -> anyhow::Result<( let chest_block = bot .world() .read() - .find_block(bot.position(), &azalea::Block::Chest.into()); + .find_block(bot.position(), &azalea::registry::Block::Chest.into()); // TODO: update this when find_blocks is implemented let Some(chest_block) = chest_block else { bot.chat("No chest found"); @@ -59,7 +59,7 @@ async fn handle(mut bot: Client, event: Event, state: State) -> anyhow::Result<( { println!("Checking slot {index}: {slot:?}"); if let ItemSlot::Present(item) = slot { - if item.kind == azalea::Item::Diamond { + if item.kind == azalea::registry::Item::Diamond { println!("clicking slot ^"); chest.click(QuickMoveClick::Left { slot: index as u16 }); } diff --git a/azalea/examples/testbot.rs b/azalea/examples/testbot.rs index 49243aa1..a0f60fbc 100644 --- a/azalea/examples/testbot.rs +++ b/azalea/examples/testbot.rs @@ -7,14 +7,13 @@ use azalea::entity::{metadata::Player, EyeHeight, Position}; use azalea::interact::HitResultComponent; use azalea::inventory::ItemSlot; use azalea::pathfinder::goals::BlockPosGoal; -use azalea::protocol::packets::game::ClientboundGamePacket; -use azalea::world::{heightmap::HeightmapKind, InstanceName, MinecraftEntityId}; -use azalea::SprintDirection; -use azalea::{prelude::*, swarm::prelude::*}; -use azalea::{ - Account, BlockPos, ChunkPos, Client, Event, GameProfileComponent, Vec3, WalkDirection, -}; -use azalea_core::ChunkBlockPos; +use azalea::{prelude::*, swarm::prelude::*, BlockPos, GameProfileComponent, WalkDirection}; +use azalea::{Account, Client, Event}; +use azalea_client::SprintDirection; +use azalea_core::{ChunkBlockPos, ChunkPos, Vec3}; +use azalea_protocol::packets::game::ClientboundGamePacket; +use azalea_world::heightmap::HeightmapKind; +use azalea_world::{InstanceName, MinecraftEntityId}; use std::time::Duration; #[derive(Default, Clone, Component)] 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>, ) { |