bevy 0.12

Author: mat-1

Cargo.lock

@@ -11,22 +11,22 @@ version = "0.8.0"
 [dependencies]
 azalea-buf = { path = "../azalea-buf", version = "0.8.0" }
 azalea-crypto = { path = "../azalea-crypto", version = "0.8.0" }
-base64 = "0.21.4"
+base64 = "0.21.5"
 chrono = { version = "0.4.31", default-features = false, features = ["serde"] }
 log = "0.4.20"
 num-bigint = "0.4.4"
 once_cell = "1.18.0"
-reqwest = { version = "0.11.21", default-features = false, features = [
+reqwest = { version = "0.11.22", default-features = false, features = [
     "json",
     "rustls-tls",
 ] }
-rsa = "0.9.2"
-serde = { version = "1.0.188", features = ["derive"] }
-serde_json = "1.0.107"
-thiserror = "1.0.49"
-tokio = { version = "1.32.0", features = ["fs"] }
-uuid = { version = "1.4.1", features = ["serde"] }
+rsa = "0.9.3"
+serde = { version = "1.0.190", features = ["derive"] }
+serde_json = "1.0.108"
+thiserror = "1.0.50"
+tokio = { version = "1.33.0", features = ["fs"] }
+uuid = { version = "1.5.0", features = ["serde"] }
 
 [dev-dependencies]
 env_logger = "0.10.0"
-tokio = { version = "1.32.0", features = ["full"] }
+tokio = { version = "1.33.0", features = ["full"] }

azalea-auth/Cargo.toml

@@ -12,6 +12,6 @@ proc-macro = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-proc-macro2 = "1.0.67"
+proc-macro2 = "1.0.69"
 quote = "1.0.33"
-syn = "2.0.37"
+syn = "2.0.39"

azalea-block/azalea-block-macros/Cargo.toml

@@ -10,11 +10,11 @@ version = "0.8.0"
 
 [dependencies]
 azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.8.0" }
-byteorder = "^1.4.3"
+byteorder = "^1.5.0"
 log = "0.4.20"
 serde_json = { version = "^1.0", optional = true }
-thiserror = "1.0.49"
-uuid = "^1.4.1"
+thiserror = "1.0.50"
+uuid = "^1.5.0"
 
 [features]
 serde_json = ["dep:serde_json"]

azalea-buf/Cargo.toml

@@ -11,6 +11,6 @@ proc-macro = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-proc-macro2 = "^1.0.67"
+proc-macro2 = "^1.0.69"
 quote = "^1.0.33"
-syn = { version = "^2.0.37", features = ["extra-traits"] }
+syn = { version = "^2.0.39", features = ["extra-traits"] }

azalea-buf/azalea-buf-macros/Cargo.toml

@@ -19,4 +19,4 @@ azalea-language = { path = "../azalea-language", version = "0.8.0" }
 log = "0.4.20"
 once_cell = "1.18.0"
 serde = { version = "^1.0", features = ["derive"] }
-serde_json = "^1.0.107"
+serde_json = "^1.0.108"

azalea-chat/Cargo.toml

@@ -9,9 +9,9 @@ version = "0.8.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-reqwest = { version = "0.11.21", default-features = false }
+reqwest = { version = "0.11.22", default-features = false }
 anyhow = "1.0.75"
-async-trait = "0.1.73"
+async-trait = "0.1.74"
 azalea-auth = { path = "../azalea-auth", version = "0.8.0" }
 azalea-block = { path = "../azalea-block", version = "0.8.0" }
 azalea-nbt = { path = "../azalea-nbt", version = "0.8.0" }
@@ -23,25 +23,25 @@ azalea-buf = { path = "../azalea-buf", version = "0.8.0" }
 azalea-protocol = { path = "../azalea-protocol", version = "0.8.0" }
 azalea-registry = { path = "../azalea-registry", version = "0.8.0" }
 azalea-world = { path = "../azalea-world", version = "0.8.0" }
-bevy_app = "0.11.3"
-bevy_ecs = "0.11.3"
-bevy_log = { version = "0.11.3", optional = true }
-bevy_tasks = "0.11.3"
-bevy_time = "0.11.3"
+bevy_app = "0.12.0"
+bevy_ecs = "0.12.0"
+bevy_log = { version = "0.12.0", optional = true }
+bevy_tasks = "0.12.0"
+bevy_time = "0.12.0"
 azalea-inventory = { path = "../azalea-inventory", version = "0.8.0" }
 derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
-futures = "0.3.28"
+futures = "0.3.29"
 log = "0.4.20"
 nohash-hasher = "0.2.0"
 once_cell = "1.18.0"
 parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
-regex = "1.9.6"
-thiserror = "^1.0.49"
-tokio = { version = "^1.32.0", features = ["sync"] }
-uuid = "^1.4.1"
+regex = "1.10.2"
+thiserror = "^1.0.50"
+tokio = { version = "^1.33.0", features = ["sync"] }
+uuid = "^1.5.0"
 azalea-entity = { version = "0.8.0", path = "../azalea-entity" }
-serde_json = "1.0.107"
-serde = "1.0.188"
+serde_json = "1.0.108"
+serde = "1.0.190"
 
 [features]
 default = ["log"]

azalea-client/Cargo.toml

@@ -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();
 

azalea-client/src/attack.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()

azalea-client/src/chat.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();

azalea-client/src/chunk_batching.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();
     }
 }

azalea-client/src/client.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>();
     }
 }

azalea-client/src/disconnect.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");

azalea-client/src/events.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 {

azalea-client/src/interact.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 {

azalea-client/src/inventory.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()) {

azalea-client/src/local_player.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 =