From 375b8a5b46daf5d06bd9c1c27be52b1fbbb6c681 Mon Sep 17 00:00:00 2001
From: extrawurst <mail@rusticorn.com>
Date: Sun, 21 Dec 2025 17:52:24 -0500
Subject: [PATCH] fix cash ui

---
 crates/hedz_reloaded/src/cash.rs              | 45 +-----------------
 crates/hedz_reloaded/src/client/ui/cash_ui.rs | 47 +++++++++++++++++++
 crates/hedz_reloaded/src/client/ui/mod.rs     |  2 +
 3 files changed, 51 insertions(+), 43 deletions(-)
 create mode 100644 crates/hedz_reloaded/src/client/ui/cash_ui.rs

diff --git a/crates/hedz_reloaded/src/cash.rs b/crates/hedz_reloaded/src/cash.rs
index 6f847fb..181f854 100644
--- a/crates/hedz_reloaded/src/cash.rs
+++ b/crates/hedz_reloaded/src/cash.rs
@@ -1,7 +1,4 @@
-use crate::{
-    GameState, HEDZ_GREEN, global_observer, loading_assets::UIAssets, protocol::PlaySound,
-    server_observer,
-};
+use crate::{GameState, global_observer, protocol::PlaySound, server_observer};
 use avian3d::prelude::Rotation;
 use bevy::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -24,11 +21,7 @@ pub struct CashInventory {
 pub struct CashCollectEvent;
 
 pub fn plugin(app: &mut App) {
-    app.add_systems(OnEnter(GameState::Playing), setup);
-    app.add_systems(
-        Update,
-        (rotate, update_ui).run_if(in_state(GameState::Playing)),
-    );
+    app.add_systems(Update, rotate.run_if(in_state(GameState::Playing)));
 
     server_observer!(app, on_cash_collect);
 }
@@ -55,37 +48,3 @@ fn rotate(time: Res<Time>, mut query: Query<&mut Rotation, With<Cash>>) {
             .mul_quat(Quat::from_rotation_y(time.delta_secs()));
     }
 }
-
-fn update_ui(
-    cash: Single<&CashInventory, Changed<CashInventory>>,
-    text: Query<Entity, With<CashText>>,
-    mut writer: TextUiWriter,
-) {
-    let Some(text) = text.iter().next() else {
-        return;
-    };
-
-    *writer.text(text, 0) = cash.cash.to_string();
-}
-
-fn setup(mut commands: Commands, assets: Res<UIAssets>) {
-    commands.spawn((
-        Name::new("cash-ui"),
-        Text::new("0"),
-        TextShadow::default(),
-        CashText,
-        TextFont {
-            font: assets.font.clone(),
-            font_size: 34.0,
-            ..default()
-        },
-        TextColor(HEDZ_GREEN.into()),
-        TextLayout::new_with_justify(Justify::Center),
-        Node {
-            position_type: PositionType::Absolute,
-            bottom: Val::Px(40.0),
-            left: Val::Px(100.0),
-            ..default()
-        },
-    ));
-}
diff --git a/crates/hedz_reloaded/src/client/ui/cash_ui.rs b/crates/hedz_reloaded/src/client/ui/cash_ui.rs
new file mode 100644
index 0000000..5df2d06
--- /dev/null
+++ b/crates/hedz_reloaded/src/client/ui/cash_ui.rs
@@ -0,0 +1,47 @@
+use crate::{
+    GameState, HEDZ_GREEN, cash::CashInventory, loading_assets::UIAssets, player::LocalPlayer,
+};
+use bevy::prelude::*;
+
+#[derive(Component, Reflect, Default)]
+#[reflect(Component)]
+struct CashText;
+
+pub fn plugin(app: &mut App) {
+    app.add_systems(OnEnter(GameState::Playing), setup);
+    app.add_systems(Update, update_ui.run_if(in_state(GameState::Playing)));
+}
+
+fn update_ui(
+    cash: Single<&CashInventory, (Changed<CashInventory>, With<LocalPlayer>)>,
+    text: Query<Entity, With<CashText>>,
+    mut writer: TextUiWriter,
+) {
+    let Some(text) = text.iter().next() else {
+        return;
+    };
+
+    *writer.text(text, 0) = cash.cash.to_string();
+}
+
+fn setup(mut commands: Commands, assets: Res<UIAssets>) {
+    commands.spawn((
+        Name::new("cash-ui"),
+        Text::new("0"),
+        TextShadow::default(),
+        CashText,
+        TextFont {
+            font: assets.font.clone(),
+            font_size: 34.0,
+            ..default()
+        },
+        TextColor(HEDZ_GREEN.into()),
+        TextLayout::new_with_justify(Justify::Center),
+        Node {
+            position_type: PositionType::Absolute,
+            bottom: Val::Px(40.0),
+            left: Val::Px(100.0),
+            ..default()
+        },
+    ));
+}
diff --git a/crates/hedz_reloaded/src/client/ui/mod.rs b/crates/hedz_reloaded/src/client/ui/mod.rs
index 54a93fb..fd13156 100644
--- a/crates/hedz_reloaded/src/client/ui/mod.rs
+++ b/crates/hedz_reloaded/src/client/ui/mod.rs
@@ -1,4 +1,5 @@
 mod backpack_ui;
+mod cash_ui;
 mod heads_ui;
 mod pause;
 
@@ -11,4 +12,5 @@ pub fn plugin(app: &mut App) {
     app.add_plugins(heads_ui::plugin);
     app.add_plugins(backpack_ui::plugin);
     app.add_plugins(pause::plugin);
+    app.add_plugins(cash_ui::plugin);
 }