Adjust schedules to add systems

Author: B-head

crates/bevy_asset/src/debug_asset_server.rs

@@ -76,7 +76,7 @@ impl Plugin for DebugAssetServerPlugin {
             watch_for_changes: ChangeWatcher::with_delay(Duration::from_millis(200)),
         });
         app.insert_non_send_resource(DebugAssetApp(debug_asset_app));
-        app.add_systems(Update, run_debug_asset_app);
+        app.add_systems(FrameReady, run_debug_asset_app);
     }
 }
 

crates/bevy_asset/src/diagnostic/asset_count_diagnostics_plugin.rs

@@ -21,7 +21,7 @@ impl<T: Asset> Default for AssetCountDiagnosticsPlugin<T> {
 impl<T: Asset> Plugin for AssetCountDiagnosticsPlugin<T> {
     fn build(&self, app: &mut App) {
         app.add_systems(Startup, Self::setup_system)
-            .add_systems(Update, Self::diagnostic_system);
+            .add_systems(FrameReady, Self::diagnostic_system);
     }
 }
 

crates/bevy_asset/src/lib.rs

@@ -47,8 +47,8 @@ pub use loader::*;
 pub use path::*;
 pub use reflect::*;
 
-use bevy_app::{prelude::*, UpdateFlowOrder};
-use bevy_ecs::schedule::ScheduleLabel;
+use bevy_app::prelude::*;
+use bevy_ecs::{schedule::ScheduleLabel, world::World};
 use bevy_utils::Duration;
 
 /// Asset storages are updated.
@@ -132,7 +132,6 @@ impl Plugin for AssetPlugin {
         app.register_type::<HandleId>();
         app.register_type::<AssetPath>();
 
-        app.add_systems(PreUpdate, asset_server::free_unused_assets_system);
         app.init_schedule(LoadAssets);
         app.init_schedule(AssetEvents);
 
@@ -141,9 +140,10 @@ impl Plugin for AssetPlugin {
             all(not(target_arch = "wasm32"), not(target_os = "android"))
         ))]
         app.add_systems(LoadAssets, io::filesystem_watcher_system);
-
-        let mut order = app.world.resource_mut::<UpdateFlowOrder>();
-        order.insert_after(First, LoadAssets);
-        order.insert_after(PostUpdate, AssetEvents);
+        app.add_systems(LoadAssets, asset_server::free_unused_assets_system);
+        app.add_systems(FrameReady, |world: &mut World| {
+            world.run_schedule(LoadAssets);
+            world.run_schedule(AssetEvents);
+        });
     }
 }

crates/bevy_audio/src/lib.rs

@@ -64,7 +64,7 @@ impl Plugin for AudioPlugin {
             .add_asset::<SpatialAudioSink>()
             .init_resource::<Audio<AudioSource>>()
             .insert_resource(self.global_volume)
-            .add_systems(PostUpdate, play_queued_audio_system::<AudioSource>);
+            .add_systems(FrameReady, play_queued_audio_system::<AudioSource>);
 
         #[cfg(any(feature = "mp3", feature = "flac", feature = "wav", feature = "vorbis"))]
         app.init_asset_loader::<AudioLoader>();
@@ -80,6 +80,6 @@ impl AddAudioSource for App {
         self.add_asset::<T>()
             .init_resource::<Audio<T>>()
             .init_resource::<AudioOutput<T>>()
-            .add_systems(PostUpdate, play_queued_audio_system::<T>)
+            .add_systems(FrameReady, play_queued_audio_system::<T>)
     }
 }

crates/bevy_core/src/lib.rs

@@ -114,7 +114,7 @@ impl Plugin for TaskPoolPlugin {
         self.task_pool_options.create_default_pools();
 
         #[cfg(not(target_arch = "wasm32"))]
-        _app.add_systems(Last, tick_global_task_pools);
+        _app.add_systems(FrameReady, tick_global_task_pools);
     }
 }
 /// A dummy type that is [`!Send`](Send), to force systems to run on the main thread.

crates/bevy_diagnostic/src/entity_count_diagnostics_plugin.rs

@@ -10,7 +10,7 @@ pub struct EntityCountDiagnosticsPlugin;
 impl Plugin for EntityCountDiagnosticsPlugin {
     fn build(&self, app: &mut App) {
         app.register_diagnostic(Diagnostic::new(Self::ENTITY_COUNT, "entity_count", 20))
-            .add_systems(Update, Self::diagnostic_system);
+            .add_systems(FrameReady, Self::diagnostic_system);
     }
 }
 

crates/bevy_diagnostic/src/frame_time_diagnostics_plugin.rs

@@ -17,7 +17,7 @@ impl Plugin for FrameTimeDiagnosticsPlugin {
         .register_diagnostic(
             Diagnostic::new(Self::FRAME_COUNT, "frame_count", 1).with_smoothing_factor(0.0),
         )
-        .add_systems(Update, Self::diagnostic_system);
+        .add_systems(FrameReady, Self::diagnostic_system);
     }
 }
 

crates/bevy_diagnostic/src/log_diagnostics_plugin.rs

@@ -37,9 +37,9 @@ impl Plugin for LogDiagnosticsPlugin {
         });
 
         if self.debug {
-            app.add_systems(PostUpdate, Self::log_diagnostics_debug_system);
+            app.add_systems(FrameReady, Self::log_diagnostics_debug_system);
         } else {
-            app.add_systems(PostUpdate, Self::log_diagnostics_system);
+            app.add_systems(FrameReady, Self::log_diagnostics_system);
         }
     }
 }

crates/bevy_diagnostic/src/system_information_diagnostics_plugin.rs

@@ -15,7 +15,7 @@ pub struct SystemInformationDiagnosticsPlugin;
 impl Plugin for SystemInformationDiagnosticsPlugin {
     fn build(&self, app: &mut App) {
         app.add_systems(Startup, internal::setup_system)
-            .add_systems(Update, internal::diagnostic_system);
+            .add_systems(FrameReady, internal::diagnostic_system);
     }
 }
 

crates/bevy_gilrs/src/lib.rs

@@ -4,7 +4,7 @@ mod converter;
 mod gilrs_system;
 mod rumble;
 
-use bevy_app::{App, Plugin, PostUpdate, PreStartup, PreUpdate};
+use bevy_app::{App, Control, FrameReady, Plugin, PreStartup};
 use bevy_ecs::prelude::*;
 use bevy_input::InputSystem;
 use bevy_utils::tracing::error;
@@ -30,8 +30,8 @@ impl Plugin for GilrsPlugin {
                 app.insert_non_send_resource(gilrs)
                     .init_non_send_resource::<RunningRumbleEffects>()
                     .add_systems(PreStartup, gilrs_event_startup_system)
-                    .add_systems(PreUpdate, gilrs_event_system.before(InputSystem))
-                    .add_systems(PostUpdate, play_gilrs_rumble.in_set(RumbleSystem));
+                    .add_systems(Control, gilrs_event_system.before(InputSystem))
+                    .add_systems(FrameReady, play_gilrs_rumble.in_set(RumbleSystem));
             }
             Err(err) => error!("Failed to start Gilrs. {}", err),
         }