Skip to content

Commit

Permalink
Update to latest Bevy main
Browse files Browse the repository at this point in the history
  • Loading branch information
NiklasEi committed Feb 3, 2024
1 parent 18c17fb commit 326e766
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ xml = ["dep:quick-xml"]
csv = ["dep:csv"]

[dependencies]
bevy = { version = "0.12", default-features = false, features = ["bevy_asset"] }
bevy = { git = "https://github.com/bevyengine/bevy", version = "0.12", default-features = false, features = ["bevy_asset"] }
serde_toml = { version = "0.8", package = "toml", optional = true }
serde_ron = { version = "0.8", package = "ron", optional = true }
serde_yaml = { version = "0.9", optional = true }
Expand All @@ -35,7 +35,7 @@ serde = { version = "1" }
anyhow = { version = "1" }

[dev-dependencies]
bevy = { version = "0.12" }
bevy = { git = "https://github.com/bevyengine/bevy", version = "0.12" }
serde = { version = "1" }

[package.metadata.docs.rs]
Expand Down
2 changes: 1 addition & 1 deletion examples/csv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn main() {
CsvAssetPlugin::<TreePosition>::new(&["level.csv"]),
))
.insert_resource(Msaa::Off)
.add_state::<AppState>()
.init_state::<AppState>()
.add_systems(Startup, setup)
.add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
.run()
Expand Down
2 changes: 1 addition & 1 deletion examples/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fn main() {
JsonAssetPlugin::<Level>::new(&["level.json"]),
))
.insert_resource(Msaa::Off)
.add_state::<AppState>()
.init_state::<AppState>()
.add_systems(Startup, setup)
.add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
.run()
Expand Down
2 changes: 1 addition & 1 deletion examples/msgpack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fn main() {
MsgPackAssetPlugin::<Level>::new(&["level.msgpack"]),
))
.insert_resource(Msaa::Off)
.add_state::<AppState>()
.init_state::<AppState>()
.add_systems(Startup, setup)
.add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
.run()
Expand Down
2 changes: 1 addition & 1 deletion examples/multiple_formats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn main() {
JsonAssetPlugin::<Level>::new(&["level.json"]),
))
.insert_resource(Msaa::Off)
.add_state::<AppState>()
.init_state::<AppState>()
.add_systems(Startup, setup)
.add_systems(Update, check_loading.run_if(in_state(AppState::Loading)))
.add_systems(OnEnter(AppState::Level), spawn_level)
Expand Down
2 changes: 1 addition & 1 deletion examples/ron.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ fn main() {
App::new()
.add_plugins((DefaultPlugins, RonAssetPlugin::<Level>::new(&["level.ron"])))
.insert_resource(Msaa::Off)
.add_state::<AppState>()
.init_state::<AppState>()
.add_systems(Startup, setup)
.add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
.run()
Expand Down
2 changes: 1 addition & 1 deletion examples/toml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fn main() {
TomlAssetPlugin::<Level>::new(&["level.toml"]),
))
.insert_resource(Msaa::Off)
.add_state::<AppState>()
.init_state::<AppState>()
.add_systems(Startup, setup)
.add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
.run()
Expand Down
2 changes: 1 addition & 1 deletion examples/xml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fn main() {
App::new()
.add_plugins((DefaultPlugins, XmlAssetPlugin::<Level>::new(&["level.xml"])))
.insert_resource(Msaa::Off)
.add_state::<AppState>()
.init_state::<AppState>()
.add_systems(Startup, setup)
.add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
.run()
Expand Down
2 changes: 1 addition & 1 deletion examples/yaml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fn main() {
YamlAssetPlugin::<Level>::new(&["level.yaml"]),
))
.insert_resource(Msaa::Off)
.add_state::<AppState>()
.init_state::<AppState>()
.add_systems(Startup, setup)
.add_systems(Update, spawn_level.run_if(in_state(AppState::Loading)))
.run()
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
//! struct LevelAsset(Handle<Level>);
//!
//! # fn stop(mut events: EventWriter<AppExit>) {
//! # events.send(AppExit)
//! # events.send(AppExit);
//! # }
//! ```

Expand Down

0 comments on commit 326e766

Please sign in to comment.