Update bracket-bevy to support bevy 0.15

bracket-bevy/Cargo.toml

@@ -13,7 +13,7 @@ categories = ["game-engines", "graphics"]
 license = "MIT"
 
 [dependencies]
-bevy = "0.9"
+bevy = { version = "~0.15" }
 parking_lot = "0.12"
 lazy_static = "1.4"
 bracket-random = { path = "../bracket-random" }
@@ -22,4 +22,4 @@ bracket-geometry = { path = "../bracket-geometry", version = "~0.8", features =
 
 [dev-dependencies]
 bracket-pathfinding = { path = "../bracket-pathfinding", version = "~0.8" }
-bracket-noise = { path = "../bracket-noise", version = "~0.8" }
+bracket-noise = { path = "../bracket-noise", version = "~0.8" }

bracket-bevy/examples/bevy_a_star_mouse.rs

@@ -5,9 +5,9 @@ use bracket_pathfinding::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BTermBuilder::simple_80x50().with_random_number_generator(true))
-        .add_startup_system(setup)
-        .add_system(tick)
+        .add_plugins(BTermBuilder::simple_80x50().with_random_number_generator(true))
+        .add_systems(Startup, setup)
+        .add_systems(Update, tick)
         .run();
 }
 
@@ -134,7 +134,7 @@ impl Algorithm2D for State {
     }
 }
 
-fn tick(ctx: Res<BracketContext>, mut state: ResMut<State>, mouse: Res<Input<MouseButton>>) {
+fn tick(ctx: Res<BracketContext>, mut state: ResMut<State>, mouse: Res<ButtonInput<MouseButton>>) {
     // Let's use batched drawing
     let mut draw_batch = ctx.new_draw_batch();
 

bracket-bevy/examples/bevy_alpha.rs

@@ -9,8 +9,8 @@ fn main() {
 
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(bterm)
-        .add_system(tick)
+        .add_plugins(bterm)
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_batch_z_order.rs

@@ -4,8 +4,8 @@ use bracket_bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BTermBuilder::simple_80x50())
-        .add_system(tick)
+        .add_plugins(BTermBuilder::simple_80x50())
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_benchmark.rs

@@ -6,8 +6,8 @@ fn main() {
 
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(bterm)
-        .add_system(tick)
+        .add_plugins(bterm)
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_benchmark_scalable.rs

@@ -8,8 +8,8 @@ fn main() {
 
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(bterm)
-        .add_system(tick)
+        .add_plugins(bterm)
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_colorfont.rs

@@ -8,8 +8,8 @@ fn main() {
 
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(bracket)
-        .add_system(tick)
+        .add_plugins(bracket)
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_dwarfmap.rs

@@ -6,8 +6,8 @@ use bracket_pathfinding::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BTermBuilder::simple_80x50())
-        .add_system(tick)
+        .add_plugins(BTermBuilder::simple_80x50())
+        .add_systems(Update, tick)
         .run();
 }
 
@@ -196,7 +196,7 @@ impl Algorithm3D for State {
     }
 }
 
-fn tick(ctx: Res<BracketContext>, mut state: Local<State>, mouse: Res<Input<MouseButton>>) {
+fn tick(ctx: Res<BracketContext>, mut state: Local<State>, mouse: Res<ButtonInput<MouseButton>>) {
     // Clear the screen
     ctx.cls();
 

bracket-bevy/examples/bevy_hello_minimal.rs

@@ -4,8 +4,8 @@ use bracket_bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BTermBuilder::simple_80x50())
-        .add_system(tick)
+        .add_plugins(BTermBuilder::simple_80x50())
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_hello_terminal.rs

@@ -4,16 +4,19 @@ use bracket_bevy::prelude::*;
 fn main() {
     let bterm = BTermBuilder::simple_80x50()
         .with_named_color("blue", BLUE)
-        .with_named_color("pink", Color::PINK);
+        .with_named_color(
+            "pink",
+            bracket_color::rgba::RGBA::from_f32(255.0, 182.0, 193.0, 1.0),
+        );
 
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(bterm)
+        .add_plugins(bterm)
         .insert_resource(State {
             y: 0,
             going_down: true,
         })
-        .add_system(tick)
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_resize_terminal.rs

@@ -4,10 +4,10 @@ use bracket_bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(
+        .add_plugins(
             BTermBuilder::simple_80x50().with_scaling_mode(TerminalScalingMode::ResizeTerminals),
         )
-        .add_system(tick)
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_roguelike_tutorial_4/main.rs

@@ -14,9 +14,9 @@ pub use rect::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BTermBuilder::simple_80x50().with_random_number_generator(true))
-        .add_startup_system(setup)
-        .add_system(tick)
+        .add_plugins(BTermBuilder::simple_80x50().with_random_number_generator(true))
+        .add_systems(Startup, setup)
+        .add_systems(Update, tick)
         .run();
 }
 
@@ -41,7 +41,7 @@ fn setup(mut commands: Commands, rng: Res<RandomNumbers>) {
 fn tick(
     ctx: Res<BracketContext>,
     map: Res<Map>,
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<ButtonInput<KeyCode>>,
     mut queries: ParamSet<(
         Query<&mut Position, With<Player>>,
         Query<(&Position, &Renderable)>,

bracket-bevy/examples/bevy_roguelike_tutorial_4/player.rs

@@ -1,24 +1,24 @@
 use bevy::prelude::*;
 
-pub fn player_input(keyboard: &Input<KeyCode>) -> (i32, i32) {
-    if keyboard.just_pressed(KeyCode::Left)
+pub fn player_input(keyboard: &ButtonInput<KeyCode>) -> (i32, i32) {
+    if keyboard.just_pressed(KeyCode::ArrowLeft)
         || keyboard.just_pressed(KeyCode::Numpad4)
-        || keyboard.just_pressed(KeyCode::H)
+        || keyboard.just_pressed(KeyCode::KeyH)
     {
         (-1, 0)
-    } else if keyboard.just_pressed(KeyCode::Right)
+    } else if keyboard.just_pressed(KeyCode::ArrowRight)
         || keyboard.just_pressed(KeyCode::Numpad6)
-        || keyboard.just_pressed(KeyCode::L)
+        || keyboard.just_pressed(KeyCode::KeyL)
     {
         (1, 0)
-    } else if keyboard.just_pressed(KeyCode::Up)
+    } else if keyboard.just_pressed(KeyCode::ArrowUp)
         || keyboard.just_pressed(KeyCode::Numpad8)
-        || keyboard.just_pressed(KeyCode::K)
+        || keyboard.just_pressed(KeyCode::KeyK)
     {
         (0, -1)
-    } else if keyboard.just_pressed(KeyCode::Down)
+    } else if keyboard.just_pressed(KeyCode::ArrowDown)
         || keyboard.just_pressed(KeyCode::Numpad2)
-        || keyboard.just_pressed(KeyCode::J)
+        || keyboard.just_pressed(KeyCode::KeyJ)
     {
         (0, 1)
     } else {

bracket-bevy/examples/bevy_test.rs

@@ -4,8 +4,8 @@ use bracket_bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BTermBuilder::simple_80x50())
-        .add_system(tick)
+        .add_plugins(BTermBuilder::simple_80x50())
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_textblock.rs

@@ -4,8 +4,8 @@ use bracket_bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BTermBuilder::simple_80x50())
-        .add_system(tick)
+        .add_plugins(BTermBuilder::simple_80x50())
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_tiles.rs

@@ -87,24 +87,24 @@ fn main() {
 
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(bterm)
-        .add_startup_system(setup)
-        .add_system(tick)
+        .add_plugins(bterm)
+        .add_systems(Startup, setup)
+        .add_systems(Update, tick)
         .run();
 }
 
-fn tick(ctx: Res<BracketContext>, mut state: ResMut<State>, keyboard: Res<Input<KeyCode>>) {
+fn tick(ctx: Res<BracketContext>, mut state: ResMut<State>, keyboard: Res<ButtonInput<KeyCode>>) {
     let mut draw_batch = ctx.new_draw_batch();
-    if keyboard.just_pressed(KeyCode::Left) {
+    if keyboard.just_pressed(KeyCode::ArrowLeft) {
         state.move_player(-1, 0)
     }
-    if keyboard.just_pressed(KeyCode::Right) {
+    if keyboard.just_pressed(KeyCode::ArrowRight) {
         state.move_player(1, 0)
     }
-    if keyboard.just_pressed(KeyCode::Up) {
+    if keyboard.just_pressed(KeyCode::ArrowUp) {
         state.move_player(0, -1)
     }
-    if keyboard.just_pressed(KeyCode::Down) {
+    if keyboard.just_pressed(KeyCode::ArrowDown) {
         state.move_player(0, 1)
     }
 

bracket-bevy/examples/bevy_two_layers_two_fonts.rs

@@ -12,9 +12,9 @@ fn main() {
 
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(bterm)
+        .add_plugins(bterm)
         .insert_resource(Bouncer(0))
-        .add_system(tick)
+        .add_systems(Update, tick)
         .run();
 }
 

bracket-bevy/examples/bevy_walking.rs

@@ -4,9 +4,9 @@ use bracket_bevy::prelude::*;
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
-        .add_plugin(BTermBuilder::simple_80x50().with_random_number_generator(true))
-        .add_startup_system(build_state)
-        .add_system(tick)
+        .add_plugins(BTermBuilder::simple_80x50().with_random_number_generator(true))
+        .add_systems(Startup, build_state)
+        .add_systems(Update, tick)
         .run();
 }
 
@@ -83,21 +83,21 @@ impl State {
     }
 }
 
-fn tick(ctx: Res<BracketContext>, mut state: ResMut<State>, keyboard: Res<Input<KeyCode>>) {
+fn tick(ctx: Res<BracketContext>, mut state: ResMut<State>, keyboard: Res<ButtonInput<KeyCode>>) {
     // Clear the screen
     ctx.cls();
 
     // Handle keyboard
-    if keyboard.just_pressed(KeyCode::Left) {
+    if keyboard.just_pressed(KeyCode::ArrowLeft) {
         state.move_player(-1, 0)
     }
-    if keyboard.just_pressed(KeyCode::Right) {
+    if keyboard.just_pressed(KeyCode::ArrowRight) {
         state.move_player(1, 0)
     }
-    if keyboard.just_pressed(KeyCode::Up) {
+    if keyboard.just_pressed(KeyCode::ArrowUp) {
         state.move_player(0, -1)
     }
-    if keyboard.just_pressed(KeyCode::Down) {
+    if keyboard.just_pressed(KeyCode::ArrowDown) {
         state.move_player(0, 1)
     }
 

bracket-bevy/src/builder/bterm_builder.rs

@@ -7,7 +7,7 @@ use crate::{
 };
 use bevy::{
     diagnostic::{FrameTimeDiagnosticsPlugin, LogDiagnosticsPlugin},
-    prelude::{CoreStage, Plugin, SystemStage, Resource},
+    prelude::{Plugin, PostUpdate, PreUpdate, Resource, Startup},
     utils::HashMap,
 };
 use bracket_color::prelude::RGBA;
@@ -176,37 +176,25 @@ impl BTermBuilder {
 
 impl Plugin for BTermBuilder {
     fn build(&self, app: &mut bevy::prelude::App) {
-        app.insert_resource(bevy::prelude::Msaa { samples: 1 });
         if self.with_diagnostics {
-            app.add_plugin(FrameTimeDiagnosticsPlugin);
+            app.add_plugins(FrameTimeDiagnosticsPlugin);
         }
         if self.log_diagnostics {
-            app.add_plugin(LogDiagnosticsPlugin::default());
+            app.add_plugins(LogDiagnosticsPlugin::default());
         }
         app.insert_resource(self.clone());
         app.insert_resource(ScreenScaler::new(self.gutter));
-        app.add_startup_system(load_terminals);
+        app.add_systems(Startup, load_terminals);
         if self.with_diagnostics {
-            app.add_stage_before(
-                CoreStage::Update,
-                "bracket_term_diagnostics",
-                SystemStage::single_threaded(),
-            );
-            app.add_system(update_timing);
-            app.add_system(update_mouse_position);
+            app.add_systems(PreUpdate, (update_timing, update_mouse_position));
         }
-        app.add_stage_after(
-            CoreStage::Update,
-            "bracket_term_update",
-            SystemStage::single_threaded(),
-        );
         if self.auto_apply_batches {
-            app.add_system(apply_all_batches);
+            app.add_systems(PostUpdate, apply_all_batches);
         }
-        app.add_system(update_consoles);
-        app.add_system(replace_meshes);
-        app.add_system(window_resize);
-        app.add_system(fix_images);
+        app.add_systems(
+            PostUpdate,
+            (update_consoles, replace_meshes, window_resize, fix_images),
+        );
         if self.with_random_number_generator {
             app.insert_resource(RandomNumbers::new());
         }