Skip to content

Commit 45d01df

Browse files
author
Kecerim24
committed
Move TablistHeaderFooter to quill/common/tablist.rs
Rename `update_tablist_header` to `update_tablist_header_footer` Rename `send_tablist_header_on_join` to `send_tablist_header_footer_on_join`
1 parent 7e0535f commit 45d01df

File tree

4 files changed

+14
-16
lines changed

4 files changed

+14
-16
lines changed

feather/common/src/events.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use base::{ChunkHandle, ChunkPosition};
2-
use libcraft_text::Text;
32

43
use crate::view::View;
54

@@ -60,11 +59,5 @@ pub struct ChunkLoadFailEvent {
6059
pub position: ChunkPosition,
6160
}
6261

63-
#[derive(Debug, Clone)]
64-
pub struct TablistHeaderFooter {
65-
pub header: Text,
66-
pub footer: Text,
67-
}
68-
6962
#[derive(Debug)]
7063
pub struct TablistExtrasUpdateEvent;

feather/server/src/systems/tablist.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33
use uuid::Uuid;
44

55
use base::{Gamemode, ProfileProperty};
6-
use common::{
7-
events::{TablistExtrasUpdateEvent, TablistHeaderFooter},
8-
Game,
9-
};
6+
use common::{events::TablistExtrasUpdateEvent, Game};
107
use ecs::{SysResult, SystemExecutor};
118
use quill_common::events::{EntityRemoveEvent, GamemodeEvent, PlayerJoinEvent};
12-
use quill_common::{components::Name, entities::Player};
9+
use quill_common::{components::Name, entities::Player, tablist::TablistHeaderFooter};
1310

1411
use crate::{ClientId, Server};
1512

@@ -25,8 +22,8 @@ pub fn register(game: &mut Game, systems: &mut SystemExecutor<Game>) {
2522
.group::<Server>()
2623
.add_system(remove_tablist_players)
2724
.add_system(add_tablist_players)
28-
.add_system(update_tablist_header)
29-
.add_system(send_tablist_header_on_join)
25+
.add_system(update_tablist_header_footer)
26+
.add_system(send_tablist_header_footer_on_join)
3027
.add_system(change_tablist_player_gamemode);
3128
}
3229

@@ -75,7 +72,7 @@ fn add_tablist_players(game: &mut Game, server: &mut Server) -> SysResult {
7572
Ok(())
7673
}
7774

78-
fn update_tablist_header(game: &mut Game, server: &mut Server) -> SysResult {
75+
fn update_tablist_header_footer(game: &mut Game, server: &mut Server) -> SysResult {
7976
for _ in game.ecs.query::<&TablistExtrasUpdateEvent>().iter() {
8077
let header_footer = game.resources.get::<TablistHeaderFooter>()?;
8178
server.broadcast_with(|client| {
@@ -88,7 +85,7 @@ fn update_tablist_header(game: &mut Game, server: &mut Server) -> SysResult {
8885
Ok(())
8986
}
9087

91-
fn send_tablist_header_on_join(game: &mut Game, server: &mut Server) -> SysResult {
88+
fn send_tablist_header_footer_on_join(game: &mut Game, server: &mut Server) -> SysResult {
9289
for (_, (_, &client_id)) in game.ecs.query::<(&PlayerJoinEvent, &ClientId)>().iter() {
9390
let header_footer = game.resources.get::<TablistHeaderFooter>()?;
9491
server

quill/common/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ pub mod entities;
88
pub mod entity;
99
pub mod entity_init;
1010
pub mod events;
11+
pub mod tablist;
1112

1213
use std::marker::PhantomData;
1314

quill/common/src/tablist.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
use libcraft_text::Text;
2+
3+
#[derive(Debug, Clone)]
4+
pub struct TablistHeaderFooter {
5+
pub header: Text,
6+
pub footer: Text,
7+
}

0 commit comments

Comments
 (0)