feat(bevy): Update to bevy 0.16 (#116)

* feat(bevy): Update to bevy 0.12.1

* update tests

* fix imports for trace feature

Author: ntibi

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "big-brain"
-version = "0.22.0"
+version = "0.23.0"
 authors = ["Kat Marchán <[email protected]>"]
 edition = "2021"
 description = "Rusty Utility AI library"
@@ -15,11 +15,11 @@ homepage = "https://github.com/zkat/big-brain"
 [workspace]
 
 [dependencies]
-bevy = { version = "0.15.0", default-features = false }
-big-brain-derive = { version = "=0.22.0", path = "./derive" }
+bevy = { version = "0.16.0", default-features = false, features = ["bevy_log"] }
+big-brain-derive = { version = "=0.23.0", path = "./derive" }
 
 [dev-dependencies]
-bevy = { version = "0.15.0", default-features = true }
+bevy = { version = "0.16.0", default-features = true }
 rand = { version = "0.8.5", features = ["small_rng"] }
 
 [features]

README.md

@@ -129,7 +129,7 @@ fn main() {
 
 #### bevy version and MSRV
 
-The current version of `big-brain` is compatible with `bevy` 0.15.0.
+The current version of `big-brain` is compatible with `bevy` 0.16.0.
 
 The Minimum Supported Rust Version for `big-brain` should be considered to
 be the same as `bevy`'s, which as of the time of this writing was "the

derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "big-brain-derive"
-version = "0.22.0"
+version = "0.23.0"
 authors = ["Kat Marchán <[email protected]>"]
 description = "Procedural macros to simplify implementation of Big Brain traits"
 documentation = "https://docs.rs/big-brain-derive"

examples/concurrent.rs

@@ -6,7 +6,6 @@
 
 use bevy::log::LogPlugin;
 use bevy::prelude::*;
-use bevy::utils::tracing::debug;
 use big_brain::prelude::*;
 use rand::rngs::SmallRng;
 use rand::{Rng, SeedableRng};

examples/custom_measure.rs

@@ -1,9 +1,9 @@
 //! This example demonstrates how to build a custom measure and use that
 //! in a Thinker.
 
+use bevy::ecs::component::Mutable;
 use bevy::log::LogPlugin;
 use bevy::prelude::*;
-use bevy::utils::tracing::debug;
 use big_brain::prelude::*;
 use big_brain::scorers::MeasuredScorer;
 
@@ -81,7 +81,7 @@ pub struct EatWaffles;
 
 fn eat_thing_action<
     TActionMarker: std::fmt::Debug + Component,
-    TActorMarker: Component + EatFood,
+    TActorMarker: Component<Mutability = Mutable> + EatFood,
 >(
     time: Res<Time>,
     mut items: Query<&mut TActorMarker>,

examples/farming_sim.rs

@@ -483,6 +483,7 @@ fn init_entities(
     commands.insert_resource(AmbientLight {
         color: Color::WHITE,
         brightness: 700.0,
+        ..default()
     });
 
     commands.spawn((

examples/one_off.rs

@@ -1,6 +1,5 @@
 use bevy::log::LogPlugin;
 use bevy::prelude::*;
-use bevy::utils::tracing::{debug, trace};
 use big_brain::prelude::*;
 
 #[derive(Clone, Component, Debug, ActionBuilder)]

examples/sequence.rs

@@ -8,7 +8,6 @@
 
 use bevy::log::LogPlugin;
 use bevy::prelude::*;
-use bevy::utils::tracing::{debug, trace};
 use big_brain::prelude::*;
 
 /// First, we make a simple Position component.

examples/thirst.rs

@@ -1,6 +1,5 @@
 use bevy::log::LogPlugin;
 use bevy::prelude::*;
-use bevy::utils::tracing::{debug, trace};
 use big_brain::prelude::*;
 
 // First, we define a "Thirst" component and associated system. This is NOT

src/actions.rs

@@ -3,8 +3,6 @@
 use std::sync::Arc;
 
 use bevy::prelude::*;
-#[cfg(feature = "trace")]
-use bevy::utils::tracing::trace;
 
 use crate::thinker::{Action, ActionSpan, Actor};
 
@@ -287,8 +285,8 @@ pub fn steps_system(
                         let step_state = step_state.clone();
                         let mut seq_state = states.get_mut(seq_ent).expect("idk");
                         *seq_state = step_state;
-                        if let Some(ent) = cmd.get_entity(steps_action.active_ent.entity()) {
-                            ent.despawn_recursive();
+                        if let Ok(mut ent) = cmd.get_entity(steps_action.active_ent.entity()) {
+                            ent.despawn();
                         }
                     }
                     Success if steps_action.active_step == steps_action.steps.len() - 1 => {
@@ -298,16 +296,16 @@ pub fn steps_system(
                         let step_state = step_state.clone();
                         let mut seq_state = states.get_mut(seq_ent).expect("idk");
                         *seq_state = step_state;
-                        if let Some(ent) = cmd.get_entity(steps_action.active_ent.entity()) {
-                            ent.despawn_recursive();
+                        if let Ok(mut ent) = cmd.get_entity(steps_action.active_ent.entity()) {
+                            ent.despawn();
                         }
                     }
                     Success => {
                         #[cfg(feature = "trace")]
                         trace!("Step succeeded, but there's more steps. Spawning next action.");
                         // Deactivate current step and go to the next step
-                        if let Some(ent) = cmd.get_entity(steps_action.active_ent.entity()) {
-                            ent.despawn_recursive();
+                        if let Ok(mut ent) = cmd.get_entity(steps_action.active_ent.entity()) {
+                            ent.despawn();
                         }
 
                         steps_action.active_step += 1;