Refactor game_manager to game/mod.rs

rust/src/bgm.rs

@@ -4,7 +4,7 @@ use godot::{
     tools::get_autoload_by_name,
 };
 
-use crate::game_manager::GameManager;
+use crate::game::GameManager;
 
 pub const MUSIC_MANAGER_GLOBAL: &str = "MusicManagerGlobal";
 

rust/src/chat.rs

@@ -2,7 +2,7 @@ use godot::{classes::RichTextLabel, prelude::*};
 
 use crate::{
     announcer::Announcement,
-    game_manager::{Game, Player},
+    game::{Game, Player},
     player::DamageSource,
 };
 

rust/src/cli_parser.rs

@@ -3,7 +3,7 @@ use std::net::SocketAddr;
 use godot::{classes::Os, prelude::*};
 
 use crate::{
-    game_manager::{Game, GameManager},
+    game::{Game, GameManager},
     net::network_manager::NetworkManager,
 };
 

rust/src/goal.rs

@@ -3,7 +3,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::{game_manager::Game, net::network_manager::NetworkManager, player::ball::Ball};
+use crate::{game::Game, net::network_manager::NetworkManager, player::ball::Ball};
 
 #[derive(GodotClass)]
 #[class(base=Area3D, init)]

rust/src/killbox.rs

@@ -5,7 +5,7 @@ use godot::{
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    game_manager::Game,
+    game::Game,
     net::network_manager::NetworkManager,
     player::{DamageSource, IPlayer, ball::Ball},
 };

rust/src/lib.rs

@@ -5,7 +5,7 @@ pub mod bgm;
 pub mod chat;
 pub mod cli_parser;
 pub mod credits;
-pub mod game_manager;
+pub mod game;
 pub mod game_settings;
 pub mod goal;
 pub mod killbox;

rust/src/lobby_world.rs

@@ -2,7 +2,7 @@ use std::{collections::HashMap, f32::consts::PI};
 
 use godot::{classes::RandomNumberGenerator, prelude::*};
 
-use crate::{game_manager::Game, ui::menu_player::MenuPlayer};
+use crate::{game::Game, ui::menu_player::MenuPlayer};
 
 #[derive(GodotClass)]
 #[class(base=Node3D, init)]

rust/src/map.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use godot::{classes::CharacterBody3D, prelude::*};
 
 use crate::{
-    game_manager::{Game, GameManager},
+    game::{Game, GameManager},
     net::util::NetVector3,
     pickup::Pickup,
     player::{

rust/src/net/network_manager.rs

@@ -10,7 +10,7 @@ use teanet::{Peer, PeerConfig, PeerMessage};
 
 use crate::{
     announcer::Announcement,
-    game_manager::{Game, GameManager, GameOption, GameOptionValue, NetPlayer},
+    game::{Game, GameManager, GameOption, GameOptionValue, NetPlayer},
     game_settings::GameSettingsManager,
     net::{net_stats::Stats, util::NetVector3},
     player::{DamageSource, NetTransform, weapon::WeaponType},

rust/src/net/protocol.rs

@@ -4,7 +4,7 @@ use godot::obj::Singleton;
 use teanet::PeerMessage;
 
 use crate::{
-    game_manager::{Game, GameManager, GameOption},
+    game::{Game, GameManager, GameOption},
     game_settings::GameSettingsManager,
     net::network_manager::{NetworkManager, Package, PeerKind},
     popup_queue::{Popup, PopupQueue},

rust/src/pickup.rs

@@ -2,7 +2,7 @@ use godot::{classes::Area3D, prelude::*};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    game_manager::Game, map::Map, net::network_manager::NetworkManager, player::IPlayer,
+    game::Game, map::Map, net::network_manager::NetworkManager, player::IPlayer,
     replay::StandaloneReplayManager,
 };
 

rust/src/player/local_player.rs

@@ -10,7 +10,7 @@ use godot::{
 };
 
 use crate::{
-    game_manager::{Game, GameManager, GameOption},
+    game::{Game, GameManager, GameOption},
     game_settings::{GameSettings, GameSettingsManager},
     killbox::KillboxKind,
     net::{

rust/src/player/mod.rs

@@ -8,7 +8,7 @@ use godot::{
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    game_manager::{Game, GameOption},
+    game::{Game, GameOption},
     killbox::KillboxKind,
     net::{
         network_manager::NetworkManager,

rust/src/player/remote_player.rs

@@ -8,7 +8,7 @@ use godot::{
 };
 
 use crate::{
-    game_manager::{Game, GameOption},
+    game::{Game, GameOption},
     killbox::KillboxKind,
     pickup::PickupKind,
     player::{

rust/src/player/weapon.rs

@@ -7,7 +7,7 @@ use godot::{
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    game_manager::Game,
+    game::Game,
     net::util::{cast_ray, shotgun_ray},
     player::{DamageSource, shootable::Shootable},
     replay::StandaloneReplayManager,

rust/src/replay.rs

@@ -9,7 +9,7 @@ use godot::{
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    game_manager::{Game, GameManager, Player},
+    game::{Game, GameManager, Player},
     game_settings::GameSettingsManager,
     map::Map,
     net::{network_manager::BallSync, util::NetVector3},

rust/src/ui/chatbox.rs

@@ -10,7 +10,7 @@ use godot::{
 
 use crate::{
     chat::Chat,
-    game_manager::Game,
+    game::Game,
     net::network_manager::{NetworkManager, Package, PeerKind},
     ui::cli::CommandLinePanel,
 };

rust/src/ui/game_finished_screen.rs

@@ -4,7 +4,7 @@ use godot::{
 };
 
 use crate::{
-    game_manager::{Game, GameManager},
+    game::{Game, GameManager},
     ui::player_listings::PlayerListings,
 };
 

rust/src/ui/hud.rs

@@ -7,7 +7,7 @@ use godot::{
 };
 
 use crate::{
-    game_manager::Game,
+    game::Game,
     net::network_manager::NetworkManager,
     ui::{chatbox::ChatBox, cli::CommandLinePanel, settings::SettingsPanel},
 };

rust/src/ui/lobby.rs

@@ -10,7 +10,7 @@ use godot::{
 
 use crate::{
     bgm::{Music, MusicManager},
-    game_manager::{Game, GameManager, GameOption, GameOptionValue, GameOptions},
+    game::{Game, GameManager, GameOption, GameOptionValue, GameOptions},
     net::network_manager::{NetworkManager, Package, PeerKind},
     ui::lobby_player_listing::LobbyPlayerListing,
 };

rust/src/ui/lobby_player_listing.rs

@@ -4,7 +4,7 @@ use godot::{
 };
 
 use crate::{
-    game_manager::{Game, GameOption, GameOptions},
+    game::{Game, GameOption, GameOptions},
     net::network_manager::NetworkManager,
     team_resource::TeamResource,
 };

rust/src/ui/menu_player.rs

@@ -3,7 +3,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::{game_manager::Game, player::soldier_mesh::SoldierMesh};
+use crate::{game::Game, player::soldier_mesh::SoldierMesh};
 
 #[derive(GodotClass)]
 #[class(base=CharacterBody3D, init)]

rust/src/ui/player_listing.rs

@@ -3,7 +3,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::{game_manager::Game, replay::StandaloneReplayManager};
+use crate::{game::Game, replay::StandaloneReplayManager};
 
 #[derive(GodotClass)]
 #[class(base=HBoxContainer, init)]

rust/src/ui/player_listings.rs

@@ -4,9 +4,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::{
+use crate::{game::Game, replay::StandaloneReplayManager, ui::player_listing::PlayerListing};
-    game_manager::Game, replay::StandaloneReplayManager, ui::player_listing::PlayerListing,
-};
 
 #[derive(GodotClass)]
 #[class(base=HBoxContainer, init)]

rust/src/ui/replay_finished_screen.rs

@@ -4,7 +4,7 @@ use godot::{
 };
 
 use crate::{
-    game_manager::{Game, GameManager},
+    game::{Game, GameManager},
     replay::StandaloneReplayManager,
     ui::player_listings::PlayerListings,
 };

rust/src/ui/simple_score_view.rs

@@ -5,7 +5,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::{game_manager::Game, replay::StandaloneReplayManager};
+use crate::{game::Game, replay::StandaloneReplayManager};
 
 #[derive(GodotClass)]
 #[class(base=HBoxContainer, init)]