dep: change from bevy_ecs etc to bevy

Cargo.toml

@@ -49,33 +49,8 @@ sweet = { path = "./crates/sweet", version = "0.*" }
 sweet_macros = { path = "./crates/sweet/macros", version = "0.*" }
 
 ### game ###
-# bevy = { version = "0.13.*" }
-# bevy_app = { version = "0.13.*" }
-# bevy_core = { version = "0.13.*" }
-# bevy_derive = { version = "0.13.*" }
-# bevy_ecs = { version = "0.13.*" }
-# bevy_hierarchy = { version = "0.13.*" }
-# bevy_math = { version = "0.13.*" }
-# bevy_reflect = { version = "0.13.*" }
-# bevy_time = { version = "0.13.*" }
-# bevy_transform = { version = "0.13.*" }
-# bevy_utils = { version = "0.13.*" }
-
 # recursive type registration https://github.com/bevyengine/bevy/tree/d3e44325b45daf13087a6fe7a425b1744b5f2379
-bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_app = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_core = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_derive = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_ecs = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_hierarchy = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_math = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_reflect = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_scene = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_tasks = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_time = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_transform = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-bevy_utils = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379" }
-
+bevy = { git = "https://github.com/bevyengine/bevy.git", rev = "d3e44325b45daf13087a6fe7a425b1744b5f2379", default-features = false }
 
 bevy-inspector-egui = "0.23.4"
 bevy_mod_debugdump = "0.10.0"

crates/forky/forky_ai/src/chat/mod.rs

@@ -1,9 +1,9 @@
 pub mod chat_gpt;
 #[allow(unused_imports)]
 pub use self::chat_gpt::*;
-pub mod llm;
-#[allow(unused_imports)]
-pub use self::llm::*;
 pub mod hello_world;
 #[allow(unused_imports)]
 pub use self::hello_world::*;
+pub mod llm;
+#[allow(unused_imports)]
+pub use self::llm::*;

crates/forky/forky_bevy/Cargo.toml

@@ -11,14 +11,7 @@ repository = { workspace = true }
 
 [dependencies]
 forky_core = { workspace = true }
-bevy_app = { workspace = true }
-bevy_derive = { workspace = true }
-bevy_ecs = { workspace = true }
-bevy_math = { workspace = true }
-bevy_time = { workspace = true }
-bevy_transform = { workspace = true }
-bevy_hierarchy = { workspace = true }
-bevy_utils = { workspace = true }
+bevy = { workspace = true }
 rand = { workspace = true }
 # bevy = { workspace = true, optional = true }
 

crates/forky/forky_bevy/src/extensions/app.rs

@@ -1,5 +1,5 @@
 use crate::prelude::*;
-use bevy_app::prelude::*;
+use bevy::prelude::*;
 use extend::ext;
 use forky_core::RcCell;
 

crates/forky/forky_bevy/src/extensions/app_res.rs

@@ -1,6 +1,4 @@
-use bevy_app::prelude::*;
-use bevy_derive::Deref;
-use bevy_derive::DerefMut;
+use bevy::prelude::*;
 use extend::ext;
 use forky_core::*;
 

crates/forky/forky_bevy/src/extensions/map.rs

@@ -1,4 +1,4 @@
-use bevy_utils::HashMap;
+use bevy::utils::HashMap;
 use extend::ext;
 use std::hash::Hash;
 

crates/forky/forky_bevy/src/extensions/mod.rs

@@ -1,24 +1,24 @@
-pub mod vec;
-#[allow(unused_imports)]
-pub use self::vec::*;
-pub mod transform_x;
-#[allow(unused_imports)]
-pub use self::transform_x::*;
 pub mod app;
 #[allow(unused_imports)]
 pub use self::app::*;
-pub mod quat;
+pub mod app_res;
 #[allow(unused_imports)]
-pub use self::quat::*;
+pub use self::app_res::*;
 pub mod global_transform;
 #[allow(unused_imports)]
 pub use self::global_transform::*;
 pub mod map;
 #[allow(unused_imports)]
 pub use self::map::*;
-pub mod app_res;
-#[allow(unused_imports)]
-pub use self::app_res::*;
 pub mod pose;
 #[allow(unused_imports)]
 pub use self::pose::*;
+pub mod quat;
+#[allow(unused_imports)]
+pub use self::quat::*;
+pub mod transform_x;
+#[allow(unused_imports)]
+pub use self::transform_x::*;
+pub mod vec;
+#[allow(unused_imports)]
+pub use self::vec::*;

crates/forky/forky_bevy/src/extensions/pose.rs

@@ -1,5 +1,5 @@
-use bevy_math::prelude::*;
-use bevy_transform::prelude::*;
+use bevy::prelude::*;
+
 
 #[derive(Debug)]
 pub struct Pose {

crates/forky/forky_bevy/src/extensions/quat.rs

@@ -1,4 +1,4 @@
-use bevy_math::prelude::*;
+use bevy::prelude::*;
 use extend::ext;
 use forky_core::*;
 

crates/forky/forky_bevy/src/extensions/transform_x.rs

@@ -1,6 +1,5 @@
 use crate::prelude::*;
-use bevy_math::prelude::*;
-use bevy_transform::prelude::*;
+use bevy::prelude::*;
 use extend::ext;
 
 #[ext]

crates/forky/forky_bevy/src/extensions/vec.rs

@@ -1,4 +1,4 @@
-use bevy_math::prelude::*;
+use bevy::prelude::*;
 use extend::ext;
 use rand::Rng;
 use std::f32::consts::PI;

crates/forky/forky_bevy/src/lib.rs

@@ -1,10 +1,8 @@
-pub mod components;
 pub mod extensions;
 // pub mod systems;
 
 
 pub mod prelude {
-	pub use crate::components::*;
 	pub use crate::extensions::*;
 	// pub use crate::systems::*;
 }

crates/forky/forky_bevy/src/systems/exit_system.rs

@@ -1,5 +1,5 @@
-use bevy_app::AppExit;
-use bevy_core::FrameCount;
+use bevy::prelude::*;
+
 
 pub fn exit_system(mut exit: EventWriter<AppExit>) { exit.send(AppExit); }
 pub fn exit_in_frames(

crates/forky/forky_bevy/test/extensions/mod.rs

@@ -1,9 +1,9 @@
-pub mod vec;
-#[allow(unused_imports)]
-pub use self::vec::*;
 pub mod app;
 #[allow(unused_imports)]
 pub use self::app::*;
 pub mod quat;
 #[allow(unused_imports)]
 pub use self::quat::*;
+pub mod vec;
+#[allow(unused_imports)]
+pub use self::vec::*;

crates/forky/forky_bevy/test/extensions/quat.rs

@@ -1,5 +1,4 @@
-use bevy_app::prelude::*;
-use bevy_math::prelude::*;
+use bevy::prelude::*;
 use forky_bevy::prelude::*;
 use sweet::*;
 

crates/forky/forky_bevy/test/extensions/vec.rs

@@ -1,4 +1,4 @@
-use bevy_math::prelude::*;
+use bevy::prelude::*;
 use forky_bevy::prelude::*;
 use sweet::*;
 

crates/forky/forky_cli/src/server/mod.rs

@@ -1,15 +1,15 @@
-pub mod proxy;
-#[allow(unused_imports)]
-pub use self::proxy::*;
-pub mod tls;
-#[allow(unused_imports)]
-pub use self::tls::*;
 pub mod address;
 #[allow(unused_imports)]
 pub use self::address::*;
+pub mod command;
+#[allow(unused_imports)]
+pub use self::command::*;
+pub mod proxy;
+#[allow(unused_imports)]
+pub use self::proxy::*;
 pub mod server;
 #[allow(unused_imports)]
 pub use self::server::*;
-pub mod command;
+pub mod tls;
 #[allow(unused_imports)]
-pub use self::command::*;
+pub use self::tls::*;

crates/forky/forky_cli/src/style/mod.rs

@@ -1,21 +1,21 @@
-pub mod command_all;
-#[allow(unused_imports)]
-pub use self::command_all::*;
-pub mod lightning;
-#[allow(unused_imports)]
-pub use self::lightning::*;
-pub mod command_file;
-#[allow(unused_imports)]
-pub use self::command_file::*;
-pub mod type_files;
-#[allow(unused_imports)]
-pub use self::type_files::*;
 pub mod cli_all;
 #[allow(unused_imports)]
 pub use self::cli_all::*;
 pub mod command;
 #[allow(unused_imports)]
 pub use self::command::*;
+pub mod command_all;
+#[allow(unused_imports)]
+pub use self::command_all::*;
+pub mod command_file;
+#[allow(unused_imports)]
+pub use self::command_file::*;
 pub mod index_files;
 #[allow(unused_imports)]
 pub use self::index_files::*;
+pub mod lightning;
+#[allow(unused_imports)]
+pub use self::lightning::*;
+pub mod type_files;
+#[allow(unused_imports)]
+pub use self::type_files::*;

crates/forky/forky_cli/test/files/test_dir/mod.rs

@@ -1,7 +1,7 @@
 pub mod test_mod;
 #[allow(unused_imports)]
 pub use self::test_mod::*;
+pub mod _test_use;
 pub mod __test_sub_dir;
 #[allow(unused_imports)]
 pub use self::__test_sub_dir::*;
-pub mod _test_use;

crates/forky/forky_core/src/extensions/mod.rs

@@ -1,27 +1,27 @@
-pub mod num_x;
-#[allow(unused_imports)]
-pub use self::num_x::*;
-pub mod path_buf;
-#[allow(unused_imports)]
-pub use self::path_buf::*;
-pub mod vec;
-#[allow(unused_imports)]
-pub use self::vec::*;
 pub mod duration;
 #[allow(unused_imports)]
 pub use self::duration::*;
-pub mod str_x;
+pub mod num_x;
 #[allow(unused_imports)]
-pub use self::str_x::*;
+pub use self::num_x::*;
+pub mod option;
+#[allow(unused_imports)]
+pub use self::option::*;
 pub mod path;
 #[allow(unused_imports)]
 pub use self::path::*;
-pub mod string;
+pub mod path_buf;
 #[allow(unused_imports)]
-pub use self::string::*;
+pub use self::path_buf::*;
 pub mod result_x;
 #[allow(unused_imports)]
 pub use self::result_x::*;
-pub mod option;
+pub mod string;
 #[allow(unused_imports)]
-pub use self::option::*;
+pub use self::string::*;
+pub mod str_x;
+#[allow(unused_imports)]
+pub use self::str_x::*;
+pub mod vec;
+#[allow(unused_imports)]
+pub use self::vec::*;

crates/forky/forky_core/src/math/mod.rs

@@ -1,6 +1,6 @@
-pub mod funcs;
-#[allow(unused_imports)]
-pub use self::funcs::*;
 pub mod constants;
 #[allow(unused_imports)]
 pub use self::constants::*;
+pub mod funcs;
+#[allow(unused_imports)]
+pub use self::funcs::*;

crates/forky/forky_core/src/math_f64/mod.rs

@@ -1,6 +1,6 @@
-pub mod funcs;
-#[allow(unused_imports)]
-pub use self::funcs::*;
 pub mod constants;
 #[allow(unused_imports)]
 pub use self::constants::*;
+pub mod funcs;
+#[allow(unused_imports)]
+pub use self::funcs::*;

crates/forky/forky_core/src/utils/mod.rs

@@ -1,6 +1,6 @@
-pub mod drop_utils;
-#[allow(unused_imports)]
-pub use self::drop_utils::*;
 pub mod async_utils;
 #[allow(unused_imports)]
 pub use self::async_utils::*;
+pub mod drop_utils;
+#[allow(unused_imports)]
+pub use self::drop_utils::*;

crates/forky/forky_core/test/extensions/mod.rs

@@ -1,12 +1,12 @@
 pub mod num_x;
 #[allow(unused_imports)]
 pub use self::num_x::*;
-pub mod vec;
+pub mod path;
 #[allow(unused_imports)]
-pub use self::vec::*;
+pub use self::path::*;
 pub mod str_x;
 #[allow(unused_imports)]
 pub use self::str_x::*;
-pub mod path;
+pub mod vec;
 #[allow(unused_imports)]
-pub use self::path::*;
+pub use self::vec::*;

crates/forky/forky_core/test/mod.rs

@@ -1,6 +1,6 @@
+pub mod extensions;
+pub mod forky_event;
 pub mod graph;
+pub mod math;
 pub mod misc;
 pub mod pointers;
-pub mod math;
-pub mod forky_event;
-pub mod extensions;

crates/forky/forky_esp/src/_core/mod.rs

@@ -1,6 +1,6 @@
-pub mod _timer;
-pub mod _smart_leds_adapter_rgbw;
 pub mod _esp_device;
 pub mod _led_controller_rgb;
-pub mod _logger;
 pub mod _led_controller_rgbw;
+pub mod _logger;
+pub mod _smart_leds_adapter_rgbw;
+pub mod _timer;