Support for custom tablist header and footer

feather/common/Cargo.toml

@@ -21,6 +21,7 @@ uuid = { version = "0.8", features = [ "v4" ] }
 libcraft-core = { path = "../../libcraft/core" }
 libcraft-inventory = { path = "../../libcraft/inventory" }
 libcraft-items = { path = "../../libcraft/items" }
+libcraft-text = { path = "../../libcraft/text" }
 rayon = "1.5"
 worldgen = { path = "../worldgen", package = "feather-worldgen" }
 rand = "0.8"

feather/common/src/events.rs

@@ -1,4 +1,5 @@
 use base::{ChunkHandle, ChunkPosition};
+use libcraft_text::Text;
 
 use crate::view::View;
 
@@ -58,3 +59,12 @@ pub struct ChunkLoadEvent {
 pub struct ChunkLoadFailEvent {
     pub position: ChunkPosition,
 }
+
+#[derive(Debug, Clone)]
+pub struct TablistHeaderFooter {
+    pub header: Text,
+    pub footer: Text,
+}
+
+#[derive(Debug)]
+pub struct TablistExtrasUpdateEvent;

feather/server/Cargo.toml

@@ -55,6 +55,7 @@ uuid = "0.8"
 slab = "0.4"
 libcraft-core = { path = "../../libcraft/core" }
 libcraft-items = { path = "../../libcraft/items" }
+libcraft-text = { path = "../../libcraft/text" }
 worldgen = { path = "../worldgen", package = "feather-worldgen" }
 
 [features]

feather/server/config.toml

@@ -13,6 +13,8 @@ motd = "A Feather server"
 max_players = 16
 default_gamemode = "creative"
 view_distance = 12
+default_header = ""
+default_footer = ""
 
 [log]
 # If you prefer less verbose logs, switch this to "info".

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/config.rs

@@ -3,7 +3,7 @@
 use std::{fs, net::IpAddr, path::Path, str::FromStr};
 
 use anyhow::Context;
-use base::Gamemode;
+use base::{Gamemode, Text};
 use serde::{Deserialize, Deserializer};
 
 use crate::{favicon::Favicon, Options};
@@ -66,6 +66,8 @@ impl Config {
             view_distance: self.server.view_distance,
             max_players: self.server.max_players,
             default_gamemode: self.server.default_gamemode,
+            default_header: self.server.default_header.clone(),
+            default_footer: self.server.default_footer.clone(),
             proxy_mode: match self.proxy.proxy_mode {
                 ProxyMode::None => None,
                 ProxyMode::Bungee => Some(crate::options::ProxyMode::Bungeecord),
@@ -90,6 +92,8 @@ pub struct ServerConfig {
     pub max_players: u32,
     pub default_gamemode: Gamemode,
     pub view_distance: u32,
+    pub default_header: Text,
+    pub default_footer: Text,
 }
 
 #[derive(Debug, Deserialize)]

feather/server/src/options.rs

@@ -1,4 +1,4 @@
-use base::Gamemode;
+use base::{Gamemode, Text};
 
 use crate::favicon::Favicon;
 
@@ -28,6 +28,12 @@ pub struct Options {
     /// The default gamemode for new players.
     pub default_gamemode: Gamemode,
 
+    /// The default tablist header.
+    pub default_header: Text,
+
+    /// The default tablist footer.
+    pub default_footer: Text,
+
     /// Proxy IP forwarding mode
     pub proxy_mode: Option<ProxyMode>,
     // HMAC key used with Velocity IP forwarding.

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

@@ -1,19 +1,31 @@
 //! Sends tablist info to clients via the Player Info packet.
 
 use base::{Gamemode, ProfileProperty};
-use common::Game;
+use common::{
+    events::{TablistExtrasUpdateEvent, TablistHeaderFooter},
+    Game,
+};
 use ecs::{SysResult, SystemExecutor};
 use quill_common::events::{EntityRemoveEvent, PlayerJoinEvent};
 use quill_common::{components::Name, entities::Player};
 use uuid::Uuid;
 
 use crate::{ClientId, Server};
 
-pub fn register(systems: &mut SystemExecutor<Game>) {
+pub fn register(game: &mut Game, systems: &mut SystemExecutor<Game>) {
+    let server_options = game.resources.get::<Server>().unwrap().options.clone();
+
+    game.insert_resource(TablistHeaderFooter {
+        header: server_options.default_header.clone(),
+        footer: server_options.default_footer.clone(),
+    });
+
     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 {
@@ -60,3 +72,31 @@ 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.to_string(),
+                &header_footer.footer.to_string(),
+            )
+        });
+    }
+    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.to_string(),
+                &header_footer.footer.to_string(),
+            );
+    }
+    Ok(())
+}