Merge pull request #170 from rdbtCVS/fix/lan-host-tab-list

Fix tab list for singleplayer LAN hosts
This commit is contained in:
Ludovic Marie
2026-10-14 21:59:55 +02:00
committed by GitHub
+110 -4
View File
@@ -10,9 +10,11 @@ use horizon_client::{
},
hud::HudBatch,
hud_layout, hud_overlays,
lan::guest::Guest,
save::{self, uuid_from_text, uuid_text},
scoreboard::{self as sb, Comp, Scoreboard, literal},
scoreboard_cmd::{self, Env, Holder},
tab_list::TabPlayer,
text::Text,
};
use horizon_world::nbt::Tag;
@@ -581,10 +583,10 @@ impl Game<'_> {
impl Game<'_> {
/// `Hud.extractTabList`: the player list while the player-list key is
/// held. A single-player world lists only its player, so it shows only
/// with a `list` objective.
/// held. A local world shows it with a joined LAN guest or a `list`
/// objective.
pub(super) fn draw_tab_list(&mut self, batch: &mut HudBatch) {
use horizon_client::tab_list::{self, TabInputs, TabPlayer};
use horizon_client::tab_list::{self, TabInputs};
let chatting = self.remote.is_some() && self.remote_chat_open();
let key = self.screen == super::Screen::Playing
&& !chatting
@@ -600,7 +602,14 @@ impl Game<'_> {
let mut me = TabPlayer::new(uuid, PLAYER_NAME);
me.game_mode = self.mode_id();
me.skin = "entity/player/wide/steve".into();
(vec![me], true, Vec::new())
let guests = self.lan.as_ref().map_or(&[][..], |h| &h.hub.guests);
let players = local_tab_players(me, guests);
let upside_down = players
.iter()
.filter(|p| p.name == "Dinnerbone" || p.name == "Grumm")
.map(|p| p.uuid)
.collect();
(players, true, upside_down)
}
};
let board = &self.score.board;
@@ -635,6 +644,18 @@ impl Game<'_> {
}
}
/// The host and guests that have entered the world, rebuilt from live state.
fn local_tab_players(me: TabPlayer, guests: &[Guest]) -> Vec<TabPlayer> {
let mut players = vec![me];
players.extend(guests.iter().filter(|g| g.placed).map(|g| {
let mut player = TabPlayer::new(g.uuid, &g.name);
player.game_mode = g.game_mode;
player.latency = g.latency.load(std::sync::atomic::Ordering::Relaxed);
player
}));
players
}
/// The commands' view of the game.
struct GameEnv<'a, 'b> {
g: &'a mut Game<'b>,
@@ -692,3 +713,88 @@ impl Env for GameEnv<'_, '_> {
self.g.feedback(message);
}
}
#[cfg(test)]
mod tab_list_tests {
use super::*;
use horizon_client::{
lan::{Joined, PlayerSender},
tab_list,
};
use horizon_protocol::packets::configuration::ClientInformation;
use std::sync::{
Arc,
atomic::{AtomicI32, Ordering},
mpsc,
};
fn guest(uuid: u128, name: &str) -> Guest {
let (tx, _rx) = mpsc::channel();
Guest::new(
Joined {
conn: uuid as u32,
uuid,
name: name.into(),
info: ClientInformation::new(8),
brand: "test".into(),
sender: PlayerSender {
tx,
pending: Arc::default(),
},
latency: Arc::new(AtomicI32::new(42)),
address: "127.0.0.1:25565".parse().unwrap(),
},
uuid as i32,
[0.0, 64.0, 0.0],
8,
)
}
#[test]
fn lan_tab_list_tracks_join_and_disconnect() {
let me = TabPlayer::new(1, PLAYER_NAME);
let mut guests = vec![guest(2, "Alex")];
let players = local_tab_players(me.clone(), &guests);
assert_eq!(players.as_slice(), std::slice::from_ref(&me));
assert!(!tab_list::visible(true, true, players.len(), false));
guests[0].placed = true;
let players = local_tab_players(me.clone(), &guests);
assert_eq!(players.len(), 2);
assert_eq!(players[0], me);
assert_eq!(players[1].uuid, 2);
assert_eq!(players[1].name, "Alex");
assert!(tab_list::visible(true, true, players.len(), false));
assert!(!tab_list::visible(false, true, players.len(), false));
guests.clear();
let players = local_tab_players(me, &guests);
assert_eq!(players.len(), 1);
assert!(!tab_list::visible(true, true, players.len(), false));
assert!(tab_list::visible(true, true, players.len(), true));
}
#[test]
fn lan_tab_list_reads_current_guest_state() {
let me = TabPlayer::new(1, PLAYER_NAME);
let mut guests = vec![guest(2, "Alex"), guest(3, "Grumm")];
for guest in &mut guests {
guest.placed = true;
}
guests[0].game_mode = tab_list::SPECTATOR;
let players = local_tab_players(me.clone(), &guests);
assert_eq!(players.len(), 3);
assert_eq!(players[1].game_mode, tab_list::SPECTATOR);
assert_eq!(players[1].latency, 42);
assert_eq!(players[1].skin, tab_list::default_skin(2));
assert_eq!(players[2].name, "Grumm");
guests[0].game_mode = 1;
guests[0].latency.store(123, Ordering::Relaxed);
guests.remove(1);
let players = local_tab_players(me, &guests);
assert_eq!(players.len(), 2);
assert_eq!(players[1].game_mode, 1);
assert_eq!(players[1].latency, 123);
}
}