update to bevy 0.18

game/units/Cargo.toml

@@ -4,21 +4,21 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bevy = "0.16.0"
+bevy = "0.18.0"
 world_generation = { path = "../../engine/world_generation" }
 shared = { path = "../shared" }
-bevy_rapier3d = "0.29.0"
-serde = { version = "1.0.204", features = ["derive"] }
+bevy_rapier3d = "0.33.0"
+serde = { version = "1.0.228", features = ["derive"] }
 asset_loader = { path = "../../engine/asset_loader" }
-serde_json = "1.0.120"
-ron = "0.8.1"
-bevy_asset_loader = { version = "0.23.0-rc.3", features = [
+serde_json = "1.0.149"
+ron = "0.12.0"
+bevy_asset_loader = { version = "0.25.0", features = [
 	"standard_dynamic_assets",
 	"3d",
 ] }
 quadtree_rs = "0.1.3"
-pathfinding = "4.11.0"
-ordered-float = "4.3.0"
+pathfinding = "4.14.0"
+ordered-float = "5.1.0"
 
 [features]
 tracing = ["bevy/trace_tracy"]

game/units/src/assets/unit_asset.rs

@@ -20,13 +20,7 @@ impl UnitAsset {
 	pub fn spawn(&self, transform: Transform) -> CommandQueue {
 		let mut commands = CommandQueue::default();
 
-		let bundle = (
-			PbrBundle {
-				transform: transform,
-				..default()
-			},
-			Unit,
-		);
+		let bundle = (transform, Unit);
 		let domain = self.domain.clone();
 		commands.push(move |world: &mut World| {
 			let mut e = world.spawn(bundle);

game/units/src/units_plugin.rs

@@ -1,6 +1,10 @@
 use std::collections::HashMap;
 
-use bevy::{ecs::world::CommandQueue, prelude::*, tasks::AsyncComputeTaskPool, utils::futures};
+use bevy::{
+	ecs::world::CommandQueue,
+	prelude::*,
+	tasks::{futures, AsyncComputeTaskPool},
+};
 use pathfinding::prelude::astar;
 use shared::{events::TileModifiedEvent, resources::TileUnderCursor, sets::GameplaySet};
 use world_generation::{hex_utils::HexCoord, prelude::Map, states::GeneratorState};
@@ -41,7 +45,7 @@ fn build_navdata(mut commands: Commands, map: Res<Map>) {
 	commands.insert_resource(nav_data);
 }
 
-fn update_navdata(mut tile_updates: EventReader<TileModifiedEvent>, mut nav_data: ResMut<NavData>) {
+fn update_navdata(mut tile_updates: MessageReader<TileModifiedEvent>, mut nav_data: ResMut<NavData>) {
 	for event in tile_updates.read() {
 		match event {
 			TileModifiedEvent::HeightChanged(coord, new_height) => {