build you shall

src/app/main.rs

@@ -1,8 +1,8 @@
-use separated;
-
 // Turn clippy into a real bitch
 #![warn(clippy::all, clippy::pedantic)]
 
+use separated;
+
 // This changes the executable to a graphical application instead of a CLI one
 // only for Release builds.
 //#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
@@ -15,8 +15,6 @@ use seldom_state::prelude::*;
 // bevy_rand
 use bevy_rand::prelude::{ WyRand, EntropyPlugin, GlobalEntropy };
 
-use plugins::gamestate::GameState;
-
 use separated::plugins::gamestate::GameState;
 use separated::components::settings::GameSettings;
 use separated::plugins::ui::set_window_icon::set_window_icon;
@@ -58,10 +56,10 @@ use bevy_incandescent::{
 //use bevy_hanabi::prelude::*;
 
 // ⚠️ TODO: Move this with Game Settings
-use separated::components::settings::GameSettings;
+// use separated::components::settings::GameSettings;
 
-use separated::plugins::ui::set_window_icon::set_window_icon;
-use separated::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
@@ -140,7 +138,7 @@ fn main() {
             separated::plugins::audio::plugin,
             separated::plugins::pathfinding::plugin,
             StateMachinePlugin,
-            bevy_mod_aseprite::AsepritePlugin,
+            // bevy_mod_aseprite::AsepritePlugin,
             //IncandescentPlugin,
             //HanabiPlugin,
         ))

src/components/interactions.rs

@@ -2,7 +2,6 @@ use std::collections::HashSet;
 
 use bevy::{
     core::Name,
-    render::color::Color,
     ecs::{
         component::Component,
         entity::Entity,
@@ -48,7 +47,7 @@ pub(crate) fn spawn_interaction_sensor(
             #[cfg(feature = "dev_features")]
             sensor_cmds.insert((
                 Name::new("interaction_sensor"),
-                bevy_rapier2d::render::ColliderDebugColor(Color::rgb(0.0, 1.0, 0.0)),
+                bevy_rapier2d::render::ColliderDebugColor(bevy::color::palettes::css::GREEN.into()),
             ));
             let child = sensor_cmds.id();
             commands.add(PushChild { parent, child });

src/components/mod.rs

@@ -1,20 +1,20 @@
-pub(crate) mod animals;
-pub(crate) mod health;
-pub(crate) mod collision;
-pub(crate) mod ground;
-pub(crate) mod items;
-pub(crate) mod sensorbundle;
-pub(crate) mod camera;
-pub(crate) mod hunger;
-pub(crate) mod armor;
-pub(crate) mod predefinedpath;
-pub(crate) mod animation;
-pub(crate) mod settings;
-pub(crate) mod interactions;
-pub(crate) mod deathzone;
-pub(super) mod swimming;
-pub(super) mod climbing;
-pub(super) mod line_of_sight;
-pub(super) mod ai;
-pub(super) mod childof;
-pub(super) mod name;
+pub mod animals;
+pub mod health;
+pub mod collision;
+pub mod ground;
+pub mod items;
+pub mod sensorbundle;
+pub mod camera;
+pub mod hunger;
+pub mod armor;
+pub mod predefinedpath;
+pub mod animation;
+pub mod settings;
+pub mod interactions;
+pub mod deathzone;
+pub mod swimming;
+pub mod climbing;
+pub mod line_of_sight;
+pub mod ai;
+pub mod childof;
+pub mod name;

src/entities/cat.rs

@@ -1,5 +1,5 @@
-use bevy::{ ecs::{ bundle::Bundle, component::Component }, sprite::SpriteSheetBundle };
-use bevy_ecs_ldtk::prelude::LdtkEntity;
+use bevy::ecs::{ bundle::Bundle, component::Component };
+use bevy_ecs_ldtk::{ prelude::LdtkEntity, utils::LdtkSpriteSheetBundle };
 
 use super::{ ColliderBundle, PredefinedPath };
 use crate::components::animals::Animal;
@@ -35,7 +35,7 @@ impl Animal for Cat {
 #[derive(Clone, Default, Bundle, LdtkEntity)]
 pub struct CatBundle {
     #[sprite_sheet_bundle]
-    pub sprite_sheet_bundle: SpriteSheetBundle,
+    pub sprite_sheet_bundle: LdtkSpriteSheetBundle,
     #[from_entity_instance]
     pub collider_bundle: ColliderBundle,
     pub cat: Cat,

src/entities/cauldron.rs

@@ -1,12 +1,12 @@
-use bevy::{ ecs::bundle::Bundle, sprite::SpriteSheetBundle };
-use bevy_ecs_ldtk::LdtkEntity;
+use bevy::ecs::bundle::Bundle;
+use bevy_ecs_ldtk::{ utils::LdtkSpriteSheetBundle, LdtkEntity };
 
 use super::ColliderBundle;
 
 #[derive(Clone, Default, Bundle, LdtkEntity)]
 pub struct CauldronBundle {
     #[sprite_sheet_bundle]
-    pub sprite_sheet_bundle: SpriteSheetBundle,
+    pub sprite_sheet_bundle: LdtkSpriteSheetBundle,
     #[from_entity_instance]
     pub collider_bundle: ColliderBundle,
 }

src/entities/chest.rs

@@ -1,12 +1,12 @@
-use bevy::{ ecs::bundle::Bundle, sprite::SpriteSheetBundle };
-use bevy_ecs_ldtk::LdtkEntity;
+use bevy::ecs::bundle::Bundle;
+use bevy_ecs_ldtk::{ utils::LdtkSpriteSheetBundle, LdtkEntity };
 
 use super::ColliderBundle;
 
 #[derive(Clone, Default, Bundle, LdtkEntity)]
 pub struct ChestBundle {
     #[sprite_sheet_bundle]
-    pub sprite_sheet_bundle: SpriteSheetBundle,
+    pub sprite_sheet_bundle: LdtkSpriteSheetBundle,
     #[from_entity_instance]
     pub collider_bundle: ColliderBundle,
 }

src/entities/dog.rs

@@ -1,5 +1,5 @@
-use bevy::{ ecs::{ bundle::Bundle, component::Component }, sprite::SpriteSheetBundle };
-use bevy_ecs_ldtk::prelude::LdtkEntity;
+use bevy::ecs::{ bundle::Bundle, component::Component };
+use bevy_ecs_ldtk::{ prelude::LdtkEntity, utils::LdtkSpriteSheetBundle };
 
 use super::{ ColliderBundle, PredefinedPath };
 use crate::components::animals::Animal;
@@ -35,7 +35,7 @@ impl Animal for Dog {
 #[derive(Clone, Default, Bundle, LdtkEntity)]
 pub struct DogBundle {
     #[sprite_sheet_bundle]
-    pub sprite_sheet_bundle: SpriteSheetBundle,
+    pub sprite_sheet_bundle: LdtkSpriteSheetBundle,
     #[from_entity_instance]
     pub collider_bundle: ColliderBundle,
     pub dog: Dog,

src/entities/enemy.rs

@@ -6,11 +6,10 @@ use bevy::{
         system::{ In, Query, Res },
         query::With,
     },
-    sprite::SpriteSheetBundle,
     time::Time,
     transform::components::Transform,
 };
-use bevy_ecs_ldtk::{ prelude::LdtkEntity, EntityInstance };
+use bevy_ecs_ldtk::{ prelude::LdtkEntity, utils::LdtkSpriteSheetBundle, EntityInstance };
 use seldom_state::{ prelude::StateMachine, trigger::IntoTrigger as _ };
 
 use super::{ ColliderBundle, PredefinedPath };
@@ -22,7 +21,7 @@ pub struct Enemy;
 #[derive(Default, Bundle, LdtkEntity)]
 pub struct EnemyBundle {
     #[sprite_sheet_bundle]
-    pub sprite_sheet_bundle: SpriteSheetBundle,
+    pub sprite_sheet_bundle: LdtkSpriteSheetBundle,
     #[from_entity_instance]
     pub collider_bundle: ColliderBundle,
     pub enemy: Enemy,

src/entities/movingplatform.rs

@@ -1,5 +1,5 @@
-use bevy::{ ecs::{ bundle::Bundle, component::Component }, sprite::SpriteSheetBundle };
-use bevy_ecs_ldtk::prelude::LdtkEntity;
+use bevy::ecs::{ bundle::Bundle, component::Component };
+use bevy_ecs_ldtk::{ prelude::LdtkEntity, utils::LdtkSpriteSheetBundle };
 
 use super::{ ColliderBundle, PredefinedPath };
 
@@ -9,7 +9,7 @@ pub struct MovingPlatform;
 #[derive(Clone, Default, Bundle, LdtkEntity)]
 pub struct MovingPlatformBundle {
     #[sprite_sheet_bundle]
-    pub sprite_sheet_bundle: SpriteSheetBundle,
+    pub sprite_sheet_bundle: LdtkSpriteSheetBundle,
     #[from_entity_instance]
     pub collider_bundle: ColliderBundle,
     #[ldtk_entity]

src/entities/player.rs

@@ -85,13 +85,13 @@ pub fn draw_health_bar(mut gizmos: Gizmos, query: Query<(&GlobalTransform, &Play
         let end = start + Vec3::new(bar_width, 0.0, 0.0);
 
         // Draw the background (red) bar
-        gizmos.line_2d(start.truncate(), end.truncate(), Color::RED);
+        gizmos.line_2d(start.truncate(), end.truncate(), bevy::color::palettes::css::RED);
 
         // Draw the foreground (green) bar based on health
         gizmos.line_2d(
             start.truncate(),
             (start + Vec3::new(bar_width * health_ratio, 0.0, 0.0)).truncate(),
-            Color::GREEN
+            bevy::color::palettes::css::GREEN
         );
     }
 }

src/entities/pumpkin.rs

@@ -1,5 +1,5 @@
-use bevy::{ ecs::component::Component, prelude::Bundle, sprite::SpriteSheetBundle };
-use bevy_ecs_ldtk::LdtkEntity;
+use bevy::{ ecs::component::Component, prelude::Bundle };
+use bevy_ecs_ldtk::{ utils::LdtkSpriteSheetBundle, LdtkEntity };
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug, Default, Component)]
 pub struct Pumpkin;
@@ -8,5 +8,5 @@ pub struct Pumpkin;
 #[derive(Clone, Default, Bundle, LdtkEntity)]
 pub struct PumpkinBundle {
     #[sprite_sheet_bundle(no_grid)]
-    pub sprite_sheet_bundle: SpriteSheetBundle,
+    pub sprite_sheet_bundle: LdtkSpriteSheetBundle,
 }

src/entities/torch.rs

@@ -1,5 +1,5 @@
-use bevy::{ ecs::{ bundle::Bundle, component::Component }, sprite::SpriteSheetBundle };
-use bevy_ecs_ldtk::{ EntityInstance, LdtkEntity };
+use bevy::ecs::{ bundle::Bundle, component::Component };
+use bevy_ecs_ldtk::{ utils::LdtkSpriteSheetBundle, EntityInstance, LdtkEntity };
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug, Default, Component)]
 pub struct Torch;
@@ -7,7 +7,7 @@ pub struct Torch;
 #[derive(Clone, Default, Bundle, LdtkEntity)]
 pub struct TorchBundle {
     #[sprite_sheet_bundle]
-    pub sprite_sheet_bundle: SpriteSheetBundle,
+    pub sprite_sheet_bundle: LdtkSpriteSheetBundle,
     pub torch: Torch,
     #[from_entity_instance]
     pub instance: EntityInstance,

src/lib.rs

@@ -1,3 +1,4 @@
 pub mod components;
 pub mod entities;
 pub mod plugins;
+pub mod systems;

src/plugins/audio/delayed_audio_source.rs

@@ -1,7 +1,6 @@
 use std::time::Duration;
 
-use bevy::{ audio::{ AddAudioSource, PlaybackMode }, prelude::*, transform::TransformSystem };
-use rodio::source::{ Delay, Repeat, Source };
+use bevy::{ audio::PlaybackMode, prelude::*, transform::TransformSystem };
 
 /// An asset type that warps an audio source for adding a delay and infinite
 /// repeats (private to this module)
@@ -11,13 +10,13 @@ struct DelayedAudioSource {
     delay: Duration,
 }
 
-impl Decodable for DelayedAudioSource {
-    type DecoderItem = <AudioSource as Decodable>::DecoderItem;
-    type Decoder = Delay<Repeat<<AudioSource as Decodable>::Decoder>>;
-    fn decoder(&self) -> Self::Decoder {
-        self.source.decoder().repeat_infinite().delay(self.delay)
-    }
-}
+// impl Decodable for DelayedAudioSource {
+//     type DecoderItem = <AudioSource as Decodable>::DecoderItem;
+//     type Decoder = Delay<Repeat<<AudioSource as Decodable>::Decoder>>;
+//     fn decoder(&self) -> Self::Decoder {
+//         self.source.decoder().repeat_infinite().delay(self.delay)
+//     }
+// }
 
 /// Component that gets converted to an AudioBundle
 #[derive(Component)]
@@ -74,7 +73,8 @@ fn convert_delayed_settings_to_audio_bundle(
 
 /// Setup an audio source type for DelayedAudioSource
 pub(super) fn plugin(app: &mut App) {
-    app.add_audio_source::<DelayedAudioSource>().add_systems(
+    // app.add_audio_source::<DelayedAudioSource>()
+    app.add_systems(
         PostUpdate,
         // bevy_audios's AudioPlaySet (sadly private) runs after
         // TransformSystem::TransformPropagate, so we run before that to ensure

src/plugins/debug.rs

@@ -1,22 +1,15 @@
 /// this code is compiled only if debug assertions are enabled (debug mode)
 //use graphviz_rust::{ cmd::{ CommandArg, Format }, exec_dot };
-use bevy::{
-    ecs::schedule::ScheduleLabel, input::common_conditions::input_toggle_active, prelude::*,
-    utils::intern::Interned,
-};
-use bevy_inspector_egui::quick::WorldInspectorPlugin;
-use bevy_rapier2d::{prelude::RapierDebugRenderPlugin, render::DebugRenderContext};
-
-use super::{
-    gamestate::GameState,
-    ui::fps_widget::{spawn_fps_widget, FpsWidget},
-};
+use bevy::prelude::*;
+use bevy_rapier2d::{ prelude::RapierDebugRenderPlugin, render::DebugRenderContext };
+
+use super::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;
@@ -27,38 +20,32 @@ pub fn disable_physics_wireframes(mut ctx: ResMut<DebugRenderContext>) {
     ctx.enabled = false;
 }
 
-pub(crate) fn plugin(app: &mut App) {
+pub fn plugin(app: &mut App) {
     // Plugins
     app.add_plugins((
         // FpsWidget
         super::ui::fps_widget::plugin,
         // WorldInspectorPlugin
-        WorldInspectorPlugin::default().run_if(input_toggle_active(false, KeyCode::F11)),
+        //WorldInspectorPlugin::default().run_if(input_toggle_active(false, KeyCode::F11)),
         // RapierDebugRenderPlugin
         RapierDebugRenderPlugin::default(),
         // StateInspectorPlugin
-        bevy_inspector_egui::quick::StateInspectorPlugin::<GameState>::default().run_if(
-            bevy::input::common_conditions::input_toggle_active(false, KeyCode::F10),
-        ),
+        // 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);
 
@@ -69,12 +56,11 @@ pub(crate) fn plugin(app: &mut App) {
     */
 }
 
-pub(crate) fn make_log_plugin() -> impl Plugin {
+pub 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(),
-        update_subscriber: None,
+        filter: "info,big_brain=debug,one_off=debug,separated=debug,wgpu_core=warn,wgpu_hal=warn".into(),
+        custom_layer: |_| None,
     }
 }
 

src/plugins/dialogueview/mod.rs

@@ -24,18 +24,13 @@ mod updating;
 use bevy::{
     app::{ App, Plugin, Update },
     asset::Handle,
-    log::info,
     ecs::{
-        schedule::{
-            SystemSet,
-            IntoSystemConfigs,
-            Condition,
-            States,
-            common_conditions::{ in_state, resource_added },
-        },
+        schedule::{ common_conditions::resource_added, Condition, IntoSystemConfigs, SystemSet },
         system::{ Commands, Res, Resource },
     },
+    log::info,
     render::texture::Image,
+    state::{ condition::in_state, state::{ FreelyMutableState, States } },
     text::Font,
 };
 use bevy_asset_loader::{
@@ -45,7 +40,7 @@ use bevy_asset_loader::{
 use bevy_yarnspinner::prelude::{ YarnFileSource, YarnSpinnerPlugin, YarnProject };
 
 pub use updating::SpeakerChangeEvent;
-pub(crate) use typewriter::{ in_dialogue, not_in_dialogue };
+pub(crate) use typewriter::not_in_dialogue;
 
 /// The plugin registering all systems of the dialogue view.
 #[derive(Debug, Default)]
@@ -71,7 +66,7 @@ struct Assets {
     edge: Handle<Image>,
 }
 
-impl<T: States> Plugin for YarnSpinnerDialogueViewPlugin<T> {
+impl<T: States + FreelyMutableState> Plugin for YarnSpinnerDialogueViewPlugin<T> {
     fn build(&self, app: &mut App) {
         app.add_plugins(
             YarnSpinnerPlugin::with_yarn_source(YarnFileSource::file("dialogues/test_dialog.yarn"))
@@ -96,7 +91,7 @@ impl<T: States> Plugin for YarnSpinnerDialogueViewPlugin<T> {
 fn spawn_dialogue_runner(mut commands: Commands, project: Res<YarnProject>) {
     info!("Starting dialogue runner.");
     // Create a dialogue runner from the project.
-    let mut dialogue_runner = project.create_dialogue_runner();
+    let dialogue_runner = project.create_dialogue_runner();
     // ⚠️ TODO: Only run dialogues on interaction!
     //dialogue_runner.start_node("Start");
     commands.spawn(dialogue_runner);

src/plugins/dialogueview/option_selection.rs

@@ -1,23 +1,24 @@
 use bevy::{
     app::{ App, Update },
+    color::Color,
     ecs::{
         entity::Entity,
-        system::{ Commands, Query, Res, Resource },
+        event::{ Event, EventReader, EventWriter },
+        query::{ Changed, With, Without },
         schedule::{
-            IntoSystemConfigs,
+            common_conditions::{ any_with_component, resource_added, resource_exists },
             Condition,
-            common_conditions::{ resource_added, resource_exists, any_with_component },
+            IntoSystemConfigs,
         },
-        query::{ With, Without, Changed },
-        event::{ Event, EventReader, EventWriter },
+        system::{ Commands, Query, Res, Resource },
     },
     hierarchy::{ Children, DespawnRecursiveExt, HierarchyQueryExt },
+    input::{ keyboard::KeyCode, ButtonInput },
     reflect::Reflect,
-    render::{ color::Color, view::Visibility },
+    render::view::Visibility,
     text::Text,
     ui::{ widget::Button, Display, Interaction, Style },
     utils::HashMap,
-    input::{ ButtonInput, keyboard::KeyCode },
     window::{ CursorIcon, PrimaryWindow, Window },
 };
 use bevy_yarnspinner::{
@@ -131,10 +132,10 @@ fn select_option(
         let (color, icon) = match *interaction {
             Interaction::Pressed if selection.is_none() => {
                 selection = Some(button.0);
-                (Color::TOMATO, CursorIcon::Default)
+                (bevy::color::palettes::css::TOMATO.into(), CursorIcon::Default)
             }
             Interaction::Hovered => (Color::WHITE, CursorIcon::Pointer),
-            _ => (Color::TOMATO, CursorIcon::Default),
+            _ => (bevy::color::palettes::css::TOMATO.into(), CursorIcon::Default),
         };
         window.cursor.icon = icon;
         let text_entity = children

src/plugins/dialogueview/setup.rs

@@ -1,9 +1,10 @@
 use bevy::{
+    color::{ Alpha, Color },
     core::Name,
     ecs::system::EntityCommands,
     hierarchy::BuildChildren,
     prelude::{ default, Commands, Component, Res },
-    render::{ color::Color, view::Visibility },
+    render::view::Visibility,
     text::{ Text, TextSection, TextStyle },
     ui::{
         node_bundles::{ ButtonBundle, ImageBundle, NodeBundle, TextBundle },
@@ -125,7 +126,7 @@ pub(crate) fn setup(mut commands: Commands, assets: Res<Assets>) {
                             padding: UiRect::horizontal(Val::Px(TEXT_BORDER)),
                             ..default()
                         },
-                        background_color: Color::BLACK.with_a(0.8).into(),
+                        background_color: Color::BLACK.with_alpha(0.8).into(),
                         ..default()
                     },
                 ))
@@ -325,7 +326,7 @@ mod text_style {
 
     pub(crate) fn option_id(assets: &Assets) -> TextStyle {
         TextStyle {
-            color: Color::ALICE_BLUE,
+            color: bevy::color::palettes::css::ALICE_BLUE.into(),
             ..option_text(assets)
         }
     }
@@ -333,7 +334,7 @@ mod text_style {
     pub(crate) fn option_text(assets: &Assets) -> TextStyle {
         TextStyle {
             font_size: 18.0,
-            color: Color::TOMATO,
+            color: bevy::color::palettes::css::TOMATO.into(),
             ..standard(assets)
         }
     }

src/plugins/gamestate.rs

@@ -1,10 +1,12 @@
 use bevy::{
     app::App,
+    color::Color,
     log::info,
     math::Vec2,
     prelude::{ OnEnter, States },
     reflect::Reflect,
-    render::{ camera::ScalingMode, color::Color },
+    render::camera::ScalingMode,
+    state::app::AppExtStates as _,
 };
 use bevy_asset_loader::{
     loading_state::{ LoadingState, LoadingStateAppExt },

src/plugins/input.rs

@@ -4,22 +4,23 @@ use bevy::{
     ecs::{
         bundle::Bundle,
         component::Component,
-        schedule::{ common_conditions::in_state, Condition, IntoSystemConfigs as _ },
+        schedule::{ Condition, IntoSystemConfigs as _ },
         system::{ Query, Res },
     },
     input::{ gamepad::GamepadButtonType, keyboard::KeyCode, mouse::MouseButton },
     log::info,
     reflect::Reflect,
+    state::condition::in_state,
     time::{ Real, Time },
     utils::default,
 };
 use bevy_rapier2d::dynamics::Velocity;
 use leafwing_input_manager::{
-    input_map::InputMap,
     action_state::{ ActionData, ActionState },
-    axislike::VirtualDPad,
+    input_map::InputMap,
     input_processing::WithDualAxisProcessingPipelineExt,
     plugin::{ InputManagerPlugin, InputManagerSystem },
+    user_input::KeyboardVirtualDPad,
 };
 pub use leafwing_input_manager::Actionlike;
 
@@ -79,7 +80,7 @@ impl<A: Actionlike> Default for InputBundle<A> {
 pub(crate) fn make_action_map<Ability: Actionlike>(
     abilities: HashMap<u8, Ability>
 ) -> InputBundle<Ability> {
-    let dual_axis_pad = VirtualDPad::wasd()
+    let dual_axis_pad = KeyboardVirtualDPad::WASD
         // You can configure a processing pipeline to handle axis-like user inputs.
         //
         // This step adds a circular deadzone that normalizes input values

src/plugins/mod.rs

@@ -1,21 +1,21 @@
-pub(crate) mod ldtk;
-pub(crate) mod splashscreen;
-pub(crate) mod dialogueview;
-pub(crate) mod gamestate;
-pub(crate) mod input;
-pub(crate) mod ui;
-pub(crate) mod easing;
-pub(crate) mod get_backend;
-pub(crate) mod rapier_utils;
-pub(crate) mod audio;
-pub(crate) mod pathfinding;
+pub mod ldtk;
+pub mod splashscreen;
+pub mod dialogueview;
+pub mod gamestate;
+pub mod input;
+pub mod ui;
+pub mod easing;
+pub mod get_backend;
+pub mod rapier_utils;
+pub mod audio;
+pub mod pathfinding;
 
-#[cfg(feature="dev_features")]
-pub(crate) mod debug;
+#[cfg(feature = "dev_features")]
+pub mod debug;
 
 /// this code is compiled only if debug assertions are disabled (release mode)
-#[cfg(not(feature="dev_features"))]
-pub(crate) mod debug {
+#[cfg(not(feature = "dev_features"))]
+pub mod debug {
     pub fn plugin(_app: &mut bevy::app::App) {}
 
     pub(crate) fn make_log_plugin() -> impl bevy::app::Plugin {

src/plugins/splashscreen/mod.rs

@@ -6,6 +6,7 @@ pub(crate) mod systems;
 use bevy::{
     app::{ App, Plugin, Update },
     prelude::{ in_state, Condition, IntoSystemConfigs, OnEnter, OnExit, States },
+    state::{ app::AppExtStates as _, state::FreelyMutableState },
 };
 use bevy_asset_loader::loading_state::{
     config::ConfigureLoadingState,
@@ -23,7 +24,7 @@ use self::{
 
 pub struct SplashScreenPlugin<T: States + Clone>(pub SplashScreenConfiguration<T>);
 
-impl<T: States + Clone> Plugin for SplashScreenPlugin<T> {
+impl<T: States + FreelyMutableState + Clone> Plugin for SplashScreenPlugin<T> {
     fn build(&self, app: &mut App) {
         app.init_state::<SplashScreenState>();
 

src/plugins/splashscreen/resources.rs

@@ -1,8 +1,10 @@
 use bevy::{
     asset::Handle,
+    color::Color,
     math::Vec2,
     prelude::{ Resource, States },
-    render::{ camera::ScalingMode, color::Color, texture::Image },
+    render::{ camera::ScalingMode, texture::Image },
+    ecs::change_detection::Res,
 };
 use bevy_asset_loader::{
     asset_collection::AssetCollection,

src/plugins/splashscreen/state.rs

@@ -1,4 +1,4 @@
-use bevy::ecs::schedule::States;
+use bevy::state::state::States;
 
 /// Controls the flow of our plugin
 #[derive(States, Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]

src/plugins/splashscreen/systems.rs

@@ -4,6 +4,7 @@ use bevy::{
     prelude::{ Camera2dBundle, Commands, Entity, NextState, Query, Res, ResMut, States, With },
     render::{ camera::{ Camera, ClearColorConfig, OrthographicProjection }, texture::Image },
     sprite::{ Sprite, SpriteBundle },
+    state::state::FreelyMutableState,
     time::{ Time, Timer, TimerMode },
 };
 use bevy_asset_loader::dynamic_asset::DynamicAssets;
@@ -58,7 +59,7 @@ pub fn on_exit(
     splash_screen_state.set(SplashScreenState::Idle);
 }
 
-pub fn update_splash_screen<T: States + Clone>(
+pub fn update_splash_screen<T: States + Clone + FreelyMutableState>(
     mut commands: Commands,
     time: Res<Time>,
     splash_screen_configuration: Res<SplashScreenConfiguration<T>>,

src/plugins/ui/banner_widget.rs

@@ -1,22 +1,24 @@
 use bevy::{
+    color::Color,
     ecs::system::EntityCommands,
     prelude::{ Component, Entity },
-    render::color::Color,
     ui::{ node_bundles::ImageBundle, AlignSelf, JustifyContent, PositionType, Val },
 };
 use sickle_ui::{
+    prelude::{ LabelConfig, UiContainerExt as _, UiLabelExt as _ },
     ui_builder::{ UiBuilder, UiRoot },
     ui_commands::SetTextExt,
     ui_style::{
-        SetImageExt,
-        SetNodeAlignSelfExt,
-        SetNodeHeightExt,
-        SetNodeJustifyContentsExt,
-        SetNodePositionTypeExt,
-        SetNodeTopExt,
-        SetNodeWidthExt,
+        generated::{
+            SetAlignSelfExt as _,
+            SetHeightExt as _,
+            SetJustifyContentExt as _,
+            SetPositionTypeExt as _,
+            SetTopExt as _,
+            SetWidthExt as _,
+        },
+        manual::SetImageExt as _,
     },
-    widgets::{ container::UiContainerExt, label::{ LabelConfig, UiLabelExt } },
 };
 
 use crate::plugins::ui::set::{ SetFont, SetPosition };
@@ -51,15 +53,12 @@ impl BannerWidgetConfig {
     }
 }
 
-pub trait UiBannerWidgetExt<'w, 's> {
-    fn banner_widget<'a>(&'a mut self, config: BannerWidgetConfig) -> UiBuilder<'w, 's, 'a, Entity>;
+pub trait UiBannerWidgetExt {
+    fn banner_widget(&mut self, config: BannerWidgetConfig) -> UiBuilder<'_, Entity>;
 }
 
-impl<'w, 's> UiBannerWidgetExt<'w, 's> for UiBuilder<'w, 's, '_, UiRoot> {
-    fn banner_widget<'a>(
-        &'a mut self,
-        config: BannerWidgetConfig
-    ) -> UiBuilder<'w, 's, 'a, Entity> {
+impl UiBannerWidgetExt for UiBuilder<'_, UiRoot> {
+    fn banner_widget(&mut self, config: BannerWidgetConfig) -> UiBuilder<'_, Entity> {
         self.container((ImageBundle::default(), BannerWidget), |banner| {
             banner
                 .style()
@@ -69,7 +68,7 @@ impl<'w, 's> UiBannerWidgetExt<'w, 's> for UiBuilder<'w, 's, '_, UiRoot> {
                 .width(Val::Px(100.0))
                 .height(Val::Px(12.0))
                 // Add a nice looking background image to our widget.
-                .image("ui/label_gradient_transparent.png");
+                .image("ui/label_gradient_transparent.png".into());
 
             // And we'll want a customizable label on the banner.
             let mut label = banner.label(LabelConfig::default());

src/plugins/ui/fps_widget.rs

@@ -1,24 +1,23 @@
 use bevy::{
     app::{ App, Update },
+    color::{ palettes, Color },
     ecs::{ component::Component, entity::Entity, query::With, system::{ Commands, Query, Res } },
-    render::color::Color,
     text::TextStyle,
     ui::{ node_bundles::NodeBundle, JustifyContent, PositionType, Val },
 };
 
 use bevy::{ asset::AssetServer, diagnostic::{ DiagnosticsStore, FrameTimeDiagnosticsPlugin } };
 use sickle_ui::{
-    ui_builder::{ UiBuilder, UiBuilderExt, UiRoot },
+    prelude::{ LabelConfig, UiContainerExt as _, UiLabelExt as _ },
+    ui_builder::{ UiBuilder, UiBuilderExt as _, UiRoot },
     ui_commands::SetTextExt,
-    ui_style::{
-        SetBackgroundColorExt,
-        //SetNodeBottomExt,
-        SetNodeJustifyContentsExt,
-        SetNodePositionTypeExt,
-        SetNodeRightExt,
-        SetNodeTopExt,
+    ui_style::generated::{
+        SetBackgroundColorExt as _,
+        SetJustifyContentExt as _,
+        SetPositionTypeExt as _,
+        SetRightExt as _,
+        SetTopExt as _,
     },
-    widgets::{ container::UiContainerExt, label::{ LabelConfig, UiLabelExt } },
 };
 
 pub fn plugin(app: &mut App) {
@@ -31,12 +30,12 @@ pub struct FpsWidget;
 #[derive(Component, Default)]
 struct FpsText;
 
-pub trait UiFPSWidgetExt<'w, 's> {
-    fn fps<'a>(&'a mut self) -> UiBuilder<'w, 's, 'a, Entity>;
+pub trait UiFPSWidgetExt {
+    fn fps(&mut self) -> UiBuilder<'_, Entity>;
 }
 
-impl<'w, 's> UiFPSWidgetExt<'w, 's> for UiBuilder<'w, 's, '_, UiRoot> {
-    fn fps<'a>(&'a mut self) -> UiBuilder<'w, 's, 'a, Entity> {
+impl UiFPSWidgetExt for UiBuilder<'_, UiRoot> {
+    fn fps(&mut self) -> UiBuilder<'_, Entity> {
         self.container((NodeBundle::default(), FpsWidget), |fps| {
             fps.style()
                 .position_type(PositionType::Absolute)
@@ -74,17 +73,17 @@ fn update_fps(
         // Target frame rate for 60 Hz monitors is actually slightly less than 60,
         // so we round down slightly to avoid flickering under happy circumstances.
         let text_color = if smoothed_fps > 59.5 {
-            Color::GREEN
+            palettes::css::GREEN
         } else if smoothed_fps > 30.0 {
-            Color::YELLOW
+            palettes::css::YELLOW
         } else {
-            Color::RED
+            palettes::css::RED
         };
 
         let text_style = TextStyle {
             font: asset_server.load("fonts/bahnschrift.ttf"),
             font_size: 12.0,
-            color: text_color,
+            color: text_color.into(),
         };
 
         commands.entity(label).set_text(format!("{:3.0}", smoothed_fps), text_style.into());

src/plugins/ui/keycap.rs

@@ -47,14 +47,11 @@ impl KeycapWidgetConfig {
 }
 
 pub trait UiKeycapWidgetExt<'w, 's> {
-    fn keycap_widget<'a>(&'a mut self, config: KeycapWidgetConfig) -> UiBuilder<'w, 's, 'a, Entity>;
+    fn keycap_widget<'a>(&'a mut self, config: KeycapWidgetConfig) -> UiBuilder<'_, Entity>;
 }
 
-impl<'w, 's> UiKeycapWidgetExt<'w, 's> for UiBuilder<'w, 's, '_, UiRoot> {
-    fn keycap_widget<'a>(
-        &'a mut self,
-        config: KeycapWidgetConfig
-    ) -> UiBuilder<'w, 's, 'a, Entity> {
+impl<'w, 's> UiKeycapWidgetExt<'w, 's> for UiBuilder<'_, UiRoot> {
+    fn keycap_widget<'a>(&'a mut self, config: KeycapWidgetConfig) -> UiBuilder<'_, Entity> {
         self.container((ImageBundle::default(), KeycapWidget), |keycap| {
             keycap
                 .style()

src/plugins/ui/mod.rs

@@ -1,6 +1,5 @@
 use bevy::prelude::*;
 
-use aery::prelude::*;
 use release_label::release_label;
 use tooltip::spawn_tooltip;
 
@@ -14,9 +13,9 @@ pub(crate) mod fps_widget;
 // Rewrite with shapes?
 //pub(crate) mod keycap;
 //pub(crate) mod keycap_demo;
-pub(crate) mod release_label;
-pub(crate) mod set;
-pub(crate) mod set_window_icon;
+pub mod release_label;
+pub mod set;
+pub mod set_window_icon;
 mod tooltip;
 
 /*
@@ -31,9 +30,9 @@ use crate::plugins::ui::flying::flying_labels;
 use crate::plugins::ui::keycap_demo::keycap_demo;
 */
 
-pub(crate) fn plugin(app: &mut bevy::app::App) {
+pub fn plugin(app: &mut bevy::app::App) {
     // Resources
-    app.insert_resource(ClearColor(Color::DARK_GRAY))
+    app.insert_resource(ClearColor(bevy::color::palettes::css::DARK_GRAY.into()))
         // Startup
         //.add_systems(Startup, keycap_demo)
         .add_systems(Startup, release_label)

src/plugins/ui/release_label.rs

@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use sickle_ui::{
     ui_builder::{ UiBuilderExt, UiRoot },
-    ui_style::{ SetNodeBottomExt, SetNodeLeftExt },
+    ui_style::generated::{ SetBottomExt as _, SetLeftExt as _ },
 };
 
 use super::banner_widget::{ BannerWidgetConfig, UiBannerWidgetExt };