Depend on bevy subcrates directly

bevy_asset_loader/Cargo.toml

@@ -15,14 +15,29 @@ readme = "README.md"
 
 [features]
 # This feature adds support for bevy's TextureAtlas assets
-2d = ["bevy/bevy_sprite", "bevy_asset_loader_derive/2d"]
+2d = [
+    "dep:bevy_math",
+    "dep:bevy_render",
+    "dep:bevy_sprite",
+    "bevy_asset_loader_derive/2d",
+]
 # This feature adds support for bevy's StandardMaterial assets
-3d = ["bevy/bevy_pbr", "bevy_asset_loader_derive/3d"]
+3d = ["dep:bevy_pbr", "dep:bevy_render", "bevy_asset_loader_derive/3d"]
 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_app = "0.14"
+bevy_asset = "0.14"
+bevy_ecs = "0.14"
+bevy_log = "0.14"
+bevy_math = { version = "0.14", optional = true }
+bevy_pbr = { version = "0.14", optional = true }
+bevy_reflect = "0.14"
+bevy_render = { version = "0.14", optional = true }
+bevy_sprite = { version = "0.14", optional = true }
+bevy_state = "0.14"
+bevy_utils = "0.14"
 bevy_asset_loader_derive = { version = "=0.21.0", path = "../bevy_asset_loader_derive" }
 anyhow = "1"
 path-slash = "0.2"

bevy_asset_loader/src/asset_collection.rs

@@ -1,8 +1,8 @@
 use crate::dynamic_asset::DynamicAssets;
-use bevy::app::App;
-use bevy::asset::UntypedHandle;
-use bevy::ecs::system::Resource;
-use bevy::ecs::world::World;
+use bevy_app::App;
+use bevy_asset::UntypedHandle;
+use bevy_ecs::system::Resource;
+use bevy_ecs::world::World;
 
 pub use bevy_asset_loader_derive::AssetCollection;
 

bevy_asset_loader/src/dynamic_asset.rs

@@ -1,11 +1,11 @@
-use bevy::utils::HashMap;
 use std::any::TypeId;
 use std::fmt::Debug;
 
-use bevy::asset::{Asset, AssetServer, UntypedHandle};
-use bevy::ecs::system::Resource;
-use bevy::ecs::world::World;
-use bevy::state::state::FreelyMutableState;
+use bevy_asset::{Asset, AssetServer, UntypedHandle};
+use bevy_ecs::system::Resource;
+use bevy_ecs::world::World;
+use bevy_state::state::FreelyMutableState;
+use bevy_utils::HashMap;
 use std::marker::PhantomData;
 
 /// Different typed that can generate the asset field value of a dynamic asset

bevy_asset_loader/src/loading_state.rs

@@ -4,18 +4,16 @@ mod systems;
 /// Configuration of loading states
 pub mod config;
 
-use bevy::app::{App, Plugin};
-use bevy::asset::{Asset, UntypedHandle};
-use bevy::ecs::{
-    schedule::{
-        InternedScheduleLabel, IntoSystemConfigs, IntoSystemSetConfigs, ScheduleLabel, SystemSet,
-    },
-    system::Resource,
-    world::FromWorld,
+use bevy_app::{App, Plugin, Update};
+use bevy_asset::{Asset, UntypedHandle};
+use bevy_ecs::schedule::{
+    InternedScheduleLabel, IntoSystemConfigs, IntoSystemSetConfigs, ScheduleLabel, SystemSet,
 };
-use bevy::prelude::{in_state, NextState, OnEnter, State, StateTransition, States, Update};
-use bevy::state::state::FreelyMutableState;
-use bevy::utils::{default, HashMap, HashSet};
+use bevy_ecs::system::Resource;
+use bevy_ecs::world::FromWorld;
+use bevy_state::condition::in_state;
+use bevy_state::state::{FreelyMutableState, NextState, OnEnter, State, StateTransition, States};
+use bevy_utils::{default, HashMap, HashSet};
 use std::any::TypeId;
 use std::marker::PhantomData;
 

bevy_asset_loader/src/loading_state/config.rs

@@ -10,12 +10,14 @@ use crate::loading_state::{
     InternalLoadingState, InternalLoadingStateSet, LoadingStateSchedule,
     OnEnterInternalLoadingState,
 };
-use bevy::app::App;
-use bevy::asset::Asset;
-use bevy::ecs::schedule::SystemConfigs;
-use bevy::prelude::{default, FromWorld, IntoSystemConfigs, Resource};
-use bevy::state::state::FreelyMutableState;
-use bevy::utils::HashMap;
+use bevy_app::App;
+use bevy_asset::Asset;
+use bevy_ecs::schedule::{IntoSystemConfigs, SystemConfigs};
+use bevy_ecs::system::Resource;
+use bevy_ecs::world::FromWorld;
+use bevy_state::state::FreelyMutableState;
+use bevy_utils::default;
+use bevy_utils::HashMap;
 use std::any::TypeId;
 
 /// Methods to configure a loading state

bevy_asset_loader/src/loading_state/dynamic_asset_systems.rs

@@ -1,12 +1,11 @@
 use crate::dynamic_asset::{DynamicAssetCollection, DynamicAssetCollections, DynamicAssets};
 use crate::loading_state::{AssetLoaderConfiguration, InternalLoadingState, LoadingAssetHandles};
-use bevy::asset::{Asset, AssetServer, Assets, LoadState};
-use bevy::ecs::change_detection::ResMut;
-use bevy::ecs::system::{Res, SystemState};
-use bevy::ecs::world::World;
-use bevy::log::{debug, warn};
-use bevy::prelude::NextState;
-use bevy::state::state::{FreelyMutableState, State};
+use bevy_asset::{Asset, AssetServer, Assets, LoadState};
+use bevy_ecs::change_detection::ResMut;
+use bevy_ecs::system::{Res, SystemState};
+use bevy_ecs::world::World;
+use bevy_log::{debug, warn};
+use bevy_state::state::{FreelyMutableState, NextState, State};
 use std::any::{type_name, TypeId};
 
 #[allow(clippy::type_complexity)]

bevy_asset_loader/src/loading_state/systems.rs

@@ -1,9 +1,9 @@
-use bevy::asset::{AssetServer, RecursiveDependencyLoadState};
-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};
+use bevy_asset::{AssetServer, RecursiveDependencyLoadState};
+use bevy_ecs::schedule::Schedules;
+use bevy_ecs::system::{Res, ResMut, Resource, SystemState};
+use bevy_ecs::world::{FromWorld, World};
+use bevy_log::{debug, info, trace, warn};
+use bevy_state::state::{FreelyMutableState, NextState, State};
 use std::any::{type_name, TypeId};
 use std::marker::PhantomData;
 

bevy_asset_loader/src/mapped.rs

@@ -1,6 +1,6 @@
 use std::borrow::Borrow;
 
-use bevy::asset::AssetPath;
+use bevy_asset::AssetPath;
 
 /// A type that can be used as key for mapped asset collection.
 ///

bevy_asset_loader/src/standard_dynamic_asset.rs

@@ -1,22 +1,22 @@
 use crate::dynamic_asset::{DynamicAsset, DynamicAssetType};
 use crate::dynamic_asset::{DynamicAssetCollection, DynamicAssets};
-use bevy::asset::{Asset, AssetServer, Assets, LoadedFolder, UntypedHandle};
-use bevy::ecs::system::SystemState;
-use bevy::ecs::world::{Command, World};
-use bevy::reflect::TypePath;
-use bevy::utils::HashMap;
+use bevy_asset::{Asset, AssetServer, Assets, LoadedFolder, UntypedHandle};
+use bevy_ecs::system::{Res, ResMut, SystemState};
+use bevy_ecs::world::{Command, World};
+use bevy_reflect::TypePath;
+use bevy_utils::HashMap;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "2d")]
-use bevy::math::UVec2;
-#[cfg(feature = "3d")]
-use bevy::pbr::StandardMaterial;
-use bevy::prelude::{Res, ResMut};
+use bevy_math::UVec2;
 #[cfg(feature = "2d")]
-use bevy::sprite::TextureAtlasLayout;
+use bevy_sprite::TextureAtlasLayout;
+
+#[cfg(feature = "3d")]
+use bevy_pbr::StandardMaterial;
 
 #[cfg(any(feature = "3d", feature = "2d"))]
-use bevy::render::texture::{Image, ImageSampler, ImageSamplerDescriptor};
+use bevy_render::texture::{Image, ImageSampler, ImageSamplerDescriptor};
 
 /// These asset variants can be loaded from configuration files. They will then replace
 /// a dynamic asset based on their keys.
@@ -270,7 +270,7 @@ impl DynamicAsset for StandardDynamicAsset {
 #[cfg(any(feature = "3d", feature = "2d"))]
 impl StandardDynamicAsset {
     fn update_image_sampler(
-        handle: &mut bevy::asset::Handle<Image>,
+        handle: &mut bevy_asset::Handle<Image>,
         images: &mut Assets<Image>,
         sampler_type: &ImageSamplerType,
     ) {