From 8555e08a2e286cb43756b14f585065524b7e581e Mon Sep 17 00:00:00 2001 From: MrlnHi Date: Sun, 5 Mar 2023 08:55:10 +0100 Subject: [PATCH] update for rebase --- crates/valence_schem/Cargo.toml | 2 +- .../valence_schem/examples/schem_loading.rs | 10 ++++--- crates/valence_schem/examples/schem_saving.rs | 26 ++++++++++--------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/crates/valence_schem/Cargo.toml b/crates/valence_schem/Cargo.toml index 67addfef3..5ab6c6068 100644 --- a/crates/valence_schem/Cargo.toml +++ b/crates/valence_schem/Cargo.toml @@ -21,7 +21,7 @@ valence_nbt = { version = "0.5.0", path = "../valence_nbt" } valence_protocol = { version = "0.1.0", path = "../valence_protocol" } [dev-dependencies] -bevy_ecs = "0.9.1" +bevy_ecs = { git = "https://github.com/bevyengine/bevy/", rev = "2ea00610188dce1eba1172a3ded8244570189230" } clap = { version = "4.1.6", features = ["derive"] } tracing = "0.1.37" tracing-subscriber = "0.3.16" diff --git a/crates/valence_schem/examples/schem_loading.rs b/crates/valence_schem/examples/schem_loading.rs index 0666689ab..5b0e2723e 100644 --- a/crates/valence_schem/examples/schem_loading.rs +++ b/crates/valence_schem/examples/schem_loading.rs @@ -22,10 +22,12 @@ pub fn main() { App::new() .add_plugin(ServerPlugin::new(())) .add_startup_system(setup) - .add_system_to_stage(EventLoop, default_event_handler) - .add_system_set(PlayerList::default_system_set()) - .add_system(init_clients) - .add_system(despawn_disconnected_clients) + .add_systems(( + default_event_handler.in_schedule(EventLoopSchedule), + init_clients, + despawn_disconnected_clients, + )) + .add_systems(PlayerList::default_systems()) .run(); } diff --git a/crates/valence_schem/examples/schem_saving.rs b/crates/valence_schem/examples/schem_saving.rs index 4316196e4..d071acf0f 100644 --- a/crates/valence_schem/examples/schem_saving.rs +++ b/crates/valence_schem/examples/schem_saving.rs @@ -19,18 +19,20 @@ pub fn main() { App::new() .add_plugin(ServerPlugin::new(())) .add_startup_system(setup) - .add_system_to_stage(EventLoop, default_event_handler) - .add_system_to_stage(EventLoop, first_pos) - .add_system_to_stage(EventLoop, second_pos) - .add_system_to_stage(EventLoop, origin) - .add_system_to_stage(EventLoop, copy_schem) - .add_system_to_stage(EventLoop, paste_schem) - .add_system_to_stage(EventLoop, save_schem) - .add_system_to_stage(EventLoop, place_blocks) - .add_system_to_stage(EventLoop, break_blocks) - .add_system_set(PlayerList::default_system_set()) - .add_system(init_clients) - .add_system(despawn_disconnected_clients) + .add_systems(( + default_event_handler.in_schedule(EventLoopSchedule), + first_pos.in_schedule(EventLoopSchedule), + second_pos.in_schedule(EventLoopSchedule), + origin.in_schedule(EventLoopSchedule), + copy_schem.in_schedule(EventLoopSchedule), + paste_schem.in_schedule(EventLoopSchedule), + save_schem.in_schedule(EventLoopSchedule), + place_blocks.in_schedule(EventLoopSchedule), + break_blocks.in_schedule(EventLoopSchedule), + init_clients, + despawn_disconnected_clients, + )) + .add_systems(PlayerList::default_systems()) .run(); }