bevy 0.12

16 files changed, 41 insertions, 41 deletions

diff --git a/azalea-client/src/attack.rs b/azalea-client/src/attack.rs
index 56f3b1d0..287a2dde 100644
--- a/azalea-client/src/attack.rs
+++ b/azalea-client/src/attack.rs
@@ -81,7 +81,7 @@ pub fn handle_attack_event(
     mut send_packet_events: EventWriter<SendPacketEvent>,
     mut swing_arm_event: EventWriter<SwingArmEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let (game_mode, mut ticks_since_last_attack, mut physics, mut sprinting, sneaking) =
             query.get_mut(event.entity).unwrap();
 
diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs
index 337bce51..f238dd47 100755
--- a/azalea-client/src/chat.rs
+++ b/azalea-client/src/chat.rs
@@ -199,7 +199,7 @@ fn handle_send_chat_event(
     mut events: EventReader<SendChatEvent>,
     mut send_chat_kind_events: EventWriter<SendChatKindEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if event.content.starts_with('/') {
             send_chat_kind_events.send(SendChatKindEvent {
                 entity: event.entity,
@@ -242,7 +242,7 @@ fn handle_send_chat_kind_event(
     mut events: EventReader<SendChatKindEvent>,
     mut send_packet_events: EventWriter<SendPacketEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let content = event
             .content
             .chars()
diff --git a/azalea-client/src/chunk_batching.rs b/azalea-client/src/chunk_batching.rs
index 81fb7550..eda16442 100644
--- a/azalea-client/src/chunk_batching.rs
+++ b/azalea-client/src/chunk_batching.rs
@@ -79,7 +79,7 @@ pub fn handle_chunk_batch_start_event(
     mut query: Query<&mut ChunkBatchInfo>,
     mut events: EventReader<ChunkBatchStartEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(mut chunk_batch_info) = query.get_mut(event.entity) {
             chunk_batch_info.start_time = Instant::now();
         }
@@ -91,7 +91,7 @@ pub fn handle_chunk_batch_finished_event(
     mut events: EventReader<ChunkBatchFinishedEvent>,
     mut send_packets: EventWriter<SendPacketEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         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();
diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs
index 7c5cb82a..f4622eed 100644
--- a/azalea-client/src/client.rs
+++ b/azalea-client/src/client.rs
@@ -59,11 +59,11 @@ use bevy_ecs::{
     bundle::Bundle,
     component::Component,
     entity::Entity,
-    schedule::{IntoSystemConfigs, LogLevel, ScheduleBuildSettings, ScheduleLabel},
+    schedule::{InternedScheduleLabel, IntoSystemConfigs, LogLevel, ScheduleBuildSettings},
     system::{ResMut, Resource},
     world::World,
 };
-use bevy_time::{prelude::FixedTime, TimePlugin};
+use bevy_time::{Fixed, Time, TimePlugin};
 use derive_more::Deref;
 use log::{debug, error};
 use parking_lot::{Mutex, RwLock};
@@ -631,7 +631,7 @@ pub struct AzaleaPlugin;
 impl Plugin for AzaleaPlugin {
     fn build(&self, app: &mut App) {
         // Minecraft ticks happen every 50ms
-        app.insert_resource(FixedTime::new(Duration::from_millis(50)))
+        app.insert_resource(Time::<Fixed>::from_duration(Duration::from_millis(50)))
             .add_systems(
                 Update,
                 (
@@ -674,14 +674,14 @@ pub fn start_ecs_runner(
 
 async fn run_schedule_loop(
     ecs: Arc<Mutex<World>>,
-    outer_schedule_label: Box<dyn ScheduleLabel>,
+    outer_schedule_label: InternedScheduleLabel,
     mut run_schedule_receiver: mpsc::UnboundedReceiver<()>,
 ) {
     loop {
         // whenever we get an event from run_schedule_receiver, run the schedule
         run_schedule_receiver.recv().await;
         let mut ecs = ecs.lock();
-        ecs.run_schedule(&outer_schedule_label);
+        ecs.run_schedule(outer_schedule_label);
         ecs.clear_trackers();
     }
 }
diff --git a/azalea-client/src/disconnect.rs b/azalea-client/src/disconnect.rs
index 966e5bb7..916ef1fb 100644
--- a/azalea-client/src/disconnect.rs
+++ b/azalea-client/src/disconnect.rs
@@ -41,7 +41,7 @@ pub fn remove_components_from_disconnected_players(
     mut commands: Commands,
     mut events: EventReader<DisconnectEvent>,
 ) {
-    for DisconnectEvent { entity } in events.iter() {
+    for DisconnectEvent { entity } in events.read() {
         commands.entity(*entity).remove::<JoinedClientBundle>();
     }
 }
diff --git a/azalea-client/src/events.rs b/azalea-client/src/events.rs
index 17ebd4e8..46c0189a 100644
--- a/azalea-client/src/events.rs
+++ b/azalea-client/src/events.rs
@@ -142,7 +142,7 @@ fn login_listener(query: Query<&LocalPlayerEvents, Added<MinecraftEntityId>>) {
 }
 
 fn chat_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<ChatReceivedEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         let local_player_events = query
             .get(event.entity)
             .expect("Non-local entities shouldn't be able to receive chat events");
@@ -160,7 +160,7 @@ fn tick_listener(query: Query<&LocalPlayerEvents, With<InstanceName>>) {
 }
 
 fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<PacketEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         let local_player_events = query
             .get(event.entity)
             .expect("Non-local entities shouldn't be able to receive add player events");
@@ -171,7 +171,7 @@ fn packet_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<Pac
 }
 
 fn add_player_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<AddPlayerEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         let local_player_events = query
             .get(event.entity)
             .expect("Non-local entities shouldn't be able to receive add player events");
@@ -185,7 +185,7 @@ fn update_player_listener(
     query: Query<&LocalPlayerEvents>,
     mut events: EventReader<UpdatePlayerEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let local_player_events = query
             .get(event.entity)
             .expect("Non-local entities shouldn't be able to receive update player events");
@@ -199,7 +199,7 @@ fn remove_player_listener(
     query: Query<&LocalPlayerEvents>,
     mut events: EventReader<RemovePlayerEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let local_player_events = query
             .get(event.entity)
             .expect("Non-local entities shouldn't be able to receive remove player events");
@@ -210,7 +210,7 @@ fn remove_player_listener(
 }
 
 pub fn death_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<DeathEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(local_player_events) = query.get(event.entity) {
             local_player_events
                 .send(Event::Death(event.packet.clone().map(|p| p.into())))
@@ -220,7 +220,7 @@ pub fn death_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<
 }
 
 fn keepalive_listener(query: Query<&LocalPlayerEvents>, mut events: EventReader<KeepAliveEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         let local_player_events = query
             .get(event.entity)
             .expect("Non-local entities shouldn't be able to receive keepalive events");
diff --git a/azalea-client/src/interact.rs b/azalea-client/src/interact.rs
index 32b68925..eaced255 100644
--- a/azalea-client/src/interact.rs
+++ b/azalea-client/src/interact.rs
@@ -115,7 +115,7 @@ pub fn handle_block_interact_event(
     mut query: Query<(Entity, &mut CurrentSequenceNumber, &HitResultComponent)>,
     mut send_packet_events: EventWriter<SendPacketEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let Ok((entity, mut sequence_number, hit_result)) = query.get_mut(event.entity) else {
             warn!("Sent BlockInteractEvent for entity that doesn't have the required components");
             continue;
@@ -312,7 +312,7 @@ pub fn handle_swing_arm_event(
     mut events: EventReader<SwingArmEvent>,
     mut send_packet_events: EventWriter<SendPacketEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         send_packet_events.send(SendPacketEvent {
             entity: event.entity,
             packet: ServerboundSwingPacket {
diff --git a/azalea-client/src/inventory.rs b/azalea-client/src/inventory.rs
index 0e4b9da3..356e0c0b 100644
--- a/azalea-client/src/inventory.rs
+++ b/azalea-client/src/inventory.rs
@@ -585,7 +585,7 @@ fn handle_menu_opened_event(
     mut events: EventReader<MenuOpenedEvent>,
     mut query: Query<&mut InventoryComponent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let mut inventory = query.get_mut(event.entity).unwrap();
         inventory.id = event.window_id as u8;
         inventory.container_menu = Some(Menu::from_kind(event.menu_type));
@@ -609,7 +609,7 @@ fn handle_container_close_event(
     mut client_side_events: EventWriter<ClientSideCloseContainerEvent>,
     mut send_packet_events: EventWriter<SendPacketEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let (entity, inventory) = query.get(event.entity).unwrap();
         if event.id != inventory.id {
             warn!(
@@ -643,7 +643,7 @@ pub fn handle_client_side_close_container_event(
     mut events: EventReader<ClientSideCloseContainerEvent>,
     mut query: Query<&mut InventoryComponent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let mut inventory = query.get_mut(event.entity).unwrap();
         inventory.container_menu = None;
         inventory.id = 0;
@@ -661,7 +661,7 @@ pub fn handle_container_click_event(
     mut events: EventReader<ContainerClickEvent>,
     mut send_packet_events: EventWriter<SendPacketEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let (entity, mut inventory) = query.get_mut(event.entity).unwrap();
         if inventory.id != event.window_id {
             warn!(
@@ -714,7 +714,7 @@ fn handle_set_container_content_event(
     mut events: EventReader<SetContainerContentEvent>,
     mut query: Query<&mut InventoryComponent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let mut inventory = query.get_mut(event.entity).unwrap();
 
         if event.container_id != inventory.id {
diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs
index c2b16434..e49a81fe 100644
--- a/azalea-client/src/local_player.rs
+++ b/azalea-client/src/local_player.rs
@@ -172,7 +172,7 @@ pub fn handle_send_packet_event(
     mut send_packet_events: EventReader<SendPacketEvent>,
     mut query: Query<&mut RawConnection>,
 ) {
-    for event in send_packet_events.iter() {
+    for event in send_packet_events.read() {
         if let Ok(raw_connection) = query.get_mut(event.entity) {
             // debug!("Sending packet: {:?}", event.packet);
             if let Err(e) = raw_connection.write_packet(event.packet.clone()) {
diff --git a/azalea-client/src/mining.rs b/azalea-client/src/mining.rs
index e1193f73..84035143 100644
--- a/azalea-client/src/mining.rs
+++ b/azalea-client/src/mining.rs
@@ -89,7 +89,7 @@ fn handle_start_mining_block_event(
     mut start_mining_events: EventWriter<StartMiningBlockWithDirectionEvent>,
     mut query: Query<&HitResultComponent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let hit_result = query.get_mut(event.entity).unwrap();
         let direction = if hit_result.block_pos == event.position {
             // we're looking at the block
@@ -136,7 +136,7 @@ fn handle_start_mining_block_with_direction_event(
     instances: Res<InstanceContainer>,
     mut commands: Commands,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let (
             instance_name,
             game_mode,
@@ -346,7 +346,7 @@ fn handle_finish_mining_block_event(
     )>,
     instances: Res<InstanceContainer>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let (instance_name, game_mode, inventory, abilities, permission_level, _sequence_number) =
             query.get_mut(event.entity).unwrap();
         let instance_lock = instances.get(instance_name).unwrap();
@@ -407,7 +407,7 @@ fn handle_stop_mining_block_event(
     mut query: Query<(&mut Mining, &MineBlockPos, &mut MineProgress)>,
     mut commands: Commands,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         let (mut _mining, mine_block_pos, mut mine_progress) = query.get_mut(event.entity).unwrap();
 
         let mine_block_pos =
diff --git a/azalea-client/src/movement.rs b/azalea-client/src/movement.rs
index 945f0c0c..b636fbcb 100644
--- a/azalea-client/src/movement.rs
+++ b/azalea-client/src/movement.rs
@@ -408,7 +408,7 @@ pub fn handle_walk(
     mut events: EventReader<StartWalkEvent>,
     mut query: Query<(&mut PhysicsState, &mut Sprinting, &mut Attributes)>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok((mut physics_state, mut sprinting, mut attributes)) = query.get_mut(event.entity)
         {
             physics_state.move_direction = event.direction;
@@ -431,7 +431,7 @@ pub fn handle_sprint(
     mut query: Query<&mut PhysicsState>,
     mut events: EventReader<StartSprintEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(mut physics_state) = query.get_mut(event.entity) {
             physics_state.move_direction = WalkDirection::from(event.direction);
             physics_state.trying_to_sprint = true;
@@ -486,7 +486,7 @@ pub enum KnockbackType {
 }
 
 pub fn handle_knockback(mut query: Query<&mut Physics>, mut events: EventReader<KnockbackEvent>) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Ok(mut physics) = query.get_mut(event.entity) {
             match event.knockback {
                 KnockbackType::Set(velocity) => {
diff --git a/azalea-client/src/packet_handling/configuration.rs b/azalea-client/src/packet_handling/configuration.rs
index 7c295bdb..e26e3f3b 100644
--- a/azalea-client/src/packet_handling/configuration.rs
+++ b/azalea-client/src/packet_handling/configuration.rs
@@ -70,7 +70,7 @@ pub fn process_packet_events(ecs: &mut World) {
     for PacketEvent {
         entity: player_entity,
         packet,
-    } in events.iter()
+    } in events.read()
     {
         // we do this so `ecs` isn't borrowed for the whole loop
         events_owned.push((*player_entity, packet.clone()));
diff --git a/azalea-client/src/packet_handling/game.rs b/azalea-client/src/packet_handling/game.rs
index a81852a6..a17dd13f 100644
--- a/azalea-client/src/packet_handling/game.rs
+++ b/azalea-client/src/packet_handling/game.rs
@@ -59,7 +59,7 @@ use crate::{
 ///     for PacketEvent {
 ///         entity,
 ///         packet,
-///     } in events.iter() {
+///     } in events.read() {
 ///         match packet {
 ///             ClientboundGamePacket::LevelParticles(p) => {
 ///                 // ...
@@ -181,7 +181,7 @@ pub fn process_packet_events(ecs: &mut World) {
     for PacketEvent {
         entity: player_entity,
         packet,
-    } in events.iter()
+    } in events.read()
     {
         // we do this so `ecs` isn't borrowed for the whole loop
         events_owned.push((*player_entity, packet.clone()));
diff --git a/azalea-client/src/player.rs b/azalea-client/src/player.rs
index 0a3f204f..9289d260 100755
--- a/azalea-client/src/player.rs
+++ b/azalea-client/src/player.rs
@@ -37,7 +37,7 @@ pub fn retroactively_add_game_profile_component(
     mut events: EventReader<AddPlayerEvent>,
     entity_uuid_index: Res<EntityUuidIndex>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         if let Some(entity) = entity_uuid_index.get(&event.info.uuid) {
             commands
                 .entity(entity)
diff --git a/azalea-client/src/respawn.rs b/azalea-client/src/respawn.rs
index d0ef1cca..cd9b434e 100644
--- a/azalea-client/src/respawn.rs
+++ b/azalea-client/src/respawn.rs
@@ -25,7 +25,7 @@ pub fn perform_respawn(
     mut events: EventReader<PerformRespawnEvent>,
     mut send_packets: EventWriter<SendPacketEvent>,
 ) {
-    for event in events.iter() {
+    for event in events.read() {
         send_packets.send(SendPacketEvent {
             entity: event.entity,
             packet: ServerboundClientCommandPacket {
diff --git a/azalea-client/src/task_pool.rs b/azalea-client/src/task_pool.rs
index 32c74c6f..da1de607 100644
--- a/azalea-client/src/task_pool.rs
+++ b/azalea-client/src/task_pool.rs
@@ -110,7 +110,7 @@ impl TaskPoolOptions {
 
             remaining_threads = remaining_threads.saturating_sub(io_threads);
 
-            IoTaskPool::init(|| {
+            IoTaskPool::get_or_init(|| {
                 TaskPoolBuilder::default()
                     .num_threads(io_threads)
                     .thread_name("IO Task Pool".to_string())
@@ -126,7 +126,7 @@ impl TaskPoolOptions {
 
             remaining_threads = remaining_threads.saturating_sub(async_compute_threads);
 
-            AsyncComputeTaskPool::init(|| {
+            AsyncComputeTaskPool::get_or_init(|| {
                 TaskPoolBuilder::default()
                     .num_threads(async_compute_threads)
                     .thread_name("Async Compute Task Pool".to_string())
@@ -141,7 +141,7 @@ impl TaskPoolOptions {
                 .compute
                 .get_number_of_threads(remaining_threads, total_threads);
 
-            ComputeTaskPool::init(|| {
+            ComputeTaskPool::get_or_init(|| {
                 TaskPoolBuilder::default()
                     .num_threads(compute_threads)
                     .thread_name("Compute Task Pool".to_string())