some changes

Cargo.toml

@@ -14,6 +14,9 @@ license = "MIT"
 keywords = ["gamedev"]
 publish = false
 
+[lib]
+path = "src/lib.rs"
+
 [[bin]]
 name = "separated"
 path = "src/app/main.rs"
@@ -73,7 +76,7 @@ dev_features = [
   "bevy/trace",
   "bevy/file_watcher",
   "bevy/embedded_watcher",
-  #"bevy_progress/debug",
+  #"iyes_progress/debug",
   "bevy_rapier2d/debug-render-2d",
   #"big-brain/trace",
   #"sickle_ui/dev",
@@ -105,22 +108,22 @@ leafwing-input-manager = { git = "https://github.com/ka-de/input-manager", branc
 ] }
 # ⚠️ TODO: Use the `sys-locale` crate instead, also maybe figure out how to query Steamworks later! 
 # cargo add sys-locale
-#bevy_device_lang = { git = "https://github.com/ka-de/bevy_device_lang", branch = "0.14" }
-#aery = { git = "https://github.com/ka-de/aery", branch = "0.14" }
-#bevy_vector_shapes = { git = "https://github.com/ka-de/bevy_vector_shapes", branch = "0.14" }
-#big-brain = { git = "https://github.com/ka-de/big-brain" }
+aery = { git = "https://github.com/ka-de/aery" }
+#bevy_vector_shapes = { git = "https://github.com/ka-de/bevy_vector_shapes" }
+big-brain = { git = "https://github.com/ka-de/big-brain" }
 bevy_mod_debugdump = { git = "https://github.com/ka-de/bevy_mod_debugdump", optional = true }
 graphviz-rust = { version = "0.9.0", optional = true }
 seldom_state = { git = "https://github.com/ka-de/seldom_state" }
-# bevy_text_input = { git = "https://github.com/ka-de/bevy_text_input", branch = "0.14" }
-# bevy_flurx = { git = "https://github.com/ka-de/bevy_flurx", branch = "0.14" }
-# bevy_magic_light_2d = { git = "https://github.com/ka-de/bevy_magic_light_2d", branch = "0.14" }
-#bevy_incandescent = { git = "https://github.com/ka-de/bevy_incandescent", branch = "0.14", features = [
+bevy_simple_text_input = { git = "https://github.com/ka-de/bevy_text_input" }
+# bevy_flurx = { git = "https://github.com/ka-de/bevy_flurx" }
+# bevy_magic_light_2d = { git = "https://github.com/ka-de/bevy_magic_light_2d" }
+#bevy_incandescent = { git = "https://github.com/ka-de/bevy_incandescent", features = [
 #  "debug",
 #  "ray_marching",
 #] }
 #bevy_reflect_utils = { git = "https://github.com/ka-de/bevy_reflect_utils" }
-bevy_mod_aseprite = { git = "https://github.com/ka-de/bevy_mod_aseprite" }
+# ⚠️  TODO: No 0.14 update yet!
+#bevy_mod_aseprite = { git = "https://github.com/ka-de/bevy_mod_aseprite" }
 # This gets rid of the excessive logging from wgpu clogging my trace performance.
 log = { version = "0.4.22", features = [
   "max_level_debug",
@@ -162,14 +165,13 @@ features = [
   "sysinfo_plugin",       # ⚠️ OwO whats this?
 ]
 
-# ☠️ RIP?
-#[dependencies.bevy_asset_loader]
-#git = "https://github.com/ka-de/bevy_asset_loader"
-#branch = "0.14"
-#default-features = false
-#features = ["2d", "standard_dynamic_assets", "progress_tracking"]
+[dependencies.bevy_asset_loader]
+git = "https://github.com/ka-de/bevy_asset_loader"
+default-features = false
+features = ["2d", "standard_dynamic_assets", "progress_tracking"]
 
 [dependencies.bevy_ecs_ldtk]
+#git = "https://github.com/Trouv/bevy_ecs_ldtk"
 git = "https://github.com/ka-de/bevy_ecs_ldtk"
 branch = "0.14"
 
@@ -182,11 +184,10 @@ features = ["highlight_changes"]
 #[dependencies.bevy_tweening]
 #git = "https://github.com/ka-de/bevy_tweening"
 
-#[dependencies.bevy_progress]
-#git = "https://github.com/ka-de/bevy_progress"
-#branch = "0.14"
-#features = ["assets"]
-#default-features = false
+[dependencies.iyes_progress]
+git = "https://github.com/ka-de/iyes_progress"
+features = ["assets"]
+default-features = false
 
 #[dependencies.bevy-steamworks]
 #git = "https://github.com/ka-de/bevy_steamworks"

README.md

@@ -229,7 +229,7 @@ This command generates documentation for the package with all features enabled,
 // `input-manager` handles the input.
 
 use bevy::prelude::*;
-use input_manager::{ axislike::VirtualAxis, prelude::* };
+use leafwing_input_manager::{ axislike::VirtualAxis, prelude::* };
 use seldom_state::prelude::*;
 
 fn main() {

assets/dialogues/definitions.yarn

@@ -1,9 +0,0 @@
-===
-//==================================================================================//
-// Definitions
-//==================================================================================//
-// - Rubicon
-// ---
-// 		The phrase “crossing the Rubicon” is an idiom that means “passing a point of no return”. Its meaning comes from an event in early January 49 BC when Julius Caesar crossed the Rubicon river, which was considered an act of war. This act sparked a three-year civil war that ultimately left Julius Caesar the undisputed ruler of the Roman world.
-// 		In a broader sense, “Rubicon” is used to refer to a limit or point that, once crossed, commits a person irrevocably to a particular course of action. It's often used to signify a point of no return or a critical decision point.
-//		In Games: In some games, a “rubicon” is an act of winning a game against an opponent whose total score is less than 100, in which case the loser's score is added to rather than subtracted from the winner's.

assets/dialogues/the_treachery.yarn

@@ -0,0 +1,19 @@
+title: The_Treachery
+position: 276,-65
+---
+Player: Why did you cross the Rubicon?
+Morgath: Only the council knew of the treachery and someone had to be blamed..
+Morgath: The choice was between you, and another child.
+Morgath: After the meeting, I went to seek the elder's wisdom..
+Morgath: He told me that the answers I was seeking was hidden in the dark forest.
+Morgath: I didn't know what to do. I had no intention of going back to the forest, I was scared and in my haste I chose to blame you and cast your family into the exile.
+Player: Okay, but why go on this journey all those years later?
+Morgath: I don't know... I don't know!
+Morgath: It got to me, all this time, only me keeping this dark secret alive while everyone else went on with their life, even you, look at you in your fancy armor!
+===
+title: Node
+position: 280,162
+---
+Asd: It's nice to see you again, <Player>! I just wish it were under better circumstances!
+-> Indeed, this was not the right way for a reunion, but it is still a welcome one!
+===

src/app/main.rs

@@ -1,3 +1,5 @@
+use separated;
+
 // Turn clippy into a real bitch
 #![warn(clippy::all, clippy::pedantic)]
 
@@ -15,10 +17,10 @@ use bevy_rand::prelude::{ WyRand, EntropyPlugin, GlobalEntropy };
 
 use plugins::gamestate::GameState;
 
-mod components;
-mod systems;
-mod entities;
-mod plugins;
+use separated::plugins::gamestate::GameState;
+use separated::components::settings::GameSettings;
+use separated::plugins::ui::set_window_icon::set_window_icon;
+use separated::plugins::get_backend::get_backend;
 
 //use bevy_tweening::*;
 
@@ -56,10 +58,10 @@ use bevy_incandescent::{
 //use bevy_hanabi::prelude::*;
 
 // ⚠️ TODO: Move this with Game Settings
-use components::settings::GameSettings;
+use separated::components::settings::GameSettings;
 
-use crate::plugins::ui::set_window_icon::set_window_icon;
-use crate::plugins::get_backend::get_backend;
+use separated::plugins::ui::set_window_icon::set_window_icon;
+use separated::plugins::get_backend::get_backend;
 // ⚠️ TODO: Move audio stuff to its own thing
 
 // 🎲 - Random Number Generation
@@ -125,20 +127,20 @@ fn main() {
                     ..default()
                 })
                 .set(ImagePlugin::default_nearest())
-                .set(plugins::debug::make_log_plugin()),
+                .set(separated::plugins::debug::make_log_plugin()),
             //TweeningPlugin,
-            plugins::gamestate::game_state_plugin,
-            systems::setup_world_systems,
-            plugins::dialogueview::YarnSpinnerDialogueViewPlugin {
+            separated::plugins::gamestate::game_state_plugin,
+            separated::systems::setup_world_systems,
+            separated::plugins::dialogueview::YarnSpinnerDialogueViewPlugin {
                 loading_state: GameState::SplashScreen,
                 playing_state: GameState::Playing,
             },
-            plugins::input::InputPlugin,
-            plugins::ui::plugin,
-            plugins::audio::plugin,
-            plugins::pathfinding::plugin,
-            bevy_mod_aseprite::AsepritePlugin,
+            separated::plugins::input::InputPlugin,
+            separated::plugins::ui::plugin,
+            separated::plugins::audio::plugin,
+            separated::plugins::pathfinding::plugin,
             StateMachinePlugin,
+            bevy_mod_aseprite::AsepritePlugin,
             //IncandescentPlugin,
             //HanabiPlugin,
         ))
@@ -147,12 +149,12 @@ fn main() {
         .add_systems(Startup, set_window_icon) // Set the Window icon.
         // ⚠️ TODO: A proper system that saves this value and allows the player to change it.
         //          Requires start of working on localization and saving and loading settings.
-        .add_systems(Startup, get_device_language) // Get the device language.
+        //.add_systems(Startup, get_device_language) // Get the device language.
 
         //.add_systems(Startup, print_random_value)
 
         // Debug plugin comes last, allowing to inspect the final app state.
-        .add_plugins(plugins::debug::plugin);
+        .add_plugins(separated::plugins::debug::plugin);
 
     // Actually start the game now!
     app.run();

src/lib.rs

@@ -0,0 +1 @@
+pub mod plugins;

src/plugins/debug.rs

@@ -1,23 +1,22 @@
 /// this code is compiled only if debug assertions are enabled (debug mode)
-
-use graphviz_rust::{ cmd::{ CommandArg, Format }, exec_dot };
-
+//use graphviz_rust::{ cmd::{ CommandArg, Format }, exec_dot };
 use bevy::{
-    prelude::*,
+    ecs::schedule::ScheduleLabel, input::common_conditions::input_toggle_active, prelude::*,
     utils::intern::Interned,
-    ecs::schedule::ScheduleLabel,
-    input::common_conditions::input_toggle_active,
 };
 use bevy_inspector_egui::quick::WorldInspectorPlugin;
-use bevy_rapier2d::{ prelude::RapierDebugRenderPlugin, render::DebugRenderContext };
+use bevy_rapier2d::{prelude::RapierDebugRenderPlugin, render::DebugRenderContext};
 
-use super::{ gamestate::GameState, ui::fps_widget::{ spawn_fps_widget, FpsWidget } };
+use super::{
+    gamestate::GameState,
+    ui::fps_widget::{spawn_fps_widget, FpsWidget},
+};
 use crate::components::childof::debug_children;
 
 // Adds L key as debug KeyCode for toggling physics wireframes.
 pub fn toggle_physics_wireframes(
     mut ctx: ResMut<DebugRenderContext>,
-    input: Res<ButtonInput<KeyCode>>
+    input: Res<ButtonInput<KeyCode>>,
 ) {
     if input.just_pressed(KeyCode::F9) {
         ctx.enabled = !ctx.enabled;
@@ -38,41 +37,52 @@ pub(crate) fn plugin(app: &mut App) {
         // RapierDebugRenderPlugin
         RapierDebugRenderPlugin::default(),
         // StateInspectorPlugin
-        bevy_inspector_egui::quick::StateInspectorPlugin::<GameState>
-            ::default()
-            .run_if(bevy::input::common_conditions::input_toggle_active(false, KeyCode::F10)),
+        bevy_inspector_egui::quick::StateInspectorPlugin::<GameState>::default().run_if(
+            bevy::input::common_conditions::input_toggle_active(false, KeyCode::F10),
+        ),
     ));
 
     // Startup
-    app.add_systems(Startup, (
-        // Debug all parent and child elements with the Name component.
-        debug_children,
-        // Disable wireframes by default. I've seen enough collision boxes for now.
-        disable_physics_wireframes,
-    ));
+    app.add_systems(
+        Startup,
+        (
+            // Debug all parent and child elements with the Name component.
+            debug_children,
+            // Disable wireframes by default. I've seen enough collision boxes for now.
+            disable_physics_wireframes,
+        ),
+    );
 
     // Update
     // FpsWidget
-    app.add_systems(Update, spawn_fps_widget.run_if(not(any_with_component::<FpsWidget>)));
+    app.add_systems(
+        Update,
+        spawn_fps_widget.run_if(not(any_with_component::<FpsWidget>)),
+    );
     // DebugRenderContext - Rapier
     app.add_systems(Update, toggle_physics_wireframes);
 
+    /*
     if let Err(err) = render_graphs(app) {
         error!("Error rendering graph: {}", err);
     }
+    */
 }
 
 pub(crate) fn make_log_plugin() -> impl Plugin {
     bevy::log::LogPlugin {
         level: bevy::log::Level::DEBUG,
-        filter: "info,big_brain=debug,one_off=debug,separated=debug,wgpu_core=warn,wgpu_hal=warn".into(),
+        filter: "info,big_brain=debug,one_off=debug,separated=debug,wgpu_core=warn,wgpu_hal=warn"
+            .into(),
         update_subscriber: None,
     }
 }
 
+/*
 type IoResult = std::io::Result<()>;
 
 /// ⚠️ debugdump 🐛 render system and render graphs when the RENDER_GRAPHS environment variable is set
+
 fn render_graphs(app: &mut App) -> IoResult {
     if std::env::var_os("RENDER_GRAPHS") == None {
         return Ok(());
@@ -128,3 +138,4 @@ pub fn render_graph(graph_str: String, output_stem: impl AsRef<str>) -> std::io:
     )?;
     Ok(())
 }
+*/

src/plugins/gamestate.rs

@@ -10,7 +10,7 @@ use bevy_asset_loader::{
     loading_state::{ LoadingState, LoadingStateAppExt },
     standard_dynamic_asset::StandardDynamicAsset,
 };
-use bevy_progress::ProgressPlugin;
+use iyes_progress::ProgressPlugin;
 
 use crate::plugins::splashscreen::{ SplashScreenConfiguration, SplashScreenPlugin };
 

src/plugins/input.rs

@@ -14,14 +14,14 @@ use bevy::{
     utils::default,
 };
 use bevy_rapier2d::dynamics::Velocity;
-use input_manager::{
+use leafwing_input_manager::{
     input_map::InputMap,
     action_state::{ ActionData, ActionState },
     axislike::VirtualDPad,
     input_processing::WithDualAxisProcessingPipelineExt,
     plugin::{ InputManagerPlugin, InputManagerSystem },
 };
-pub use input_manager::Actionlike;
+pub use leafwing_input_manager::Actionlike;
 
 use std::collections::HashMap;
 use std::time::Instant;

src/plugins/splashscreen/mod.rs

@@ -12,7 +12,7 @@ use bevy_asset_loader::loading_state::{
     LoadingState,
     LoadingStateAppExt,
 };
-use bevy_progress::ProgressPlugin;
+use iyes_progress::ProgressPlugin;
 pub use resources::SplashScreenConfiguration;
 
 use self::{

src/plugins/ui/mod.rs

@@ -1,9 +1,8 @@
 use bevy::prelude::*;
 
+use aery::prelude::*;
 use release_label::release_label;
 use tooltip::spawn_tooltip;
-use bevy_vector_shapes::prelude::*;
-use aery::prelude::*;
 
 //use keycap_demo::keycap_demo;
 
@@ -35,16 +34,11 @@ use crate::plugins::ui::keycap_demo::keycap_demo;
 pub(crate) fn plugin(app: &mut bevy::app::App) {
     // Resources
     app.insert_resource(ClearColor(Color::DARK_GRAY))
-        // Plugins
-        .add_plugins(ShapePlugin::default())
-        // 🐺
         // Startup
         //.add_systems(Startup, keycap_demo)
         .add_systems(Startup, release_label)
-
         // Update
         //.add_systems(Update, flying_labels)
-
         // PreUpdate
         .add_systems(PreUpdate, spawn_tooltip);
 }