update to bevy 0.18

engine/asset_loader/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = "1.0.204"
-serde_json = "1.0.120"
-bevy = "0.16.0"
-ron = "0.8.1"
+serde = "1.0.228"
+serde_json = "1.0.149"
+bevy = "0.18.0"
+ron = "0.12.0"

engine/asset_loader/src/macros.rs

@@ -1,3 +1,5 @@
+use bevy::{asset::AssetLoader, reflect::TypePath};
+
 #[macro_export]
 macro_rules! create_asset_loader {
 	(
@@ -9,7 +11,7 @@ macro_rules! create_asset_loader {
 		$($string_array_name: ident -> $handle_array_name: ident)* ?
 	) => {
 		use bevy::prelude::*;
-		use bevy::asset::{AssetLoader, AssetEvent, AssetEvents, LoadContext, LoadState, AsyncReadExt, io::Reader};
+		use bevy::asset::{AssetLoader, AssetEvent,  LoadContext, LoadState, AsyncReadExt, io::Reader};
 		pub struct $plugin_name;
 		impl Plugin for $plugin_name {
 			fn build(&self, app: &mut App) {
@@ -18,7 +20,7 @@ macro_rules! create_asset_loader {
 			}
 		}
 
-		#[derive(Default)]
+		#[derive(Default, TypePath)]
 		pub struct $loader_name;
 
 		impl AssetLoader for $loader_name {
@@ -30,10 +32,10 @@ macro_rules! create_asset_loader {
 
 			async fn load(
 		        &self,
-				reader: & mut dyn bevy::asset::io::Reader,
-				_: &Self::Settings,
-				load_context: &mut LoadContext<'_>,
-		    ) -> Result<Self::Asset, Self::Error> {
+		        reader: &mut dyn bevy::asset::io::Reader,
+		        settings: &Self::Settings,
+		        load_context: &mut bevy::asset::LoadContext<'_>,
+		    ) -> Result<Self::Asset, Self::Error>{
 				let mut bytes = Vec::new();
 				let read_result = reader.read_to_end(&mut bytes).await;
 				if read_result.is_err() {

engine/asset_loader_proc/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-serde = "1.0.204"
-serde_json = "1.0.120"
-bevy = "0.16.0"
-ron = "0.8.1"
+serde = "1.0.228"
+serde_json = "1.0.149"
+bevy = "0.18.0"
+ron = "0.12.0"

engine/world_generation/Cargo.toml

@@ -6,19 +6,19 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.16.0"
+bevy = "0.18.0"
 noise = "0.9.0"
-serde = { version = "1.0.203", features = ["derive"] }
-serde_json = "1.0.115"
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.149"
 asset_loader = { path = "../asset_loader" }
-rayon = "1.10.0"
-bevy-inspector-egui = "0.28.1"
-bevy_asset_loader = { version = "0.23.0-rc.3", features = [
+rayon = "1.11.0"
+bevy-inspector-egui = "0.36.0"
+bevy_asset_loader = { version = "0.25.0", features = [
 	"standard_dynamic_assets",
 	"3d",
 ] }
-ron = "0.8.1"
-image = "0.25.2"
+ron = "0.12.0"
+image = "0.25.9"
 num = "0.4.3"
 
 [features]

engine/world_generation/src/consts.rs

@@ -1,7 +1,4 @@
-use bevy::{
-	prelude::*,
-	render::{mesh::MeshVertexAttribute, render_resource::VertexFormat},
-};
+use bevy::{mesh::MeshVertexAttribute, prelude::*, render::render_resource::VertexFormat};
 
 use crate::hex_utils::{INNER_RADIUS, OUTER_RADIUS};
 

engine/world_generation/src/generators/mesh_generator.rs

@@ -1,14 +1,10 @@
 use crate::hex_utils::HexCoord;
 use crate::{hex_utils::offset3d_to_world, prelude::*};
+use bevy::asset::RenderAssetUsages;
 #[cfg(feature = "tracing")]
 use bevy::log::*;
-use bevy::{
-	prelude::*,
-	render::{
-		mesh::{Indices, PrimitiveTopology},
-		render_asset::RenderAssetUsages,
-	},
-};
+use bevy::mesh::{Indices, PrimitiveTopology};
+use bevy::prelude::*;
 
 pub fn generate_chunk_mesh(chunk: &MeshChunkData) -> Mesh {
 	#[cfg(feature = "tracing")]

engine/world_generation/src/generators/packed_mesh_generator.rs

@@ -1,11 +1,9 @@
-use crate::hex_utils::{offset3d_to_world, HexCoord};
+use crate::hex_utils::HexCoord;
 use crate::prelude::*;
+use bevy::asset::RenderAssetUsages;
 use bevy::{
+	mesh::{Indices, PrimitiveTopology},
 	prelude::*,
-	render::{
-		mesh::{Indices, PrimitiveTopology},
-		render_asset::RenderAssetUsages,
-	},
 };
 
 pub fn generate_packed_chunk_mesh(chunk: &MeshChunkData) -> Mesh {