diff --git a/Cargo.toml b/Cargo.toml index 09eeaad..f663cf3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,16 +2,14 @@ name = "montociel" version = "0.1.0" edition = "2021" -resolver = "2" # Important! wgpu/Bevy needs this! +resolver = "2" [dependencies] -bevy = { version = "0.6", default-features = false, features = ["bevy_winit", "render", "bevy_gltf", "png"] } +bevy = {version = "0.5", default-features = false, features = ["bevy_winit", "render", "bevy_gltf", "png"]} bevy_rapier2d = "*" rand = "0.8" - -winit = "0.26.1" # newer version not ok with new rustc version - # Dependencies for native only. -# [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -# bevy = {version = "0.5", default-features = false, features = ["bevy_wgpu", "bevy_winit", "render", "x11"]} +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +bevy = {version = "0.5", default-features = false, features = ["bevy_wgpu", "bevy_winit", "render", "x11"]} + diff --git a/src/cloud.rs b/src/cloud.rs index 8c2ccc0..a45e278 100644 --- a/src/cloud.rs +++ b/src/cloud.rs @@ -10,7 +10,7 @@ pub struct Evil; pub struct CloudPlugin; impl Plugin for CloudPlugin { - fn build(&self, app: &mut App) { + fn build(&self, app: &mut AppBuilder) { app.init_resource::() .add_system_set( SystemSet::on_enter(AppState::InGame) diff --git a/src/montociel.rs b/src/montociel.rs index 255ca24..36f0c9d 100644 --- a/src/montociel.rs +++ b/src/montociel.rs @@ -9,7 +9,7 @@ pub struct Montociel; pub struct MontocielPlugin; impl Plugin for MontocielPlugin { - fn build(&self, app: &mut App) { + fn build(&self, app: &mut AppBuilder) { app.add_system_set( SystemSet::on_enter(AppState::InGame).with_system(spawn_montociel.system()), ) diff --git a/src/score.rs b/src/score.rs index 6cab380..7574add 100644 --- a/src/score.rs +++ b/src/score.rs @@ -26,7 +26,7 @@ impl Score { pub struct ScorePlugin; impl Plugin for ScorePlugin { - fn build(&self, app: &mut App) { + fn build(&self, app: &mut AppBuilder) { app.init_resource::() .add_system_set( SystemSet::on_enter(AppState::InGame).with_system(setup_score_ui.system()), diff --git a/src/ui.rs b/src/ui.rs index 473eee5..9940944 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -4,7 +4,7 @@ use bevy::prelude::*; pub struct UIPlugin; impl Plugin for UIPlugin { - fn build(&self, app: &mut App) { + fn build(&self, app: &mut AppBuilder) { app.add_system_set(SystemSet::on_enter(AppState::Menu).with_system(setup_button.system())) .add_system_set( SystemSet::on_enter(AppState::GameOver).with_system(setup_button.system()),