From c71df1b676f34bc5119aa718d7e1f827144cf950 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Thu, 24 Oct 2024 20:25:20 +0200
Subject: [PATCH 01/15] WIP update to Bevy 0.15 rc.1

---
 CHANGELOG.md                                  |   1 +
 README.md                                     |   5 +-
 bevy_asset_loader/Cargo.toml                  |  12 +-
 .../examples/configure_loading_state.rs       |   8 +-
 .../examples/custom_dynamic_assets.rs         |  59 +++++-----
 bevy_asset_loader/examples/dynamic_asset.rs   |   8 +-
 bevy_asset_loader/examples/failure_state.rs   |   2 +-
 bevy_asset_loader/examples/full_collection.rs |  71 ++++-------
 .../examples/full_dynamic_collection.rs       | 110 +++++-------------
 bevy_asset_loader/examples/image_asset.rs     |  35 +++---
 .../examples/manual_dynamic_asset.rs          |   8 +-
 .../examples/progress_tracking.rs             |   2 +-
 bevy_asset_loader/examples/two_collections.rs |   8 +-
 .../src/loading_state/systems.rs              |  10 +-
 .../tests/can_run_without_next_state.rs       |   2 +-
 .../tests/continues_to_failure_state.rs       |   2 +-
 bevy_asset_loader/tests/init_resource.rs      |   2 +-
 .../tests/mapped_path_use_slash.rs            |   2 +-
 .../tests/multiple_asset_collections.rs       |   2 +-
 .../tests/multiple_loading_states.rs          |   2 +-
 bevy_asset_loader/tests/multiple_states.rs    |   2 +-
 .../tests/reload_dynamic_asset_files.rs       |   2 +-
 .../tests/same_collection_multiple_times.rs   |   2 +-
 bevy_asset_loader_derive/Cargo.toml           |   2 +-
 bevy_asset_loader_derive/src/lib.rs           |   2 +-
 25 files changed, 147 insertions(+), 214 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7922eb..0ecc41a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- support for Bevy 0.15
 - custom `on_unimplemented` diagnostics for the `AssetCollection` trait
 - image derive attribute `array_texture_layers`
 - wait for dependencies of assets to load 
diff --git a/README.md b/README.md
index 1fb7a46..060f245 100644
--- a/README.md
+++ b/README.md
@@ -45,10 +45,7 @@ struct AudioAssets {
 /// This system runs in MyStates::Next. Thus, AudioAssets is available as a resource
 /// and the contained handle is done loading.
 fn start_background_audio(mut commands: Commands, audio_assets: Res<AudioAssets>) {
-    commands.spawn(AudioBundle {
-        source: audio_assets.background.clone(),
-        settings: PlaybackSettings::LOOP,
-    });
+    commands.spawn((AudioPlayer(audio_assets.background.clone()), PlaybackSettings::LOOP));
 }
 
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
index b3227ed..18d9fdf 100644
--- a/bevy_asset_loader/Cargo.toml
+++ b/bevy_asset_loader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_asset_loader"
-version = "0.21.0"
+version = "0.22.0-rc.1"
 authors = ["Niklas Eicker <git@nikl.me>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -22,20 +22,20 @@ standard_dynamic_assets = ["dep:bevy_common_assets", "dep:serde"]
 progress_tracking = ["dep:iyes_progress"]
 
 [dependencies]
-bevy = { version = "0.14.0", default-features = false, features = ["bevy_asset", "bevy_state"] }
-bevy_asset_loader_derive = { version = "=0.21.0", path = "../bevy_asset_loader_derive" }
+bevy = { version = "0.15.0-rc.1", default-features = false, features = ["bevy_asset", "bevy_state"] }
+bevy_asset_loader_derive = { version = "=0.22.0-rc.1", path = "../bevy_asset_loader_derive" }
 anyhow = "1"
 path-slash = "0.2"
 
-bevy_common_assets = { version = "0.11.0", features = ["ron"], optional = true }
+bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"], optional = true }
 serde = { version = "1", optional = true }
 iyes_progress = { version = "0.12.0", optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.14.0", features = ["vorbis"] }
+bevy = { version = "0.15.0-rc.1", features = ["vorbis"] }
 anyhow = "1"
 iyes_progress = { version = "0.12.0" }
-bevy_common_assets = { version = "0.11.0", features = ["ron"] }
+bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"] }
 serde = { version = "1" }
 ron = "0.8.1"
 trybuild = { version = "1.0" }
diff --git a/bevy_asset_loader/examples/configure_loading_state.rs b/bevy_asset_loader/examples/configure_loading_state.rs
index 2a8a695..837b61f 100644
--- a/bevy_asset_loader/examples/configure_loading_state.rs
+++ b/bevy_asset_loader/examples/configure_loading_state.rs
@@ -77,10 +77,10 @@ fn spawn_player(mut commands: Commands, image_assets: Res<ImageAssets>) {
 }
 
 fn play_background_audio(mut commands: Commands, audio_assets: Res<AudioAssets>) {
-    commands.spawn(AudioBundle {
-        source: audio_assets.background.clone(),
-        settings: PlaybackSettings::LOOP,
-    });
+    commands.spawn((
+        AudioPlayer(audio_assets.background.clone()),
+        PlaybackSettings::LOOP,
+    ));
 }
 
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
diff --git a/bevy_asset_loader/examples/custom_dynamic_assets.rs b/bevy_asset_loader/examples/custom_dynamic_assets.rs
index ee92a69..18263d8 100644
--- a/bevy_asset_loader/examples/custom_dynamic_assets.rs
+++ b/bevy_asset_loader/examples/custom_dynamic_assets.rs
@@ -26,46 +26,45 @@ fn main() {
 }
 
 fn render_stuff(mut commands: Commands, assets: Res<MyAssets>) {
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..Camera3dBundle::default()
-    });
-    commands.spawn(PbrBundle {
-        mesh: assets.cube.clone(),
-        material: assets.tree_standard_material.clone(),
-        transform: Transform::from_xyz(-1., 0., 1.),
-        ..default()
-    });
-    commands.spawn(PbrBundle {
-        mesh: assets.cube.clone(),
-        material: assets.player_standard_material.clone(),
-        transform: Transform::from_xyz(1., 0., 1.),
-        ..default()
-    });
-    commands.spawn(PointLightBundle {
-        point_light: PointLight {
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
+    commands.spawn((
+        Mesh3d(assets.cube.clone()),
+        MeshMaterial3d(assets.tree_standard_material.clone()),
+        Transform::from_xyz(-1., 0., 1.),
+    ));
+    commands.spawn((
+        Mesh3d(assets.cube.clone()),
+        MeshMaterial3d(assets.player_standard_material.clone()),
+        Transform::from_xyz(1., 0., 1.),
+    ));
+    commands.spawn((
+        PointLight {
             intensity: 1500.0,
             shadows_enabled: true,
             ..default()
         },
-        transform: Transform::from_xyz(4.0, 8.0, 4.0),
-        ..default()
-    });
+        Transform::from_xyz(4.0, 8.0, 4.0),
+    ));
 
-    commands.spawn(Camera2dBundle {
-        camera: Camera {
+    commands.spawn((
+        Camera2d,
+        Camera {
             order: 1,
             clear_color: ClearColorConfig::None,
             ..default()
         },
-        ..default()
-    });
+    ));
     // Combined image as sprite
-    commands.spawn(SpriteBundle {
-        texture: assets.combined_image.clone(),
-        transform: Transform::from_xyz(0.0, 200.0, 0.0),
-        ..default()
-    });
+    commands.spawn((
+        Sprite {
+            image: assets.combined_image.clone(),
+            ..default()
+        },
+        Transform::from_xyz(0.0, 200.0, 0.0),
+    ));
 }
 
 #[derive(AssetCollection, Resource)]
diff --git a/bevy_asset_loader/examples/dynamic_asset.rs b/bevy_asset_loader/examples/dynamic_asset.rs
index e5a0096..b22fcca 100644
--- a/bevy_asset_loader/examples/dynamic_asset.rs
+++ b/bevy_asset_loader/examples/dynamic_asset.rs
@@ -77,10 +77,10 @@ fn spawn_player_and_tree(mut commands: Commands, image_assets: Res<ImageAssets>)
 }
 
 fn play_background_audio(mut commands: Commands, audio_assets: Res<AudioAssets>) {
-    commands.spawn(AudioBundle {
-        source: audio_assets.background.clone(),
-        settings: PlaybackSettings::LOOP,
-    });
+    commands.spawn((
+        AudioPlayer(audio_assets.background.clone()),
+        PlaybackSettings::LOOP,
+    ));
 }
 
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
diff --git a/bevy_asset_loader/examples/failure_state.rs b/bevy_asset_loader/examples/failure_state.rs
index 31e14b4..0da3520 100644
--- a/bevy_asset_loader/examples/failure_state.rs
+++ b/bevy_asset_loader/examples/failure_state.rs
@@ -39,7 +39,7 @@ fn ok(mut quit: EventWriter<AppExit>) {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 10. {
+    if time.elapsed_secs_f64() > 10. {
         panic!("The asset loader did not change the state in 10 seconds");
     }
 }
diff --git a/bevy_asset_loader/examples/full_collection.rs b/bevy_asset_loader/examples/full_collection.rs
index f9c73e8..17ae0ee 100644
--- a/bevy_asset_loader/examples/full_collection.rs
+++ b/bevy_asset_loader/examples/full_collection.rs
@@ -1,5 +1,5 @@
 use bevy::app::AppExit;
-use bevy::asset::RecursiveDependencyLoadState;
+use bevy::asset::{RecursiveDependencyLoadState, UntypedAssetId};
 use bevy::prelude::*;
 use bevy::render::texture::{ImageSampler, ImageSamplerDescriptor};
 use bevy::utils::HashMap;
@@ -83,22 +83,18 @@ fn expectations(
 ) {
     info!("Done loading the collection. Checking expectations...");
 
-    assert_eq!(
-        asset_server.get_recursive_dependency_load_state(&assets.single_file.clone()),
-        Some(RecursiveDependencyLoadState::Loaded)
-    );
+    assert!(is_recursively_loaded(&assets.single_file, &asset_server));
     let material = standard_materials
         .get(&assets.standard_material)
         .expect("Standard material should be added to its assets resource.");
-    assert_eq!(
-        asset_server.get_recursive_dependency_load_state(
-            &material
-                .base_color_texture
-                .clone()
-                .expect("Material should have image as base color texture")
-        ),
-        Some(RecursiveDependencyLoadState::Loaded)
-    );
+
+    assert!(is_recursively_loaded(
+        &material
+            .base_color_texture
+            .clone()
+            .expect("Material should have image as base color texture"),
+        &asset_server
+    ));
     texture_atlas_layouts
         .get(&assets.texture_atlas_layout)
         .expect("Texture atlas layout should be added to its assets resource.");
@@ -126,62 +122,38 @@ fn expectations(
 
     assert_eq!(assets.folder_untyped.len(), 7);
     for handle in assets.folder_untyped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     assert_eq!(assets.folder_typed.len(), 7);
     for handle in assets.folder_typed.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     assert_eq!(assets.mapped_folder_untyped.len(), 7);
     for (name, handle) in assets.mapped_folder_untyped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
     assert_eq!(assets.mapped_folder_typed.len(), 7);
     for (name, handle) in assets.mapped_folder_typed.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
     assert_eq!(assets.files_untyped.len(), 2);
     for handle in assets.files_untyped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     assert_eq!(assets.files_typed.len(), 2);
     for handle in assets.files_typed.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     assert_eq!(assets.mapped_files_untyped.len(), 2);
     for (name, handle) in assets.mapped_files_untyped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
     assert_eq!(assets.mapped_files_typed.len(), 2);
     for (name, handle) in assets.mapped_files_typed.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
 
@@ -212,6 +184,13 @@ impl<const R: u8, const G: u8, const B: u8, const A: u8> FromWorld
     }
 }
 
+fn is_recursively_loaded(handle: impl Into<UntypedAssetId>, asset_server: &AssetServer) -> bool {
+    asset_server
+        .get_recursive_dependency_load_state(handle)
+        .map(|state| state.is_loaded())
+        .unwrap_or(false)
+}
+
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
 enum MyStates {
     #[default]
diff --git a/bevy_asset_loader/examples/full_dynamic_collection.rs b/bevy_asset_loader/examples/full_dynamic_collection.rs
index ab8586b..97850ab 100644
--- a/bevy_asset_loader/examples/full_dynamic_collection.rs
+++ b/bevy_asset_loader/examples/full_dynamic_collection.rs
@@ -1,5 +1,5 @@
 use bevy::app::AppExit;
-use bevy::asset::RecursiveDependencyLoadState;
+use bevy::asset::UntypedAssetId;
 use bevy::prelude::*;
 use bevy::render::texture::{ImageSampler, ImageSamplerDescriptor};
 use bevy::utils::HashMap;
@@ -119,22 +119,17 @@ fn expectations(
 ) {
     info!("Done loading the collection. Checking expectations...");
 
-    assert_eq!(
-        asset_server.get_recursive_dependency_load_state(&assets.single_file),
-        Some(RecursiveDependencyLoadState::Loaded)
-    );
+    assert!(is_recursively_loaded(&assets.single_file, &asset_server));
     let material = standard_materials
         .get(&assets.standard_material)
         .expect("Standard material should be added to its assets resource.");
-    assert_eq!(
-        asset_server.get_recursive_dependency_load_state(
-            material
-                .base_color_texture
-                .as_ref()
-                .expect("Material should have image as base color texture")
-        ),
-        Some(RecursiveDependencyLoadState::Loaded)
-    );
+    assert!(is_recursively_loaded(
+        material
+            .base_color_texture
+            .as_ref()
+            .expect("Material should have image as base color texture"),
+        &asset_server
+    ));
     texture_atlas_layouts
         .get(&assets.texture_atlas_layout)
         .expect("Texture atlas layout should be added to its assets resource.");
@@ -158,62 +153,38 @@ fn expectations(
 
     assert_eq!(assets.folder_untyped.len(), FOLDER_SIZE);
     for handle in assets.folder_untyped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     assert_eq!(assets.folder_untyped_mapped.len(), FOLDER_SIZE);
     for (name, handle) in assets.folder_untyped_mapped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
     assert_eq!(assets.folder_typed.len(), FOLDER_SIZE);
     for handle in assets.folder_typed.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     assert_eq!(assets.folder_typed_mapped.len(), FOLDER_SIZE);
     for (name, handle) in assets.folder_typed_mapped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
     assert_eq!(assets.files_untyped.len(), 2);
     for handle in assets.files_untyped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     assert_eq!(assets.files_untyped_mapped.len(), 2);
     for (name, handle) in assets.files_untyped_mapped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
     assert_eq!(assets.files_typed.len(), 2);
     for handle in assets.files_typed.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     assert_eq!(assets.files_typed_mapped.len(), 2);
     for (name, handle) in assets.files_typed_mapped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
 
@@ -223,20 +194,14 @@ fn expectations(
     };
     assert_eq!(optional_folder_untyped.len(), FOLDER_SIZE);
     for handle in optional_folder_untyped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     let Some(ref optional_folder_untyped_mapped) = assets.optional_folder_untyped_mapped else {
         panic!("Optional asset not loaded")
     };
     assert_eq!(optional_folder_untyped_mapped.len(), FOLDER_SIZE);
     for (name, handle) in optional_folder_untyped_mapped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
     let Some(ref optional_folder_typed) = assets.optional_folder_typed else {
@@ -244,20 +209,14 @@ fn expectations(
     };
     assert_eq!(optional_folder_typed.len(), FOLDER_SIZE);
     for handle in optional_folder_typed.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     let Some(ref optional_folder_typed_mapped) = assets.optional_folder_typed_mapped else {
         panic!("Optional asset not loaded")
     };
     assert_eq!(optional_folder_typed_mapped.len(), FOLDER_SIZE);
     for (name, handle) in optional_folder_typed_mapped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
 
@@ -267,20 +226,14 @@ fn expectations(
     };
     assert_eq!(optional_files_untyped.len(), 2);
     for handle in optional_files_untyped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     let Some(ref optional_files_untyped_mapped) = assets.optional_files_untyped_mapped else {
         panic!("Optional asset not loaded")
     };
     assert_eq!(optional_files_untyped_mapped.len(), 2);
     for (name, handle) in optional_files_untyped_mapped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
     let Some(ref optional_files_typed) = assets.optional_files_typed else {
@@ -288,20 +241,14 @@ fn expectations(
     };
     assert_eq!(optional_files_typed.len(), 2);
     for handle in optional_files_typed.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
     }
     let Some(ref optional_files_typed_mapped) = assets.optional_files_typed_mapped else {
         panic!("Optional asset not loaded")
     };
     assert_eq!(optional_files_typed_mapped.len(), 2);
     for (name, handle) in optional_files_typed_mapped.iter() {
-        assert_eq!(
-            asset_server.get_recursive_dependency_load_state(handle),
-            Some(RecursiveDependencyLoadState::Loaded)
-        );
+        assert!(is_recursively_loaded(handle, &asset_server));
         assert_eq!(&handle.path().unwrap().to_string(), name);
     }
 
@@ -310,6 +257,13 @@ fn expectations(
     quit.send(AppExit::Success);
 }
 
+fn is_recursively_loaded(handle: impl Into<UntypedAssetId>, asset_server: &AssetServer) -> bool {
+    asset_server
+        .get_recursive_dependency_load_state(handle)
+        .map(|state| state.is_loaded())
+        .unwrap_or(false)
+}
+
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
 enum MyStates {
     #[default]
diff --git a/bevy_asset_loader/examples/image_asset.rs b/bevy_asset_loader/examples/image_asset.rs
index bc5ad1b..f7fba03 100644
--- a/bevy_asset_loader/examples/image_asset.rs
+++ b/bevy_asset_loader/examples/image_asset.rs
@@ -31,25 +31,28 @@ struct ImageAssets {
 }
 
 fn draw(mut commands: Commands, image_assets: Res<ImageAssets>) {
-    commands.spawn(Camera2dBundle {
-        projection: OrthographicProjection {
+    commands.spawn((
+        Camera2d,
+        OrthographicProjection {
             far: 1000.,
-            near: -1000.,
             scale: 0.25,
-            ..default()
+            ..OrthographicProjection::default_2d()
         },
-        ..default()
-    });
-    commands.spawn(SpriteBundle {
-        texture: image_assets.tree_linear.clone(),
-        transform: Transform::from_translation(Vec3::new(-50., 0., 1.)),
-        ..Default::default()
-    });
-    commands.spawn(SpriteBundle {
-        texture: image_assets.tree_nearest.clone(),
-        transform: Transform::from_translation(Vec3::new(50., 0., 1.)),
-        ..Default::default()
-    });
+    ));
+    commands.spawn((
+        Sprite {
+            image: image_assets.tree_linear.clone(),
+            ..Default::default()
+        },
+        Transform::from_translation(Vec3::new(-50., 0., 1.)),
+    ));
+    commands.spawn((
+        Sprite {
+            image: image_assets.tree_nearest.clone(),
+            ..Default::default()
+        },
+        Transform::from_translation(Vec3::new(50., 0., 1.)),
+    ));
 }
 
 fn assert(images: Res<ImageAssets>, image_assets: Res<Assets<Image>>) {
diff --git a/bevy_asset_loader/examples/manual_dynamic_asset.rs b/bevy_asset_loader/examples/manual_dynamic_asset.rs
index 50567af..562d7bd 100644
--- a/bevy_asset_loader/examples/manual_dynamic_asset.rs
+++ b/bevy_asset_loader/examples/manual_dynamic_asset.rs
@@ -148,10 +148,10 @@ fn render_optional_background(mut commands: Commands, image_assets: Res<ImageAss
 }
 
 fn play_background_audio(mut commands: Commands, audio_assets: Res<AudioAssets>) {
-    commands.spawn(AudioBundle {
-        source: audio_assets.background.clone(),
-        settings: PlaybackSettings::LOOP,
-    });
+    commands.spawn((
+        AudioPlayer(audio_assets.background.clone()),
+        PlaybackSettings::LOOP,
+    ));
 }
 
 fn move_player(input: Res<ButtonInput<KeyCode>>, mut player: Query<&mut Transform, With<Player>>) {
diff --git a/bevy_asset_loader/examples/progress_tracking.rs b/bevy_asset_loader/examples/progress_tracking.rs
index 872ce06..c1fc7cd 100644
--- a/bevy_asset_loader/examples/progress_tracking.rs
+++ b/bevy_asset_loader/examples/progress_tracking.rs
@@ -63,7 +63,7 @@ struct TextureAssets {
 }
 
 fn track_fake_long_task(time: Res<Time>) -> Progress {
-    if time.elapsed_seconds_f64() > DURATION_LONG_TASK_IN_SECS {
+    if time.elapsed_secs_f64() > DURATION_LONG_TASK_IN_SECS {
         info!("Long fake task is completed");
         true.into()
     } else {
diff --git a/bevy_asset_loader/examples/two_collections.rs b/bevy_asset_loader/examples/two_collections.rs
index 87140b7..aa55afd 100644
--- a/bevy_asset_loader/examples/two_collections.rs
+++ b/bevy_asset_loader/examples/two_collections.rs
@@ -58,10 +58,10 @@ fn spawn_player_and_tree(mut commands: Commands, image_assets: Res<ImageAssets>)
 }
 
 fn play_background_audio(mut commands: Commands, audio_assets: Res<AudioAssets>) {
-    commands.spawn(AudioBundle {
-        source: audio_assets.background.clone(),
-        settings: PlaybackSettings::LOOP,
-    });
+    commands.spawn((
+        AudioPlayer(audio_assets.background.clone()),
+        PlaybackSettings::LOOP,
+    ));
 }
 
 fn move_player(input: Res<ButtonInput<KeyCode>>, mut player: Query<&mut Transform, With<Player>>) {
diff --git a/bevy_asset_loader/src/loading_state/systems.rs b/bevy_asset_loader/src/loading_state/systems.rs
index 0040a04..df15e99 100644
--- a/bevy_asset_loader/src/loading_state/systems.rs
+++ b/bevy_asset_loader/src/loading_state/systems.rs
@@ -1,4 +1,4 @@
-use bevy::asset::{AssetServer, RecursiveDependencyLoadState};
+use bevy::asset::AssetServer;
 use bevy::ecs::system::SystemState;
 use bevy::ecs::world::{FromWorld, World};
 use bevy::log::{debug, info, trace, warn};
@@ -106,10 +106,10 @@ fn count_loaded_handles<S: FreelyMutableState, Assets: AssetCollection>(
     let total = loading_asset_handles.handles.len();
 
     let failure = loading_asset_handles.handles.iter().any(|handle| {
-        matches!(
-            asset_server.get_recursive_dependency_load_state(handle.id()),
-            Some(RecursiveDependencyLoadState::Failed)
-        )
+        asset_server
+            .get_recursive_dependency_load_state(handle.id())
+            .map(|state| state.is_failed())
+            .unwrap_or(false)
     });
     let done = loading_asset_handles
         .handles
diff --git a/bevy_asset_loader/tests/can_run_without_next_state.rs b/bevy_asset_loader/tests/can_run_without_next_state.rs
index bc05568..b80e5df 100644
--- a/bevy_asset_loader/tests/can_run_without_next_state.rs
+++ b/bevy_asset_loader/tests/can_run_without_next_state.rs
@@ -31,7 +31,7 @@ fn can_run_without_next_state() {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 30. {
+    if time.elapsed_secs_f64() > 30. {
         panic!("The asset loader did not load the collection in 30 seconds");
     }
 }
diff --git a/bevy_asset_loader/tests/continues_to_failure_state.rs b/bevy_asset_loader/tests/continues_to_failure_state.rs
index d5c7ff9..2a724a5 100644
--- a/bevy_asset_loader/tests/continues_to_failure_state.rs
+++ b/bevy_asset_loader/tests/continues_to_failure_state.rs
@@ -33,7 +33,7 @@ fn exit(mut exit: EventWriter<AppExit>) {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 10. {
+    if time.elapsed_secs_f64() > 10. {
         panic!("The asset loader did not change the state in 10 seconds");
     }
 }
diff --git a/bevy_asset_loader/tests/init_resource.rs b/bevy_asset_loader/tests/init_resource.rs
index d57f210..1851f36 100644
--- a/bevy_asset_loader/tests/init_resource.rs
+++ b/bevy_asset_loader/tests/init_resource.rs
@@ -30,7 +30,7 @@ fn init_resource() {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 10. {
+    if time.elapsed_secs_f64() > 10. {
         panic!("The asset loader did not change the state in 10 seconds");
     }
 }
diff --git a/bevy_asset_loader/tests/mapped_path_use_slash.rs b/bevy_asset_loader/tests/mapped_path_use_slash.rs
index e268e0a..06f594f 100644
--- a/bevy_asset_loader/tests/mapped_path_use_slash.rs
+++ b/bevy_asset_loader/tests/mapped_path_use_slash.rs
@@ -30,7 +30,7 @@ fn mapped_path_use_slash() {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 60. {
+    if time.elapsed_secs_f64() > 60. {
         panic!("The asset loader did not change the state in 60 seconds");
     }
 }
diff --git a/bevy_asset_loader/tests/multiple_asset_collections.rs b/bevy_asset_loader/tests/multiple_asset_collections.rs
index f052a91..cf8fcff 100644
--- a/bevy_asset_loader/tests/multiple_asset_collections.rs
+++ b/bevy_asset_loader/tests/multiple_asset_collections.rs
@@ -30,7 +30,7 @@ fn multiple_asset_collections() {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 60. {
+    if time.elapsed_secs_f64() > 60. {
         panic!("The asset loader did not change the state in 60 seconds");
     }
 }
diff --git a/bevy_asset_loader/tests/multiple_loading_states.rs b/bevy_asset_loader/tests/multiple_loading_states.rs
index 2b7fba6..c9f03e7 100644
--- a/bevy_asset_loader/tests/multiple_loading_states.rs
+++ b/bevy_asset_loader/tests/multiple_loading_states.rs
@@ -38,7 +38,7 @@ fn multiple_loading_states() {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 30. {
+    if time.elapsed_secs_f64() > 30. {
         panic!("The app did not finish in 30 seconds");
     }
 }
diff --git a/bevy_asset_loader/tests/multiple_states.rs b/bevy_asset_loader/tests/multiple_states.rs
index 14787b9..e5c311c 100644
--- a/bevy_asset_loader/tests/multiple_states.rs
+++ b/bevy_asset_loader/tests/multiple_states.rs
@@ -85,7 +85,7 @@ fn go_to_game_play_loading_done(
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 30. {
+    if time.elapsed_secs_f64() > 30. {
         panic!("The app did not finish in 30 seconds");
     }
 }
diff --git a/bevy_asset_loader/tests/reload_dynamic_asset_files.rs b/bevy_asset_loader/tests/reload_dynamic_asset_files.rs
index 8cd60b4..c6d9f27 100644
--- a/bevy_asset_loader/tests/reload_dynamic_asset_files.rs
+++ b/bevy_asset_loader/tests/reload_dynamic_asset_files.rs
@@ -79,7 +79,7 @@ fn splash_countdown(
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 30. {
+    if time.elapsed_secs_f64() > 30. {
         panic!("The app did not finish in 30 seconds");
     }
 }
diff --git a/bevy_asset_loader/tests/same_collection_multiple_times.rs b/bevy_asset_loader/tests/same_collection_multiple_times.rs
index 167fca2..08b81c1 100644
--- a/bevy_asset_loader/tests/same_collection_multiple_times.rs
+++ b/bevy_asset_loader/tests/same_collection_multiple_times.rs
@@ -50,7 +50,7 @@ fn use_loading_assets(assets: Res<MyAssets>, asset_server: Res<AssetServer>) {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 30. {
+    if time.elapsed_secs_f64() > 30. {
         panic!("The app did not finish in 30 seconds");
     }
 }
diff --git a/bevy_asset_loader_derive/Cargo.toml b/bevy_asset_loader_derive/Cargo.toml
index dab1e87..e9e7cda 100644
--- a/bevy_asset_loader_derive/Cargo.toml
+++ b/bevy_asset_loader_derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_asset_loader_derive"
-version = "0.21.0"
+version = "0.22.0-rc.1"
 authors = ["Niklas Eicker <git@nikl.me>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
diff --git a/bevy_asset_loader_derive/src/lib.rs b/bevy_asset_loader_derive/src/lib.rs
index d649399..8eeea91 100644
--- a/bevy_asset_loader_derive/src/lib.rs
+++ b/bevy_asset_loader_derive/src/lib.rs
@@ -170,7 +170,7 @@ fn impl_asset_collection(
         }
     } else {
         return Err(vec![syn::Error::new_spanned(
-            &ast.into_token_stream(),
+            ast.into_token_stream(),
             "AssetCollection can only be derived for a struct",
         )]);
     }

From c77b250726cc541b708b50d8ba55dda2c3f4523c Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Wed, 30 Oct 2024 20:53:03 +0100
Subject: [PATCH 02/15] Update rest of examples to Bevy 0.15 rc.2

---
 bevy_asset_loader/Cargo.toml                  |   6 +-
 bevy_asset_loader/examples/atlas_from_grid.rs |  33 +++---
 .../examples/configure_loading_state.rs       |  11 +-
 .../examples/custom_dynamic_assets.rs         |   5 +-
 bevy_asset_loader/examples/dynamic_asset.rs   |  49 +++-----
 .../examples/dynamic_asset_arrays.rs          |  58 ++++-----
 bevy_asset_loader/examples/full_collection.rs |   2 +-
 bevy_asset_loader/examples/init_resource.rs   |  25 ++--
 .../examples/manual_dynamic_asset.rs          | 111 +++++++-----------
 .../examples/no_loading_state.rs              |  36 +++---
 .../examples/progress_tracking.rs             |  34 ++----
 .../examples/standard_material.rs             |  19 ++-
 bevy_asset_loader/examples/two_collections.rs |  23 ++--
 bevy_asset_loader/tests/ui/no_default.stderr  |   6 +-
 14 files changed, 170 insertions(+), 248 deletions(-)

diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
index 18d9fdf..0417841 100644
--- a/bevy_asset_loader/Cargo.toml
+++ b/bevy_asset_loader/Cargo.toml
@@ -23,18 +23,18 @@ progress_tracking = ["dep:iyes_progress"]
 
 [dependencies]
 bevy = { version = "0.15.0-rc.1", default-features = false, features = ["bevy_asset", "bevy_state"] }
-bevy_asset_loader_derive = { version = "=0.22.0-rc.1", path = "../bevy_asset_loader_derive" }
+bevy_asset_loader_derive = { version = "0.22.0-rc.1", path = "../bevy_asset_loader_derive" }
 anyhow = "1"
 path-slash = "0.2"
 
 bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"], optional = true }
 serde = { version = "1", optional = true }
-iyes_progress = { version = "0.12.0", optional = true }
+iyes_progress = { path = "../../iyes_progress", optional = true }
 
 [dev-dependencies]
 bevy = { version = "0.15.0-rc.1", features = ["vorbis"] }
 anyhow = "1"
-iyes_progress = { version = "0.12.0" }
+iyes_progress = { path = "../../iyes_progress" }
 bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"] }
 serde = { version = "1" }
 ron = "0.8.1"
diff --git a/bevy_asset_loader/examples/atlas_from_grid.rs b/bevy_asset_loader/examples/atlas_from_grid.rs
index 3864f35..6a9ea91 100644
--- a/bevy_asset_loader/examples/atlas_from_grid.rs
+++ b/bevy_asset_loader/examples/atlas_from_grid.rs
@@ -35,21 +35,19 @@ struct MyAssets {
 }
 
 fn draw_atlas(mut commands: Commands, my_assets: Res<MyAssets>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
     // draw the original image (whole sprite sheet)
-    commands.spawn(SpriteBundle {
-        texture: my_assets.female_adventurer.clone(),
-        transform: Transform::from_xyz(0., -150., 0.),
-        ..Default::default()
-    });
+    commands.spawn((
+        Sprite::from_image(my_assets.female_adventurer.clone()),
+        Transform::from_xyz(0., -150., 0.),
+    ));
     // draw animated sprite using the texture atlas layout
     commands.spawn((
-        SpriteBundle {
-            texture: my_assets.female_adventurer.clone(),
-            transform: Transform::from_xyz(0., 150., 0.),
-            ..Default::default()
-        },
-        TextureAtlas::from(my_assets.female_adventurer_layout.clone()),
+        Sprite::from_atlas_image(
+            my_assets.female_adventurer.clone(),
+            TextureAtlas::from(my_assets.female_adventurer_layout.clone()),
+        ),
+        Transform::from_xyz(0., 150., 0.),
         AnimationTimer(Timer::from_seconds(0.1, TimerMode::Repeating)),
     ));
 }
@@ -57,14 +55,13 @@ fn draw_atlas(mut commands: Commands, my_assets: Res<MyAssets>) {
 #[derive(Component)]
 struct AnimationTimer(Timer);
 
-fn animate_sprite_system(
-    time: Res<Time>,
-    mut sprites_to_animate: Query<(&mut AnimationTimer, &mut TextureAtlas)>,
-) {
-    for (mut timer, mut sprite) in &mut sprites_to_animate {
+fn animate_sprite_system(time: Res<Time>, mut query: Query<(&mut AnimationTimer, &mut Sprite)>) {
+    for (mut timer, mut sprite) in &mut query {
         timer.0.tick(time.delta());
         if timer.0.finished() {
-            sprite.index = (sprite.index + 1) % 8;
+            if let Some(atlas) = &mut sprite.texture_atlas {
+                atlas.index = (atlas.index + 1) % 8;
+            }
         }
     }
 }
diff --git a/bevy_asset_loader/examples/configure_loading_state.rs b/bevy_asset_loader/examples/configure_loading_state.rs
index 837b61f..716ea9e 100644
--- a/bevy_asset_loader/examples/configure_loading_state.rs
+++ b/bevy_asset_loader/examples/configure_loading_state.rs
@@ -68,12 +68,11 @@ impl FromWorld for ExampleResource {
 }
 
 fn spawn_player(mut commands: Commands, image_assets: Res<ImageAssets>) {
-    commands.spawn(Camera2dBundle::default());
-    commands.spawn(SpriteBundle {
-        texture: image_assets.player.clone(),
-        transform: Transform::from_translation(Vec3::new(0., 0., 1.)),
-        ..Default::default()
-    });
+    commands.spawn(Camera2d);
+    commands.spawn((
+        Sprite::from_image(image_assets.player.clone()),
+        Transform::from_translation(Vec3::new(0., 0., 1.)),
+    ));
 }
 
 fn play_background_audio(mut commands: Commands, audio_assets: Res<AudioAssets>) {
diff --git a/bevy_asset_loader/examples/custom_dynamic_assets.rs b/bevy_asset_loader/examples/custom_dynamic_assets.rs
index 18263d8..c1ca724 100644
--- a/bevy_asset_loader/examples/custom_dynamic_assets.rs
+++ b/bevy_asset_loader/examples/custom_dynamic_assets.rs
@@ -59,10 +59,7 @@ fn render_stuff(mut commands: Commands, assets: Res<MyAssets>) {
     ));
     // Combined image as sprite
     commands.spawn((
-        Sprite {
-            image: assets.combined_image.clone(),
-            ..default()
-        },
+        Sprite::from_image(assets.combined_image.clone()),
         Transform::from_xyz(0.0, 200.0, 0.0),
     ));
 }
diff --git a/bevy_asset_loader/examples/dynamic_asset.rs b/bevy_asset_loader/examples/dynamic_asset.rs
index b22fcca..e405303 100644
--- a/bevy_asset_loader/examples/dynamic_asset.rs
+++ b/bevy_asset_loader/examples/dynamic_asset.rs
@@ -46,34 +46,22 @@ struct AudioAssets {
 }
 
 fn spawn_player_and_tree(mut commands: Commands, image_assets: Res<ImageAssets>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
     let mut transform = Transform::from_translation(Vec3::new(0., 0., 1.));
     transform.scale = Vec3::splat(0.5);
-    commands
-        .spawn((
-            SpriteBundle {
-                transform: Transform {
-                    translation: Vec3::new(0., 150., 0.),
-                    ..Default::default()
-                },
-                texture: image_assets.player.clone(),
-                ..Default::default()
-            },
-            TextureAtlas {
-                layout: image_assets.player_layout.clone(),
-                index: 0,
-            },
-        ))
-        .insert(AnimationTimer(Timer::from_seconds(
-            0.1,
-            TimerMode::Repeating,
-        )))
-        .insert(Player);
-    commands.spawn(SpriteBundle {
-        texture: image_assets.tree.clone(),
-        transform: Transform::from_translation(Vec3::new(50., 30., 1.)),
-        ..Default::default()
-    });
+    commands.spawn((
+        Sprite::from_atlas_image(
+            image_assets.player.clone(),
+            TextureAtlas::from(image_assets.player_layout.clone()),
+        ),
+        Transform::from_translation(Vec3::new(0., 150., 0.)),
+        AnimationTimer(Timer::from_seconds(0.1, TimerMode::Repeating)),
+        Player,
+    ));
+    commands.spawn((
+        Sprite::from_image(image_assets.tree.clone()),
+        Transform::from_translation(Vec3::new(50., 30., 1.)),
+    ));
 }
 
 fn play_background_audio(mut commands: Commands, audio_assets: Res<AudioAssets>) {
@@ -96,14 +84,13 @@ struct Player;
 #[derive(Component)]
 struct AnimationTimer(Timer);
 
-fn animate_sprite_system(
-    time: Res<Time>,
-    mut query: Query<(&mut AnimationTimer, &mut TextureAtlas)>,
-) {
+fn animate_sprite_system(time: Res<Time>, mut query: Query<(&mut AnimationTimer, &mut Sprite)>) {
     for (mut timer, mut sprite) in &mut query {
         timer.0.tick(time.delta());
         if timer.0.finished() {
-            sprite.index = (sprite.index + 1) % 8;
+            if let Some(atlas) = &mut sprite.texture_atlas {
+                atlas.index = (atlas.index + 1) % 8;
+            }
         }
     }
 }
diff --git a/bevy_asset_loader/examples/dynamic_asset_arrays.rs b/bevy_asset_loader/examples/dynamic_asset_arrays.rs
index 1fde643..7f3c6f0 100644
--- a/bevy_asset_loader/examples/dynamic_asset_arrays.rs
+++ b/bevy_asset_loader/examples/dynamic_asset_arrays.rs
@@ -34,39 +34,26 @@ struct ImageAssets {
 }
 
 fn spawn_player_and_tree(mut commands: Commands, image_assets: Res<ImageAssets>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
     let mut transform = Transform::from_translation(Vec3::new(0., 0., 1.));
     transform.scale = Vec3::splat(0.5);
-    commands
-        .spawn((
-            SpriteBundle {
-                transform: Transform {
-                    translation: Vec3::new(0., 150., 0.),
-                    ..Default::default()
-                },
-                texture: image_assets.mixed_handlers[1].clone().typed(),
-                ..Default::default()
-            },
-            TextureAtlas {
-                layout: image_assets.atlas_layout[0].clone(),
-                index: 0,
-            },
-        ))
-        .insert(AnimationTimer(Timer::from_seconds(
-            0.1,
-            TimerMode::Repeating,
-        )))
-        .insert(Player);
-    commands.spawn(SpriteBundle {
-        texture: image_assets.mixed_handlers[1].clone().typed(),
-        transform: Transform::from_translation(Vec3::new(50., 30., 1.)),
-        ..Default::default()
-    });
-    commands.spawn(SpriteBundle {
-        texture: image_assets.mixed_handlers[2].clone().typed(),
-        transform: Transform::from_translation(Vec3::new(50., -90., 1.)),
-        ..Default::default()
-    });
+    commands.spawn((
+        Transform::from_translation(Vec3::new(0., 150., 0.)),
+        Sprite::from_atlas_image(
+            image_assets.mixed_handlers[1].clone().typed(),
+            TextureAtlas::from(image_assets.atlas_layout[0].clone()),
+        ),
+        AnimationTimer(Timer::from_seconds(0.1, TimerMode::Repeating)),
+        Player,
+    ));
+    commands.spawn((
+        Sprite::from_image(image_assets.mixed_handlers[1].clone().typed()),
+        Transform::from_translation(Vec3::new(50., 30., 1.)),
+    ));
+    commands.spawn((
+        Sprite::from_image(image_assets.mixed_handlers[2].clone().typed()),
+        Transform::from_translation(Vec3::new(50., -90., 1.)),
+    ));
 }
 
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
@@ -82,14 +69,13 @@ struct Player;
 #[derive(Component)]
 struct AnimationTimer(Timer);
 
-fn animate_sprite_system(
-    time: Res<Time>,
-    mut query: Query<(&mut AnimationTimer, &mut TextureAtlas)>,
-) {
+fn animate_sprite_system(time: Res<Time>, mut query: Query<(&mut AnimationTimer, &mut Sprite)>) {
     for (mut timer, mut sprite) in &mut query {
         timer.0.tick(time.delta());
         if timer.0.finished() {
-            sprite.index = (sprite.index + 1) % 8;
+            if let Some(atlas) = &mut sprite.texture_atlas {
+                atlas.index = (atlas.index + 1) % 8;
+            }
         }
     }
 }
diff --git a/bevy_asset_loader/examples/full_collection.rs b/bevy_asset_loader/examples/full_collection.rs
index 17ae0ee..1527f88 100644
--- a/bevy_asset_loader/examples/full_collection.rs
+++ b/bevy_asset_loader/examples/full_collection.rs
@@ -1,5 +1,5 @@
 use bevy::app::AppExit;
-use bevy::asset::{RecursiveDependencyLoadState, UntypedAssetId};
+use bevy::asset::UntypedAssetId;
 use bevy::prelude::*;
 use bevy::render::texture::{ImageSampler, ImageSamplerDescriptor};
 use bevy::utils::HashMap;
diff --git a/bevy_asset_loader/examples/init_resource.rs b/bevy_asset_loader/examples/init_resource.rs
index 1fa04b0..c70fb2f 100644
--- a/bevy_asset_loader/examples/init_resource.rs
+++ b/bevy_asset_loader/examples/init_resource.rs
@@ -63,21 +63,16 @@ fn draw(
     combined_texture: Res<CombinedImage>,
     image_assets: Res<ImageAssets>,
 ) {
-    commands.spawn(Camera2dBundle::default());
-    commands.spawn(SpriteBundle {
-        texture: image_assets.player.clone(),
-        transform: Transform::from_translation(Vec3::new(-150., 0., 1.)),
-        ..Default::default()
-    });
-    commands.spawn(SpriteBundle {
-        texture: combined_texture.combined.clone(),
-        ..Default::default()
-    });
-    commands.spawn(SpriteBundle {
-        texture: image_assets.tree.clone(),
-        transform: Transform::from_translation(Vec3::new(150., 0., 1.)),
-        ..Default::default()
-    });
+    commands.spawn(Camera2d);
+    commands.spawn((
+        Sprite::from_image(image_assets.player.clone()),
+        Transform::from_translation(Vec3::new(-150., 0., 1.)),
+    ));
+    commands.spawn(Sprite::from_image(combined_texture.combined.clone()));
+    commands.spawn((
+        Sprite::from_image(image_assets.tree.clone()),
+        Transform::from_translation(Vec3::new(150., 0., 1.)),
+    ));
 }
 
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
diff --git a/bevy_asset_loader/examples/manual_dynamic_asset.rs b/bevy_asset_loader/examples/manual_dynamic_asset.rs
index 562d7bd..1301abd 100644
--- a/bevy_asset_loader/examples/manual_dynamic_asset.rs
+++ b/bevy_asset_loader/examples/manual_dynamic_asset.rs
@@ -80,7 +80,7 @@ fn character_setup(
         );
     } else if mouse_input.just_pressed(MouseButton::Right) {
         // Or be using a command:
-        commands.add(RegisterStandardDynamicAsset {
+        commands.queue(RegisterStandardDynamicAsset {
             key: "character",
             asset: StandardDynamicAsset::File {
                 path: "images/zombie.png".to_owned(),
@@ -124,26 +124,20 @@ pub struct FontAssets {
 fn spawn_player_and_tree(mut commands: Commands, image_assets: Res<ImageAssets>) {
     let mut transform = Transform::from_translation(Vec3::new(0., 0., 1.));
     transform.scale = Vec3::splat(0.5);
-    commands
-        .spawn(SpriteBundle {
-            texture: image_assets.player.clone(),
-            transform,
-            ..Default::default()
-        })
-        .insert(Player);
-    commands.spawn(SpriteBundle {
-        texture: image_assets.tree.clone(),
-        transform: Transform::from_translation(Vec3::new(50., 30., 1.)),
-        ..Default::default()
-    });
+    commands.spawn((
+        Sprite::from_image(image_assets.player.clone()),
+        transform,
+        Player,
+    ));
+    commands.spawn((
+        Sprite::from_image(image_assets.tree.clone()),
+        Transform::from_translation(Vec3::new(50., 30., 1.)),
+    ));
 }
 
 fn render_optional_background(mut commands: Commands, image_assets: Res<ImageAssets>) {
     if let Some(background) = &image_assets.background {
-        commands.spawn(SpriteBundle {
-            texture: background.clone(),
-            ..Default::default()
-        });
+        commands.spawn(Sprite::from_image(background.clone()));
     }
 }
 
@@ -187,10 +181,10 @@ enum MyStates {
 }
 
 fn menu(mut commands: Commands, font_assets: Res<FontAssets>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
     commands
-        .spawn(NodeBundle {
-            style: Style {
+        .spawn((
+            Node {
                 width: Val::Percent(100.),
                 height: Val::Percent(100.),
                 margin: UiRect::all(Val::Auto),
@@ -199,63 +193,48 @@ fn menu(mut commands: Commands, font_assets: Res<FontAssets>) {
                 flex_direction: FlexDirection::ColumnReverse,
                 ..Default::default()
             },
-            background_color: BackgroundColor(Color::linear_rgba(0.0,0.0,0.0,1.0)),
-            ..Default::default()
-        })
+            BackgroundColor(Color::linear_rgba(0.0, 0.0, 0.0, 1.0)),
+        ))
         .insert(MenuUi)
         .with_children(|parent| {
-            parent.spawn(TextBundle {
-                text: Text {
-                    sections: vec![TextSection {
-                        value:
-                            "Choose your character: Adventurer (left click) or Zombie (right click)\n\
+            parent.spawn(text(
+                Text::new(
+                    "Choose your character: Adventurer (left click) or Zombie (right click)\n\
                             Your input will decide which image file gets loaded\n\n\
                             Press 'B' to toggle background\n\
-                            The background image is optional and not loaded if not needed"
-                                .to_string(),
-                        style: TextStyle {
-                            font: font_assets.fira_sans.clone(),
-                            font_size: 30.0,
-                            color: Color::linear_rgb(1., 1., 1.),
-                        },
-                    }],
-                    justify: JustifyText::Center,
-                    ..Default::default()
-                },
-                ..Default::default()
-            });
-            parent.spawn(TextBundle {
-                text: Text {
-                    sections: vec![TextSection {
-                        value: "Background currently Off".to_string(),
-                        style: TextStyle {
-                            font: font_assets.fira_sans.clone(),
-                            font_size: 30.0,
-                            color: Color::linear_rgb(1., 1., 1.),
-                        },
-                    }],
-                    justify: JustifyText::Center,
-                    ..Default::default()
-                },
-                ..Default::default()
-            }).insert(BackgroundText);
+                            The background image is optional and not loaded if not needed",
+                ),
+                &font_assets,
+            ));
+            parent
+                .spawn(text(Text::new("Background currently "), &font_assets))
+                .with_child(text((TextSpan::new("Off"), BackgroundText), &font_assets));
         });
 }
 
+fn text(bundle: impl Bundle, font_assets: &FontAssets) -> impl Bundle {
+    return (
+        bundle,
+        TextFont {
+            font: font_assets.fira_sans.clone(),
+            font_size: 30.0,
+            ..default()
+        },
+        TextColor(Color::linear_rgb(1., 1., 1.)),
+        TextLayout::new_with_justify(JustifyText::Center),
+    );
+}
+
 fn update_menu(
-    mut background_text: Query<&mut Text, With<BackgroundText>>,
+    mut background_text: Query<&mut TextSpan, With<BackgroundText>>,
     show_background: Res<ShowBackground>,
 ) {
     if show_background.is_changed() {
-        background_text
-            .single_mut()
-            .sections
-            .get_mut(0)
-            .unwrap()
-            .value = format!(
-            "Background is {}",
-            if show_background.0 { "On" } else { "Off" }
-        );
+        background_text.single_mut().0 = if show_background.0 {
+            "On".to_string()
+        } else {
+            "Off".to_string()
+        };
     }
 }
 
diff --git a/bevy_asset_loader/examples/no_loading_state.rs b/bevy_asset_loader/examples/no_loading_state.rs
index 7a78ea9..c0cac5f 100644
--- a/bevy_asset_loader/examples/no_loading_state.rs
+++ b/bevy_asset_loader/examples/no_loading_state.rs
@@ -43,10 +43,7 @@ fn load_audio(world: &mut World) {
 fn play_audio(audio_assets: Option<Res<AudioAssets>>, mut commands: Commands) {
     if let Some(audio_assets) = audio_assets {
         if audio_assets.is_added() {
-            commands.spawn(AudioBundle {
-                source: audio_assets.background.clone(),
-                ..default()
-            });
+            commands.spawn(AudioPlayer(audio_assets.background.clone()));
         }
     }
 }
@@ -68,38 +65,35 @@ struct AudioAssets {
 }
 
 fn draw(mut commands: Commands, image_assets: Res<ImageAssets>) {
-    commands.spawn(Camera2dBundle::default());
+    commands.spawn(Camera2d);
     commands
         .spawn((
-            SpriteBundle {
-                texture: image_assets.female_adventurer.clone(),
-                transform: Transform::from_translation(Vec3::new(-150., 0., 1.)),
-                ..Default::default()
-            },
-            TextureAtlas::from(image_assets.female_adventurer_layout.clone()),
+            Sprite::from_atlas_image(
+                image_assets.female_adventurer.clone(),
+                TextureAtlas::from(image_assets.female_adventurer_layout.clone()),
+            ),
+            Transform::from_translation(Vec3::new(-150., 0., 1.)),
         ))
         .insert(AnimationTimer(Timer::from_seconds(
             0.1,
             TimerMode::Repeating,
         )));
-    commands.spawn(SpriteBundle {
-        texture: image_assets.tree.clone(),
-        transform: Transform::from_translation(Vec3::new(150., 0., 1.)),
-        ..Default::default()
-    });
+    commands.spawn((
+        Sprite::from_image(image_assets.tree.clone()),
+        Transform::from_translation(Vec3::new(150., 0., 1.)),
+    ));
 }
 
 #[derive(Component)]
 struct AnimationTimer(Timer);
 
-fn animate_sprite_system(
-    time: Res<Time>,
-    mut query: Query<(&mut AnimationTimer, &mut TextureAtlas)>,
-) {
+fn animate_sprite_system(time: Res<Time>, mut query: Query<(&mut AnimationTimer, &mut Sprite)>) {
     for (mut timer, mut sprite) in &mut query {
         timer.0.tick(time.delta());
         if timer.0.finished() {
-            sprite.index = (sprite.index + 1) % 8;
+            if let Some(atlas) = &mut sprite.texture_atlas {
+                atlas.index = (atlas.index + 1) % 8;
+            }
         }
     }
 }
diff --git a/bevy_asset_loader/examples/progress_tracking.rs b/bevy_asset_loader/examples/progress_tracking.rs
index c1fc7cd..0e11a78 100644
--- a/bevy_asset_loader/examples/progress_tracking.rs
+++ b/bevy_asset_loader/examples/progress_tracking.rs
@@ -1,5 +1,5 @@
 use bevy::app::AppExit;
-use bevy::asset::RecursiveDependencyLoadState;
+use bevy::asset::UntypedAssetId;
 use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
 use bevy::prelude::*;
 use bevy_asset_loader::prelude::*;
@@ -78,29 +78,14 @@ fn expect(
     texture_atlas_layouts: Res<Assets<TextureAtlasLayout>>,
     mut quit: EventWriter<AppExit>,
 ) {
-    assert_eq!(
-        asset_server.get_recursive_dependency_load_state(&audio_assets.background.clone()),
-        Some(RecursiveDependencyLoadState::Loaded)
-    );
-    assert_eq!(
-        asset_server.get_recursive_dependency_load_state(&audio_assets.plop.clone()),
-        Some(RecursiveDependencyLoadState::Loaded)
-    );
+    is_recursively_loaded(&audio_assets.background, &asset_server);
+    is_recursively_loaded(&audio_assets.plop, &asset_server);
     texture_atlas_layouts
         .get(&texture_assets.female_adventurer_layout)
         .expect("Texture atlas should be added to its assets resource.");
-    assert_eq!(
-        asset_server.get_recursive_dependency_load_state(&texture_assets.female_adventurer.clone()),
-        Some(RecursiveDependencyLoadState::Loaded)
-    );
-    assert_eq!(
-        asset_server.get_recursive_dependency_load_state(&texture_assets.player.clone()),
-        Some(RecursiveDependencyLoadState::Loaded)
-    );
-    assert_eq!(
-        asset_server.get_recursive_dependency_load_state(&texture_assets.tree.clone()),
-        Some(RecursiveDependencyLoadState::Loaded)
-    );
+    is_recursively_loaded(&texture_assets.female_adventurer, &asset_server);
+    is_recursively_loaded(&texture_assets.player, &asset_server);
+    is_recursively_loaded(&texture_assets.tree, &asset_server);
     info!("Everything looks good!");
     info!("Quitting the application...");
     quit.send(AppExit::Success);
@@ -126,6 +111,13 @@ fn print_progress(
     }
 }
 
+fn is_recursively_loaded(handle: impl Into<UntypedAssetId>, asset_server: &AssetServer) -> bool {
+    asset_server
+        .get_recursive_dependency_load_state(handle)
+        .map(|state| state.is_loaded())
+        .unwrap_or(false)
+}
+
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
 enum MyStates {
     #[default]
diff --git a/bevy_asset_loader/examples/standard_material.rs b/bevy_asset_loader/examples/standard_material.rs
index 46696a7..bb082c5 100644
--- a/bevy_asset_loader/examples/standard_material.rs
+++ b/bevy_asset_loader/examples/standard_material.rs
@@ -29,17 +29,16 @@ fn spawn_player(
     my_assets: Res<MyAssets>,
     mut meshes: ResMut<Assets<Mesh>>,
 ) {
-    commands.spawn(PbrBundle {
-        mesh: meshes.add(Cuboid {
+    commands.spawn((
+        MeshMaterial3d(my_assets.player.clone()),
+        Mesh3d(meshes.add(Cuboid {
             half_size: Vec3::splat(1.0),
-        }),
-        material: my_assets.player.clone(),
-        ..Default::default()
-    });
-    commands.spawn(Camera3dBundle {
-        transform: Transform::from_xyz(-3.0, 3.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
-        ..Default::default()
-    });
+        })),
+    ));
+    commands.spawn((
+        Camera3d::default(),
+        Transform::from_xyz(-3.0, 3.0, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
+    ));
 }
 
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
diff --git a/bevy_asset_loader/examples/two_collections.rs b/bevy_asset_loader/examples/two_collections.rs
index aa55afd..32c4e43 100644
--- a/bevy_asset_loader/examples/two_collections.rs
+++ b/bevy_asset_loader/examples/two_collections.rs
@@ -42,19 +42,16 @@ struct ImageAssets {
 struct Player;
 
 fn spawn_player_and_tree(mut commands: Commands, image_assets: Res<ImageAssets>) {
-    commands.spawn(Camera2dBundle::default());
-    commands
-        .spawn(SpriteBundle {
-            texture: image_assets.player.clone(),
-            transform: Transform::from_translation(Vec3::new(0., 0., 1.)),
-            ..Default::default()
-        })
-        .insert(Player);
-    commands.spawn(SpriteBundle {
-        texture: image_assets.tree.clone(),
-        transform: Transform::from_translation(Vec3::new(50., 30., 1.)),
-        ..Default::default()
-    });
+    commands.spawn(Camera2d);
+    commands.spawn((
+        Sprite::from_image(image_assets.player.clone()),
+        Transform::from_translation(Vec3::new(0., 0., 1.)),
+        Player,
+    ));
+    commands.spawn((
+        Sprite::from_image(image_assets.tree.clone()),
+        Transform::from_translation(Vec3::new(50., 30., 1.)),
+    ));
 }
 
 fn play_background_audio(mut commands: Commands, audio_assets: Res<AudioAssets>) {
diff --git a/bevy_asset_loader/tests/ui/no_default.stderr b/bevy_asset_loader/tests/ui/no_default.stderr
index da6e134..f3f7076 100644
--- a/bevy_asset_loader/tests/ui/no_default.stderr
+++ b/bevy_asset_loader/tests/ui/no_default.stderr
@@ -6,13 +6,13 @@ error[E0277]: the trait bound `NoDefault: FromWorld` is not satisfied
   |
   = help: the following other types implement trait `FromWorld`:
             BlitPipeline
-            CASNode
-            CASPipeline
+            BoxShadowPipeline
+            CasNode
+            CasPipeline
             Children
             DeferredLightingLayout
             DepthOfFieldGlobalBindGroupLayout
             FallbackImage
-            FallbackImageCubemap
           and $N others
   = note: required for `NoDefault` to implement `FromWorld`
 help: consider annotating `NoDefault` with `#[derive(Default)]`

From a35dce30f500df44292716cef8f84e0a22b6dd2d Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Wed, 30 Oct 2024 20:55:54 +0100
Subject: [PATCH 03/15] Point to iyes_progress fork

---
 bevy_asset_loader/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
index 0417841..562ed37 100644
--- a/bevy_asset_loader/Cargo.toml
+++ b/bevy_asset_loader/Cargo.toml
@@ -29,12 +29,12 @@ path-slash = "0.2"
 
 bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"], optional = true }
 serde = { version = "1", optional = true }
-iyes_progress = { path = "../../iyes_progress", optional = true }
+iyes_progress = { git = "https://github.com/NiklasEi/iyes_progress", branch = "main", optional = true }
 
 [dev-dependencies]
 bevy = { version = "0.15.0-rc.1", features = ["vorbis"] }
 anyhow = "1"
-iyes_progress = { path = "../../iyes_progress" }
+iyes_progress = { git = "https://github.com/NiklasEi/iyes_progress", branch = "main" }
 bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"] }
 serde = { version = "1" }
 ron = "0.8.1"

From dd686f1fa232d5dd5eb5f7ade3472bb4692f8208 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Wed, 30 Oct 2024 22:02:48 +0100
Subject: [PATCH 04/15] Remove explicit return

---
 bevy_asset_loader/examples/manual_dynamic_asset.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bevy_asset_loader/examples/manual_dynamic_asset.rs b/bevy_asset_loader/examples/manual_dynamic_asset.rs
index 1301abd..c512d9e 100644
--- a/bevy_asset_loader/examples/manual_dynamic_asset.rs
+++ b/bevy_asset_loader/examples/manual_dynamic_asset.rs
@@ -213,7 +213,7 @@ fn menu(mut commands: Commands, font_assets: Res<FontAssets>) {
 }
 
 fn text(bundle: impl Bundle, font_assets: &FontAssets) -> impl Bundle {
-    return (
+    (
         bundle,
         TextFont {
             font: font_assets.fira_sans.clone(),
@@ -222,7 +222,7 @@ fn text(bundle: impl Bundle, font_assets: &FontAssets) -> impl Bundle {
         },
         TextColor(Color::linear_rgb(1., 1., 1.)),
         TextLayout::new_with_justify(JustifyText::Center),
-    );
+    )
 }
 
 fn update_menu(

From 7d41ac35b83e7b9d00249c591184379aa6c303fd Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sun, 24 Nov 2024 13:13:02 +0100
Subject: [PATCH 05/15] Fix doc tests

---
 bevy_asset_loader/src/lib.rs           | 5 +----
 bevy_asset_loader/src/loading_state.rs | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bevy_asset_loader/src/lib.rs b/bevy_asset_loader/src/lib.rs
index b4aea6d..ad90c57 100644
--- a/bevy_asset_loader/src/lib.rs
+++ b/bevy_asset_loader/src/lib.rs
@@ -47,10 +47,7 @@
 //! // since this function runs in MyState::Next, we know our assets are loaded.
 //! // We can get their handles from the AudioAssets resource.
 //! fn use_asset_handles(mut commands: Commands, audio_assets: Res<AudioAssets>) {
-//!     commands.spawn(AudioBundle {
-//!         source: audio_assets.background.clone(),
-//!         ..default()
-//!     });
+//!     commands.spawn(AudioPlayer(audio_assets.background.clone()));
 //! }
 //!
 //! #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
diff --git a/bevy_asset_loader/src/loading_state.rs b/bevy_asset_loader/src/loading_state.rs
index 4b4893e..0fc7b0c 100644
--- a/bevy_asset_loader/src/loading_state.rs
+++ b/bevy_asset_loader/src/loading_state.rs
@@ -69,10 +69,7 @@ use crate::loading_state::systems::{apply_internal_state_transition, run_loading
 /// }
 ///
 /// fn play_audio(mut commands: Commands, audio_assets: Res<AudioAssets>) {
-///     commands.spawn(AudioBundle {
-///         source: audio_assets.background.clone(),
-///         ..default()
-///     });
+///     commands.spawn(AudioPlayer(audio_assets.background.clone()));
 /// }
 ///
 /// #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]

From 94f0cba732bcd298074f3705834ceb382c3d2928 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sun, 24 Nov 2024 14:20:24 +0100
Subject: [PATCH 06/15] Update to new iyes_progress rc

---
 bevy_asset_loader/Cargo.toml                  |  4 +-
 .../examples/progress_tracking.rs             | 35 ++++++------
 bevy_asset_loader/src/loading_state.rs        | 55 ++++++++++++-------
 .../src/loading_state/systems.rs              | 50 +++++++++--------
 4 files changed, 82 insertions(+), 62 deletions(-)

diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
index 562ed37..fdc1b37 100644
--- a/bevy_asset_loader/Cargo.toml
+++ b/bevy_asset_loader/Cargo.toml
@@ -29,12 +29,12 @@ path-slash = "0.2"
 
 bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"], optional = true }
 serde = { version = "1", optional = true }
-iyes_progress = { git = "https://github.com/NiklasEi/iyes_progress", branch = "main", optional = true }
+iyes_progress = { version = "0.13.0-rc.1", optional = true }
 
 [dev-dependencies]
 bevy = { version = "0.15.0-rc.1", features = ["vorbis"] }
 anyhow = "1"
-iyes_progress = { git = "https://github.com/NiklasEi/iyes_progress", branch = "main" }
+iyes_progress = { version = "0.13.0-rc.1" }
 bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"] }
 serde = { version = "1" }
 ron = "0.8.1"
diff --git a/bevy_asset_loader/examples/progress_tracking.rs b/bevy_asset_loader/examples/progress_tracking.rs
index 0e11a78..5e661f6 100644
--- a/bevy_asset_loader/examples/progress_tracking.rs
+++ b/bevy_asset_loader/examples/progress_tracking.rs
@@ -3,7 +3,7 @@ use bevy::asset::UntypedAssetId;
 use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
 use bevy::prelude::*;
 use bevy_asset_loader::prelude::*;
-use iyes_progress::{Progress, ProgressCounter, ProgressPlugin, ProgressSystem};
+use iyes_progress::{Progress, ProgressPlugin, ProgressReturningSystem, ProgressTracker};
 
 /// This example shows how to track the loading progress of your collections using `iyes_progress`
 ///
@@ -16,7 +16,8 @@ fn main() {
         .add_plugins((
             DefaultPlugins,
             // track progress during `MyStates::AssetLoading` and continue to `MyStates::Next` when progress is completed
-            ProgressPlugin::new(MyStates::AssetLoading).continue_to(MyStates::Next),
+            ProgressPlugin::<MyStates>::new()
+                .with_state_transition(MyStates::AssetLoading, MyStates::Next),
             FrameTimeDiagnosticsPlugin,
         ))
         .init_state::<MyStates>()
@@ -29,7 +30,10 @@ fn main() {
         .add_systems(OnEnter(MyStates::Next), expect)
         .add_systems(
             Update,
-            (track_fake_long_task.track_progress(), print_progress)
+            (
+                track_fake_long_task.track_progress::<MyStates>(),
+                print_progress,
+            )
                 .chain()
                 .run_if(in_state(MyStates::AssetLoading))
                 .after(LoadingStateSet(MyStates::AssetLoading)),
@@ -92,22 +96,21 @@ fn expect(
 }
 
 fn print_progress(
-    progress: Option<Res<ProgressCounter>>,
+    progress: Res<ProgressTracker<MyStates>>,
     diagnostics: Res<DiagnosticsStore>,
     mut last_done: Local<u32>,
 ) {
-    if let Some(progress) = progress.map(|counter| counter.progress()) {
-        if progress.done > *last_done {
-            *last_done = progress.done;
-            info!(
-                "[Frame {}] Changed progress: {:?}",
-                diagnostics
-                    .get(&FrameTimeDiagnosticsPlugin::FRAME_COUNT)
-                    .map(|diagnostic| diagnostic.value().unwrap_or(0.))
-                    .unwrap_or(0.),
-                progress
-            );
-        }
+    let progress = progress.get_global_progress();
+    if progress.done > *last_done {
+        *last_done = progress.done;
+        info!(
+            "[Frame {}] Changed progress: {:?}",
+            diagnostics
+                .get(&FrameTimeDiagnosticsPlugin::FRAME_COUNT)
+                .map(|diagnostic| diagnostic.value().unwrap_or(0.))
+                .unwrap_or(0.),
+            progress
+        );
     }
 }
 
diff --git a/bevy_asset_loader/src/loading_state.rs b/bevy_asset_loader/src/loading_state.rs
index 0fc7b0c..da2b020 100644
--- a/bevy_asset_loader/src/loading_state.rs
+++ b/bevy_asset_loader/src/loading_state.rs
@@ -32,16 +32,14 @@ use systems::{
     reset_loading_state, resume_to_finalize, start_loading_collection,
 };
 
-#[cfg(feature = "standard_dynamic_assets")]
-use bevy_common_assets::ron::RonAssetPlugin;
-
 #[cfg(feature = "standard_dynamic_assets")]
 use crate::standard_dynamic_asset::{
     StandardDynamicAsset, StandardDynamicAssetArrayCollection, StandardDynamicAssetCollection,
 };
-
+#[cfg(feature = "standard_dynamic_assets")]
+use bevy_common_assets::ron::RonAssetPlugin;
 #[cfg(feature = "progress_tracking")]
-use iyes_progress::TrackedProgressSet;
+use iyes_progress::ProgressEntryId;
 
 use crate::dynamic_asset::{DynamicAsset, DynamicAssets};
 use crate::loading_state::systems::{apply_internal_state_transition, run_loading_state};
@@ -57,7 +55,6 @@ use crate::loading_state::systems::{apply_internal_state_transition, run_loading
 /// App::new()
 ///         .add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin))
 ///         .init_state::<GameState>()
-/// #       .init_resource::<iyes_progress::ProgressCounter>()
 ///         .add_loading_state(LoadingState::new(GameState::Loading)
 ///             .continue_to_state(GameState::Menu)
 ///             .load_collection::<AudioAssets>()
@@ -121,7 +118,6 @@ where
     /// App::new()
     /// #       .add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin))
     /// #       .init_state::<GameState>()
-    /// #       .init_resource::<iyes_progress::ProgressCounter>()
     ///         .add_loading_state(
     ///           LoadingState::new(GameState::Loading)
     ///             .continue_to_state(GameState::Menu)
@@ -174,7 +170,6 @@ where
     /// App::new()
     /// #       .add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin))
     /// #       .init_state::<GameState>()
-    /// #       .init_resource::<iyes_progress::ProgressCounter>()
     ///         .add_loading_state(
     ///           LoadingState::new(GameState::Loading)
     ///             .continue_to_state(GameState::Menu)
@@ -220,7 +215,6 @@ where
     /// App::new()
     /// #       .add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin))
     /// #       .init_state::<GameState>()
-    /// #       .init_resource::<iyes_progress::ProgressCounter>()
     ///         .add_loading_state(
     ///           LoadingState::new(GameState::Loading)
     ///             .continue_to_state(GameState::Menu)
@@ -294,7 +288,6 @@ where
     /// App::new()
     /// #       .add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin))
     /// #       .init_state::<GameState>()
-    /// #       .init_resource::<iyes_progress::ProgressCounter>()
     ///         .add_loading_state(
     ///           LoadingState::new(GameState::Loading)
     ///             .continue_to_state(GameState::Menu)
@@ -347,6 +340,11 @@ where
         }
         app.init_resource::<State<InternalLoadingState<S>>>();
         app.init_resource::<NextState<InternalLoadingState<S>>>();
+        #[cfg(feature = "progress_tracking")]
+        app.insert_resource(LoadingStateProgressId::<S> {
+            id: ProgressEntryId::new(),
+            _marker: default(),
+        });
 
         app.init_resource::<DynamicAssetCollections<S>>();
         #[cfg(feature = "standard_dynamic_assets")]
@@ -437,15 +435,6 @@ where
                     .register_dynamic_asset_collection::<StandardDynamicAssetArrayCollection>();
             }
 
-            #[cfg(feature = "progress_tracking")]
-            app.add_systems(
-                Update,
-                run_loading_state::<S>
-                    .in_set(TrackedProgressSet)
-                    .in_set(LoadingStateSet(self.loading_state.clone()))
-                    .run_if(in_state(self.loading_state)),
-            );
-            #[cfg(not(feature = "progress_tracking"))]
             app.add_systems(
                 Update,
                 run_loading_state::<S>
@@ -543,6 +532,32 @@ impl<T> Default for LoadingAssetHandles<T> {
     }
 }
 
+#[cfg(feature = "progress_tracking")]
+#[derive(Resource)]
+struct LoadingStateProgressId<State: FreelyMutableState> {
+    id: ProgressEntryId,
+    _marker: PhantomData<State>,
+}
+
+#[cfg(feature = "progress_tracking")]
+#[derive(Resource)]
+struct AssetCollectionsProgressId<State: FreelyMutableState, Assets: AssetCollection> {
+    id: ProgressEntryId,
+    _marker_state: PhantomData<State>,
+    _marker_assets: PhantomData<Assets>,
+}
+
+#[cfg(feature = "progress_tracking")]
+impl<State: FreelyMutableState, Assets: AssetCollection> AssetCollectionsProgressId<State, Assets> {
+    pub(crate) fn new(id: ProgressEntryId) -> Self {
+        AssetCollectionsProgressId {
+            id,
+            _marker_state: default(),
+            _marker_assets: default(),
+        }
+    }
+}
+
 #[derive(Resource)]
 pub(crate) struct AssetLoaderConfiguration<State: FreelyMutableState> {
     state_configurations: HashMap<State, LoadingConfiguration<State>>,
@@ -617,7 +632,6 @@ pub trait LoadingStateAppExt {
     /// App::new()
     /// #       .add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin))
     /// #       .init_state::<GameState>()
-    /// #       .init_resource::<iyes_progress::ProgressCounter>()
     ///         .add_loading_state(
     ///           LoadingState::new(GameState::Loading)
     ///             .continue_to_state(GameState::Menu)
@@ -699,7 +713,6 @@ pub trait LoadingStateAppExt {
     /// App::new()
     /// #       .add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin))
     /// #       .init_state::<GameState>()
-    /// #       .init_resource::<iyes_progress::ProgressCounter>()
     ///         .add_loading_state(
     ///           LoadingState::new(GameState::Loading)
     ///             .continue_to_state(GameState::Menu)
diff --git a/bevy_asset_loader/src/loading_state/systems.rs b/bevy_asset_loader/src/loading_state/systems.rs
index df15e99..3c37ad2 100644
--- a/bevy_asset_loader/src/loading_state/systems.rs
+++ b/bevy_asset_loader/src/loading_state/systems.rs
@@ -1,21 +1,21 @@
+use crate::asset_collection::AssetCollection;
+#[cfg(feature = "progress_tracking")]
+use crate::loading_state::{AssetCollectionsProgressId, LoadingStateProgressId};
+use crate::loading_state::{
+    AssetLoaderConfiguration, InternalLoadingState, LoadingAssetHandles, LoadingStateSchedule,
+    OnEnterInternalLoadingState,
+};
 use bevy::asset::AssetServer;
 use bevy::ecs::system::SystemState;
 use bevy::ecs::world::{FromWorld, World};
 use bevy::log::{debug, info, trace, warn};
 use bevy::prelude::{NextState, Res, ResMut, Resource, Schedules};
 use bevy::state::state::{FreelyMutableState, State};
+#[cfg(feature = "progress_tracking")]
+use iyes_progress::{ProgressEntryId, ProgressTracker};
 use std::any::{type_name, TypeId};
 use std::marker::PhantomData;
 
-#[cfg(feature = "progress_tracking")]
-use iyes_progress::{HiddenProgress, Progress, ProgressCounter};
-
-use crate::asset_collection::AssetCollection;
-use crate::loading_state::{
-    AssetLoaderConfiguration, InternalLoadingState, LoadingAssetHandles, LoadingStateSchedule,
-    OnEnterInternalLoadingState,
-};
-
 pub(crate) fn init_resource<Asset: Resource + FromWorld>(world: &mut World) {
     let asset = Asset::from_world(world);
     world.insert_resource(asset);
@@ -53,6 +53,11 @@ pub(crate) fn start_loading_collection<S: FreelyMutableState, Assets: AssetColle
         marker: PhantomData::<Assets>,
     };
     world.insert_resource(handles);
+
+    #[cfg(feature = "progress_tracking")]
+    world.insert_resource(AssetCollectionsProgressId::<S, Assets>::new(
+        ProgressEntryId::new(),
+    ));
 }
 
 #[allow(clippy::type_complexity)]
@@ -79,20 +84,17 @@ pub(crate) fn check_loading_collection<S: FreelyMutableState, Assets: AssetColle
             &asset_server,
             &mut asset_loader_configuration,
         );
+        #[cfg(feature = "progress_tracking")]
+        {
+            let entry_id = world.resource::<AssetCollectionsProgressId<S, Assets>>().id;
+            world
+                .resource::<ProgressTracker<S>>()
+                .set_progress(entry_id, done, total);
+        }
         if total == done {
             let asset_collection = Assets::create(world);
             world.insert_resource(asset_collection);
             world.remove_resource::<LoadingAssetHandles<Assets>>();
-
-            #[cfg(feature = "progress_tracking")]
-            world
-                .resource_mut::<ProgressCounter>()
-                .persist_progress(Progress { done, total });
-        } else {
-            #[cfg(feature = "progress_tracking")]
-            world
-                .resource::<ProgressCounter>()
-                .manually_track(Progress { done, total });
         }
     }
 }
@@ -160,22 +162,24 @@ pub(crate) fn resume_to_finalize<S: FreelyMutableState>(
 
 pub(crate) fn initialize_loading_state<S: FreelyMutableState>(
     mut loading_state: ResMut<NextState<InternalLoadingState<S>>>,
-    #[cfg(feature = "progress_tracking")] mut progress_counter: ResMut<ProgressCounter>,
+    #[cfg(feature = "progress_tracking")] tracking_id: Res<LoadingStateProgressId<S>>,
+    #[cfg(feature = "progress_tracking")] tracker: Res<ProgressTracker<S>>,
 ) {
     #[cfg(feature = "progress_tracking")]
-    progress_counter.persist_progress_hidden(HiddenProgress(Progress { total: 1, done: 0 }));
+    tracker.set_total(tracking_id.id, 1);
     loading_state.set(InternalLoadingState::LoadingDynamicAssetCollections);
 }
 
 pub(crate) fn finish_loading_state<S: FreelyMutableState>(
     state: Res<State<S>>,
     mut next_state: ResMut<NextState<S>>,
-    #[cfg(feature = "progress_tracking")] mut progress_counter: ResMut<ProgressCounter>,
+    #[cfg(feature = "progress_tracking")] tracking_id: Res<LoadingStateProgressId<S>>,
+    #[cfg(feature = "progress_tracking")] tracker: Res<ProgressTracker<S>>,
     mut loading_state: ResMut<NextState<InternalLoadingState<S>>>,
     asset_loader_configuration: Res<AssetLoaderConfiguration<S>>,
 ) {
     #[cfg(feature = "progress_tracking")]
-    progress_counter.persist_progress_hidden(HiddenProgress(Progress { total: 0, done: 1 }));
+    tracker.set_done(tracking_id.id, 1);
     info!(
         "Loading state '{}::{:?}' is done",
         type_name::<S>(),

From bdc9cd00467e5c24f4073452e4e7b98e354a0e1f Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sun, 24 Nov 2024 14:51:01 +0100
Subject: [PATCH 07/15] Support running with progress tracking feature but
 without tracking setup

---
 bevy_asset_loader/src/lib.rs                   |  1 -
 bevy_asset_loader/src/loading_state/config.rs  |  1 -
 bevy_asset_loader/src/loading_state/systems.rs | 18 +++++++++++-------
 .../tests/can_run_without_next_state.rs        |  2 --
 .../tests/continues_to_failure_state.rs        |  2 --
 .../tests/continues_without_collection.rs      |  2 --
 bevy_asset_loader/tests/init_resource.rs       |  2 --
 .../tests/mapped_path_use_slash.rs             |  2 --
 .../tests/multiple_asset_collections.rs        |  2 --
 .../tests/multiple_loading_states.rs           |  5 -----
 bevy_asset_loader/tests/multiple_states.rs     |  5 -----
 .../tests/reload_dynamic_asset_files.rs        |  5 -----
 .../tests/same_collection_multiple_times.rs    |  2 --
 13 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/bevy_asset_loader/src/lib.rs b/bevy_asset_loader/src/lib.rs
index ad90c57..e3a85c6 100644
--- a/bevy_asset_loader/src/lib.rs
+++ b/bevy_asset_loader/src/lib.rs
@@ -15,7 +15,6 @@
 //!         .add_plugins(DefaultPlugins)
 //! # */
 //! #       .add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin))
-//! #       .init_resource::<iyes_progress::ProgressCounter>()
 //!         .init_state::<GameState>()
 //!         .add_loading_state(
 //!             LoadingState::new(GameState::Loading)
diff --git a/bevy_asset_loader/src/loading_state/config.rs b/bevy_asset_loader/src/loading_state/config.rs
index f32a212..a1f6aac 100644
--- a/bevy_asset_loader/src/loading_state/config.rs
+++ b/bevy_asset_loader/src/loading_state/config.rs
@@ -63,7 +63,6 @@ pub trait ConfigureLoadingState {
 /// # */
 /// #       .add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin))
 ///         .init_state::<GameState>()
-/// #       .init_resource::<iyes_progress::ProgressCounter>()
 ///         .add_loading_state(
 ///           LoadingState::new(GameState::Loading)
 ///             .continue_to_state(GameState::Menu)
diff --git a/bevy_asset_loader/src/loading_state/systems.rs b/bevy_asset_loader/src/loading_state/systems.rs
index 3c37ad2..806fd5f 100644
--- a/bevy_asset_loader/src/loading_state/systems.rs
+++ b/bevy_asset_loader/src/loading_state/systems.rs
@@ -87,9 +87,9 @@ pub(crate) fn check_loading_collection<S: FreelyMutableState, Assets: AssetColle
         #[cfg(feature = "progress_tracking")]
         {
             let entry_id = world.resource::<AssetCollectionsProgressId<S, Assets>>().id;
-            world
-                .resource::<ProgressTracker<S>>()
-                .set_progress(entry_id, done, total);
+            if let Some(tracker) = world.get_resource::<ProgressTracker<S>>() {
+                tracker.set_progress(entry_id, done, total);
+            }
         }
         if total == done {
             let asset_collection = Assets::create(world);
@@ -163,10 +163,12 @@ pub(crate) fn resume_to_finalize<S: FreelyMutableState>(
 pub(crate) fn initialize_loading_state<S: FreelyMutableState>(
     mut loading_state: ResMut<NextState<InternalLoadingState<S>>>,
     #[cfg(feature = "progress_tracking")] tracking_id: Res<LoadingStateProgressId<S>>,
-    #[cfg(feature = "progress_tracking")] tracker: Res<ProgressTracker<S>>,
+    #[cfg(feature = "progress_tracking")] tracker: Option<Res<ProgressTracker<S>>>,
 ) {
     #[cfg(feature = "progress_tracking")]
-    tracker.set_total(tracking_id.id, 1);
+    if let Some(tracker) = tracker {
+        tracker.set_total(tracking_id.id, 1);
+    }
     loading_state.set(InternalLoadingState::LoadingDynamicAssetCollections);
 }
 
@@ -174,12 +176,14 @@ pub(crate) fn finish_loading_state<S: FreelyMutableState>(
     state: Res<State<S>>,
     mut next_state: ResMut<NextState<S>>,
     #[cfg(feature = "progress_tracking")] tracking_id: Res<LoadingStateProgressId<S>>,
-    #[cfg(feature = "progress_tracking")] tracker: Res<ProgressTracker<S>>,
+    #[cfg(feature = "progress_tracking")] tracker: Option<Res<ProgressTracker<S>>>,
     mut loading_state: ResMut<NextState<InternalLoadingState<S>>>,
     asset_loader_configuration: Res<AssetLoaderConfiguration<S>>,
 ) {
     #[cfg(feature = "progress_tracking")]
-    tracker.set_done(tracking_id.id, 1);
+    if let Some(tracker) = tracker {
+        tracker.set_done(tracking_id.id, 1);
+    }
     info!(
         "Loading state '{}::{:?}' is done",
         type_name::<S>(),
diff --git a/bevy_asset_loader/tests/can_run_without_next_state.rs b/bevy_asset_loader/tests/can_run_without_next_state.rs
index b80e5df..e46a685 100644
--- a/bevy_asset_loader/tests/can_run_without_next_state.rs
+++ b/bevy_asset_loader/tests/can_run_without_next_state.rs
@@ -16,8 +16,6 @@ fn can_run_without_next_state() {
         StatesPlugin,
     ));
     app.init_state::<MyStates>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins(iyes_progress::ProgressPlugin::new(MyStates::Load));
     app.add_loading_state(LoadingState::new(MyStates::Load).load_collection::<MyAssets>())
         .init_resource::<TestState>()
         .add_systems(
diff --git a/bevy_asset_loader/tests/continues_to_failure_state.rs b/bevy_asset_loader/tests/continues_to_failure_state.rs
index 2a724a5..b283f41 100644
--- a/bevy_asset_loader/tests/continues_to_failure_state.rs
+++ b/bevy_asset_loader/tests/continues_to_failure_state.rs
@@ -10,8 +10,6 @@ fn continues_to_failure_state() {
 
     app.add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin));
     app.init_state::<MyStates>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins(iyes_progress::ProgressPlugin::new(MyStates::Load));
     app.add_loading_state(
         LoadingState::new(MyStates::Load)
             .continue_to_state(MyStates::Next)
diff --git a/bevy_asset_loader/tests/continues_without_collection.rs b/bevy_asset_loader/tests/continues_without_collection.rs
index 68167ea..e06c47b 100644
--- a/bevy_asset_loader/tests/continues_without_collection.rs
+++ b/bevy_asset_loader/tests/continues_without_collection.rs
@@ -10,8 +10,6 @@ fn continues_without_collection() {
 
     app.add_plugins((MinimalPlugins, AssetPlugin::default(), StatesPlugin));
     app.init_state::<MyStates>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins(iyes_progress::ProgressPlugin::new(MyStates::Load));
     app.add_loading_state(LoadingState::new(MyStates::Load).continue_to_state(MyStates::Next))
         .init_resource::<TestState>()
         .add_systems(Update, expect.run_if(in_state(MyStates::Load)))
diff --git a/bevy_asset_loader/tests/init_resource.rs b/bevy_asset_loader/tests/init_resource.rs
index 1851f36..c8775b3 100644
--- a/bevy_asset_loader/tests/init_resource.rs
+++ b/bevy_asset_loader/tests/init_resource.rs
@@ -16,8 +16,6 @@ fn init_resource() {
         StatesPlugin,
     ));
     app.init_state::<MyStates>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins(iyes_progress::ProgressPlugin::new(MyStates::Load));
     app.add_loading_state(
         LoadingState::new(MyStates::Load)
             .continue_to_state(MyStates::Next)
diff --git a/bevy_asset_loader/tests/mapped_path_use_slash.rs b/bevy_asset_loader/tests/mapped_path_use_slash.rs
index 06f594f..47f3d06 100644
--- a/bevy_asset_loader/tests/mapped_path_use_slash.rs
+++ b/bevy_asset_loader/tests/mapped_path_use_slash.rs
@@ -17,8 +17,6 @@ fn mapped_path_use_slash() {
         StatesPlugin,
     ));
     app.init_state::<MyStates>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins(iyes_progress::ProgressPlugin::new(MyStates::Load));
     app.add_loading_state(
         LoadingState::new(MyStates::Load)
             .continue_to_state(MyStates::Next)
diff --git a/bevy_asset_loader/tests/multiple_asset_collections.rs b/bevy_asset_loader/tests/multiple_asset_collections.rs
index cf8fcff..7acb6a9 100644
--- a/bevy_asset_loader/tests/multiple_asset_collections.rs
+++ b/bevy_asset_loader/tests/multiple_asset_collections.rs
@@ -16,8 +16,6 @@ fn multiple_asset_collections() {
         StatesPlugin,
     ));
     app.init_state::<MyStates>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins(iyes_progress::ProgressPlugin::new(MyStates::Load));
     app.add_loading_state(
         LoadingState::new(MyStates::Load)
             .continue_to_state(MyStates::Next)
diff --git a/bevy_asset_loader/tests/multiple_loading_states.rs b/bevy_asset_loader/tests/multiple_loading_states.rs
index c9f03e7..9ee841a 100644
--- a/bevy_asset_loader/tests/multiple_loading_states.rs
+++ b/bevy_asset_loader/tests/multiple_loading_states.rs
@@ -15,11 +15,6 @@ fn multiple_loading_states() {
         StatesPlugin,
     ));
     app.init_state::<MyStates>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins((
-        iyes_progress::ProgressPlugin::new(MyStates::Splash),
-        iyes_progress::ProgressPlugin::new(MyStates::Load),
-    ));
     app.add_loading_state(
         LoadingState::new(MyStates::Splash)
             .continue_to_state(MyStates::Load)
diff --git a/bevy_asset_loader/tests/multiple_states.rs b/bevy_asset_loader/tests/multiple_states.rs
index e5c311c..430bb1a 100644
--- a/bevy_asset_loader/tests/multiple_states.rs
+++ b/bevy_asset_loader/tests/multiple_states.rs
@@ -15,11 +15,6 @@ fn main() {
         StatesPlugin,
     ));
     app.init_state::<Prepare>().init_state::<Game>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins((
-        iyes_progress::ProgressPlugin::new(Game::Booting),
-        iyes_progress::ProgressPlugin::new(Prepare::Loading),
-    ));
     app.add_loading_state(
         LoadingState::new(Game::Booting)
             .continue_to_state(Game::Loading)
diff --git a/bevy_asset_loader/tests/reload_dynamic_asset_files.rs b/bevy_asset_loader/tests/reload_dynamic_asset_files.rs
index c6d9f27..57cdcfd 100644
--- a/bevy_asset_loader/tests/reload_dynamic_asset_files.rs
+++ b/bevy_asset_loader/tests/reload_dynamic_asset_files.rs
@@ -18,11 +18,6 @@ fn main() {
         StatesPlugin,
     ));
     app.init_state::<MyStates>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins((
-        iyes_progress::ProgressPlugin::new(MyStates::SplashAssetLoading),
-        iyes_progress::ProgressPlugin::new(MyStates::MainMenuAssetLoading),
-    ));
     app.insert_resource(SplashTimer(Timer::from_seconds(1.0, TimerMode::Once)))
         .add_loading_state(
             LoadingState::new(MyStates::SplashAssetLoading)
diff --git a/bevy_asset_loader/tests/same_collection_multiple_times.rs b/bevy_asset_loader/tests/same_collection_multiple_times.rs
index 08b81c1..3f21630 100644
--- a/bevy_asset_loader/tests/same_collection_multiple_times.rs
+++ b/bevy_asset_loader/tests/same_collection_multiple_times.rs
@@ -15,8 +15,6 @@ fn same_collection_multiple_times() {
         StatesPlugin,
     ));
     app.init_state::<MyStates>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins(iyes_progress::ProgressPlugin::new(MyStates::Load));
     app.add_loading_state(
         LoadingState::new(MyStates::Load)
             .continue_to_state(MyStates::Play)

From b080a9b925235237a495611856ddbfd6f1aa1b57 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Mon, 25 Nov 2024 22:21:09 +0100
Subject: [PATCH 08/15] Update substate example and test

---
 bevy_asset_loader/examples/sub_state.rs       | 41 ++++++-------
 .../tests/can_run_with_sub_states.rs          | 61 ++++++++-----------
 2 files changed, 44 insertions(+), 58 deletions(-)

diff --git a/bevy_asset_loader/examples/sub_state.rs b/bevy_asset_loader/examples/sub_state.rs
index 5efc87b..8740cf3 100644
--- a/bevy_asset_loader/examples/sub_state.rs
+++ b/bevy_asset_loader/examples/sub_state.rs
@@ -2,36 +2,31 @@ use bevy::prelude::*;
 use bevy_asset_loader::prelude::*;
 
 fn main() {
-    let mut app = App::new();
-
-    app.add_plugins(DefaultPlugins);
-
-    app.init_state::<AppState>();
-    app.add_sub_state::<MainMenuState>();
-
-    app.add_loading_state(
-        LoadingState::new(MainMenuState::Loading)
-            .continue_to_state(MainMenuState::Active)
-            .on_failure_continue_to_state(MainMenuState::Error)
-            .load_collection::<MyAssets>(),
-    );
-
-    app.add_systems(OnEnter(MainMenuState::Active), setup_main_menu);
-
-    app.run();
+    App::new()
+        .add_plugins(DefaultPlugins)
+        .init_state::<AppState>()
+        .add_sub_state::<MainMenuState>()
+        .add_loading_state(
+            LoadingState::new(MainMenuState::Loading)
+                .continue_to_state(MainMenuState::Game)
+                .load_collection::<MyAssets>(),
+        )
+        .add_systems(OnEnter(MainMenuState::Game), setup)
+        .run();
 }
 
 #[derive(AssetCollection, Resource)]
 struct MyAssets {
     #[asset(path = "audio/background.ogg")]
     background: Handle<AudioSource>,
+    #[asset(path = "images/player.png")]
+    player: Handle<Image>,
 }
 
-fn setup_main_menu(mut commands: Commands, my_assets: Res<MyAssets>) {
-    commands.spawn(AudioSourceBundle {
-        source: my_assets.background.clone(),
-        ..Default::default()
-    });
+fn setup(mut commands: Commands, my_assets: Res<MyAssets>) {
+    commands.spawn(AudioPlayer(my_assets.background.clone()));
+    commands.spawn(Camera2d);
+    commands.spawn(Sprite::from_image(my_assets.player.clone()));
 }
 
 #[derive(Clone, Copy, Default, Eq, PartialEq, Debug, Hash, States)]
@@ -46,5 +41,5 @@ pub enum MainMenuState {
     #[default]
     Loading,
     Error,
-    Active,
+    Game,
 }
diff --git a/bevy_asset_loader/tests/can_run_with_sub_states.rs b/bevy_asset_loader/tests/can_run_with_sub_states.rs
index 497606a..0fa8f86 100644
--- a/bevy_asset_loader/tests/can_run_with_sub_states.rs
+++ b/bevy_asset_loader/tests/can_run_with_sub_states.rs
@@ -7,33 +7,30 @@ use bevy_asset_loader::prelude::*;
 
 #[test]
 fn can_run_with_sub_states() {
-    let mut app = App::new();
-
-    app.add_plugins((
-        MinimalPlugins,
-        AssetPlugin::default(),
-        AudioPlugin::default(),
-        StatesPlugin,
-    ));
-    app.init_state::<AppState>();
-    app.add_sub_state::<MainMenuState>();
-    #[cfg(feature = "progress_tracking")]
-    app.add_plugins(iyes_progress::ProgressPlugin::new(MainMenuState::Loading));
-    app.add_loading_state(
-        LoadingState::new(MainMenuState::Loading)
-            .continue_to_state(MainMenuState::Active)
-            .load_collection::<MyAssets>(),
-    )
-    .init_resource::<TestState>()
-    .add_systems(
-        Update,
-        (
-            load_main_menu.run_if(in_state(AppState::Load)),
-            expect.run_if(in_state(MainMenuState::Active)),
-            timeout.run_if(in_state(MainMenuState::Loading)),
-        ),
-    )
-    .run();
+    App::new()
+        .add_plugins((
+            MinimalPlugins,
+            AssetPlugin::default(),
+            AudioPlugin::default(),
+            StatesPlugin,
+        ))
+        .init_state::<AppState>()
+        .add_sub_state::<MainMenuState>()
+        .add_loading_state(
+            LoadingState::new(MainMenuState::Loading)
+                .continue_to_state(MainMenuState::Active)
+                .load_collection::<MyAssets>(),
+        )
+        .init_resource::<TestState>()
+        .add_systems(
+            Update,
+            (
+                load_main_menu.run_if(in_state(AppState::Load)),
+                expect.run_if(in_state(MainMenuState::Active)),
+                timeout.run_if(in_state(MainMenuState::Loading)),
+            ),
+        )
+        .run();
 }
 
 fn load_main_menu(mut state: ResMut<NextState<AppState>>) {
@@ -41,7 +38,7 @@ fn load_main_menu(mut state: ResMut<NextState<AppState>>) {
 }
 
 fn timeout(time: Res<Time>) {
-    if time.elapsed_seconds_f64() > 30. {
+    if time.elapsed_secs_f64() > 30. {
         panic!("The asset loader did not load the collection in 30 seconds");
     }
 }
@@ -73,11 +70,10 @@ impl Default for TestState {
     }
 }
 
-#[allow(dead_code)]
 #[derive(AssetCollection, Resource)]
 struct MyAssets {
     #[asset(path = "audio/background.ogg")]
-    background: Handle<AudioSource>,
+    _background: Handle<AudioSource>,
 }
 
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
@@ -92,10 +88,5 @@ enum AppState {
 enum MainMenuState {
     #[default]
     Loading,
-    #[expect(
-        dead_code,
-        reason = "not used in test, but useful to show how to use it"
-    )]
-    Error,
     Active,
 }

From 5fdef33a266e496b6818e2ce75a4d164d5d66125 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Mon, 25 Nov 2024 22:23:16 +0100
Subject: [PATCH 09/15] Add sub states to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ecc41a..0c61cfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 - support for Bevy 0.15
+- support for using sub states as loading states ([@mgi388](https://github.com/mgi388) in [#239](https://github.com/NiklasEi/bevy_asset_loader/pull/239))
 - custom `on_unimplemented` diagnostics for the `AssetCollection` trait
 - image derive attribute `array_texture_layers`
 - wait for dependencies of assets to load 

From b831fab5b5cf1d58a8227460e737ccb5e5bf3bd2 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Wed, 27 Nov 2024 22:03:04 +0100
Subject: [PATCH 10/15] Add image sampler address modes to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c61cfa..6077290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - support for Bevy 0.15
 - support for using sub states as loading states ([@mgi388](https://github.com/mgi388) in [#239](https://github.com/NiklasEi/bevy_asset_loader/pull/239))
+- support image sampler address modes for image assets ([@pcwalton](https://github.com/pcwalton) in [#238](https://github.com/NiklasEi/bevy_asset_loader/pull/238))
 - custom `on_unimplemented` diagnostics for the `AssetCollection` trait
 - image derive attribute `array_texture_layers`
 - wait for dependencies of assets to load 

From 36d6eb7384ee5b385f166d73d69ad296863b2c8e Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sat, 30 Nov 2024 20:31:39 +0100
Subject: [PATCH 11/15] Update Readme and bump first dependency versions

---
 README.md                           |  5 +++--
 bevy_asset_loader/Cargo.toml        | 12 ++++++------
 bevy_asset_loader_derive/Cargo.toml |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 98eddb3..fc15cc7 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ This [Bevy][bevy] plugin reduces boilerplate for handling game assets. The crate
 
 In most cases you will want to load your asset collections during loading states (think loading screens). During such a state, all assets are loaded and their loading progress is observed. Only when asset collections can be built with fully loaded asset handles, the collections are inserted to Bevy's ECS as resources. If you do not want to use a loading state, asset collections can still result in cleaner code and improved maintainability (see the ["usage without a loading state"](#usage-without-a-loading-state) section).
 
-_The `main` branch and the latest release support Bevy version `0.14` (see [version table](#compatible-bevy-versions))_
+_The `main` branch and the latest release support Bevy version `0.15` (see [version table](#compatible-bevy-versions))_
 
 ## Loading states
 
@@ -537,6 +537,7 @@ Compatibility of `bevy_asset_loader` versions:
 
 | Bevy version | `bevy_asset_loader` version |
 |:-------------|:----------------------------|
+| `0.15`       | `0.22`                      |
 | `0.14`       | `0.21`                      |
 | `0.13`       | `0.20`                      |
 | `0.12`       | `0.18` - `0.19`             |
@@ -547,7 +548,7 @@ Compatibility of `bevy_asset_loader` versions:
 | `0.7`        | `0.10` - `0.11`             |
 | `0.6`        | `0.8` - `0.9`               |
 | `0.5`        | `0.1` - `0.7`               |
-| `0.13`       | branch `main`               |
+| `0.15`       | branch `main`               |
 | `main`       | branch `bevy_main`          |
 
 ## License
diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
index 82b5153..9bc21b5 100644
--- a/bevy_asset_loader/Cargo.toml
+++ b/bevy_asset_loader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_asset_loader"
-version = "0.22.0-rc.1"
+version = "0.22.0"
 authors = ["Niklas Eicker <git@nikl.me>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"
@@ -22,20 +22,20 @@ standard_dynamic_assets = ["dep:bevy_common_assets", "dep:serde"]
 progress_tracking = ["dep:iyes_progress"]
 
 [dependencies]
-bevy = { version = "0.15.0-rc.1", default-features = false, features = ["bevy_asset", "bevy_state"] }
-bevy_asset_loader_derive = { version = "0.22.0-rc.1", path = "../bevy_asset_loader_derive" }
+bevy = { version = "0.15.0", default-features = false, features = ["bevy_asset", "bevy_state"] }
+bevy_asset_loader_derive = { version = "0.22.0", path = "../bevy_asset_loader_derive" }
 anyhow = "1"
 path-slash = "0.2"
 
-bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"], optional = true }
+bevy_common_assets = { version = "0.12.0", features = ["ron"], optional = true }
 serde = { version = "1", optional = true }
 iyes_progress = { version = "0.13.0-rc.1", optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.15.0-rc.1", features = ["vorbis"] }
+bevy = { version = "0.15.0", features = ["vorbis"] }
 anyhow = "1"
 iyes_progress = { version = "0.13.0-rc.1" }
-bevy_common_assets = { version = "0.12.0-rc.1", features = ["ron"] }
+bevy_common_assets = { version = "0.12.0", features = ["ron"] }
 serde = { version = "1" }
 ron = "0.8.1"
 trybuild = { version = "1.0" }
diff --git a/bevy_asset_loader_derive/Cargo.toml b/bevy_asset_loader_derive/Cargo.toml
index e9e7cda..3439ca7 100644
--- a/bevy_asset_loader_derive/Cargo.toml
+++ b/bevy_asset_loader_derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bevy_asset_loader_derive"
-version = "0.22.0-rc.1"
+version = "0.22.0"
 authors = ["Niklas Eicker <git@nikl.me>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

From 75c2d8214b987db6f0ae335357ed6c790ae2bc1d Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sun, 1 Dec 2024 20:17:41 +0100
Subject: [PATCH 12/15] Bump iyes_progress

---
 bevy_asset_loader/Cargo.toml                    |  4 ++--
 bevy_asset_loader/examples/progress_tracking.rs | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
index 9bc21b5..2de0cb3 100644
--- a/bevy_asset_loader/Cargo.toml
+++ b/bevy_asset_loader/Cargo.toml
@@ -29,12 +29,12 @@ path-slash = "0.2"
 
 bevy_common_assets = { version = "0.12.0", features = ["ron"], optional = true }
 serde = { version = "1", optional = true }
-iyes_progress = { version = "0.13.0-rc.1", optional = true }
+iyes_progress = { version = "0.13.0", optional = true }
 
 [dev-dependencies]
 bevy = { version = "0.15.0", features = ["vorbis"] }
 anyhow = "1"
-iyes_progress = { version = "0.13.0-rc.1" }
+iyes_progress = { version = "0.13.0" }
 bevy_common_assets = { version = "0.12.0", features = ["ron"] }
 serde = { version = "1" }
 ron = "0.8.1"
diff --git a/bevy_asset_loader/examples/progress_tracking.rs b/bevy_asset_loader/examples/progress_tracking.rs
index 5e661f6..d390be5 100644
--- a/bevy_asset_loader/examples/progress_tracking.rs
+++ b/bevy_asset_loader/examples/progress_tracking.rs
@@ -26,6 +26,7 @@ fn main() {
                 .load_collection::<TextureAssets>()
                 .load_collection::<AudioAssets>(),
         )
+        .add_systems(OnEnter(MyStates::AssetLoading), render_description)
         // gracefully quit the app when `MyStates::Next` is reached
         .add_systems(OnEnter(MyStates::Next), expect)
         .add_systems(
@@ -66,6 +67,16 @@ struct TextureAssets {
     female_adventurer_layout: Handle<TextureAtlasLayout>,
 }
 
+fn render_description(mut commands: Commands) {
+    commands.spawn(Camera2d::default());
+    commands.spawn(Text::new(
+        r#"
+    See the console for progress output
+    
+    This window will close when progress completes..."#,
+    ));
+}
+
 fn track_fake_long_task(time: Res<Time>) -> Progress {
     if time.elapsed_secs_f64() > DURATION_LONG_TASK_IN_SECS {
         info!("Long fake task is completed");

From 82292102e79333ba7d973f2da1607117342e4602 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sun, 1 Dec 2024 20:19:27 +0100
Subject: [PATCH 13/15] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6077290..0e80879 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+## v0.22.0 - 01.12.2024
 - support for Bevy 0.15
 - support for using sub states as loading states ([@mgi388](https://github.com/mgi388) in [#239](https://github.com/NiklasEi/bevy_asset_loader/pull/239))
 - support image sampler address modes for image assets ([@pcwalton](https://github.com/pcwalton) in [#238](https://github.com/NiklasEi/bevy_asset_loader/pull/238))

From cd9bf5dd7d78e436f1c2c0bb98506ea9dff59319 Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sun, 1 Dec 2024 20:25:27 +0100
Subject: [PATCH 14/15] Move bevy image imports

---
 bevy_asset_loader/examples/full_collection.rs         | 2 +-
 bevy_asset_loader/examples/full_dynamic_collection.rs | 9 ++++-----
 bevy_asset_loader/examples/progress_tracking.rs       | 2 +-
 bevy_asset_loader/src/standard_dynamic_asset.rs       | 4 +---
 bevy_asset_loader_derive/src/assets.rs                | 6 +++---
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/bevy_asset_loader/examples/full_collection.rs b/bevy_asset_loader/examples/full_collection.rs
index 115e890..f90e976 100644
--- a/bevy_asset_loader/examples/full_collection.rs
+++ b/bevy_asset_loader/examples/full_collection.rs
@@ -1,7 +1,7 @@
 use bevy::app::AppExit;
 use bevy::asset::UntypedAssetId;
+use bevy::image::{ImageSampler, ImageSamplerDescriptor};
 use bevy::prelude::*;
-use bevy::render::texture::{ImageSampler, ImageSamplerDescriptor};
 use bevy::utils::HashMap;
 use bevy_asset_loader::prelude::*;
 
diff --git a/bevy_asset_loader/examples/full_dynamic_collection.rs b/bevy_asset_loader/examples/full_dynamic_collection.rs
index 3a3d0a7..4a8a9c3 100644
--- a/bevy_asset_loader/examples/full_dynamic_collection.rs
+++ b/bevy_asset_loader/examples/full_dynamic_collection.rs
@@ -1,14 +1,13 @@
+//! This example requires the `standard_dynamic_assets` feature for loading the ron file
+//! and the `2d` and `3d` features for `TextureAtlas` and `StandardMaterial` dynamic assets.
+//! It showcases all possible configurations for dynamic assets.
 use bevy::app::AppExit;
 use bevy::asset::UntypedAssetId;
+use bevy::image::{ImageAddressMode, ImageSampler, ImageSamplerDescriptor};
 use bevy::prelude::*;
-use bevy::render::texture::{ImageAddressMode, ImageSampler, ImageSamplerDescriptor};
 use bevy::utils::HashMap;
 use bevy_asset_loader::prelude::*;
 
-/// This example requires the `standard_dynamic_assets` feature for loading the ron file
-/// and the `2d` and `3d` features for `TextureAtlas` and `StandardMaterial` dynamic assets.
-/// It showcases all possible configurations for dynamic assets.
-
 const FOLDER_SIZE: usize = 8;
 
 fn main() {
diff --git a/bevy_asset_loader/examples/progress_tracking.rs b/bevy_asset_loader/examples/progress_tracking.rs
index d390be5..1c7313a 100644
--- a/bevy_asset_loader/examples/progress_tracking.rs
+++ b/bevy_asset_loader/examples/progress_tracking.rs
@@ -68,7 +68,7 @@ struct TextureAssets {
 }
 
 fn render_description(mut commands: Commands) {
-    commands.spawn(Camera2d::default());
+    commands.spawn(Camera2d);
     commands.spawn(Text::new(
         r#"
     See the console for progress output
diff --git a/bevy_asset_loader/src/standard_dynamic_asset.rs b/bevy_asset_loader/src/standard_dynamic_asset.rs
index 55e3f84..e858450 100644
--- a/bevy_asset_loader/src/standard_dynamic_asset.rs
+++ b/bevy_asset_loader/src/standard_dynamic_asset.rs
@@ -18,9 +18,7 @@ use bevy::sprite::TextureAtlasLayout;
 #[cfg(any(feature = "3d", feature = "2d"))]
 use bevy::ecs::change_detection::ResMut;
 #[cfg(any(feature = "3d", feature = "2d"))]
-use bevy::render::texture::{
-    Image, ImageAddressMode, ImageFilterMode, ImageSampler, ImageSamplerDescriptor,
-};
+use bevy::image::{Image, ImageAddressMode, ImageFilterMode, ImageSampler, ImageSamplerDescriptor};
 
 /// These asset variants can be loaded from configuration files. They will then replace
 /// a dynamic asset based on their keys.
diff --git a/bevy_asset_loader_derive/src/assets.rs b/bevy_asset_loader_derive/src/assets.rs
index dafba20..89c0011 100644
--- a/bevy_asset_loader_derive/src/assets.rs
+++ b/bevy_asset_loader_derive/src/assets.rs
@@ -155,7 +155,7 @@ impl AssetField {
                 let label = Lit::Str(LitStr::new(&field_ident.to_string(), token_stream.span()));
 
                 quote!(#token_stream #field_ident : {
-                    use bevy::render::texture::{ImageAddressMode, ImageFilterMode, ImageSampler, ImageSamplerDescriptor};
+                    use bevy::image::{ImageAddressMode, ImageFilterMode, ImageSampler, ImageSamplerDescriptor};
                     let mut system_state = ::bevy::ecs::system::SystemState::<(
                         ResMut<::bevy::prelude::Assets<::bevy::prelude::Image>>,
                         Res<::bevy::prelude::AssetServer>,
@@ -282,7 +282,7 @@ impl AssetField {
                         Res<::bevy::prelude::AssetServer>,
                     )>::new(world);
                     let (mut materials, asset_server) = system_state.get_mut(world);
-                    materials.add(::bevy::pbr::StandardMaterial::from(asset_server.load::<::bevy::render::texture::Image>(#asset_path)))
+                    materials.add(::bevy::pbr::StandardMaterial::from(asset_server.load::<::bevy::image::Image>(#asset_path)))
                 },)
             }
             AssetField::TextureAtlasLayout(texture_atlas) => {
@@ -537,7 +537,7 @@ impl AssetField {
                 let asset_path = asset_path.clone();
                 quote!(#token_stream {
                     let asset_server = world.get_resource::<::bevy::prelude::AssetServer>().expect("Cannot get AssetServer");
-                    handles.push(asset_server.load::<::bevy::render::texture::Image>(#asset_path).untyped());
+                    handles.push(asset_server.load::<::bevy::image::Image>(#asset_path).untyped());
                 })
             }
             AssetField::Files(assets, _, _) => {

From b273b13519b6ed00d9e47640a0ce3671a4d1625a Mon Sep 17 00:00:00 2001
From: Niklas Eicker <git@nikl.me>
Date: Sun, 1 Dec 2024 20:41:03 +0100
Subject: [PATCH 15/15] Enable bevy/png for 2d and 3d features

---
 bevy_asset_loader/Cargo.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bevy_asset_loader/Cargo.toml b/bevy_asset_loader/Cargo.toml
index 2de0cb3..83dddd2 100644
--- a/bevy_asset_loader/Cargo.toml
+++ b/bevy_asset_loader/Cargo.toml
@@ -15,9 +15,9 @@ readme = "README.md"
 
 [features]
 # This feature adds support for bevy's TextureAtlas assets
-2d = ["bevy/bevy_sprite", "bevy_asset_loader_derive/2d"]
+2d = ["bevy/bevy_sprite", "bevy/png", "bevy_asset_loader_derive/2d"]
 # This feature adds support for bevy's StandardMaterial assets
-3d = ["bevy/bevy_pbr", "bevy_asset_loader_derive/3d"]
+3d = ["bevy/bevy_pbr", "bevy/png", "bevy_asset_loader_derive/3d"]
 standard_dynamic_assets = ["dep:bevy_common_assets", "dep:serde"]
 progress_tracking = ["dep:iyes_progress"]