diff --git a/crates/hedz_reloaded/src/backpack/backpack_ui.rs b/crates/hedz_reloaded/src/backpack/backpack_ui.rs deleted file mode 100644 index a6f8912..0000000 --- a/crates/hedz_reloaded/src/backpack/backpack_ui.rs +++ /dev/null @@ -1,39 +0,0 @@ -use super::UiHeadState; -use bevy::prelude::*; - -pub static BACKPACK_HEAD_SLOTS: usize = 5; - -#[derive(Component, Default)] -pub struct BackpackMarker; - -#[derive(Component, Default)] -pub struct BackpackCountText; - -#[derive(Component, Default)] -pub struct HeadSelector(pub usize); - -#[derive(Component, Default)] -pub struct HeadImage(pub usize); - -#[derive(Component, Default)] -pub struct HeadDamage(pub usize); - -#[derive(Component, Default, Debug, Reflect)] -#[reflect(Component, Default)] -pub struct BackpackUiState { - pub heads: [Option; 5], - pub scroll: usize, - pub count: usize, - pub current_slot: usize, - pub open: bool, -} - -impl BackpackUiState { - pub fn relative_current_slot(&self) -> usize { - self.current_slot.saturating_sub(self.scroll) - } -} - -pub fn plugin(app: &mut App) { - app.register_type::(); -} diff --git a/crates/hedz_reloaded/src/backpack/mod.rs b/crates/hedz_reloaded/src/backpack/mod.rs index 836f730..d2f558e 100644 --- a/crates/hedz_reloaded/src/backpack/mod.rs +++ b/crates/hedz_reloaded/src/backpack/mod.rs @@ -6,13 +6,7 @@ use crate::{ heads_database::HeadsDatabase, }; use bevy::prelude::*; -#[cfg(feature = "client")] -use bevy_replicon::prelude::ClientTriggerExt; use serde::{Deserialize, Serialize}; -pub use ui_head_state::UiHeadState; - -pub mod backpack_ui; -pub mod ui_head_state; #[derive(Component, Default, Reflect, Serialize, Deserialize, PartialEq)] #[reflect(Component)] @@ -40,120 +34,15 @@ impl Backpack { } } -#[derive(Event, Serialize, Deserialize)] +#[derive(Event, Debug, Serialize, Deserialize)] pub struct BackpackSwapEvent(pub usize); pub fn plugin(app: &mut App) { app.register_type::(); - app.add_plugins(backpack_ui::plugin); - - #[cfg(feature = "client")] - app.add_systems(FixedUpdate, (backpack_inputs, sync_on_change)); - global_observer!(app, on_head_collect); } -#[cfg(feature = "client")] -fn backpack_inputs( - backpacks: Single< - (&Backpack, &mut backpack_ui::BackpackUiState), - With, - >, - mut backpack_inputs: MessageReader, - mut commands: Commands, - time: Res