From 6a2182ce52e5ecd67cec60ac55445307dc7c9baf Mon Sep 17 00:00:00 2001
From: Nolan Darilek <nolan@thewordnerd.info>
Date: Fri, 16 May 2025 10:26:13 -0500
Subject: [PATCH] chore: Update to Bevy 0.16.

---
 Cargo.toml |  6 +++---
 src/lib.rs | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d29bd0d..4ae1506 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,12 +10,12 @@ repository = "https://labs.lightsout.games/projects/bevy_synthizer"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { version = "0.15", default-features = false, features = ["bevy_asset"] }
+bevy = { version = "0.16", default-features = false, features = ["bevy_asset"] }
 synthizer = "0.5.6"
-thiserror = "1"
+thiserror = "2"
 
 [dev-dependencies]
-bevy = { version = "0.15", default-features = true }
+bevy = { version = "0.16", default-features = true }
 
 [package.metadata.release]
 publish = false
diff --git a/src/lib.rs b/src/lib.rs
index db2a719..3c1a42f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -188,7 +188,7 @@ fn update_listener(
     context: ResMut<Context>,
     listener: Query<Option<&GlobalTransform>, With<Listener>>,
 ) {
-    if let Ok(transform) = listener.get_single() {
+    if let Ok(transform) = listener.single() {
         let transform: Transform = transform
             .map(|v| {
                 let transform: Transform = (*v).into();
@@ -272,9 +272,9 @@ fn add_source_handle(
 fn add_generator(
     context: Res<Context>,
     buffers: Res<Assets<Buffer>>,
-    mut query: Query<(Entity, Option<&Parent>, &mut Sound)>,
+    mut query: Query<(Entity, Option<&ChildOf>, &mut Sound)>,
     mut sources: Query<&mut Source>,
-    parents: Query<&Parent>,
+    parents: Query<&ChildOf>,
 ) {
     for (entity, parent, mut sound) in &mut query {
         if sound.generator.is_some() {
@@ -286,11 +286,11 @@ fn add_generator(
             let mut parent = parent;
             let mut target = None;
             while let Some(p) = parent {
-                if sources.get(**p).is_ok() {
-                    target = Some(**p);
+                if sources.get(p.parent()).is_ok() {
+                    target = Some(p.parent());
                     break;
                 }
-                parent = parents.get(**p).ok();
+                parent = parents.get(p.parent()).ok();
             }
             target.map(|v| sources.get_mut(v).unwrap())
         } else {
@@ -341,7 +341,7 @@ fn add_generator(
 fn add_sound_without_source(
     mut commands: Commands,
     query: Query<Entity, (Added<Sound>, Without<Source>)>,
-    parents: Query<(&Parent, Option<&Source>)>,
+    parents: Query<(&ChildOf, Option<&Source>)>,
 ) {
     for entity in &query {
         let mut has_source = false;
@@ -351,7 +351,7 @@ fn add_sound_without_source(
                 has_source = true;
                 break;
             }
-            target = **parent;
+            target = parent.parent();
         }
         if !has_source {
             commands.entity(entity).insert(Source::default());
@@ -709,10 +709,10 @@ fn events(
             if *generator.handle() == event.source {
                 match event.r#type {
                     syz::EventType::Finished => {
-                        output.send(SynthizerEvent::Finished(entity));
+                        output.write(SynthizerEvent::Finished(entity));
                     }
                     syz::EventType::Looped => {
-                        output.send(SynthizerEvent::Looped(entity));
+                        output.write(SynthizerEvent::Looped(entity));
                     }
                     _ => {}
                 }