rust/src/bgm.rs

@@ -4,7 +4,7 @@ use godot::{
     tools::get_autoload_by_name,
 };
 
-use crate::game::GameManager;
+use crate::game_manager::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::{Game, Player},
+    game_manager::{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::{Game, GameManager},
+    game_manager::{Game, GameManager},
     net::network_manager::NetworkManager,
 };
 

rust/src/game/commands.rs

@@ -1,74 +0,0 @@
-use godot::classes::class_macros::private::virtuals::Xrvrs::Gd;
-
-use crate::{
-    game::Game,
-    ui::cli::{CliColor, Command, CommandLinePanel},
-};
-
-pub fn register_commands(cli: &mut Gd<CommandLinePanel>) {
-    cli.bind_mut()
-        .register_command("respawn_ball".to_string(), Box::new(RespawnBallCommand));
-    cli.bind_mut()
-        .register_command("players".to_string(), Box::new(ListPlayersCommand));
-    cli.bind_mut()
-        .register_command("kill".to_string(), Box::new(KillCommand));
-}
-
-pub fn unregister_commands(cli: &mut Gd<CommandLinePanel>) {
-    cli.bind_mut()
-        .unregister_command("respawn_ball".to_string());
-    cli.bind_mut().unregister_command("players".to_string());
-    cli.bind_mut().unregister_command("kill".to_string());
-}
-
-pub struct RespawnBallCommand;
-impl Command for RespawnBallCommand {
-    fn execute(&self, _: &mut CommandLinePanel, _: &[&str]) {
-        if let Some(game) = &mut Game::singleton() {
-            game.bind_mut().respawn_ball();
-        }
-    }
-
-    fn help(&self) -> &str {
-        "respawns the ball"
-    }
-}
-
-pub struct ListPlayersCommand;
-impl Command for ListPlayersCommand {
-    fn execute(&self, cli: &mut CommandLinePanel, _: &[&str]) {
-        if let Some(game) = &mut Game::singleton() {
-            for player in &game.bind().players {
-                cli.publish_message(
-                    format!(" - {} ({})", player.data.name, player.id()),
-                    CliColor::Info,
-                );
-            }
-        }
-    }
-
-    fn help(&self) -> &str {
-        "lists all players"
-    }
-}
-
-pub struct KillCommand;
-impl Command for KillCommand {
-    fn execute(&self, cli: &mut CommandLinePanel, args: &[&str]) {
-        if let Some(player_str) = args.first() {
-            if let Ok(player_id) = player_str.parse() {
-                if let Some(game) = &mut Game::singleton() {
-                    game.bind_mut().kill_player(player_id);
-                }
-            } else {
-                cli.publish_message("Invalid player id".to_string(), CliColor::Error);
-            }
-        } else {
-            cli.publish_message("Usage: kill [player_id]".to_string(), CliColor::Error);
-        }
-    }
-
-    fn help(&self) -> &str {
-        "kills given player"
-    }
-}

rust/src/game/opts.rs

@@ -1,86 +0,0 @@
-use std::collections::HashMap;
-
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug)]
-pub struct GameOptions {
-    pub values: HashMap<GameOption, GameOptionValue>,
-}
-
-impl Default for GameOptions {
-    fn default() -> Self {
-        let mut opts = HashMap::new();
-        opts.insert(GameOption::AllowAnyMap, GameOptionValue::Boolean(false));
-        opts.insert(GameOption::AllowAnyTeam, GameOptionValue::Boolean(false));
-        opts.insert(GameOption::FriendlyFire, GameOptionValue::Boolean(true));
-        opts.insert(GameOption::GoalsNeededToWin, GameOptionValue::Number(5.));
-        opts.insert(GameOption::RespawnTimer, GameOptionValue::Number(5.));
-        opts.insert(
-            GameOption::TelegrenadesAllowed,
-            GameOptionValue::Boolean(true),
-        );
-        Self { values: opts }
-    }
-}
-
-impl GameOptions {
-    pub fn is_true(&self, opt: GameOption) -> bool {
-        let opt = self
-            .values
-            .get(&opt)
-            .copied()
-            .unwrap_or(GameOptionValue::Boolean(false));
-        match opt {
-            GameOptionValue::Boolean(value) => value,
-            _ => false,
-        }
-    }
-
-    pub fn get_float(&self, opt: GameOption) -> f64 {
-        let opt = self
-            .values
-            .get(&opt)
-            .copied()
-            .unwrap_or(GameOptionValue::Number(0.));
-        match opt {
-            GameOptionValue::Number(value) => value,
-            _ => 0.,
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Hash, Copy, Clone, Serialize, Deserialize)]
-pub enum GameOption {
-    /// Allow anyone to select a map, not just the host
-    AllowAnyMap,
-    /// Allow anyone to select anyone's team, not just themselves and the host
-    AllowAnyTeam,
-    /// Allow anyone to shoot anyone, not just other team's members
-    FriendlyFire,
-    /// The number of goals needed to win a match
-    GoalsNeededToWin,
-    /// Whether telegrenades are allowed or not.
-    TelegrenadesAllowed,
-    /// How long in seconds does it take for a player to respawn
-    RespawnTimer,
-}
-
-impl ToString for GameOption {
-    fn to_string(&self) -> String {
-        match self {
-            GameOption::AllowAnyMap => "Allow anyone to select the map",
-            GameOption::AllowAnyTeam => "Allow anyone to select any teams",
-            GameOption::FriendlyFire => "Friendly fire",
-            GameOption::GoalsNeededToWin => "Goals needed to win",
-            GameOption::TelegrenadesAllowed => "Telegrenades allowed",
-            GameOption::RespawnTimer => "Respawn Time (seconds)",
-        }
-        .to_owned()
-    }
-}
-
-#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
-pub enum GameOptionValue {
-    Boolean(bool),
-    Number(f64),
-}

rust/src/game_manager.rs

@@ -10,10 +10,6 @@ use crate::{
     },
     bgm::{Music, MusicManager},
     chat::{Chat, ChatMessage},
-    game::{
-        commands::{register_commands, unregister_commands},
-        opts::{GameOption, GameOptionValue, GameOptions},
-    },
     map::Map,
     map_resource::MapResource,
     net::{
@@ -33,12 +29,9 @@ use crate::{
     },
     replay::{ReplayEvent, ReplayPlayback, ReplayRecorder},
     team_resource::TeamResource,
-    ui::cli::CommandLinePanel,
+    ui::cli::{CliColor, Command, CommandLinePanel},
 };
 
-pub mod commands;
-pub mod opts;
-
 pub const GAME_MANAGER_GLOBAL: &str = "GameManagerGlobal";
 
 #[derive(GodotClass)]
@@ -159,6 +152,141 @@ impl GameManager {
     }
 }
 
+#[derive(Debug)]
+pub struct GameOptions {
+    pub values: HashMap<GameOption, GameOptionValue>,
+}
+
+impl Default for GameOptions {
+    fn default() -> Self {
+        let mut opts = HashMap::new();
+        opts.insert(GameOption::AllowAnyMap, GameOptionValue::Boolean(false));
+        opts.insert(GameOption::AllowAnyTeam, GameOptionValue::Boolean(false));
+        opts.insert(GameOption::FriendlyFire, GameOptionValue::Boolean(true));
+        opts.insert(GameOption::GoalsNeededToWin, GameOptionValue::Number(5.));
+        opts.insert(GameOption::RespawnTimer, GameOptionValue::Number(5.));
+        opts.insert(
+            GameOption::TelegrenadesAllowed,
+            GameOptionValue::Boolean(true),
+        );
+        Self { values: opts }
+    }
+}
+
+impl GameOptions {
+    pub fn is_true(&self, opt: GameOption) -> bool {
+        let opt = self
+            .values
+            .get(&opt)
+            .copied()
+            .unwrap_or(GameOptionValue::Boolean(false));
+        match opt {
+            GameOptionValue::Boolean(value) => value,
+            _ => false,
+        }
+    }
+
+    pub fn get_float(&self, opt: GameOption) -> f64 {
+        let opt = self
+            .values
+            .get(&opt)
+            .copied()
+            .unwrap_or(GameOptionValue::Number(0.));
+        match opt {
+            GameOptionValue::Number(value) => value,
+            _ => 0.,
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Hash, Copy, Clone, Serialize, Deserialize)]
+pub enum GameOption {
+    /// Allow anyone to select a map, not just the host
+    AllowAnyMap,
+    /// Allow anyone to select anyone's team, not just themselves and the host
+    AllowAnyTeam,
+    /// Allow anyone to shoot anyone, not just other team's members
+    FriendlyFire,
+    /// The number of goals needed to win a match
+    GoalsNeededToWin,
+    /// Whether telegrenades are allowed or not.
+    TelegrenadesAllowed,
+    /// How long in seconds does it take for a player to respawn
+    RespawnTimer,
+}
+
+impl ToString for GameOption {
+    fn to_string(&self) -> String {
+        match self {
+            GameOption::AllowAnyMap => "Allow anyone to select the map",
+            GameOption::AllowAnyTeam => "Allow anyone to select any teams",
+            GameOption::FriendlyFire => "Friendly fire",
+            GameOption::GoalsNeededToWin => "Goals needed to win",
+            GameOption::TelegrenadesAllowed => "Telegrenades allowed",
+            GameOption::RespawnTimer => "Respawn Time (seconds)",
+        }
+        .to_owned()
+    }
+}
+
+#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
+pub enum GameOptionValue {
+    Boolean(bool),
+    Number(f64),
+}
+
+pub struct RespawnBallCommand;
+impl Command for RespawnBallCommand {
+    fn execute(&self, _: &mut CommandLinePanel, _: &[&str]) {
+        if let Some(game) = &mut Game::singleton() {
+            game.bind_mut().respawn_ball();
+        }
+    }
+
+    fn help(&self) -> &str {
+        "respawns the ball"
+    }
+}
+
+pub struct ListPlayersCommand;
+impl Command for ListPlayersCommand {
+    fn execute(&self, cli: &mut CommandLinePanel, _: &[&str]) {
+        if let Some(game) = &mut Game::singleton() {
+            for player in &game.bind().players {
+                cli.publish_message(
+                    format!(" - {} ({})", player.data.name, player.id()),
+                    CliColor::Info,
+                );
+            }
+        }
+    }
+
+    fn help(&self) -> &str {
+        "lists all players"
+    }
+}
+
+pub struct KillCommand;
+impl Command for KillCommand {
+    fn execute(&self, cli: &mut CommandLinePanel, args: &[&str]) {
+        if let Some(player_str) = args.first() {
+            if let Ok(player_id) = player_str.parse() {
+                if let Some(game) = &mut Game::singleton() {
+                    game.bind_mut().kill_player(player_id);
+                }
+            } else {
+                cli.publish_message("Invalid player id".to_string(), CliColor::Error);
+            }
+        } else {
+            cli.publish_message("Usage: kill [player_id]".to_string(), CliColor::Error);
+        }
+    }
+
+    fn help(&self) -> &str {
+        "kills given player"
+    }
+}
+
 #[derive(GodotClass)]
 #[class(base=Node, init)]
 pub struct Game {
@@ -392,7 +520,12 @@ impl Game {
                     peer.set_accepting_connections(false);
 
                     let mut cli = CommandLinePanel::singleton();
-                    register_commands(&mut cli);
+                    cli.bind_mut()
+                        .register_command("respawn_ball".to_string(), Box::new(RespawnBallCommand));
+                    cli.bind_mut()
+                        .register_command("players".to_string(), Box::new(ListPlayersCommand));
+                    cli.bind_mut()
+                        .register_command("kill".to_string(), Box::new(KillCommand));
                 }
             }
         });
@@ -461,7 +594,10 @@ impl Game {
         });
 
         let mut cli = CommandLinePanel::singleton();
-        unregister_commands(&mut cli);
+        cli.bind_mut()
+            .unregister_command("respawn_ball".to_string());
+        cli.bind_mut().unregister_command("players".to_string());
+        cli.bind_mut().unregister_command("kill".to_string());
     }
 
     pub fn change_option(&mut self, opt: GameOption, value: GameOptionValue) {

rust/src/game_settings.rs

@@ -1,9 +1,12 @@
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
+use std::{
+    net::SocketAddr,
+    time::{Duration, SystemTime, UNIX_EPOCH},
+};
 
 use godot::{
     classes::{
         AudioServer, DisplayServer, FileAccess, InputEvent, InputEventKey, InputEventMouseButton,
-        InputMap, display_server::WindowMode, file_access::ModeFlags,
+        InputMap, display_server::WindowMode, file_access::ModeFlags, window::Mode,
     },
     global::{Key, MouseButton},
     prelude::*,

rust/src/goal.rs

@@ -3,7 +3,7 @@ use godot::{
     prelude::*,
 };
 
-use crate::{game::Game, net::network_manager::NetworkManager, player::ball::Ball};
+use crate::{game_manager::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::Game,
+    game_manager::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;
+pub mod game_manager;
 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::Game, ui::menu_player::MenuPlayer};
+use crate::{game_manager::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::{Game, GameManager},
+    game_manager::{Game, GameManager},
     net::util::NetVector3,
     pickup::Pickup,
     player::{

rust/src/net/network_manager.rs

@@ -10,10 +10,7 @@ use teanet::{Peer, PeerConfig, PeerMessage};
 
 use crate::{
     announcer::Announcement,
-    game::{
+    game_manager::{Game, GameManager, GameOption, GameOptionValue, NetPlayer},
-        Game, GameManager, NetPlayer,
-        opts::{GameOption, GameOptionValue},
-    },
     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::{Game, GameManager, opts::GameOption},
+    game_manager::{Game, GameManager, GameOption},
     game_settings::GameSettingsManager,
     net::network_manager::{NetworkManager, Package, PeerKind},
     popup_queue::{Popup, PopupQueue},
@@ -17,7 +17,7 @@ impl NetworkManager {
 
         if let Some(peer) = &mut self.peer {
             match peer {
-                PeerKind::Client(peer, _) => match message {
+                PeerKind::Client(peer, addr) => match message {
                     teanet::PeerMessage::NewConnection(connection) => {
                         cli.bind_mut().publish_message(
                             format!("Connected to: {}", connection.address),

rust/src/pickup.rs

@@ -2,7 +2,7 @@ use godot::{classes::Area3D, prelude::*};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    game::Game, map::Map, net::network_manager::NetworkManager, player::IPlayer,
+    game_manager::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::{Game, GameManager, opts::GameOption},
+    game_manager::{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::{Game, opts::GameOption},
+    game_manager::{Game, GameOption},
     killbox::KillboxKind,
     net::{
         network_manager::NetworkManager,

rust/src/player/remote_player.rs

@@ -8,7 +8,7 @@ use godot::{
 };
 
 use crate::{
-    game::{Game, opts::GameOption},
+    game_manager::{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::Game,
+    game_manager::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::{Game, GameManager, Player},
+    game_manager::{Game, GameManager, Player},
     game_settings::GameSettingsManager,
     map::Map,
     net::{network_manager::BallSync, util::NetVector3},
@@ -362,7 +362,9 @@ impl INode for ReplayPlayback {
                             }
                             self.telegrenades.remove(player_id);
 
-                            if let Some(map) = &mut self.current_map {
+                            if let Some(map) = &mut self.current_map
+                                && let Some(player) = self.replay.players.get(player_id)
+                            {
                                 if let Some(telegrenade) = map.bind_mut().spawn_replay_telegrenade(
                                     (*location).into(),
                                     (*velocity).into(),

rust/src/ui/chatbox.rs

@@ -10,7 +10,7 @@ use godot::{
 
 use crate::{
     chat::Chat,
-    game::Game,
+    game_manager::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::{Game, GameManager},
+    game_manager::{Game, GameManager},
     ui::player_listings::PlayerListings,
 };
 

rust/src/ui/hud.rs

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

rust/src/ui/lobby.rs

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

rust/src/ui/lobby_player_listing.rs

@@ -4,10 +4,7 @@ use godot::{
 };
 
 use crate::{
-    game::{
+    game_manager::{Game, GameOption, GameOptions},
-        Game,
-        opts::{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::Game, player::soldier_mesh::SoldierMesh};
+use crate::{game_manager::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::Game, replay::StandaloneReplayManager};
+use crate::{game_manager::Game, replay::StandaloneReplayManager};
 
 #[derive(GodotClass)]
 #[class(base=HBoxContainer, init)]

rust/src/ui/player_listings.rs

@@ -4,7 +4,9 @@ use godot::{
     prelude::*,
 };
 
-use crate::{game::Game, replay::StandaloneReplayManager, ui::player_listing::PlayerListing};
+use crate::{
+    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::{Game, GameManager},
+    game_manager::{Game, GameManager},
     replay::StandaloneReplayManager,
     ui::player_listings::PlayerListings,
 };

rust/src/ui/replay_hud.rs

@@ -1,5 +1,5 @@
 use godot::{
-    classes::{Control, IControl, Label, Slider},
+    classes::{Control, IControl, InputEvent, Label, Slider},
     prelude::*,
 };
 

rust/src/ui/simple_score_view.rs

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