Support for custom tablist header and footer

feather/common/src/events.rs

@@ -73,3 +73,12 @@ pub struct EntityRemoveEvent;
 /// Triggered when an entity is added into the world.
 #[derive(Debug)]
 pub struct EntityCreateEvent;
+
+#[derive(Debug, Clone)]
+pub struct TablistHeaderFooter {
+    pub header: String,
+    pub footer: String,
+}
+
+#[derive(Debug)]
+pub struct TablistExtrasUpdateEvent;

feather/server/src/client.rs

@@ -18,7 +18,10 @@ use common::{
     Window,
 };
 use libcraft_items::InventorySlot;
-use packets::server::{Particle, SetSlot, SpawnLivingEntity, UpdateLight, WindowConfirmation};
+use packets::server::{
+    Particle, PlayerListHeaderAndFooter, SetSlot, SpawnLivingEntity, UpdateLight,
+    WindowConfirmation,
+};
 use protocol::packets::server::{
     EntityPosition, EntityPositionAndRotation, EntityTeleport, HeldItemChange, PlayerAbilities,
 };
@@ -331,6 +334,14 @@ impl Client {
         self.send_packet(PlayerInfo::RemovePlayers(vec![uuid]));
     }
 
+    pub fn send_tablist_header_footer(&self, header: &str, footer: &str) {
+        log::trace!("Sending PlayerListHeaderAndFooter ({},{})", header, footer);
+        self.send_packet(PlayerListHeaderAndFooter {
+            header: header.to_string(),
+            footer: footer.to_string(),
+        })
+    }
+
     pub fn unload_entity(&self, id: NetworkId) {
         log::trace!("Unloading {:?} on {}", id, self.username);
         self.sent_entities.borrow_mut().remove(&id);

feather/server/src/systems.rs

@@ -30,7 +30,7 @@ pub fn register(server: Server, game: &mut Game, systems: &mut SystemExecutor<Ga
     view::register(game, systems);
     crate::chunk_subscriptions::register(systems);
     player_leave::register(systems);
-    tablist::register(systems);
+    tablist::register(game, systems);
     block::register(systems);
     entity::register(game, systems);
     chat::register(game, systems);

feather/server/src/systems/tablist.rs

@@ -2,7 +2,7 @@
 
 use base::{Gamemode, ProfileProperty};
 use common::{
-    events::{EntityRemoveEvent, PlayerJoinEvent},
+    events::{EntityRemoveEvent, PlayerJoinEvent, TablistExtrasUpdateEvent, TablistHeaderFooter},
     Game,
 };
 use ecs::{SysResult, SystemExecutor};
@@ -11,11 +11,17 @@ use uuid::Uuid;
 
 use crate::{ClientId, Server};
 
-pub fn register(systems: &mut SystemExecutor<Game>) {
+pub fn register(game: &mut Game, systems: &mut SystemExecutor<Game>) {
+    game.insert_resource(TablistHeaderFooter {
+        header: "{\"text\":\"\"}".to_string(),
+        footer: "{\"text\":\"\"}".to_string(),
+    });
     systems
         .group::<Server>()
         .add_system(remove_tablist_players)
-        .add_system(add_tablist_players);
+        .add_system(add_tablist_players)
+        .add_system(update_tablist_header)
+        .add_system(send_tablist_header_on_join);
 }
 
 fn remove_tablist_players(game: &mut Game, server: &mut Server) -> SysResult {
@@ -62,3 +68,25 @@ fn add_tablist_players(game: &mut Game, server: &mut Server) -> SysResult {
     }
     Ok(())
 }
+
+fn update_tablist_header(game: &mut Game, server: &mut Server) -> SysResult {
+    for _ in game.ecs.query::<&TablistExtrasUpdateEvent>().iter() {
+        let header_footer = game.resources.get::<TablistHeaderFooter>()?;
+        server.broadcast_with(|client| {
+            client.send_tablist_header_footer(&header_footer.header, &header_footer.footer)
+        });
+    }
+    Ok(())
+}
+
+fn send_tablist_header_on_join(game: &mut Game, server: &mut Server) -> SysResult {
+    for (_, (_, &client_id)) in game.ecs.query::<(&PlayerJoinEvent, &ClientId)>().iter() {
+        let header_footer = game.resources.get::<TablistHeaderFooter>()?;
+        server
+            .clients
+            .get(client_id)
+            .unwrap()
+            .send_tablist_header_footer(&header_footer.header, &header_footer.footer);
+    }
+    Ok(())
+}