Refactor some files to player directory

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";

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;
 

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)]

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,

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},
 };

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)]