diff --git a/crates/bevy_state/Cargo.toml b/crates/bevy_state/Cargo.toml index 39e8623e86..b9d9b27399 100644 --- a/crates/bevy_state/Cargo.toml +++ b/crates/bevy_state/Cargo.toml @@ -19,7 +19,7 @@ bevy_hierarchy = ["dep:bevy_hierarchy"] [dependencies] bevy_ecs = { path = "../bevy_ecs", version = "0.14.0-dev" } -bevy_state_macros = { path = "macros", version = "0.14.0-dev" } +bevy_state_macros_official = { path = "macros", version = "0.14.0-dev" } bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" } bevy_reflect = { path = "../bevy_reflect", version = "0.14.0-dev", optional = true } bevy_app = { path = "../bevy_app", version = "0.14.0-dev", optional = true } diff --git a/crates/bevy_state/macros/Cargo.toml b/crates/bevy_state/macros/Cargo.toml index 70ff618e47..dd3a6db611 100644 --- a/crates/bevy_state/macros/Cargo.toml +++ b/crates/bevy_state/macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "bevy_state_macros" +name = "bevy_state_macros_official" version = "0.14.0-dev" description = "Bevy ECS Macros" edition = "2021" diff --git a/crates/bevy_state/src/condition.rs b/crates/bevy_state/src/condition.rs index c0ff5abe49..d303738f48 100644 --- a/crates/bevy_state/src/condition.rs +++ b/crates/bevy_state/src/condition.rs @@ -180,7 +180,7 @@ mod tests { use bevy_ecs::schedule::{Condition, IntoSystemConfigs, Schedule}; use crate::prelude::*; - use bevy_state_macros::States; + use bevy_state_macros_official::States; #[derive(States, PartialEq, Eq, Debug, Default, Hash, Clone)] enum TestState { diff --git a/crates/bevy_state/src/state/mod.rs b/crates/bevy_state/src/state/mod.rs index 9e5df2d0b6..7675552137 100644 --- a/crates/bevy_state/src/state/mod.rs +++ b/crates/bevy_state/src/state/mod.rs @@ -6,7 +6,7 @@ mod states; mod sub_states; mod transitions; -pub use bevy_state_macros::*; +pub use bevy_state_macros_official::*; pub use computed_states::*; pub use freely_mutable_state::*; pub use resources::*; @@ -20,8 +20,8 @@ mod tests { use bevy_ecs::event::EventRegistry; use bevy_ecs::prelude::*; use bevy_ecs::schedule::ScheduleLabel; - use bevy_state_macros::States; - use bevy_state_macros::SubStates; + use bevy_state_macros_official::States; + use bevy_state_macros_official::SubStates; use super::*; use crate as bevy_state; diff --git a/crates/bevy_state/src/state/resources.rs b/crates/bevy_state/src/state/resources.rs index 66aa42bf14..0c8e089d6b 100644 --- a/crates/bevy_state/src/state/resources.rs +++ b/crates/bevy_state/src/state/resources.rs @@ -23,7 +23,7 @@ use bevy_ecs::prelude::ReflectResource; /// ``` /// use bevy_state::prelude::*; /// use bevy_ecs::prelude::*; -/// use bevy_state_macros::States; +/// use bevy_state_macros_official::States; /// /// #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Default, States)] /// enum GameState { diff --git a/crates/bevy_state/src/state/sub_states.rs b/crates/bevy_state/src/state/sub_states.rs index 207ef74e24..8a2443b63b 100644 --- a/crates/bevy_state/src/state/sub_states.rs +++ b/crates/bevy_state/src/state/sub_states.rs @@ -1,7 +1,7 @@ use bevy_ecs::schedule::Schedule; use super::{freely_mutable_state::FreelyMutableState, state_set::StateSet, states::States}; -pub use bevy_state_macros::SubStates; +pub use bevy_state_macros_official::SubStates; /// A sub-state is a state that exists only when the source state meet certain conditions, /// but unlike [`ComputedStates`](crate::state::ComputedStates) - while they exist they can be manually modified.