feat: upgrade packages

deny.toml

@@ -2,27 +2,27 @@
 # More documentation for the licenses section can be found here:
 # https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
 [licenses]
-unlicensed = "deny"
+version = 2
 allow = [
-  "MIT",
-  "Apache-2.0",
-  "Unlicense",
-  "Zlib",
   "Apache-2.0 WITH LLVM-exception",
-  "Unicode-DFS-2016",
-  "Unicode-3.0",
+  "Apache-2.0",
+  "BSD-2-Clause",
+  "BSD-2-Clause-Patent",
   "BSD-3-Clause",
   "BSL-1.0",
-  "MIT-0",
-  "OFL-1.1",
-  "LicenseRef-UFL-1.0",
   "CC0-1.0",
   "ISC",
-  "BSD-2-Clause",
-  "BSD-2-Clause-Patent",
+  "LicenseRef-UFL-1.0",
+  "MIT",
+  "MIT-0",
+  "MPL-2.0",
+  "OFL-1.1",
   "OpenSSL",
+  "Unicode-3.0",
+  "Unicode-DFS-2016",
+  "Unlicense",
+  "Zlib",
 ]
-default = "deny"
 
 [sources.allow-org]
 github = ["fishfolk"]

framework_crates/bones_asset/Cargo.toml

@@ -23,18 +23,18 @@ bs58            = "0.5"
 anyhow          = "1.0"
 serde_yaml      = "0.9"
 serde_json      = "1.0"
-erased-serde    = "0.3"
+erased-serde    = "0.4"
 paste           = "1.0"
 ulid            = { version = "1.0" }
 semver          = { version = "1.0", features = ["serde"] }
-async-channel   = "1.8"
+async-channel   = "1.9"
 once_cell       = "1.18"
 path-absolutize = { version = "3.1", features = ["use_unix_paths_on_wasm"] }
 ehttp           = "0.3"
 tracing         = "0.1"
-bevy_tasks      = "0.11"
+bevy_tasks      = "0.12"
 dashmap         = "5.5"
-event-listener  = "3.0"
+event-listener  = "4.0"
 elsa            = "1.9"
 append-only-vec = "0.1.3"
 
@@ -47,4 +47,4 @@ web-sys = { version = "0.3", features = ["console"] }
 [dev-dependencies]
 bones_schema = { version = "0.3", path = "../bones_schema", features = ["glam"] }
 glam         = "0.24"
-bevy_tasks   = "0.11"
+bevy_tasks   = "0.12"

framework_crates/bones_asset/examples/tutorial.rs

@@ -149,7 +149,7 @@ fn main() -> anyhow::Result<()> {
 
     // Load assets
     let s = asset_server.clone();
-    IoTaskPool::init(TaskPool::default);
+    IoTaskPool::get_or_init(TaskPool::default);
     println!("Loading Assets...");
 
     // Spawn a task to load the assets

framework_crates/bones_bevy_renderer/Cargo.toml

@@ -17,17 +17,17 @@ webgl2  = ["bevy/webgl2"]
 [dependencies]
 bones_framework = { version = "0.3", path = "../bones_framework" }
 
-bevy_egui           = "0.22"
+bevy_egui           = "0.24"
 glam                = { version = "0.24", features = ["serde"] }
-bevy_prototype_lyon = "0.9"
+bevy_prototype_lyon = "0.10"
 serde_yaml          = "0.9"
 serde               = "1.0.188"
 anyhow              = "1.0"
 
 [dependencies.bevy]
 default-features = false
 features         = ["bevy_render", "bevy_core_pipeline", "bevy_sprite", "x11", "bevy_gilrs"]
-version          = "0.11"
+version          = "0.12"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 directories = "5.0"

framework_crates/bones_bevy_renderer/src/lib.rs

@@ -661,7 +661,7 @@ fn setup_egui(world: &mut World) {
             // Insert the bones egui textures
             ctx.data_mut(|map| {
                 map.insert_temp(
-                    bevy_egui::egui::Id::null(),
+                    bevy_egui::egui::Id::NULL,
                     bones_data.bones_egui_textures.clone(),
                 );
             });
@@ -695,19 +695,19 @@ fn get_bones_input(
     (
         bones::MouseInputs {
             movement: mouse_motion_events
-                .iter()
+                .read()
                 .last()
                 .map(|x| x.delta)
                 .unwrap_or_default(),
             wheel_events: mouse_wheel_events
-                .iter()
+                .read()
                 .map(|event| bones::MouseScrollEvent {
                     unit: event.unit.into_bones(),
                     movement: Vec2::new(event.x, event.y),
                 })
                 .collect(),
             button_events: mouse_button_input_events
-                .iter()
+                .read()
                 .map(|event| bones::MouseButtonEvent {
                     button: event.button.into_bones(),
                     state: event.state.into_bones(),
@@ -716,7 +716,7 @@ fn get_bones_input(
         },
         bones::KeyboardInputs {
             key_events: keyboard_events
-                .iter()
+                .read()
                 .map(|event| bones::KeyboardEvent {
                     scan_code: event.scan_code,
                     key_code: event.key_code.map(|x| x.into_bones()).into(),
@@ -726,7 +726,7 @@ fn get_bones_input(
         },
         bones::GamepadInputs {
             gamepad_events: gamepad_events
-                .iter()
+                .read()
                 .map(|event| match event {
                     GamepadEvent::Connection(c) => {
                         bones::GamepadEvent::Connection(bones::GamepadConnectionEvent {
@@ -805,7 +805,7 @@ fn step_bones_game(world: &mut World) {
 
     let BonesData { game, .. } = &mut data;
 
-    let bevy_time = world.resource::<Time>();
+    let bevy_time = world.resource::<Time<Real>>();
 
     // Reload assets if necessary
     if let Some(mut asset_server) = game.shared_resource_mut::<bones::AssetServer>() {
@@ -1023,23 +1023,26 @@ fn extract_bones_sprites(
                 please open an issue."
                 );
             };
-            extracted_sprites.sprites.push(ExtractedSprite {
-                entity: bones_renderable_entity.0,
-                transform: {
-                    let mut t: Transform = transform.into_bevy();
-                    // Add tiny z offset to enforce a consistent z-sort
-                    t.translation.z += z_offset;
-                    z_offset += 0.00001;
-                    t.into()
+            extracted_sprites.sprites.insert(
+                bones_renderable_entity.0,
+                ExtractedSprite {
+                    original_entity: Some(bones_renderable_entity.0),
+                    transform: {
+                        let mut t: Transform = transform.into_bevy();
+                        // Add tiny z offset to enforce a consistent z-sort
+                        t.translation.z += z_offset;
+                        z_offset += 0.00001;
+                        t.into()
+                    },
+                    color: sprite.color.into_bevy(),
+                    rect: None,
+                    custom_size: None,
+                    image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
+                    flip_x: sprite.flip_x,
+                    flip_y: sprite.flip_y,
+                    anchor: Anchor::Center.as_vec(),
                 },
-                color: sprite.color.into_bevy(),
-                rect: None,
-                custom_size: None,
-                image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
-                flip_x: sprite.flip_x,
-                flip_y: sprite.flip_y,
-                anchor: Anchor::Center.as_vec(),
-            })
+            );
         }
 
         // Extract atlas sprites
@@ -1065,17 +1068,20 @@ fn extract_bones_sprites(
                 min,
                 max: min + atlas.tile_size,
             };
-            extracted_sprites.sprites.push(ExtractedSprite {
-                entity: bones_renderable_entity.0,
-                transform: transform.into_bevy().into(),
-                color: atlas_sprite.color.into_bevy(),
-                rect: Some(rect),
-                custom_size: None,
-                image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
-                flip_x: atlas_sprite.flip_x,
-                flip_y: atlas_sprite.flip_y,
-                anchor: Anchor::Center.as_vec(),
-            })
+            extracted_sprites.sprites.insert(
+                bones_renderable_entity.0,
+                ExtractedSprite {
+                    original_entity: Some(bones_renderable_entity.0),
+                    transform: transform.into_bevy().into(),
+                    color: atlas_sprite.color.into_bevy(),
+                    rect: Some(rect),
+                    custom_size: None,
+                    image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
+                    flip_x: atlas_sprite.flip_x,
+                    flip_y: atlas_sprite.flip_y,
+                    anchor: Anchor::Center.as_vec(),
+                },
+            );
         }
     }
 }
@@ -1167,17 +1173,20 @@ fn extract_bones_tilemaps(
                 // create a proper tile renderer. That can render multiple tiles on one quad instead
                 // of using a separate quad for each tile.
                 transform.scale += Vec3::new(0.01, 0.01, 0.0);
-                extracted_sprites.sprites.push(ExtractedSprite {
-                    entity: bones_renderable_entity.0,
-                    transform: transform.into(),
-                    color: Color::WHITE,
-                    rect: Some(rect),
-                    custom_size: None,
-                    image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
-                    flip_x: tile.flip_x,
-                    flip_y: tile.flip_y,
-                    anchor: Anchor::BottomLeft.as_vec(),
-                })
+                extracted_sprites.sprites.insert(
+                    bones_renderable_entity.0,
+                    ExtractedSprite {
+                        original_entity: Some(bones_renderable_entity.0),
+                        transform: transform.into(),
+                        color: Color::WHITE,
+                        rect: Some(rect),
+                        custom_size: None,
+                        image_handle_id: bones_image_ids.get(&image_id).unwrap().id(),
+                        flip_x: tile.flip_x,
+                        flip_y: tile.flip_y,
+                        anchor: Anchor::BottomLeft.as_vec(),
+                    },
+                );
             }
         }
     }
@@ -1213,7 +1222,7 @@ fn sync_bones_path2ds(
                 new_components = Some((
                     bundle.path,
                     lyon::Stroke::new(Color::default(), 1.0),
-                    bundle.transform,
+                    Transform::default(),
                 ));
                 let (path, stroke, transform) = new_components.as_mut().unwrap();
                 (path, stroke, transform)
@@ -1244,11 +1253,8 @@ fn sync_bones_path2ds(
         // Spawn the shape if it doesn't already exist
         if let Some((path, stroke, transform)) = new_components {
             commands
-                .spawn(lyon::ShapeBundle {
-                    path,
-                    transform,
-                    ..default()
-                })
+                .spawn(lyon::ShapeBundle { path, ..default() })
+                .insert(transform)
                 .insert(stroke)
                 .insert(BevyBonesEntity);
         }

framework_crates/bones_framework/Cargo.toml

@@ -74,15 +74,15 @@ bones_scripting = { version = "0.3", path = "../bones_scripting", optional = tru
 
 # Other
 anyhow        = "1.0"
-async-channel = "1.7"
-bevy_tasks    = { version = "0.11" }
+async-channel = "1.9"
+bevy_tasks    = { version = "0.12" }
 bytemuck      = "1.12"
 either        = "1.8"
-futures-lite  = "1.12"
+futures-lite  = "2.3"
 glam          = "0.24"
 hex           = "0.4"
 instant       = { version = "0.1", features = ["wasm-bindgen"] }
-noise         = "0.8"
+noise         = "0.9"
 once_cell     = "1.17"
 thiserror     = "1.0"
 tracing       = "0.1"
@@ -98,8 +98,8 @@ serde      = { version = "1.0", features = ["derive"] }
 image = { version = "0.24", default-features = false }
 
 # Gui
-egui       = { version = "0.23", optional = true }
-egui_plot  = "0.23"
+egui       = { version = "0.24", optional = true }
+egui_plot  = "0.24"
 ttf-parser = { version = "0.20", default-features = false, optional = true }
 
 # Audio
@@ -117,14 +117,14 @@ document-features = { version = "0.2", optional = true }
 
 # Networking
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-ggrs                   = { version = "0.9", features = ["sync-send"] }
+ggrs                   = { version = "0.10", features = ["sync-send"] }
 bones_matchmaker_proto = { version = "0.2", path = "../../other_crates/bones_matchmaker_proto" }
 bytes                  = "1.4"
-mdns-sd                = { version = "0.7", default-features = false }
+mdns-sd                = { version = "0.10", default-features = false }
 numquant               = "0.2"
 ping-rs                = "0.1"
 postcard               = { version = "1.0", features = ["alloc"] }
-rcgen                  = "0.10"
+rcgen                  = "0.12"
 rustls                 = { version = "0.21", features = ["dangerous_configuration", "quic"] }
 smallvec               = "1.10"
 quinn                  = { version = "0.10", default-features = false, features = ["native-certs", "tls-rustls"] }