From 9948ff42aa2424e4ae87717115a51b147d3e1183 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Thu, 15 Oct 2026 20:00:42 +0200 Subject: [PATCH] LAN: other players' name tags, and the host under its own name No player had a name tag: only mobs with a custom name drew one. The other players now get theirs on both sides (the guests on the host, the players a server sends on a client), shown as LivingEntityRenderer.shouldShowName allows: no custom name or crosshair needed, a crouching player's only within 32 blocks, team visibility and colours by player name, the below-name score. The host also joined its own LAN world as "Player": the guests' player list, name tags and chat, the MOTD and the offline UUID now use the host's profile name, as IntegratedServer does. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/control.rs | 4 + crates/horizon-client/src/game/lan.rs | 16 ++- crates/horizon-client/src/game/lan_actions.rs | 2 +- crates/horizon-client/src/game/names.rs | 113 ++++++++++++++---- crates/horizon-client/src/game/remote.rs | 12 ++ 5 files changed, 115 insertions(+), 32 deletions(-) diff --git a/crates/horizon-client/src/game/control.rs b/crates/horizon-client/src/game/control.rs index f604ca7d8..83d5f304c 100644 --- a/crates/horizon-client/src/game/control.rs +++ b/crates/horizon-client/src/game/control.rs @@ -713,6 +713,10 @@ impl Game<'_> { })), "uptime_seconds": self.started.elapsed().as_secs_f64(), "server": self.remote_status(), + // The names the name tags show now, seen from the eyes. + "name_tags": self + .eye_position() + .map(|e| self.shown_name_tags(glam::DVec3::from_array(e))), }); status["physical_keys"] = json!(physical_keys); status diff --git a/crates/horizon-client/src/game/lan.rs b/crates/horizon-client/src/game/lan.rs index 1bce62bb8..1e39080b5 100644 --- a/crates/horizon-client/src/game/lan.rs +++ b/crates/horizon-client/src/game/lan.rs @@ -2,7 +2,7 @@ //! server threads and the play-state hub, feeds it the world's entities each //! tick and turns what the guests do into gameplay. A world that is not open //! costs one `Option` check per tick. -use super::{Game, chat::PLAYER_NAME}; +use super::Game; use horizon_client::{ Result, items::ItemStack, @@ -43,6 +43,8 @@ pub(super) struct LanHost { pub settings: LanSettings, pub host_entity: i32, pub host_uuid: u128, + /// The host's profile name (the account's, or the offline name). + pub host_name: String, /// The guests' models in the host's world. pub models: HashMap, host_mode: i32, @@ -325,6 +327,7 @@ impl Game<'_> { Some("status") => Ok(Some(match &self.lan { Some(h) => json!({ "open": true, + "host": h.host_name, "port": h.settings.port, "guests": h.hub.guests.iter().map(|g| json!({ "name": g.name, @@ -356,9 +359,11 @@ impl Game<'_> { if self.lan.is_some() || self.remote.is_some() || self.title.is_some() { return Err("already open".into()); } - let motd = format!("{PLAYER_NAME} - {}", self.level.name); + // IntegratedServer.publishServer: the MOTD names the host's profile. + let name = self.options.player_name(); + let motd = format!("{name} - {}", self.level.name); let host_uuid = self.level.player_uuid.map_or_else( - || offline_uuid(PLAYER_NAME), + || offline_uuid(&name), |u| { u128::from(u[0] as u32) << 96 | u128::from(u[1] as u32) << 64 @@ -438,6 +443,7 @@ impl Game<'_> { settings: LanSettings { port, ..settings }, host_entity, host_uuid, + host_name: self.options.player_name(), models: HashMap::new(), host_mode: self.mode_id(), play: HashMap::new(), @@ -509,7 +515,7 @@ impl Game<'_> { equipment[5] = self.armor[0].clone(); Some(HostState { uuid: host.host_uuid, - name: PLAYER_NAME.to_owned(), + name: host.host_name.clone(), entity_id: host.host_entity, position: [p.position.x, p.position.y, p.position.z], yaw: self.yaw, @@ -878,7 +884,7 @@ impl Game<'_> { /// A chat line the host typed, for the guests. pub(super) fn lan_host_chat(&mut self, message: &str) { if let Some(host) = &self.lan { - host.hub.chat(PLAYER_NAME, message); + host.hub.chat(&host.host_name, message); } } } diff --git a/crates/horizon-client/src/game/lan_actions.rs b/crates/horizon-client/src/game/lan_actions.rs index 7faba7f6c..cb853de75 100644 --- a/crates/horizon-client/src/game/lan_actions.rs +++ b/crates/horizon-client/src/game/lan_actions.rs @@ -553,7 +553,7 @@ impl Game<'_> { let words: Vec<&str> = command.trim_start_matches('/').split(' ').collect(); if words[0] == "list" && (words.len() == 1 || words[1..] == ["uuids"]) { let me = (self.options.dedicated.is_none() && self.player.is_some()) - .then_some((host.host_uuid, super::chat::PLAYER_NAME)); + .then_some((host.host_uuid, host.host_name.as_str())); let content = host.hub.list_reply(me, words.len() == 2); host.hub.send_to( conn, diff --git a/crates/horizon-client/src/game/names.rs b/crates/horizon-client/src/game/names.rs index 1b39f051f..2e727259b 100644 --- a/crates/horizon-client/src/game/names.rs +++ b/crates/horizon-client/src/game/names.rs @@ -3,9 +3,10 @@ //! on a translucent black background, shown when the name is visible or the //! mob is under the crosshair within 64 blocks, as its team's name tag //! visibility allows, in the team's colours, with its score in the -//! objective displayed below names. +//! objective displayed below names. Other players' names (on a LAN host +//! or a server) show whenever `LivingEntityRenderer.shouldShowName` allows. use super::{Game, view_vector}; -use horizon_client::{mesher::Vertex, save::uuid_text, scoreboard as sb, text::Text}; +use horizon_client::{mesher::Vertex, mobs::Mob, save::uuid_text, scoreboard as sb, text::Text}; impl Game<'_> { /// A named name tag names the mob under the crosshair. @@ -28,13 +29,12 @@ impl Game<'_> { self.swing_arm(); true } - /// `Entity.belowNameDisplay`: the mob's score in the objective shown below - /// names, then a space and the objective's name. - fn below_name_text(&self, id: u32) -> Option { + /// `Entity.belowNameDisplay`: the score holder's score in the objective + /// shown below names, then a space and the objective's name. + fn below_name_text(&self, holder: &str) -> Option { let board = &self.score.board; let objective = board.display_objective(sb::SLOT_BELOW_NAME)?; - let uuid = self.persist.uuids.get(&id)?; - let score = board.score(&uuid_text(*uuid), &objective.name)?; + let score = board.score(holder, &objective.name)?; // numberFormatOrDefault(StyledFormat.NO_STYLE). let format = score .number_format @@ -47,23 +47,60 @@ impl Game<'_> { t.push(objective.display_text()); Some(t) } - pub(super) fn name_tag_geometry(&self, camera: glam::DVec3, alpha: f64, out: &mut Vec) { + /// The other players' models and names: the guests on a LAN host, the + /// players a server sends on a client. + fn other_players(&self) -> Vec<(&Mob, String)> { + let mut out = Vec::new(); + if let Some(host) = &self.lan { + for (conn, m) in &host.models { + if let Some(g) = host.hub.guest(*conn) { + out.push((m, g.name.clone())); + } + } + } + for (id, name) in self.remote_player_names() { + if let Some(m) = self.mobs.iter().find(|m| m.id == id) { + out.push((m, name)); + } + } + out + } + /// The names the name tags show this frame (the control socket's status). + pub(super) fn shown_name_tags(&self, camera: glam::DVec3) -> Vec { + self.name_tags(camera, 1.0) + .into_iter() + .filter_map(|(_, lines, _)| lines.last().map(|(t, _)| t.plain())) + .collect() + } + /// Each name tag: where it hangs, its lines (text, lift) and its light. + #[allow(clippy::type_complexity)] + fn name_tags( + &self, + camera: glam::DVec3, + alpha: f64, + ) -> Vec<(glam::DVec3, Vec<(Text, f64)>, u32)> { let target = self.mob_hit().map(|(i, _)| self.mobs[i].id); - let forward = glam::DVec3::from_array(view_vector(self.yaw, self.pitch)); - let right = forward.cross(glam::DVec3::Y).normalize_or_zero(); - let up = right.cross(forward).normalize_or_zero(); - let white = self.res.atlas.font.white(); let viewer = self.player_team(); - for m in &self.mobs { - let Some(name) = m.custom_name.as_deref() else { - continue; - }; + let mut tags = Vec::new(); + let players = self.other_players(); + let named = self + .mobs + .iter() + .filter_map(|m| Some((m, m.custom_name.clone()?, false))); + let players = players.into_iter().map(|(m, name)| (m, name, true)); + for (m, name, player) in named.chain(players) { if !m.alive() { continue; } + // EntityAttachment.NAME_TAG: 0.5 above the (crouching) height. + let height = if player && m.extra.crouching { + 1.5 + } else { + f64::from(m.height()) + }; let p = glam::DVec3::new( m.previous.x + (m.position.x - m.previous.x) * alpha, - m.previous.y + (m.position.y - m.previous.y) * alpha + f64::from(m.height()) + 0.5, + m.previous.y + (m.position.y - m.previous.y) * alpha + height + 0.5, m.previous.z + (m.position.z - m.previous.z) * alpha, ); // The name tag distance (64) is measured to the entity. @@ -72,7 +109,17 @@ impl Game<'_> { if distance_sqr >= 64.0 * 64.0 { continue; } - let team = self.mob_team(m.id); + // A player's scores and team go by name, a mob's by UUID. + let holder = if player { + Some(name.clone()) + } else { + self.persist.uuids.get(&m.id).map(|u| uuid_text(*u)) + }; + let team = if player { + self.score.board.players_team(&name) + } else { + self.mob_team(m.id) + }; // LivingEntityRenderer.shouldShowName (team rules included), then // MobRenderer: a visible name, or the mob under the crosshair. let invisible = sb::invisible_to( @@ -82,27 +129,31 @@ impl Game<'_> { m.has_effect("minecraft:invisibility"), ); let view = sb::NameView { - discrete: false, + discrete: player && m.extra.crouching, distance_sqr, invisible_to_viewer: invisible, hud_hidden: self.ui.hide_gui, is_camera: false, is_vehicle: self.mobs.iter().any(|o| o.extra.mount == Some(m.id)), }; - if !sb::name_shown(team, viewer, view) || !(m.name_visible || Some(m.id) == target) { + // MobRenderer.shouldShowName: a visible name, or the mob under the + // crosshair; players (LivingEntityRenderer) need neither. + if !sb::name_shown(team, viewer, view) + || !(player || m.name_visible || Some(m.id) == target) + { continue; } - // getDisplayName: the custom name in the team's prefix, suffix and colour. + // getDisplayName: the name in the team's prefix, suffix and colour. let shown = match team { - Some(t) => t.formatted_name(Text::literal(name)), - None => Text::literal(name), + Some(t) => t.formatted_name(Text::literal(&name)), + None => Text::literal(&name), }; let mut lines = Vec::new(); // EntityRenderer.extractNameTags: the score shows within the // below-name distance (10), under the name. let mut lift = 0.0; if distance_sqr < 10.0 * 10.0 - && let Some(score) = self.below_name_text(m.id) + && let Some(score) = holder.and_then(|h| self.below_name_text(&h)) { lines.push((score, 0.0)); lift = f64::from(9.0f32 * 1.15 * 0.025); @@ -110,11 +161,21 @@ impl Game<'_> { lines.push((shown, lift)); let l = self.world.light( m.position.x.floor() as i32, - (m.position.y + f64::from(m.height())).floor() as i32, + (m.position.y + height).floor() as i32, m.position.z.floor() as i32, ); let light = (u32::from(l >> 4) * 16) | ((u32::from(l & 15) * 16) << 8); - let away = forward.as_vec3() * 0.002; + tags.push((p, lines, light)); + } + tags + } + pub(super) fn name_tag_geometry(&self, camera: glam::DVec3, alpha: f64, out: &mut Vec) { + let forward = glam::DVec3::from_array(view_vector(self.yaw, self.pitch)); + let right = forward.cross(glam::DVec3::Y).normalize_or_zero(); + let up = right.cross(forward).normalize_or_zero(); + let white = self.res.atlas.font.white(); + let away = forward.as_vec3() * 0.002; + for (p, lines, light) in self.name_tags(camera, alpha) { for (text, lift) in lines { let o = (p + glam::DVec3::new(0.0, lift, 0.0) - camera).as_vec3(); let (r, u) = (right.as_vec3() * 0.025, up.as_vec3() * 0.025); diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 6ad981151..8e953faf1 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -2716,6 +2716,18 @@ impl Game<'_> { } } /// Status for `horizon-ctl status`. + /// The other players' entities in the level and their names (from the + /// player list). + pub(super) fn remote_player_names(&self) -> Vec<(u32, String)> { + let Some(r) = self.remote.as_ref() else { + return Vec::new(); + }; + r.level_players + .iter() + .filter(|(_, uuid)| **uuid != r.profile) + .filter_map(|(id, uuid)| Some((*id as u32, r.players.get(uuid)?.clone()))) + .collect() + } pub(super) fn remote_status(&self) -> Option { let r = self.remote.as_ref()?; Some(serde_json::json!({