fix: adapt DesktopTerrarium to Bevy 0.19

Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bevy = { version = "0.15", features = ["wayland"] }
+bevy = { version = "0.19", features = ["wayland"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 chrono = { version = "0.4", features = ["serde"] }

src/events/milestones.rs

@@ -2,25 +2,25 @@ use crate::components::{CritterSpecies, PlantSpecies};
 use crate::resources::WeatherType;
 use bevy::prelude::*;
 
-#[derive(Event)]
+#[derive(Message)]
 pub struct PlantStageChanged {
     pub entity: Entity,
     pub species: PlantSpecies,
     pub old_stage: u8,
     pub new_stage: u8,
 }
 
-#[derive(Event)]
+#[derive(Message)]
 pub struct CritterArrived {
     pub species: CritterSpecies,
 }
 
-#[derive(Event)]
+#[derive(Message)]
 pub struct CritterDeparted {
     pub species: CritterSpecies,
 }
 
-#[derive(Event)]
+#[derive(Message)]
 pub struct WeatherChanged {
     pub from: WeatherType,
     pub to: WeatherType,

src/main.rs

@@ -7,7 +7,7 @@ fn main() {
         .add_plugins(DefaultPlugins.set(WindowPlugin {
             primary_window: Some(Window {
                 title: "Desktop Terrarium".to_string(),
-                resolution: WindowResolution::new(800.0, 600.0),
+                resolution: WindowResolution::new(800, 600),
                 present_mode: PresentMode::AutoVsync,
                 resizable: true,
                 resize_constraints: WindowResizeConstraints {

src/plugins/mod.rs

@@ -11,10 +11,10 @@ impl Plugin for TerrariumPlugin {
             .init_resource::<WeatherState>()
             .init_resource::<BehaviorSignals>()
             .init_resource::<DebugSettings>()
-            .add_event::<PlantStageChanged>()
-            .add_event::<CritterArrived>()
-            .add_event::<CritterDeparted>()
-            .add_event::<WeatherChanged>()
+            .add_message::<PlantStageChanged>()
+            .add_message::<CritterArrived>()
+            .add_message::<CritterDeparted>()
+            .add_message::<WeatherChanged>()
             .add_systems(
                 Startup,
                 (

src/systems/critter_movement.rs

@@ -6,15 +6,15 @@ pub fn critter_movement_system(
     mut commands: Commands,
     mut critters: Query<(Entity, &mut Critter, &mut Transform)>,
     time: Res<Time>,
-    mut events: EventWriter<CritterDeparted>,
+    mut events: MessageWriter<CritterDeparted>,
 ) {
     for (entity, mut critter, mut transform) in &mut critters {
         // Advance along path
         critter.path_progress += critter.speed * time.delta_secs();
 
         if critter.path_progress >= 1.0 {
             // Path complete - despawn
-            events.send(CritterDeparted {
+            events.write(CritterDeparted {
                 species: critter.species,
             });
             commands.entity(entity).despawn();

src/systems/critter_spawner.rs

@@ -11,7 +11,7 @@ pub fn critter_spawner_system(
     time: Res<Time>,
     mut spawn_timer: Local<f32>,
     asset_server: Res<AssetServer>,
-    mut events: EventWriter<CritterArrived>,
+    mut events: MessageWriter<CritterArrived>,
 ) {
     *spawn_timer += time.delta_secs();
 
@@ -38,7 +38,7 @@ pub fn critter_spawner_system(
                 },
             ));
 
-            events.send(CritterArrived {
+            events.write(CritterArrived {
                 species: CritterSpecies::Butterfly,
             });
             *spawn_timer = 0.0;
@@ -69,7 +69,7 @@ pub fn critter_spawner_system(
                     },
                 ));
 
-                events.send(CritterArrived {
+                events.write(CritterArrived {
                     species: CritterSpecies::Beetle,
                 });
             }

src/systems/parallax.rs

@@ -9,7 +9,7 @@ pub fn parallax_system(
     mut layers: Query<(&SceneLayer, &mut Transform)>,
     time: Res<Time>,
 ) {
-    let window = match windows.get_single() {
+    let window = match windows.single() {
         Ok(w) => w,
         Err(_) => return,
     };

src/systems/plant_growth.rs

@@ -8,7 +8,7 @@ const GROWTH_RATE_PER_SEC: f32 = 0.001; // ~17 minutes per stage
 pub fn plant_growth_system(
     mut plants: Query<(Entity, &mut Plant)>,
     behavior: Res<BehaviorSignals>,
-    mut events: EventWriter<PlantStageChanged>,
+    mut events: MessageWriter<PlantStageChanged>,
     time: Res<Time>,
 ) {
     let growth_delta = if behavior.is_active {
@@ -32,7 +32,7 @@ pub fn plant_growth_system(
             plant.stage += 1;
             plant.growth_progress = 0.0;
 
-            events.send(PlantStageChanged {
+            events.write(PlantStageChanged {
                 entity,
                 species: plant.species,
                 old_stage,
@@ -43,7 +43,7 @@ pub fn plant_growth_system(
 }
 
 pub fn handle_plant_stage_changes(
-    mut events: EventReader<PlantStageChanged>,
+    mut events: MessageReader<PlantStageChanged>,
     mut plants: Query<(&Plant, &mut Sprite)>,
     asset_server: Res<AssetServer>,
 ) {

src/systems/weather_transition.rs

@@ -6,7 +6,7 @@ pub fn weather_transition_system(
     mut weather: ResMut<WeatherState>,
     debug: Res<DebugSettings>,
     time: Res<Time>,
-    mut events: EventWriter<WeatherChanged>,
+    mut events: MessageWriter<WeatherChanged>,
 ) {
     // Handle debug overrides
     if let Some(forced_weather) = debug.force_weather {
@@ -34,7 +34,7 @@ pub fn weather_transition_system(
         if weather.phase_elapsed >= weather.phase_duration_secs {
             // Start transition to next weather
             let new_target = weather.current.next();
-            events.send(WeatherChanged {
+            events.write(WeatherChanged {
                 from: weather.current,
                 to: new_target,
             });