Merge pull request #217 from wiggleforlife/main

Update to Bevy 0.15

Author: janhohenheim

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_yarnspinner"
-version = "0.3.1"
+version = "0.4.0"
 edition = "2021"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -20,13 +20,13 @@ audio_assets = ["bevy/bevy_audio", "bevy/vorbis"]
 anyhow = "1"
 csv = "1"
 serde = { version = "1", features = ["derive"] }
-yarnspinner = { path = "../yarnspinner", features = ["bevy", "serde"], version = "0.3.0" }
+yarnspinner = { path = "../yarnspinner", features = ["bevy", "serde"], version = "0.4.0" }
 sha2 = "0.10"
 rand = { version = "0.8", features = ["small_rng"] }
 
 
 [dependencies.bevy]
-version = "0.14.0"
+version = "0.15.0"
 default-features = false
 features = [
     "bevy_asset",
@@ -38,7 +38,7 @@ tempfile = "3"
 static_assertions = "1.1.0"
 
 [dev-dependencies.bevy]
-version = "0.14.0"
+version = "0.15.0"
 default-features = false
 features = [
     "bevy_core_pipeline",

crates/bevy_plugin/Cargo.toml

@@ -271,6 +271,9 @@ mod tests {
         let element = &debug_string[element_start..element_end];
 
         // Not testing the part after because its stability is not guaranteed.
-        assert_eq!(element, "{\"test\": fn(bevy_ecs::system::In<(f32, f32)>)");
+        assert_eq!(
+            element,
+            "{\"test\": fn(bevy_ecs::system::input::In<(f32, f32)>)"
+        );
     }
 }

crates/bevy_plugin/src/commands/command_registry.rs

@@ -36,7 +36,7 @@ pub(crate) fn command_wrapping_plugin(_app: &mut App) {}
 /// commands.add_command("add_player", add_player);
 ///
 /// fn add_player(_: In<()>, time: Res<Time>) {
-///    println!("Time since game start: {}", time.elapsed_seconds());
+///    println!("Time since game start: {}", time.elapsed_secs());
 /// }
 /// ```
 /// This command can be called from Yarn with `<<print_time>>`. Note how because we accept no parameters from Yarn, we use `In<()>` as the first parameter.

crates/bevy_plugin/src/commands/command_wrapping.rs

@@ -2,7 +2,7 @@ use crate::commands::UntypedYarnCommand;
 use crate::dialogue_runner::DialogueExecutionSystemSet;
 use crate::events::ExecuteCommandEvent;
 use crate::prelude::*;
-use bevy::ecs::event::ManualEventReader;
+use bevy::ecs::event::EventCursor;
 use bevy::prelude::*;
 
 pub(crate) fn command_execution_plugin(app: &mut App) {
@@ -14,8 +14,8 @@ pub(crate) fn command_execution_plugin(app: &mut App) {
     );
 }
 
-fn execute_commands(world: &mut World, mut reader: Local<ManualEventReader<ExecuteCommandEvent>>) {
-    let events = clone_events(world, &mut reader);
+fn execute_commands(world: &mut World, mut cursor: Local<EventCursor<ExecuteCommandEvent>>) {
+    let events = clone_events(world, &mut cursor);
     for event in events {
         let Some(mut command) = clone_command(world, &event) else {
             continue;
@@ -30,10 +30,10 @@ fn execute_commands(world: &mut World, mut reader: Local<ManualEventReader<Execu
 
 fn clone_events(
     world: &World,
-    reader: &mut ManualEventReader<ExecuteCommandEvent>,
+    cursor: &mut EventCursor<ExecuteCommandEvent>,
 ) -> Vec<ExecuteCommandEvent> {
     let events = world.resource::<Events<ExecuteCommandEvent>>();
-    reader.read(events).cloned().collect()
+    cursor.read(events).cloned().collect()
 }
 
 fn clone_command(

crates/bevy_plugin/src/commands/execution.rs

@@ -13,7 +13,7 @@ pub struct InnerDialogue<'a>(pub(crate) &'a Dialogue);
 #[derive(Debug)]
 pub struct InnerDialogueMut<'a>(pub(crate) &'a mut Dialogue);
 
-impl<'a> InnerDialogue<'a> {
+impl InnerDialogue<'_> {
     /// Proxy for [`Dialogue::node_names`].
     pub fn node_names(&self) -> impl Iterator<Item = &str> {
         self.0.node_names().unwrap()
@@ -33,7 +33,7 @@ impl<'a> InnerDialogue<'a> {
     }
 }
 
-impl<'a> InnerDialogueMut<'a> {
+impl InnerDialogueMut<'_> {
     /// Proxy for [`Dialogue::node_names`].
     pub fn node_names(&self) -> impl Iterator<Item = &str> {
         self.0.node_names().unwrap()

crates/bevy_plugin/src/dialogue_runner/inner.rs

@@ -2,7 +2,7 @@ use crate::fmt_utils::SkipDebug;
 use crate::prelude::*;
 use crate::UnderlyingTextProvider;
 
-use bevy::ecs::event::ManualEventReader;
+use bevy::ecs::event::EventCursor;
 use bevy::prelude::*;
 use std::any::Any;
 use std::collections::HashMap;
@@ -23,7 +23,7 @@ pub struct StringsFileTextProvider {
     base_string_table: HashMap<LineId, StringInfo>,
     strings_file_handle: Option<Handle<StringsFile>>,
     translation_string_table: Option<HashMap<LineId, String>>,
-    event_reader: Arc<RwLock<ManualEventReader<AssetEvent<StringsFile>>>>,
+    event_cursor: Arc<RwLock<EventCursor<AssetEvent<StringsFile>>>>,
 }
 
 impl UnderlyingTextProvider for StringsFileTextProvider {
@@ -115,7 +115,7 @@ impl StringsFileTextProvider {
             base_string_table: yarn_project.compilation.string_table.clone(),
             strings_file_handle: None,
             translation_string_table: None,
-            event_reader: Default::default(),
+            event_cursor: Default::default(),
         }
     }
     fn set_language_invalidating_translation(&mut self, language: impl Into<Option<Language>>) {
@@ -158,8 +158,8 @@ impl TextProvider for StringsFileTextProvider {
         }
         let asset_events = world.resource::<Events<AssetEvent<StringsFile>>>();
         let strings_file_has_changed = || {
-            let mut reader = self.event_reader.write().unwrap();
-            reader.read(asset_events).any(|event| match event {
+            let mut cursor = self.event_cursor.write().unwrap();
+            cursor.read(asset_events).any(|event| match event {
                 AssetEvent::Modified { id } => *id == handle.id(),
                 _ => false,
             })

crates/bevy_plugin/src/line_provider/text_provider/strings_file_text_provider.rs

@@ -15,10 +15,9 @@ pub(crate) fn line_id_generation_plugin(app: &mut App) {
         (
             handle_yarn_file_events
                 .pipe(panic_on_err)
-                .run_if(in_development.and_then(has_localizations)),
+                .run_if(in_development.and(has_localizations)),
             handle_yarn_file_events_outside_development.run_if(
-                resource_exists::<YarnProject>
-                    .and_then(not(in_development.and_then(has_localizations))),
+                resource_exists::<YarnProject>.and(not(in_development.and(has_localizations))),
             ),
         )
             .chain()

crates/bevy_plugin/src/localization/line_id_generation.rs

@@ -2,7 +2,7 @@
 
 use crate::prelude::*;
 use anyhow::{anyhow, bail};
-use bevy::asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext};
+use bevy::asset::{io::Reader, AssetLoader, LoadContext};
 use bevy::prelude::*;
 use bevy::reflect::TypePath;
 use bevy::utils::HashMap;
@@ -23,11 +23,11 @@ impl AssetLoader for StringsFileAssetLoader {
     type Asset = StringsFile;
     type Settings = ();
     type Error = anyhow::Error;
-    async fn load<'a>(
-        &'a self,
-        reader: &'a mut Reader<'_>,
-        _settings: &'a (),
-        _load_context: &'a mut LoadContext<'_>,
+    async fn load(
+        &self,
+        reader: &mut dyn Reader,
+        _settings: &(),
+        _load_context: &mut LoadContext<'_>,
     ) -> Result<Self::Asset, Self::Error> {
         let mut bytes = Vec::new();
         reader.read_to_end(&mut bytes).await?;

crates/bevy_plugin/src/localization/strings_file/asset.rs

@@ -13,9 +13,9 @@ pub(crate) fn strings_file_updating_plugin(app: &mut App) {
                 .in_set(YarnSpinnerSystemSet)
                 .run_if(
                     in_development
-                        .and_then(has_localizations)
-                        .and_then(resource_exists::<YarnProject>)
-                        .and_then(events_in_queue::<UpdateAllStringsFilesForStringTableEvent>()),
+                        .and(has_localizations)
+                        .and(resource_exists::<YarnProject>)
+                        .and(events_in_queue::<UpdateAllStringsFilesForStringTableEvent>()),
                 ),)
                 .chain(),
         );