chore: migrate to some new bevy 0.17 features (#50)

Author: ssouthcity

Cargo.lock

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-bevy = { version = "0.17.2", features = ["wayland"] }
+bevy = { version = "0.17.2", features = ["wayland", "experimental_bevy_ui_widgets"] }
 bevy-inspector-egui = "0.34.0"
 bevy_aseprite_ultra = "0.7.0"
 bevy_ecs_tilemap = { version = "0.17.0-rc.1" }

Cargo.toml

@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1758829446,
+        "lastModified": 1759527603,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "babde55e249190decef99c1c90281e0730536443",
+        "rev": "ce82fad570fd74ac5dfe3ce587ee8b37e918d71f",
         "type": "github"
       },
       "original": {
@@ -40,10 +40,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
+        "lastModified": 1759523803,
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",
         "type": "github"
       },
       "original": {
@@ -74,10 +74,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758690382,
+        "lastModified": 1759381078,
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
         "type": "github"
       },
       "original": {
@@ -105,10 +105,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1758767687,
+        "lastModified": 1759544920,
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "b8bcc09d4f627f4e325408f6e7a85c3ac31f0eeb",
+        "rev": "bd3a63bbff2c4cb3cd48e9d49f54c2ccad457f70",
         "type": "github"
       },
       "original": {

devenv.lock

@@ -1,3 +1,4 @@
+use bevy::dev_tools::fps_overlay::FpsOverlayPlugin;
 use bevy::dev_tools::states::log_transitions;
 use bevy::input::common_conditions::{input_just_pressed, input_toggle_active};
 use bevy::prelude::*;
@@ -9,8 +10,11 @@ use crate::screens::Screen;
 const TOGGLE_KEY: KeyCode = KeyCode::Backquote;
 
 pub fn plugin(app: &mut App) {
-    app.add_plugins(EguiPlugin::default());
-    app.add_plugins(WorldInspectorPlugin::new().run_if(input_toggle_active(false, TOGGLE_KEY)));
+    app.add_plugins((
+        FpsOverlayPlugin::default(),
+        EguiPlugin::default(),
+        WorldInspectorPlugin::new().run_if(input_toggle_active(false, TOGGLE_KEY)),
+    ));
 
     app.add_systems(Update, log_transitions::<Screen>);
 

src/dev_tools.rs

@@ -1,7 +1,4 @@
-use bevy::{
-    ecs::{relationship::RelatedSpawner, spawn::SpawnWith},
-    prelude::*,
-};
+use bevy::{prelude::*, ui_widgets::observe};
 
 use crate::{
     assets::indexing::IndexMap,
@@ -86,15 +83,18 @@ pub fn open_recipe_menu(
             align_items: AlignItems::Center,
             ..default()
         },
-        Children::spawn(SpawnWith(|parent: &mut RelatedSpawner<ChildOf>| {
-            parent
-                .spawn((Text::new("Deselect"), TextColor(Color::BLACK)))
-                .observe(on_deselect_recipe);
-
-            parent
-                .spawn((Text::new("Close"), TextColor(Color::BLACK)))
-                .observe(on_close_menu);
-        })),
+        children![
+            (
+                Text::new("Deselect"),
+                TextColor(Color::BLACK),
+                observe(on_deselect_recipe),
+            ),
+            (
+                Text::new("Close"),
+                TextColor(Color::BLACK),
+                observe(on_close_menu),
+            )
+        ],
     ));
 
     let recipe_view_id = commands

src/gameplay/hud/inspect/info.rs

@@ -20,7 +20,6 @@ pub fn plugin(app: &mut App) {
 }
 
 #[derive(States, Reflect, Default, Debug, Hash, PartialEq, Eq, Clone, Copy)]
-#[states(scoped_entities)]
 pub enum InspectionMenuState {
     #[default]
     Closed,