update to bevy 0.13

Author: ecrax

Cargo.toml

@@ -10,22 +10,22 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = { version = "0.12", default-features = false, features = ["bevy_asset"] }
-bevy_asset = "0.12.1"
-bevy_app = "0.12"
-bevy_ecs = "0.12"
+bevy = { version = "0.13", default-features = false, features = ["bevy_asset"] }
+bevy_asset = "0.13"
+bevy_app = "0.13"
+bevy_ecs = "0.13"
 crossterm = { version = "0.27", features = ["serde"] }
 ron = "0.8"
 serde = { version = "1.0", features = ["derive"] }
-unicode-segmentation = "1.7"
+unicode-segmentation = "1.11"
 broccoli = "2"
-anyhow = { version = "1.0.79", features = [] }
+thiserror = "1.0.58"
 
 [dev-dependencies]
 # Note that we need "multi-threaded" for "file_watcher" to work (otherwise the game will freeze when assets are modified)
-bevy = { version = "0.12", default-features = false, features = ["bevy_asset", "file_watcher", "multi-threaded"] }
+bevy = { version = "0.13", default-features = false, features = ["bevy_asset", "file_watcher", "multi-threaded"] }
 ron = "0.8"
-textwrap = "0.16.0"
+textwrap = "0.16"
 
 [[example]]
 name = "window"

examples/assets.rs

@@ -40,10 +40,11 @@ pub fn main() {
                 .set(LogPlugin {
                     filter: "off".into(),
                     level: bevy::log::Level::ERROR,
+                    ..default()
                 }),
         )
         .add_plugins(CrosstermPlugin)
-        .add_state::<GameState>()
+        .init_state::<GameState>()
         .add_systems(OnEnter(GameState::Loading), default_settings)
         .add_systems(OnEnter(GameState::Loading), load_assets)
         .add_systems(Update, check_for_loaded)

examples/demo/main.rs

@@ -52,13 +52,14 @@ pub fn main() {
                 .set(LogPlugin {
                     filter: "off".into(),
                     level: bevy::log::Level::ERROR,
+                    ..default()
                 })
                 .set(TaskPoolPlugin {
                     task_pool_options: TaskPoolOptions::with_num_threads(1),
                 }),
         )
         .add_plugins(CrosstermPlugin)
-        .add_state::<GameState>()
+        .init_state::<GameState>()
         .add_systems(Startup, loading_system)
         .add_systems(
             Update,

examples/focus.rs

@@ -23,6 +23,7 @@ pub fn main() {
                 .set(LogPlugin {
                     filter: "off".into(),
                     level: bevy::log::Level::ERROR,
+                    ..default()
                 }),
         )
         .add_plugins(CrosstermPlugin)

examples/redraw_demo.rs

@@ -31,6 +31,7 @@ pub fn main() {
                 .set(LogPlugin {
                     filter: "off".into(),
                     level: bevy::log::Level::ERROR,
+                    ..default()
                 }),
         )
         .add_plugins(CrosstermPlugin)

examples/transparency.rs

@@ -22,6 +22,7 @@ pub fn main() {
                 .set(LogPlugin {
                     filter: "off".into(),
                     level: bevy::log::Level::ERROR,
+                    ..default()
                 }),
         )
         .add_plugins(CrosstermPlugin)

examples/window.rs

@@ -33,6 +33,7 @@ pub fn main() {
                 .set(LogPlugin {
                     filter: "off".into(),
                     level: bevy::log::Level::ERROR,
+                    ..default()
                 }),
         )
         .add_plugins(CrosstermPlugin)

src/asset_loaders.rs

@@ -2,31 +2,37 @@ use bevy::utils::BoxedFuture;
 use bevy_asset::io::Reader;
 use bevy_asset::AsyncReadExt;
 use bevy_asset::{AssetLoader, LoadContext};
+use thiserror::Error;
 
 use crate::components::{Sprite, StyleMap};
 
+#[derive(Error, Debug)]
+pub enum LoadSpriteError {
+    #[error("sprite data contains invalid utf8 data")]
+    InvalidUtf8(#[from] std::str::Utf8Error),
+    #[error("io error")]
+    Io(#[from] std::io::Error),
+}
+
 #[derive(Default)]
 pub struct SpriteLoader;
 
-// TODO
-// Library should not use anyhow
-
 impl AssetLoader for SpriteLoader {
     type Asset = Sprite;
     type Settings = ();
-    type Error = anyhow::Error;
+    type Error = LoadSpriteError;
 
     fn load<'a>(
         &'a self,
         reader: &'a mut Reader,
         _settings: &'a Self::Settings,
         _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, anyhow::Error>> {
+    ) -> BoxedFuture<'a, Result<Self::Asset, LoadSpriteError>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
             reader.read_to_end(&mut bytes).await?;
-            let string = std::str::from_utf8(&bytes);
-            let sprite = Sprite::new(string?);
+            let string = std::str::from_utf8(&bytes)?;
+            let sprite = Sprite::new(string);
             Ok(sprite)
         })
     }
@@ -36,20 +42,28 @@ impl AssetLoader for SpriteLoader {
     }
 }
 
+#[derive(Error, Debug)]
+pub enum LoadStyleMapError {
+    #[error("error deserializing style map from ron data")]
+    Deserialize(#[from] ron::de::SpannedError),
+    #[error("io error")]
+    Io(#[from] std::io::Error),
+}
+
 #[derive(Default)]
 pub struct StyleMapLoader;
 
 impl AssetLoader for StyleMapLoader {
     type Asset = StyleMap;
     type Settings = ();
-    type Error = anyhow::Error;
+    type Error = LoadStyleMapError;
 
     fn load<'a>(
         &'a self,
         reader: &'a mut Reader,
         _settings: &'a Self::Settings,
         _load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<Self::Asset, anyhow::Error>> {
+    ) -> BoxedFuture<'a, Result<Self::Asset, LoadStyleMapError>> {
         Box::pin(async move {
             let mut bytes = Vec::new();
             reader.read_to_end(&mut bytes).await?;

src/components.rs

@@ -1,5 +1,5 @@
 use bevy::prelude::*;
-use bevy::reflect::{TypePath, TypeUuid};
+use bevy::reflect::TypePath;
 use bevy::utils::{HashMap, HashSet};
 use bevy_asset::Handle;
 use serde::{Deserialize, Serialize};
@@ -40,7 +40,7 @@ pub struct SpriteBundle {
     pub visible: Visible,
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Reflect, Default)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize, Deserialize, Default, TypePath)]
 pub struct Colors {
     pub foreground: Option<Color>,
     pub background: Option<Color>,
@@ -149,7 +149,7 @@ mod attribute_parser {
 // impl Reflect for StyleAttributes {}
 // impl FromReflect for StyleAttributes {}
 
-#[derive(Copy, Clone, Serialize, Deserialize, PartialEq, Eq, Reflect)]
+#[derive(Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Style {
     pub colors: Colors,
     #[serde(with = "attribute_parser")]
@@ -206,8 +206,7 @@ impl Default for Style {
     }
 }
 
-#[derive(Default, Serialize, Deserialize, PartialEq, Eq, TypeUuid, TypePath, Asset)]
-#[uuid = "a5418d12-e050-498a-a31e-37fd0b6c078d"]
+#[derive(Default, Serialize, Deserialize, PartialEq, Eq, TypePath, Asset)]
 pub struct StyleMap {
     pub style: Style,
     pub map: Vec<Vec<Style>>,
@@ -301,8 +300,7 @@ impl Visible {
     }
 }
 
-#[derive(Default, Eq, PartialEq, Debug, TypeUuid, Reflect, Asset)]
-#[uuid = "f04f5352-e656-4a90-95a5-2269c02d0091"]
+#[derive(Default, Eq, PartialEq, Debug, Reflect, Asset)]
 pub struct Sprite {
     // The whole sprites's data
     data: String,

src/lib.rs

@@ -1,4 +1,4 @@
-#![feature(trivial_bounds)]
+// #![feature(trivial_bounds)]
 
 use bevy::prelude::*;
 use bevy_app::App;