Merge pull request #221 from YarnSpinnerTool/bevy-0.16

Update to Bevy 0.16.0-RC

Author: janhohenheim

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_yarnspinner"
-version = "0.4.0"
+version = "0.5.0-rc.1"
 edition = "2021"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
@@ -20,30 +20,28 @@ audio_assets = ["bevy/bevy_audio", "bevy/vorbis"]
 anyhow = "1"
 csv = "1"
 serde = { version = "1", features = ["derive"] }
-yarnspinner = { path = "../yarnspinner", features = ["bevy", "serde"], version = "0.4.0" }
+yarnspinner = { path = "../yarnspinner", features = [
+    "bevy",
+    "serde",
+], version = "0.5.0-rc" }
 sha2 = "0.10"
 rand = { version = "0.8", features = ["small_rng"] }
+variadics_please = "1"
 
 
 [dependencies.bevy]
-version = "0.15.0"
+version = "0.16.0-rc"
 default-features = false
-features = [
-    "bevy_asset",
-    "multi_threaded",
-]
+features = ["bevy_asset", "multi_threaded"]
 
 [dev-dependencies]
 tempfile = "3"
 static_assertions = "1.1.0"
 
 [dev-dependencies.bevy]
-version = "0.15.0"
+version = "0.16.0-rc"
 default-features = false
-features = [
-    "bevy_core_pipeline",
-    "bevy_audio",
-]
+features = ["bevy_core_pipeline", "bevy_audio"]
 
 [target.'cfg(all(not(target_arch = "wasm32"), not(target_os = "android")))'.dependencies]
 glob = "0.3.1"

crates/bevy_plugin/Cargo.toml

@@ -2,8 +2,8 @@
 //! Alas, Wasm forces us to do this
 
 use crate::prelude::YarnSpinnerSystemSet;
+use bevy::platform_support::collections::HashMap;
 use bevy::prelude::*;
-use bevy::utils::HashMap;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::time::Duration;

crates/bevy_plugin/src/commands/command_registry/wait.rs

@@ -2,11 +2,11 @@ use crate::prelude::*;
 use bevy::ecs::system::{SystemParam, SystemParamItem, SystemState};
 use bevy::prelude::*;
 use bevy::tasks::Task;
-use bevy::utils::all_tuples;
 use std::fmt::{Debug, Display, Formatter};
 use std::marker::PhantomData;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, RwLock};
+use variadics_please::all_tuples;
 use yarnspinner::core::{YarnFnParam, YarnFnParamItem, YarnValueWrapper};
 
 pub(crate) fn command_wrapping_plugin(_app: &mut App) {}

crates/bevy_plugin/src/commands/command_wrapping.rs

@@ -12,10 +12,10 @@ use crate::commands::TaskFinishedIndicator;
 use crate::line_provider::LineAssets;
 use crate::prelude::*;
 use crate::UnderlyingYarnLine;
-use anyhow::{anyhow, bail};
+use anyhow::{anyhow, bail, Result};
 use bevy::asset::LoadedUntypedAsset;
-use bevy::utils::HashSet;
-use bevy::{prelude::*, utils::HashMap};
+use bevy::platform_support::collections::HashSet;
+use bevy::{platform_support::collections::HashMap, prelude::*};
 pub(crate) use runtime_interaction::DialogueExecutionSystemSet;
 use std::any::TypeId;
 use std::fmt::Debug;

crates/bevy_plugin/src/dialogue_runner.rs

@@ -2,8 +2,8 @@ use crate::default_impl::{MemoryVariableStorage, StringsFileTextProvider};
 use crate::fmt_utils::SkipDebug;
 use crate::line_provider::SharedTextProvider;
 use crate::prelude::*;
+use bevy::platform_support::collections::HashMap;
 use bevy::prelude::*;
-use bevy::utils::HashMap;
 use rand::{rngs::SmallRng, Rng, SeedableRng};
 use std::any::{Any, TypeId};
 use std::fmt::Debug;
@@ -31,7 +31,7 @@ impl DialogueRunnerBuilder {
             text_provider: SharedTextProvider::new(StringsFileTextProvider::from_yarn_project(
                 yarn_project,
             )),
-            asset_providers: HashMap::new(),
+            asset_providers: HashMap::default(),
             library: create_extended_standard_library(),
             commands: YarnCommands::builtin_commands(),
             compilation: yarn_project.compilation().clone(),

crates/bevy_plugin/src/dialogue_runner/builder.rs

@@ -145,17 +145,17 @@ impl LocalizedLine {
     /// and updates the other attributes in this markup as follows:
     ///
     /// - Attributes that start and end before the deleted attribute are
-    ///     unmodified.
+    ///   unmodified.
     /// - Attributes that start before the deleted attribute and end inside it
-    ///     are truncated to remove the part overlapping the deleted attribute.
+    ///   are truncated to remove the part overlapping the deleted attribute.
     /// - Attributes that have the same position and length as the deleted
-    ///     attribute are deleted, if they apply to any text.
+    ///   attribute are deleted, if they apply to any text.
     /// - Attributes that start and end within the deleted attribute are deleted.
     /// - Attributes that start within the deleted attribute, and end outside
-    ///     it, have their start truncated to remove the part overlapping the
-    ///     deleted attribute.
+    ///   it, have their start truncated to remove the part overlapping the
+    ///   deleted attribute.
     /// - Attributes that start after the deleted attribute have their start
-    ///     point adjusted to account for the deleted text.
+    ///   point adjusted to account for the deleted text.
     ///
     /// This method does not modify the current object. A new  [`LocalizedLine`] is returned.
     ///

crates/bevy_plugin/src/dialogue_runner/localized_line.rs

@@ -5,8 +5,8 @@ use crate::line_provider::LineProviderSystemSet;
 use crate::prelude::*;
 use anyhow::bail;
 use bevy::asset::LoadedUntypedAsset;
+use bevy::platform_support::collections::HashMap;
 use bevy::prelude::*;
-use bevy::utils::HashMap;
 
 pub(crate) fn runtime_interaction_plugin(app: &mut App) {
     app.add_systems(
@@ -46,7 +46,7 @@ fn continue_runtime(
         let is_sending_missed_events = !dialogue_runner.unsent_events.is_empty();
         if !is_sending_missed_events {
             if dialogue_runner.just_started {
-                dialogue_start_events.send(DialogueStartEvent { source });
+                dialogue_start_events.write(DialogueStartEvent { source });
                 dialogue_runner.just_started = false;
             }
             if !dialogue_runner.is_running {
@@ -55,7 +55,7 @@ fn continue_runtime(
             }
 
             if let Some(line_ids) = std::mem::take(&mut dialogue_runner.popped_line_hints) {
-                line_hints_events.send(LineHintsEvent { line_ids, source });
+                line_hints_events.write(LineHintsEvent { line_ids, source });
             }
 
             if !(dialogue_runner.will_continue_in_next_update
@@ -80,7 +80,7 @@ fn continue_runtime(
                             .join(", ");
                         bail!("Dialogue options does not contain selected option. Expected one of [{expected_options}], but found {option}");
                     };
-                    present_line_events.send(PresentLineEvent {
+                    present_line_events.write(PresentLineEvent {
                         line: option.line,
                         source,
                     });
@@ -99,7 +99,7 @@ fn continue_runtime(
                 DialogueEvent::Line(line) => {
                     let assets = dialogue_runner.get_assets(&line);
                     let metadata = project.line_metadata(&line.id).unwrap_or_default().to_vec();
-                    present_line_events.send(PresentLineEvent {
+                    present_line_events.write(PresentLineEvent {
                         line: LocalizedLine::from_yarn_line(line, assets, metadata),
                         source,
                     });
@@ -117,26 +117,26 @@ fn continue_runtime(
                         })
                         .collect();
                     last_options.insert(source, options.clone());
-                    present_options_events.send(PresentOptionsEvent { options, source });
+                    present_options_events.write(PresentOptionsEvent { options, source });
                 }
                 DialogueEvent::Command(command) => {
-                    execute_command_events.send(ExecuteCommandEvent { command, source });
+                    execute_command_events.write(ExecuteCommandEvent { command, source });
                     dialogue_runner.continue_in_next_update();
                 }
                 DialogueEvent::NodeComplete(node_name) => {
-                    node_complete_events.send(NodeCompleteEvent { node_name, source });
+                    node_complete_events.write(NodeCompleteEvent { node_name, source });
                 }
                 DialogueEvent::NodeStart(node_name) => {
-                    node_start_events.send(NodeStartEvent { node_name, source });
+                    node_start_events.write(NodeStartEvent { node_name, source });
                 }
                 DialogueEvent::LineHints(line_ids) => {
-                    line_hints_events.send(LineHintsEvent { line_ids, source });
+                    line_hints_events.write(LineHintsEvent { line_ids, source });
                 }
                 DialogueEvent::DialogueComplete => {
                     if !is_sending_missed_events {
                         dialogue_runner.is_running = false;
                     }
-                    dialogue_complete_events.send(DialogueCompleteEvent { source });
+                    dialogue_complete_events.write(DialogueCompleteEvent { source });
                 }
             }
         }

crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs

@@ -9,7 +9,7 @@
 //! - [`YarnSpinnerPlugin`]: The plugin registering all systems and types.
 //! - [`YarnProject`]: A [`Resource`](bevy::prelude::Resource) for the compiled Yarn project, which is created for you when [`YarnSpinnerPlugin`] is added.
 //! - [`DialogueRunner`]: The [`Component`](bevy::prelude::Component) running through the Yarn files and sending events for things you should draw on the screen.
-//!     Can be created from a [`YarnProject`].
+//!   Can be created from a [`YarnProject`].
 //!
 //! ## Dialogue Views
 //!
@@ -39,7 +39,7 @@
 //! The main workflow is as follows:
 //! - Register the [`YarnSpinnerPlugin`]
 //! - When the [`YarnProject`] [`Resource`](bevy::prelude::Resource) is added, spawn a [`DialogueRunner`] from it.
-//!     The latter can nicely be done with `my_system.run_if(resource_added::<YarnProject>)`.
+//!   The latter can nicely be done with `my_system.run_if(resource_added::<YarnProject>)`.
 //!
 //! The following example is adapted from the [hello world example](https://github.com/YarnSpinnerTool/YarnSpinner-Rust/blob/main/examples/bevy_yarnspinner/src/bin/hello_world.rs).
 //!
@@ -53,7 +53,7 @@
 //!
 //! ```no_run
 //! // src/main.rs
-//! use bevy::{prelude::*, utils::Duration};
+//! use bevy::prelude::*;
 //! use bevy_yarnspinner::prelude::*;
 //! // Use the example dialogue view to see the dialogue in action. Requires the `bevy_yarnspinner_example_dialogue_view` crate.
 //! // use bevy_yarnspinner_example_dialogue_view::prelude::*;
@@ -79,7 +79,7 @@
 //! }
 //!
 //! fn setup_camera(mut commands: Commands) {
-//!     commands.spawn(Camera2dBundle::default());
+//!     commands.spawn(Camera2d::default());
 //! }
 //!
 //! fn spawn_dialogue_runner(mut commands: Commands, project: Res<YarnProject>) {
@@ -144,14 +144,14 @@ pub mod prelude {
         yarn_file_asset::YarnFile,
     };
     pub(crate) use crate::{localization::StringsFile, utils::*};
-    pub(crate) use anyhow::{Context, Error, Result};
+    pub(crate) use anyhow::{Context, Error};
     pub(crate) use serde::{Deserialize, Serialize};
     pub(crate) use yarnspinner::prelude::*;
     pub use yarnspinner::prelude::{
         IntoYarnValueFromNonYarnValue, Language, LineId, MarkupAttribute, MarkupValue, OptionId,
         VariableStorage, YarnFn, YarnLibrary, YarnValue,
     };
-    pub(crate) type SystemResult = Result<()>;
+    pub(crate) type SystemResult = anyhow::Result<()>;
 }
 
 pub use crate::commands::{TaskFinishedIndicator, UntypedYarnCommand};

crates/bevy_plugin/src/lib.rs

@@ -3,8 +3,8 @@ use crate::UnderlyingYarnLine;
 #[cfg(feature = "audio_assets")]
 pub use audio_asset_provider_plugin::AudioAssetProvider;
 use bevy::asset::{Asset, LoadedUntypedAsset};
+use bevy::platform_support::collections::HashMap;
 use bevy::prelude::*;
-use bevy::utils::HashMap;
 pub use file_extension_asset_provider_plugin::{file_extensions, FileExtensionAssetProvider};
 use std::any::Any;
 use std::fmt::Debug;
@@ -157,7 +157,7 @@ pub struct LineAssets(HashMap<&'static str, UntypedHandle>);
 impl LineAssets {
     /// Creates a new empty [`LineAssets`] struct.
     pub fn new() -> Self {
-        Self(HashMap::new())
+        Self(HashMap::default())
     }
 
     /// Creates a new [`LineAssets`] struct from an iterator of untyped [`Handle`]s and the [`TypePath::type_path`] of the [`Asset`] they reference.