Merge pull request #220 from Sunnickel/feature/join-message

feature: Added Join and Leave messages

Author: ReCore-sys

src/bin/src/systems/connection_killer.rs

@@ -1,3 +1,4 @@
+use crate::systems::system_messages;
 use bevy_ecs::prelude::{Commands, Entity, Query, Res};
 use ferrumc_core::identity::player_identity::PlayerIdentity;
 use ferrumc_net::connection::StreamWriter;
@@ -11,40 +12,48 @@ pub fn connection_killer(
     state: Res<GlobalStateResource>,
 ) {
     while let Some((disconnecting_entity, reason)) = state.0.players.disconnection_queue.pop() {
-        for (entity, conn, player_identity) in query.iter() {
-            if disconnecting_entity == entity {
-                info!(
-                    "Player {} ({}) disconnected: {}",
-                    player_identity.username,
-                    player_identity.uuid,
-                    reason.as_deref().unwrap_or("No reason")
-                );
-                if conn.running.load(std::sync::atomic::Ordering::Relaxed) {
-                    trace!(
-                        "Sending disconnect packet to player {}",
-                        player_identity.username
-                    );
-                    if let Err(e) = conn.send_packet_ref(
-                        &ferrumc_net::packets::outgoing::disconnect::DisconnectPacket {
-                            reason: TextComponent::from(
-                                reason.as_deref().unwrap_or("Disconnected"),
-                            ),
-                        },
-                    ) {
-                        warn!(
-                            "Failed to send disconnect packet to player {}: {:?}",
-                            player_identity.username, e
+        let entity_result = query.get(disconnecting_entity);
+        match entity_result {
+            Ok(disconnecting_player) => {
+                for (entity, conn, player_identity) in query.iter() {
+                    if disconnecting_entity == entity {
+                        info!(
+                            "Player {} ({}) disconnected: {}",
+                            player_identity.username,
+                            player_identity.uuid,
+                            reason.as_deref().unwrap_or("No reason")
                         );
-                    }
-                } else {
-                    trace!(
+                        if conn.running.load(std::sync::atomic::Ordering::Relaxed) {
+                            trace!(
+                                "Sending disconnect packet to player {}",
+                                player_identity.username
+                            );
+                            if let Err(e) = conn.send_packet_ref(
+                                &ferrumc_net::packets::outgoing::disconnect::DisconnectPacket {
+                                    reason: TextComponent::from(
+                                        reason.as_deref().unwrap_or("Disconnected"),
+                                    ),
+                                },
+                            ) {
+                                warn!(
+                                    "Failed to send disconnect packet to player {}: {:?}",
+                                    player_identity.username, e
+                                );
+                            }
+                        } else {
+                            trace!(
                         "Connection for player {} is not running, skipping disconnect packet",
                         player_identity.username
                     );
+                        }
+                    } else {
+                        system_messages::player_leave::handle(disconnecting_player.2, entity);
+                    }
+                    cmd.entity(entity).despawn();
                 }
-                cmd.entity(entity).despawn();
-            } else {
-                // Broadcast the disconnection to other players
+            }
+            Err(e) => {
+                warn!("Player's entity has already been removed: {}", e);
             }
         }
     }

src/bin/src/systems/mod.rs

@@ -7,6 +7,7 @@ pub mod new_connections;
 pub mod player_count_update;
 pub mod send_chunks;
 pub mod shutdown_systems;
+mod system_messages;
 pub mod world_sync;
 
 pub fn register_game_systems(schedule: &mut bevy_ecs::schedule::Schedule) {

src/bin/src/systems/new_connections.rs

@@ -1,3 +1,4 @@
+use crate::systems::system_messages;
 use bevy_ecs::prelude::{Commands, Res, Resource};
 use crossbeam_channel::Receiver;
 use ferrumc_core::chunks::chunk_receiver::ChunkReceiver;
@@ -55,9 +56,19 @@ pub fn accept_new_connections(
             entity.id(),
             (
                 new_connection.player_identity.uuid.as_u128(),
-                new_connection.player_identity.username,
+                new_connection.player_identity.username.clone(),
             ),
         );
+
+        for player in &state.0.players.player_list {
+            if player.value().0 != new_connection.player_identity.uuid.as_u128() {
+                system_messages::player_join::handle(
+                    &new_connection.player_identity,
+                    *player.key(),
+                );
+            }
+        }
+
         if let Err(err) = return_sender.send(entity.id()) {
             error!(
                 "Failed to send entity ID back to the networking thread: {:?}",

src/bin/src/systems/system_messages/mod.rs

@@ -0,0 +1,2 @@
+pub mod player_join;
+pub mod player_leave;

src/bin/src/systems/system_messages/player_join.rs

@@ -0,0 +1,13 @@
+use bevy_ecs::entity::Entity;
+use ferrumc_core::identity::player_identity::PlayerIdentity;
+use ferrumc_core::mq;
+use ferrumc_text::{Color, NamedColor, TextComponent};
+
+pub fn handle(disconnecting_player: &PlayerIdentity, receiver_player: Entity) {
+    let mut message =
+        TextComponent::from(format!("{} joined the game", disconnecting_player.username));
+    let color: Color = Color::Named(NamedColor::Yellow);
+    message.color = Some(color);
+
+    mq::queue(message, false, receiver_player);
+}

src/bin/src/systems/system_messages/player_leave.rs

@@ -0,0 +1,12 @@
+use bevy_ecs::entity::Entity;
+use ferrumc_core::identity::player_identity::PlayerIdentity;
+use ferrumc_core::mq;
+use ferrumc_text::{Color, NamedColor, TextComponent};
+
+pub fn handle(joining_player: &PlayerIdentity, receiver_player: Entity) {
+    let mut message = TextComponent::from(format!("{} left the game", joining_player.username));
+    let color: Color = Color::Named(NamedColor::Yellow);
+    message.color = Some(color);
+
+    mq::queue(message, false, receiver_player);
+}