Move TablistHeaderFooter to quill/common/tablist.rs

Kecerim24 · Kecerim24 · commit 45d01dfc44d6 · 2022-01-21T20:45:47.000+01:00
Rename `update_tablist_header` to `update_tablist_header_footer`
Rename `send_tablist_header_on_join` to `send_tablist_header_footer_on_join`
diff --git a/feather/common/src/events.rs b/feather/common/src/events.rs
@@ -1,5 +1,4 @@
 use base::{ChunkHandle, ChunkPosition};
-use libcraft_text::Text;
 
 use crate::view::View;
 
@@ -60,11 +59,5 @@ pub struct ChunkLoadFailEvent {
     pub position: ChunkPosition,
 }
 
-#[derive(Debug, Clone)]
-pub struct TablistHeaderFooter {
-    pub header: Text,
-    pub footer: Text,
-}
-
 #[derive(Debug)]
 pub struct TablistExtrasUpdateEvent;
diff --git a/feather/server/src/systems/tablist.rs b/feather/server/src/systems/tablist.rs
@@ -3,13 +3,10 @@
 use uuid::Uuid;
 
 use base::{Gamemode, ProfileProperty};
-use common::{
-    events::{TablistExtrasUpdateEvent, TablistHeaderFooter},
-    Game,
-};
+use common::{events::TablistExtrasUpdateEvent, Game};
 use ecs::{SysResult, SystemExecutor};
 use quill_common::events::{EntityRemoveEvent, GamemodeEvent, PlayerJoinEvent};
-use quill_common::{components::Name, entities::Player};
+use quill_common::{components::Name, entities::Player, tablist::TablistHeaderFooter};
 
 use crate::{ClientId, Server};
 
@@ -25,8 +22,8 @@ pub fn register(game: &mut Game, systems: &mut SystemExecutor<Game>) {
         .group::<Server>()
         .add_system(remove_tablist_players)
         .add_system(add_tablist_players)
-        .add_system(update_tablist_header)
-        .add_system(send_tablist_header_on_join)
+        .add_system(update_tablist_header_footer)
+        .add_system(send_tablist_header_footer_on_join)
         .add_system(change_tablist_player_gamemode);
 }
 
@@ -75,7 +72,7 @@ fn add_tablist_players(game: &mut Game, server: &mut Server) -> SysResult {
     Ok(())
 }
 
-fn update_tablist_header(game: &mut Game, server: &mut Server) -> SysResult {
+fn update_tablist_header_footer(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| {
@@ -88,7 +85,7 @@ fn update_tablist_header(game: &mut Game, server: &mut Server) -> SysResult {
     Ok(())
 }
 
-fn send_tablist_header_on_join(game: &mut Game, server: &mut Server) -> SysResult {
+fn send_tablist_header_footer_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
diff --git a/quill/common/src/lib.rs b/quill/common/src/lib.rs
@@ -8,6 +8,7 @@ pub mod entities;
 pub mod entity;
 pub mod entity_init;
 pub mod events;
+pub mod tablist;
 
 use std::marker::PhantomData;
 
diff --git a/quill/common/src/tablist.rs b/quill/common/src/tablist.rs
@@ -0,0 +1,7 @@
+use libcraft_text::Text;
+
+#[derive(Debug, Clone)]
+pub struct TablistHeaderFooter {
+    pub header: Text,
+    pub footer: Text,
+}
