Update to Bevy 0.16 RC 3

Author: Shatur

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_enhanced_input"
-version = "0.9.0"
+version = "0.10.0-rc.3"
 authors = ["Hennadii Chernyshchyk <[email protected]>"]
 edition = "2024"
 description = "Input manager for Bevy, inspired by Unreal Engine Enhanced Input"
@@ -12,17 +12,24 @@ license = "MIT OR Apache-2.0"
 include = ["/src", "/LICENSE*"]
 
 [dependencies]
-bevy_enhanced_input_macros = { path = "macros", version = "0.9.0" }
-bevy = { version = "0.15", default-features = false, features = ["serialize"] }
+bevy_enhanced_input_macros = { path = "macros", version = "0.10.0-rc.3" }
+bevy = { version = "0.16.0-rc.3", default-features = false, features = [
+  "serialize",
+] }
+log = "0.4" # Directly depend on `log` like other `no_std` Bevy crates, since `bevy_log` currently requires `std`.
+variadics_please = "1.0"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 bitflags = { version = "2.6", features = ["serde"] }
 
 [dev-dependencies]
-bevy = { version = "0.15", default-features = false, features = [
+bevy = { version = "0.16.0-rc.3", default-features = false, features = [
   "bevy_gilrs",
-  "bevy_ui",
   "bevy_gizmos",
+  "bevy_log",
+  "bevy_ui_picking_backend",
+  "bevy_ui",
   "bevy_window",
+  "default_font",
   "x11",
 ] }
 ron = "0.9"

examples/all_conditions.rs

@@ -33,7 +33,7 @@ fn spawn(mut commands: Commands) {
 }
 
 fn binding(trigger: Trigger<Binding<Dummy>>, mut actions: Query<&mut Actions<Dummy>>) {
-    let mut actions = actions.get_mut(trigger.entity()).unwrap();
+    let mut actions = actions.get_mut(trigger.target()).unwrap();
     actions
         .bind::<PressAction>()
         .to(PressAction::KEY)

examples/context_layering.rs

@@ -44,7 +44,7 @@ fn spawn(mut commands: Commands) {
 }
 
 fn regular_binding(trigger: Trigger<Binding<Player>>, mut players: Query<&mut Actions<Player>>) {
-    let mut actions = players.get_mut(trigger.entity()).unwrap();
+    let mut actions = players.get_mut(trigger.target()).unwrap();
     actions
         .bind::<Move>()
         .to(Cardinal::wasd_keys())
@@ -58,7 +58,7 @@ fn regular_binding(trigger: Trigger<Binding<Player>>, mut players: Query<&mut Ac
 }
 
 fn swimming_binding(trigger: Trigger<Binding<Swimming>>, mut players: Query<&mut Actions<Player>>) {
-    let mut actions = players.get_mut(trigger.entity()).unwrap();
+    let mut actions = players.get_mut(trigger.target()).unwrap();
     // `Player` has lower priority, so `Dive` and `ExitWater` consume inputs first,
     // preventing `Rotate` and `EnterWater` from being triggered.
     // The consuming behavior can be configured in the `InputAction` trait.
@@ -67,12 +67,12 @@ fn swimming_binding(trigger: Trigger<Binding<Swimming>>, mut players: Query<&mut
 }
 
 fn apply_movement(trigger: Trigger<Fired<Move>>, mut players: Query<&mut Transform>) {
-    let mut transform = players.get_mut(trigger.entity()).unwrap();
+    let mut transform = players.get_mut(trigger.target()).unwrap();
     transform.translation += trigger.value.extend(0.0);
 }
 
 fn rotate(trigger: Trigger<Started<Rotate>>, mut players: Query<&mut Transform>) {
-    let mut transform = players.get_mut(trigger.entity()).unwrap();
+    let mut transform = players.get_mut(trigger.target()).unwrap();
     transform.rotate_z(FRAC_PI_4);
 }
 
@@ -82,21 +82,21 @@ fn enter_water(
     mut players: Query<&mut PlayerColor>,
 ) {
     // Change color for visibility.
-    let mut color = players.get_mut(trigger.entity()).unwrap();
+    let mut color = players.get_mut(trigger.target()).unwrap();
     **color = INDIGO_600.into();
 
     commands
-        .entity(trigger.entity())
+        .entity(trigger.target())
         .insert(Actions::<Swimming>::default());
 }
 
 fn start_diving(trigger: Trigger<Started<Dive>>, mut players: Query<&mut Visibility>) {
-    let mut visibility = players.get_mut(trigger.entity()).unwrap();
+    let mut visibility = players.get_mut(trigger.target()).unwrap();
     *visibility = Visibility::Hidden;
 }
 
 fn end_diving(trigger: Trigger<Completed<Dive>>, mut players: Query<&mut Visibility>) {
-    let mut visibility = players.get_mut(trigger.entity()).unwrap();
+    let mut visibility = players.get_mut(trigger.target()).unwrap();
     *visibility = Visibility::Visible;
 }
 
@@ -105,11 +105,11 @@ fn exit_water(
     mut commands: Commands,
     mut players: Query<&mut PlayerColor>,
 ) {
-    let mut color = players.get_mut(trigger.entity()).unwrap();
+    let mut color = players.get_mut(trigger.target()).unwrap();
     **color = Default::default();
 
     commands
-        .entity(trigger.entity())
+        .entity(trigger.target())
         .remove::<Actions<Swimming>>();
 }
 

examples/context_switch.rs

@@ -42,7 +42,7 @@ fn spawn(mut commands: Commands) {
 }
 
 fn foot_binding(trigger: Trigger<Binding<OnFoot>>, mut players: Query<&mut Actions<OnFoot>>) {
-    let mut actions = players.get_mut(trigger.entity()).unwrap();
+    let mut actions = players.get_mut(trigger.target()).unwrap();
     actions
         .bind::<Move>()
         .to(Cardinal::wasd_keys())
@@ -56,7 +56,7 @@ fn foot_binding(trigger: Trigger<Binding<OnFoot>>, mut players: Query<&mut Actio
 }
 
 fn car_binding(trigger: Trigger<Binding<InCar>>, mut players: Query<&mut Actions<InCar>>) {
-    let mut actions = players.get_mut(trigger.entity()).unwrap();
+    let mut actions = players.get_mut(trigger.target()).unwrap();
     actions
         .bind::<Move>()
         .to(Cardinal::wasd_keys())
@@ -69,12 +69,12 @@ fn car_binding(trigger: Trigger<Binding<InCar>>, mut players: Query<&mut Actions
 }
 
 fn apply_movement(trigger: Trigger<Fired<Move>>, mut players: Query<&mut Transform>) {
-    let mut transform = players.get_mut(trigger.entity()).unwrap();
+    let mut transform = players.get_mut(trigger.target()).unwrap();
     transform.translation += trigger.value.extend(0.0);
 }
 
 fn rotate(trigger: Trigger<Started<Rotate>>, mut players: Query<&mut Transform>) {
-    let mut transform = players.get_mut(trigger.entity()).unwrap();
+    let mut transform = players.get_mut(trigger.target()).unwrap();
     transform.rotate_z(FRAC_PI_4);
 }
 
@@ -84,11 +84,11 @@ fn enter_car(
     mut players: Query<&mut PlayerColor>,
 ) {
     // Change color for visibility.
-    let mut color = players.get_mut(trigger.entity()).unwrap();
+    let mut color = players.get_mut(trigger.target()).unwrap();
     **color = FUCHSIA_400.into();
 
     commands
-        .entity(trigger.entity())
+        .entity(trigger.target())
         .remove::<Actions<OnFoot>>()
         .insert(Actions::<InCar>::default());
 }
@@ -98,11 +98,11 @@ fn exit_car(
     mut commands: Commands,
     mut players: Query<&mut PlayerColor>,
 ) {
-    let mut color = players.get_mut(trigger.entity()).unwrap();
+    let mut color = players.get_mut(trigger.target()).unwrap();
     **color = Default::default();
 
     commands
-        .entity(trigger.entity())
+        .entity(trigger.target())
         .remove::<Actions<InCar>>()
         .insert(Actions::<OnFoot>::default());
 }

examples/keybinding_menu.rs

@@ -26,10 +26,8 @@ impl Plugin for KeybindingMenuPlugin {
                 (
                     update_button_text,
                     (
-                        cancel_binding
-                            .never_param_warn()
-                            .run_if(input_just_pressed(KeyCode::Escape)),
-                        bind.never_param_warn(),
+                        cancel_binding.run_if(input_just_pressed(KeyCode::Escape)),
+                        bind,
                     )
                         .chain(),
                 ),
@@ -62,11 +60,11 @@ fn setup(mut commands: Commands) {
 
     // We use separate root node to let dialogs cover the whole UI.
     commands
-        .spawn((Node {
+        .spawn(Node {
             width: Val::Percent(100.0),
             height: Val::Percent(100.0),
             ..Default::default()
-        },))
+        })
         .with_children(|parent| {
             parent
                 .spawn(Node {
@@ -124,7 +122,7 @@ struct SettingsField(&'static str);
 /// Number of input columns.
 const INPUTS_PER_ACTION: usize = 3;
 
-fn setup_actions(parent: &mut ChildBuilder, settings: &KeyboardSettings) -> Entity {
+fn setup_actions(parent: &mut ChildSpawnerCommands, settings: &KeyboardSettings) -> Entity {
     parent
         .spawn(Node {
             display: Display::Grid,
@@ -172,7 +170,7 @@ fn setup_actions(parent: &mut ChildBuilder, settings: &KeyboardSettings) -> Enti
 }
 
 fn setup_action_row(
-    parent: &mut ChildBuilder,
+    parent: &mut ChildSpawnerCommands,
     name: &'static str,
     inputs: &[Input],
     field: SettingsField,
@@ -210,7 +208,7 @@ fn delete_binding(
     mut input_buttons: Query<(&Name, &mut InputButton)>,
     delete_buttons: Query<&DeleteButton>,
 ) {
-    let delete_button = delete_buttons.get(trigger.entity()).unwrap();
+    let delete_button = delete_buttons.get(trigger.target()).unwrap();
     let (name, mut input_button) = input_buttons
         .get_mut(delete_button.button_entity)
         .expect("delete button should point to an input button");
@@ -221,16 +219,16 @@ fn delete_binding(
 fn show_binding_dialog(
     trigger: Trigger<Pointer<Click>>,
     mut commands: Commands,
-    root_entity: Single<Entity, (With<Node>, Without<Parent>)>,
+    root_entity: Single<Entity, (With<Node>, Without<ChildOf>)>,
     names: Query<&Name>,
 ) {
-    let name = names.get(trigger.entity()).unwrap();
+    let name = names.get(trigger.target()).unwrap();
     info!("starting binding for '{name}'");
 
     commands.entity(*root_entity).with_children(|parent| {
         parent
             .spawn(BindingDialog {
-                button_entity: trigger.entity(),
+                button_entity: trigger.target(),
             })
             .with_children(|parent| {
                 parent
@@ -264,7 +262,7 @@ fn bind(
     mut key_events: EventReader<KeyboardInput>,
     mut mouse_button_events: EventReader<MouseButtonInput>,
     dialog: Single<(Entity, &BindingDialog)>,
-    root_entity: Single<Entity, (With<Node>, Without<Parent>)>,
+    root_entity: Single<Entity, (With<Node>, Without<ChildOf>)>,
     mut buttons: Query<(Entity, &Name, &mut InputButton)>,
 ) {
     let keys = key_events
@@ -337,12 +335,12 @@ fn bind(
         button.input = Some(input);
     }
 
-    commands.entity(dialog_entity).despawn_recursive();
+    commands.entity(dialog_entity).despawn();
 }
 
 fn cancel_binding(mut commands: Commands, dialog_entity: Single<Entity, With<BindingDialog>>) {
     info!("cancelling binding");
-    commands.entity(*dialog_entity).despawn_recursive();
+    commands.entity(*dialog_entity).despawn();
 }
 
 fn replace_binding(
@@ -364,7 +362,7 @@ fn replace_binding(
     button.input = input;
 
     info!("reassigning binding to '{name}'");
-    commands.entity(dialog_entity).despawn_recursive();
+    commands.entity(dialog_entity).despawn();
 }
 
 fn cancel_replace_binding(
@@ -373,7 +371,7 @@ fn cancel_replace_binding(
     dialog_entity: Single<Entity, With<ConflictDialog>>,
 ) {
     info!("cancelling replace binding");
-    commands.entity(*dialog_entity).despawn_recursive();
+    commands.entity(*dialog_entity).despawn();
 }
 
 fn apply(
@@ -432,13 +430,13 @@ fn update_button_background(
 #[derive(Component, Default)]
 #[require(
     Button,
-    Node(|| Node {
+    Node {
         justify_content: JustifyContent::Center,
         align_items: AlignItems::Center,
         width: Val::Px(160.0),
         height: Val::Px(35.0),
         ..Default::default()
-    }),
+    },
 )]
 struct SettingsButton;
 
@@ -454,13 +452,13 @@ struct InputButton {
 #[derive(Component)]
 #[require(
     Button,
-    Node(|| Node {
+    Node {
         justify_content: JustifyContent::Center,
         align_items: AlignItems::Center,
         width: Val::Px(35.0),
         height: Val::Px(35.0),
         ..Default::default()
-    }),
+    },
 )]
 struct DeleteButton {
     /// Entity with [`InputButton`].
@@ -469,16 +467,16 @@ struct DeleteButton {
 
 #[derive(Component, Default)]
 #[require(
-    Node(|| Node {
+    Node {
         position_type: PositionType::Absolute,
         width: Val::Percent(100.0),
         height: Val::Percent(100.0),
         align_items: AlignItems::Center,
         justify_content: JustifyContent::Center,
         ..Default::default()
-    }),
-    FocusPolicy(|| FocusPolicy::Block),
-    BackgroundColor(|| BackgroundColor(Color::srgba(1.0, 1.0, 1.0, 0.3))),
+    },
+    FocusPolicy::Block,
+    BackgroundColor(Color::srgba(1.0, 1.0, 1.0, 0.3)),
 )]
 struct Dialog;
 

examples/local_multiplayer.rs

@@ -62,7 +62,7 @@ fn binding(
     gamepads: Res<Gamepads>,
     mut players: Query<(&Player, &mut Actions<Player>)>,
 ) {
-    let (&player, mut actions) = players.get_mut(trigger.entity()).unwrap();
+    let (&player, mut actions) = players.get_mut(trigger.target()).unwrap();
 
     // By default actions read inputs from all gamepads,
     // but for local multiplayer we need assign specific
@@ -101,12 +101,12 @@ fn binding(
 }
 
 fn apply_movement(trigger: Trigger<Fired<Move>>, mut players: Query<&mut Transform>) {
-    let mut transform = players.get_mut(trigger.entity()).unwrap();
+    let mut transform = players.get_mut(trigger.target()).unwrap();
     transform.translation += trigger.value.extend(0.0);
 }
 
 fn rotate(trigger: Trigger<Started<Rotate>>, mut players: Query<&mut Transform>) {
-    let mut transform = players.get_mut(trigger.entity()).unwrap();
+    let mut transform = players.get_mut(trigger.target()).unwrap();
     transform.rotate_z(FRAC_PI_4);
 }
 

examples/simple.rs

@@ -43,7 +43,7 @@ fn spawn(mut commands: Commands) {
 // It's also possible to create bindings before the insertion,
 // but this way you can conveniently reload bindings when settings change.
 fn binding(trigger: Trigger<Binding<Player>>, mut players: Query<&mut Actions<Player>>) {
-    let mut actions = players.get_mut(trigger.entity()).unwrap();
+    let mut actions = players.get_mut(trigger.target()).unwrap();
 
     // Bindings like WASD or sticks are very common,
     // so we provide built-ins to assign all keys/axes at once.
@@ -66,13 +66,13 @@ fn binding(trigger: Trigger<Binding<Player>>, mut players: Query<&mut Actions<Pl
 }
 
 fn apply_movement(trigger: Trigger<Fired<Move>>, mut players: Query<&mut Transform>) {
-    let mut transform = players.get_mut(trigger.entity()).unwrap();
+    let mut transform = players.get_mut(trigger.target()).unwrap();
     // The value has already been preprocessed by defined modifiers.
     transform.translation += trigger.value.extend(0.0);
 }
 
 fn rotate(trigger: Trigger<Started<Rotate>>, mut players: Query<&mut Transform>) {
-    let mut transform = players.get_mut(trigger.entity()).unwrap();
+    let mut transform = players.get_mut(trigger.target()).unwrap();
     transform.rotate_z(FRAC_PI_4);
 }