Merge pull request #265 from YarnSpinnerTool/prep-release-now

Prep release

Author: janhohenheim

crates/bevy_plugin/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevy_yarnspinner"
 version = "0.6.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/YarnSpinnerTool/YarnSpinner-Rust"
 homepage = "https://docs.yarnspinner.dev/"
 keywords = ["gamedev", "dialog", "yarn", "bevy"]

crates/bevy_plugin/src/commands.rs

@@ -1,6 +1,6 @@
 use bevy::prelude::*;
-pub(crate) use command_registry::wait::update_wait;
 pub use command_registry::YarnCommands;
+pub(crate) use command_registry::wait::update_wait;
 pub use command_wrapping::{TaskFinishedIndicator, UntypedYarnCommand, YarnCommand};
 
 mod command_registry;

crates/bevy_plugin/src/commands/command_registry.rs

@@ -1,5 +1,5 @@
-use crate::commands::command_wrapping::YarnCommandWrapper;
 use crate::commands::UntypedYarnCommand;
+use crate::commands::command_wrapping::YarnCommandWrapper;
 use crate::prelude::*;
 use bevy::prelude::*;
 use std::borrow::Cow;

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

@@ -4,8 +4,8 @@
 use crate::prelude::YarnSpinnerSystemSet;
 use bevy::platform::collections::HashMap;
 use bevy::prelude::*;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Duration;
 
 pub(crate) fn wait_command_plugin(app: &mut App) {

crates/bevy_plugin/src/commands/execution.rs

@@ -50,12 +50,12 @@ fn clone_command(
 
 fn get_dialogue_runner(world: &mut World, entity: Entity) -> &DialogueRunner {
     let mut dialogue_runners = world.query::<&DialogueRunner>();
-    let dialogue_runner = dialogue_runners.get(world, entity).unwrap();
-    dialogue_runner
+
+    (dialogue_runners.get(world, entity).unwrap()) as _
 }
 
 fn get_dialogue_runner_mut(world: &mut World, entity: Entity) -> Mut<'_, DialogueRunner> {
     let mut dialogue_runners = world.query::<&mut DialogueRunner>();
-    let dialogue_runner = dialogue_runners.get_mut(world, entity).unwrap();
-    dialogue_runner
+
+    dialogue_runners.get_mut(world, entity).unwrap()
 }

crates/bevy_plugin/src/dialogue_runner.rs

@@ -8,11 +8,11 @@ pub use self::{
     inner::{InnerDialogue, InnerDialogueMut},
     localized_line::LocalizedLine,
 };
+use crate::UnderlyingYarnLine;
 use crate::commands::TaskFinishedIndicator;
 use crate::line_provider::LineAssets;
 use crate::prelude::*;
-use crate::UnderlyingYarnLine;
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use bevy::asset::LoadedUntypedAsset;
 use bevy::{
     platform::collections::{HashMap, HashSet},
@@ -70,7 +70,9 @@ impl DialogueRunner {
     /// - All previously called [`YarnCommand`]s are finished, indicated by their return type's [`TaskFinishedIndicator::is_finished`] returning `true`.
     pub fn continue_in_next_update(&mut self) -> &mut Self {
         if !self.is_running {
-            panic!("Can't continue dialogue that isn't running. Please call `DialogueRunner::start_node()` before calling `DialogueRunner::continue_in_next_update()`.");
+            panic!(
+                "Can't continue dialogue that isn't running. Please call `DialogueRunner::start_node()` before calling `DialogueRunner::continue_in_next_update()`."
+            );
         }
         self.will_continue_in_next_update = true;
         self
@@ -87,7 +89,9 @@ impl DialogueRunner {
     /// Implies [`DialogueRunner::continue_in_next_update`].
     pub fn select_option(&mut self, option: OptionId) -> Result<&mut Self> {
         if !self.is_running {
-            bail!("Can't select option {option}: the dialogue is currently not running. Please call `DialogueRunner::continue_in_next_update()` only after receiving a `PresentOptionsEvent`.")
+            bail!(
+                "Can't select option {option}: the dialogue is currently not running. Please call `DialogueRunner::continue_in_next_update()` only after receiving a `PresentOptionsEvent`."
+            )
         }
         self.inner_mut()
             .0
@@ -157,7 +161,9 @@ impl DialogueRunner {
     pub fn try_start_node(&mut self, node_name: impl AsRef<str>) -> Result<&mut Self> {
         let node_name = node_name.as_ref();
         if self.is_running {
-            bail!("Can't start dialogue from node {node_name}: the dialogue is currently in the middle of running. Stop the dialogue first.");
+            bail!(
+                "Can't start dialogue from node {node_name}: the dialogue is currently in the middle of running. Stop the dialogue first."
+            );
         }
         self.is_running = true;
         self.just_started = true;

crates/bevy_plugin/src/dialogue_runner/builder.rs

@@ -4,7 +4,7 @@ use crate::line_provider::SharedTextProvider;
 use crate::prelude::*;
 use bevy::platform::collections::HashMap;
 use bevy::prelude::*;
-use rand::{rngs::SmallRng, Rng, SeedableRng};
+use rand::{Rng, SeedableRng, rngs::SmallRng};
 use std::any::{Any, TypeId};
 use std::fmt::Debug;
 
@@ -125,10 +125,10 @@ fn create_extended_standard_library() -> YarnLibrary {
     library
         .add_function("random", || SmallRng::from_os_rng().random_range(0.0..1.0))
         .add_function("random_range", |min: f32, max: f32| {
-            if let Some(min) = min.as_int() {
-                if let Some(max_inclusive) = max.as_int() {
-                    return SmallRng::from_os_rng().random_range(min..=max_inclusive) as f32;
-                }
+            if let Some(min) = min.as_int()
+                && let Some(max_inclusive) = max.as_int()
+            {
+                return SmallRng::from_os_rng().random_range(min..=max_inclusive) as f32;
             }
             SmallRng::from_os_rng().random_range(min..max)
         })

crates/bevy_plugin/src/dialogue_runner/events.rs

@@ -1,5 +1,5 @@
-use crate::prelude::*;
 use crate::UnderlyingYarnCommand;
+use crate::prelude::*;
 use bevy::prelude::*;
 
 pub(crate) fn dialogue_runner_events_plugin(app: &mut App) {

crates/bevy_plugin/src/dialogue_runner/localized_line.rs

@@ -67,15 +67,13 @@ impl LocalizedLine {
     /// assert_eq!("Great, thanks", line.text);
     /// assert!(line.character_name().is_none());
     pub fn character_name(&self) -> Option<&str> {
-        if let Some(attribute) = self.attribute(CHARACTER_ATTRIBUTE) {
-            if let Some(name) = attribute.property(CHARACTER_ATTRIBUTE_NAME_PROPERTY) {
-                let MarkupValue::String(name) = name else {
-                    bug!(
-                        "Attribute \"character\" has a \"name\" property, but it is not a string."
-                    );
-                };
-                return Some(name.as_str());
-            }
+        if let Some(attribute) = self.attribute(CHARACTER_ATTRIBUTE)
+            && let Some(name) = attribute.property(CHARACTER_ATTRIBUTE_NAME_PROPERTY)
+        {
+            let MarkupValue::String(name) = name else {
+                bug!("Attribute \"character\" has a \"name\" property, but it is not a string.");
+            };
+            return Some(name.as_str());
         }
         None
     }

crates/bevy_plugin/src/dialogue_runner/runtime_interaction.rs

@@ -75,25 +75,27 @@ fn continue_runtime(
             }
             dialogue_runner.will_continue_in_next_update = false;
 
-            if dialogue_runner.run_selected_options_as_lines {
-                if let Some(option) = dialogue_runner.last_selected_option.take() {
-                    let options = last_options
+            if dialogue_runner.run_selected_options_as_lines
+                && let Some(option) = dialogue_runner.last_selected_option.take()
+            {
+                let options = last_options
                         .remove(&source)
                         .expect_or_bug("Failed to get last presented options when trying to run selected option as line.");
-                    let Some(option) = options.into_iter().find(|o| o.id == option) else {
-                        let expected_options = last_options
-                            .values()
-                            .flat_map(|options| options.iter().map(|option| option.id.to_string()))
-                            .collect::<Vec<_>>()
-                            .join(", ");
-                        bail!("Dialogue options does not contain selected option. Expected one of [{expected_options}], but found {option}");
-                    };
-                    present_line_events.write(PresentLineEvent {
-                        line: option.line,
-                        source,
-                    });
-                    continue;
-                }
+                let Some(option) = options.into_iter().find(|o| o.id == option) else {
+                    let expected_options = last_options
+                        .values()
+                        .flat_map(|options| options.iter().map(|option| option.id.to_string()))
+                        .collect::<Vec<_>>()
+                        .join(", ");
+                    bail!(
+                        "Dialogue options does not contain selected option. Expected one of [{expected_options}], but found {option}"
+                    );
+                };
+                present_line_events.write(PresentLineEvent {
+                    line: option.line,
+                    source,
+                });
+                continue;
             }
         }