From 6eec26547d2692dae3ab074b44281c97e9d1556c Mon Sep 17 00:00:00 2001
From: Sofia <sofia@teascade.net>
Date: Fri, 24 Jul 2026 00:47:02 +0300
Subject: [PATCH] Refactor some files to player directory

---
 rust/src/game_manager.rs                     |  3 +--
 rust/src/lib.rs                              |  3 ---
 rust/src/net/network_manager.rs              |  3 +--
 rust/src/{player.rs => player/mod.rs}        | 10 ++++++++--
 rust/src/{ => player}/player_hand_remover.rs |  0
 rust/src/{ => player}/soldier_mesh.rs        |  2 +-
 rust/src/{ => player}/weapon.rs              |  0
 rust/src/ui/menu_player.rs                   |  2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)
 rename rust/src/{player.rs => player/mod.rs} (99%)
 rename rust/src/{ => player}/player_hand_remover.rs (100%)
 rename rust/src/{ => player}/soldier_mesh.rs (99%)
 rename rust/src/{ => player}/weapon.rs (100%)

diff --git a/rust/src/game_manager.rs b/rust/src/game_manager.rs
index 71d4732..4a08684 100644
--- a/rust/src/game_manager.rs
+++ b/rust/src/game_manager.rs
@@ -15,9 +15,8 @@ use crate::{
         },
         util::NetVector3,
     },
-    player::{DamageSource, IPlayer, LocalPlayer, NetTransform, RemotePlayer},
+    player::{DamageSource, IPlayer, LocalPlayer, NetTransform, RemotePlayer, weapon::WeaponType},
     team_resource::TeamResource,
-    weapon::WeaponType,
 };
 
 pub const GAME_MANAGER_GLOBAL: &str = "GameManagerGlobal";
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 3d35069..a1e7c50 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -10,12 +10,9 @@ pub mod map;
 pub mod map_resource;
 pub mod net;
 pub mod player;
-pub mod player_hand_remover;
 pub mod popup_queue;
-pub mod soldier_mesh;
 pub mod team_resource;
 pub mod ui;
-pub mod weapon;
 
 struct MyExtension;
 
diff --git a/rust/src/net/network_manager.rs b/rust/src/net/network_manager.rs
index a39f413..007fc1d 100644
--- a/rust/src/net/network_manager.rs
+++ b/rust/src/net/network_manager.rs
@@ -12,10 +12,9 @@ use crate::{
     game_manager::{Game, GameManager, GameOption, GameOptionValue, NetPlayer},
     game_settings::GameSettingsManager,
     net::{net_stats::Stats, util::NetVector3},
-    player::{DamageSource, NetTransform},
+    player::{DamageSource, NetTransform, weapon::WeaponType},
     popup_queue::{Popup, PopupQueue},
     ui::cli::{CliColor, CommandLinePanel},
-    weapon::WeaponType,
 };
 
 #[derive(GodotClass)]
diff --git a/rust/src/player.rs b/rust/src/player/mod.rs
similarity index 99%
rename from rust/src/player.rs
rename to rust/src/player/mod.rs
index 409db05..5cb876d 100644
--- a/rust/src/player.rs
+++ b/rust/src/player/mod.rs
@@ -22,11 +22,17 @@ use crate::{
         },
         util::{NetVector3, cast_ray},
     },
-    soldier_mesh::SoldierMesh,
+    player::{
+        soldier_mesh::SoldierMesh,
+        weapon::{BallWeapon, Raygun, Weapon, WeaponType},
+    },
     ui::{cli::CommandLinePanel, settings::SettingsPanel},
-    weapon::{BallWeapon, Raygun, Weapon, WeaponType},
 };
 
+pub mod player_hand_remover;
+pub mod soldier_mesh;
+pub mod weapon;
+
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct NetTransform {
     pub location: NetVector3,
diff --git a/rust/src/player_hand_remover.rs b/rust/src/player/player_hand_remover.rs
similarity index 100%
rename from rust/src/player_hand_remover.rs
rename to rust/src/player/player_hand_remover.rs
diff --git a/rust/src/soldier_mesh.rs b/rust/src/player/soldier_mesh.rs
similarity index 99%
rename from rust/src/soldier_mesh.rs
rename to rust/src/player/soldier_mesh.rs
index ea681dd..ffaf131 100644
--- a/rust/src/soldier_mesh.rs
+++ b/rust/src/player/soldier_mesh.rs
@@ -3,7 +3,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::{
+use crate::player::{
     player_hand_remover::PlayerHandRemover,
     weapon::{BallWeapon, Raygun, Weapon},
 };
diff --git a/rust/src/weapon.rs b/rust/src/player/weapon.rs
similarity index 100%
rename from rust/src/weapon.rs
rename to rust/src/player/weapon.rs
diff --git a/rust/src/ui/menu_player.rs b/rust/src/ui/menu_player.rs
index 6f9d129..7a29d3b 100644
--- a/rust/src/ui/menu_player.rs
+++ b/rust/src/ui/menu_player.rs
@@ -1,6 +1,6 @@
 use godot::prelude::*;
 
-use crate::soldier_mesh::SoldierMesh;
+use crate::player::soldier_mesh::SoldierMesh;
 
 #[derive(GodotClass)]
 #[class(base=Node3D, init)]