Crates ship their own lang files: horizon_hooks::lang (layer plan M5)

horizon_hooks::lang::register(&'static [(code, json)]), re-exported as
horizon_platform::lang. The game's entry installs the registered files
into horizon_client::lang; Language::load reads them in the horizon
namespace right after the engine's bundled file for the same language,
before packs, and the engine's file wins on a key both have. Regional
variants share one alias table with the bundled files (fr_ca -> fr_fr,
de_ch -> de_de without ß). Nothing registered: languages load as before.

tools/lang_coverage.py reports crates/*/assets/lang beside the game's
folder; a crate's review record is tools/lang_review/<crate>/, and
--mark-reviewed puts each key in the folder that holds it. lang.rs's
file checks run on every crate folder, and a crate key the engine also
has fails them.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

CONTRIBUTING.md

@@ -198,5 +198,3 @@ new pushes, we add it again.
 
 [Discord](https://discord.gg/playhorizon) for questions and ideas, [issues](https://github.com/horizon-rust/horizon/issues)
 for bugs. To take something on, `/claim` its issue ([above](#claim-before-you-start)).
-
-How Horizon is run, and how people join the Team or lead a group: [GOVERNANCE.md](GOVERNANCE.md).

Cargo.lock

@@ -1650,15 +1650,6 @@ dependencies = [
  "ureq",
 ]
 
-[[package]]
-name = "horizon-discord"
-version = "0.1.0"
-dependencies = [
- "horizon-platform",
- "log",
- "serde_json",
-]
-
 [[package]]
 name = "horizon-dualsense"
 version = "0.1.0"
@@ -1802,7 +1793,6 @@ dependencies = [
 name = "horizon-official"
 version = "0.1.0"
 dependencies = [
- "horizon-discord",
  "horizon-friends",
  "horizon-game",
  "horizon-heartbeat",

Cargo.toml

@@ -34,7 +34,6 @@ members = [
     "crates/horizon-game",
     "crates/horizon-official",
     "crates/horizon-heartbeat",
-    "crates/horizon-discord",
     "crates/horizon-official-servers",
     "crates/horizon-bench",
     "crates/horizon-friends",

GOVERNANCE.md

@@ -1,483 +0,0 @@
-# Horizon governance
-
-> Adopted 2026-11-09 by the founder as his last decision as head of the project. It takes effect when he
-> announces that he is stepping down. From then on only the council changes it, by a 2/3 poll (section 15).
-
-Horizon has no boss. A **council of equals** decides by polls. **Theme groups** do the work in their areas, each
-with a **lead**. The **Horizon Team** reviews and merges code. **Moderators** keep the Discord server and the
-official server safe. Every role of trust is earned with work the project can measure, and it ends when that work
-stops.
-
-## Contents
-
-1. [Principles](#1-principles)
-2. [The levels at a glance](#2-the-levels-at-a-glance)
-3. [Each level in detail](#3-each-level-in-detail)
-4. [The council and its polls](#4-the-council-and-its-polls)
-5. [The selection filter](#5-the-selection-filter)
-6. [Theme groups](#6-theme-groups)
-7. [Moderation and appeals](#7-moderation-and-appeals)
-8. [Conflicts and hard cases](#8-conflicts-and-hard-cases)
-9. [The age rule (18+)](#9-the-age-rule-18)
-10. [The agents](#10-the-agents)
-11. [Accounts and the handover path](#11-accounts-and-the-handover-path)
-12. [Money](#12-money)
-13. [Transparency](#13-transparency)
-14. [Rules that are never voted on](#14-rules-that-are-never-voted-on)
-15. [Changing this document](#15-changing-this-document)
-
-## 1. Principles
-
-- **Equals.** Every council member has one vote. Nobody, the founder included, stands above the others.
-- **The founder.** Ludovic keeps the title of **Founder**: his role stays at the top of the member list and he is
-  credited as Horizon's founder everywhere. The title is symbolic. It carries no extra vote or power: on the council
-  he counts exactly like every other member.
-- **Evidence, not popularity.** You get a role by doing the work first. Kira measures that work: merged pull
-  requests, reviews, triage, support answers and days active. A vote then confirms it.
-- **Small, clear powers.** Each role can do a short, written list of things. Anything else goes to the council.
-- **Roles are on loan.** Every role has a 30-day probation and an inactivity rule. Stepping down for inactivity is
-  not a sanction, and you can come back.
-- **Public by default.** Polls, results and rules are public. Only matters about a person stay private, and even then
-  the result is published.
-- **18+ for roles of trust** (section 9).
-- **Mojang's and Microsoft's rules come first.** They are never put to a vote (section 14).
-
-## 2. The levels at a glance
-
-From the most open level to the most trusted. A person can hold several levels at once: a group lead can also be on
-the Horizon Team, for example.
-
-| Level | What it can do | How you get in | How you leave | 18+ |
-| --- | --- | --- | --- | --- |
-| **Member** | Play, chat, report bugs, suggest ideas, open issues and pull requests, pick group roles | Join the Discord server or the GitHub repo | Leave, or get banned | No |
-| **Contributor** (⛏️ Iron, 🥇 Gold, 💎 Diamond, 🟪 Netherite ranks) | Write in #contributors; `/claim` issues; nominate people for group lead (if active in that group) | One merged pull request in a public horizon-rust repo, linked with `/link-github` and `/verify-github`. Ranks come from merged pull requests: 10, 40, 100 and 200 | Contributor status and ranks stay | No |
-| **Group member** | Read and write in the group's channel; get the group's pings; take part in the group's advisory poll on its lead | Pick the group's role in Channels & Roles, or with `/groups` | Remove the role | No |
-| **🤝 Support** | Answer and close posts in #horizon-support | `/apply`; vote of the mods and the Team (as today) | Resign, 30 days inactive, or removed by the Chief of Mods or the council | No |
-| **🛡️ Moderator** | Time out, delete messages, manage threads, quarantine. No bans | `/apply`, then the selection filter; mods' vote; the council may object within 24 h | Resign, 30 days inactive, suspended by the Chief of Mods, removed by a council poll (simple majority) | **Yes** |
-| **🛡️ Chief of Mods** | A moderator's powers, plus bans; leads the mods; suspends a mod at once pending the council | Council poll (simple majority), from the mods with at least 30 days | Resign, 30 days inactive, council poll (simple majority) | **Yes** |
-| **🧭 Group lead** | Decides inside the group's topic (section 6); manages the group's channel; triage on the group's GitHub issues | Nomination, the filter, a 24 h public discussion with an advisory group poll, then a council poll (simple majority); 30 days probation | Resign, 30 days inactive (automatic), council poll (simple majority); confirmed again every 6 months | **Yes** |
-| **🌌 Horizon Team** | Review and merge pull requests (GitHub `horizon-team`, write access); `/nightly` and triage commands (trusted reviewers); #horizon-team | Nomination, the filter, a 24 h public discussion, then a council poll (2/3); 30 days probation | Resign, 60 days without a merge or review (automatic), council poll (2/3, without the person) | **Yes** |
-| **🏛️ Council** | Decides everything else by poll (section 4); bans; emergency actions by any 2 members | Nominated by a council member, the filter, a 24 h public discussion, then a council poll (2/3); 30 days probation | Resign, inactivity (section 5.5), council poll (2/3, without the person) | **Yes** |
-
-**The account holder** isn't a level. The founder (Ludovic) still holds the project's accounts (GitHub organisation
-owner, Discord server owner, the Microsoft app approved by Mojang, the domains, Railway, money). He carries out the
-council's decisions on them and hands them over step by step (section 11). As a council member he has one vote,
-like everyone else.
-
-## 3. Each level in detail
-
-### Member
-
-Anyone in the Discord server or on GitHub. Members follow the server rules and Horizon's
-[contributing guide](CONTRIBUTING.md). They can propose anything: an idea in #horizon-ideas, a bug in #horizon-bugs,
-an issue or a pull request on GitHub, or a request for a council poll (any council member can pick it up).
-
-### Contributor
-
-- **Discord:** the 🛠️ Contributor role writes in #contributors and in the threads of #polls-and-decisions. A rank
-  role (⛏️ Iron at 10 merged pull requests, 🥇 Gold at 40, 💎 Diamond at 100, 🟪 Netherite at 200, counted over every
-  public horizon-rust repo) shows how much has been merged. Ranks only go up.
-- **GitHub:** no repository role. Anyone can `/claim` and `/unclaim` their own issues.
-- **Alone:** their own work.
-
-### Group member
-
-Each theme group (section 6) has a role that anyone can pick and drop. It opens the group's channel and receives the
-group's pings. Picking a role grants no power. A group member counts as **active in the group** when Kira has seen at
-least one counted action in the group's area (section 5.1) in the last 60 days. Only active group members can
-nominate a lead or vote in the group's advisory poll.
-
-### 🤝 Support
-
-Unchanged: Support members help players in #horizon-support. They answer every post there and mark posts solved.
-The role carries no permission, so it has no age rule. They join through `/apply`, and the mods and the Team vote.
-
-### 🛡️ Moderators and the Chief of Mods
-
-- **Discord:** time out members, delete messages, manage threads and nicknames, read the audit log, quarantine
-  through Kira, and see the staff channels. **Moderators don't ban.** Bans are done by council members and the Chief of
-  Mods. Kira's automatic actions (the honeypot, clear scams, illegal images) stay as they are.
-- **Official server:** server operators (ops) are moderators in game. They need the 18+ rule and are confirmed the
-  same way (section 6, Server and SMP).
-- **Alone:** a timeout, a deleted message, a quarantine, with a reason in the mod case.
-- **The Chief of Mods** is the first contact for moderation questions. They organise the mods, can ban, and can take a
-  moderator's role away at once when there is a problem. The council confirms or reverses that within 72 hours.
-
-### 🧭 Group leads
-
-Section 6 says what a lead decides alone and what goes to the council.
-
-- **Discord:** in their group's channel only, delete messages, manage and pin threads, and ping the group role. The
-  🧭 lead role carries no server-wide permission.
-- **GitHub:** triage on the issues and pull requests that carry their group's label (`/label`, `/unlabel`, `/close`,
-  `/reopen`, `/unclaim`), from a list of group leads that grants no repository role. Leads merge only if they are on
-  the Horizon Team too.
-
-### 🌌 Horizon Team
-
-The Horizon Team **merges pull requests**. Its rules are in [the release flow](docs/release-flow.md): read the whole
-diff, never merge your own pull request, and use `needs-proof` for anything risky.
-
-- **GitHub:** member of the `horizon-team` team (write access to the Horizon repos), on the trusted reviewers list
-  (`/nightly` and triage commands).
-- **Discord:** the 🌌 Horizon Team role, #horizon-team, and writing in #contributors and the read-only channels.
-  Moderation permissions belong to the moderators and the council: a Team member moderates only if they also hold
-  one of those roles.
-- **During the 30-day probation:** they merge only ordinary pull requests. They don't merge `needs-proof` pull
-  requests, don't approve files that CODEOWNERS guards, and don't use `/nightly`.
-
-### 🏛️ Council
-
-- **Discord:** the 🏛️ Council role: the moderators' permissions plus ban and mention @everyone; #council (private);
-  starting polls in #polls-and-decisions.
-- **GitHub:** the `council` team. Over time it takes over the founder's CODEOWNERS review and his owner powers in the
-  release tools (section 11).
-- **Alone (any one member):** start a poll; pick up a member's request for a poll; do anything their other roles
-  allow.
-- **Any two members together:** an emergency action (section 4.6).
-- **Everything else** is decided by poll.
-
-## 4. The council and its polls
-
-### 4.1 Founding council
-
-kacpherek, levzzz5154, rdbtCVS, Online5277, dezer-x and Ludovic: six members, one vote each. The founding members
-don't go through the filter or a probation. They do make the 18+ declaration (section 9). The council has at most
-**9** members. It adds a seat only when a 2/3 poll says it needs one.
-
-### 4.2 How a poll works
-
-| Rule | Value |
-| --- | --- |
-| Who starts one | Any council member, with `/poll` (Kira). Anyone else asks a council member to start it |
-| Where | #polls-and-decisions, in public. Polls about a person (removal, appeals, the age rule) run in #council, and only their result is public |
-| How long | 24 hours. It closes early only if every council member has voted |
-| Ballot | Yes, No or Abstain. You can change it until the poll closes |
-| Quorum | At least half of the council votes (Abstain counts). With 6 members, 3 votes |
-| Simple majority | More Yes than No |
-| Two-thirds | Yes is at least 2/3 of the Yes and No votes, **and at least 3 Yes votes** |
-| Tie | Nothing changes |
-| No quorum | Nothing changes. Kira reminds the members who haven't voted 12 hours and 2 hours before the end |
-| About yourself | You don't vote, and you don't count in the council's size for that poll |
-| Asking again | A poll that failed can't be asked again for 7 days, unless two members agree that new facts justify it |
-
-### 4.3 Which threshold applies
-
-| Simple majority | Two-thirds |
-| --- | --- |
-| Day-to-day project decisions: direction, priorities, settling disputes between groups, a public statement | Adding council members and Horizon Team members |
-| Group leads and co-leads: appointing, removing, confirming every 6 months | Removing a council member or a Team member (without the person concerned) |
-| Moderators, the Chief of Mods, Support: confirming, removing | Rules: this document, the server rules, the contributing policy, the licence |
-| Ending a probation early | Money (section 12) |
-| Confirming an emergency action | Account handover steps (section 11) |
-| Second-level moderation appeals | Waiving part of the selection filter (section 5.4) |
-| Bringing back someone who stepped down for inactivity, within 6 months | Changing the council's size |
-
-**When in doubt, two-thirds.** Any council member can say a poll needs 2/3, and Kira then counts it at 2/3.
-
-### 4.4 Discussion
-
-Polls that add someone to the council, the Team or a lead post start with a **24-hour public discussion** (section
-5.3). Other polls are discussed in their own thread while they run. A member who wants more time votes No and says
-why. A failed poll can come back after 7 days.
-
-### 4.5 Conflicts of interest
-
-A member doesn't vote on a poll about themselves: their own role, their own removal, an appeal of their own
-moderation action, or money paid to them. They say so in the poll's thread and Kira leaves them out of the count.
-
-### 4.6 Emergencies
-
-For **security** (a leaked secret, a malicious pull request or mod, a hijacked account), **Mojang or Microsoft** (a
-request from them, a risk to the approved sign-in) or **legal** matters (a takedown, the law), **any two council
-members act at once**. They may:
-
-- pause releases and the Nightly;
-- take a mod down from the registry;
-- remove someone's roles or access for now;
-- lock or hide channels and content;
-- ask the account holder to rotate a secret or a key.
-
-They record it with `/emergency` in Kira, and both of them confirm it there. Kira opens a council poll at once
-(simple majority) to confirm it. If the poll doesn't pass, the action is undone where it can be. An emergency never
-adds members, changes rules or spends money.
-
-### 4.7 Removing a council member
-
-A 2/3 poll of the other members, in #council. The person concerned doesn't vote and doesn't count in the quorum.
-Only the result is published, never the reasons. Other ways to leave: resigning, inactivity (section 5.5), or a
-false age declaration (section 9).
-
-### 4.8 When the council drops below a quorum
-
-- **Fewer than 5 members:** Kira opens nominations for the council at once. The council fills seats within 30 days.
-- **Fewer than 3 members, or fewer than 3 who voted in the last 30 days:** an **interim council** forms. It counts the
-  remaining council members, the Horizon Team and the group leads past probation. Its only task is adding council
-  members, by its own 2/3 poll with a quorum of half. Any two of its members can take emergency actions. All other
-  decisions wait. The Team keeps merging and the leads keep leading.
-- **Nobody left:** the Team and the group leads form the interim council in the same way.
-
-## 5. The selection filter
-
-Nobody becomes a lead, a Team member or a council member just because they are well liked or talk a lot. Kira
-measures the work, and only people above a floor can be nominated. The council then decides among them.
-
-### 5.1 What Kira measures
-
-| Signal | What counts | Source |
-| --- | --- | --- |
-| **Merged pull requests** | Pull requests merged in a public horizon-rust repo. For Modding, also in the mod API's fork (arismoko/horizon). Counted overall, and per group by label or by files touched | GitHub search, as the ranks are counted today |
-| **Reviews** | Others' pull requests you reviewed: approved, asked for changes, or left a review with comments. One per pull request | GitHub search `reviewed-by:` and Kira's GitHub webhook |
-| **Triage** | Triage commands run (`/label`, `/close`, duplicates), issues labelled or closed, bug posts routed on Discord | The triage workflow's comments and Kira's webhook |
-| **Support answers** | #horizon-support posts you answered that ended solved | Kira's support feature |
-| **Active days** | Distinct days with any of the above, or with messages in #contributors or a group's channel. Chat elsewhere doesn't count | Kira |
-| **Tenure** | Days since your first counted contribution (since you joined the server, for moderators) | GitHub, Discord |
-| **Clean record** | No timeout, quarantine or ban in the last 90 days | Kira's mod cases |
-| **Verified GitHub** | `/verify-github` done | Kira |
-| **18+ declaration** | Made (section 9) | Kira |
-
-Kira turns these into an **evidence card**: the person's numbers, overall and in the group's area, for the last 60
-days and in total. Anyone can see their own card with `/evidence`. A nomination shows the card publicly.
-
-### 5.2 The floors
-
-A nomination is refused below these floors.
-
-| Role | Floor |
-| --- | --- |
-| **Group lead** | Verified GitHub; tenure of 30 days or more; **in the group's area: 8 or more merged pull requests, or 20 or more reviews** (Translations: 5 or more merged translation pull requests; Server and SMP: 8 pull requests, or 30 days as an official server operator with activity); 15 or more active days in the last 60; clean record; 18+ |
-| **Moderator** | In the server for 30 days or more; Kira level 10 or more; 15 or more active days in the last 60; clean record; 18+ |
-| **Chief of Mods** | Moderator for 30 days or more, past probation; 18+ |
-| **Horizon Team** | 🥇 Gold rank (40 merged pull requests); 20 or more reviews of others' pull requests; tenure of 30 days or more; 20 or more active days in the last 60; clean record; verified GitHub; 18+ |
-| **Council** | Horizon Team member, group lead or Chief of Mods for 60 days or more, past probation; 20 or more active days in the last 60; clean record; 18+ |
-
-The numbers are checked again once a year (section 15). They should stay reachable for people who really work on
-Horizon and out of reach for people who don't.
-
-### 5.3 The path to a role
-
-1. **Nomination.** Run `/nominate member: role: [group:]` in Kira.
-   - A **group lead** can be nominated by an active member of that group or by a council member. A self-nomination
-     needs a second from another active group member or a council member.
-   - A **Team member** can be nominated by a council or Team member. Someone can also nominate themselves with
-     `/apply`, if a council or Team member sponsors them.
-   - A **council member** can only be nominated by a council member.
-   - **Moderators** apply with `/apply`.
-2. **The filter.** Kira checks the floor and the 18+ declaration. Below the floor, Kira refuses and says which line
-   is short.
-3. **Public discussion, 24 hours.** Kira posts the nomination and the evidence card in a thread of
-   #polls-and-decisions. Contributors and the council can comment. For a lead, Kira also runs an **advisory poll** in
-   the group's channel for the same 24 hours. Only active group members vote in it, and the council sees the result.
-4. **Council poll, 24 hours.** Simple majority for a lead, 2/3 for the Team and the council. For moderators, the mods'
-   vote replaces this step, and any two council members can object within 24 hours; the council then decides by poll.
-5. **Probation, 30 days.** The role is held in full, except for the Team limits in section 3. At day 25, Kira asks the
-   council in #council whether anything is wrong. Probation ends by itself at day 30, unless a council poll (simple
-   majority) ended it earlier.
-
-### 5.4 Exceptions
-
-Some valuable people don't show up in the numbers, such as a designer for the website. The council can **waive the
-tenure or the area floors** by a 2/3 poll that says why. The age rule and the clean record are never waived.
-
-### 5.5 Inactivity
-
-Kira checks every day. It warns the person in a DM and in #council, then posts the step-down in
-#polls-and-decisions with neutral wording ("stepped down: inactive"), and removes the Discord role. The account
-holder or an org owner removes GitHub access when the Team role ends.
-
-| Role | What counts as activity | Warning | Steps down |
-| --- | --- | --- | --- |
-| Group lead | A counted action in the group's area, or messages in the group's channel | Day 21 | Day 30 |
-| Horizon Team | A merge or a review | Day 45 | Day 60 |
-| Moderator, Chief of Mods | A moderation action, or messages in the staff channels | Day 21 | Day 30 |
-| Support | An answer in #horizon-support | Day 21 | Day 30 |
-| Council | A vote in a poll. At 30 days with no vote, while at least 2 polls were held | Day 23 | Day 30, or 45 days with no counted activity at all |
-
-- **Away.** Anyone can announce an absence with `/away` for up to 45 days, once every 6 months. Away days don't
-  count. A lead names someone from the group to cover for them.
-- **Coming back.** Within 6 months: a simple-majority poll, with no new probation. After 6 months: the normal path.
-
-### 5.6 Terms
-
-- **Group leads** are confirmed every 6 months by a simple-majority poll. If someone else in the group passes the
-  floor and is nominated, both go on the same poll.
-- **Council and Team** have no fixed term. They stay as long as they are active and keep the council's trust. Removal
-  is always possible (section 4.7).
-
-## 6. Theme groups
-
-### 6.1 The groups
-
-| Group | Covers | GitHub | Discord |
-| --- | --- | --- | --- |
-| **Modding** | The mod API, native and content mods, mixins, the mod registry, `cargo horizon-mod` | The mod API lives in Ari's fork **arismoko/horizon**. Its owner runs that repo by their own rules; the council governs only what is Horizon's: horizon-rust/horizon-mods, horizon-mixins, horizon-native-mod-template, the registry. Label `mods` | The 🧩 MODDING category (#modding, #horizon-modding-team); roles 🧩 Modder (picked) and 🧩 Horizon Modding Team (the lead gives it) |
-| **Shaders and rendering** | The renderer, shaders, shader packs, OptiFine and Polytone pack formats | Label `rendering`; `crates/horizon-client-render` (gfx), `*.wgsl`, `horizon-shaders`, `horizon-shader-api`, `horizon-optifine`, `horizon-polytone` | #shaders-rendering |
-| **Performance** | Frame rate, memory, server tick, benchmarks | Label `perf`; `horizon-bench`, the benchmark tools | #performance |
-| **Launcher** | The launcher: installs, updates, instances, its pages | Label `launcher`; `launcher/` | #launcher |
-| **Server and SMP** | Dedicated server, hosting, the anticheat, multiplayer, and the official SMP | Labels `server`, `multiplayer`; `horizon-server*`, `horizon-anticheat`, `lan/`, `dedicated*`; horizon-rust/horizon-server | #server-smp (plus #join-server, #server-chat) |
-| **Translations** | The game's and the launcher's languages | Label `roadmap:languages`; `launcher/lang/`, `crates/horizon-client/assets/horizon/lang/` | #translations and the 🌍 language channels |
-| **Website** | playhorizon.dev | horizon-rust/horizon-site; label `website`. The site's design stays as it is unless the council decides otherwise | #website |
-| **Vanilla accuracy** | Parity with vanilla 26.3: harnesses, oracles, the port ledger | Labels `parity`, `parity-regression`, `full-parity`; `tools/test_*_parity.py`, the Java oracles | #vanilla-accuracy |
-| **UI** | The game's menus, HUD, settings, controller navigation, the design system | Labels `ui`, `accessibility`; `title/`, `settings_shell.rs`, `hud*`, `ui.rs`, `docs/design-system.md`, `horizon-theme`. The launcher's look is shared with Launcher | #ui |
-
-A pull request can belong to two groups. Both leads can comment, and the Team merges as usual. If the leads disagree,
-the council decides.
-
-### 6.2 Leads per group
-
-- **One lead per group.** A group with 8 or more active members may also have **one co-lead**, chosen the same way.
-- A person leads **at most two groups**. Council members may lead a group, though a lead from outside the council is
-  preferred: it spreads the work.
-
-### 6.3 What a lead decides alone
-
-Inside their group's topic, and within this document, the contributing guide, the vanilla-first rule, the layers and
-the design system:
-
-- the group's priorities and the order of its roadmap items;
-- which issues are `good first issue`, and triage of the group's issues;
-- technical and design direction inside the area, when vanilla behaviour and the default look don't change;
-- accepting or declining an idea or a proposal in the area. Any two active group members or one council member can
-  take that decision to the council;
-- how the group organises itself (threads, meetings, the channel's rules on top of the server's);
-- asking the Team for reviews, adding `needs-proof`, and nominating people.
-
-### 6.4 What goes to the council
-
-- the rules, money, accounts and secrets;
-- who is on the council, the Team or the mods;
-- anything that changes vanilla behaviour or turns a Horizon-only feature on by default;
-- breaking a public promise: the mod API, server compatibility, save and file formats;
-- disputes between groups;
-- anything involving Mojang, Microsoft or the law;
-- speaking for the whole project outside the group's topic.
-
-### 6.5 A group without a lead
-
-The work goes on. The Team reviews and merges, and Kira still routes the group's issues and questions to its
-channel. Until a lead is chosen, any council member may take a lead's decision for that group and says so in the
-channel. Kira pins a "lead wanted" note with the floor. **No lead is better than a lead who doesn't do the work:**
-nobody is appointed just to fill the seat.
-
-## 7. Moderation and appeals
-
-- **The server rules** are in #rules. Moderators enforce them, the Chief of Mods leads the mods, and the council can
-  change the rules (2/3).
-- **Every action has a mod case**: who acted, what they did, and why. Kira keeps the cases.
-- **First appeal:** within 14 days, through #appeal (for a quarantine) or mod mail. A moderator who wasn't involved,
-  or the Chief of Mods, answers within 72 hours.
-- **Second appeal:** for bans, timeouts over 24 hours and quarantines, a council poll in #council (simple majority).
-  Members who were involved don't vote. The answer is final for 90 days.
-- **Not appealable here:** actions that Discord's rules or the law require. Those are reported where the law says.
-- **Removing a moderator:** the Chief of Mods can suspend a moderator at once, and the council decides within 72 hours
-  (simple majority). The council removes the Chief of Mods the same way.
-- **Staff are moderated like everyone.** When a council member is involved, the council decides without them.
-
-## 8. Conflicts and hard cases
-
-| Case | What happens |
-| --- | --- |
-| Two groups disagree | The leads talk first. If they still disagree, the council decides (simple majority) |
-| A lead's decision is contested | Any two active group members or one council member can bring it to the council |
-| A Team member merges against the rules | Any council member can revert the merge. The council can remove the member (2/3) |
-| A council member breaks the rules | The council decides without them. Removal takes 2/3 (section 4.7) |
-| Someone holds a role and is under 18 | Section 9 |
-| The council can't reach quorum | Section 4.8 |
-| The founder and the council disagree about one of his own accounts | Until a step of section 11 hands it over, the account stays his. He carries out the council's decisions on project matters, or he says publicly that he won't |
-
-## 9. The age rule (18+)
-
-**Who must be 18 or older:** members of the council and the Horizon Team, trusted reviewers, group leads and
-co-leads, the Chief of Mods and the moderators, official server operators, and anyone with admin rights anywhere in
-the project: Discord (Administrator, Manage Roles, Manage Channels, ban), GitHub (write, admin, organisation),
-server panels, Railway, or Kira's admin side. The same goes for anyone who holds a project secret.
-
-**Who doesn't have to be:** members, contributors (with any rank), group members and 🤝 Support. Contributors under
-18 are welcome and valued. They just can't hold the roles above.
-
-**How it's checked, without collecting ID:**
-
-- **A declaration.** Before taking such a role, and once at the start for everyone who holds one, the person presses
-  a button in Kira: "I confirm that I am 18 or older. I understand that a false declaration removes all my roles of
-  trust." Kira keeps only the Discord account, the date and the wording's version. It never stores a birth date, an
-  ID, a photo, or any outside age-checking service's result.
-- **No declaration, no role.** At the start, current role holders have 7 days to make it. Until they do, their role is
-  paused.
-- **When there's doubt** (the person says they are younger, or there is a credible private report), one council
-  member asks the person privately. If the doubt remains, any council member pauses the role, and the council decides
-  within 72 hours in #council.
-- **A false declaration** removes every role of trust at once, and the person can't hold one for 12 months.
-- **Privacy.** Age is never discussed in public. A role that ends for this reason ends with the same neutral line as
-  any other step-down.
-
-## 10. The agents
-
-Horizon uses AI agents: the founder's orchestrator, which runs coding agents, and Kira, the Discord bot.
-
-- **They obey council decisions only:** a passed poll recorded by Kira, a recorded emergency action of two council
-  members, and the standing rules in this document and the project's docs.
-- **The only exception is the founder's own things:** his spending, his machines (they run CI and the vanilla tests),
-  his personal accounts and his time. On those, his word decides. This list should get shorter over time (section 11).
-- **Role work isn't a decision.** A lead asking Kira to route issues, or a Team member asking an agent to prove a pull
-  request, is that person using their role. The agents help, within the role's powers.
-- **They check the source.** An agent acts on a decision only when it finds it in Kira's decisions log
-  (section 13). A message saying "the council decided", or a screenshot, is not enough.
-- **They post as agents.** Everything an agent posts says it comes from an agent, and states decisions as the
-  project's.
-
-## 11. Accounts and the handover path
-
-Today the founder holds every account. The aim is for him to hold fewer, in an order that never leaves the project
-unable to act, and never puts an account that is tied to a person into anyone else's hands.
-
-| Account | Today | Can it be shared? | Plan |
-| --- | --- | --- | --- |
-| **GitHub organisation** (horizon-rust) | One owner (the founder) | Yes: an organisation can have several owners | **Step 1:** a second owner from the council, chosen by a 2/3 poll in the council's first week, with two-factor authentication on. **Step 2:** a `council` team; CODEOWNERS reviews and the release tools' owner powers (`paused`, `/nightly remove`) move from the founder to that team |
-| **Discord server** | Owned by the founder | Partly: a server has exactly one owner; powers can be given through roles | **Step 1:** the 🏛️ Council role gets moderation and ban permissions; Kira applies the outcomes of passed polls, so nobody needs Manage Roles; two-factor authentication becomes required for moderation. Ownership itself stays with the founder until a legal entity exists |
-| **Kira** (bot application, Railway service) | The founder's Discord developer account and Railway | The bot: yes (a Discord developer team). Railway: adding members may need a paid plan | **Step 1:** a Discord developer team with two council members. Railway members once the council decides on money |
-| **Official server** (hosting panel) | The founder's account | Yes: panel sub-users | **Step 1:** sub-users for the Server and SMP lead and for one council member |
-| **Domains** (playhorizon.dev and the others) | The founder's registrar account | Not without moving it | Auto-renewal on, registered for several years ahead. They move only to a legal entity, if one is created |
-| **The Microsoft app approved by Mojang** (sign-in) | The founder's Azure app registration; Mojang approved it after his application | **No.** The approval was given on his application. Moving the app or adding owners would change who Mojang deals with, and we have found no documented way to transfer an approval | **Never moves** without Mojang's written agreement. The only change considered: a legal entity, if one is created, and only if Mojang agrees |
-| **Signing** (Apple developer certificate, release signing keys) | The founder's | The Apple certificate is in his legal name: no | The Apple certificate never moves. Release keys stay in GitHub's protected environments, and the council team approves their use from step 2 |
-| **Money** (sponsorship, donations) | Personal accounts of the founder | Through a fiscal host | Section 12 |
-| **The founder's machines, AI accounts and password vault** | His | No | His own things: they never move. The project should depend on them less over time |
-
-**Order:** first the safety nets that remove a single point of failure (a second organisation owner, the bot's
-developer team, panel sub-users). Then the day-to-day powers (CODEOWNERS and release tools to the council team). Last,
-whatever needs a legal entity: domains, money, and with Mojang's agreement the sign-in app. Each step is a 2/3 poll,
-and the founder carries it out.
-
-## 12. Money
-
-*Placeholder: the options (Open Collective and others) are being researched.*
-
-- The council approves every expense by a **2/3 poll**.
-- **Every income and every expense is public.**
-- Nobody votes on money paid to themselves.
-
-## 13. Transparency
-
-- **#polls-and-decisions:** every poll and every result, posted by Kira, and the 24-hour discussions of nominations.
-  For polls that aren't about a person, each member's vote is shown once the poll closes.
-- **The decisions log:** Kira keeps an append-only record of every poll, emergency action, appointment and
-  step-down, with its date and result. It is public and machine-readable, so the agents can check a decision there.
-- **This document** lives in horizon-rust/horizon as `GOVERNANCE.md`. A short summary is pinned in #rules and in
-  #polls-and-decisions.
-- **Who holds which role:** the people page of playhorizon.dev's hub shows the council, the Team, the group leads,
-  the Chief of Mods, the moderators and Support.
-- **#council** is private for discussion and for polls about people. Everything the council decides is published.
-
-## 14. Rules that are never voted on
-
-These are Horizon's conditions for existing, not choices. No poll can change them:
-
-- Playing needs a **Microsoft account that owns Minecraft: Java Edition**. There is no play without one.
-- **No Mojang files** in Horizon's repos or downloads. Players' own copies stay on their own machines.
-- **No gambling**, in any form, including with in-game currency.
-- **Mojang's and Microsoft's terms and Usage Guidelines** apply to everything Horizon does.
-- **The law**, and the terms of service of Discord and GitHub.
-
-## 15. Changing this document
-
-A 2/3 council poll, then a pull request that a Team member merges. The council reviews the floors' numbers
-(section 5.2) once a year, or sooner if they turn out wrong.

README.md

@@ -135,8 +135,6 @@ python3 tools/pr_ready.py
 
 It runs rustfmt, clippy, the touched crates' tests, the Python tests, the public-tree check and the vanilla harnesses your change affects. Never commit game files, decompiled source or prepared resources.
 
-How Horizon is run (the council, theme groups and their leads, the Horizon Team, moderation): [GOVERNANCE.md](GOVERNANCE.md).
-
 ## Project status
 
 **Player-visible gaps: 0 open** of the 833 the [port ledger](tools/port_ledger.py) found, reading every vanilla 26.3 method against Horizon's code: vanilla behaviour a player would notice that Horizon doesn't have yet. By area: Animals [0](https://github.com/horizon-rust/horizon/issues/3512); Monsters and bosses [0](https://github.com/horizon-rust/horizon/issues/3513); Entities, projectiles, vehicles and decorations [0](https://github.com/horizon-rust/horizon/issues/3514); Items, enchantments and inventories [0](https://github.com/horizon-rust/horizon/issues/3515); Blocks, redstone and fluids [0](https://github.com/horizon-rust/horizon/issues/3516); World, world generation and saves [0](https://github.com/horizon-rust/horizon/issues/3517); Screens, HUD and client packets [0](https://github.com/horizon-rust/horizon/issues/3518); Entity and block rendering, models [0](https://github.com/horizon-rust/horizon/issues/3519); Server and players on the server [0](https://github.com/horizon-rust/horizon/issues/3520); Mob AI, villagers and raids [0](https://github.com/horizon-rust/horizon/issues/3521). This number goes down as gaps close (`tools/parity_gaps.py`); the table below says what the harnesses compare.

crates/horizon-client-core/src/lang.rs

@@ -74,11 +74,70 @@ pub trait ResourceSource {
         vec!["minecraft".into()]
     }
 }
+/// The bundled file a language reads, and whether it drops `ß`: a regional variant reads its
+/// language's file (Swiss German writes "ss" for "ß", as vanilla's de_ch does).
+fn bundled_code(code: &str) -> (&str, bool) {
+    match code {
+        "ko" => ("ko_kr", false),
+        "hr" => ("hr_hr", false),
+        "de_at" => ("de_de", false),
+        "de_ch" => ("de_de", true),
+        "fr_ca" | "fr_ch" => ("fr_fr", false),
+        "es_ar" | "es_cl" | "es_ec" | "es_mx" | "es_uy" | "es_ve" => ("es_es", false),
+        code => (code, false),
+    }
+}
+
+/// Lang files crates above the engine ship (`horizon_hooks::lang`), each a list of
+/// (code, JSON) pairs. The game's entry installs them once, before any language loads.
+static CRATE_FILES: std::sync::OnceLock<&'static [&'static [(&'static str, &'static str)]]> =
+    std::sync::OnceLock::new();
+
+/// Installs the crates' lang files (`horizon_hooks::lang::engine::all()`). Only the first call
+/// counts.
+pub fn install_crate_files(files: &'static [&'static [(&'static str, &'static str)]]) {
+    let _ = CRATE_FILES.set(files);
+}
+
+/// The crates' entries for language `code` (through [`bundled_code`]'s variants) that the
+/// engine's own `horizon` file for it doesn't have: on a key both have, the engine wins.
+fn read_crate_files(files: &[&[(&str, &str)]], code: &str, map: &mut HashMap<String, String>) {
+    if files.is_empty() {
+        return;
+    }
+    let (file, swiss) = bundled_code(code);
+    let mut own = HashMap::new();
+    if let Some(bytes) = Bundled.read(&format!("assets/horizon/lang/{code}.json")) {
+        read_lang_file(&bytes, &mut own);
+    }
+    for (c, json) in files.iter().flat_map(|f| f.iter()) {
+        if *c != file {
+            continue;
+        }
+        let mut theirs = HashMap::new();
+        if swiss {
+            read_lang_file(json.replace('ß', "ss").as_bytes(), &mut theirs);
+        } else {
+            read_lang_file(json.as_bytes(), &mut theirs);
+        }
+        for (key, value) in theirs {
+            if !own.contains_key(&key) {
+                map.insert(key, value);
+            }
+        }
+    }
+}
+
 /// Horizon's own strings, compiled in so they need no prepared resources.
 struct Bundled;
 impl ResourceSource for Bundled {
     fn read(&self, path: &str) -> Option<Vec<u8>> {
-        let body = match path {
+        let code = path
+            .strip_prefix("assets/horizon/lang/")?
+            .strip_suffix(".json")?;
+        let (file, swiss) = bundled_code(code);
+        let path = format!("assets/horizon/lang/{file}.json");
+        let body = match path.as_str() {
             "assets/horizon/lang/en_us.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/en_us.json")
             }
@@ -103,10 +162,10 @@ impl ResourceSource for Bundled {
             "assets/horizon/lang/tr_tr.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/tr_tr.json")
             }
-            "assets/horizon/lang/ko_kr.json" | "assets/horizon/lang/ko.json" => {
+            "assets/horizon/lang/ko_kr.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/ko_kr.json")
             }
-            "assets/horizon/lang/hr_hr.json" | "assets/horizon/lang/hr.json" => {
+            "assets/horizon/lang/hr_hr.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/hr_hr.json")
             }
             "assets/horizon/lang/pt_pt.json" => {
@@ -331,30 +390,20 @@ impl ResourceSource for Bundled {
             "assets/horizon/lang/vec_it.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/vec_it.json")
             }
-            "assets/horizon/lang/de_de.json" | "assets/horizon/lang/de_at.json" => {
+            "assets/horizon/lang/de_de.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/de_de.json")
             }
-            // Swiss German writes "ss" for "ß", as vanilla's de_ch does.
-            "assets/horizon/lang/de_ch.json" => {
-                let de = include_str!("../../horizon-client/assets/horizon/lang/de_de.json");
-                return Some(de.replace('ß', "ss").into_bytes());
-            }
-            "assets/horizon/lang/fr_fr.json"
-            | "assets/horizon/lang/fr_ca.json"
-            | "assets/horizon/lang/fr_ch.json" => {
+            "assets/horizon/lang/fr_fr.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/fr_fr.json")
             }
-            "assets/horizon/lang/es_es.json"
-            | "assets/horizon/lang/es_ar.json"
-            | "assets/horizon/lang/es_cl.json"
-            | "assets/horizon/lang/es_ec.json"
-            | "assets/horizon/lang/es_mx.json"
-            | "assets/horizon/lang/es_uy.json"
-            | "assets/horizon/lang/es_ve.json" => {
+            "assets/horizon/lang/es_es.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/es_es.json")
             }
             _ => return None,
         };
+        if swiss {
+            return Some(body.replace('ß', "ss").into_bytes());
+        }
         Some(body.as_bytes().to_vec())
     }
     fn namespaces(&self) -> Vec<String> {
@@ -438,6 +487,16 @@ impl Language {
     /// from every namespace and every source in priority order (later sources
     /// override).
     pub fn load(sources: &[&dyn ResourceSource], code: &str) -> Self {
+        let crate_files = CRATE_FILES.get().copied().unwrap_or_default();
+        Self::load_with(sources, code, crate_files)
+    }
+
+    /// [`Language::load`] with these crates' lang files.
+    fn load_with(
+        sources: &[&dyn ResourceSource],
+        code: &str,
+        crate_files: &[&[(&str, &str)]],
+    ) -> Self {
         let mut map = HashMap::new();
         let mut codes = vec![DEFAULT];
         if code != DEFAULT {
@@ -453,12 +512,14 @@ impl Language {
             sources.iter().flat_map(|s| s.namespaces()).collect();
         for c in codes {
             for namespace in &namespaces {
-                for source in sources {
-                    let Some(bytes) = source.read(&format!("assets/{namespace}/lang/{c}.json"))
-                    else {
-                        continue;
-                    };
-                    read_lang_file(&bytes, &mut map);
+                for (i, source) in sources.iter().enumerate() {
+                    if let Some(bytes) = source.read(&format!("assets/{namespace}/lang/{c}.json")) {
+                        read_lang_file(&bytes, &mut map);
+                    }
+                    // The crates' text right after the engine's own (`Bundled`, the first source).
+                    if i == 0 && namespace == "horizon" {
+                        read_crate_files(crate_files, c, &mut map);
+                    }
                 }
             }
         }
@@ -688,6 +749,43 @@ mod tests {
         );
     }
 
+    #[test]
+    fn a_crates_text_loads_after_the_engines_and_before_packs() {
+        static CRATE: &[(&str, &str)] = &[
+            (
+                "en_us",
+                r#"{"test.crate.hello": "Hello", "horizon.osk.close": "Shut", "test.crate.packed": "Crate"}"#,
+            ),
+            (
+                "de_de",
+                r#"{"test.crate.hello": "Grüß dich", "horizon.osk.close": "Zu"}"#,
+            ),
+            ("fr_fr", r#"{"test.crate.hello": "Bonjour"}"#),
+        ];
+        let pack = Mem(HashMap::from([(
+            "assets/horizon/lang/en_us.json".to_owned(),
+            br#"{"test.crate.packed": "Pack"}"#.to_vec(),
+        )]));
+        let load = |code| Language::load_with(&[&pack], code, &[CRATE]);
+        let en = load("en_us");
+        assert_eq!(en.get("test.crate.hello"), Some("Hello"));
+        // The engine's own file wins on a key both have; a pack wins over both.
+        assert_eq!(en.get("horizon.osk.close"), Some("Close"));
+        assert_eq!(en.get("test.crate.packed"), Some("Pack"));
+        let de = load("de_de");
+        assert_eq!(de.get("test.crate.hello"), Some("Grüß dich"));
+        assert_eq!(de.get("horizon.osk.close"), Some("Schließen"));
+        // Regional variants read their language's file, as the engine's do.
+        assert_eq!(load("de_ch").get("test.crate.hello"), Some("Grüss dich"));
+        assert_eq!(load("fr_ca").get("test.crate.hello"), Some("Bonjour"));
+        // A language the crate lacks falls back to its English.
+        assert_eq!(load("pl_pl").get("test.crate.hello"), Some("Hello"));
+        // Without crate files, nothing changes.
+        let plain = Language::load_with(&[&pack], "de_de", &[]);
+        assert_eq!(plain.get("test.crate.hello"), None);
+        assert_eq!(plain.len() + 1, de.len());
+    }
+
     #[test]
     fn a_scoped_language_is_the_calling_threads_and_reports_what_it_lacks() {
         let empty = Mem(HashMap::new());
@@ -739,6 +837,20 @@ mod tests {
         std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("../horizon-client/assets/horizon/lang")
     }
+    /// The crates whose own lang files the game loads (`crates/<name>/assets/lang`,
+    /// registered through `horizon_hooks::lang`), with that folder.
+    fn crate_lang_dirs() -> Vec<(String, std::path::PathBuf)> {
+        let crates = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("..");
+        let mut dirs: Vec<_> = std::fs::read_dir(&crates)
+            .unwrap()
+            .flatten()
+            .map(|e| (e.file_name().into_string().unwrap(), e.path()))
+            .map(|(name, path)| (name, path.join("assets/lang")))
+            .filter(|(_, dir)| dir.join("en_us.json").is_file())
+            .collect();
+        dirs.sort();
+        dirs
+    }
     /// The keys of a flat bundled file in file order, duplicates included (a map
     /// would keep only the last of two equal keys). One `"key": "value"` per line.
     fn file_keys(body: &str) -> Vec<String> {
@@ -776,11 +888,33 @@ mod tests {
 
     #[test]
     fn bundled_files_are_served_and_have_no_stale_or_repeated_keys() {
-        let dir = bundled_dir();
+        let engine = check_lang_dir(&bundled_dir(), true);
+        assert!(
+            engine.1 >= 7,
+            "found {} bundled lang files in {}",
+            engine.1,
+            bundled_dir().display()
+        );
+        // A crate's files pass the same checks. Its keys are its own: on a key the engine's
+        // files also have, the engine's text would win and hide the crate's.
+        for (name, dir) in crate_lang_dirs() {
+            let (en, _) = check_lang_dir(&dir, false);
+            for key in en.keys() {
+                assert!(
+                    !engine.0.contains_key(key),
+                    "{name}: {key} is also the engine's"
+                );
+            }
+        }
+    }
+
+    /// The checks every lang folder passes: flat maps, no repeated key, no key en_us lacks, the
+    /// same placeholders as English, no empty text. Its en_us and how many files it has.
+    fn check_lang_dir(dir: &std::path::Path, bundled: bool) -> (HashMap<String, String>, usize) {
         let en_body = std::fs::read_to_string(dir.join("en_us.json")).unwrap();
         let en: HashMap<String, String> = serde_json::from_str(&en_body).unwrap();
         let mut seen = 0;
-        for entry in std::fs::read_dir(&dir).unwrap().flatten() {
+        for entry in std::fs::read_dir(dir).unwrap().flatten() {
             let name = entry.file_name().into_string().unwrap();
             let Some(code) = name.strip_suffix(".json") else {
                 continue;
@@ -789,7 +923,7 @@ mod tests {
             // A file that Bundled::read does not name is never loaded.
             let path = format!("assets/horizon/lang/{name}");
             assert!(
-                Bundled.read(&path).is_some(),
+                !bundled || Bundled.read(&path).is_some(),
                 "{name} is not served by Bundled"
             );
             let body = std::fs::read_to_string(entry.path()).unwrap();
@@ -815,11 +949,7 @@ mod tests {
                 assert!(!value.trim().is_empty(), "{code}: {key} is empty");
             }
         }
-        assert!(
-            seen >= 7,
-            "found {seen} bundled lang files in {}",
-            dir.display()
-        );
+        (en, seen)
     }
 
     #[test]
@@ -834,10 +964,10 @@ mod tests {
                 }
             }
         }
-        let en: HashMap<String, String> = serde_json::from_str(
-            &std::fs::read_to_string(bundled_dir().join("en_us.json")).unwrap(),
-        )
-        .unwrap();
+        let english = |dir: &std::path::Path| -> HashMap<String, String> {
+            serde_json::from_str(&std::fs::read_to_string(dir.join("en_us.json")).unwrap()).unwrap()
+        };
+        let mut en = english(&bundled_dir());
         let crates = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("..");
         let mut files = Vec::new();
         for krate in [
@@ -847,6 +977,11 @@ mod tests {
         ] {
             rust_files(&crates.join(krate).join("src"), &mut files);
         }
+        // A crate that ships lang files names its keys in its own sources.
+        for (name, dir) in crate_lang_dirs() {
+            en.extend(english(&dir));
+            rust_files(&crates.join(name).join("src"), &mut files);
+        }
         assert!(files.len() > 100, "found only {} sources", files.len());
         let mut found = 0;
         for file in files {

crates/horizon-client-input/Cargo.toml

@@ -9,13 +9,11 @@ description = "The client's input layer: key bindings and their names, mouse, co
 [dependencies]
 horizon-client-core = { path = "../horizon-client-core" }
 winit = "0.30.13"
+# The window icon.
+horizon-theme = { path = "../horizon-theme" }
 png = "0.18"
 arboard = { version = "3.6.1", default-features = false, features = ["wayland-data-control"] }
 
-[dev-dependencies]
-# The window icon test decodes Horizon's icon.
-horizon-theme = { path = "../horizon-theme" }
-
 [features]
 controllers = []
 

crates/horizon-client-input/src/window.rs

@@ -638,30 +638,10 @@ pub fn fullscreen_request(
     }
 }
 
-/// The PNG the windows show as their icon, given once at startup by the layer that brands the
-/// game (the engine has none of its own).
-static ICON_PNG: std::sync::OnceLock<&'static [u8]> = std::sync::OnceLock::new();
-
-/// Give the windows their icon, a PNG: call it before the first window opens. A second call
-/// keeps the first icon.
-pub fn set_icon_png(png: &'static [u8]) {
-    let _ = ICON_PNG.set(png);
-}
-
-/// The icon given to [`set_icon_png`], if any.
-pub fn icon_png() -> Option<&'static [u8]> {
-    ICON_PNG.get().copied()
-}
-
-/// The icon for the window's title bar and the task bar (X11 and Windows; Wayland takes it from
-/// the `.desktop` entry, macOS from the app bundle). `None` with no icon given, or one that
-/// can't be read.
+/// Horizon's icon for the window's title bar and the task bar (X11 and Windows; Wayland takes
+/// it from the `horizon.desktop` entry, macOS from the app bundle). `None` if it can't be read.
 pub fn icon() -> Option<winit::window::Icon> {
-    decode_icon(icon_png()?)
-}
-
-fn decode_icon(png: &[u8]) -> Option<winit::window::Icon> {
-    let mut decoder = png::Decoder::new(std::io::Cursor::new(png));
+    let mut decoder = png::Decoder::new(std::io::Cursor::new(horizon_theme::ICON_PNG));
     decoder.ignore_checksums(true);
     decoder.set_transformations(png::Transformations::EXPAND | png::Transformations::STRIP_16);
     let mut reader = decoder.read_info().ok()?;
@@ -674,15 +654,14 @@ fn decode_icon(png: &[u8]) -> Option<winit::window::Icon> {
     winit::window::Icon::from_rgba(bytes, info.width, info.height).ok()
 }
 
-/// Apply the icon given to [`set_icon_png`] to a window. Windows has a separate taskbar icon slot
-/// from the small window icon; requiring a given icon to decode there prevents a generic taskbar
-/// icon from appearing.
-pub fn with_icon(attributes: winit::window::WindowAttributes) -> winit::window::WindowAttributes {
-    #[cfg(not(target_os = "windows"))]
+/// Apply Horizon's icon to every window. Windows has a separate taskbar icon slot from the small
+/// window icon; requiring the decoded icon there prevents a generic taskbar icon from appearing.
+pub fn with_horizon_icon(
+    attributes: winit::window::WindowAttributes,
+) -> winit::window::WindowAttributes {
     let icon = icon();
     #[cfg(target_os = "windows")]
-    let icon =
-        icon_png().map(|png| decode_icon(png).expect("the window icon must decode on Windows"));
+    let icon = Some(icon.expect("Horizon's icon must be available on Windows"));
 
     let attributes = attributes.with_window_icon(icon.clone());
     #[cfg(target_os = "windows")]
@@ -760,8 +739,7 @@ mod tests {
     }
     #[test]
     fn the_window_icon_decodes() {
-        assert!(decode_icon(horizon_theme::ICON_PNG).is_some());
-        assert!(decode_icon(b"not a png").is_none());
+        assert!(icon().is_some());
     }
 
     #[test]

crates/horizon-client-lib/Cargo.toml

@@ -70,6 +70,7 @@ flate2 = { version = "1.1.10", default-features = false, features = ["zlib-rs",
 mio = { version = "1.2.4", features = ["os-poll", "net"] }
 # Shared chunk frames are found by one keyed 128-bit hash of their body (lan/conn.rs SharedFrames).
 xxhash-rust = { version = "0.8.19", features = ["xxh3"] }
+horizon-theme = { path = "../horizon-theme" }
 # Opt-in data collection: the game keeps, the launcher sends (docs/telemetry.md).
 horizon-telemetry = { path = "../horizon-telemetry", default-features = false }
 horizon-bench = { path = "../horizon-bench" }
@@ -108,12 +109,16 @@ objc2-foundation = { version = "0.3", default-features = false, features = ["std
 wgpu = { version = "30.0.1", default-features = false, features = ["gles"] }
 
 [features]
-default = ["audio", "controllers"]
+default = ["audio", "controllers", "horizon-extras"]
 # Sound output. Without it (and `controllers`) the program links neither libasound nor libudev on
 # Linux: the server build (`--no-default-features`, released as horizon-engine; docs/server.md).
 audio = ["horizon-client-render/audio"]
 # Controllers: gilrs, and the DualSense's own output. Without it only `horizon-ctl pad`'s virtual pad.
 controllers = ["dep:gilrs", "horizon-client-input/controllers"]
+# Horizon's own parts still in this crate (docs/forking.md, docs/layers.md): the features below.
+horizon-extras = ["discord"]
+# "Playing Horizon" on the player's Discord profile (`discord_presence`).
+discord = []
 # Records the call sites of mob random draws (`mob_ai_probe` traces).
 rng-trace = ["horizon-core/rng-trace"]
 # Compatibility with earlier experiment commands: main already uses mimalloc.
@@ -125,8 +130,6 @@ windows-segment-heap = []
 workspace = true
 
 [dev-dependencies]
-# ui_theme's unit tests draw text in the design system's fonts.
-horizon-theme = { path = "../horizon-theme" }
 horizon-client-render = { path = "../horizon-client-render", features = ["test-support"] }
 horizon-items = { path = "../horizon-items", features = ["test-support"] }
 # Every WGSL shader translated as wgpu's DirectX 12 backend does (gfx.rs tests).

crates/horizon-client-render/Cargo.toml

@@ -29,6 +29,7 @@ horizon-protocol = { path = "../horizon-protocol" }
 horizon-shader-api = { path = "../horizon-shader-api" }
 horizon-shaders = { path = "../horizon-shaders" }
 horizon-system = { path = "../horizon-system" }
+horizon-theme = { path = "../horizon-theme" }
 horizon-threads = { path = "../horizon-threads" }
 horizon-world = { path = "../horizon-world" }
 ab_glyph = "0.2.32"
@@ -84,7 +85,5 @@ horizon-extras = []
 workspace = true
 
 [dev-dependencies]
-# Tests: a TrueType font to load, and the design system the menus' motion curves match.
-horizon-theme = { path = "../horizon-theme" }
 horizon-items = { path = "../horizon-items", features = ["test-support"] }
 naga = { version = "30.0.1", features = ["wgsl-in", "hlsl-out", "glsl-out", "msl-out", "spv-out"] }

crates/horizon-client-render/src/extras.rs

@@ -2,7 +2,7 @@
 //! settings, kept in `horizon-extras.txt` next to `options.txt` so that file
 //! stays exactly vanilla's, and the logic behind them. Every extra is off by
 //! default; see `docs/extras.md`. Horizon's own switches outside the Extras page
-//! (No AI, Agent Control) are kept here too.
+//! (No AI, Agent Control, Discord Rich Presence) are kept here too.
 use std::{collections::VecDeque, fs, path::Path};
 
 pub const FILE: &str = "horizon-extras.txt";
@@ -145,6 +145,8 @@ pub struct Extras {
     /// F3+R and F3+E start/stop a repro recording and write its bundle (off by
     /// default: a recording copies the world).
     pub repro_keys: bool,
+    /// "Playing Horizon" on the player's Discord profile (`discord_presence`; on by default).
+    pub discord_presence: bool,
     /// Another controller can join P1's world (`splitscreen`, off by default).
     pub splitscreen: bool,
     /// Two players in one window: 0 auto (side by side when wider than tall), 1 side by side,
@@ -231,6 +233,7 @@ impl Default for Extras {
             no_ai: false,
             agent_control: false,
             repro_keys: false,
+            discord_presence: true,
             splitscreen: false,
             splitscreen_two: 0,
             splitscreen_three: 0,
@@ -335,6 +338,7 @@ impl Extras {
                 horizon_core::no_ai::KEY => e.no_ai = flag(e.no_ai),
                 "agentControl" => e.agent_control = flag(e.agent_control),
                 "reproKeys" => e.repro_keys = flag(e.repro_keys),
+                "discordPresence" => e.discord_presence = flag(e.discord_presence),
                 "splitscreen" => e.splitscreen = flag(e.splitscreen),
                 "splitscreenTwo" => e.splitscreen_two = value.parse().unwrap_or(0).min(2),
                 "splitscreenThree" => e.splitscreen_three = value.parse().unwrap_or(0).min(2),
@@ -372,7 +376,7 @@ impl Extras {
     }
     pub fn serialize(&self) -> String {
         let mut text = format!(
-            "packBrowser:{}\npregen:{}\nfullbright:{}\ndynamicLights:{}\nzoom:{}\nzoomKey:{}\nzoomLevel:{}\nzoomSmooth:{}\nzoomSensitivity:{}\nlodZoomDetail:{}\nfps:{}\nfpsCorner:{}\nfpsLows:{}\nkeystrokes:{}\nkeystrokesCorner:{}\nkeystrokesCps:{}\nmovedToMods:{}\nminimap:{}\nminimapCorner:{}\nminimapSize:{}\nminimapShape:{}\nminimapZoom:{}\nminimapRotate:{}\nautoReconnect:{}\nuiSoundReserve:{}\nownNameTag:{}\nhideBlockParticles:{}\nmouseTweaks:{}\nmouseTweaksWheel:{}\nsort:{}\nsortKey:{}\nchatAnimation:{}\nchatIndicator:{}\n{}:{}\nagentControl:{}\nreproKeys:{}\nsplitscreen:{}\nsplitscreenTwo:{}\nsplitscreenThree:{}\nsplitscreenNames:{}\nwheelCyclesListSettings:{}\nmusicOff:{}\nmusicPage:{}\ncosmeticsMine:{}\n{}cosmeticsHideFx:{}\ncosmeticsSolo:{}\n{}:{}\n{}:{}\n{}:{}\n",
+            "packBrowser:{}\npregen:{}\nfullbright:{}\ndynamicLights:{}\nzoom:{}\nzoomKey:{}\nzoomLevel:{}\nzoomSmooth:{}\nzoomSensitivity:{}\nlodZoomDetail:{}\nfps:{}\nfpsCorner:{}\nfpsLows:{}\nkeystrokes:{}\nkeystrokesCorner:{}\nkeystrokesCps:{}\nmovedToMods:{}\nminimap:{}\nminimapCorner:{}\nminimapSize:{}\nminimapShape:{}\nminimapZoom:{}\nminimapRotate:{}\nautoReconnect:{}\nuiSoundReserve:{}\nownNameTag:{}\nhideBlockParticles:{}\nmouseTweaks:{}\nmouseTweaksWheel:{}\nsort:{}\nsortKey:{}\nchatAnimation:{}\nchatIndicator:{}\n{}:{}\nagentControl:{}\nreproKeys:{}\ndiscordPresence:{}\nsplitscreen:{}\nsplitscreenTwo:{}\nsplitscreenThree:{}\nsplitscreenNames:{}\nwheelCyclesListSettings:{}\nmusicOff:{}\nmusicPage:{}\ncosmeticsMine:{}\n{}cosmeticsHideFx:{}\ncosmeticsSolo:{}\n{}:{}\n{}:{}\n{}:{}\n",
             bool_text(self.pack_browser),
             bool_text(self.pregen),
             bool_text(self.fullbright),
@@ -414,6 +418,7 @@ impl Extras {
             bool_text(self.no_ai),
             bool_text(self.agent_control),
             bool_text(self.repro_keys),
+            bool_text(self.discord_presence),
             bool_text(self.splitscreen),
             self.splitscreen_two,
             self.splitscreen_three,
@@ -608,6 +613,8 @@ pub enum Item {
     /// Not on the Extras page: Horizon Settings shows No AI, its AI Agent page Agent Control.
     NoAi,
     AgentControl,
+    /// On the Horizon Settings page.
+    DiscordPresence,
     /// On the AI Agent page, next to Agent Control: the F3 recording shortcuts.
     ReproKeys,
     /// On the Splitscreen settings page.
@@ -684,6 +691,7 @@ impl Item {
             Item::NoAi => "horizon.extras.no_ai",
             Item::AgentControl => "horizon.extras.agent_control",
             Item::ReproKeys => "horizon.extras.repro_keys",
+            Item::DiscordPresence => "horizon.extras.discord_presence",
             Item::Splitscreen => "horizon.extras.splitscreen",
             Item::ChatAnimation => "horizon.extras.chat_animation",
             Item::ChatIndicator => "horizon.extras.chat_indicator",
@@ -716,6 +724,7 @@ impl Item {
             Item::NoAi => "horizon.extras.no_ai.tooltip",
             Item::AgentControl => "horizon.extras.agent_control.tooltip",
             Item::ReproKeys => "horizon.extras.repro_keys.tooltip",
+            Item::DiscordPresence => "horizon.extras.discord_presence.tooltip",
             Item::Splitscreen => "horizon.extras.splitscreen.tooltip",
             Item::ChatAnimation => "horizon.extras.chat_animation.tooltip",
             Item::ChatIndicator => "horizon.extras.chat_indicator.tooltip",
@@ -759,6 +768,7 @@ impl Item {
             Item::NoAi => "No AI",
             Item::AgentControl => "Agent Control",
             Item::ReproKeys => "Recording shortcuts",
+            Item::DiscordPresence => "Discord Rich Presence",
             Item::Splitscreen => "Splitscreen",
             Item::WheelCyclesSettings => "Scroll wheel changes settings",
             Item::PackBrowser => "Resource pack browser",
@@ -782,9 +792,10 @@ impl Item {
             ChatIndicator => ChatAnimation,
             Pvp(o) => return o.parent().map(Pvp),
             Fullbright | DynamicLights | OwnNameTag | HideBlockParticles | MouseTweaks | Sort
-            | AutoReconnect | NoAi | AgentControl | ReproKeys | Splitscreen | ChatAnimation
-            | WheelCyclesSettings | MusicPage | PackBrowser | CosmeticsMine | CosmeticsOthers
-            | CosmeticsHideFx | CosmeticsSolo | HorizonMarks | HorizonMe | Pregen => {
+            | AutoReconnect | NoAi | AgentControl | ReproKeys | DiscordPresence | Splitscreen
+            | ChatAnimation | WheelCyclesSettings | MusicPage | PackBrowser | CosmeticsMine
+            | CosmeticsOthers | CosmeticsHideFx | CosmeticsSolo | HorizonMarks | HorizonMe
+            | Pregen => {
                 return None;
             }
         })
@@ -833,6 +844,9 @@ impl Item {
             Item::NoAi => {
                 "Hides and turns off every AI feature: agent control, horizon-ctl and the MCP servers. The launcher's switch too."
             }
+            Item::DiscordPresence => {
+                "Shows Playing Horizon on your Discord profile while Discord runs: menus, single player or multiplayer, the dimension and the time played. Never a world's name or a server's address."
+            }
             Item::Splitscreen => {
                 "In a world, another controller can join as a new player: press A when it asks, then pick a profile and where to play."
             }
@@ -913,6 +927,7 @@ impl Item {
             Item::NoAi => e.no_ai,
             Item::AgentControl => e.agent_control,
             Item::ReproKeys => e.repro_keys,
+            Item::DiscordPresence => e.discord_presence,
             Item::Splitscreen => e.splitscreen,
             Item::WheelCyclesSettings => e.wheel_cycles_settings,
             Item::PackBrowser => e.pack_browser,
@@ -971,6 +986,7 @@ impl Item {
             Item::NoAi => e.no_ai = !e.no_ai,
             Item::AgentControl => e.agent_control = !e.agent_control,
             Item::ReproKeys => e.repro_keys = !e.repro_keys,
+            Item::DiscordPresence => e.discord_presence = !e.discord_presence,
             Item::Splitscreen => e.splitscreen = !e.splitscreen,
             Item::WheelCyclesSettings => e.wheel_cycles_settings = !e.wheel_cycles_settings,
             Item::PackBrowser => e.pack_browser = !e.pack_browser,
@@ -1088,7 +1104,7 @@ mod tests {
         assert!(!d.mouse_tweaks && !d.sort && !d.own_name_tag && !d.ui_sound_reserve);
         assert!(!d.hide_block_particles && !d.pregen);
         assert!(!d.music_page && d.music_off.is_empty());
-        assert!(!d.wheel_cycles_settings);
+        assert!(d.discord_presence && !d.wheel_cycles_settings);
         assert_eq!(Extras::parse(""), d);
         assert_eq!(Extras::parse(&d.serialize()), d);
         let mut e = d.clone();
@@ -1127,6 +1143,7 @@ mod tests {
         e.sort_key = "key.keyboard.r".into();
         e.chat_animation = true;
         e.chat_indicator = false;
+        e.discord_presence = false;
         assert!(!e.splitscreen);
         Item::Splitscreen.cycle(&mut e, false);
         assert_eq!(Item::Splitscreen.switch(&e), Some(true));

crates/horizon-client-render/src/gfx/hdr.rs

@@ -1001,14 +1001,12 @@ impl Hdr {
     }
 }
 
-/// The windows' icon (`window::set_icon_png`: Horizon's in the official game) as a 1-bit mask:
-/// its white strokes, one colour with hard edges, are the logo; everything else is not. No icon
-/// given: an empty mask.
+/// Horizon's icon (horizon-theme) as a 1-bit mask: its white strokes, one colour with hard
+/// edges, are the logo; everything else is not.
 fn logo_mask(device: &wgpu::Device, queue: &wgpu::Queue) -> wgpu::TextureView {
     use wgpu::util::DeviceExt;
-    let (w, h, rgba) = horizon_client_input::window::icon_png()
-        .and_then(|png| crate::hud::decode_bytes(png).ok())
-        .unwrap_or((1, 1, vec![0; 4]));
+    let (w, h, rgba) =
+        crate::hud::decode_bytes(horizon_theme::ICON_PNG).unwrap_or((1, 1, vec![0; 4]));
     let mask: Vec<u8> = rgba
         .as_chunks::<4>()
         .0

crates/horizon-client-render/src/graphics_style.rs

@@ -2,21 +2,16 @@
 //! colours and the controls it draws with. The screen (`graphics_ui`) only
 //! lays out rows and handles input; a menu theme replaces this module.
 //!
-//! Its colours come from `menu_style`, given at startup (in the official game the design
-//! system's Blocks palette, `docs/design-system.md`), in a lighter form: square panels of
-//! dark glass with a thin edge, so the world shows through, flat controls, and the face on
-//! the one main button, in vanilla's font.
-use crate::menu_style::{self, SettingsColours};
+//! It takes the design system's Blocks palette (`horizon_theme::BLOCKS_DARK`,
+//! `docs/design-system.md`) in a lighter form: square panels of dark glass
+//! with a thin edge, so the world shows through, flat controls, and the violet
+//! face on the one main button, in vanilla's font.
 use crate::{
     hud::{HudAtlas, HudBatch},
     text::Text,
     ui,
 };
-
-/// The settings pages' colours (`menu_style`, given at startup).
-fn b() -> &'static SettingsColours {
-    &menu_style::get().settings
-}
+use horizon_theme::BLOCKS_DARK as B;
 
 /// What a setting costs in frame time, shown with its description.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -41,91 +36,54 @@ impl Cost {
     /// `0xRRGGBB`: the palette's success, warn and danger.
     pub fn rgb(self) -> u32 {
         match self {
-            Cost::None => b().ink_soft,
-            Cost::Low | Cost::Saves => b().success,
-            Cost::Medium => b().warn,
-            Cost::High => b().danger,
+            Cost::None => B.ink_soft,
+            Cost::Low | Cost::Saves => B.success,
+            Cost::Medium => B.warn,
+            Cost::High => B.danger,
         }
     }
 }
 
-use menu_style::hud_colour as hex;
+/// `0xRRGGBB` and an alpha in the HUD's colour encoding.
+const fn hex(c: u32, a: u8) -> u32 {
+    (a as u32) << 24 | (c & 0xff) << 16 | (c >> 8 & 0xff) << 8 | (c >> 16 & 0xff)
+}
 /// The plate and the strip: the page's dark, see-through, so the world shows behind them.
-fn glass() -> u32 {
-    hex(b().page, 118)
-}
+const GLASS: u32 = hex(B.page, 118);
 /// Their 1 px edge.
-pub fn edge() -> u32 {
-    hex(b().ink, 26)
-}
+const EDGE: u32 = hex(B.ink, 26);
 /// A group's panel, a little lighter than the plate it sits on.
-fn group_fill() -> u32 {
-    hex(b().ink, 11)
-}
+const GROUP: u32 = hex(B.ink, 11);
 /// A hovered or focused row, lit on its group's panel.
-pub fn hover() -> u32 {
-    hex(b().ink, 18)
-}
+pub const HOVER: u32 = hex(B.ink, 18);
 /// The open page in the page list.
-pub fn open() -> u32 {
-    hex(b().ink, 26)
-}
+pub const OPEN: u32 = hex(B.ink, 26);
 /// The rule under the plate's heading, and between two rows of a group.
-pub fn head_rule() -> u32 {
-    hex(b().ink, 31)
-}
-pub fn row_rule() -> u32 {
-    hex(b().ink, 15)
-}
+pub const HEAD_RULE: u32 = hex(B.ink, 31);
+pub const ROW_RULE: u32 = hex(B.ink, 15);
 /// Fields, boxes and the value stepper: sunk, see-through.
-fn well_fill() -> u32 {
-    hex(b().outline, 102)
-}
+const WELL: u32 = hex(B.outline, 102);
 /// A button, a slider's track, the scroller's thumb.
-fn button_fill() -> u32 {
-    hex(b().ink, 20)
-}
-fn button_hover() -> u32 {
-    hex(b().ink, 41)
-}
-fn track_fill() -> u32 {
-    hex(b().ink, 64)
-}
-fn handle_fill() -> u32 {
-    hex(b().ink, 255)
-}
+const BUTTON: u32 = hex(B.ink, 20);
+const BUTTON_HOVER: u32 = hex(B.ink, 41);
+const TRACK: u32 = hex(B.ink, 64);
+const HANDLE: u32 = hex(B.ink, 255);
 /// The one main button.
-pub fn face() -> u32 {
-    hex(b().face, 255)
-}
-fn face_hover() -> u32 {
-    hex(b().face_hover, 255)
-}
+const FACE: u32 = hex(B.face, 255);
+const FACE_HOVER: u32 = hex(0x6a50e6, 255);
 /// A tick box's edge when off.
-fn box_edge() -> u32 {
-    hex(b().ink_soft, 89)
-}
-fn outline() -> u32 {
-    hex(b().outline, 255)
-}
-pub fn accent() -> u32 {
-    hex(b().accent, 255)
-}
+const BOX_EDGE: u32 = hex(B.ink_soft, 89);
+const OUTLINE: u32 = hex(B.outline, 255);
+pub const ACCENT: u32 = hex(B.accent, 255);
 /// Vanilla's white text, and its grey for what can't be used now.
 pub const WHITE: u32 = u32::MAX;
-pub fn muted() -> u32 {
-    hex(b().muted, 255)
-}
+pub const MUTED: u32 = hex(B.muted, 255);
 /// A page that isn't open, a value at rest.
-pub fn soft() -> u32 {
-    hex(b().ink_soft, 255)
-}
+pub const SOFT: u32 = hex(B.ink_soft, 255);
 /// Vanilla's grey for a tooltip's lines under its first (`ChatFormatting.GRAY`).
 pub const GREY: u32 = hex(0xaaaaaa, 255);
 /// A light veil over the backdrop, under the panels.
-pub fn veil() -> u32 {
-    hex(b().page, 77)
-}
+pub const VEIL: u32 = hex(B.page, 77);
 
 /// Sizes in GUI pixels.
 /// Shorter screens than this (a 720p window at scale 3) keep a narrower margin on top.
@@ -162,21 +120,21 @@ pub fn ring(batch: &mut HudBatch, atlas: &HudAtlas, [x, y, w, h]: [f32; 4], colo
 }
 /// The screen's plate, and the strip under it: dark glass with a thin edge.
 pub fn panel(batch: &mut HudBatch, atlas: &HudAtlas, rect: [f32; 4]) {
-    fill(batch, atlas, rect, glass());
-    ring(batch, atlas, rect, edge());
+    fill(batch, atlas, rect, GLASS);
+    ring(batch, atlas, rect, EDGE);
 }
 /// A group's panel on the plate, its rows on it.
 pub fn group(batch: &mut HudBatch, atlas: &HudAtlas, rect: [f32; 4]) {
-    fill(batch, atlas, rect, group_fill());
+    fill(batch, atlas, rect, GROUP);
 }
 /// A sunk well: the search field, the value stepper.
 pub fn well(batch: &mut HudBatch, atlas: &HudAtlas, rect: [f32; 4]) {
-    fill(batch, atlas, rect, well_fill());
+    fill(batch, atlas, rect, WELL);
 }
 /// The scroller: a faint track and its thumb.
 pub fn scroller(batch: &mut HudBatch, atlas: &HudAtlas, track: [f32; 4], thumb: [f32; 4]) {
-    fill(batch, atlas, track, row_rule());
-    fill(batch, atlas, thumb, track_fill());
+    fill(batch, atlas, track, ROW_RULE);
+    fill(batch, atlas, thumb, TRACK);
 }
 /// `text` cut to `width` with an ellipsis, as a long name gives way to its control: the HUD
 /// kit's `fit::ellipsize`.
@@ -184,11 +142,11 @@ pub use crate::hud_kit::fit::ellipsize as fit;
 /// A 12 px tick box ending at `right`, centred in the row at `y`: its edge in the accent when on.
 pub fn checkbox(batch: &mut HudBatch, atlas: &HudAtlas, right: f32, y: f32, on: bool, live: bool) {
     let rect = [right - 12.0, y + 4.0, 12.0, 12.0];
-    fill(batch, atlas, rect, well_fill());
+    fill(batch, atlas, rect, WELL);
     let edge = match (on, live) {
-        (true, true) => accent(),
-        (true, false) => muted(),
-        (false, _) => box_edge(),
+        (true, true) => ACCENT,
+        (true, false) => MUTED,
+        (false, _) => BOX_EDGE,
     };
     ring(batch, atlas, rect, edge);
     if on {
@@ -211,7 +169,7 @@ fn tick(batch: &mut HudBatch, atlas: &HudAtlas, x: f32, y: f32, color: u32) {
         for (i, c) in row.chars().enumerate() {
             if c == '#' {
                 let (px, py) = (x + i as f32, y + j as f32);
-                fill(batch, atlas, [px + 1.0, py + 1.0, 1.0, 1.0], outline());
+                fill(batch, atlas, [px + 1.0, py + 1.0, 1.0, 1.0], OUTLINE);
                 fill(batch, atlas, [px, py, 1.0, 1.0], color);
             }
         }
@@ -240,17 +198,17 @@ pub fn button_with_room(
 ) {
     let [x, y, w, h] = rect;
     let face = match (live, primary, hover) {
-        (false, _, _) => well_fill(),
-        (true, true, false) => face(),
-        (true, true, true) => face_hover(),
-        (true, false, false) => button_fill(),
-        (true, false, true) => button_hover(),
+        (false, _, _) => WELL,
+        (true, true, false) => FACE,
+        (true, true, true) => FACE_HOVER,
+        (true, false, false) => BUTTON,
+        (true, false, true) => BUTTON_HOVER,
     };
     fill(batch, atlas, rect, face);
     if hover && live {
         ring(batch, atlas, rect, WHITE);
     }
-    let color = if live { WHITE } else { muted() };
+    let color = if live { WHITE } else { MUTED };
     let ty = y + ((h - 8.0) / 2.0).floor();
     let left = x + 2.0 + room;
     scrolling_label(
@@ -294,7 +252,7 @@ pub fn slider(
     (hover, live): (bool, bool),
 ) {
     let [x, y, w, h] = rect;
-    let color = if live { WHITE } else { muted() };
+    let color = if live { WHITE } else { MUTED };
     scrolling_label(
         batch,
         atlas,
@@ -305,22 +263,17 @@ pub fn slider(
     );
     let line = y + h - 3.0;
     let at = x + (position.clamp(0.0, 1.0) * (w - 4.0)).round();
-    fill(batch, atlas, [x, line, w, 2.0], track_fill());
+    fill(batch, atlas, [x, line, w, 2.0], TRACK);
     fill(
         batch,
         atlas,
         [x, line, at - x, 2.0],
-        if live { accent() } else { muted() },
+        if live { ACCENT } else { MUTED },
     );
     let handle = [at, line - 3.0, 4.0, 8.0];
-    fill(
-        batch,
-        atlas,
-        handle,
-        if live { handle_fill() } else { muted() },
-    );
+    fill(batch, atlas, handle, if live { HANDLE } else { MUTED });
     if hover && live {
-        ring(batch, atlas, [at - 1.0, line - 4.0, 6.0, 10.0], accent());
+        ring(batch, atlas, [at - 1.0, line - 4.0, 6.0, 10.0], ACCENT);
     }
 }
 /// A value that a press steps through: in a well, between the arrows that say so.
@@ -337,13 +290,13 @@ pub fn cycler(
         ring(batch, atlas, rect, WHITE);
     }
     let ty = y + ((h - 8.0) / 2.0).floor();
-    let arrows = if hover && live { WHITE } else { muted() };
+    let arrows = if hover && live { WHITE } else { MUTED };
     batch.text_styled(atlas, &Text::literal("<"), x + 3.0, ty, arrows, true);
     batch.text_styled(atlas, &Text::literal(">"), x + w - 8.0, ty, arrows, true);
     let color = match (live, hover) {
-        (false, _) => muted(),
+        (false, _) => MUTED,
         (true, true) => WHITE,
-        (true, false) => soft(),
+        (true, false) => SOFT,
     };
     scrolling_label(batch, atlas, value, [x + 9.0, ty, w - 18.0], (y, h), color);
 }

crates/horizon-client-render/src/hud_kit/motion.rs

@@ -3,9 +3,8 @@
 //! where a tween is at the frame's [`Clock`]; nothing here holds state or runs on its own, and
 //! no motion ever decides what input does.
 //!
-//! A [`Tween`] takes a duration and a CSS `cubic-bezier` curve: Horizon's overlays use the design
-//! system's (`horizon_theme::QUICK`, `MOVE`), at the theme's duration or a shorter one of their
-//! own.
+//! The curves are the design system's (`horizon_theme::QUICK`, `MOVE`): a [`Tween`] takes one
+//! of them, at the theme's duration or a shorter one of its own.
 //!
 //! The game builds the clock once a frame (`Clock::new(now, still)`). A still clock (the game is
 //! paused, frame-stepped by `HORIZON_STILL` or a screenshot sequence, or a repro recording or
@@ -17,7 +16,7 @@
 //! use std::time::{Duration, Instant};
 //!
 //! let opened = Instant::now();
-//! let open = Tween::new(Duration::from_millis(90), [0.4, 0.0, 0.2, 1.0]);
+//! let open = Tween::new(Duration::from_millis(90), horizon_theme::QUICK);
 //! // Half way through: partly faded in, partly grown from 94%.
 //! let clock = Clock::new(opened + Duration::from_millis(45), false);
 //! let alpha = motion::fade(open, clock, opened);
@@ -27,6 +26,7 @@
 //! let still = Clock::new(opened, true);
 //! assert_eq!(motion::fade(open, still, opened), 1.0);
 //! ```
+use horizon_theme::Motion;
 use std::time::{Duration, Instant};
 
 /// The time a frame shows, built once a frame by the game.
@@ -50,20 +50,28 @@ impl Clock {
     }
 }
 
-/// A duration and an easing curve.
+/// A duration and one of the design system's easing curves.
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct Tween {
     /// How long it runs.
     pub duration: Duration,
-    /// The CSS `cubic-bezier` control points of its curve.
+    /// The CSS `cubic-bezier` control points of its curve (a `horizon_theme::Motion`'s).
     pub curve: [f32; 4],
 }
 
 impl Tween {
-    /// `curve` over `duration`: the dial's motions are shorter than the launcher's, on the same
-    /// curves.
-    pub const fn new(duration: Duration, curve: [f32; 4]) -> Self {
-        Self { duration, curve }
+    /// `motion`'s curve over `duration`: the dial's motions are shorter than the launcher's, on
+    /// the same curves.
+    pub const fn new(duration: Duration, motion: Motion) -> Self {
+        Self {
+            duration,
+            curve: motion.curve,
+        }
+    }
+
+    /// A theme motion as it is: its own duration and curve.
+    pub const fn of(motion: Motion) -> Self {
+        Self::new(motion.duration(), motion)
     }
 
     /// The linear progress, 0 to 1, `since` a start at this clock; 1 on a still clock.
@@ -76,7 +84,7 @@ impl Tween {
 
     /// The eased progress, 0 to 1, on the tween's curve.
     pub fn progress(self, clock: Clock, since: Instant) -> f32 {
-        bezier(self.curve, self.linear(clock, since))
+        horizon_theme::bezier(self.curve, self.linear(clock, since))
     }
 
     /// Whether it has finished (always, on a still clock).
@@ -90,29 +98,6 @@ impl Tween {
     }
 }
 
-/// A CSS `cubic-bezier(x1, y1, x2, y2)` at `t` in 0..1: solves x for the curve parameter,
-/// returns y.
-pub fn bezier([x1, y1, x2, y2]: [f32; 4], t: f32) -> f32 {
-    let t = t.clamp(0.0, 1.0);
-    if t == 0.0 || t == 1.0 {
-        return t;
-    }
-    let at = |a: f32, b: f32, s: f32| {
-        let u = 1.0 - s;
-        3.0 * u * u * s * a + 3.0 * u * s * s * b + s * s * s
-    };
-    let (mut lo, mut hi) = (0f32, 1f32);
-    for _ in 0..24 {
-        let mid = (lo + hi) / 2.0;
-        if at(x1, x2, mid) < t {
-            lo = mid;
-        } else {
-            hi = mid;
-        }
-    }
-    at(y1, y2, (lo + hi) / 2.0)
-}
-
 /// An alpha from 0 to 1 as something fades in.
 pub fn fade(tween: Tween, clock: Clock, since: Instant) -> f32 {
     tween.progress(clock, since)
@@ -160,7 +145,7 @@ mod tests {
     #[test]
     fn a_tween_runs_from_its_start_to_its_end_and_holds() {
         let t0 = Instant::now();
-        let tween = Tween::new(MS(80), horizon_theme::MOVE.curve);
+        let tween = Tween::new(MS(80), horizon_theme::MOVE);
         assert_eq!(tween.progress(at(t0, 0), t0), 0.0);
         assert_eq!(tween.progress(at(t0, 80), t0), 1.0);
         assert_eq!(tween.progress(at(t0, 500), t0), 1.0);
@@ -175,7 +160,8 @@ mod tests {
     fn a_still_clock_shows_every_motion_settled() {
         let t0 = Instant::now();
         let still = Clock::new(t0, true);
-        let tween = Tween::new(horizon_theme::QUICK.duration(), horizon_theme::QUICK.curve);
+        let tween = Tween::of(horizon_theme::QUICK);
+        assert_eq!(tween.duration, horizon_theme::QUICK.duration());
         assert_eq!(fade(tween, still, t0), 1.0);
         assert_eq!(fade_out(tween, still, t0), 0.0);
         assert_eq!(scale_in(tween, still, t0, 0.94), 1.0);
@@ -187,7 +173,7 @@ mod tests {
     #[test]
     fn the_helpers_start_where_they_say() {
         let t0 = Instant::now();
-        let tween = Tween::new(MS(100), horizon_theme::QUICK.curve);
+        let tween = Tween::new(MS(100), horizon_theme::QUICK);
         let c = at(t0, 0);
         assert_eq!(fade(tween, c, t0), 0.0);
         assert_eq!(fade_out(tween, c, t0), 1.0);
@@ -198,25 +184,10 @@ mod tests {
         assert!((flash(tween, at(t0, 25), t0) - 0.75).abs() < 1e-6);
     }
 
-    #[test]
-    fn the_curve_is_the_design_systems() {
-        for motion in horizon_theme::MOTION {
-            for i in 0..=20 {
-                let t = i as f32 / 20.0;
-                assert_eq!(
-                    bezier(motion.curve, t),
-                    motion.ease(t),
-                    "{} at {t}",
-                    motion.name
-                );
-            }
-        }
-    }
-
     #[test]
     fn a_turn_takes_the_short_way_round() {
         let t0 = Instant::now();
-        let tween = Tween::new(MS(80), horizon_theme::MOVE.curve);
+        let tween = Tween::new(MS(80), horizon_theme::MOVE);
         // From up-left (7/8 of a turn) to up-right: through up, not round the bottom.
         let from = 7.0 * FRAC_PI_4;
         let half = turn(tween, at(t0, 1), t0, from, FRAC_PI_4);

crates/horizon-client-render/src/hud_kit/tabs.rs

@@ -38,12 +38,6 @@
 //! ```
 use crate::hud::{HudAtlas, HudBatch};
 use crate::hud_kit::{colour, fit};
-use crate::menu_style::{self, OverlayColours};
-
-/// The overlays' colours (`menu_style`, given at startup).
-fn overlay() -> &'static OverlayColours {
-    &menu_style::get().overlay
-}
 
 /// A pip under the strip: its size and the step from one to the next, in GUI px.
 pub const PIP: [f32; 2] = [3.0, 2.0];
@@ -51,12 +45,8 @@ pub const PIP_STEP: f32 = 5.0;
 /// How far, in GUI px, the arrows sit from the name.
 pub const ARROW_GAP: f32 = 4.0;
 /// An arrow with a page that way, and one at an end, with none.
-pub fn arrow_colour() -> u32 {
-    colour(overlay().backdrop_muted, 255)
-}
-pub fn arrow_off_colour() -> u32 {
-    colour(overlay().backdrop_muted, 77)
-}
+pub const ARROW: u32 = colour(horizon_theme::BACKDROP_MUTED, 255);
+pub const ARROW_OFF: u32 = colour(horizon_theme::BACKDROP_MUTED, 77);
 /// The pips (the selected one is white).
 pub const PIP_OFF: u32 = colour(0xFFFFFF, 89);
 pub const PIP_ON: u32 = colour(0xFFFFFF, 255);
@@ -75,15 +65,9 @@ pub const EDGE_FADE: f32 = 12.0;
 pub const FADE: [f32; 5] = [1.0, 0.7, 0.35, 0.15, 0.1];
 /// The selected tab's fill and text, and the others'.
 pub const SELECTED_FILL: u32 = colour(0xFFFFFF, 242);
-pub fn selected_text() -> u32 {
-    colour(overlay().page, 255)
-}
-pub fn tab_fill() -> u32 {
-    colour(overlay().page, 191)
-}
-pub fn tab_text() -> u32 {
-    colour(overlay().backdrop_muted, 255)
-}
+pub const SELECTED_TEXT: u32 = colour(horizon_theme::DARK.page, 255);
+pub const TAB_FILL: u32 = colour(horizon_theme::DARK.page, 191);
+pub const TAB_TEXT: u32 = colour(horizon_theme::BACKDROP_MUTED, 255);
 /// The line of text's height in GUI px (vanilla's font, without its shadow).
 const LINE: f32 = 8.0;
 
@@ -160,11 +144,7 @@ pub fn draw(batch: &mut HudBatch, atlas: &HudAtlas, strip: &Strip) {
             arrow,
             ax,
             ay,
-            if on {
-                arrow_colour()
-            } else {
-                arrow_off_colour()
-            },
+            if on { ARROW } else { ARROW_OFF },
             true,
         );
     }
@@ -302,9 +282,9 @@ pub fn draw_tabs(batch: &mut HudBatch, atlas: &HudAtlas, strip: &TabStrip, alpha
     for tab in &row.tabs {
         let [tx, ty, tw, th] = tab.area;
         let (fill, text) = if tab.selected {
-            (SELECTED_FILL, selected_text())
+            (SELECTED_FILL, SELECTED_TEXT)
         } else {
-            (tab_fill(), tab_text())
+            (TAB_FILL, TAB_TEXT)
         };
         let tab_start = batch.vertices.len();
         // Cut where the edges' fades start, so each fade runs over its own piece.
@@ -400,16 +380,15 @@ mod tests {
             let [ax, _] = strip.arrows[i];
             (batch.vertices.iter())
                 .filter(|v| {
-                    (v.pos[0] - ax).abs() < 4.0
-                        && v.color & 0x00FF_FFFF == arrow_colour() & 0x00FF_FFFF
+                    (v.pos[0] - ax).abs() < 4.0 && v.color & 0x00FF_FFFF == ARROW & 0x00FF_FFFF
                 })
                 .map(|v| v.color >> 24)
                 .max()
                 .unwrap_or(0)
         };
         let first = collapsed(&atlas, &pages, 0, AREA);
-        assert_eq!(alpha(&first, 0), arrow_off_colour() >> 24);
-        assert_eq!(alpha(&first, 1), arrow_colour() >> 24);
+        assert_eq!(alpha(&first, 0), ARROW_OFF >> 24);
+        assert_eq!(alpha(&first, 1), ARROW >> 24);
     }
 
     #[test]

crates/horizon-client-render/src/lib.rs

@@ -74,7 +74,6 @@ pub mod light;
 pub mod lod;
 pub mod logging;
 pub mod menu_blur;
-pub mod menu_style;
 pub mod mesher;
 pub mod minimap;
 pub mod mipmap;

crates/horizon-client-render/src/menu_style.rs

@@ -1,145 +0,0 @@
-//! The look of the screens vanilla doesn't have that the engine still draws: the settings pages
-//! (`graphics_style`), the HUD kit's tab strip, and the overlays drawn with `ui_theme` (the
-//! on-screen keyboard, the boot screen, the missing-resources window). Vanilla's screens never
-//! read it.
-//!
-//! The layer above gives it once at startup ([`install`]), before the first frame; the
-//! official game gives Horizon's design system (`docs/design-system.md`). With none given, the
-//! screens draw in [`NEUTRAL`]: vanilla's greys and chat colours, and no text where they would
-//! use their own fonts. A read is one atomic load, and only those screens make it.
-use std::sync::OnceLock;
-
-/// Colours as `0xRRGGBB`, sizes in dp (the launcher's logical pixels).
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct MenuStyle {
-    pub settings: SettingsColours,
-    pub overlay: OverlayColours,
-    pub sizes: Sizes,
-    /// The overlays' TrueType faces; none: they draw no text.
-    pub fonts: Option<Fonts>,
-}
-
-/// The settings pages: square panels of dark glass over the world, flat controls, one face.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct SettingsColours {
-    /// The plate behind everything, drawn see-through.
-    pub page: u32,
-    /// Text, and the light the panels, rules, hovers and controls are drawn in.
-    pub ink: u32,
-    /// Secondary text and values.
-    pub ink_soft: u32,
-    /// Labels, descriptions, what can't be used.
-    pub muted: u32,
-    /// Wells and the dark edge of small marks.
-    pub outline: u32,
-    /// Focus, a checked box, a slider's fill.
-    pub accent: u32,
-    /// The one main button, and while hovered.
-    pub face: u32,
-    pub face_hover: u32,
-    pub success: u32,
-    pub warn: u32,
-    pub danger: u32,
-}
-
-/// Overlays drawn over the game (the HUD kit's tab strip, `ui_theme`'s overlays).
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct OverlayColours {
-    /// The dark page under text and tabs.
-    pub page: u32,
-    /// Muted text over a veiled backdrop.
-    pub backdrop_muted: u32,
-    /// Text and the light hover and pressed plates are drawn in.
-    pub ink: u32,
-    /// Secondary text and values.
-    pub ink_soft: u32,
-    /// One-pixel rules between rows.
-    pub rule: u32,
-    /// The main action, and its text.
-    pub accent: u32,
-    pub on_accent: u32,
-}
-
-/// `ui_theme`'s type scale and shapes, in dp.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Sizes {
-    pub caption: f32,
-    pub label: f32,
-    pub ui: f32,
-    pub body: f32,
-    pub title: f32,
-    /// The boot screen's wordmark at its smallest, and its console lines.
-    pub display: f32,
-    pub micro: f32,
-    /// Fields; plates (hover rows, selection); a large control's height.
-    pub radius: f32,
-    pub radius_plate: f32,
-    pub control_large: f32,
-}
-
-/// TrueType faces (`ui_theme::Face`).
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct Fonts {
-    pub regular: &'static [u8],
-    pub medium: &'static [u8],
-    pub semibold: &'static [u8],
-    pub mono: &'static [u8],
-}
-
-/// The look with nothing given: vanilla's greys and chat colours.
-pub const NEUTRAL: MenuStyle = MenuStyle {
-    settings: SettingsColours {
-        page: 0x101010,
-        ink: 0xffffff,
-        ink_soft: 0xe0e0e0,
-        muted: 0xa0a0a0,
-        outline: 0x000000,
-        accent: 0xffffff,
-        face: 0x555555,
-        face_hover: 0x6f6f6f,
-        success: 0x55ff55,
-        warn: 0xffff55,
-        danger: 0xff5555,
-    },
-    overlay: OverlayColours {
-        page: 0x101010,
-        backdrop_muted: 0xa0a0a0,
-        ink: 0xffffff,
-        ink_soft: 0xe0e0e0,
-        rule: 0x303030,
-        accent: 0xffffff,
-        on_accent: 0x000000,
-    },
-    sizes: Sizes {
-        caption: 12.0,
-        label: 13.0,
-        ui: 14.0,
-        body: 15.0,
-        title: 28.0,
-        display: 44.0,
-        micro: 11.0,
-        radius: 0.0,
-        radius_plate: 0.0,
-        control_large: 40.0,
-    },
-    fonts: None,
-};
-
-static STYLE: OnceLock<MenuStyle> = OnceLock::new();
-
-/// Give the menus their look: call it once at startup. A second call keeps the first look and
-/// returns false.
-pub fn install(style: MenuStyle) -> bool {
-    STYLE.set(style).is_ok()
-}
-
-/// The look given to [`install`], or [`NEUTRAL`].
-#[inline]
-pub fn get() -> &'static MenuStyle {
-    STYLE.get().unwrap_or(&NEUTRAL)
-}
-
-/// `0xRRGGBB` and an alpha in the HUD's colour encoding (`0xAABBGGRR`).
-pub const fn hud_colour(rgb: u32, alpha: u8) -> u32 {
-    (alpha as u32) << 24 | (rgb & 0xff) << 16 | (rgb >> 8 & 0xff) << 8 | (rgb >> 16 & 0xff)
-}

crates/horizon-client-render/src/options_ui_pages.rs

@@ -124,15 +124,21 @@ impl OptionsUi {
                 Some(open("horizon.pages.open.studio", Page::Studio)),
             ),
             // No AI hides the AI Agent page and everything AI.
-            if s.extras.no_ai {
-                Row::Buttons(self.extra_button(s, crate::extras::Item::NoAi), None)
-            } else {
-                Row::Buttons(
-                    open("horizon.pages.open.agent", Page::Agent),
-                    Some(self.extra_button(s, crate::extras::Item::NoAi)),
-                )
-            },
-        ];
+            Row::Buttons(
+                self.extra_button(s, crate::extras::Item::DiscordPresence),
+                Some(if s.extras.no_ai {
+                    self.extra_button(s, crate::extras::Item::NoAi)
+                } else {
+                    open("horizon.pages.open.agent", Page::Agent)
+                }),
+            ),
+        ]
+        .into_iter()
+        .chain(
+            (!s.extras.no_ai)
+                .then(|| Row::Buttons(self.extra_button(s, crate::extras::Item::NoAi), None)),
+        )
+        .collect();
         self.added_entries(&mut rows);
         rows
     }

crates/horizon-client-render/src/poi_sections.rs

@@ -7,10 +7,7 @@
 //! sections are immutable behind `Arc` and edited through `Arc::make_mut`, so
 //! a weak reference tells an edited or replaced section from the one the list
 //! was built from (see `random_tick_sections`), without keeping its blocks.
-use crate::{
-    chunk::{Chunk, Section},
-    fast_hash::FxHashMap,
-};
+use crate::{chunk::Section, fast_hash::FxHashMap};
 use std::sync::{Arc, Mutex, Weak};
 
 /// A section's POIs: the block index in the section (`y << 8 | z << 4 | x`)
@@ -21,16 +18,13 @@ struct Cached<T> {
     section: Weak<Section>,
     pois: SectionPois<T>,
 }
-/// Cached POI lists by chunk column `(chunk x, chunk z)`, each by section
-/// index: a search through a column looks it up once.
+/// Cached POI lists by section, `(chunk x, section index, chunk z)`.
 pub struct PoiSections<T> {
     sections: Mutex<Lists<T>>,
 }
 struct Lists<T> {
-    by_column: FxHashMap<(i32, i32), Vec<Option<Cached<T>>>>,
-    /// How many section lists are kept, and the count above which the lists
-    /// of sections no longer resident are dropped.
-    len: usize,
+    by_section: FxHashMap<(i32, i32, i32), Cached<T>>,
+    /// Size above which lists of sections no longer resident are dropped.
     prune_at: usize,
 }
 const MIN_PRUNE: usize = 4096;
@@ -38,61 +32,27 @@ impl<T> Default for PoiSections<T> {
     fn default() -> Self {
         Self {
             sections: Mutex::new(Lists {
-                by_column: FxHashMap::default(),
-                len: 0,
+                by_section: FxHashMap::default(),
                 prune_at: MIN_PRUNE,
             }),
         }
     }
 }
-impl<T: Copy> Lists<T> {
-    /// The column's lists, for sections up to `last`, after dropping the
-    /// lists of sections no longer resident if there are too many.
-    fn column(
-        &mut self,
-        column: (i32, i32),
-        last: usize,
-    ) -> (&mut [Option<Cached<T>>], &mut usize) {
-        if self.len >= self.prune_at {
-            self.prune();
+impl<T: Copy> PoiSections<T> {
+    /// The POIs of `section`, whose block states `kind` classifies. `kind`
+    /// must give the same answer for a state on every call.
+    pub fn get(
+        &self,
+        key: (i32, i32, i32),
+        section: &Arc<Section>,
+        mut kind: impl FnMut(u32) -> Option<T>,
+    ) -> SectionPois<T> {
+        let mut lists = self.sections.lock().unwrap_or_else(|e| e.into_inner());
+        if let Some(cached) = lists.by_section.get(&key)
+            && cached.section.as_ptr() == Arc::as_ptr(section)
+        {
+            return cached.pois.clone();
         }
-        let lists = self.by_column.entry(column).or_default();
-        if lists.len() <= last {
-            lists.resize_with(last + 1, || None);
-        }
-        (lists, &mut self.len)
-    }
-
-    /// Drops the lists of sections no longer resident.
-    fn prune(&mut self) {
-        let mut len = 0;
-        self.by_column.retain(|_, lists| {
-            for c in lists.iter_mut() {
-                if c.as_ref().is_some_and(|c| c.section.strong_count() == 0) {
-                    *c = None;
-                }
-            }
-            let kept = lists.iter().filter(|c| c.is_some()).count();
-            len += kept;
-            kept > 0
-        });
-        self.len = len;
-        self.prune_at = (len * 2).max(MIN_PRUNE);
-    }
-}
-
-/// The POIs of `section` from `slot`, listed again (and kept there) unless
-/// `slot` was listed from this very section; `len` counts the slots filled.
-fn list<'a, T: Copy>(
-    slot: &'a mut Option<Cached<T>>,
-    len: &mut usize,
-    section: &Arc<Section>,
-    kind: &mut impl FnMut(u32) -> Option<T>,
-) -> &'a SectionPois<T> {
-    let fresh = slot
-        .as_ref()
-        .is_some_and(|c| c.section.as_ptr() == Arc::as_ptr(section));
-    if !fresh {
         let pois: SectionPois<T> = if section.blocks.maybe_has(|v| kind(v).is_some()) {
             let mut states = [0u32; 4096];
             section.unpack(&mut states);
@@ -104,56 +64,18 @@ fn list<'a, T: Copy>(
         } else {
             Arc::from([])
         };
-        *len += usize::from(slot.is_none());
-        *slot = Some(Cached {
-            section: Arc::downgrade(section),
-            pois,
-        });
-    }
-    &slot.as_ref().expect("just listed").pois
-}
-
-impl<T: Copy> PoiSections<T> {
-    /// The POIs of `section`, the `key.1`-th section of the column
-    /// `(key.0, key.2)`, whose block states `kind` classifies. `kind` must give
-    /// the same answer for a state on every call.
-    pub fn get(
-        &self,
-        key: (i32, i32, i32),
-        section: &Arc<Section>,
-        mut kind: impl FnMut(u32) -> Option<T>,
-    ) -> SectionPois<T> {
-        let mut lists = self.sections.lock().unwrap_or_else(|e| e.into_inner());
-        let s = usize::try_from(key.1).expect("a section index");
-        let (column, len) = lists.column((key.0, key.2), s);
-        list(&mut column[s], len, section, &mut kind).clone()
-    }
-
-    /// The POIs of `chunk` from block Y `y0` to `y1`, its first section at
-    /// `min_y`, as [`Self::get`] gives them: each section that has any, with
-    /// the Y of its lowest blocks, in order, put in `out`. One lookup of the
-    /// column.
-    pub fn column(
-        &self,
-        chunk: &Chunk,
-        min_y: i32,
-        (y0, y1): (i32, i32),
-        mut kind: impl FnMut(u32) -> Option<T>,
-        out: &mut Vec<(i32, SectionPois<T>)>,
-    ) {
-        out.clear();
-        let (first, last) = ((y0 - min_y) >> 4, (y1 - min_y) >> 4);
-        if first > last {
-            return;
-        }
-        let mut lists = self.sections.lock().unwrap_or_else(|e| e.into_inner());
-        let (slots, len) = lists.column((chunk.x, chunk.z), last as usize);
-        for s in first as usize..=last as usize {
-            let pois = list(&mut slots[s], len, &chunk.sections[s], &mut kind);
-            if !pois.is_empty() {
-                out.push((min_y + s as i32 * 16, pois.clone()));
-            }
+        if lists.by_section.len() >= lists.prune_at {
+            lists.by_section.retain(|_, c| c.section.strong_count() > 0);
+            lists.prune_at = (lists.by_section.len() * 2).max(MIN_PRUNE);
         }
+        lists.by_section.insert(
+            key,
+            Cached {
+                section: Arc::downgrade(section),
+                pois: pois.clone(),
+            },
+        );
+        pois
     }
 }
 
@@ -221,48 +143,6 @@ mod tests {
         assert!(index.get((0, 0, 0), &chunk.sections[0], kind).is_empty());
     }
 
-    /// A column gives each section's list as `get` does, the sections
-    /// without any left out, and keeps them until a section changes.
-    #[test]
-    fn a_column_gives_what_each_section_gives() {
-        let index = PoiSections::<u8>::default();
-        let kind = |v: u32| (v == 5).then_some(5);
-        let mut chunk = Arc::new(Chunk::empty(2, -3));
-        for (x, y, z) in [(1, MIN_Y + 2, 3), (4, MIN_Y + 40, 0), (0, MIN_Y + 41, 15)] {
-            Arc::make_mut(&mut chunk).set(x, y, z, 5);
-        }
-        let mut out = Vec::new();
-        index.column(&chunk, MIN_Y, (MIN_Y, MIN_Y + 63), kind, &mut out);
-        let bases: Vec<i32> = out.iter().map(|(base, _)| *base).collect();
-        assert_eq!(bases, [MIN_Y, MIN_Y + 32]);
-        for (base, pois) in &out {
-            let s = (base - MIN_Y) / 16;
-            let one = index.get((2, s, -3), &chunk.sections[s as usize], kind);
-            assert!(Arc::ptr_eq(pois, &one));
-        }
-        // Kept: no rescan.
-        index.column(
-            &chunk,
-            MIN_Y,
-            (MIN_Y, MIN_Y + 63),
-            |_| panic!("rescanned"),
-            &mut out,
-        );
-        assert_eq!(out.len(), 2);
-        // An edit lists that section again.
-        Arc::make_mut(&mut chunk).set(4, MIN_Y + 40, 0, 1);
-        let mut rescans = 0;
-        let counted = |v: u32| {
-            rescans += 1;
-            kind(v)
-        };
-        index.column(&chunk, MIN_Y, (MIN_Y + 20, MIN_Y + 63), counted, &mut out);
-        assert!(rescans > 0);
-        assert_eq!(out.len(), 1);
-        assert_eq!(out[0].0, MIN_Y + 32);
-        assert_eq!(&*out[0].1, &[(9 << 8 | 15 << 4, 5)]);
-    }
-
     #[test]
     fn unloaded_sections_are_dropped() {
         let index = PoiSections::<u8>::default();
@@ -273,7 +153,7 @@ mod tests {
             index.get((1, i, 0), &Arc::new(Section::default()), kind);
         }
         let lists = index.sections.lock().unwrap();
-        assert!(lists.len <= 2);
-        assert!(lists.by_column[&(0, 0)][0].is_some());
+        assert!(lists.by_section.len() <= 2);
+        assert!(lists.by_section.contains_key(&(0, 0, 0)));
     }
 }

crates/horizon-client-render/src/settings_shell.rs

@@ -237,17 +237,17 @@ impl<P: Copy, S: Copy> Lines<P, S> {
 pub(crate) fn backdrop(batch: &mut HudBatch, atlas: &HudAtlas, in_world: bool) {
     let (w, h) = (batch.width, batch.height);
     ui::menu_background(batch, atlas, 0.0, 0.0, w, h, in_world);
-    style::fill(batch, atlas, [0.0, 0.0, w, h], style::veil());
+    style::fill(batch, atlas, [0.0, 0.0, w, h], style::VEIL);
 }
 
 /// The mark and the screen's name over the search field.
 pub(crate) fn mark(batch: &mut HudBatch, atlas: &HudAtlas, cols: &Columns, title: &str) {
     let (x, y) = (cols.side_x, cols.side_y);
-    style::fill(batch, atlas, [x, y + 2.0, 6.0, 6.0], style::accent());
+    style::fill(batch, atlas, [x, y + 2.0, 6.0, 6.0], style::ACCENT);
     let horizon = Text::literal("Horizon");
     batch.text_styled(atlas, &horizon, x + 10.0, y, style::WHITE, true);
     let title = Text::literal(title);
-    batch.text_styled(atlas, &title, x, y + 10.0, style::muted(), true);
+    batch.text_styled(atlas, &title, x, y + 10.0, style::MUTED, true);
 }
 
 /// A page in the page list: the open page on a plate with the accent's bar beside it, the
@@ -273,13 +273,13 @@ pub(crate) fn page_tab(
         crate::widgets::target_as(rect, crate::widgets::Kind::Tab(open));
     }
     if open {
-        style::fill(batch, atlas, rect, style::open());
-        style::fill(batch, atlas, [px, py, 2.0, ph], style::accent());
+        style::fill(batch, atlas, rect, style::OPEN);
+        style::fill(batch, atlas, [px, py, 2.0, ph], style::ACCENT);
     }
     let color = match (open || hover, has) {
         (true, _) => style::WHITE,
-        (false, true) => style::soft(),
-        (false, false) => style::muted(),
+        (false, true) => style::SOFT,
+        (false, false) => style::MUTED,
     };
     let ty = py + ((ph - 8.0) / 2.0).floor();
     let name = Text::literal(style::fit(atlas, name, pw - 12.0));
@@ -312,12 +312,12 @@ pub(crate) fn search_field(
     search.draw(batch, atlas, None);
     if search.value.is_empty() && !focused {
         let hint = Text::literal(search.message.clone());
-        batch.text_styled(atlas, &hint, x + 5.0, search.y, style::muted(), true);
+        batch.text_styled(atlas, &hint, x + 5.0, search.y, style::MUTED, true);
     }
     if !search.value.is_empty() {
         let hover = ui::hovered(cursor, clear[0], clear[1], clear[2], clear[3]);
         crate::widgets::widget_cursor(hover, true);
-        let color = if hover { style::WHITE } else { style::muted() };
+        let color = if hover { style::WHITE } else { style::MUTED };
         let cy = y + ((h - 8.0) / 2.0).floor();
         ui::centered_text(
             batch,
@@ -344,7 +344,7 @@ pub(crate) fn plate(batch: &mut HudBatch, atlas: &HudAtlas, cols: &Columns, head
         batch,
         atlas,
         [px + 8.0, py + 24.0, pw - 16.0, 1.0],
-        style::head_rule(),
+        style::HEAD_RULE,
     );
 }
 
@@ -383,9 +383,9 @@ pub(crate) fn list<P: Copy, S: Copy>(
         }
         let Some(setting) = line.setting else {
             let (name, color, dy) = match line.group {
-                Some(("", _)) => (page_name(line.page), style::muted(), 3.0),
-                Some((name, _)) => (lang::get(name), style::muted(), 3.0),
-                None => (page_name(line.page), style::accent(), 4.0),
+                Some(("", _)) => (page_name(line.page), style::MUTED, 3.0),
+                Some((name, _)) => (lang::get(name), style::MUTED, 3.0),
+                None => (page_name(line.page), style::ACCENT, 4.0),
             };
             let name = Text::literal(name);
             batch.text_styled(atlas, &name, cols.list_x + 2.0, y + dy, color, true);
@@ -393,7 +393,7 @@ pub(crate) fn list<P: Copy, S: Copy>(
         };
         if !after_name {
             let rule = [cols.list_x + 8.0, y, cols.list_w - 16.0, 1.0];
-            style::fill(batch, atlas, rule, style::row_rule());
+            style::fill(batch, atlas, rule, style::ROW_RULE);
         }
         row(batch, setting, y);
     }
@@ -404,7 +404,7 @@ pub(crate) fn list<P: Copy, S: Copy>(
             &none,
             cols.list_x + 2.0,
             cols.top + 4.0,
-            style::muted(),
+            style::MUTED,
             true,
         );
     }
@@ -499,7 +499,7 @@ pub(crate) fn row(batch: &mut HudBatch, atlas: &HudAtlas, cols: &Columns, y: f32
     let active = live && (hover || focused || held);
     if active {
         let lit = [rect[0] + 2.0, y + 1.0, rect[2] - 4.0, style::ROW - 2.0];
-        style::fill(batch, atlas, lit, style::hover());
+        style::fill(batch, atlas, lit, style::HOVER);
     }
     crate::widgets::widget_cursor(hover, live);
     // The control socket's widget tree, the narrator and a controller's focus.
@@ -523,8 +523,8 @@ pub(crate) fn row(batch: &mut HudBatch, atlas: &HudAtlas, cols: &Columns, y: f32
     if live {
         crate::widgets::target_as(rect, kind);
     }
-    let color = if live { style::WHITE } else { style::muted() };
-    let soft = if live { style::soft() } else { style::muted() };
+    let color = if live { style::WHITE } else { style::MUTED };
+    let soft = if live { style::SOFT } else { style::MUTED };
     let ty = y + ((style::ROW - 8.0) / 2.0).floor();
     let lit = live && (hover || held);
     let left = rect[0] + style::INSET;
@@ -611,7 +611,7 @@ fn lit(batch: &mut HudBatch, atlas: &HudAtlas, [x, y, w, _]: [f32; 4]) {
         batch,
         atlas,
         [x + 2.0, y + 1.0, w - 4.0, style::ROW - 2.0],
-        style::hover(),
+        style::HOVER,
     );
 }
 
@@ -644,7 +644,7 @@ fn read_row(
     let room = rect[2] - 2.0 * style::INSET - name_w - 8.0;
     let value = style::fit(atlas, value, room);
     let vx = rect[0] + rect[2] - style::INSET - atlas.font.width(&value);
-    batch.text_styled(atlas, &Text::literal(value), vx, ty, style::soft(), true);
+    batch.text_styled(atlas, &Text::literal(value), vx, ty, style::SOFT, true);
     if focused {
         style::ring(
             batch,
@@ -749,7 +749,7 @@ fn pad_row(batch: &mut HudBatch, atlas: &HudAtlas, cols: &Columns, y: f32, view:
         batch.text_styled(atlas, &yellow(close), right.ceil(), ty, style::WHITE, true);
     }
     let left = rect[0] + style::INSET;
-    let color = if live { style::WHITE } else { style::muted() };
+    let color = if live { style::WHITE } else { style::MUTED };
     let shown = Text::literal(style::fit(atlas, name, chip[0] - 6.0 - left));
     batch.text_styled(atlas, &shown, left, ty, color, true);
     if focused {
@@ -799,7 +799,7 @@ fn side_lines(
         ];
         crate::widgets::record(line, rect, false);
         let shown = Text::literal(style::fit(atlas, line, rect[2]));
-        batch.text_styled(atlas, &shown, rect[0], rect[1], style::muted(), true);
+        batch.text_styled(atlas, &shown, rect[0], rect[1], style::MUTED, true);
     }
 }
 /// A line under the page list: its inset, and its height.
@@ -881,7 +881,7 @@ fn heading(batch: &mut HudBatch, atlas: &HudAtlas, text: &str, [x, y, w, _]: [f3
     let rect = [x + SIDE_INSET, y + HEADING_Y, w - 2.0 * SIDE_INSET, 8.0];
     crate::widgets::record(text, rect, false);
     let shown = Text::literal(style::fit(atlas, text, rect[2]));
-    batch.text_styled(atlas, &shown, rect[0], rect[1], style::muted(), true);
+    batch.text_styled(atlas, &shown, rect[0], rect[1], style::MUTED, true);
 }
 
 /// Vanilla's scroller, inside the panel's right edge, sized as `ui::Scroll` drags it.
@@ -1896,8 +1896,8 @@ impl<S: Screen> Shell<S> {
             // The row's page is open: lit as the list's open page is.
             if list.lit == Some(*shown) {
                 let row @ [x, y, _, h] = strip.area;
-                style::fill(batch, atlas, row, style::open());
-                style::fill(batch, atlas, [x, y, 2.0, h], style::accent());
+                style::fill(batch, atlas, row, style::OPEN);
+                style::fill(batch, atlas, [x, y, 2.0, h], style::ACCENT);
             }
             tabs::draw(batch, atlas, strip);
         }
@@ -2134,14 +2134,7 @@ impl<S: Screen> Shell<S> {
             crate::widgets::narratable(|| crate::widgets::Narratable::text(row.name.clone(), rect));
             let ty = y + ((style::ROW - 8.0) / 2.0).floor();
             let name = Text::literal(style::fit(atlas, &row.name, rect[2] - 2.0 * style::INSET));
-            batch.text_styled(
-                atlas,
-                &name,
-                rect[0] + style::INSET,
-                ty,
-                style::muted(),
-                true,
-            );
+            batch.text_styled(atlas, &name, rect[0] + style::INSET, ty, style::MUTED, true);
             return;
         }
         let over = |[x, y, w, h]: [f32; 4]| pointer.is_some_and(|at| ui::hovered(at, x, y, w, h));
@@ -2247,7 +2240,7 @@ impl<S: Screen> Shell<S> {
         // Labelled for the widget tree: what the strip says is what a test or an agent reads.
         crate::widgets::record(about, cols.dock, false);
         let color = if why.is_some() {
-            style::muted()
+            style::MUTED
         } else {
             style::GREY
         };

crates/horizon-client-render/src/studio_ui.rs

@@ -304,19 +304,19 @@ impl StudioUi {
 
                 // Card background & highlight
                 if is_selected {
-                    style::fill(batch, atlas, rect, style::open());
+                    style::fill(batch, atlas, rect, style::OPEN);
                 } else if is_hovered {
-                    style::fill(batch, atlas, rect, style::hover());
+                    style::fill(batch, atlas, rect, style::HOVER);
                 } else {
                     style::well(batch, atlas, rect);
                 }
 
                 let border_color = if is_selected {
-                    style::accent()
+                    style::ACCENT
                 } else if is_hovered {
                     style::WHITE
                 } else {
-                    style::row_rule()
+                    style::ROW_RULE
                 };
                 style::ring(batch, atlas, rect, border_color);
 

crates/horizon-client/Cargo.toml

@@ -119,11 +119,14 @@ audio = ["horizon-client-render/audio", "horizon-client-lib/audio"]
 controllers = ["horizon-client-lib/controllers", "dep:gilrs", "dep:horizon-dualsense", "horizon-client-input/controllers"]
 # Horizon's own extras over the vanilla game, for a fork that wants them out (docs/forking.md):
 # cosmetics and emotes, the "Horizon player" presence, the official server added to
-# the server list, the Horizon Settings and Mods pages and Play with Friends, and ray tracing on
-# request (`HORIZON_RAY_TRACING=1`). Players always get them; there is no switch. `grep -rn horizon-extras crates/` lists
+# the server list, the Horizon Settings and Mods pages, Discord and Play with Friends, and ray
+# tracing on request (`HORIZON_RAY_TRACING=1`). Players always get them; there is no switch. `grep -rn horizon-extras crates/` lists
 # every place it gates. Without it (`--no-default-features --features audio,controllers`) the
 # client is best effort: CI builds only the default.
-horizon-extras = ["horizon-client-render/horizon-extras", "friends"]
+horizon-extras = ["horizon-client-lib/horizon-extras", "horizon-client-render/horizon-extras", "discord", "friends"]
+# Online extras a server or a port can leave out; the server build has none of them. "Playing Horizon"
+# on Discord (game/discord.rs).
+discord = ["horizon-client-lib/discord"]
 # Play with Friends: sharing a world behind an invite code (game/friends.rs). Joining one is
 # horizon-friends' `game` side, which horizon-official registers (`horizon_hooks::tunnel`).
 friends = ["dep:horizon-friends"]

crates/horizon-client/src/client_lib.rs

@@ -17,8 +17,8 @@ pub use horizon_client_render::{
     containers, controller_ui, crash, custom_sky, datapack, dynamic_light, effects, environment,
     extras, fast_hash, fluid_render, fog, font, gfx, graphics, graphics_style, graphics_ui,
     hdr_calibration, hud, hud_kit, hud_layout, hud_overlays, inventory_effects, java_text,
-    jigsaw_block, json_folder, level_loading, light, lod, logging, menu_blur, menu_style, mesher,
-    minimap, mipmap, mod_browser, mod_list, model_library, models, multiline_edit, native_emissive,
+    jigsaw_block, json_folder, level_loading, light, lod, logging, menu_blur, mesher, minimap,
+    mipmap, mod_browser, mod_list, model_library, models, multiline_edit, native_emissive,
     options_file, options_fixes, options_ui, overlay, pack_browser, pack_formats, pack_hooks,
     pack_palette, pack_screen, packs, pad_cursor, pad_glyph, par, particles, poi_sections,
     polytone_creative_tabs, polytone_post, post_chain, potent_sulfur, preedit, providers, pvp,
@@ -58,6 +58,8 @@ pub mod debug_overlay;
 pub mod debugworld;
 pub mod dialog;
 pub mod dialog_screen;
+#[cfg(feature = "discord")]
+pub mod discord_presence;
 pub mod end_crystal;
 pub mod end_gateway;
 pub mod entities;

crates/horizon-client/src/discord_presence.rs

@@ -1,30 +1,21 @@
 //! Discord Rich Presence: "Playing Horizon" on the player's Discord profile, with what they are
 //! doing (docs/native-client.md). A thread of its own talks to the Discord app on this computer
 //! through its local IPC socket (Discord's RPC docs: `discord-ipc-N`, frames of opcode u32 LE +
-//! length u32 LE + JSON). The game says what the player does on each change ([`set`]), which wakes the thread,
+//! length u32 LE + JSON). The game only calls [`set`] each frame: a change wakes the thread,
 //! which connects when Discord runs, retries every 15 s when it doesn't, keeps under Discord's
 //! update limit and clears the activity on quit. Nothing is sent with the setting off,
-//! or with `HORIZON_NO_DISCORD=1`.
-//!
-//! A Horizon crate (docs/layers.md): the game tells it what the player does through the
-//! platform's hooks ([`HOOKS`]: `client_started`, `activity`, `shutdown`), which the official
-//! executable (`horizon-official`) registers with the switch: its line of `horizon-extras.txt`
-//! ([`SETTING`]) and its row in Extras' Multiplayer group ([`SECTION`]). horizon-client's own
-//! executable has no presence.
-#![forbid(unsafe_code)]
+//! or with `HORIZON_NO_DISCORD=1`. It uses nothing else of the game (docs/layers.md: Horizon layer):
+//! `game/discord.rs` says what the player does.
 use std::collections::VecDeque;
 use std::io::{self, Read, Write};
 use std::path::PathBuf;
-use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Condvar, Mutex, OnceLock};
 use std::thread::Thread;
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
 use serde_json::{Value, json};
 
-use horizon_platform::hooks::{self, Activity, Dimension, GameMode, Hooks, Play};
-use horizon_platform::pages::{Act, Label, Page, Place, Row};
-use horizon_platform::settings::Store;
+use horizon_command::args::GameMode;
 
 /// The "Horizon" application on Discord's developer portal (public: it names the game). Its
 /// Rich Presence assets: `horizon`, the logo.
@@ -49,141 +40,24 @@ const CLOSE: u32 = 2;
 const PING: u32 = 3;
 const PONG: u32 = 4;
 
-/// The presence's hooks, for `horizon_platform::hooks::register`.
-pub static HOOKS: Presence = Presence;
-
-pub struct Presence;
-
-impl Hooks for Presence {
-    /// Starts the presence thread with the game's window (never for a dedicated server).
-    fn client_started(&self, client: &hooks::Client) {
-        start(client.automated);
-    }
-
-    fn activity(&self, now: Activity) {
-        set(match now {
-            Activity::Menus => Status::Menus,
-            Activity::World {
-                play,
-                dimension,
-                mode,
-            } => Status::World {
-                play,
-                dimension,
-                mode,
-            },
-            // Anything a later game says that this crate doesn't know yet.
-            _ => Status::Off,
-        });
-    }
-
-    /// On quit: the activity is cleared.
-    fn shutdown(&self) {
-        stop();
-    }
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Dimension {
+    Overworld,
+    Nether,
+    End,
 }
 
-/// The switch's line in `horizon-extras.txt`, where the engine's Extras kept it before.
-const KEY: &str = "discordPresence";
-/// The switch's row, and what it says on hover.
-const LABEL: &str = "horizon.extras.discord_presence";
-const ABOUT: &str = "horizon.extras.discord_presence.tooltip";
-
-/// The switch (on by default). One presence per computer: the first splitscreen player's
-/// switch, in their settings, on their Extras page; the other players have none.
-static ON: AtomicBool = AtomicBool::new(true);
-
-/// Whether the player whose turn it is owns the switch: the first one.
-fn first_player() -> bool {
-    hooks::seat() == 0
-}
-
-/// Turns the presence on or off; off clears the activity at once.
-pub fn set_enabled(on: bool) {
-    ON.store(on, Ordering::Relaxed);
-    let mut shared = lock();
-    let status = shown(shared.game);
-    let changed = shared.wanted.update(status, unix_now());
-    drop(shared);
-    if let Some(thread) = THREAD.get().filter(|_| changed) {
-        thread.unpark();
-    }
-}
-
-pub fn enabled() -> bool {
-    ON.load(Ordering::Relaxed)
-}
-
-/// What Discord is told for the game's `status`: nothing with the switch off.
-fn shown(status: Status) -> Status {
-    if enabled() { status } else { Status::Off }
-}
-
-/// The switch's line of `horizon-extras.txt`, for `horizon_platform::settings::register`.
-pub static SETTING: Setting = Setting;
-
-pub struct Setting;
-
-impl Store for Setting {
-    fn file(&self) -> &'static str {
-        "horizon-extras.txt"
-    }
-    fn owns(&self, key: &str) -> bool {
-        key == KEY
-    }
-    fn load(&self, _key: &str, value: &str) {
-        if !first_player() {
-            return;
-        }
-        match value {
-            "true" => set_enabled(true),
-            "false" => set_enabled(false),
-            _ => {}
-        }
-    }
-    fn save(&self, line: &mut dyn FnMut(&str, &str)) {
-        if first_player() {
-            line(KEY, if enabled() { "true" } else { "false" });
-        }
-    }
-    fn is_default(&self) -> bool {
-        enabled() || !first_player()
-    }
-}
-
-/// The switch's row in the Extras page's Multiplayer group, for
-/// `horizon_platform::pages::register`.
-pub static SECTION: Section = Section;
-
-pub struct Section;
-
-impl Page for Section {
-    fn id(&self) -> &'static str {
-        "horizon-discord.extras"
-    }
-    fn title(&self) -> &'static str {
-        "horizon.extras.header.multiplayer"
-    }
-    fn place(&self) -> Place {
-        Place::Extras
-    }
-    fn rows(&self, rows: &mut Vec<Row>) {
-        if !first_player() {
-            return;
-        }
-        rows.push(Row::Toggle {
-            label: LABEL,
-            on: enabled(),
-        });
-    }
-    fn act(&self, row: usize, act: Act) {
-        if row == 0 && first_player() && matches!(act, Act::Press | Act::PressBack) {
-            set_enabled(!enabled());
-        }
-    }
-    fn tooltip(&self, _row: usize) -> Option<Label> {
-        Some(Label::Key(ABOUT))
-    }
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Play {
+    Singleplayer,
+    /// A server or someone else's LAN world. Its address and name are never shown.
+    Multiplayer,
+    /// This world is open to LAN or friends; `players` counts the host, `max` is how many
+    /// may join.
+    Hosting {
+        players: usize,
+        max: usize,
+    },
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -223,15 +97,11 @@ impl Wanted {
 }
 
 struct Shared {
-    /// What the game said last.
-    game: Status,
-    /// What Discord is to show: the game's, or nothing with the switch off.
     wanted: Wanted,
     stop: bool,
     stopped: bool,
 }
 static SHARED: Mutex<Shared> = Mutex::new(Shared {
-    game: Status::Menus,
     wanted: Wanted {
         status: Status::Menus,
         since: None,
@@ -244,8 +114,7 @@ static THREAD: OnceLock<Thread> = OnceLock::new();
 
 /// Starts the presence thread, once: when the game starts, never for a dedicated server.
 /// `automated` runs (offscreen, benchmarks) only talk to a test's fake Discord.
-/// The status [`set`] gave before, the switch included, is the first one sent.
-pub fn start(automated: bool) {
+pub fn start(enabled: bool, automated: bool) {
     let fake_discord = std::env::var_os(IPC_DIR_ENV).is_some();
     if THREAD.get().is_some()
         || std::env::var_os("HORIZON_NO_DISCORD").is_some_and(|v| v != "0")
@@ -253,6 +122,9 @@ pub fn start(automated: bool) {
     {
         return;
     }
+    if !enabled {
+        lock().wanted.status = Status::Off;
+    }
     match std::thread::Builder::new()
         .name("Discord presence".into())
         .spawn(run)
@@ -264,13 +136,12 @@ pub fn start(automated: bool) {
     }
 }
 
-/// What the player does now; only a change wakes the thread. Kept for [`start`] before it.
+/// What the player does now; only a change wakes the thread. Free without [`start`].
 pub fn set(status: Status) {
-    let mut shared = lock();
-    shared.game = status;
-    let changed = shared.wanted.update(shown(status), unix_now());
-    drop(shared);
-    if let Some(thread) = THREAD.get().filter(|_| changed) {
+    let Some(thread) = THREAD.get() else {
+        return;
+    };
+    if lock().wanted.update(status, unix_now()) {
         thread.unpark();
     }
 }
@@ -711,37 +582,6 @@ mod tests {
 
     /// A fake Discord: answers the handshake with READY, each command with its nonce, after a ping.
     #[cfg(unix)]
-    /// The switch as the player's settings and the Extras page see it. The only test that
-    /// touches the presence's statics.
-    #[test]
-    fn the_switch_clears_the_activity_at_once() {
-        let wanted = || lock().wanted.status;
-        Setting.load(KEY, "false");
-        set(Status::Menus);
-        assert!(!enabled());
-        assert_eq!(wanted(), Status::Off);
-        let mut rows = Vec::new();
-        SECTION.rows(&mut rows);
-        assert_eq!(
-            rows,
-            [Row::Toggle {
-                label: LABEL,
-                on: false
-            }]
-        );
-        let mut lines = Vec::new();
-        Setting.save(&mut |k, v| lines.push(format!("{k}:{v}")));
-        assert_eq!(lines, ["discordPresence:false"]);
-        assert!(!Setting.is_default());
-        // On from the page: what the game said last is shown at once.
-        SECTION.act(0, Act::Press);
-        assert_eq!(wanted(), Status::Menus);
-        assert!(Setting.is_default());
-        SECTION.act(0, Act::Press);
-        assert_eq!(wanted(), Status::Off);
-        SECTION.act(0, Act::Press);
-    }
-
     #[test]
     fn talks_to_discord_over_its_socket() {
         let dir = std::env::temp_dir().join(format!("horizon-discord-{}", std::process::id()));

crates/horizon-client/src/entry.rs

@@ -13,7 +13,6 @@ pub fn main_with(mods: crate::mod_api::Mods) {
         log::warn!("Trait mods already installed; ignoring the second list");
     }
     horizon_threads::configure_allocator();
-    crate::horizon_look::give();
     // OptiFine's and Polytone's pack formats (platform, docs/layers.md), before any pack loads.
     horizon_client::pack_formats::install();
     // horizon-extras (docs/forking.md): without the feature, no Horizon Settings or Mods page.
@@ -28,6 +27,8 @@ pub fn main_with(mods: crate::mod_api::Mods) {
     // then the Horizon parts still in this crate; none registers after this point.
     game::player_hooks::register();
     horizon_hooks::engine::seal();
+    // The text crates ship (`horizon_hooks::lang`), loaded with the game's own languages.
+    horizon_client::lang::install_crate_files(horizon_hooks::lang::engine::all());
     horizon_client::spans::startup::init(std::time::Instant::now());
     horizon_client::spans::trace::start_from_env();
     let args: Vec<String> = std::env::args().skip(1).collect();

crates/horizon-client/src/game.rs

@@ -49,7 +49,6 @@ fn pack_files(world_tables: &Option<WorldTables>) -> horizon_world::loot::PackOv
     }
 }
 
-mod activity;
 mod advancements;
 mod advancements_screen;
 mod agent;
@@ -129,6 +128,8 @@ mod decorated_pot;
 mod dedicated;
 mod deflect;
 mod dialogs;
+#[cfg(feature = "discord")]
+mod discord;
 mod dispense_fixture;
 mod dispenser;
 mod dragon;
@@ -1498,7 +1499,7 @@ impl LevelAccess for GameLevel<'_> {
             };
         }
         if let Some(signal) = books::lectern_signal(self.world, pos) {
-            return signal * i32::from(books::has_book_state(self.registry, state));
+            return signal;
         }
         if let Some(signal) =
             machines::shelf_signal(self.world, self.registry, state, pos, direction)
@@ -6716,8 +6717,8 @@ impl Game<'_> {
                 .extend(out.drain(player_start..));
         }
         self.mark_motion(out.len(), 0);
-        // What crates draw around players: first person, see-through (game/player_hooks.rs).
-        self.players_after_geometry(camera, alpha, &mut out);
+        // Companions in first person, trails and auras (game/cosmetics/fx.rs).
+        self.cosmetics_fx_geometry(camera, alpha, &mut out);
         self.mark_entity(out.len(), "minecraft:evoker_fangs");
         self.fangs_geometry(camera, alpha, &mut out);
         self.block_item_display_geometry(camera, alpha, &mut out);
@@ -11252,7 +11253,8 @@ impl Game<'_> {
                     self.heal_hold_latches();
                     // For the hooks above the engine (the "I'm playing" ping): said when it changes.
                     horizon_hooks::engine::published(self.is_published());
-                    self.report_activity();
+                    #[cfg(feature = "discord")]
+                    self.update_discord_presence();
                     let steps = self.clock.advance(elapsed);
                     for _ in 0..steps {
                         let started = Instant::now();
@@ -12527,8 +12529,15 @@ pub fn run_with() -> Result<()> {
     if options.execution_role.is_client() {
         narrator::start(&early_settings);
     }
-    // A game window's hooks (Discord's presence): never for a server.
-    activity::client_started(&options);
+    // "Playing Horizon" on Discord: never for a server; an automated run only talks to a test's fake Discord.
+    #[cfg(feature = "discord")]
+    if options.dedicated.is_none() {
+        let automated = options.benchmark.is_some()
+            || options.offscreen
+            || options.frames.is_some()
+            || options.world_frames.is_some();
+        horizon_client::discord_presence::start(early_settings.extras.discord_presence, automated);
+    }
     // Snapshots of derived tables live in the game folder, never beside the
     // shared resources.
     Behaviours::set_cache_dir(std::env::current_dir()?.join(".horizon-cache"));

crates/horizon-client/src/game/activity.rs

@@ -1,68 +0,0 @@
-//! What the player is doing, for the hooks above the engine (`Hooks::activity`: the Horizon
-//! layer's Discord presence shows it).
-use super::*;
-use horizon_client::command::args::GameMode;
-use horizon_hooks::{Activity, Client, Dimension, Play};
-
-/// At startup, for a game window (never a dedicated server's): the player's first activity, then
-/// `Hooks::client_started`.
-pub(super) fn client_started(options: &Options) {
-    if options.dedicated.is_some() {
-        return;
-    }
-    let automated = options.benchmark.is_some()
-        || options.offscreen
-        || options.frames.is_some()
-        || options.world_frames.is_some();
-    horizon_hooks::engine::activity(Activity::Menus);
-    horizon_hooks::engine::client_started(&Client::new(automated));
-}
-
-impl Game<'_> {
-    /// Each frame: only a change reaches the hooks.
-    pub(super) fn report_activity(&self) {
-        // One status per computer: P1's, not a splitscreen player's.
-        if self.options.split_guest {
-            return;
-        }
-        horizon_hooks::engine::activity(self.activity());
-    }
-    fn activity(&self) -> Activity {
-        if self.title.is_some() {
-            return Activity::Menus;
-        }
-        let max = horizon_client::lan::MAX_PLAYERS;
-        let play = if let Some(host) = &self.lan {
-            Play::Hosting {
-                players: 1 + host.hub.guests.len(),
-                max,
-            }
-        } else if let Some(server) = &self.integrated {
-            match (server.published(), &self.remote) {
-                (Some(_), Some(remote)) => Play::Hosting {
-                    players: remote.player_count(),
-                    max,
-                },
-                _ => Play::Singleplayer,
-            }
-        } else if self.remote.is_some() {
-            Play::Multiplayer
-        } else {
-            Play::Singleplayer
-        };
-        Activity::World {
-            play,
-            dimension: match self.dim {
-                Dim::Overworld => Dimension::Overworld,
-                Dim::Nether => Dimension::Nether,
-                Dim::End => Dimension::End,
-            },
-            mode: match self.mode {
-                GameMode::Survival => horizon_hooks::GameMode::Survival,
-                GameMode::Creative => horizon_hooks::GameMode::Creative,
-                GameMode::Adventure => horizon_hooks::GameMode::Adventure,
-                GameMode::Spectator => horizon_hooks::GameMode::Spectator,
-            },
-        }
-    }
-}

crates/horizon-client/src/game/armor_stands.rs

@@ -1278,21 +1278,10 @@ impl Game<'_> {
             .raw
             .get(&id)
             .is_some_and(|tag| horizon_client::entity_nbt::flag(tag, "Invulnerable"));
-        // Entity.isInvulnerableTo: the flag, then EnchantmentHelper.isImmuneToDamage.
         let a = &self.armor_stands[i];
-        if (invulnerable && !creative)
-            || a.invisible
-            || a.marker
-            || self.stand_immune_to_damage(i, damage_type, causing)
-        {
+        if (invulnerable && !creative) || a.invisible || a.marker {
             return false;
         }
-        // ArmorStand.hurtServer attributes its game events to the source
-        // entity: the player, a LAN guest or the mob.
-        let by = match causing {
-            Some(Target::Player | Target::Guest(_) | Target::Mob(_)) => causing,
-            _ => None,
-        };
         let (explosion, ignites, burns) = (
             tagged("minecraft:is_explosion"),
             tagged("minecraft:ignites_armor_stands"),
@@ -1303,26 +1292,21 @@ impl Game<'_> {
             tagged("minecraft:always_kills_armor_stands"),
         );
         if explosion {
-            self.break_armor_stand_with_source(i, by);
+            self.break_armor_stand_by_anything(i);
             return false;
         }
         if ignites {
             if self.armor_stands[i].fire_ticks > 0 {
-                self.cause_stand_damage(i, 0.15, by);
+                self.cause_stand_damage(i, 0.15);
             } else {
-                // igniteForSeconds(5.0f): at least 100 ticks, and
-                // Entity.igniteForTicks calls clearFreeze.
+                // igniteForSeconds(5.0f): at least 100 ticks.
                 let a = &mut self.armor_stands[i];
                 a.fire_ticks = a.fire_ticks.max(100);
-                if let Some(horizon_world::nbt::Tag::Compound(map)) = self.persist.raw.get_mut(&id)
-                {
-                    map.remove(&"TicksFrozen".into());
-                }
             }
             return false;
         }
         if burns && self.armor_stands[i].health > 0.5 {
-            self.cause_stand_damage(i, 4.0, by);
+            self.cause_stand_damage(i, 4.0);
             return false;
         }
         if !breaks && !always_kills {
@@ -1337,85 +1321,22 @@ impl Game<'_> {
         if !may_build {
             return false;
         }
-        self.break_armor_stand_by_hit(i, creative, always_kills, by)
-    }
-    /// `EnchantmentHelper.isImmuneToDamage` for the stand at `i`: whether an
-    /// enchantment on an active equipment slot has a `minecraft:damage_immunity`
-    /// effect whose requirements hold for `damage_type` and `causing`.
-    fn stand_immune_to_damage(
-        &mut self,
-        i: usize,
-        damage_type: &str,
-        causing: Option<super::commands::Target>,
-    ) -> bool {
-        use super::commands::Target;
-        let mut checks = Vec::new();
-        let equipment = &self.armor_stands[i].equipment;
-        for (stack, slot) in equipment.iter().zip(ArmorStand::SLOTS) {
-            let Some(stack) = stack else { continue };
-            let armor = matches!(slot, "head" | "chest" | "legs" | "feet");
-            let hand = matches!(slot, "mainhand" | "offhand");
-            for (id, level) in stack.enchantments() {
-                let Some(def) = self.res.stations().enchantments.get(id) else {
-                    continue;
-                };
-                if !def.slots.iter().any(|s| {
-                    s == slot || s == "any" || (s == "armor" && armor) || (s == "hand" && hand)
-                }) {
-                    continue;
-                }
-                let immunity = &def.effects["minecraft:damage_immunity"];
-                for entry in immunity.as_array().into_iter().flatten() {
-                    checks.push((entry.get("requirements").cloned(), *level));
-                }
-            }
-        }
-        if checks.is_empty() {
-            return false;
-        }
-        let attacker = match causing {
-            Some(Target::Player | Target::Guest(_)) => Some("minecraft:player".to_owned()),
-            Some(Target::Mob(m_id)) => self
-                .mobs
-                .iter()
-                .find(|m| m.id == m_id)
-                .map(|m| m.kind.id.clone()),
-            Some(Target::Stand(_)) => Some("minecraft:armor_stand".to_owned()),
+        // ArmorStand.hurtServer attributes its game events to the source
+        // entity: the player, a LAN guest or the mob.
+        let by = match causing {
+            Some(Target::Player | Target::Guest(_) | Target::Mob(_)) => causing,
             _ => None,
         };
-        let canonical = if damage_type.contains(':') {
-            damage_type.to_owned()
-        } else {
-            format!("minecraft:{damage_type}")
-        };
-        let ctx = horizon_client::enchant::EffectContext {
-            items: Some(self.res.items()),
-            damage_type: Some(&canonical),
-            is_direct: attacker.is_some(),
-            this: Some("minecraft:armor_stand"),
-            attacker: attacker.as_deref(),
-            direct_attacker: attacker.as_deref(),
-            ..Default::default()
-        };
-        let ench = &self.res.stations().enchantments;
-        let rng = &mut self.world.random;
-        for (req, level) in checks {
-            if req.is_none_or(|r| ench.condition(&r, level, &ctx, rng)) {
-                return true;
-            }
-        }
-        false
+        self.break_armor_stand_by_hit(i, creative, always_kills, by)
     }
     /// `ArmorStand.causeDamage`: the health less `amount`, broken by anything
-    /// at 0.5 or less, else `gameEvent(ENTITY_DAMAGE, damageSource.getEntity())`.
-    fn cause_stand_damage(&mut self, i: usize, amount: f32, by: Option<super::commands::Target>) {
+    /// at 0.5 or less.
+    fn cause_stand_damage(&mut self, i: usize, amount: f32) {
         let health = self.armor_stands[i].health - amount;
         if health <= 0.5 {
-            self.break_armor_stand_with_source(i, by);
+            self.break_armor_stand_by_anything(i);
         } else {
-            let at = self.armor_stands[i].position;
             self.armor_stands[i].health = health;
-            self.stand_game_event("minecraft:entity_damage", [at.x, at.y, at.z], by);
         }
     }
     /// ArmorStandRenderer: the stand with its default pose, then armor layers.

crates/horizon-client/src/game/books.rs

@@ -1608,16 +1608,6 @@ impl Game<'_> {
         }
     }
 }
-/// `LecternBlock.getAnalogOutputSignal`'s `HAS_BOOK` check.
-pub(super) fn has_book_state(
-    registry: &'static horizon_world::registry::BlockRegistry,
-    state: horizon_world::registry::BlockStateId,
-) -> bool {
-    registry
-        .state(state)
-        .is_some_and(|s| s.properties.get("has_book").is_some_and(|v| v == "true"))
-}
-
 /// `LecternBlockEntity.getRedstoneSignal`.
 pub(super) fn lectern_signal(world: &horizon_client::world::World, pos: BlockPos) -> Option<i32> {
     match world.block_entities.get(&(pos.x, pos.y, pos.z)) {
@@ -1731,7 +1721,6 @@ mod lectern_signal_tests {
         items::ItemStack,
     };
     use horizon_core::position::BlockPos;
-    use horizon_world::level::LevelAccess;
     use horizon_world::registry::BlockStateId;
 
     fn signal(game: &mut super::Game<'_>, book: Option<ItemStack>, page: i32) -> i32 {
@@ -1749,55 +1738,6 @@ mod lectern_signal_tests {
         lectern_signal(&game.world, BlockPos::new(key.0, key.1, key.2)).unwrap()
     }
 
-    /// `LecternBlock.getAnalogOutputSignal` reads the block entity only while
-    /// the state's `HAS_BOOK` is true.
-    #[test]
-    #[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES"]
-    fn a_lectern_without_the_has_book_state_feeds_no_comparator() {
-        let mut game = server_game();
-        let key = (8, 64, 8);
-        let state = game
-            .pack
-            .assets
-            .registry
-            .default_state("minecraft:lectern")
-            .unwrap();
-        game.world.set(key.0, key.1, key.2, state).unwrap();
-        game.world.block_entities.insert(
-            key,
-            BlockEntity::Lectern(Lectern {
-                book: Some(ItemStack::new("minecraft:writable_book", 1)),
-                page: 0,
-            }),
-        );
-        let signal = |game: &mut super::Game<'_>, state| {
-            game.with_level(|_, level, _| {
-                level.block_entity_analog_signal(
-                    BlockPos::new(key.0, key.1, key.2),
-                    state,
-                    horizon_core::geometry::Direction::North,
-                )
-            })
-        };
-        assert_eq!(
-            signal(&mut game, state),
-            0,
-            "the block state says the lectern holds no book"
-        );
-        let registry = game.pack.assets.registry;
-        let mut with_book = registry.state(state).unwrap().clone();
-        with_book
-            .properties
-            .insert("has_book".into(), "true".into());
-        let with_book = registry.id(&with_book).unwrap();
-        game.world.set(key.0, key.1, key.2, with_book).unwrap();
-        assert_eq!(
-            signal(&mut game, with_book),
-            15,
-            "with HAS_BOOK the book's page signal"
-        );
-    }
-
     /// `LecternBlockEntity.getRedstoneSignal`: `floor(page / (pageCount - 1)
     /// * 14) + (hasBook() ? 1 : 0)`. `hasBook()` asks for a book-content
     /// component, so a stack that only sits in the lectern (a non-book item a

crates/horizon-client/src/game/cosmetics.rs

@@ -13,12 +13,18 @@ mod fx;
 
 use super::Game;
 use horizon_client::fast_hash::FxHashMap;
+use horizon_client::mesher::Vertex;
+use horizon_client::mobs::anim::Poses;
+use horizon_client::mobs::{Mob, Part, Polygon};
+use horizon_cosmetics::follow::Follow;
 use horizon_cosmetics::prefs::{self, Others};
+use horizon_cosmetics::trail::{Budget, Emitter};
 use horizon_cosmetics::{Item, Slot};
 use horizon_hooks::players::{
-    Badge, Bone, CameraOverride, CameraView, Frame, Gear, Kind, Look, Mark, Mesh, NameDecoration,
-    Pass, PlayerDraw, PlayerModel, PlayerModels, Quad, SpriteStore, Sprites,
+    Badge, CameraOverride, CameraView, Frame, Gear, Kind, Mark, NameDecoration, PlayerModel,
+    PlayerModels, SpriteStore, Sprites,
 };
+use std::cell::{Cell, RefCell};
 use std::sync::mpsc::{Receiver, channel};
 use std::sync::{Arc, Mutex, PoisonError};
 use std::time::{Duration, Instant};
@@ -26,10 +32,46 @@ use std::time::{Duration, Instant};
 /// Horizon's mark before a Horizon player's name, over their name tag and in the player list.
 const MARK: Mark = &horizon_cosmetics::mark::MARK;
 
+/// An item as the renderer takes it.
+struct Baked {
+    item: Arc<Item>,
+    /// A model per bone it rides (a shirt's sleeves are on the arms).
+    models: Vec<(horizon_cosmetics::Bone, Arc<Part>)>,
+    /// Its texture's sprite (a 64×64 skin slot of the atlas).
+    location: String,
+    /// The frame it was last marked drawn in (its slot is kept).
+    marked: Cell<u32>,
+}
+
+impl Baked {
+    fn new(item: &Arc<Item>, frame: u32) -> Self {
+        Self {
+            item: item.clone(),
+            models: item
+                .roots()
+                .map(|(bone, root)| (bone, Arc::new(part(root))))
+                .collect(),
+            location: format!("cosmetics/{:x}", Arc::as_ptr(item) as usize),
+            marked: Cell::new(frame.wrapping_sub(1)),
+        }
+    }
+}
+
 #[derive(Default)]
 pub(super) struct Cosmetics {
+    /// The hooks' client (`Seat`), taken once it started.
+    client: Option<Arc<horizon_cosmetics::Cosmetics>>,
+    /// By the item's address; each entry holds its item, so the address isn't reused.
+    baked: RefCell<FxHashMap<usize, Baked>>,
+    /// Items drawn whose texture isn't in the atlas yet.
+    uploads: RefCell<Vec<Arc<Item>>>,
+    frame: Cell<u32>,
+    /// Kept between players so a frame of avatars allocates none: the wearer's body, an item.
+    poses: RefCell<(Poses, Poses)>,
     /// Item files from a folder (`HORIZON_COSMETICS_LOCAL`): mannequins wear them too.
     local: bool,
+    /// Companions, trails and auras.
+    fx: RefCell<Fx>,
     /// Emotes: those the wheel offers and the one playing (`cosmetics/emotes.rs`).
     emotes: emotes::Emotes,
     /// The emote wheel (`cosmetics/emote_wheel.rs`).
@@ -88,6 +130,49 @@ fn load_owned_emotes(
     )
 }
 
+/// The key of the player's own model in `Fx`'s maps (others go by entity id).
+const OWN: u32 = u32::MAX;
+/// Full light, for what glows.
+const FULL_LIGHT: u32 = 240 | 240 << 8;
+
+/// What companions and trails keep between frames, per wearer (marked with the frame they were
+/// last drawn in; the others are dropped), and the frame's trails and auras, drawn after the
+/// players (`cosmetics_fx_geometry`).
+#[derive(Default)]
+struct Fx {
+    companions: FxHashMap<u32, (Follow, u32)>,
+    trails: FxHashMap<u32, (Emitter, u32)>,
+    budget: Budget,
+    clock: Option<(Instant, Instant)>,
+    /// Ticks since the first frame, and the last frame's length in seconds.
+    now: f64,
+    dt: f32,
+    /// Trails and auras: see-through.
+    clear: Vec<Vertex>,
+}
+
+impl Fx {
+    /// A new frame: the clock moves on and what no frame drew since the last one goes.
+    fn frame(&mut self, frame: u32) {
+        let now = Instant::now();
+        let (start, last) = self.clock.get_or_insert((now, now));
+        self.dt = now.duration_since(*last).as_secs_f32().min(0.25);
+        self.now = now.duration_since(*start).as_secs_f64() * 20.0;
+        *last = now;
+        let seen = |mark: u32| frame.wrapping_sub(mark) <= 1;
+        self.companions.retain(|_, (_, mark)| seen(*mark));
+        let budget = &mut self.budget;
+        self.trails.retain(|_, (e, mark)| {
+            let keep = seen(*mark);
+            if !keep {
+                e.clear(budget);
+            }
+            keep
+        });
+        self.clear.clear();
+    }
+}
+
 /// Whether the signed-in account owns a cosmetic: the answer kept from the last run first
 /// (`prefs::owned`), then the service's, asked once a run and retried after a failure like Show my
 /// cosmetics. Not known yet, or no session: not owning.
@@ -249,11 +334,15 @@ impl Cosmetics {
 /// choice, or by owning none). Hidden, the service is never asked about them.
 fn worn_of(
     client: &horizon_cosmetics::Cosmetics,
-    said: &Said,
+    extras: &horizon_client::extras::Extras,
     own: bool,
     uuid: impl FnOnce() -> Option<u128>,
 ) -> Option<horizon_cosmetics::Worn> {
-    let shown = if own { said.mine } else { !said.others_hidden };
+    let shown = if own {
+        extras.cosmetics_mine
+    } else {
+        extras.effective_others() != Others::Hidden
+    };
     if !shown {
         return None;
     }
@@ -280,6 +369,24 @@ fn own_uuid(
 /// How often a looping emote is said again (the service keeps one a minute).
 const LOOP_AGAIN: Duration = Duration::from_secs(30);
 
+/// The game's model of an item's part.
+fn part(p: &horizon_cosmetics::Part) -> Part {
+    Part {
+        name: p.name.clone(),
+        pose: p.pose,
+        polygons: p
+            .faces
+            .iter()
+            .map(|f| Polygon {
+                normal: f.normal,
+                vertices: f.vertices,
+                cull_back: false,
+            })
+            .collect(),
+        children: p.children.iter().map(part).collect(),
+    }
+}
+
 /// The texture in the top-left corner of a skin slot's 64×64 RGBA.
 fn slot_image(item: &Item) -> Vec<u8> {
     let t = &item.texture;
@@ -356,45 +463,12 @@ struct Seat {
     models: Vec<PlayerModel>,
     /// The world is the window's own single-player one (`Frame::solo`).
     solo: bool,
-    /// The items the hooks show, by the item's address.
-    items: FxHashMap<usize, Kept>,
+    /// Name tag badges' sprites, by the item's address: their id (never reused) and the item,
+    /// held so the address isn't reused while it is there.
+    sprites: FxHashMap<usize, (u64, Arc<Item>)>,
     last_sprite: u64,
     /// Sprites drawing missed, put in the atlas next frame.
     wanted: Vec<u64>,
-    /// Companions, trails and auras (`cosmetics/fx.rs`).
-    fx: fx::Fx,
-}
-
-/// An item the hooks show: its sprite's id (never reused) and a mesh per bone it rides, held
-/// with the item so its address isn't reused while it is here.
-struct Kept {
-    sprite: u64,
-    item: Arc<Item>,
-    meshes: Vec<(Bone, Arc<Mesh>)>,
-}
-
-/// The hooks' model of an item's part.
-fn mesh(p: &horizon_cosmetics::Part) -> Mesh {
-    let quads = p.faces.iter().map(|f| Quad::new(f.normal, f.vertices));
-    Mesh::new(
-        p.name.clone(),
-        p.pose,
-        quads.collect(),
-        p.children.iter().map(mesh).collect(),
-    )
-}
-
-/// The hooks' name of a bone.
-fn bone(b: horizon_cosmetics::Bone) -> Bone {
-    use horizon_cosmetics::Bone as B;
-    match b {
-        B::Head => Bone::Head,
-        B::Body => Bone::Body,
-        B::LeftArm => Bone::LeftArm,
-        B::RightArm => Bone::RightArm,
-        B::LeftLeg => Bone::LeftLeg,
-        B::RightLeg => Bone::RightLeg,
-    }
 }
 
 /// What the game tells the hooks before each call, until the settings move here (spec #14091
@@ -409,8 +483,6 @@ struct Said {
     others_hidden: bool,
     /// Horizon's mark by Horizon players' names.
     marks: bool,
-    /// Other players' trails and auras are hidden.
-    hide_fx: bool,
     /// Cosmetics in single player: the signed-in account's on the player's own model.
     solo: bool,
     /// My emote pulled the camera back: when it started (the own model's age).
@@ -421,19 +493,6 @@ struct Said {
     first: Option<Arc<Item>>,
 }
 
-impl Said {
-    /// What the game's settings say.
-    fn settings(&mut self, extras: &horizon_client::extras::Extras) {
-        self.mine = extras.cosmetics_mine;
-        self.listed = extras.horizon_listed;
-        self.others_shown = extras.effective_others() == Others::Shown;
-        self.others_hidden = extras.effective_others() == Others::Hidden;
-        self.marks = extras.horizon_marks;
-        self.hide_fx = extras.cosmetics_hide_fx;
-        self.solo = extras.cosmetics_solo;
-    }
-}
-
 /// One [`Seat`] per splitscreen player.
 static SERVICES: Mutex<Vec<Seat>> = Mutex::new(Vec::new());
 
@@ -456,7 +515,6 @@ impl horizon_hooks::Hooks for Hooks {
         service(|s| {
             s.solo = frame.solo;
             s.frame();
-            s.fx.frame();
             s.put_sprites(sprites);
         });
     }
@@ -481,15 +539,6 @@ impl horizon_hooks::Hooks for Hooks {
     }
 
     /// An emote pulls the camera back: it eases out over the emote's first quarter second.
-    fn player_layers(&self, model: &PlayerModel, draw: &mut dyn PlayerDraw) {
-        service(|s| s.player_layers(model, draw));
-    }
-
-    /// The player's own companion in first person.
-    fn first_person(&self, own: &PlayerModel, draw: &mut dyn PlayerDraw) {
-        service(|s| s.first_person(own, draw));
-    }
-
     fn camera(&self, own: &CameraView) -> Option<CameraOverride> {
         let start = service(|s| s.said.pull)?;
         let t = ((own.age - start) / 5.0).clamp(0.0, 1.0);
@@ -615,7 +664,14 @@ impl Seat {
         if !(styles || said.marks) {
             return None;
         }
-        let uuid = self.uuid_of(m)?;
+        let uuid = match m.kind {
+            Kind::Own => own_uuid(m.uuid, self.solo, said.solo, || {
+                horizon_client::auth::current().map(|s| s.uuid)
+            }),
+            Kind::Mannequin if self.local => Some(u128::from(m.id)),
+            Kind::Player => m.uuid,
+            _ => None,
+        }?;
         let mut frame = self.client.as_ref()?.frame();
         let mark = (said.marks && frame.horizon(uuid)).then_some(MARK);
         let worn = if styles { frame.worn(uuid) } else { None };
@@ -631,152 +687,42 @@ impl Seat {
         Some(NameDecoration::new(mark, badge, top))
     }
 
-    /// The UUID the service knows `m` by: a player's, or a mannequin's id with local items.
-    fn uuid_of(&self, m: &PlayerModel) -> Option<u128> {
-        match m.kind {
-            Kind::Own => own_uuid(m.uuid, self.solo, self.said.solo, || {
-                horizon_client::auth::current().map(|s| s.uuid)
-            }),
-            Kind::Mannequin if self.local => Some(u128::from(m.id)),
-            Kind::Player => m.uuid,
-            _ => None,
-        }
-    }
-
-    /// `item` as the hooks show it, kept from its first sight.
-    fn kept(&mut self, item: &Arc<Item>) -> &Kept {
+    /// The name tag style in `worn`: its badge's place in the atlas and its line's colour. None
+    /// until the badge is in the atlas (it is put there next frame).
+    fn badge(&mut self, worn: &horizon_cosmetics::Worn, sprites: &dyn Sprites) -> Option<Badge> {
+        let item = worn.iter().find(|i| i.slot == Slot::NameTag)?;
+        let [r, g, b] = item.tag?.line;
         let next = self.last_sprite + 1;
-        let kept = self
-            .items
+        let (id, _) = *self
+            .sprites
             .entry(Arc::as_ptr(item) as usize)
-            .or_insert_with(|| Kept {
-                sprite: next,
-                item: item.clone(),
-                meshes: item
-                    .roots()
-                    .map(|(b, root)| (bone(b), Arc::new(mesh(root))))
-                    .collect(),
-            });
-        self.last_sprite = self.last_sprite.max(kept.sprite);
-        kept
-    }
-
-    /// Where `item`'s texture is in the atlas (`get` reads the crate's sprites): the top left
-    /// corner of its slot. None until it is there (it is put there next frame).
-    fn uv(&mut self, item: &Arc<Item>, get: impl Fn(u64) -> Option<[f32; 4]>) -> Option<[f32; 4]> {
-        let id = self.kept(item).sprite;
-        let Some([u0, v0, u1, v1]) = get(id) else {
+            .or_insert_with(|| (next, item.clone()));
+        self.last_sprite = self.last_sprite.max(id);
+        let Some([u0, v0, u1, v1]) = sprites.get(id) else {
             if !self.wanted.contains(&id) {
                 self.wanted.push(id);
             }
             return None;
         };
-        let (w, h) = (
-            item.texture.width as f32 / 64.0,
-            item.texture.height as f32 / 64.0,
-        );
-        Some([u0, v0, u0 + (u1 - u0) * w, v0 + (v1 - v0) * h])
+        // The mark sits in the slot's top left corner.
+        let u1 = u0 + (u1 - u0) * item.texture.width as f32 / 64.0;
+        let v1 = v0 + (v1 - v0) * item.texture.height as f32 / 64.0;
+        Some(Badge::new(
+            [u0, v0, u1, v1],
+            u32::from_be_bytes([0, r, g, b]),
+        ))
     }
 
-    /// The name tag style in `worn`: its badge and its line's colour. None until the badge is in
-    /// the atlas.
-    fn badge(&mut self, worn: &horizon_cosmetics::Worn, sprites: &dyn Sprites) -> Option<Badge> {
-        let item = worn.iter().find(|i| i.slot == Slot::NameTag)?;
-        let [r, g, b] = item.tag?.line;
-        let uv = self.uv(item, |id| sprites.get(id))?;
-        Some(Badge::new(uv, u32::from_be_bytes([0, r, g, b])))
-    }
-
-    /// Puts the sprites drawing missed in the atlas; forgets the items no one wears.
+    /// Puts the sprites drawing missed in the atlas; forgets those of items no one wears.
     fn put_sprites(&mut self, store: &mut dyn SpriteStore) {
         for id in self.wanted.drain(..) {
-            let kept = self.items.values().find(|k| k.sprite == id);
-            if let Some(kept) = kept.filter(|_| !store.has(id)) {
-                store.put(id, slot_image(&kept.item));
+            let item = self.sprites.values().find(|(i, _)| *i == id);
+            if let Some((_, item)) = item.filter(|_| !store.has(id)) {
+                store.put(id, slot_image(item));
             }
         }
-        self.items.retain(|_, k| Arc::strong_count(&k.item) > 1);
-    }
-
-    /// The cosmetics `m` wears, on its bones and around it in the world (companions, trails,
-    /// auras: `cosmetics/fx.rs`), and an emote's props.
-    fn player_layers(&mut self, m: &PlayerModel, draw: &mut dyn PlayerDraw) {
-        if m.invisible {
-            return;
-        }
-        let said = &self.said;
-        let own = m.kind == Kind::Own;
-        // "Name tags only": other players' styles beside their names, nothing on their bodies.
-        let bodies = own || said.others_shown;
-        let ticks = draw.ticks();
-        // An emote's props: its time and weight while it plays.
-        let emote = emotes::pose_playing(draw.body_pose()).and_then(|p| {
-            let (t, w) = p.at(ticks)?;
-            (p.item.vertices > 0).then(|| (p.item.clone(), t, w))
-        });
-        let client = self.client.as_ref().filter(|_| bodies);
-        let worn = client.and_then(|c| worn_of(c, &self.said, own, || self.uuid_of(m)));
-        // Items on one bone (a back item, a shoulder pet and a shirt ride the body) share its
-        // matrix: the head, the body and the two arms at most.
-        let mut bones: [Option<(Bone, [[f32; 4]; 4])>; 4] = [None; 4];
-        let worn_items = worn.iter().flat_map(|w| w.iter()).map(|i| (i, None));
-        let emote_items = emote.iter().map(|(i, t, w)| (i, Some((*t, *w))));
-        for (item, emoting) in worn_items.chain(emote_items) {
-            // On no bone, around the model in the world.
-            if let (Slot::Companion | Slot::Trail | Slot::Aura, None) = (item.slot, emoting) {
-                if draw.pass() == Pass::World {
-                    self.fx(m, item, draw);
-                }
-                continue;
-            }
-            // Covered by gear, or drawn by no bone (a name tag style).
-            if emoting.is_none() && covered(m.gear, item.slot) {
-                continue;
-            }
-            let Some(uv) = self.uv(item, |id| draw.sprite(id)) else {
-                continue;
-            };
-            for i in 0..self.kept(item).meshes.len() {
-                let (bone_of, mesh) = self.kept(item).meshes[i].clone();
-                let known = bones.iter().flatten().find(|(b, _)| *b == bone_of);
-                let matrix = match known {
-                    Some(&(_, matrix)) => matrix,
-                    None => {
-                        let Some(matrix) = draw.bone(bone_of) else {
-                            continue;
-                        };
-                        if let Some(free) = bones.iter_mut().find(|b| b.is_none()) {
-                            *free = Some((bone_of, matrix));
-                        }
-                        matrix
-                    }
-                };
-                draw.draw(&mesh, matrix, Look::new(uv), &mut |p| {
-                    item.animate(ticks, |name, pose| *p.pose(name) = pose);
-                    if let (Some((t, w)), Some(e)) = (emoting, &item.emote) {
-                        e.pose_props(t, |n| item.rest(n), |n, pose| *p.pose(n) = pose);
-                        // Props grow in and shrink out with the emote's blend.
-                        let root = p.pose(&mesh.name);
-                        for s in &mut root[6..9] {
-                            *s *= w;
-                        }
-                    }
-                });
-            }
-        }
-    }
-
-    /// The window's own companion while its body is out of view.
-    fn first_person(&mut self, m: &PlayerModel, draw: &mut dyn PlayerDraw) {
-        let Some(client) = self.client.as_ref().filter(|_| !m.invisible) else {
-            return;
-        };
-        let Some(worn) = worn_of(client, &self.said, true, || self.uuid_of(m)) else {
-            return;
-        };
-        if let Some(item) = worn.iter().find(|i| i.slot == Slot::Companion) {
-            self.fx(m, item, draw);
-        }
+        self.sprites
+            .retain(|_, (_, item)| Arc::strong_count(item) > 1);
     }
 
     /// Once a tick: names the Horizon players in view to the emote feed and plays what it says
@@ -878,7 +824,12 @@ impl Game<'_> {
         let pull = self.cosmetics.emotes.pull();
         service(|s| {
             let said = &mut s.said;
-            said.settings(extras);
+            said.mine = extras.cosmetics_mine;
+            said.listed = extras.horizon_listed;
+            said.others_shown = extras.effective_others() == Others::Shown;
+            said.others_hidden = extras.effective_others() == Others::Hidden;
+            said.marks = extras.horizon_marks;
+            said.solo = extras.cosmetics_solo;
             said.pull = pull;
             if said.playing.as_ref().map(|(id, l)| (id.as_str(), *l)) != playing {
                 said.playing = playing.map(|(id, l)| (id.to_owned(), l));
@@ -889,16 +840,36 @@ impl Game<'_> {
         });
     }
 
-    /// Once a frame, after the hooks: what the game reads of them (the settings' owner flag,
-    /// whether items come from a folder).
+    /// Once a frame, after the hooks: takes the service's client for drawing and puts the
+    /// textures the last frame wanted into the atlas.
     pub(super) fn cosmetics_frame(&mut self) {
         if !enabled() {
             return;
         }
-        let (owns, local) = service(|s| (s.owner.owns, s.local));
+        let c = &mut self.cosmetics;
+        let owns = service(|s| {
+            if c.client.is_none() {
+                c.client = s.client.clone();
+                c.local = s.local;
+            }
+            s.owner.owns
+        });
         // Read every frame: the settings button shows it, and it is never saved.
         self.settings.extras.cosmetics_owner = owns;
-        self.cosmetics.local = local;
+        c.frame.set(c.frame.get().wrapping_add(1));
+        c.fx.get_mut().frame(c.frame.get());
+        let uploads = std::mem::take(&mut *c.uploads.borrow_mut());
+        for item in uploads {
+            let location = format!("cosmetics/{:x}", Arc::as_ptr(&item) as usize);
+            if !self.gui.atlas.sprites.contains_key(&location) {
+                self.store_skin(location, slot_image(&item));
+            }
+        }
+        // Items no player wears any more.
+        self.cosmetics
+            .baked
+            .borrow_mut()
+            .retain(|_, b| Arc::strong_count(&b.item) > 1);
     }
 
     /// Asks the service which emotes the account owns, for the wheel: when it opens, at most
@@ -924,6 +895,210 @@ impl Game<'_> {
             })
             .ok();
     }
+
+    /// What `m` wears, if cosmetics are shown for it: `own` for the player's own model.
+    fn worn(&self, m: &Mob, own: bool) -> Option<horizon_cosmetics::Worn> {
+        let client = self.cosmetics.client.as_ref()?;
+        worn_of(client, &self.settings.extras, own, || {
+            self.cosmetics_uuid(m, own)
+        })
+    }
+
+    /// The UUID the service knows `m` by: a player's, or a mannequin's id with local items.
+    fn cosmetics_uuid(&self, m: &Mob, own: bool) -> Option<u128> {
+        if own {
+            own_uuid(
+                self.remote.as_ref().map(|r| r.profile()),
+                self.integrated.is_some(),
+                self.settings.extras.cosmetics_solo,
+                || horizon_client::auth::current().map(|s| s.uuid),
+            )
+        } else if &*m.kind.id == "minecraft:player" {
+            self.remote_player_uuid(m.id)
+        } else if self.cosmetics.local && &*m.kind.id == "minecraft:mannequin" {
+            Some(u128::from(m.id))
+        } else {
+            None
+        }
+    }
+
+    /// The cosmetics `m` wears, on its bones. `gpu`: posed on the GPU (the mob pass's skin
+    /// frame, begun); the bounds of what went there come back, for culling. Else the vertices
+    /// go to `out`. `camera`: where the world view's camera is; None in a picture of the player
+    /// (the inventory), which shows no companion, trail or aura.
+    #[allow(clippy::too_many_arguments)]
+    pub(super) fn cosmetics_geometry(
+        &self,
+        m: &Mob,
+        own: bool,
+        base: glam::Mat4,
+        camera: Option<glam::DVec3>,
+        alpha: f32,
+        light: u32,
+        gpu: bool,
+        out: &mut Vec<horizon_client::mesher::Vertex>,
+    ) -> Option<(glam::Vec3, glam::Vec3)> {
+        use horizon_client::mobs::{anim, render};
+        let worn = self.worn(m, own);
+        // An emote's props: its time and weight while it plays.
+        let ticks = m.age as f32 + alpha;
+        let emote = emotes::playing(m).and_then(|p| {
+            let (t, w) = p.at(ticks)?;
+            (p.item.vertices > 0).then_some((&p.item, t, w))
+        });
+        if worn.is_none() && emote.is_none() || horizon_client::mobs::trader::is_invisible(m) {
+            return None;
+        }
+        // The avatar's body, posed as it is drawn.
+        let (key, _) = render::body(m);
+        let body = m.kind.layer(&key).unwrap_or(&m.kind.model);
+        let mut scratch = self.cosmetics.poses.borrow_mut();
+        let (body_poses, poses) = &mut *scratch;
+        body_poses.reset(body);
+        let data = self.res.mob_data();
+        anim::setup(m, &anim::state(m, alpha), body_poses, &data.animations);
+        let mut bounds = None;
+        // Items on one bone (a back item, a shoulder pet and a shirt ride the body) share its
+        // matrix: the head, the body and the two arms at most.
+        let mut bones: [Option<(horizon_cosmetics::Bone, glam::Mat4)>; 4] = [None; 4];
+        // "Name tags only": other players' styles beside their names, nothing on their bodies.
+        let bodies = own || self.settings.extras.effective_others() == Others::Shown;
+        let worn_items = worn.iter().flat_map(|w| w.iter()).map(|i| (i, None));
+        let emote_items = emote.map(|(i, t, w)| (i, Some((t, w))));
+        for (item, emoting) in worn_items.chain(emote_items) {
+            if emoting.is_none() && !bodies {
+                continue;
+            }
+            if let (Some(camera), Slot::Companion | Slot::Trail | Slot::Aura) = (camera, item.slot)
+            {
+                // The player's own in first person: only its companion, drawn after the drain
+                // of the first-person model (`cosmetics_fx_geometry`).
+                if !(own && !self.own_body_in_view()) {
+                    let at = fx::Wearer {
+                        m,
+                        own,
+                        key: if own { OWN } else { m.id },
+                        base,
+                        camera,
+                        alpha,
+                        light,
+                    };
+                    bounds = self.cosmetics_fx(&at, item, gpu, bounds, poses, out);
+                }
+                continue;
+            }
+            if emoting.is_none() && covered(super::player_hooks::gear(m), item.slot) {
+                continue;
+            }
+            let Some((models, uv)) = self.cosmetics_baked(item) else {
+                continue;
+            };
+            for (bone_of, model) in &models {
+                let known = bones.iter().flatten().find(|(b, _)| b == bone_of);
+                let bone = match known {
+                    Some(&(_, matrix)) => matrix,
+                    None => {
+                        let Some(matrix) =
+                            render::part_matrix(body, base, body_poses, bone_of.part(), 0.0)
+                        else {
+                            continue;
+                        };
+                        if let Some(free) = bones.iter_mut().find(|b| b.is_none()) {
+                            *free = Some((*bone_of, matrix));
+                        }
+                        matrix
+                    }
+                };
+                poses.reset(model);
+                item.animate(ticks, |name, pose| *poses.get(name) = pose);
+                if let (Some((t, w)), Some(e)) = (emoting, &item.emote) {
+                    e.pose_props(t, |n| item.rest(n), |n, pose| *poses.get(n) = pose);
+                    // Props grow in and shrink out with the emote's blend.
+                    let root = poses.get(&model.name);
+                    for s in &mut root[6..9] {
+                        *s *= w;
+                    }
+                }
+                bounds = self.cosmetics_model(model, bone, poses, uv, light, gpu, bounds, out);
+            }
+        }
+        bounds
+    }
+
+    /// An item's models and its texture's corners in the atlas, once its texture is there (it is
+    /// asked for meanwhile).
+    #[allow(clippy::type_complexity)]
+    fn cosmetics_baked(
+        &self,
+        item: &Arc<Item>,
+    ) -> Option<(Vec<(horizon_cosmetics::Bone, Arc<Part>)>, [f32; 4])> {
+        let frame = self.cosmetics.frame.get();
+        let mut baked = self.cosmetics.baked.borrow_mut();
+        let b = baked
+            .entry(Arc::as_ptr(item) as usize)
+            .or_insert_with(|| Baked::new(item, frame));
+        let Some(rect) = self.gui.atlas.sprites.get(&b.location) else {
+            self.cosmetics.uploads.borrow_mut().push(item.clone());
+            return None;
+        };
+        if b.marked.replace(frame) != frame {
+            self.skin_downloads.borrow_mut().drawn(&b.location);
+        }
+        // The texture fills the top-left of its 64×64 slot.
+        let (w, h) = (
+            item.texture.width as f32 / 64.0,
+            item.texture.height as f32 / 64.0,
+        );
+        let uv = [
+            rect.u0,
+            rect.v0,
+            rect.u0 + (rect.u1 - rect.u0) * w,
+            rect.v0 + (rect.v1 - rect.v0) * h,
+        ];
+        Some((b.models.clone(), uv))
+    }
+
+    /// One model at `matrix`, posed by `poses`: on the GPU's skin path when `gpu` (the bounds
+    /// grow to hold it), else its vertices go to `out`.
+    #[allow(clippy::too_many_arguments)]
+    fn cosmetics_model(
+        &self,
+        model: &Arc<Part>,
+        matrix: glam::Mat4,
+        poses: &horizon_client::mobs::anim::Poses,
+        uv: [f32; 4],
+        light: u32,
+        gpu: bool,
+        bounds: Option<(glam::Vec3, glam::Vec3)>,
+        out: &mut Vec<Vertex>,
+    ) -> Option<(glam::Vec3, glam::Vec3)> {
+        if gpu {
+            let mut models = self.skin_models.borrow_mut();
+            let mut frame = self.skin_frame.borrow_mut();
+            let mut skin = horizon_client::mobs::skin::Skin::new(&mut models, &mut frame);
+            skin.bounds = bounds;
+            let paint = horizon_client::mobs::skin::Paint {
+                uv,
+                scroll: 0.0,
+                color: 0xFFFF_FFFF,
+                light,
+                overlay: 0,
+            };
+            if skin.draw(model, matrix, poses, paint) {
+                return skin.bounds;
+            }
+        }
+        horizon_client::mobs::render_model(
+            model,
+            matrix,
+            &|p: &Part| poses.pose(p),
+            uv,
+            light,
+            0,
+            out,
+        );
+        bounds
+    }
 }
 
 #[cfg(test)]
@@ -990,13 +1165,6 @@ mod tests {
 
     const OTHER: u128 = 0x1234;
 
-    /// What `extras` tell the hooks.
-    fn said_of(extras: &Extras) -> Said {
-        let mut said = Said::default();
-        said.settings(extras);
-        said
-    }
-
     /// What another player wears as `extras` shows it, drawn frame after frame for up to
     /// `patience` (the service answers on its own thread), and what was asked of the service.
     fn other_player(
@@ -1014,7 +1182,7 @@ mod tests {
         let client = horizon_cosmetics::Cosmetics::new(service.clone(), None);
         let deadline = Instant::now() + patience;
         let worn = loop {
-            let worn = worn_of(&client, &said_of(extras), false, || Some(OTHER));
+            let worn = worn_of(&client, extras, false, || Some(OTHER));
             if worn.is_some() || Instant::now() >= deadline {
                 break worn;
             }
@@ -1075,7 +1243,7 @@ mod tests {
             let uuid = || own_uuid(Some(OFFLINE), solo, extras.cosmetics_solo, || Some(ACCOUNT));
             let deadline = Instant::now() + patience;
             let worn = loop {
-                let worn = worn_of(&client, &said_of(&extras), true, uuid);
+                let worn = worn_of(&client, &extras, true, uuid);
                 if worn.is_some() || Instant::now() >= deadline {
                     break worn;
                 }
@@ -1230,173 +1398,4 @@ mod tests {
         service.tick(&mut view);
         assert!(view.0[3].1.is_none());
     }
-
-    /// A player model as `player_layers` draws on it: one bone, the sprites it is given; logs
-    /// each draw (mesh, matrix, uv, its root's scale once posed).
-    #[derive(Default)]
-    struct Canvas {
-        pose: Option<Arc<dyn BodyPose>>,
-        sprite: Option<[f32; 4]>,
-        drawn: Vec<(String, [[f32; 4]; 4], [f32; 4], [f32; 3])>,
-        /// The model's matrix (`LEFT_ARM` if None) and how it moves.
-        base: Option<glam::Mat4>,
-        motion: horizon_hooks::players::Motion,
-        /// Each draw's look: see-through alpha and light.
-        looks: Vec<(Option<f32>, horizon_hooks::players::Light)>,
-    }
-
-    const LEFT_ARM: [[f32; 4]; 4] = [[2.0, 0.0, 0.0, 0.0]; 4];
-
-    impl PlayerDraw for Canvas {
-        fn pass(&self) -> horizon_hooks::players::Pass {
-            horizon_hooks::players::Pass::World
-        }
-        fn ticks(&self) -> f32 {
-            102.0
-        }
-        fn base(&self) -> [[f32; 4]; 4] {
-            self.base.map_or(LEFT_ARM, |b| b.to_cols_array_2d())
-        }
-        fn motion(&self) -> horizon_hooks::players::Motion {
-            self.motion
-        }
-        fn view(&self) -> horizon_hooks::players::View {
-            Default::default()
-        }
-        fn particles(
-            &mut self,
-            _: [f32; 4],
-            _: &[horizon_hooks::players::Particle],
-            _: horizon_hooks::players::Light,
-        ) {
-        }
-        fn bone(&mut self, bone: Bone) -> Option<[[f32; 4]; 4]> {
-            (bone == Bone::LeftArm).then_some(LEFT_ARM)
-        }
-        fn body_pose(&self) -> Option<&Arc<dyn BodyPose>> {
-            self.pose.as_ref()
-        }
-        fn sprite(&self, _: u64) -> Option<[f32; 4]> {
-            self.sprite
-        }
-        fn draw(
-            &mut self,
-            mesh: &Arc<Mesh>,
-            matrix: [[f32; 4]; 4],
-            look: Look,
-            pose: &mut dyn FnMut(&mut dyn horizon_hooks::players::PartPoses),
-        ) {
-            struct Rest(std::collections::HashMap<String, [f32; 9]>);
-            impl horizon_hooks::players::PartPoses for Rest {
-                fn pose(&mut self, name: &str) -> &mut [f32; 9] {
-                    self.0.entry(name.to_owned()).or_insert([0.0; 9])
-                }
-            }
-            let mut rest = Rest([(mesh.name.clone(), mesh.pose)].into());
-            pose(&mut rest);
-            let root = rest.0[&mesh.name];
-            self.looks.push((look.see_through, look.light));
-            self.drawn.push((
-                mesh.name.clone(),
-                matrix,
-                look.uv,
-                [root[6], root[7], root[8]],
-            ));
-        }
-    }
-
-    #[test]
-    fn an_emotes_prop_goes_on_its_bone_once_its_texture_is_in_scaled_by_the_blend() {
-        let pop = CROWN
-            .replace(
-                r#""slot": "head", "bone": "head""#,
-                r#""slot": "emote", "bone": "left_arm""#,
-            )
-            .replace(
-                r#""uv": [0, 0]}]}]}"#,
-                r#""uv": [0, 0]}]}],
-                "emote": {"length": 40, "blend": 4, "tracks": [
-                  {"part": "right_arm", "keys": [{"t": 0}, {"t": 40}]}]}}"#,
-            );
-        let item = Arc::new(Item::parse(pop.as_bytes()).unwrap());
-        let playing = horizon_cosmetics::Playing {
-            item: item.clone(),
-            start: 100.0,
-            stop: None,
-        };
-        let (_, weight) = playing.at(102.0).unwrap();
-        assert!(weight > 0.0 && weight < 1.0, "{weight}");
-        let player = PlayerModel::new(9, Kind::Player, Some(5), 102, false);
-        let mut view = View(vec![(player, None)]);
-        emotes::set_model_playing(&mut view, 9, Some(playing));
-        let mut canvas = Canvas {
-            pose: view.0[0].1.clone(),
-            ..Canvas::default()
-        };
-        // Others' cosmetics hidden, no service: the player's own emote still shows.
-        let mut seat = Seat {
-            said: Said {
-                others_hidden: true,
-                ..Said::default()
-            },
-            ..Seat::default()
-        };
-        // Its texture not in the atlas yet: nothing drawn, the sprite asked for.
-        seat.player_layers(&player, &mut canvas);
-        assert!(canvas.drawn.is_empty());
-        assert_eq!(seat.wanted.len(), 1);
-        canvas.sprite = Some([0.0, 0.0, 0.5, 0.5]);
-        seat.player_layers(&player, &mut canvas);
-        // A 16×16 texture: the slot's top left quarter of it.
-        let quarter = 0.5 * 16.0 / 64.0;
-        assert_eq!(canvas.drawn.len(), 1);
-        let (_, matrix, uv, scale) = &canvas.drawn[0];
-        assert_eq!((matrix, uv), (&LEFT_ARM, &[0.0, 0.0, quarter, quarter]));
-        for s in scale {
-            assert!((s - weight).abs() < 1e-6, "{scale:?} by {weight}");
-        }
-    }
-
-    #[test]
-    fn an_aura_goes_see_through_at_the_feet_unless_swimming_far_or_hidden() {
-        use horizon_hooks::players::{Light, Motion};
-        let ring = CROWN
-            .replace(r#""slot": "head", "bone": "head""#, r#""slot": "aura""#)
-            // At the feet: an aura reaches at most 6 pixels above them.
-            .replace(r#""attach": {"offset": [0, -18, 0]},"#, "")
-            .replace(
-                r#""uv": [0, 0]}]}]}"#,
-                r#""uv": [0, 0]}]}], "aura": {"at": "feet", "alpha": 0.5}}"#,
-            );
-        let ring = Arc::new(Item::parse(ring.as_bytes()).unwrap());
-        let at = glam::Vec3::new(3.0, 0.0, 4.0);
-        let mut canvas = Canvas {
-            sprite: Some([0.0, 0.0, 0.5, 0.5]),
-            base: Some(glam::Mat4::from_translation(at)),
-            ..Canvas::default()
-        };
-        let other = PlayerModel::new(9, Kind::Player, Some(5), 102, false);
-        let own = PlayerModel::new(1, Kind::Own, None, 102, false);
-        let mut seat = Seat::default();
-        seat.fx(&other, &ring, &mut canvas);
-        // Half see-through, lit as the wearer, 24 pixels under the neck.
-        assert_eq!(canvas.looks, [(Some(0.5), Light::Model)]);
-        let feet = glam::Mat4::from_cols_array_2d(&canvas.drawn[0].1).w_axis;
-        assert_eq!(feet.truncate(), at + glam::Vec3::new(0.0, 1.5, 0.0));
-        // Swimming, it would tip over with the body: none.
-        canvas.motion = Motion::default().poses(false, false, false, true);
-        seat.fx(&other, &ring, &mut canvas);
-        canvas.motion = Motion::default();
-        // Past 48 blocks: none.
-        canvas.base = Some(glam::Mat4::from_translation(glam::Vec3::X * 49.0));
-        seat.fx(&other, &ring, &mut canvas);
-        assert_eq!(canvas.looks.len(), 1);
-        // Others' trails and auras hidden: theirs go, the player's own stays.
-        canvas.base = Some(glam::Mat4::from_translation(at));
-        seat.said.hide_fx = true;
-        seat.fx(&other, &ring, &mut canvas);
-        assert_eq!(canvas.looks.len(), 1);
-        seat.fx(&own, &ring, &mut canvas);
-        assert_eq!(canvas.looks.len(), 2);
-    }
 }

crates/horizon-client/src/game/cosmetics/emotes.rs

@@ -71,6 +71,11 @@ pub(in crate::game) fn pose_playing(pose: Option<&Arc<dyn BodyPose>>) -> Option<
     any.downcast_ref::<EmotePose>().map(|e| &e.0)
 }
 
+/// The emote `m` plays, if any.
+pub(in crate::game) fn playing(m: &Mob) -> Option<&Playing> {
+    pose_playing(m.emote.as_ref())
+}
+
 /// The pose that plays `next` where `now` is laid, unless it plays that already (None: keep
 /// it; a new one allocates).
 fn replaced(

crates/horizon-client/src/game/cosmetics/fx.rs

@@ -1,78 +1,47 @@
 //! Companions, trails and auras ([docs/cosmetics.md](../../../../../docs/cosmetics.md)): worn
 //! like the other cosmetics but on no bone. A companion floats beside its wearer and follows with
 //! a lag (`horizon_cosmetics::follow`), drawn with the wearer; a trail's particles
-//! (`horizon_cosmetics::trail`) and an aura blend, so they are drawn see-through after every
-//! player (`PlayerDraw::particles`, `Look::see_through`). Nothing of them is an entity, collides
-//! or is sent to a server.
+//! (`horizon_cosmetics::trail`) and an aura blend, so they go after every player in one
+//! see-through span (`cosmetics_fx_geometry`). Nothing of them is an entity, collides or is sent
+//! to a server.
 
-use super::Seat;
+use super::{FULL_LIGHT, OWN};
+use crate::game::Game;
 use glam::{DVec3, Mat4, Vec3};
-use horizon_client::fast_hash::FxHashMap;
+use horizon_client::mesher::Vertex;
+use horizon_client::mobs::anim::Poses;
+use horizon_client::mobs::{Mob, Part};
 use horizon_cosmetics::follow::{self, Follow};
-use horizon_cosmetics::trail::{Budget, Emitter};
+use horizon_cosmetics::trail::Emitter;
 use horizon_cosmetics::{Item, Slot};
-use horizon_hooks::players::{Kind, Light, Look, Particle, Pass, PlayerDraw, PlayerModel};
 use std::sync::Arc;
-use std::time::Instant;
 
 /// How far from the camera (blocks) a wearer's companion, trail and aura are drawn.
 const FAR: f32 = 48.0;
 
-/// The key of the player's own model in `Fx`'s maps (others go by entity id).
-const OWN: u32 = u32::MAX;
-
-/// What companions and trails keep between frames, per wearer (marked with the frame they were
-/// last drawn in; the others are dropped).
-#[derive(Default)]
-pub(super) struct Fx {
-    companions: FxHashMap<u32, (Follow, u32)>,
-    trails: FxHashMap<u32, (Emitter, u32)>,
-    budget: Budget,
-    clock: Option<(Instant, Instant)>,
-    /// Ticks since the first frame, and the last frame's length in seconds.
-    now: f64,
-    dt: f32,
-    frame: u32,
-    /// Kept so a frame of trails allocates none.
-    particles: Vec<Particle>,
+/// Who wears it, as drawn this frame.
+pub(super) struct Wearer<'a> {
+    pub m: &'a Mob,
+    /// The player's own model.
+    pub own: bool,
+    /// `OWN`, or the entity id.
+    pub key: u32,
+    /// The wearer's model matrix (`render::base_transform`), relative to `camera`.
+    pub base: Mat4,
+    pub camera: DVec3,
+    pub alpha: f32,
+    pub light: u32,
 }
 
-impl Fx {
-    /// A new frame: the clock moves on and what no frame drew since the last one goes.
-    pub(super) fn frame(&mut self) {
-        self.frame = self.frame.wrapping_add(1);
-        let frame = self.frame;
-        let now = Instant::now();
-        let (start, last) = self.clock.get_or_insert((now, now));
-        self.dt = now.duration_since(*last).as_secs_f32().min(0.25);
-        self.now = now.duration_since(*start).as_secs_f64() * 20.0;
-        *last = now;
-        let seen = |mark: u32| frame.wrapping_sub(mark) <= 1;
-        self.companions.retain(|_, (_, mark)| seen(*mark));
-        let budget = &mut self.budget;
-        self.trails.retain(|_, (e, mark)| {
-            let keep = seen(*mark);
-            if !keep {
-                e.clear(budget);
-            }
-            keep
-        });
-    }
+/// `m`'s head yaw this frame (degrees).
+fn head_yaw(m: &Mob, alpha: f32) -> f32 {
+    let turn = horizon_client::mobs::living::wrap(m.head_yaw - m.previous_head_yaw);
+    m.previous_head_yaw + turn * alpha
+}
 
-    /// The companion of wearer `key` moved toward `target` (once a frame, however many times it
-    /// is drawn).
-    fn follow(&mut self, key: u32, target: DVec3, yaw: f32, lag: f32) -> Follow {
-        let (frame, dt) = (self.frame, self.dt);
-        let (f, mark) = self
-            .companions
-            .entry(key)
-            .or_insert((Follow::at(target, yaw), frame));
-        if *mark != frame {
-            f.step(target, yaw, lag, dt);
-            *mark = frame;
-        }
-        *f
-    }
+/// Whether `m` lies in a bed.
+fn asleep(m: &Mob) -> bool {
+    m.extra.avatar_pose == horizon_client::pose::Pose::Sleeping
 }
 
 /// Where a companion floats: `at` (relative to the camera) facing `yaw`, at the wearer's scale,
@@ -83,144 +52,270 @@ fn companion_matrix(at: Vec3, yaw: f32, scale: f32) -> Mat4 {
         * Mat4::from_scale(Vec3::new(-scale, -scale, scale))
 }
 
-/// Full light for what glows, else `otherwise`.
-fn glowing(glow: bool, otherwise: Light) -> Light {
-    if glow { Light::Full } else { otherwise }
-}
-
-impl Seat {
-    /// A companion, trail or aura `m` wears, around its model as `draw` draws it. Other players'
-    /// trails and auras stay hidden with "Hide other players' trails and auras".
-    pub(super) fn fx(&mut self, m: &PlayerModel, item: &Arc<Item>, draw: &mut dyn PlayerDraw) {
-        let own = m.kind == Kind::Own;
-        if !own && item.slot.is_effect() && self.said.hide_fx {
-            return;
+impl Game<'_> {
+    /// A companion, trail or aura `at` wears: a companion goes where the wearer's other items go
+    /// (`gpu` and `out`, `bounds` grown), trails and auras to the frame's see-through vertices.
+    /// Other players' trails and auras stay hidden with "Hide other players' trails and auras".
+    pub(super) fn cosmetics_fx(
+        &self,
+        at: &Wearer,
+        item: &Arc<Item>,
+        gpu: bool,
+        bounds: Option<(Vec3, Vec3)>,
+        poses: &mut Poses,
+        out: &mut Vec<Vertex>,
+    ) -> Option<(Vec3, Vec3)> {
+        if !at.own && item.slot.is_effect() && self.settings.extras.cosmetics_hide_fx {
+            return bounds;
         }
         // Past `FAR` a companion, trail or aura is a few pixels across for the cost of a model:
         // not drawn, and a trail that isn't drawn doesn't spawn (its particles go back to the
         // budget).
-        let base = Mat4::from_cols_array_2d(&draw.base());
-        if base.w_axis.truncate().length_squared() > FAR * FAR {
-            return;
+        if at.base.w_axis.truncate().length_squared() > FAR * FAR {
+            return bounds;
         }
-        let Some(uv) = self.uv(item, |id| draw.sprite(id)) else {
-            return;
-        };
-        let key = if own { OWN } else { m.id };
         match item.slot {
-            Slot::Companion => self.companion(key, item, uv, base, draw),
-            Slot::Trail => self.trail(key, item, uv, draw),
-            Slot::Aura => self.aura(item, uv, base, draw),
-            _ => {}
+            Slot::Companion => {
+                let Some((model, uv, matrix)) = self.companion_at(at, item, None) else {
+                    return bounds;
+                };
+                self.pose_companion(item, at.m, at.alpha, poses, &model);
+                let glow = item.companion.as_ref().is_some_and(|c| c.glow);
+                let light = if glow { FULL_LIGHT } else { at.light };
+                self.cosmetics_model(&model, matrix, poses, uv, light, gpu, bounds, out)
+            }
+            Slot::Trail => {
+                self.trail(at, item);
+                bounds
+            }
+            Slot::Aura => {
+                self.aura(at, item, poses);
+                bounds
+            }
+            _ => bounds,
         }
     }
 
-    /// The companion where it floats, its follow moved on once a frame. In first person it keeps
-    /// out of the middle of the view, lit where it floats.
-    fn companion(
-        &mut self,
-        key: u32,
+    /// The companion's model, texture and matrix this frame, its follow moved on once a frame.
+    /// `first_person`: the camera's forward and left, for the player's own in first person: the
+    /// companion keeps out of the middle of the view.
+    fn companion_at(
+        &self,
+        at: &Wearer,
         item: &Arc<Item>,
-        uv: [f32; 4],
-        base: Mat4,
-        draw: &mut dyn PlayerDraw,
-    ) {
-        let Some(c) = item.companion.as_ref() else {
-            return;
-        };
-        let Some((_, mesh)) = self.kept(item).meshes.first().cloned() else {
-            return;
-        };
-        let first_person = draw.pass() == Pass::FirstPerson;
-        let (motion, view) = (draw.motion(), draw.view());
-        let camera = DVec3::from(view.camera);
-        let scale = base.x_axis.truncate().length();
-        let target = base.transform_point3(Vec3::from(c.anchor) / 16.0);
-        let head = base.transform_point3(Vec3::from(horizon_cosmetics::HEAD) / 16.0);
-        let follow = self
-            .fx
-            .follow(key, camera + target.as_dvec3(), motion.head_yaw, c.lag);
+        first_person: Option<(Vec3, Vec3)>,
+    ) -> Option<(Arc<Part>, [f32; 4], Mat4)> {
+        let c = item.companion.as_ref()?;
+        let (models, uv) = self.cosmetics_baked(item)?;
+        let model = models.first()?.1.clone();
+        let scale = at.base.x_axis.truncate().length();
+        let target = at.base.transform_point3(Vec3::from(c.anchor) / 16.0);
+        let head = at
+            .base
+            .transform_point3(Vec3::from(horizon_cosmetics::HEAD) / 16.0);
+        let yaw = head_yaw(at.m, at.alpha);
+        let follow = self.companion_follow(at.key, at.camera + target.as_dvec3(), yaw, c.lag);
         let clearance = (horizon_cosmetics::HEAD_CLEARANCE + c.reach) / 16.0 * scale;
-        let mut rel = (follow.pos - camera).as_vec3();
-        if first_person {
-            rel = follow::out_of_view(rel, Vec3::from(view.forward), Vec3::from(view.left));
+        let mut rel = (follow.pos - at.camera).as_vec3();
+        if let Some((forward, left)) = first_person {
+            rel = follow::out_of_view(rel, forward, left);
         }
         rel = follow::clear_of(rel, head, clearance);
-        let matrix = companion_matrix(rel, follow.yaw, scale).to_cols_array_2d();
-        let near = if first_person {
-            Light::AtPlace
-        } else {
-            Light::Model
-        };
-        let look = Look::new(uv).lit(glowing(c.glow, near));
-        let ticks = draw.ticks();
-        // Its animations, and its `look` part turned with the wearer's pitch.
-        let pitch = (motion.head_pitch * 0.6).clamp(-30.0, 30.0).to_radians();
-        draw.draw(&mesh, matrix, look, &mut |p| {
-            item.animate(ticks, |name, pose| *p.pose(name) = pose);
-            if let Some(part) = c.look.as_deref() {
-                p.pose(part)[3] += pitch;
-            }
-        });
+        Some((model, uv, companion_matrix(rel, follow.yaw, scale)))
+    }
+
+    /// The companion of wearer `key` moved toward `target` (once a frame, however many times it
+    /// is drawn).
+    fn companion_follow(&self, key: u32, target: DVec3, yaw: f32, lag: f32) -> Follow {
+        let frame = self.cosmetics.frame.get();
+        let mut fx = self.cosmetics.fx.borrow_mut();
+        let dt = fx.dt;
+        let (f, mark) = fx
+            .companions
+            .entry(key)
+            .or_insert((Follow::at(target, yaw), frame));
+        if *mark != frame {
+            f.step(target, yaw, lag, dt);
+            *mark = frame;
+        }
+        *f
+    }
+
+    /// The companion's animations, and its `look` part turned with the wearer's pitch.
+    fn pose_companion(&self, item: &Item, m: &Mob, alpha: f32, poses: &mut Poses, model: &Part) {
+        poses.reset(model);
+        item.animate(m.age as f32 + alpha, |name, pose| *poses.get(name) = pose);
+        if let Some(look) = item.companion.as_ref().and_then(|c| c.look.as_deref()) {
+            let pitch = m.previous_head_pitch + (m.head_pitch - m.previous_head_pitch) * alpha;
+            poses.get(look)[3] += (pitch * 0.6).clamp(-30.0, 30.0).to_radians();
+        }
     }
 
     /// The trail's particles: spawned once a frame by the distance walked (not while sneaking or
     /// asleep), facing the camera.
-    fn trail(&mut self, key: u32, item: &Arc<Item>, uv: [f32; 4], draw: &mut dyn PlayerDraw) {
+    fn trail(&self, at: &Wearer, item: &Arc<Item>) {
         let Some(t) = &item.trail else {
             return;
         };
-        let (motion, view) = (draw.motion(), draw.view());
-        let moves = !motion.crouching && !motion.asleep;
-        let Fx {
+        let Some((_, uv)) = self.cosmetics_baked(item) else {
+            return;
+        };
+        let m = at.m;
+        let a = f64::from(at.alpha);
+        let feet = DVec3::new(
+            m.previous.x + (m.position.x - m.previous.x) * a,
+            m.previous.y + (m.position.y - m.previous.y) * a,
+            m.previous.z + (m.position.z - m.previous.z) * a,
+        );
+        let moves = !m.extra.crouching && !asleep(m);
+        let q = self.camera_orientation();
+        let (right, up) = (q * Vec3::X, q * Vec3::Y);
+        let light = if t.glow { FULL_LIGHT } else { at.light };
+        let frame = self.cosmetics.frame.get();
+        let mut fx = self.cosmetics.fx.borrow_mut();
+        let super::Fx {
             trails,
             budget,
             now,
-            frame,
-            particles,
+            clear,
             ..
-        } = &mut self.fx;
+        } = &mut *fx;
         let (e, mark) = trails
-            .entry(key)
+            .entry(at.key)
             .or_insert_with(|| (Emitter::default(), frame.wrapping_sub(1)));
-        if *mark != *frame {
-            e.step(t, DVec3::from(motion.feet), moves, *now, budget);
-            *mark = *frame;
+        if *mark != frame {
+            e.step(t, feet, moves, *now, budget);
+            *mark = frame;
+        }
+        for quad in e.quads(t, *now, at.camera, right, up) {
+            let color = ((quad.alpha.clamp(0.0, 1.0) * 255.0) as u32) << 24 | 0x00FF_FFFF;
+            for (corner, [u, v]) in quad.corners.iter().zip(quad.uv) {
+                clear.push(Vertex {
+                    pos: corner.to_array(),
+                    uv: [uv[0] + (uv[2] - uv[0]) * u, uv[1] + (uv[3] - uv[1]) * v],
+                    layer: 0,
+                    color,
+                    light,
+                    // Unlit: a particle keeps its colour whichever way it faces.
+                    normal: [0, 0, 0, 0],
+                    glint_uv: [0.0, 0.0],
+                });
+            }
         }
-        let (camera, right, up) = (
-            DVec3::from(view.camera),
-            Vec3::from(view.right),
-            Vec3::from(view.up),
-        );
-        particles.clear();
-        particles.extend(
-            e.quads(t, *now, camera, right, up)
-                .map(|q| Particle::new(q.corners.map(|c| c.to_array()), q.uv, q.alpha)),
-        );
-        draw.particles(uv, particles, glowing(t.glow, Light::Model));
     }
 
     /// The aura at the wearer's feet, see-through. None while they fly, swim or sleep: it would
     /// tip over with the body.
-    fn aura(&mut self, item: &Arc<Item>, uv: [f32; 4], base: Mat4, draw: &mut dyn PlayerDraw) {
-        let Some(a) = &item.aura else {
+    fn aura(&self, at: &Wearer, item: &Arc<Item>, poses: &mut Poses) {
+        let (m, Some(a)) = (at.m, &item.aura) else {
             return;
         };
-        let motion = draw.motion();
-        if motion.flying || motion.asleep || motion.swimming {
+        if m.extra.fall_flying || asleep(m) || m.extra.swim.amount(at.alpha) > 0.0 {
             return;
         }
-        let Some((_, mesh)) = self.kept(item).meshes.first().cloned() else {
+        let Some((models, uv)) = self.cosmetics_baked(item) else {
+            return;
+        };
+        let Some((_, model)) = models.first() else {
             return;
         };
         // The model's origin is the middle of the feet: 24 pixels under the neck.
-        let matrix = base * Mat4::from_translation(Vec3::new(0.0, 24.0 / 16.0, 0.0));
-        let look = Look::new(uv)
-            .lit(glowing(a.glow, Light::Model))
-            .see_through(a.alpha);
-        let ticks = draw.ticks();
-        draw.draw(&mesh, matrix.to_cols_array_2d(), look, &mut |p| {
-            item.animate(ticks, |name, pose| *p.pose(name) = pose)
+        let matrix = at.base * Mat4::from_translation(Vec3::new(0.0, 24.0 / 16.0, 0.0));
+        poses.reset(model);
+        item.animate(m.age as f32 + at.alpha, |name, pose| {
+            *poses.get(name) = pose
         });
+        let light = if a.glow { FULL_LIGHT } else { at.light };
+        let mut fx = self.cosmetics.fx.borrow_mut();
+        let start = fx.clear.len();
+        horizon_client::mobs::render_model(
+            model,
+            matrix,
+            &|p: &Part| poses.pose(p),
+            uv,
+            light,
+            0,
+            &mut fx.clear,
+        );
+        let color = ((a.alpha * 255.0) as u32) << 24 | 0x00FF_FFFF;
+        for v in &mut fx.clear[start..] {
+            v.color = color;
+            // Seen through, a face turned away would add to the near one (and a card's two
+            // faces would double it): `entity.wgsl` drops back faces, so it is `alpha` at most.
+            v.normal[3] = horizon_client::mesher::SHADED_CULL_W;
+        }
+    }
+
+    /// After every player: the player's own companion in first person (out of the middle of the
+    /// view, after the first-person model went to the shadow pass only), then the frame's trails
+    /// and auras in one see-through span.
+    pub(in crate::game) fn cosmetics_fx_geometry(
+        &self,
+        camera: DVec3,
+        alpha: f64,
+        out: &mut Vec<Vertex>,
+    ) {
+        if !super::enabled() {
+            return;
+        }
+        if !self.own_body_in_view()
+            && let Some(m) = self.player_model.as_ref()
+        {
+            self.mark_entity(out.len(), "minecraft:player");
+            self.own_companion_first_person(m, camera, alpha as f32, out);
+        }
+        let fx = self.cosmetics.fx.borrow();
+        if !fx.clear.is_empty() {
+            self.mark_translucent_entity(out.len(), "minecraft:player");
+            out.extend_from_slice(&fx.clear);
+        }
+    }
+
+    fn own_companion_first_person(
+        &self,
+        m: &Mob,
+        camera: DVec3,
+        alpha: f32,
+        out: &mut Vec<Vertex>,
+    ) {
+        if horizon_client::mobs::trader::is_invisible(m) || self.own_invisible() {
+            return;
+        }
+        let Some(worn) = self.worn(m, true) else {
+            return;
+        };
+        let Some(item) = worn.iter().find(|i| i.slot == Slot::Companion) else {
+            return;
+        };
+        let at = Wearer {
+            m,
+            own: true,
+            key: OWN,
+            base: horizon_client::mobs::render::base_transform(m, alpha, camera),
+            camera,
+            alpha,
+            light: FULL_LIGHT,
+        };
+        let (yaw, pitch) = (self.yaw.to_radians(), self.pitch.to_radians());
+        let forward = Vec3::new(
+            -yaw.sin() * pitch.cos(),
+            -pitch.sin(),
+            yaw.cos() * pitch.cos(),
+        );
+        let left = Vec3::new(yaw.cos(), 0.0, yaw.sin());
+        let Some((model, uv, matrix)) = self.companion_at(&at, item, Some((forward, left))) else {
+            return;
+        };
+        // Lit where it floats.
+        let p = (camera + matrix.w_axis.truncate().as_dvec3()).floor();
+        let light = self.world.light(p.x as i32, p.y as i32, p.z as i32);
+        let mut light = (u32::from(light >> 4) * 16) | ((u32::from(light & 15) * 16) << 8);
+        if item.companion.as_ref().is_some_and(|c| c.glow) {
+            light = FULL_LIGHT;
+        }
+        let mut poses = self.cosmetics.poses.borrow_mut();
+        let poses = &mut poses.1;
+        self.pose_companion(item, m, alpha, poses, &model);
+        self.cosmetics_model(&model, matrix, poses, uv, light, false, None, out);
     }
 }

crates/horizon-client/src/game/discord.rs

@@ -0,0 +1,49 @@
+//! What the player is doing, for Discord Rich Presence (`horizon_client::discord_presence`).
+use super::*;
+use horizon_client::discord_presence::{self as presence, Dimension, Play, Status};
+
+impl Game<'_> {
+    /// Each frame: only a change reaches the presence thread.
+    pub(super) fn update_discord_presence(&self) {
+        // One Discord status per computer: P1's, not a splitscreen player's.
+        if self.options.split_guest {
+            return;
+        }
+        presence::set(self.discord_status());
+    }
+    fn discord_status(&self) -> Status {
+        if !self.settings.extras.discord_presence {
+            return Status::Off;
+        }
+        if self.title.is_some() {
+            return Status::Menus;
+        }
+        let play = if let Some(host) = &self.lan {
+            Play::Hosting {
+                players: 1 + host.hub.guests.len(),
+                max: horizon_client::lan::MAX_PLAYERS,
+            }
+        } else if let Some(server) = &self.integrated {
+            match (server.published(), &self.remote) {
+                (Some(_), Some(remote)) => Play::Hosting {
+                    players: remote.player_count(),
+                    max: horizon_client::lan::MAX_PLAYERS,
+                },
+                _ => Play::Singleplayer,
+            }
+        } else if self.remote.is_some() {
+            Play::Multiplayer
+        } else {
+            Play::Singleplayer
+        };
+        Status::World {
+            play,
+            dimension: match self.dim {
+                Dim::Overworld => Dimension::Overworld,
+                Dim::Nether => Dimension::Nether,
+                Dim::End => Dimension::End,
+            },
+            mode: self.mode,
+        }
+    }
+}

crates/horizon-client/src/game/loading_screen.rs

@@ -34,6 +34,8 @@ pub(super) fn run_event_loop(mut game: Game<'_>) -> Result<()> {
     narrator::stop();
     leave_fullscreen_after(&result, &mut game.settings);
     result?;
+    #[cfg(feature = "discord")]
+    horizon_client::discord_presence::stop();
     write_report(&game)?;
     if let Some(e) = game.error.take() {
         return Err(e);
@@ -96,8 +98,9 @@ impl Loading {
             .map_or([1280, 720], |o| o.window_size)
             .map(f64::from);
         self.fullscreen = horizon_client::window::FullscreenState::new(fullscreen);
-        let attributes =
-            horizon_client::window::with_icon(Window::default_attributes().with_title("Horizon"));
+        let attributes = horizon_client::window::with_horizon_icon(
+            Window::default_attributes().with_title("Horizon"),
+        );
         // Wayland names the window by its app id, which the horizon.desktop entry matches.
         #[cfg(target_os = "linux")]
         let attributes = winit::platform::wayland::WindowAttributesExtWayland::with_name(
@@ -127,25 +130,22 @@ impl Loading {
         // redraw the same design when they start. GDI is unsafe:
         // horizon-threads holds it (this crate forbids unsafe code).
         #[cfg(target_os = "windows")]
-        // In the fonts given to `menu_style`; with none, the window stays as it is.
-        let boot_paint_stop = hwnd(&window)
-            .zip(horizon_client::menu_style::get().fonts)
-            .map(|(hwnd, fonts)| {
-                let stop = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
-                let repaint_stop = stop.clone();
-                std::thread::spawn(move || {
-                    while !repaint_stop.load(std::sync::atomic::Ordering::Relaxed) {
-                        horizon_threads::boot_paint::paint(
-                            hwnd,
-                            fonts.semibold,
-                            fonts.mono,
-                            &horizon_client::logging::recent_lines(),
-                        );
-                        std::thread::sleep(std::time::Duration::from_millis(300));
-                    }
-                });
-                stop
+        let boot_paint_stop = hwnd(&window).map(|hwnd| {
+            let stop = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
+            let repaint_stop = stop.clone();
+            std::thread::spawn(move || {
+                while !repaint_stop.load(std::sync::atomic::Ordering::Relaxed) {
+                    horizon_threads::boot_paint::paint(
+                        hwnd,
+                        horizon_theme::fonts::GEIST_SEMIBOLD,
+                        horizon_theme::fonts::GEIST_MONO,
+                        &horizon_client::logging::recent_lines(),
+                    );
+                    std::thread::sleep(std::time::Duration::from_millis(300));
+                }
             });
+            stop
+        });
         let offscreen = self.options.as_ref().is_some_and(|o| o.offscreen);
         let boot_step = startup::step("renderer.boot");
         match loading_renderer(

crates/horizon-client/src/game/no_resources.rs

@@ -93,9 +93,10 @@ impl ApplicationHandler for Missing {
         if self.window.is_some() {
             return;
         }
-        let attributes =
-            horizon_client::window::with_icon(Window::default_attributes().with_title("Horizon"))
-                .with_inner_size(winit::dpi::LogicalSize::new(1040.0, 700.0));
+        let attributes = horizon_client::window::with_horizon_icon(
+            Window::default_attributes().with_title("Horizon"),
+        )
+        .with_inner_size(winit::dpi::LogicalSize::new(1040.0, 700.0));
         let made = event_loop
             .create_window(attributes)
             .map_err(Into::into)

crates/horizon-client/src/game/perspective.rs

@@ -801,8 +801,19 @@ impl Game<'_> {
                 packed,
                 out,
             );
-            let world = horizon_hooks::players::Pass::World;
-            self.own_layers_geometry(m, world, camera, alpha as f32, packed, out);
+            if super::cosmetics::enabled() {
+                let base = horizon_client::mobs::render::base_transform(m, alpha as f32, camera);
+                self.cosmetics_geometry(
+                    m,
+                    true,
+                    base,
+                    Some(camera),
+                    alpha as f32,
+                    packed,
+                    false,
+                    out,
+                );
+            }
             self.player_elytra_geometry(m, chest, camera, alpha as f32, packed, out);
             self.spin_attack_geometry(m, camera, alpha as f32, packed, out);
             self.shoulder_parrots_geometry(m, camera, alpha as f32, packed, out);
@@ -916,8 +927,10 @@ impl Game<'_> {
             240 | 240 << 8,
             &mut verts,
         );
-        let picture = horizon_hooks::players::Pass::Picture;
-        self.own_layers_geometry(&m, picture, camera, 1.0, 240 | 240 << 8, &mut verts);
+        if super::cosmetics::enabled() {
+            let base = horizon_client::mobs::render::base_transform(&m, 1.0, camera);
+            self.cosmetics_geometry(&m, true, base, None, 1.0, 240 | 240 << 8, false, &mut verts);
+        }
         // `WingsLayer` draws through `RenderTypes.armorCutoutNoCull`: the
         // wings' faces show from both sides (the elytra texture is empty on
         // the face that looks at the body).

crates/horizon-client/src/game/piston_push.rs

@@ -738,11 +738,14 @@ impl Game<'_> {
         });
         self.set_pushed_on_ground(target, limited, resolved);
 
-        // shortcut: unoccupied server mobs only, expand when controller/passenger authority is bound.
-        let mob = if let Target::Entity(EntityHandle::Mob(i)) = target {
+        // Entity.move updates ground before its tiny-collision return. This
+        // native slice covers only unoccupied server NoAI horizontal moves.
+        if let Target::Entity(EntityHandle::Mob(i)) = target {
             let m = &self.mobs[i];
-            (!self.options.execution_role.is_client()
+            let eligible = !self.options.execution_role.is_client()
                 && self.remote.is_none()
+                && limited.y == 0.0
+                && m.no_ai
                 && !m.extra.passenger
                 && m.extra.mount.is_none()
                 && m.rider.is_none()
@@ -754,22 +757,16 @@ impl Game<'_> {
                         .guests
                         .iter()
                         .any(|g| host.hub.here(g) && g.vehicle == Some(m.id))
-                }))
-            .then_some(i)
-        } else {
-            None
-        };
-        // Entity.move updates ground before its tiny-collision return.
-        if let Some(i) = mob
-            && self.mobs[i].no_ai
-        {
-            self.mobs[i].on_ground = limited.y < 0.0 && limited.y != resolved.y;
-        }
-        let tnt_after_move =
-            tnt.is_some() && !self.options.execution_role.is_client() && self.remote.is_none();
-        if mob.is_none() && !tnt_after_move {
-            self.restitute_piston(target, limited, resolved);
+                });
+            if eligible {
+                self.mobs[i].on_ground = limited.y < 0.0 && limited.y != resolved.y;
+            }
         }
+        // `Entity.move(MoverType.PISTON, …)` restitution, which runs whether or
+        // not the step is applied: so a primed TNT in a chunk that does not tick
+        // entities still loses its velocity into walls and ceilings and
+        // bounces on slime (#12022).
+        self.restitute_piston(target, limited, resolved);
         let moved = resolved.length_squared() > 1.0e-7
             || limited.length_squared() - resolved.length_squared() < 1.0e-7;
         if moved {
@@ -778,12 +775,6 @@ impl Game<'_> {
             // A move the collisions cut to nothing still ends in the check.
             self.release_after_block_move(target);
         }
-        // Restitution reads the new landing block even when the push was blocked.
-        if let Some(i) = mob {
-            self.mobs[i].restitute_movement(&self.world, &self.motion.blocks, limited, resolved);
-        } else if tnt_after_move {
-            self.restitute_piston(target, limited, resolved);
-        }
         if let Some((i, from, ..)) = tnt {
             self.finish_tnt_piston_move(i, from, resolved);
         }
@@ -1062,7 +1053,6 @@ mod tests {
 mod order_tests {
     use crate::game::{Audio, Game, Options, Progress, Settings, load_resources};
     use horizon_client::chunk::Chunk;
-    use horizon_core::geometry::Vec3;
     use horizon_core::{geometry::Direction, position::BlockPos};
     use horizon_world::level::pistons::MovingPiston;
     use std::sync::Arc;
@@ -1161,9 +1151,8 @@ mod order_tests {
         }
         // The near stone's box reaches x 5.5 into a TNT from x 5.01: 0.49 plus
         // PUSH_OFFSET; the far stone's old box stops it at x 6.
-        // Vanilla's TNT width is 0.98F, not the exact decimal 0.98.
         assert!(
-            (moved[0] - 0.500000009536743).abs() < 1e-9,
+            (moved[0] - 0.5).abs() < 1e-9,
             "far stone gone first: {}",
             moved[0]
         );
@@ -1262,7 +1251,7 @@ mod order_tests {
     }
 
     /// A primed TNT pushed down by a piston onto a slime block bounces up,
-    /// matching vanilla's restitution even in a lazy chunk (#12022).
+    /// matching vanilla's slime restitution (~+0.64) even in a lazy chunk (#12022).
     #[test]
     #[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES"]
     fn a_pushed_tnt_bounces_on_slime() {
@@ -1323,36 +1312,32 @@ mod order_tests {
             death_ticks: 0,
             id: 1,
         };
-        // Pinned 26.3 PistonMovingBlockEntity.moveCollidedEntities, without entity ticks.
-        for (floor, y, vy, final_y, final_vy) in [
-            (slime, 200.5, -0.4, 200.0, 0.3510000138133766_f64),
-            (stone, 200.5, -0.4, 200.0, 0.0),
-            (slime, 200.0, -0.4, 200.0, 0.3200000047683716),
-            (slime, 200.00001, -0.4, 200.00001, 0.32000064476813395),
-            (slime, 200.5, 0.3, 200.0, 0.0),
-        ] {
-            game.world.set(5, 199, 5, floor).unwrap();
-            game.block_ticks.moving_pistons = vec![(BlockPos::new(5, 200, 5), piston)];
-            game.sync_moving_pistons();
-            game.tnts.clear();
-            assert!(game.run_command(&format!(
-                "summon tnt 5.5 {y} 5.5 {{fuse:80,Motion:[0.0d,{vy}d,0.0d]}}"
-            )));
-            assert_eq!(game.tnts[0].velocity.y, vy);
-            let pushes: Vec<_> = game
-                .block_ticks
-                .moving_pistons
-                .iter()
-                .map(|&(pos, old)| (pos, old, old.progress + 0.5))
-                .collect();
-            for (_, piston) in &mut game.block_ticks.moving_pistons {
-                piston.progress += 0.5;
-            }
-            game.push_piston_entities(pushes);
-            assert_eq!(game.tnts[0].position, Vec3::new(5.5, final_y, 5.5));
-            assert_eq!(game.tnts[0].velocity.y.to_bits(), final_vy.to_bits());
-            assert!(game.tnts[0].on_ground);
+        game.block_ticks.moving_pistons = vec![(BlockPos::new(5, 200, 5), piston)];
+        game.sync_moving_pistons();
+        game.tnts.clear();
+        assert!(game.run_command("summon tnt 5.5 200.5 5.5 {fuse:80,Motion:[0.0d,-0.4d,0.0d]}"));
+        assert!(
+            (game.tnts[0].velocity.y - (-0.4)).abs() < 1.0e-9,
+            "TNT starts with vy -0.4, got {:?}",
+            game.tnts[0].velocity
+        );
+        // Piston advances from progress 0 to 0.5 and pushes the TNT down.
+        let pushes: Vec<_> = game
+            .block_ticks
+            .moving_pistons
+            .iter()
+            .map(|&(pos, old)| (pos, old, old.progress + 0.5))
+            .collect();
+        for (_, piston) in &mut game.block_ticks.moving_pistons {
+            piston.progress += 0.5;
         }
+        game.push_piston_entities(pushes);
+        // The slime block at y=199 bounces the TNT up; vertical velocity must be positive.
+        assert!(
+            game.tnts[0].velocity.y > 0.0,
+            "TNT should bounce up on slime, got vy {:?}",
+            game.tnts[0].velocity
+        );
     }
 }
 
@@ -1617,54 +1602,6 @@ mod h255_mob_piston_ground_tests {
     }
     #[test]
     #[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES"]
-    fn h255_added_tnt_authority_and_exhausted_budget() {
-        use crate::game::execution_role::ExecutionRole;
-        for role in [
-            ExecutionRole::Client,
-            ExecutionRole::IntegratedServer,
-            ExecutionRole::DedicatedServer,
-        ] {
-            with_role_game(role, |game| {
-                assert!(game.run_command("setblock 5 199 5 slime_block"));
-                assert!(
-                    game.run_command("summon tnt 5.5 200.5 5.5 {fuse:80,Motion:[0d,-0.4d,0d]}")
-                );
-                let mut budget = std::collections::HashMap::new();
-                let push = |game: &mut Game<'_>,
-                            budget: &mut std::collections::HashMap<_, _>,
-                            movement| {
-                    let tnt = &game.tnts[0];
-                    game.move_pushed(
-                        Target::Entity(EntityHandle::Tnt(0)),
-                        tnt.bounds(),
-                        [tnt.position.x, tnt.position.z],
-                        0.0,
-                        tnt.on_ground,
-                        movement,
-                        Direction::Down,
-                        budget,
-                    );
-                };
-                push(game, &mut budget, Vec3::ZERO);
-                assert_eq!(game.tnts[0].position.y, 200.5);
-                assert_eq!(game.tnts[0].velocity.y, -0.4);
-                push(game, &mut budget, Vec3::new(0.0, -0.51, 0.0));
-                let expected = if role.is_client() {
-                    0.0_f64
-                } else {
-                    0.3510000138133766
-                };
-                assert_eq!(game.tnts[0].velocity.y.to_bits(), expected.to_bits());
-                game.tnts[0].position.y = 200.5;
-                game.tnts[0].velocity.y = -0.4;
-                push(game, &mut budget, Vec3::new(0.0, -0.51, 0.0));
-                assert_eq!(game.tnts[0].position.y, 200.5);
-                assert_eq!(game.tnts[0].velocity.y, -0.4);
-            });
-        }
-    }
-    #[test]
-    #[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES"]
     fn h255_added_no_request_and_exhausted_budget_keep_state() {
         with_game(|game| {
             let i = added_mob(game, 20, "horse", true, 8.5);
@@ -1676,16 +1613,6 @@ mod h255_mob_piston_ground_tests {
             added_push(game, i, Vec3::new(0.51, 0.0, 0.0));
             assert!(game.mobs[i].on_ground, "occupied path remains excluded");
             assert_eq!(game.mobs[i].position, Vec3::new(9.01, 202.0, 4.5));
-            assert!(game.run_command("setblock 9 201 4 slime_block"));
-            game.mobs[i].position.y = 202.25;
-            game.mobs[i].velocity = Vec3::new(0.0, -1.0, 0.0);
-            game.mobs[i].sync_position = false;
-            added_push(game, i, Vec3::new(0.0, -0.5, 0.0));
-            assert_eq!(
-                game.mobs[i].velocity.y, 0.0,
-                "occupied restitution stays outside this slice"
-            );
-            assert!(!game.mobs[i].sync_position);
             assert!(game.run_command("ride @s dismount"));
             assert!(game.riding.is_none());
             assert!(game.mobs[i].rider.is_none());
@@ -1728,46 +1655,23 @@ mod h255_mob_piston_ground_tests {
     }
     #[test]
     #[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES"]
-    fn h255_added_client_role_ai_and_vertical_ground_state() {
+    fn h255_added_client_role_ai_and_vertical_paths_keep_native_state() {
         use crate::game::execution_role::ExecutionRole as Role;
-        for (role, no_ai, movement, on_ground) in [
-            (Role::Client, true, Vec3::new(0.25, 0.0, 0.0), true),
-            (
-                Role::IntegratedServer,
-                false,
-                Vec3::new(0.25, 0.0, 0.0),
-                true,
-            ),
-            (
-                Role::IntegratedServer,
-                true,
-                Vec3::new(0.0, 0.25, 0.0),
-                false,
-            ),
+        for (role, no_ai, movement) in [
+            (Role::Client, true, Vec3::new(0.25, 0.0, 0.0)),
+            (Role::IntegratedServer, false, Vec3::new(0.25, 0.0, 0.0)),
+            (Role::IntegratedServer, true, Vec3::new(0.0, 0.25, 0.0)),
         ] {
             with_role_game(role, |game| {
                 let i = added_mob(game, 22, "husk", no_ai, 8.5);
                 let before = game.mobs[i].position;
                 added_push(game, i, movement);
                 assert_eq!(game.mobs[i].position, before.add_vector(movement));
-                assert_eq!(game.mobs[i].on_ground, on_ground);
+                assert!(
+                    game.mobs[i].on_ground,
+                    "excluded native path remains unchanged; not Java parity"
+                );
             });
         }
     }
-
-    #[test]
-    #[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES"]
-    fn h255_added_partial_push_reads_slime_after_the_position_changes() {
-        with_game(|game| {
-            assert!(game.run_command("setblock 8 201 4 slime_block"));
-            let i = added_mob(game, 23, "iron_golem", true, 8.5);
-            game.mobs[i].position.y = 202.25;
-            game.mobs[i].velocity = Vec3::new(0.0, -1.0, 0.0);
-            game.mobs[i].sync_position = false;
-            added_push(game, i, Vec3::new(0.0, -0.5, 0.0));
-            assert_eq!(game.mobs[i].position, Vec3::new(8.5, 202.0, 4.5));
-            assert!(game.mobs[i].velocity.y > 0.9);
-            assert!(game.mobs[i].sync_position);
-        });
-    }
 }

crates/horizon-client/src/game/player_hooks.rs

@@ -11,8 +11,8 @@ use horizon_client::mobs::anim::{self, BodyPose, PooledPoses, Poses};
 use horizon_client::mobs::{Mob, Part, Polygon, render};
 use horizon_hooks::engine;
 use horizon_hooks::players::{
-    Bone, CameraView, Frame, Gear, Kind, Light, Look, Mesh, Motion, PartPoses, Particle, Pass,
-    PlayerDraw, PlayerModel, PlayerModels, SpriteStore, Sprites, View,
+    Bone, CameraView, Frame, Gear, Kind, Mesh, PartPoses, Pass, PlayerDraw, PlayerModel,
+    PlayerModels, SpriteStore, Sprites,
 };
 use std::sync::Arc;
 
@@ -182,14 +182,6 @@ fn part_of(mesh: &Arc<Mesh>) -> Arc<Part> {
     })
 }
 
-/// Full light, packed as the vertices carry it.
-const FULL: u32 = 240 | 240 << 8;
-
-thread_local! {
-    /// What crates draw see-through this frame, added after every player.
-    static SEE_THROUGH: std::cell::RefCell<Vec<Vertex>> = const { std::cell::RefCell::new(Vec::new()) };
-}
-
 /// Forgets the meshes no crate holds any more (once a frame).
 fn forget_meshes() {
     let _ = MESHES.try_with(|m| {
@@ -207,7 +199,7 @@ impl PartPoses for PosesOf<'_> {
     }
 }
 
-/// A player model drawn, as a crate draws on it: posed on the GPU's skin path
+/// A player model drawn in the world pass, as a crate draws on it: posed on the GPU's skin path
 /// when `gpu` (the mob pass's skin frame, begun; the bounds of what went there grow, for
 /// culling), else its vertices go to `out`.
 struct DrawPlayer<'a, 'g> {
@@ -216,7 +208,6 @@ struct DrawPlayer<'a, 'g> {
     pass: Pass,
     /// The model's matrix (`render::base_transform`).
     base: glam::Mat4,
-    camera: glam::DVec3,
     alpha: f32,
     light: u32,
     gpu: bool,
@@ -232,19 +223,6 @@ impl DrawPlayer<'_, '_> {
         let (key, _) = render::body(self.m);
         self.m.kind.layer(&key).unwrap_or(&self.m.kind.model)
     }
-
-    /// `light` packed; `at`: the place `Light::AtPlace` reads, relative to the camera.
-    fn packed(&self, light: Light, at: glam::Vec3) -> u32 {
-        match light {
-            Light::Full => FULL,
-            Light::AtPlace => {
-                let p = (self.camera + at.as_dvec3()).floor();
-                let l = self.game.world.light(p.x as i32, p.y as i32, p.z as i32);
-                (u32::from(l >> 4) * 16) | ((u32::from(l & 15) * 16) << 8)
-            }
-            _ => self.light,
-        }
-    }
 }
 
 impl PlayerDraw for DrawPlayer<'_, '_> {
@@ -256,52 +234,7 @@ impl PlayerDraw for DrawPlayer<'_, '_> {
         self.m.age as f32 + self.alpha
     }
 
-    fn base(&self) -> [[f32; 4]; 4] {
-        self.base.to_cols_array_2d()
-    }
-
-    fn motion(&self) -> Motion {
-        let (m, a) = (self.m, self.alpha);
-        let t = f64::from(a);
-        let (p, n) = (m.previous, m.position);
-        let feet = [
-            p.x + (n.x - p.x) * t,
-            p.y + (n.y - p.y) * t,
-            p.z + (n.z - p.z) * t,
-        ];
-        let turn = horizon_client::mobs::living::wrap(m.head_yaw - m.previous_head_yaw);
-        let yaw = m.previous_head_yaw + turn * a;
-        let pitch = m.previous_head_pitch + (m.head_pitch - m.previous_head_pitch) * a;
-        let asleep = m.extra.avatar_pose == horizon_client::pose::Pose::Sleeping;
-        let swimming = m.extra.swim.amount(a) > 0.0;
-        Motion::new(feet, yaw, pitch).poses(
-            m.extra.crouching,
-            asleep,
-            m.extra.fall_flying,
-            swimming,
-        )
-    }
-
-    fn view(&self) -> View {
-        let q = self.game.camera_orientation();
-        let (right, up) = (
-            (q * glam::Vec3::X).to_array(),
-            (q * glam::Vec3::Y).to_array(),
-        );
-        let (yaw, pitch) = (self.game.yaw.to_radians(), self.game.pitch.to_radians());
-        let forward = [
-            -yaw.sin() * pitch.cos(),
-            -pitch.sin(),
-            yaw.cos() * pitch.cos(),
-        ];
-        let left = [yaw.cos(), 0.0, yaw.sin()];
-        View::new(self.camera.to_array(), right, up).looking(forward, left)
-    }
-
     fn bone(&mut self, bone: Bone) -> Option<[[f32; 4]; 4]> {
-        if self.pass == Pass::FirstPerson {
-            return None;
-        }
         if self.body.is_none() {
             let mut poses = Poses::pooled();
             poses.reset(self.body());
@@ -327,30 +260,13 @@ impl PlayerDraw for DrawPlayer<'_, '_> {
         &mut self,
         mesh: &Arc<Mesh>,
         matrix: [[f32; 4]; 4],
-        look: Look,
+        uv: [f32; 4],
         pose: &mut dyn FnMut(&mut dyn PartPoses),
     ) {
         let model = part_of(mesh);
         let matrix = glam::Mat4::from_cols_array_2d(&matrix);
-        let (uv, light) = (look.uv, self.packed(look.light, matrix.w_axis.truncate()));
         self.poses.reset(&model);
         pose(&mut PosesOf(&mut self.poses));
-        let poses = &self.poses;
-        if let Some(alpha) = look.see_through {
-            let color = ((alpha.clamp(0.0, 1.0) * 255.0) as u32) << 24 | 0x00FF_FFFF;
-            let pose_of = |p: &Part| poses.pose(p);
-            SEE_THROUGH.with_borrow_mut(|out| {
-                let start = out.len();
-                horizon_client::mobs::render_model(&model, matrix, &pose_of, uv, light, 0, out);
-                for v in &mut out[start..] {
-                    v.color = color;
-                    // Seen through, a face turned away would add to the near one: `entity.wgsl`
-                    // drops back faces, so it is `alpha` at most.
-                    v.normal[3] = horizon_client::mesher::SHADED_CULL_W;
-                }
-            });
-            return;
-        }
         if self.gpu {
             let mut models = self.game.skin_models.borrow_mut();
             let mut frame = self.game.skin_frame.borrow_mut();
@@ -360,43 +276,30 @@ impl PlayerDraw for DrawPlayer<'_, '_> {
                 uv,
                 scroll: 0.0,
                 color: 0xFFFF_FFFF,
-                light,
+                light: self.light,
                 overlay: 0,
             };
-            if skin.draw(&model, matrix, poses, paint) {
+            if skin.draw(&model, matrix, &self.poses, paint) {
                 self.bounds = skin.bounds;
                 return;
             }
         }
-        let pose_of = |p: &Part| poses.pose(p);
-        horizon_client::mobs::render_model(&model, matrix, &pose_of, uv, light, 0, self.out);
-    }
-
-    fn particles(&mut self, uv: [f32; 4], particles: &[Particle], light: Light) {
-        let light = self.packed(light, glam::Vec3::ZERO);
-        SEE_THROUGH.with_borrow_mut(|out| {
-            for q in particles {
-                let color = ((q.alpha.clamp(0.0, 1.0) * 255.0) as u32) << 24 | 0x00FF_FFFF;
-                for (corner, [u, v]) in q.corners.iter().zip(q.uv) {
-                    out.push(Vertex {
-                        pos: *corner,
-                        uv: [uv[0] + (uv[2] - uv[0]) * u, uv[1] + (uv[3] - uv[1]) * v],
-                        layer: 0,
-                        color,
-                        light,
-                        // Unlit: a particle keeps its colour whichever way it faces.
-                        normal: [0, 0, 0, 0],
-                        glint_uv: [0.0, 0.0],
-                    });
-                }
-            }
-        });
+        let poses = &self.poses;
+        horizon_client::mobs::render_model(
+            &model,
+            matrix,
+            &|p: &Part| poses.pose(p),
+            uv,
+            self.light,
+            0,
+            self.out,
+        );
     }
 }
 
 impl Game<'_> {
-    /// What crates draw on player model `m` in the world pass (`creatures.rs`): see
-    /// [`DrawPlayer`]. The bounds of what went to the GPU.
+    /// What crates draw on player model `m` in the world pass (`creatures.rs`), then the
+    /// cosmetics still drawn here: see [`DrawPlayer`]. The bounds of what went to the GPU.
     #[allow(clippy::too_many_arguments)]
     pub(super) fn player_layers_geometry(
         &self,
@@ -412,102 +315,33 @@ impl Game<'_> {
             self.serving.is_none(),
             "a server thread calls no client hook"
         );
-        let kind = kind(m).filter(|_| engine::any())?;
-        let model = model(m, kind, self.remote_player_uuid(m.id));
-        let mut draw = DrawPlayer {
-            game: self,
-            m,
-            pass: Pass::World,
-            base,
-            camera,
-            alpha,
-            light,
-            gpu,
-            out,
-            bounds: None,
-            body: None,
-            poses: Poses::pooled(),
-        };
-        engine::player_layers(&model, &mut draw);
-        draw.bounds
-    }
-
-    /// What crates draw on the window's own model `m` (its vertices to `out`): in the world in
-    /// third person (`Pass::World`), or in the inventory's picture of it (`Pass::Picture`).
-    /// `camera`: the world view's camera, or the picture's.
-    pub(super) fn own_layers_geometry(
-        &self,
-        m: &Mob,
-        pass: Pass,
-        camera: glam::DVec3,
-        alpha: f32,
-        light: u32,
-        out: &mut Vec<Vertex>,
-    ) {
-        debug_assert!(
-            self.serving.is_none(),
-            "a server thread calls no client hook"
-        );
-        if !engine::any() {
-            return;
-        }
-        let model = model(m, Kind::Own, self.remote.as_ref().map(|r| r.profile()));
-        let mut draw = DrawPlayer {
-            game: self,
-            m,
-            pass,
-            base: render::base_transform(m, alpha, camera),
-            camera,
-            alpha,
-            light,
-            gpu: false,
-            out,
-            bounds: None,
-            body: None,
-            poses: Poses::pooled(),
-        };
-        engine::player_layers(&model, &mut draw);
-    }
-
-    /// After every player (`game.rs`): what crates draw around the window's own model in first
-    /// person, then what was drawn see-through, in one span.
-    pub(super) fn players_after_geometry(
-        &self,
-        camera: glam::DVec3,
-        alpha: f64,
-        out: &mut Vec<Vertex>,
-    ) {
-        if engine::any()
-            && !self.own_body_in_view()
-            && let Some(m) = self.player_model.as_ref()
-        {
-            let own = model(m, Kind::Own, self.remote.as_ref().map(|r| r.profile()));
-            let own = own.looks(own.gear, own.invisible || self.own_invisible());
-            self.mark_entity(out.len(), "minecraft:player");
+        let kind = kind(m)?;
+        let mut bounds = None;
+        if engine::any() {
+            let model = model(m, kind, self.remote_player_uuid(m.id));
             let mut draw = DrawPlayer {
                 game: self,
                 m,
-                pass: Pass::FirstPerson,
-                base: render::base_transform(m, alpha as f32, camera),
-                camera,
-                alpha: alpha as f32,
-                light: FULL,
-                gpu: false,
+                pass: Pass::World,
+                base,
+                alpha,
+                light,
+                gpu,
                 out: &mut *out,
                 bounds: None,
                 body: None,
                 poses: Poses::pooled(),
             };
-            engine::first_person(&own, &mut draw);
+            engine::player_layers(&model, &mut draw);
+            bounds = draw.bounds;
+        }
+        let worn = super::cosmetics::enabled()
+            .then(|| self.cosmetics_geometry(m, false, base, Some(camera), alpha, light, gpu, out))
+            .flatten();
+        match (bounds, worn) {
+            (Some((l, h)), Some((lo, hi))) => Some((l.min(lo), h.max(hi))),
+            (b, w) => b.or(w),
         }
-        let _ = SEE_THROUGH.try_with(|v| {
-            let mut v = v.borrow_mut();
-            if !v.is_empty() {
-                self.mark_translucent_entity(out.len(), "minecraft:player");
-                out.extend_from_slice(&v);
-                v.clear();
-            }
-        });
     }
 
     /// Once a frame, before drawing.
@@ -524,7 +358,6 @@ impl Game<'_> {
         let frame = Frame::new(connection, self.integrated.is_some());
         engine::frame(&frame, &mut HookStore(self));
         forget_meshes();
-        let _ = SEE_THROUGH.try_with(|v| v.borrow_mut().clear());
         self.cosmetics_frame();
     }
 

crates/horizon-client/src/game/remote.rs

@@ -7242,15 +7242,15 @@ impl Game<'_> {
             } else if m.alive() {
                 m.body_rotation_tick();
             }
-            // Squid.aiStep; WalkAnimationState.update from the horizontal distance.
+            // Squid.aiStep follows LivingEntity's interpolation and head turn.
             horizon_client::mobs::aquatic::squid_client_step(m, &mut mob_fx);
-            let d = (m.position.x - m.previous.x).hypot(m.position.z - m.previous.z) as f32;
-            let (target, factor) = if m.species() == horizon_client::mobs::Species::Frog {
-                (horizon_client::mobs::frog::walk_target(m, d), 0.4)
-            } else if horizon_client::mobs::camel::is_camel(m.species()) {
-                horizon_client::mobs::camel::walk_target(m, d)
+            // WalkAnimationState.update from the horizontal distance moved.
+            let (dx, dz) = (m.position.x - m.previous.x, m.position.z - m.previous.z);
+            let (target, factor) = if horizon_client::mobs::camel::is_camel(m.species()) {
+                // Camel.updateWalkAnimation.
+                horizon_client::mobs::camel::walk_target(m, (dx * dx + dz * dz).sqrt() as f32)
             } else {
-                ((d * 4.0).min(1.0), 0.4)
+                ((((dx * dx + dz * dz).sqrt() * 4.0) as f32).min(1.0), 0.4)
             };
             m.limb_speed += (target - m.limb_speed) * factor;
             m.limb_position += m.limb_speed;
@@ -11463,7 +11463,8 @@ impl Remote {
     pub(super) fn listed_player_count(&self) -> usize {
         self.listed.len()
     }
-    /// Players in the server's player list, this one included (for the activity hooks).
+    /// Players in the server's player list, this one included (for Discord).
+    #[cfg(feature = "discord")]
     pub(super) fn player_count(&self) -> usize {
         self.players.len()
     }

crates/horizon-client/src/game/replay.rs

@@ -1,18 +1,8 @@
-//! Recording a session's packets as `.mcpr` and playing them back in a `Game`: the `/studio record`
-//! and `/studio replay` commands (chat and `horizon-ctl`), the replay's clock and its world. This is
-//! platform (docs/layers.md, "Replays"); Studio's editor (`studio.rs`) builds on it.
+//! Replay playback's state in a `Game`. Recording a session's packets as `.mcpr` and playing them
+//! back is platform (docs/layers.md, "Replays"); Studio's editor (`studio.rs`) builds on it.
 
-use super::{Game, PendingWorldEntry, Screen};
-use horizon_client::{
-    Result,
-    studio::{Metadata, ReplayDriver},
-    text::Text,
-};
-use serde_json::{Value, json};
-use std::{
-    path::{Path, PathBuf},
-    time::{Duration, SystemTime, UNIX_EPOCH},
-};
+use super::Game;
+use horizon_client::studio::ReplayDriver;
 
 /// The packet replay a `Game` plays, if any, and its playback clock.
 #[derive(Default)]
@@ -48,808 +38,4 @@ impl Game<'_> {
             .player_alpha()
             .unwrap_or_else(|| self.clock.camera_fraction())
     }
-
-    /// In-game chat command handler: `/studio <record|replay> ...`.
-    /// Returns true if the command was recognized and handled.
-    pub(super) fn studio_command(&mut self, command: &str) -> bool {
-        let Some(rest) = command.strip_prefix("studio") else {
-            return false;
-        };
-        if !rest.is_empty() && !rest.starts_with(char::is_whitespace) {
-            return false;
-        }
-        let words: Vec<&str> = rest.split_whitespace().collect();
-        if words.is_empty() {
-            self.system_message(Text::translate("horizon.studio.replay.usage", &[]));
-            return true;
-        }
-
-        match words[0] {
-            "freecam" | "keyframe" | "path" if super::studio::EDITOR => {
-                return self.studio_editor_command(&words);
-            }
-            "record" => match words.get(1).copied() {
-                Some("start") => match self.start_studio_recording(words.get(2).copied()) {
-                    Ok(v) if v["ok"].as_bool() == Some(true) => {
-                        let path = v["path"].as_str().unwrap_or_default();
-                        self.system_message(Text::tr("horizon.studio.record.started", &[&path]));
-                    }
-                    Ok(v) => {
-                        let error = v["error"].as_str().unwrap_or_default();
-                        self.system_message(Text::tr("horizon.studio.record.error", &[&error]));
-                    }
-                    Err(error) => {
-                        self.system_message(Text::tr("horizon.studio.record.error", &[&error]));
-                    }
-                },
-                Some("stop") => match self.stop_studio_recording() {
-                    Ok(v) if v["ok"].as_bool() == Some(true) => {
-                        let path = v["path"].as_str().unwrap_or_default();
-                        self.system_message(Text::tr("horizon.studio.record.saved", &[&path]));
-                    }
-                    Ok(v) => {
-                        let error = v["error"].as_str().unwrap_or_default();
-                        self.system_message(Text::tr("horizon.studio.record.error", &[&error]));
-                    }
-                    Err(error) => {
-                        self.system_message(Text::tr("horizon.studio.record.error", &[&error]));
-                    }
-                },
-                Some("status") => {
-                    let status = self.studio_recording_status();
-                    if status["active"].as_bool() == Some(true) {
-                        let elapsed =
-                            (status["elapsed_ms"].as_u64().unwrap_or(0) / 1000).to_string();
-                        let packets = status["packet_count"].as_u64().unwrap_or(0).to_string();
-                        let size =
-                            (status["bytes_written"].as_u64().unwrap_or(0) / 1024).to_string();
-                        let path = status["path"].as_str().unwrap_or_default();
-                        self.system_message(Text::tr(
-                            "horizon.studio.record.status.active",
-                            &[&elapsed, &packets, &size, &path],
-                        ));
-                    } else if let Some(error) = status["error"].as_str() {
-                        self.system_message(Text::tr("horizon.studio.record.error", &[&error]));
-                    } else {
-                        self.system_message(Text::translate(
-                            "horizon.studio.record.status.inactive",
-                            &[],
-                        ));
-                    }
-                }
-                _ => self.system_message(Text::translate("horizon.studio.record.usage", &[])),
-            },
-            "replay" => match words.get(1).copied() {
-                Some("open") => {
-                    let Some(path) = words.get(2) else {
-                        self.system_message(Text::translate(
-                            "horizon.studio.replay.open.usage",
-                            &[],
-                        ));
-                        return true;
-                    };
-                    match self.open_studio_replay(path) {
-                        Ok(v) if v["ok"].as_bool() == Some(true) => {
-                            let duration_s = v["duration_ms"].as_f64().unwrap_or(0.0) / 1000.0;
-                            let packets = v["packet_count"].as_u64().unwrap_or(0);
-                            let duration = format!("{duration_s:.1}");
-                            let packets = packets.to_string();
-                            self.system_message(Text::tr(
-                                "horizon.studio.replay.opened",
-                                &[path, &duration, &packets],
-                            ));
-                        }
-                        Ok(v) => {
-                            let err = v["error"].as_str().unwrap_or_default();
-                            self.system_message(Text::tr(
-                                "horizon.studio.replay.open_error",
-                                &[&err],
-                            ));
-                        }
-                        Err(e) => {
-                            let error = e.to_string();
-                            self.system_message(Text::tr(
-                                "horizon.studio.replay.open_error",
-                                &[&error],
-                            ));
-                        }
-                    }
-                }
-                Some("pause") => {
-                    if let Some(r) = self.replay.driver.as_mut() {
-                        r.set_paused(true);
-                        self.system_message(Text::translate("horizon.studio.replay.paused", &[]));
-                    } else {
-                        self.system_message(Text::translate("horizon.studio.replay.inactive", &[]));
-                    }
-                }
-                Some("resume") => {
-                    if let Some(r) = self.replay.driver.as_mut() {
-                        r.set_paused(false);
-                        self.system_message(Text::translate("horizon.studio.replay.resumed", &[]));
-                    } else {
-                        self.system_message(Text::translate("horizon.studio.replay.inactive", &[]));
-                    }
-                }
-                Some("speed") => {
-                    let Some(spd_str) = words.get(2) else {
-                        self.system_message(Text::translate(
-                            "horizon.studio.replay.speed.usage",
-                            &[],
-                        ));
-                        return true;
-                    };
-                    if let Ok(spd) = spd_str.parse::<f64>() {
-                        let new_speed = if let Some(r) = self.replay.driver.as_mut() {
-                            r.set_speed(spd);
-                            Some(r.speed())
-                        } else {
-                            None
-                        };
-                        if let Some(speed) = new_speed {
-                            let speed = format!("{speed:.2}");
-                            self.system_message(Text::tr(
-                                "horizon.studio.replay.speed.set",
-                                &[&speed],
-                            ));
-                        } else {
-                            self.system_message(Text::translate(
-                                "horizon.studio.replay.inactive",
-                                &[],
-                            ));
-                        }
-                    } else {
-                        self.system_message(Text::translate(
-                            "horizon.studio.replay.speed.invalid",
-                            &[],
-                        ));
-                    }
-                }
-                Some("seek") => {
-                    let Some(ms_str) = words.get(2) else {
-                        self.system_message(Text::translate(
-                            "horizon.studio.replay.seek.usage",
-                            &[],
-                        ));
-                        return true;
-                    };
-                    if let Ok(ms) = ms_str.parse::<u32>() {
-                        if self.replay.driver.is_some() {
-                            match self.seek_studio_replay(ms) {
-                                Ok(()) => {
-                                    let actual_ms = self
-                                        .replay
-                                        .driver
-                                        .as_ref()
-                                        .map_or(ms, |replay| ms.min(replay.duration_ms()));
-                                    let ms_text = actual_ms.to_string();
-                                    let seconds = format!("{:.1}", actual_ms as f32 / 1000.0);
-                                    self.system_message(Text::tr(
-                                        "horizon.studio.replay.seeked",
-                                        &[&ms_text, &seconds],
-                                    ));
-                                }
-                                Err(e) => {
-                                    if e.kind() == std::io::ErrorKind::Unsupported {
-                                        self.system_message(Text::translate(
-                                            "horizon.studio.replay.seek.backward_requires_standalone",
-                                            &[],
-                                        ));
-                                    } else {
-                                        let error = e.to_string();
-                                        self.system_message(Text::tr(
-                                            "horizon.studio.replay.seek.error",
-                                            &[&error],
-                                        ));
-                                    }
-                                }
-                            }
-                        } else {
-                            self.system_message(Text::translate(
-                                "horizon.studio.replay.inactive",
-                                &[],
-                            ));
-                        }
-                    } else {
-                        self.system_message(Text::translate(
-                            "horizon.studio.replay.seek.invalid",
-                            &[],
-                        ));
-                    }
-                }
-                Some("status") => {
-                    if let Some(r) = self.replay.driver.as_ref() {
-                        let position = r.position_ms().to_string();
-                        let duration = r.duration_ms().to_string();
-                        let progress = format!("{:.1}", r.progress() * 100.0);
-                        let speed = format!("{:.2}", r.speed());
-                        let paused = r.is_paused().to_string();
-                        let finished = r.is_finished().to_string();
-                        self.system_message(Text::tr(
-                            "horizon.studio.replay.status",
-                            &[&position, &duration, &progress, &speed, &paused, &finished],
-                        ));
-                    } else {
-                        self.system_message(Text::translate("horizon.studio.replay.inactive", &[]));
-                    }
-                }
-                Some("close") => {
-                    if self.close_studio_replay() {
-                        self.system_message(Text::translate("horizon.studio.replay.closed", &[]));
-                    } else {
-                        self.system_message(Text::translate("horizon.studio.replay.inactive", &[]));
-                    }
-                }
-                _ => {
-                    self.system_message(Text::translate("horizon.studio.replay.usage", &[]));
-                }
-            },
-            _ => {
-                self.system_message(Text::translate("horizon.studio.replay.usage", &[]));
-            }
-        }
-        true
-    }
-
-    /// Reset playback tick accumulator and align positions on seek.
-    pub(super) fn reset_studio_playback_ticks(&mut self) {
-        self.replay.virtual_tick_ms = 0.0;
-        if let Some(player) = &self.player {
-            self.previous_position = player.position;
-            if let Some(m) = self.player_model.as_mut() {
-                m.previous = player.position;
-                m.position = player.position;
-                m.limb_speed = 0.0;
-                m.previous_limb_speed = 0.0;
-            }
-        }
-    }
-
-    /// Reconstruct replay state at a target timestamp. Standalone replays can
-    /// safely reset their synthetic remote; an in-world replay can only seek
-    /// forward because its pre-replay world must remain intact.
-    pub(super) fn seek_studio_replay(&mut self, target_ms: u32) -> std::io::Result<()> {
-        let current_ms = self
-            .replay
-            .driver
-            .as_ref()
-            .map_or(0, ReplayDriver::position_ms);
-        let packets = if self.replay.standalone {
-            let packets = self
-                .replay
-                .driver
-                .as_mut()
-                .expect("replay checked by caller")
-                .seek_and_collect(target_ms)?;
-            self.init_remote_for_replay()
-                .map_err(|error| std::io::Error::other(error.to_string()))?;
-            packets
-        } else {
-            if target_ms < current_ms {
-                return Err(std::io::Error::new(
-                    std::io::ErrorKind::Unsupported,
-                    "backward seek requires a standalone replay",
-                ));
-            }
-            self.replay
-                .driver
-                .as_mut()
-                .expect("replay checked by caller")
-                .seek_forward(target_ms)?
-        };
-
-        self.dispatch_studio_replay_packets(packets);
-        self.reset_studio_playback_ticks();
-        self.replay.last_tick = Some(std::time::Instant::now());
-        Ok(())
-    }
-
-    fn dispatch_studio_replay_packets(
-        &mut self,
-        packets: Vec<horizon_client::studio::mcpr::TimestampedPacket>,
-    ) {
-        for pkt in packets {
-            match horizon_protocol::packets::play::Clientbound::decode(pkt.id, &pkt.payload) {
-                Ok(packet) => {
-                    let _ = self.handle_packet(packet);
-                }
-                Err(e) => {
-                    let name = horizon_protocol::ids::name(
-                        horizon_protocol::State::Play,
-                        horizon_protocol::Direction::Clientbound,
-                        pkt.id,
-                    )
-                    .unwrap_or("?");
-                    log::debug!(
-                        "Studio replay skipped packet {name} (id {:#x}): {e}",
-                        pkt.id
-                    );
-                }
-            }
-        }
-    }
-
-    /// Advance active replay playback by elapsed frame time and dispatch ready packets.
-    pub(super) fn advance_studio_replay(&mut self) -> Result<()> {
-        let Some(driver) = self.replay.driver.as_mut() else {
-            self.replay.last_tick = None;
-            return Ok(());
-        };
-
-        let now = std::time::Instant::now();
-        let delta = match self.replay.last_tick {
-            Some(last) => now
-                .saturating_duration_since(last)
-                .min(Duration::from_millis(250)),
-            None => Duration::from_millis(16),
-        };
-        self.replay.last_tick = Some(now);
-
-        let ready_packets = match driver.advance(delta) {
-            Ok(pkts) => pkts,
-            Err(e) => {
-                log::warn!("Studio replay advance error: {e}");
-                return Ok(());
-            }
-        };
-
-        self.dispatch_studio_replay_packets(ready_packets);
-        let paused = self
-            .replay
-            .driver
-            .as_ref()
-            .is_some_and(|replay| replay.is_paused());
-        if self.player_model.is_none() {
-            self.tick_player_model();
-        }
-        if !paused {
-            let speed = self
-                .replay
-                .driver
-                .as_ref()
-                .map_or(1.0, |r| r.speed() as f32)
-                .max(0.1);
-            self.replay.virtual_tick_ms += delta.as_secs_f32() * 1000.0 * speed;
-            while self.replay.virtual_tick_ms >= 50.0 {
-                self.replay.virtual_tick_ms -= 50.0;
-                if let Some(player) = &self.player {
-                    let current_pos = player.position;
-                    let (dx, dz) = (
-                        current_pos.x - self.previous_position.x,
-                        current_pos.z - self.previous_position.z,
-                    );
-                    let walked = (dx * dx + dz * dz).sqrt() as f32;
-                    if let Some(m) = self.player_model.as_mut() {
-                        m.previous = self.previous_position;
-                        m.position = current_pos;
-                        m.previous_limb_speed = m.limb_speed;
-                        let target_speed = (walked * 4.0).min(1.0);
-                        m.limb_speed += (target_speed - m.limb_speed) * 0.4;
-                        if m.limb_speed < 0.001 {
-                            m.limb_speed = 0.0;
-                        }
-                        m.limb_position += m.limb_speed;
-                        m.previous_yaw = m.yaw;
-                        m.previous_head_yaw = m.head_yaw;
-                        m.previous_head_pitch = m.head_pitch;
-                        m.previous_body_yaw = m.body_yaw;
-                        m.yaw = self.yaw;
-                        m.head_yaw = self.yaw;
-                        m.head_pitch = self.pitch;
-                        let mut target = m.body_yaw;
-                        if dx * dx + dz * dz > 0.0025 {
-                            let walk = (dz.atan2(dx) as f32).to_degrees() - 90.0;
-                            let facing =
-                                ((self.yaw - walk + 180.0).rem_euclid(360.0) - 180.0).abs();
-                            target = if 95.0 < facing && facing < 265.0 {
-                                walk - 180.0
-                            } else {
-                                walk
-                            };
-                        }
-                        let diff = (target - m.body_yaw + 180.0).rem_euclid(360.0) - 180.0;
-                        m.body_yaw += diff * 0.3;
-                        let body_diff = (self.yaw - m.body_yaw + 180.0).rem_euclid(360.0) - 180.0;
-                        if body_diff.abs() > 50.0 {
-                            m.body_yaw += body_diff - body_diff.signum() * 50.0;
-                        }
-                        m.age = m.age.wrapping_add(1);
-                    }
-                    self.previous_position = current_pos;
-                }
-            }
-        } else if let Some(m) = self.player_model.as_mut() {
-            m.previous_limb_speed = m.limb_speed;
-        }
-        self.studio_replay_advanced();
-        Ok(())
-    }
-
-    /// Control socket command handler for `studio`.
-    pub(super) fn studio_control(&mut self, words: &[&str]) -> Result<Option<Value>> {
-        if words.first().copied() != Some("studio") {
-            return Ok(None);
-        }
-        match words.get(1).copied() {
-            Some("record") => match words.get(2).copied() {
-                Some("start") => {
-                    let name = words.get(3).copied();
-                    let res = self.start_studio_recording(name)?;
-                    Ok(Some(res))
-                }
-                Some("stop") => {
-                    let res = self.stop_studio_recording()?;
-                    Ok(Some(res))
-                }
-                Some("status") => {
-                    let res = self.studio_recording_status();
-                    Ok(Some(res))
-                }
-                _ => Ok(Some(json!({ "error": "unknown studio record subcommand" }))),
-            },
-            Some("replay") => match words.get(2).copied() {
-                Some("open") => {
-                    let path = words.get(3).ok_or("missing path for studio replay open")?;
-                    let res = self.open_studio_replay(path)?;
-                    Ok(Some(res))
-                }
-                Some("pause") => {
-                    if let Some(r) = self.replay.driver.as_mut() {
-                        r.set_paused(true);
-                        Ok(Some(json!({ "ok": true, "paused": true })))
-                    } else {
-                        Ok(Some(json!({ "error": "no active replay" })))
-                    }
-                }
-                Some("resume") => {
-                    if let Some(r) = self.replay.driver.as_mut() {
-                        r.set_paused(false);
-                        Ok(Some(json!({ "ok": true, "paused": false })))
-                    } else {
-                        Ok(Some(json!({ "error": "no active replay" })))
-                    }
-                }
-                Some("speed") => {
-                    let spd_str = words.get(3).ok_or("missing speed value")?;
-                    let spd: f64 = spd_str.parse().map_err(|_| "invalid speed")?;
-                    if let Some(r) = self.replay.driver.as_mut() {
-                        r.set_speed(spd);
-                        Ok(Some(json!({ "ok": true, "speed": r.speed() })))
-                    } else {
-                        Ok(Some(json!({ "error": "no active replay" })))
-                    }
-                }
-                Some("seek") => {
-                    let ms_str = words.get(3).ok_or("missing seek timestamp")?;
-                    let ms: u32 = ms_str.parse().map_err(|_| "invalid timestamp")?;
-                    let pos = if let Some(r) = self.replay.driver.as_mut() {
-                        r.seek(ms).map_err(|e| format!("{e}"))?;
-                        Some(r.position_ms())
-                    } else {
-                        None
-                    };
-                    if let Some(pos) = pos {
-                        self.reset_studio_playback_ticks();
-                        Ok(Some(json!({ "ok": true, "position_ms": pos })))
-                    } else {
-                        Ok(Some(json!({ "error": "no active replay" })))
-                    }
-                }
-                Some("status") => {
-                    if let Some(r) = self.replay.driver.as_ref() {
-                        Ok(Some(json!({
-                            "ok": true,
-                            "active": true,
-                            "position_ms": r.position_ms(),
-                            "duration_ms": r.duration_ms(),
-                            "progress": r.progress(),
-                            "speed": r.speed(),
-                            "paused": r.is_paused(),
-                            "finished": r.is_finished(),
-                        })))
-                    } else {
-                        Ok(Some(json!({ "ok": true, "active": false })))
-                    }
-                }
-                Some("close") => {
-                    let closed = self.close_studio_replay();
-                    Ok(Some(json!({ "ok": true, "closed": closed })))
-                }
-                _ => Ok(Some(json!({ "error": "unknown studio replay subcommand" }))),
-            },
-            Some("screen") if super::studio::EDITOR => self.studio_screen_control(words),
-            _ => Ok(Some(json!({ "error": "unknown studio command" }))),
-        }
-    }
-
-    pub(super) fn start_studio_recording(&mut self, name: Option<&str>) -> Result<Value> {
-        let Some(r) = self.remote.as_ref() else {
-            return Ok(json!({ "ok": false, "error": "no active world session" }));
-        };
-        if r.session.is_recording() {
-            return Ok(json!({ "ok": false, "error": "recording already active" }));
-        }
-        let _ = std::fs::create_dir_all("recordings");
-        let ts = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .unwrap_or_default()
-            .as_secs();
-        let filename = match name {
-            Some(n) if !n.is_empty() => format!("{}_{}.mcpr", n, ts),
-            _ => format!("recording_{}.mcpr", ts),
-        };
-        let path = PathBuf::from("recordings").join(filename);
-        let server_address = if r.session.address.is_empty() {
-            "local".to_owned()
-        } else {
-            r.session.address.clone()
-        };
-        let is_singleplayer = server_address == "local";
-        let meta = Metadata::new(
-            server_address,
-            is_singleplayer,
-            horizon_core::release::VERSION.into(),
-        );
-        match horizon_client::studio::StudioRecorder::start(path.clone(), meta) {
-            Ok(recorder) => {
-                r.session.start_recording(recorder, |recorder| {
-                    self.dump_world_snapshot_to_recorder(recorder);
-                });
-                Ok(json!({ "ok": true, "path": path.display().to_string() }))
-            }
-            Err(e) => Ok(json!({ "ok": false, "error": e.to_string() })),
-        }
-    }
-
-    pub(super) fn stop_studio_recording(&mut self) -> Result<Value> {
-        let Some(r) = self.remote.as_ref() else {
-            return Ok(json!({ "ok": false, "error": "no active world session" }));
-        };
-        match r.session.stop_recording() {
-            Some(Ok(path)) => Ok(json!({ "ok": true, "path": path.display().to_string() })),
-            Some(Err(e)) => Ok(json!({ "ok": false, "error": e.to_string() })),
-            None => Ok(json!({ "ok": false, "error": "no active recording" })),
-        }
-    }
-
-    pub(super) fn studio_recording_status(&self) -> Value {
-        if let Some(r) = self.remote.as_ref()
-            && let Some(status) = r.session.recorder_status()
-        {
-            json!({
-                "ok": true,
-                "active": status.active,
-                "path": status.path.display().to_string(),
-                "elapsed_ms": status.elapsed.as_millis(),
-                "packet_count": status.packet_count,
-                "bytes_written": status.bytes_written,
-            })
-        } else {
-            json!({ "ok": true, "active": false })
-        }
-    }
-
-    pub(super) fn open_studio_replay(&mut self, path: &str) -> Result<Value> {
-        if let Err(error) = self.save_studio_camera_track() {
-            return Ok(json!({ "ok": false, "error": error.to_string() }));
-        }
-        // The recordings browser can be opened while the title screen is
-        // available but the slower world tables are still loading. Replay
-        // setup builds the normal client registries, which require `rest`.
-        if self.remote.is_none() && self.res.rest.get().is_none() {
-            let pending = PendingWorldEntry::StudioReplay(PathBuf::from(path));
-            if self.defer_world_entry(pending)? {
-                return Ok(json!({ "ok": true, "pending": true }));
-            }
-            self.join_world_rest()?;
-        }
-
-        // Validate and index the archive before replacing the title menu or active world. A
-        // temp-file, metadata, or protocol error must leave the current screen usable.
-        let driver = match ReplayDriver::open(Path::new(path)) {
-            Ok(driver) => driver,
-            Err(error) => {
-                log::error!("Failed to open studio replay '{path}': {error}");
-                return Ok(json!({ "ok": false, "error": error.to_string() }));
-            }
-        };
-
-        let standalone = self.replay.driver.is_none() && self.remote.is_none();
-        if self.remote.is_none()
-            && let Err(error) = self.init_remote_for_replay()
-        {
-            log::error!("Failed to initialize studio replay session: {error}");
-            return Ok(json!({ "ok": false, "error": error.to_string() }));
-        }
-
-        let duration_ms = driver.duration_ms();
-        let packets = driver.packet_count();
-        self.studio_replay_opened(&driver);
-        if self.replay.driver.is_none() {
-            self.replay.previous_camera_type = Some(self.camera_type);
-            self.replay.standalone = standalone;
-        }
-        self.replay.driver = Some(driver);
-        self.camera_type = super::perspective::CameraType::FirstPerson;
-        self.title = None;
-        self.screen = Screen::Playing;
-        self.capture(false);
-        self.dragging = false;
-        // Apply timestamp-zero login, player pose, and chunk packets before the first rendered
-        // frame so playback opens at the recorded player's viewpoint.
-        let _ = self.advance_studio_replay();
-        self.reset_studio_playback_ticks();
-        log::info!("Studio: Opened replay '{path}' ({duration_ms} ms, {packets} packets)");
-        Ok(json!({
-            "ok": true,
-            "duration_ms": duration_ms,
-            "packet_count": packets,
-        }))
-    }
-    pub(super) fn close_studio_replay(&mut self) -> bool {
-        self.studio_replay_closing();
-        let closed = self.replay.driver.take().is_some();
-        if !closed {
-            return false;
-        }
-
-        // A standalone replay owns a synthetic Remote connection. Treat that
-        // connection as replay state even if the saved origin flag was lost;
-        // sending it through leave_server() opens the Multiplayer screen.
-        let standalone = self.replay.standalone
-            || self
-                .remote
-                .as_ref()
-                .is_some_and(|remote| remote.brand == "horizon-studio");
-        self.replay.standalone = false;
-        if let Some(camera_type) = self.replay.previous_camera_type.take() {
-            self.camera_type = camera_type;
-        }
-        self.replay.last_tick = None;
-        self.studio_replay_closed();
-        self.replay.virtual_tick_ms = 0.0;
-        self.capture(false);
-        if standalone {
-            if let Some(mut remote) = self.remote.take() {
-                remote.session.disconnect();
-            }
-            self.using = None;
-            self.end_mod_use();
-            if let Err(error) = self.finish_close_world() {
-                log::error!("Failed to close standalone Studio replay cleanly: {error}");
-            }
-            self.reset_studio_hand_state();
-            // A title-screen replay has no previous world perspective to
-            // restore. Start the next world in first person with visible hands.
-            self.camera_type = super::perspective::CameraType::FirstPerson;
-            if let Some(title) = self.title.as_mut() {
-                title.mode = horizon_client::title::Mode::Main;
-            }
-        } else if self.integrated.is_none() && self.lan.is_none() {
-            let _ = self.close_world();
-            if let Some(title) = self.title.as_mut() {
-                title.mode = horizon_client::title::Mode::Main;
-            }
-        }
-        closed
-    }
-    /// Dump current player pose, dimension login, center chunk, and resident loaded chunks
-    /// into the recording stream at timestamp 0ms so replays accurately reconstruct the world.
-    pub(super) fn dump_world_snapshot_to_recorder(
-        &self,
-        recorder: &horizon_client::studio::StudioRecorder,
-    ) {
-        let Some(r) = self.remote.as_ref() else {
-            return;
-        };
-        let record_cb = |pkt: horizon_protocol::packets::play::Clientbound| {
-            let encoded = pkt.encode();
-            let mut reader = horizon_protocol::buf::Reader::new(&encoded);
-            if let Ok(id) = reader.varint() {
-                let payload = reader.rest();
-                recorder.record_packet_at(0, id, payload);
-            }
-        };
-
-        // 1. C::Login packet baseline
-        let login = horizon_protocol::packets::play::Clientbound::Login(
-            horizon_protocol::packets::play::Login {
-                player_id: r.entity_id,
-                hardcore: self.level.hardcore,
-                levels: vec!["minecraft:overworld".into()],
-                max_players: 20,
-                chunk_radius: self.settings.render_distance,
-                simulation_distance: self.settings.simulation_distance,
-                reduced_debug_info: false,
-                show_death_screen: true,
-                limited_crafting: false,
-                spawn: horizon_protocol::packets::play::SpawnInfo {
-                    dimension_type: 0,
-                    dimension: "minecraft:overworld".into(),
-                    seed: 0,
-                    game_type: 0,
-                    previous_game_type: None,
-                    debug: false,
-                    flat: false,
-                    last_death: None,
-                    portal_cooldown: 0,
-                    sea_level: 63,
-                },
-                online_mode: false,
-                enforces_secure_chat: false,
-            },
-        );
-        record_cb(login);
-
-        // 2. Center chunk and player position
-        let (pos, yaw, pitch) = if let Some(p) = &self.player {
-            (
-                glam::DVec3::new(p.position.x, p.position.y, p.position.z),
-                self.yaw,
-                self.pitch,
-            )
-        } else {
-            (glam::DVec3::ZERO, self.yaw, self.pitch)
-        };
-        let chunk_x = (pos.x.floor() as i32) >> 4;
-        let chunk_z = (pos.z.floor() as i32) >> 4;
-
-        let center_chunk = horizon_protocol::packets::play::Clientbound::SetChunkCacheCenter(
-            horizon_protocol::packets::play::SetChunkCacheCenter {
-                x: chunk_x,
-                z: chunk_z,
-            },
-        );
-        record_cb(center_chunk);
-
-        let player_pos = horizon_protocol::packets::play::Clientbound::PlayerPosition(
-            horizon_protocol::packets::play::PlayerPosition {
-                teleport: 0,
-                position: [pos.x, pos.y, pos.z],
-                delta: [0.0, 0.0, 0.0],
-                yaw,
-                pitch,
-                relatives: 0,
-            },
-        );
-        record_cb(player_pos);
-
-        // 3. Encode resident loaded chunks into LevelChunkWithLight packets
-        let biome_names: Vec<String> = world_biomes!(self)
-            .list
-            .iter()
-            .map(|b| b.name.clone())
-            .collect();
-        let registry: Vec<String> = r
-            .registries
-            .registries
-            .get("minecraft:worldgen/biome")
-            .map(|v| v.iter().map(|(n, _)| n.clone()).collect())
-            .unwrap_or_else(|| biome_names.clone());
-
-        let encoder = crate::lan::chunks::ChunkEncoder::with_signs(
-            self.res.facts().states.iter().map(|s| {
-                (
-                    s.name.clone(),
-                    s.fluid_level > 0 || s.waterlogged,
-                    s.sign_form(),
-                )
-            }),
-            &r.builtin,
-            &biome_names,
-            &registry,
-        );
-
-        let mut count = 0;
-        for chunk in self.world.chunks.values() {
-            let level_chunk = encoder.encode(chunk, &self.world.block_entities);
-            record_cb(
-                horizon_protocol::packets::play::Clientbound::LevelChunkWithLight(level_chunk),
-            );
-            count += 1;
-        }
-        log::info!(
-            "Studio Recorder: Dumped initial world snapshot ({count} chunks) at timestamp 0ms"
-        );
-    }
 }

crates/horizon-client/src/game/resource_loader.rs

@@ -306,6 +306,8 @@ pub(super) fn run_loading(
         App::Loading(loading) => leave_fullscreen_after(&result, &mut loading.settings),
     }
     result?;
+    #[cfg(feature = "discord")]
+    horizon_client::discord_presence::stop();
     match app {
         App::Ready(mut split) => {
             write_report(&split.host)?;

crates/horizon-client/src/game/split/windows.rs

@@ -516,9 +516,10 @@ impl<'a> Split<'a> {
                 continue;
             }
             // Opened without the focus: whoever types in the game's window keeps the keyboard.
-            let attributes = horizon_client::window::with_icon(Window::default_attributes())
-                .with_active(false)
-                .with_visible(window_shown(true, self.offscreen));
+            let attributes =
+                horizon_client::window::with_horizon_icon(Window::default_attributes())
+                    .with_active(false)
+                    .with_visible(window_shown(true, self.offscreen));
             // A monitor's window covers it, borderless. On macOS not the system's fullscreen, a
             // Space of its own that hides the other windows as it slides in.
             let placement = self.placement(*key).cloned();

crates/horizon-client/src/game/stand_command_hurt_tests.rs

@@ -113,117 +113,6 @@ fn fire_from_damage_lights_or_burns_the_stand_though_the_command_fails() {
     assert!(health.ends_with(": 16.0f"), "{health}");
 }
 
-#[test]
-#[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES"]
-fn igniting_a_frozen_stand_clears_its_freeze_while_burning_keeps_it() {
-    let mut game = game();
-    summon(&mut game, ",TicksFrozen:140");
-    let (_, frozen) = say(&mut game, &format!("data get entity {STAND} TicksFrozen"));
-    assert!(frozen.ends_with(": 140"), "{frozen}");
-    assert!(!game.run_command(&format!("damage {STAND} 1 minecraft:in_fire")));
-    let (_, fire) = say(&mut game, &format!("data get entity {STAND} Fire"));
-    assert!(fire.ends_with(": 100s"), "{fire}");
-    let (ok, frozen_after) = say(&mut game, &format!("data get entity {STAND} TicksFrozen"));
-    assert!(!ok, "{frozen_after}");
-
-    // When already burning, in_fire calls causeDamage(0.15) instead of igniteForSeconds.
-    assert!(game.run_command(&format!("data merge entity {STAND} {{TicksFrozen:140}}")));
-    assert!(!game.run_command(&format!("damage {STAND} 1 minecraft:in_fire")));
-    let (ok, still_frozen) = say(&mut game, &format!("data get entity {STAND} TicksFrozen"));
-    assert!(ok && still_frozen.ends_with(": 140"), "{still_frozen}");
-}
-
-#[test]
-#[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES"]
-fn damage_immunity_on_worn_boots_refuses_campfire_but_not_in_fire_or_wrong_slot() {
-    let mut game = game();
-    summon(
-        &mut game,
-        r#",equipment:{feet:{id:"minecraft:diamond_boots",count:1,components:{"minecraft:enchantments":{"minecraft:frost_walker":1}}}}"#,
-    );
-    // campfire is in both #ignites_armor_stands and #burn_from_stepping.
-    assert!(!game.run_command(&format!("damage {STAND} 1 minecraft:campfire")));
-    let (_, fire) = say(&mut game, &format!("data get entity {STAND} Fire"));
-    assert!(fire.ends_with(": 0s"), "{fire}");
-    // in_fire is not in #burn_from_stepping, so it still ignites the stand.
-    assert!(!game.run_command(&format!("damage {STAND} 1 minecraft:in_fire")));
-    let (_, fire) = say(&mut game, &format!("data get entity {STAND} Fire"));
-    assert!(fire.ends_with(": 100s"), "{fire}");
-
-    // Frost Walker on a helmet (head) is not in an active slot for the enchantment.
-    let mut helmeted = self::game();
-    summon(
-        &mut helmeted,
-        r#",equipment:{head:{id:"minecraft:diamond_helmet",count:1,components:{"minecraft:enchantments":{"minecraft:frost_walker":1}}}}"#,
-    );
-    assert!(!helmeted.run_command(&format!("damage {STAND} 1 minecraft:campfire")));
-    let (_, fire) = say(&mut helmeted, &format!("data get entity {STAND} Fire"));
-    assert!(fire.ends_with(": 100s"), "{fire}");
-}
-
-fn capture() {
-    super::sculk::TEST_POSTED_EVENTS.with(|events| *events.borrow_mut() = Some(Vec::new()));
-}
-
-fn take_events() -> Vec<(&'static str, [f64; 3], Option<horizon_client::mobs::Who>)> {
-    super::sculk::TEST_POSTED_EVENTS.with(|events| events.borrow_mut().take().unwrap_or_default())
-}
-
-#[test]
-#[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES"]
-fn cause_damage_and_explosion_post_attributed_game_events() {
-    use horizon_client::mobs::Who;
-    let mut game = game();
-    summon(&mut game, ",Fire:200s");
-    assert!(game.run_command("summon pig 14.5 100 2.5 {NoAI:1b}"));
-    let pig_id = game.mobs[0].id;
-    let at = [2.5, 100.0, 8.5];
-
-    // Burning stand hurt by in_fire (0.15) posts entity_damage attributed to the pig.
-    capture();
-    assert!(!game.run_command(&format!(
-        "damage {STAND} 1 minecraft:in_fire by @e[type=pig,limit=1]"
-    )));
-    assert_eq!(
-        take_events(),
-        vec![("minecraft:entity_damage", at, Some(Who::Mob(pig_id)))]
-    );
-
-    // Burning stand hurt by on_fire (4.0) while surviving posts entity_damage.
-    capture();
-    assert!(!game.run_command(&format!(
-        "damage {STAND} 1 minecraft:on_fire by @e[type=pig,limit=1]"
-    )));
-    assert_eq!(
-        take_events(),
-        vec![("minecraft:entity_damage", at, Some(Who::Mob(pig_id)))]
-    );
-
-    // Burning stand broken by on_fire (health <= 0.5) posts entity_die attributed to the pig.
-    assert!(game.run_command(&format!("data merge entity {STAND} {{Health:4f}}")));
-    capture();
-    assert!(!game.run_command(&format!(
-        "damage {STAND} 1 minecraft:on_fire by @e[type=pig,limit=1]"
-    )));
-    assert!(!game.run_command(&format!("execute if entity {STAND}")));
-    assert_eq!(
-        take_events(),
-        vec![("minecraft:entity_die", at, Some(Who::Mob(pig_id)))]
-    );
-
-    // Stand broken by explosion posts entity_die attributed to the pig.
-    summon(&mut game, "");
-    capture();
-    assert!(!game.run_command(&format!(
-        "damage {STAND} 1 minecraft:explosion by @e[type=pig,limit=1]"
-    )));
-    assert!(!game.run_command(&format!("execute if entity {STAND}")));
-    assert_eq!(
-        take_events(),
-        vec![("minecraft:entity_die", at, Some(Who::Mob(pig_id)))]
-    );
-}
-
 // Controls added after the baseline: the guards before the acting sources,
 // and a stand broken once however often it is hurt.
 

crates/horizon-client/src/game/window_handler.rs

@@ -273,8 +273,9 @@ impl ApplicationHandler for Game<'_> {
         let fullscreen = self.settings.fullscreen || self.options.fullscreen;
         let size = self.options.window_size.map(f64::from);
         self.fullscreen = horizon_client::window::FullscreenState::new(fullscreen);
-        let attributes =
-            horizon_client::window::with_icon(Window::default_attributes().with_title("Horizon"));
+        let attributes = horizon_client::window::with_horizon_icon(
+            Window::default_attributes().with_title("Horizon"),
+        );
         // Wayland names the window by its app id, which the horizon.desktop entry matches.
         #[cfg(target_os = "linux")]
         let attributes = winit::platform::wayland::WindowAttributesExtWayland::with_name(

crates/horizon-client/src/horizon_look.rs

@@ -1,56 +0,0 @@
-//! Horizon's look, given to the engine's extension points at startup (docs/layers.md): the
-//! windows' icon and the colours, sizes and fonts of the menus vanilla doesn't have
-//! (`docs/design-system.md`).
-//! Its own module so it can leave the engine crate as a pure file move, for the official
-//! executable to call.
-use horizon_client::menu_style::{Fonts, MenuStyle, OverlayColours, SettingsColours, Sizes};
-use horizon_theme as theme;
-
-/// Give the engine Horizon's look; call it once, before the first window opens.
-pub(crate) fn give() {
-    horizon_client::window::set_icon_png(theme::ICON_PNG);
-    let (blocks, dark) = (theme::BLOCKS_DARK, theme::DARK);
-    horizon_client::menu_style::install(MenuStyle {
-        settings: SettingsColours {
-            page: blocks.page,
-            ink: blocks.ink,
-            ink_soft: blocks.ink_soft,
-            muted: blocks.muted,
-            outline: blocks.outline,
-            accent: blocks.accent,
-            face: blocks.face,
-            // The face's hover, lighter than `face`: the settings screen's own shade.
-            face_hover: 0x6a50e6,
-            success: blocks.success,
-            warn: blocks.warn,
-            danger: blocks.danger,
-        },
-        overlay: OverlayColours {
-            page: dark.page,
-            backdrop_muted: theme::BACKDROP_MUTED,
-            ink: dark.ink,
-            ink_soft: dark.ink_soft,
-            rule: dark.rule,
-            accent: dark.accent,
-            on_accent: dark.on_accent,
-        },
-        sizes: Sizes {
-            caption: theme::CAPTION.px,
-            label: theme::LABEL.px,
-            ui: theme::UI.px,
-            body: theme::BODY.px,
-            title: theme::TITLE.px,
-            display: theme::DISPLAY.px,
-            micro: theme::MICRO.px,
-            radius: theme::RADIUS,
-            radius_plate: theme::RADIUS_PLATE,
-            control_large: theme::CONTROL_LARGE,
-        },
-        fonts: Some(Fonts {
-            regular: theme::fonts::GEIST_REGULAR,
-            medium: theme::fonts::GEIST_MEDIUM,
-            semibold: theme::fonts::GEIST_SEMIBOLD,
-            mono: theme::fonts::GEIST_MONO,
-        }),
-    });
-}

crates/horizon-client/src/lib.rs

@@ -6,7 +6,6 @@ extern crate self as horizon_client;
 pub use horizon_client_lib::*;
 pub mod entry;
 pub mod game;
-mod horizon_look;
 pub mod mod_api;
 
 #[cfg(test)]

crates/horizon-client/src/mobs/keyframes.rs

@@ -73,7 +73,7 @@ impl Animation {
     /// KeyframeAnimation.apply(millis, scale): offsets added to each bone's pose.
     pub fn apply(&self, millis: i64, scale: f32, poses: &mut super::anim::Poses) {
         let mut seconds = millis as f32 / 1000.0;
-        if self.looping && self.length > 0.0 {
+        if self.looping {
             seconds %= self.length;
         }
         for (bone, channels) in &self.bones {
@@ -231,34 +231,4 @@ mod tests {
         ];
         assert!((sample(&k, 1.0, 1.0)[0] - 1.0).abs() < 1e-6);
     }
-    #[test]
-    fn looping_animation_applies_walk_without_overflow() {
-        let anim = Animation {
-            length: 1.25,
-            looping: true,
-            bones: vec![(
-                "body".to_string(),
-                vec![Channel {
-                    target: Target::Position,
-                    keyframes: vec![
-                        Keyframe {
-                            time: 0.0,
-                            pre: [0.0; 3],
-                            post: [0.0, 1.0, 0.0],
-                            catmull: false,
-                        },
-                        Keyframe {
-                            time: 1.25,
-                            pre: [0.0, 1.0, 0.0],
-                            post: [0.0, 1.0, 0.0],
-                            catmull: false,
-                        },
-                    ],
-                }],
-            )],
-        };
-        let mut poses = super::super::anim::Poses::default();
-        anim.apply_walk(50.0, 1.0, 1.0, 2.5, &mut poses);
-        assert!((poses.get("body")[1] - 1.0).abs() < 1e-6);
-    }
 }

crates/horizon-client/src/mobs/living.rs

@@ -849,6 +849,7 @@ impl Mob {
         self.horizontal_collision = x_hit || z_hit;
         // A server's mobs are authoritative (`isLocalInstanceAuthoritative`):
         // the vertical flags update even without vertical movement.
+        let moved_vertically = wanted.y.abs() > 0.0;
         let vertical = wanted.y != moved.y;
         self.vertical_collision_below = vertical && wanted.y < 0.0;
         self.on_ground = self.vertical_collision_below;
@@ -856,51 +857,42 @@ impl Mob {
         // checkFallDamage reads the landing block (getOnPosLegacy).
         self.supporting = self.supporting_block(w, moved);
         self.species_check_fall_damage(w, moved, events);
-        self.restitute_movement(w.world, w.movement, wanted, moved);
-        self.movement_emission(w, moved, events);
-        // Entity.move's last step: soul sand, honey and the like slow the
-        // horizontal speed of whatever the mob stands in or on.
-        let factor = self.block_speed_factor(w);
-        self.velocity = horizon_world::entity_move::scale_by_block_speed(self.velocity, factor);
-    }
-    /// `Entity.restituteMovementAfterCollisions`, shared by travel and piston pushes.
-    pub fn restitute_movement(
-        &mut self,
-        world: &crate::world::World,
-        movement: &horizon_world::movement_properties::BoundMovementProperties,
-        wanted: Vec3,
-        moved: Vec3,
-    ) {
-        let differs = |a: f64, b: f64| (b - a).abs() >= f64::from(1.0e-5_f32);
-        let x_hit = differs(wanted.x, moved.x);
-        let z_hit = differs(wanted.z, moved.z);
-        let vertical = wanted.y != moved.y;
-        if wanted.y.abs() > 0.0 && vertical || x_hit || z_hit {
+        // Entity.restituteMovementAfterCollisions: the colliding components
+        // bounce back by the entity's bounciness or the block's (a slime
+        // block, a bed), whichever is larger. A mob never sneaks, so nothing
+        // suppresses its bounce there.
+        if moved_vertically && vertical || self.horizontal_collision {
+            // Entity.getOnPos(0.2F): the block whose bounce this move sees.
             let on = (
                 self.position.x.floor() as i32,
                 (self.position.y - f64::from(0.2_f32)).floor() as i32,
                 self.position.z.floor() as i32,
             );
             let input = RestitutionInput {
-                block: world.block(on.0, on.1, on.2),
+                block: w.world.block(on.0, on.1, on.2),
                 collided_x: x_hit,
                 collided_z: z_hit,
                 vertical_collision: vertical,
-                collision_below: vertical && wanted.y < 0.0,
+                collision_below: self.vertical_collision_below,
                 living: true,
                 resolved_movement: moved,
                 fall_distance: self.fall_distance,
             };
-            // Unknown block states have no bounce; the provider cannot fail.
+            // The port's phases cannot fail for a mob: a block outside the
+            // registry reads as one with no bounce, never as an error.
             let _ = restitute_movement(
                 &mut MobRestitution {
                     mob: self,
-                    world,
-                    movement,
+                    world: w,
                 },
                 input,
             );
         }
+        self.movement_emission(w, moved, events);
+        // Entity.move's last step: soul sand, honey and the like slow the
+        // horizontal speed of whatever the mob stands in or on.
+        let factor = self.block_speed_factor(w);
+        self.velocity = horizon_world::entity_move::scale_by_block_speed(self.velocity, factor);
     }
     /// `Entity.getBlockSpeedFactor` at the mob's feet.
     fn block_speed_factor(&self, w: &MobWorld) -> f32 {
@@ -2111,21 +2103,20 @@ pub fn client_water_splash(mob: &mut Mob, out: &mut Vec<MobEvent>) {
 /// mob that never sneaks. The phases themselves are
 /// `movement_restitution::restitute_movement`, the same port the player and
 /// dropped items use.
-struct MobRestitution<'a> {
+struct MobRestitution<'a, 'w> {
     mob: &'a mut Mob,
-    world: &'a crate::world::World,
-    movement: &'a horizon_world::movement_properties::BoundMovementProperties,
+    world: &'a MobWorld<'w>,
 }
-impl<'a> MobRestitution<'a> {
+impl<'a, 'w> MobRestitution<'a, 'w> {
     /// The block's movement data: its coefficients and its bounce tag.
     fn movement(
         &self,
         state: BlockStateId,
     ) -> Result<horizon_world::movement_properties::MovementBlock, ()> {
-        self.movement.get(state).map_err(|_| ())
+        self.world.movement.get(state).map_err(|_| ())
     }
 }
-impl RestitutionWorld for MobRestitution<'_> {
+impl RestitutionWorld for MobRestitution<'_, '_> {
     // The block data cannot fail here: a state the registry does not know
     // reads as a block with no bounce, never as an error.
     type Error = ();
@@ -2171,7 +2162,7 @@ impl RestitutionWorld for MobRestitution<'_> {
                 position.z.floor() as i32,
             ));
         };
-        let state = self.world.block(support[0], support[1], support[2]);
+        let state = self.world.world.block(support[0], support[1], support[2]);
         let keeps_column = self
             .movement(state)
             .is_ok_and(|b| b.wall || b.coefficients.fence_gate);

crates/horizon-client/src/mobs/villager_brain.rs

@@ -928,12 +928,12 @@ fn chunk_pois(
         return;
     };
     let kind = |state: u32| poi_of_state(w, horizon_world::registry::BlockStateId(state));
-    let (min, mut lists) = (w.world.bottom_y(), Vec::new());
-    w.world.pois.column(chunk, min, (y0, y1), kind, &mut lists);
-    for (base, pois) in &lists {
-        for &(i, poi) in pois.iter() {
+    let min = w.world.bottom_y();
+    for s in (y0 - min) >> 4..=(y1 - min) >> 4 {
+        let section = &chunk.sections[s as usize];
+        for &(i, poi) in w.world.pois.get((qx, s, qz), section, kind).iter() {
             let i = i32::from(i);
-            let y = base + (i >> 8);
+            let y = min + s * 16 + (i >> 8);
             if (y0..=y1).contains(&y) {
                 visit(poi, [qx * 16 + (i & 15), y, qz * 16 + (i >> 4 & 15)]);
             }

crates/horizon-client/src/no_resources.rs

@@ -46,11 +46,11 @@ impl NoResources {
         let x = ((ui.w - width) / 2.0).round();
         let lines: Vec<Vec<String>> = PARAGRAPHS
             .iter()
-            .map(|p| wrap(ui, Face::Regular, body(), p, width))
+            .map(|p| wrap(ui, Face::Regular, BODY, p, width))
             .collect();
         let text_h = lines.iter().map(|l| l.len() as f32 * LINE).sum::<f32>()
             + (lines.len() - 1) as f32 * PARAGRAPH_GAP;
-        let height = TITLE_LINE + 16.0 + text_h + 28.0 + control() + 20.0 + SMALL_LINE;
+        let height = TITLE_LINE + 16.0 + text_h + 28.0 + CONTROL + 20.0 + SMALL_LINE;
         let y = ((ui.h - height) / 2.0).max(24.0).round();
         let buttons_y = y + TITLE_LINE + 16.0 + text_h + 28.0;
         let mut buttons = Vec::new();
@@ -59,7 +59,7 @@ impl NoResources {
             ("Download the launcher", Action::Download),
             ("Quit", Action::Quit),
         ] {
-            let w = (ui.measure(Face::Medium, button_text(), label) + 40.0).round();
+            let w = (ui.measure(Face::Medium, BUTTON_TEXT, label) + 40.0).round();
             buttons.push(Button {
                 label,
                 action,
@@ -80,29 +80,21 @@ impl NoResources {
 
     pub fn draw(&self, ui: &mut Ui) {
         let layout = self.layout(ui);
-        ui.rounded(0.0, 0.0, ui.w, ui.h, 0.0, color::bg());
+        ui.rounded(0.0, 0.0, ui.w, ui.h, 0.0, color::BG);
         let mut y = layout.y;
         ui.text_line(
             Face::Medium,
-            title_size(),
+            TITLE_SIZE,
             TITLE_LINE,
             layout.x,
             y,
-            color::text(),
+            color::TEXT,
             TITLE,
         );
         y += TITLE_LINE + 16.0;
         for paragraph in &layout.lines {
             for line in paragraph {
-                ui.text_line(
-                    Face::Regular,
-                    body(),
-                    LINE,
-                    layout.x,
-                    y,
-                    color::text(),
-                    line,
-                );
+                ui.text_line(Face::Regular, BODY, LINE, layout.x, y, color::TEXT, line);
                 y += LINE;
             }
             y += PARAGRAPH_GAP;
@@ -110,20 +102,20 @@ impl NoResources {
         for button in &layout.buttons {
             let hovered = button.contains(ui.cursor);
             let (plate, ink) = match (button.action, hovered) {
-                (Action::Download, false) => (color::accent(), color::on_accent()),
+                (Action::Download, false) => (color::ACCENT, color::ON_ACCENT),
                 (Action::Download, true) => {
-                    (color::with_alpha(color::accent(), 0.85), color::on_accent())
+                    (color::with_alpha(color::ACCENT, 0.85), color::ON_ACCENT)
                 }
-                (Action::Quit, false) => (color::raised(), color::text()),
-                (Action::Quit, true) => (color::hover(), color::text()),
+                (Action::Quit, false) => (color::RAISED, color::TEXT),
+                (Action::Quit, true) => (color::HOVER, color::TEXT),
             };
-            let h = control();
+            let h = CONTROL;
             ui.rounded(button.x, button.y, button.w, h, h / 2.0, plate);
-            let lw = ui.measure(Face::Medium, button_text(), button.label);
+            let lw = ui.measure(Face::Medium, BUTTON_TEXT, button.label);
             let lx = button.x + ((button.w - lw) / 2.0).round();
             ui.text_line(
                 Face::Medium,
-                button_text(),
+                BUTTON_TEXT,
                 h,
                 lx,
                 button.y,
@@ -131,11 +123,11 @@ impl NoResources {
                 button.label,
             );
         }
-        let small_y = layout.buttons[0].y + control() + 20.0;
+        let small_y = layout.buttons[0].y + CONTROL + 20.0;
         for (i, line) in wrap(
             ui,
             Face::Regular,
-            ui_theme::small(),
+            ui_theme::SMALL,
             &self.looked_in,
             layout.width,
         )
@@ -145,11 +137,11 @@ impl NoResources {
             let line_y = small_y + i as f32 * SMALL_LINE;
             ui.text_line(
                 Face::Regular,
-                ui_theme::small(),
+                ui_theme::SMALL,
                 SMALL_LINE,
                 layout.x,
                 line_y,
-                color::muted(),
+                color::MUTED,
                 line,
             );
         }
@@ -165,22 +157,14 @@ impl NoResources {
     }
 }
 
-fn title_size() -> f32 {
-    ui_theme::sizes().title
-}
+const TITLE_SIZE: f32 = horizon_theme::TITLE.px;
 const TITLE_LINE: f32 = 40.0;
-fn body() -> f32 {
-    ui_theme::sizes().body
-}
+const BODY: f32 = horizon_theme::BODY.px;
 const LINE: f32 = 24.0;
 const PARAGRAPH_GAP: f32 = 10.0;
-fn button_text() -> f32 {
-    ui_theme::sizes().ui
-}
+const BUTTON_TEXT: f32 = horizon_theme::UI.px;
 const SMALL_LINE: f32 = 18.0;
-fn control() -> f32 {
-    ui_theme::sizes().control_large
-}
+const CONTROL: f32 = horizon_theme::CONTROL_LARGE;
 
 struct Layout {
     x: f32,
@@ -200,7 +184,7 @@ struct Button {
 
 impl Button {
     fn contains(&self, (cx, cy): (f32, f32)) -> bool {
-        cx >= self.x && cx < self.x + self.w && cy >= self.y && cy < self.y + control()
+        cx >= self.x && cx < self.x + self.w && cy >= self.y && cy < self.y + CONTROL
     }
 }
 
@@ -248,7 +232,7 @@ mod tests {
         for size in [[1280, 720], [800, 600], [2560, 1440]] {
             let (download, quit, density) = with_ui(size, (0.0, 0.0), |ui| {
                 let layout = screen.layout(ui);
-                let center = |b: &Button| (b.x + b.w / 2.0, b.y + control() / 2.0);
+                let center = |b: &Button| (b.x + b.w / 2.0, b.y + CONTROL / 2.0);
                 (
                     center(&layout.buttons[0]),
                     center(&layout.buttons[1]),
@@ -271,7 +255,7 @@ mod tests {
                 let layout = screen.layout(ui);
                 let last = layout.buttons.last().unwrap();
                 assert!(
-                    last.x + last.w <= ui.w && last.y + control() <= ui.h,
+                    last.x + last.w <= ui.w && last.y + CONTROL <= ui.h,
                     "{size:?}"
                 );
             });
@@ -282,10 +266,10 @@ mod tests {
     fn text_wraps_within_the_column_and_keeps_every_word() {
         with_ui([1280, 720], (0.0, 0.0), |ui| {
             for paragraph in PARAGRAPHS {
-                let lines = wrap(ui, Face::Regular, body(), paragraph, 300.0);
+                let lines = wrap(ui, Face::Regular, BODY, paragraph, 300.0);
                 assert!(lines.len() > 1, "{paragraph}");
                 for line in &lines {
-                    assert!(ui.measure(Face::Regular, body(), line) <= 300.0, "{line}");
+                    assert!(ui.measure(Face::Regular, BODY, line) <= 300.0, "{line}");
                 }
                 assert_eq!(lines.join(" "), paragraph);
             }

crates/horizon-client/src/osk.rs

@@ -293,16 +293,16 @@ impl Keyboard {
             y0 - 12.0,
             width + 24.0,
             height,
-            ui_theme::radius_plate(),
-            color::with_alpha(color::bg(), 0.94),
+            ui_theme::RADIUS_PLATE,
+            color::with_alpha(color::BG, 0.94),
         );
         ui.border(
             x0 - 12.0,
             y0 - 12.0,
             width + 24.0,
             height,
-            ui_theme::radius_plate(),
-            color::border(),
+            ui_theme::RADIUS_PLATE,
+            color::BORDER,
         );
         for (r, row) in self.rows().iter().enumerate() {
             let y = y0 + r as f32 * (KEY_H + GAP);
@@ -314,13 +314,13 @@ impl Keyboard {
                 let lit = matches!(key, Key::Shift) && (self.shift || self.caps)
                     || matches!(key, Key::Layer) && self.symbols;
                 let (plate, ink) = if focused {
-                    (color::accent(), color::on_accent())
+                    (color::ACCENT, color::ON_ACCENT)
                 } else if lit {
-                    (color::hover(), color::text())
+                    (color::HOVER, color::TEXT)
                 } else {
-                    (color::raised(), color::text())
+                    (color::RAISED, color::TEXT)
                 };
-                ui.rounded(x, y, w, KEY_H, ui_theme::radius(), plate);
+                ui.rounded(x, y, w, KEY_H, ui_theme::RADIUS, plate);
                 let label = match key {
                     Key::Char(ch) => self.letter(*ch),
                     Key::Shift if self.caps => "CAPS".into(),
@@ -331,10 +331,10 @@ impl Keyboard {
                     Key::Backspace => tr("horizon.osk.delete", "Delete"),
                     Key::Done => tr("gui.done", "Done"),
                 };
-                let lw = ui.measure(Face::Medium, ui_theme::body(), &label);
+                let lw = ui.measure(Face::Medium, ui_theme::BODY, &label);
                 ui.text_line(
                     Face::Medium,
-                    ui_theme::body(),
+                    ui_theme::BODY,
                     KEY_H,
                     x + ((w - lw) / 2.0).round(),
                     y,
@@ -359,10 +359,10 @@ impl Keyboard {
             .collect();
         ui.text_centered(
             Face::Regular,
-            ui_theme::small(),
+            ui_theme::SMALL,
             x0 + width / 2.0,
             y0 + 5.0 * (KEY_H + GAP) + 2.0,
-            color::muted(),
+            color::MUTED,
             &line.join("   "),
         );
     }

crates/horizon-client/src/studio/timeline_ui.rs

@@ -408,7 +408,7 @@ impl TimelineUi {
             let tx = start_x + sec * px_per_sec;
             if tx <= start_x + w {
                 // Major tick line
-                style::fill(batch, atlas, [tx, y + 8.0, 1.0, 8.0], style::head_rule());
+                style::fill(batch, atlas, [tx, y + 8.0, 1.0, 8.0], style::HEAD_RULE);
                 // Label every 2 or 5 seconds depending on width
                 let is_labeled = if total_secs > 60.0 {
                     (sec as u32).is_multiple_of(10)
@@ -424,7 +424,7 @@ impl TimelineUi {
                         "horizon.studio.timeline.seconds",
                         &[Text::literal(seconds)],
                     );
-                    batch.text_styled(atlas, &label, tx + 2.0, y + 1.0, style::soft(), true);
+                    batch.text_styled(atlas, &label, tx + 2.0, y + 1.0, style::SOFT, true);
                 }
             }
             sec += sec_step;
@@ -459,7 +459,7 @@ impl TimelineUi {
         // Base lane well
         let lane_rect = [start_x, y, track_w, bar_h];
         style::fill(batch, atlas, lane_rect, 0xFF14_171F);
-        style::ring(batch, atlas, lane_rect, style::row_rule());
+        style::ring(batch, atlas, lane_rect, style::ROW_RULE);
 
         let total_dur = self.duration_ms.max(1) as f32;
 
@@ -514,7 +514,7 @@ impl TimelineUi {
                     &scene_title,
                     seg_x + 5.0,
                     y + 5.0,
-                    style::muted(),
+                    style::MUTED,
                     true,
                 );
             }
@@ -577,7 +577,7 @@ impl TimelineUi {
         let px = start_x + norm * track_w;
 
         // Scrubber line from ruler through bottom of tracks
-        style::fill(batch, atlas, [px - 1.0, y, 2.0, h], style::accent());
+        style::fill(batch, atlas, [px - 1.0, y, 2.0, h], style::ACCENT);
 
         // Inverted triangle marker at ruler top
         let tri_color = style::WHITE;

crates/horizon-client/src/studio/topbar.rs

@@ -178,7 +178,7 @@ impl TopBarUi {
                 );
             }
             let color = if open {
-                style::accent()
+                style::ACCENT
             } else if hovered {
                 style::WHITE
             } else {
@@ -220,7 +220,7 @@ impl TopBarUi {
             if pause_hovered {
                 style::WHITE
             } else {
-                style::muted()
+                style::MUTED
             },
             true,
         );
@@ -339,11 +339,7 @@ impl TopBarUi {
                 &Text::translate(key, &[]),
                 x + 8.0,
                 y + 6.0,
-                if hovered {
-                    style::WHITE
-                } else {
-                    style::muted()
-                },
+                if hovered { style::WHITE } else { style::MUTED },
                 true,
             );
             if !shortcut.is_empty() {
@@ -354,7 +350,7 @@ impl TopBarUi {
                     &shortcut,
                     x + menu_width - shortcut_width - 8.0,
                     y + 6.0,
-                    style::soft(),
+                    style::SOFT,
                     true,
                 );
             }

crates/horizon-client/src/ui_theme.rs

@@ -1,6 +1,6 @@
-//! The design system's widgets drawn in the game: palette, type scale, radii,
-//! control sizes and fonts from `menu_style`, given at startup (in the official
-//! game `crates/horizon-theme`, `docs/design-system.md`). Every menu is vanilla's (`ui`); what is left
+//! The design system's widgets drawn in the game (`crates/horizon-theme`:
+//! palette, type scale, radii, control sizes, motion and the bundled fonts;
+//! `docs/design-system.md`). Every menu is vanilla's (`ui`); what is left
 //! here draws Horizon's own overlays that vanilla has no screen for: the
 //! on-screen keyboard a controller types with (`osk`), plus the
 //! `horizon.txt` preferences.
@@ -39,76 +39,44 @@ pub(crate) fn set_preference(dir: &Path, key: &str, value: Option<&str>) {
     let _ = std::fs::write(dir.join("horizon.txt"), out);
 }
 
-/// The overlays' palette (`menu_style`) in the HUD's colour encoding, plus the
+/// The dark palette (`horizon_theme::DARK`) in the HUD's colour encoding, plus the
 /// translucent plates the overlays draw over the game.
 pub(crate) mod color {
-    use horizon_client_render::menu_style::{self, OverlayColours};
-    pub use menu_style::hud_colour as hex;
-    fn p() -> &'static OverlayColours {
-        &menu_style::get().overlay
+    use horizon_theme::DARK as P;
+    pub const fn hex(c: u32, a: u8) -> u32 {
+        (a as u32) << 24 | (c & 0xff) << 16 | (c >> 8 & 0xff) << 8 | (c >> 16 & 0xff)
     }
     /// The page, under every veil.
-    pub fn bg() -> u32 {
-        hex(p().page, 255)
-    }
+    pub const BG: u32 = hex(P.page, 255);
     /// Hover plates, secondary buttons, fields, the segmented track: the
     /// dark palette's soft plate, as ink over the veil so the plates read the
     /// same over any backdrop (over the page colour they are `plate_soft`).
-    pub fn raised() -> u32 {
-        hex(p().ink, 20)
-    }
+    pub const RAISED: u32 = hex(P.ink, 20);
     /// Pressed plates and a switch that is off (`plate`, the same way).
-    pub fn hover() -> u32 {
-        hex(p().ink, 36)
-    }
+    pub const HOVER: u32 = hex(P.ink, 36);
     /// One-pixel rules between rows, slider tracks.
-    pub fn border() -> u32 {
-        hex(p().rule, 255)
-    }
+    pub const BORDER: u32 = hex(P.rule, 255);
     /// Text and selection (`ink`).
-    pub fn text() -> u32 {
-        hex(p().ink, 255)
-    }
+    pub const TEXT: u32 = hex(P.ink, 255);
     /// Values and secondary text (`ink_soft`).
-    pub fn muted() -> u32 {
-        hex(p().ink_soft, 255)
-    }
-    pub fn accent() -> u32 {
-        hex(p().accent, 255)
-    }
-    pub fn on_accent() -> u32 {
-        hex(p().on_accent, 255)
-    }
+    pub const MUTED: u32 = hex(P.ink_soft, 255);
+    pub const ACCENT: u32 = hex(P.accent, 255);
+    pub const ON_ACCENT: u32 = hex(P.on_accent, 255);
     pub(crate) fn with_alpha(c: u32, a: f32) -> u32 {
         let base = (c >> 24) as f32;
         (c & 0x00ff_ffff) | ((base * a.clamp(0.0, 1.0)).round() as u32) << 24
     }
 }
 
-/// The type scale and shapes (`menu_style`), in dp.
-pub(crate) fn sizes() -> &'static horizon_client_render::menu_style::Sizes {
-    &horizon_client_render::menu_style::get().sizes
-}
-pub(crate) fn small() -> f32 {
-    sizes().caption
-}
-pub(crate) fn body() -> f32 {
-    sizes().label
-}
-/// The boot screen's wordmark (`display`) and console lines (`micro`).
-fn display() -> f32 {
-    sizes().display
-}
-fn micro() -> f32 {
-    sizes().micro
-}
-/// Fields; plates (hover rows, selection).
-pub(crate) fn radius() -> f32 {
-    sizes().radius
-}
-pub(crate) fn radius_plate() -> f32 {
-    sizes().radius_plate
-}
+/// The launcher's type scale and shapes (`horizon_theme`), in dp.
+pub(crate) const SMALL: f32 = horizon_theme::CAPTION.px;
+pub(crate) const BODY: f32 = horizon_theme::LABEL.px;
+/// The boot screen's wordmark (`DISPLAY`) and console lines (`MICRO`).
+pub(crate) const DISPLAY: f32 = horizon_theme::DISPLAY.px;
+pub(crate) const MICRO: f32 = horizon_theme::MICRO.px;
+/// Fields; plates (hover rows, selection); pills (buttons, segments).
+pub(crate) const RADIUS: f32 = horizon_theme::RADIUS;
+pub(crate) const RADIUS_PLATE: f32 = horizon_theme::RADIUS_PLATE;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub(crate) enum Face {
@@ -119,34 +87,20 @@ pub(crate) enum Face {
     /// Counts, timestamps and the boot screen's console lines.
     Mono,
 }
-#[cfg(not(test))]
-const TEST_FONTS: Option<horizon_client_render::menu_style::Fonts> = None;
-#[cfg(test)]
-const TEST_FONTS: Option<horizon_client_render::menu_style::Fonts> =
-    Some(horizon_client_render::menu_style::Fonts {
-        regular: horizon_theme::fonts::GEIST_REGULAR,
-        medium: horizon_theme::fonts::GEIST_MEDIUM,
-        semibold: horizon_theme::fonts::GEIST_SEMIBOLD,
-        mono: horizon_theme::fonts::GEIST_MONO,
-    });
 struct Fonts {
     faces: [FontRef<'static>; 4],
 }
 impl Fonts {
-    /// The faces given in `menu_style`; none given, none (unit tests take the design system's).
-    fn load() -> Option<Self> {
-        let given = horizon_client_render::menu_style::get()
-            .fonts
-            .or(TEST_FONTS)?;
-        let f = |b: &'static [u8]| FontRef::try_from_slice(b).expect("given font");
-        Some(Self {
+    fn load() -> Self {
+        let f = |b: &'static [u8]| FontRef::try_from_slice(b).expect("bundled font");
+        Self {
             faces: [
-                f(given.regular),
-                f(given.medium),
-                f(given.semibold),
-                f(given.mono),
+                f(horizon_theme::fonts::GEIST_REGULAR),
+                f(horizon_theme::fonts::GEIST_MEDIUM),
+                f(horizon_theme::fonts::GEIST_SEMIBOLD),
+                f(horizon_theme::fonts::GEIST_MONO),
             ],
-        })
+        }
     }
     fn face(&self, f: Face) -> &FontRef<'static> {
         &self.faces[f as usize]
@@ -188,8 +142,7 @@ struct Cached {
 }
 /// Glyphs and corner masks rasterized into the atlas region `horizon/ui-text`.
 struct Cache {
-    /// None: no fonts were given, and text draws nothing.
-    fonts: Option<Fonts>,
+    fonts: Fonts,
     entries: HashMap<Key, Cached>,
     shelf: (u32, u32, u32),
     pending: Vec<crate::font::Patch>,
@@ -277,16 +230,9 @@ impl Cache {
         if let Some(c) = self.entries.get(&key) {
             return *c;
         }
-        let Some(fonts) = &self.fonts else {
-            return Cached {
-                rect: None,
-                left: 0.0,
-                top: 0.0,
-            };
-        };
-        let scale = fonts.scale(face, f32::from(size) / 4.0);
+        let scale = self.fonts.scale(face, f32::from(size) / 4.0);
         let glyph = id.with_scale_and_position(scale, ab_glyph::point(0.0, 0.0));
-        let made = match fonts.face(face).outline_glyph(glyph) {
+        let made = match self.fonts.face(face).outline_glyph(glyph) {
             Some(outline) => {
                 let b = outline.px_bounds();
                 let (w, h) = (b.width() as u32, b.height() as u32);
@@ -513,17 +459,14 @@ impl<'a> Ui<'a> {
         let atlas = self.atlas;
         let gui = self.scale;
         with_cache(atlas, |c| {
-            let Some(fonts) = &c.fonts else {
-                return (0.0, 0.0, 0.0, Vec::new());
-            };
-            let scale = fonts.scale(face, px);
+            let scale = c.fonts.scale(face, px);
             let (ascent, descent) = {
-                let f = fonts.face(face).as_scaled(scale);
+                let f = c.fonts.face(face).as_scaled(scale);
                 (f.ascent(), f.descent())
             };
             let chars: Vec<(char, Option<crate::font::Glyph>)> = unformatted(text)
                 .map(|ch| {
-                    let pack = (!ch.is_whitespace() && fonts.face(face).glyph_id(ch).0 == 0)
+                    let pack = (!ch.is_whitespace() && c.fonts.face(face).glyph_id(ch).0 == 0)
                         .then(|| atlas.font.glyph(ch))
                         // The pack lacks it too (its missing glyph): Geist's box, like vanilla's.
                         .filter(|g| g.rect.is_some() || g.right <= 0.0);
@@ -548,10 +491,7 @@ impl<'a> Ui<'a> {
                     continue;
                 }
                 let (id, advance, kern) = {
-                    let Some(fonts) = &c.fonts else {
-                        break;
-                    };
-                    let font = fonts.face(face);
+                    let font = c.fonts.face(face);
                     let id = font.glyph_id(ch);
                     let f = font.as_scaled(scale);
                     (id, f.h_advance(id), prev.map_or(0.0, |p| f.kern(p, id)))
@@ -666,8 +606,8 @@ pub fn draw_boot(atlas: &HudAtlas, batch: &mut HudBatch, logs: &[String]) {
 /// The wordmark with its tagline, centred.
 fn wordmark(atlas: &HudAtlas, batch: &mut HudBatch) {
     let mut ui = Ui::new(atlas, batch, (0.0, 0.0));
-    let size = (ui.w / 16.0).clamp(display(), 96.0);
-    let small = (size * 0.25).clamp(micro(), 18.0);
+    let size = (ui.w / 16.0).clamp(DISPLAY, 96.0);
+    let small = (size * 0.25).clamp(MICRO, 18.0);
     let block = size * 1.45 + small * 0.6 + small * 1.5;
     let top = (ui.h - block) / 2.0;
     ui.text_centered(Face::SemiBold, size, ui.w / 2.0, top, BOOT_TEXT, "Horizon");
@@ -689,7 +629,7 @@ pub fn draw_boot_log(atlas: &HudAtlas, batch: &mut HudBatch, logs: &[String]) {
         return;
     }
     let mut ui = Ui::new(atlas, batch, (0.0, 0.0));
-    let (size, line, pad) = (micro(), micro() * 1.5, 16.0);
+    let (size, line, pad) = (MICRO, MICRO * 1.5, 16.0);
     let max_w = ui.w / 2.0;
     let max_rows = (((ui.h - pad) / line) as usize).clamp(1, 24);
     let mut y = ui.h - pad - line;
@@ -756,12 +696,7 @@ mod tests {
         let atlas = HudAtlas::build(Path::new("/nonexistent/horizon-test-assets")).unwrap();
         reset_atlas();
         let draw = |cache: &mut Cache| {
-            let glyph = cache
-                .fonts
-                .as_ref()
-                .unwrap()
-                .face(Face::Regular)
-                .glyph_id('A');
+            let glyph = cache.fonts.face(Face::Regular).glyph_id('A');
             assert!(
                 cache
                     .glyph(&atlas, Face::Regular, glyph, 16.0)
@@ -847,7 +782,7 @@ mod tests {
         let lines = wrapping_lines(
             &ui,
             Face::Mono,
-            micro(),
+            MICRO,
             "the quick brown fox jumps over the lazy dog",
             90.0,
         );
@@ -855,7 +790,7 @@ mod tests {
         assert!(
             lines
                 .iter()
-                .all(|l| ui.measure(Face::Mono, micro(), l) <= 90.0),
+                .all(|l| ui.measure(Face::Mono, MICRO, l) <= 90.0),
             "every wrapped line fits"
         );
         assert_eq!(
@@ -877,7 +812,7 @@ mod tests {
     fn drawn(atlas: &HudAtlas, text: &str) -> (f32, Vec<([f32; 2], [f32; 2])>) {
         let mut batch = HudBatch::new([1280, 720]);
         let mut ui = Ui::new(atlas, &mut batch, (0.0, 0.0));
-        let w = ui.text_line(Face::Medium, body(), 20.0, 10.0, 10.0, color::text(), text);
+        let w = ui.text_line(Face::Medium, BODY, 20.0, 10.0, 10.0, color::TEXT, text);
         let quads = batch
             .vertices
             .iter()

crates/horizon-discord/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "horizon-discord"
-version = "0.1.0"
-edition.workspace = true
-license.workspace = true
-rust-version.workspace = true
-description = "Discord Rich Presence: \"Playing Horizon\" on the player's Discord profile (docs/native-client.md)"
-
-[dependencies]
-horizon-platform = { path = "../horizon-platform" }
-log = "0.4"
-serde_json = "1.0.151"
-
-[lints]
-workspace = true

crates/horizon-hooks/src/lang.rs

@@ -0,0 +1,47 @@
+//! Lang files a crate above the engine ships with its text (docs/layers.md, "Platform
+//! registries"). A crate [`register`]s its `(code, JSON)` pairs, usually `include_str!`s of its
+//! `assets/lang/<code>.json`, before the game starts. The game loads them as part of its own
+//! `horizon` namespace, right after its bundled files for the same language, so resource packs
+//! still override them; on a key both have, the engine's file wins. A regional variant reads its
+//! language's file as the engine's do (`fr_ca` reads `fr_fr`, `de_ch` reads `de_de` without `ß`).
+use crate::{TooLate, registry::Registry};
+
+/// One crate's lang files: a language code (`en_us`, `fr_fr`) and that file's JSON text.
+pub type Files = [(&'static str, &'static str)];
+
+static FILES: Registry<Files> = Registry::new();
+
+/// Adds a crate's lang files. Before the game starts, as [`crate::register`]; a later call is
+/// refused.
+pub fn register(files: &'static Files) -> Result<(), TooLate> {
+    FILES.register(files)
+}
+
+pub(crate) fn all() -> &'static [&'static Files] {
+    FILES.all()
+}
+
+/// The engine's side. Only the engine calls it.
+pub mod engine {
+    /// Every crate's files, in registration order, sealing the list on the first call.
+    pub fn all() -> &'static [&'static super::Files] {
+        super::all()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn files_registered_before_the_game_starts_are_kept_in_order() {
+        static A: &Files = &[("en_us", r#"{"a.b.c": "A"}"#)];
+        static B: &Files = &[("en_us", r#"{"d.e.f": "B"}"#), ("fr_fr", "{}")];
+        assert_eq!(register(A), Ok(()));
+        assert_eq!(register(B), Ok(()));
+        let all = engine::all();
+        assert_eq!(all.len(), 2);
+        assert_eq!(all[1][1].0, "fr_fr");
+        assert_eq!(register(A), Err(TooLate));
+    }
+}

crates/horizon-hooks/src/lib.rs

@@ -14,10 +14,11 @@
 //!
 //! The platform registries (docs/layers.md, "Platform registries") have the same shape:
 //! [`settings`] for the settings each crate keeps in its own lines, [`pages`] for its settings
-//! pages, [`hud`] for what it draws on the HUD.
+//! pages, [`hud`] for what it draws on the HUD, [`lang`] for the lang files with its text.
 #![forbid(unsafe_code)]
 
 pub mod hud;
+pub mod lang;
 pub mod pages;
 pub mod players;
 mod registry;
@@ -77,79 +78,12 @@ pub trait Hooks: Sync {
     /// Draws on a player model, after its vanilla layers, each time it is drawn.
     fn player_layers(&self, _model: &players::PlayerModel, _draw: &mut dyn players::PlayerDraw) {}
 
-    /// Draws around the window's own model while its body is out of view (first person), once a
-    /// frame after the first-person model: [`players::Pass::FirstPerson`].
-    fn first_person(&self, _own: &players::PlayerModel, _draw: &mut dyn players::PlayerDraw) {}
-
     /// The resolver of `friend:` addresses this crate offers ([`tunnel`]); the first hook that
     /// offers one is used. Asked on the network thread when joining and on the game thread when
     /// an address is shown, never per frame.
     fn tunnel(&self) -> Option<&dyn tunnel::Resolver> {
         None
     }
-
-    /// A game window opened: once, before the first frame, for every run that has a window,
-    /// automated ones included ([`Client::automated`]); never for a dedicated server.
-    fn client_started(&self, _client: &Client) {}
-
-    /// What the player is doing, for a status shown outside the game (Discord's): called when it
-    /// changes, not every frame. Splitscreen: the first player's only.
-    fn activity(&self, _now: Activity) {}
-}
-
-/// What [`Hooks::client_started`] gets.
-#[non_exhaustive]
-pub struct Client {
-    /// A run nobody plays: offscreen, a benchmark, a run that quits by itself after some frames.
-    pub automated: bool,
-}
-
-impl Client {
-    pub fn new(automated: bool) -> Self {
-        Self { automated }
-    }
-}
-
-/// What the player is doing ([`Hooks::activity`]).
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-#[non_exhaustive]
-pub enum Activity {
-    /// On the title screen or another menu outside a world.
-    Menus,
-    World {
-        play: Play,
-        dimension: Dimension,
-        mode: GameMode,
-    },
-}
-
-/// How the player is in a world.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Play {
-    Singleplayer,
-    /// A server or someone else's LAN world.
-    Multiplayer,
-    /// Their world is open to LAN or friends; `players` counts the host, `max` is how many may
-    /// join.
-    Hosting {
-        players: usize,
-        max: usize,
-    },
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Dimension {
-    Overworld,
-    Nether,
-    End,
-}
-
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum GameMode {
-    Survival,
-    Creative,
-    Adventure,
-    Spectator,
 }
 
 /// What [`Hooks::started`] gets.
@@ -222,6 +156,7 @@ pub mod engine {
         crate::settings::all();
         crate::pages::engine::all();
         crate::hud::engine::all();
+        crate::lang::all();
     }
 
     /// [`Hooks::started`].
@@ -245,32 +180,6 @@ pub mod engine {
         }
     }
 
-    /// [`Hooks::client_started`].
-    pub fn client_started(client: &Client) {
-        for hooks in all() {
-            hooks.client_started(client);
-        }
-    }
-
-    /// The activity at the last call (`None` before the first).
-    static ACTIVITY: std::sync::Mutex<Option<Activity>> = std::sync::Mutex::new(None);
-
-    /// [`Hooks::activity`], when `now` differs from the last call's. Cheap enough to call every
-    /// frame: with no hook registered it only loads the empty list.
-    pub fn activity(now: Activity) {
-        let hooks = all();
-        if hooks.is_empty() {
-            return;
-        }
-        let mut last = ACTIVITY.lock().unwrap_or_else(|e| e.into_inner());
-        if last.replace(now) != Some(now) {
-            drop(last);
-            for h in hooks {
-                h.activity(now);
-            }
-        }
-    }
-
     /// [`Hooks::shutdown`].
     pub fn shutdown() {
         for hooks in all() {
@@ -310,13 +219,6 @@ pub mod engine {
         }
     }
 
-    /// [`Hooks::first_person`].
-    pub fn first_person(own: &players::PlayerModel, draw: &mut dyn players::PlayerDraw) {
-        for hooks in all() {
-            hooks.first_person(own, draw);
-        }
-    }
-
     /// [`Hooks::camera`].
     pub fn camera(own: &players::CameraView) -> Option<players::CameraOverride> {
         all().iter().find_map(|h| h.camera(own))
@@ -355,9 +257,6 @@ mod tests {
         fn published(&self, open: bool) {
             self.0.lock().unwrap().push(format!("published {open}"));
         }
-        fn activity(&self, now: Activity) {
-            self.0.lock().unwrap().push(format!("{now:?}"));
-        }
         fn frame(&self, frame: &players::Frame, sprites: &mut dyn players::SpriteStore) {
             self.0
                 .lock()
@@ -388,14 +287,7 @@ mod tests {
                 return;
             };
             let turn = draw.ticks() / 100.0;
-            let look = players::Look::new(uv);
-            draw.draw(&HAT, head, look, &mut |p| p.pose("brim")[4] = turn);
-        }
-        /// A spark at the eyes, as bright as the head turns.
-        fn first_person(&self, _: &players::PlayerModel, draw: &mut dyn players::PlayerDraw) {
-            let alpha = draw.motion().head_yaw / 90.0;
-            let spark = players::Particle::new([[0.0; 3]; 4], [[0.0; 2]; 4], alpha);
-            draw.particles([0.0; 4], &[spark], players::Light::Full);
+            draw.draw(&HAT, head, uv, &mut |p| p.pose("brim")[4] = turn);
         }
         fn tick(&self, models: &mut dyn players::PlayerModels) {
             let mut ids = Vec::new();
@@ -472,10 +364,9 @@ mod tests {
             ))
         });
 
-    /// A player drawn at age 50, its head where the camera is, turned 45 degrees; logs each draw
-    /// and its particles' alphas.
+    /// A player drawn at age 50, its head where the camera is; logs each draw.
     #[derive(Default)]
-    struct Canvas(Vec<(String, [[f32; 4]; 4], [f32; 4], f32)>, Vec<f32>);
+    struct Canvas(Vec<(String, [[f32; 4]; 4], [f32; 4], f32)>);
     impl players::PlayerDraw for Canvas {
         fn pass(&self) -> players::Pass {
             players::Pass::World
@@ -483,15 +374,6 @@ mod tests {
         fn ticks(&self) -> f32 {
             50.0
         }
-        fn base(&self) -> [[f32; 4]; 4] {
-            [[1.0, 0.0, 0.0, 0.0]; 4]
-        }
-        fn motion(&self) -> players::Motion {
-            players::Motion::new([0.0; 3], 45.0, 0.0)
-        }
-        fn view(&self) -> players::View {
-            players::View::default()
-        }
         fn bone(&mut self, bone: players::Bone) -> Option<[[f32; 4]; 4]> {
             (bone == players::Bone::Head).then_some([[1.0, 0.0, 0.0, 0.0]; 4])
         }
@@ -505,7 +387,7 @@ mod tests {
             &mut self,
             mesh: &std::sync::Arc<players::Mesh>,
             matrix: [[f32; 4]; 4],
-            look: players::Look,
+            uv: [f32; 4],
             pose: &mut dyn FnMut(&mut dyn players::PartPoses),
         ) {
             struct Rest([f32; 9]);
@@ -516,10 +398,7 @@ mod tests {
             }
             let mut brim = Rest(mesh.children[0].pose);
             pose(&mut brim);
-            self.0.push((mesh.name.clone(), matrix, look.uv, brim.0[4]));
-        }
-        fn particles(&mut self, _: [f32; 4], particles: &[players::Particle], _: players::Light) {
-            self.1.extend(particles.iter().map(|p| p.alpha));
+            self.0.push((mesh.name.clone(), matrix, uv, brim.0[4]));
         }
     }
 
@@ -538,14 +417,6 @@ mod tests {
         for open in [false, true, true, true, false, false] {
             engine::published(open);
         }
-        let world = Activity::World {
-            play: Play::Singleplayer,
-            dimension: Dimension::Nether,
-            mode: GameMode::Creative,
-        };
-        for now in [Activity::Menus, Activity::Menus, world, world] {
-            engine::activity(now);
-        }
         engine::shutdown();
         assert!(engine::any());
         let mut atlas = Atlas::default();
@@ -576,8 +447,6 @@ mod tests {
                 0.5
             )]
         );
-        engine::first_person(&model(players::Kind::Own), &mut canvas);
-        assert_eq!(canvas.1, [0.5]);
         let mut models = Two(Default::default());
         engine::tick(&mut models);
         assert!(models.body_pose(3).is_some() && models.body_pose(7).is_some());
@@ -587,8 +456,6 @@ mod tests {
                 "started 0.2.31",
                 "published true",
                 "published false",
-                "Menus",
-                "World { play: Singleplayer, dimension: Nether, mode: Creative }",
                 "frame 4"
             ]
         );

crates/horizon-hooks/src/players.rs

@@ -274,149 +274,8 @@ impl Bone {
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 #[non_exhaustive]
 pub enum Pass {
-    /// In the world, seen by the camera (the window's own model too, in third person).
+    /// In the world, seen by the camera.
     World,
-    /// The inventory's picture of the window's own model.
-    Picture,
-    /// The window's own model while its body is out of view (first person): no bone, only what
-    /// floats around it ([`crate::Hooks::first_person`]).
-    FirstPerson,
-}
-
-/// How a player model moves this frame ([`PlayerDraw::motion`]), with the frame's part of a tick.
-#[derive(Clone, Copy, Debug, Default)]
-#[non_exhaustive]
-pub struct Motion {
-    /// Where its feet are, in the world.
-    pub feet: [f64; 3],
-    /// Where its head turns (degrees, the game's yaw and pitch).
-    pub head_yaw: f32,
-    pub head_pitch: f32,
-    pub crouching: bool,
-    /// Lies in a bed.
-    pub asleep: bool,
-    /// Flies with an elytra.
-    pub flying: bool,
-    /// Swims (any part of the swimming pose).
-    pub swimming: bool,
-}
-
-impl Motion {
-    pub fn new(feet: [f64; 3], head_yaw: f32, head_pitch: f32) -> Self {
-        Self {
-            feet,
-            head_yaw,
-            head_pitch,
-            ..Self::default()
-        }
-    }
-
-    /// With its poses: crouching, asleep, flying, swimming.
-    pub fn poses(self, crouching: bool, asleep: bool, flying: bool, swimming: bool) -> Self {
-        Self {
-            crouching,
-            asleep,
-            flying,
-            swimming,
-            ..self
-        }
-    }
-}
-
-/// The camera a player model is drawn for ([`PlayerDraw::view`]).
-#[derive(Clone, Copy, Debug, Default)]
-#[non_exhaustive]
-pub struct View {
-    /// Where it is, in the world: matrices and [`Particle`] corners are relative to it.
-    pub camera: [f64; 3],
-    /// Its right and up, for what faces it.
-    pub right: [f32; 3],
-    pub up: [f32; 3],
-    /// Where the window's player looks, and their level left (first person).
-    pub forward: [f32; 3],
-    pub left: [f32; 3],
-}
-
-impl View {
-    pub fn new(camera: [f64; 3], right: [f32; 3], up: [f32; 3]) -> Self {
-        Self {
-            camera,
-            right,
-            up,
-            ..Self::default()
-        }
-    }
-
-    /// With where the window's player looks and their level left.
-    pub fn looking(self, forward: [f32; 3], left: [f32; 3]) -> Self {
-        Self {
-            forward,
-            left,
-            ..self
-        }
-    }
-}
-
-/// How a mesh or particles are lit.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-#[non_exhaustive]
-pub enum Light {
-    /// As the player model is.
-    Model,
-    /// Fully lit: it glows.
-    Full,
-    /// By the world where the mesh's origin is (as particles: like [`Light::Model`]).
-    AtPlace,
-}
-
-/// How [`PlayerDraw::draw`] draws a mesh.
-#[derive(Clone, Copy, Debug)]
-#[non_exhaustive]
-pub struct Look {
-    /// The sprite part it is textured by (u0, v0, u1, v1).
-    pub uv: [f32; 4],
-    pub light: Light,
-    /// Drawn see-through at this alpha, after every player, its back faces dropped.
-    pub see_through: Option<f32>,
-}
-
-impl Look {
-    /// Opaque, lit as the model.
-    pub fn new(uv: [f32; 4]) -> Self {
-        Self {
-            uv,
-            light: Light::Model,
-            see_through: None,
-        }
-    }
-
-    pub fn lit(self, light: Light) -> Self {
-        Self { light, ..self }
-    }
-
-    pub fn see_through(self, alpha: f32) -> Self {
-        Self {
-            see_through: Some(alpha),
-            ..self
-        }
-    }
-}
-
-/// A quad that faces the camera ([`PlayerDraw::particles`]).
-#[derive(Clone, Copy, Debug)]
-#[non_exhaustive]
-pub struct Particle {
-    /// Its corners, relative to the camera.
-    pub corners: [[f32; 3]; 4],
-    /// Each corner's place across the sprite part (0 to 1).
-    pub uv: [[f32; 2]; 4],
-    pub alpha: f32,
-}
-
-impl Particle {
-    pub fn new(corners: [[f32; 3]; 4], uv: [[f32; 2]; 4], alpha: f32) -> Self {
-        Self { corners, uv, alpha }
-    }
 }
 
 /// The poses of a [`Mesh`]'s parts for one [`PlayerDraw::draw`], each at rest to begin with.
@@ -432,25 +291,19 @@ pub trait PlayerDraw {
     fn pass(&self) -> Pass;
     /// The model's age in ticks, with the frame's part of a tick.
     fn ticks(&self) -> f32;
-    /// The model's own matrix, its origin at the neck (y down, 16 units a block).
-    fn base(&self) -> [[f32; 4]; 4];
-    fn motion(&self) -> Motion;
-    fn view(&self) -> View;
-    /// Where `bone` is as the body is drawn this frame; None if the model has no such part (or
-    /// no body is drawn: [`Pass::FirstPerson`]).
+    /// Where `bone` is as the body is drawn this frame; None if the model has no such part.
     fn bone(&mut self, bone: Bone) -> Option<[[f32; 4]; 4]>;
     /// The pose laid over the model's body ([`PlayerModels::set_body_pose`]), if any.
     fn body_pose(&self) -> Option<&Arc<dyn BodyPose>>;
     /// As [`Sprites::get`].
     fn sprite(&self, id: u64) -> Option<[f32; 4]>;
-    /// Draws `mesh` at `matrix` as `look` says; `pose` poses its parts first.
+    /// Draws `mesh` at `matrix`, textured by the sprite part `uv` (u0, v0, u1, v1) and lit as the
+    /// model is; `pose` poses its parts first.
     fn draw(
         &mut self,
         mesh: &Arc<Mesh>,
         matrix: [[f32; 4]; 4],
-        look: Look,
+        uv: [f32; 4],
         pose: &mut dyn FnMut(&mut dyn PartPoses),
     );
-    /// Draws `particles`, textured by the sprite part `uv`, see-through after every player.
-    fn particles(&mut self, uv: [f32; 4], particles: &[Particle], light: Light);
 }

crates/horizon-official/Cargo.toml

@@ -16,7 +16,6 @@ horizon-platform = { path = "../horizon-platform" }
 horizon-heartbeat = { path = "../horizon-heartbeat" }
 horizon-friends = { path = "../horizon-friends", features = ["game"] }
 horizon-official-servers = { path = "../horizon-official-servers" }
-horizon-discord = { path = "../horizon-discord" }
 log = "0.4"
 
 [build-dependencies]

crates/horizon-official/src/lib.rs

@@ -4,36 +4,27 @@
 //! (`game-build.yml`); horizon-client keeps its own plain executable.
 //!
 //! Each Horizon crate that runs in the game gives a `&'static` value implementing
-//! `horizon_platform::hooks::Hooks`, and its settings store and pages if it has any, and
-//! [`register`] adds them. Nothing here depends on an engine crate.
+//! `horizon_platform::hooks::Hooks`, and [`register`] adds it. Nothing here depends on an engine
+//! crate.
 #![forbid(unsafe_code)]
 
 use horizon_platform::hooks::{self, Hooks};
-use horizon_platform::{pages, settings};
 
 /// Every Horizon part in the game, in the order its hooks run.
-const PARTS: [&dyn Hooks; 4] = [
+const PARTS: [&dyn Hooks; 3] = [
     // The anonymous "I'm playing" ping.
     &horizon_heartbeat::HOOKS,
     // Play with Friends: `friend:` addresses join through its tunnel.
     &horizon_friends::game::HOOKS,
     // The official server in the player's server list.
     &horizon_official_servers::HOOKS,
-    // "Playing Horizon" on the player's Discord profile.
-    &horizon_discord::HOOKS,
 ];
-/// Their settings, in the player's settings files.
-const STORES: [&dyn settings::Store; 1] = [&horizon_discord::SETTING];
-/// Their rows and pages in the options screens.
-const PAGES: [&dyn pages::Page; 1] = [&horizon_discord::SECTION];
 
 /// Registers Horizon's in-game parts with the game. The executable calls it before it runs the
 /// game, and so does the launcher's generated executable for native mods.
 pub fn register() {
-    let late = PARTS.into_iter().map(hooks::register);
-    let late = late.chain(STORES.into_iter().map(settings::register));
-    for result in late.chain(PAGES.into_iter().map(pages::register)) {
-        if let Err(e) = result {
+    for part in PARTS {
+        if let Err(e) = hooks::register(part) {
             // The executable registered after starting the game: a bug, not a player's problem.
             log::warn!("Horizon: an in-game part did not register: {e}");
         }

crates/horizon-platform/src/lib.rs

@@ -50,14 +50,11 @@ pub mod hooks {
     /// [`Hooks::tick`] get, the pose a crate lays over a player's body, what goes by their names,
     /// the crate's sprites, the camera, and what a crate draws on them.
     pub use horizon_hooks::players::{
-        BODY_PARTS, Badge, BodyPose, Bone, CameraOverride, CameraView, Frame, Gear, Kind, Light,
-        Look, Mark, Mesh, Motion, NameDecoration, PartPoses, Particle, Pass, PlayerDraw,
-        PlayerModel, PlayerModels, Quad, SpriteStore, Sprites, View,
-    };
-    pub use horizon_hooks::{
-        Activity, Client, Dimension, GameMode, Hooks, Play, Started, TooLate, register, seat,
-        tunnel,
+        BODY_PARTS, Badge, BodyPose, Bone, CameraOverride, CameraView, Frame, Gear, Kind, Mark,
+        Mesh, NameDecoration, PartPoses, Pass, PlayerDraw, PlayerModel, PlayerModels, Quad,
+        SpriteStore, Sprites,
     };
+    pub use horizon_hooks::{Hooks, Started, TooLate, register, seat, tunnel};
 }
 
 /// The settings store (`horizon_hooks::settings`): a crate's own `key:value` lines in the game
@@ -71,6 +68,12 @@ pub mod pages {
     pub use horizon_hooks::pages::{Act, Label, Page, Place, Row, register};
 }
 
+/// The lang files with a crate's text, loaded with the game's own (docs/layers.md, "Platform
+/// registries").
+pub mod lang {
+    pub use horizon_hooks::lang::{Files, register};
+}
+
 /// Drawing on the HUD (docs/layers.md, "Platform registries").
 pub mod hud {
     pub use horizon_hooks::hud::{Canvas, Corner, Layer, register};

docs/README.md

@@ -7,7 +7,6 @@ To play, use [the launcher](../launcher/README.md); the project site is [playhor
 - [AGENTS.md](../AGENTS.md) and [Architecture](architecture.md): where each part of the code lives, how `Game` is organised, which harness checks which area.
 - [How Horizon is built](how-horizon-is-built.md): who writes Horizon, how changes are checked, and what is safe to run.
 - [Release flow](release-flow.md): pull request checks, merging and the automatic Nightly releases that reach players.
-- [Operations](operations.md): running Horizon by hand when no agent runs and the maintainer's machines are off: merging, releases, offline runners, the mods registry, Kira, the official server, security.
 - [Build from source](../README.md#build-from-source): your own copy of the game, resource preparation, `cargo run`.
 - [Build times](build-times.md): `tools/build_times.py` measures cold and incremental builds per crate and the critical path, writes a JSON report and a table, and compares two reports; the first numbers, Windows and Linux.
 - [Native client](native-client.md): options, controls, the dedicated server, `horizon-ctl` scripting, packaging, architecture.

docs/forking.md

@@ -23,14 +23,14 @@ What changes in that build:
 |---|---|---|
 | Cosmetics, emotes and the emote wheel, "Show me as a Horizon player" | `game/cosmetics.rs` (+ `cosmetics/fx.rs`, `cosmetics/emotes.rs`, `cosmetics/emote_wheel.rs`), crate `horizon-cosmetics` | `game::cosmetics::enabled()`: the service is never asked, nothing is drawn, B opens no wheel |
 | The official server added to the server list, the withdrawn partner server taken out | crate `horizon-official-servers` | registered only by the official executable (`horizon-official`); horizon-client's own executable has none |
-| Horizon Settings (Extras, PvP & HUD, Splitscreen, Studio, AI Agent) and Mods (with the registry browser) | `options_ui.rs` (`Page::Horizon` and below), `extras_ui.rs`, `extras.rs`, `pvp.rs`, `game/extras.rs`, `game/tweaks.rs`, `extras_hud.rs` | the Options screen shows vanilla's greyed Telemetry Data instead (`options_ui::HORIZON_EXTRAS`, set in `entry.rs`) |
-| Discord Rich Presence and its switch | crate `horizon-discord` | registered only by the official executable (`horizon-official`); horizon-client's own executable has none |
+| Horizon Settings (Extras, PvP & HUD, Splitscreen, Studio, AI Agent, Discord) and Mods (with the registry browser) | `options_ui.rs` (`Page::Horizon` and below), `extras_ui.rs`, `extras.rs`, `pvp.rs`, `game/extras.rs`, `game/tweaks.rs`, `extras_hud.rs` | the Options screen shows vanilla's greyed Telemetry Data instead (`options_ui::HORIZON_EXTRAS`, set in `entry.rs`) |
+| Discord Rich Presence | `discord_presence.rs`, `game/discord.rs` | the `discord` feature, which `horizon-extras` turns on |
 | Play with Friends | hosting: `game/friends.rs`, `game/friends/screen.rs`; joining: crate `horizon-friends` (`game`) | hosting: the `friends` feature (`game/friends_off.rs` stands in); joining: only the official executable registers it ([layers.md](layers.md#how-a-horizon-crate-plugs-in)) |
 | The anonymous "I'm playing" ping | crate `horizon-heartbeat` | not in horizon-client at all: only the official executable (`horizon-official`) registers it ([layers.md](layers.md#how-a-horizon-crate-plugs-in)) |
 
 Credits & Attribution then says where the official build is (`horizon.plain.official`).
 
-`grep -rn horizon-extras crates/` lists every gate. Apart from the `friends` feature above, the gates
+`grep -rn horizon-extras crates/` lists every gate. Apart from the three features above, the gates
 are `cfg!(feature = "horizon-extras")`: both sides compile in every build, so no stub has to follow
 the code it replaces. To remove an extra for good, delete its files from the table and the lines its
 gate guards.

docs/layers.md

@@ -156,8 +156,8 @@ Horizon's own extras and its product, and every built-in address of an outside s
   benchmark uploads, releases and updates, the hosting supervisor, the launcher.
 - **Examples:** `horizon-addresses`, `horizon-cosmetics`, `horizon-friends`, `horizon-relay`, `horizon-telemetry`,
   `horizon-bench`, `horizon-release-sign`, `horizon-server`, `horizon-mod-registry`, `horizon-heartbeat`,
-  `horizon-official`, `horizon-official-servers`, `horizon-discord`, `launcher/`. Still in engine crates today:
-  `game/cosmetics.rs`, `game/emotes.rs`, `game/extras.rs`, `game/tweaks.rs`, `extras_ui.rs`, `pvp.rs`.
+  `horizon-official`, `horizon-official-servers`, `launcher/`. Still in engine crates today: `game/cosmetics.rs`, `game/emotes.rs`,
+  `game/discord.rs`, `game/extras.rs`, `game/tweaks.rs`, `extras_ui.rs`, `pvp.rs`.
 - **Rules:**
   - It uses the platform's public API only, never the engine.
   - Until it moves, every Horizon feature in the game sits behind the `horizon-extras` feature
@@ -322,8 +322,8 @@ hook (#14081), `seat()` (#14096).
   only calls it.
 - With nothing registered, the engine does no work: a load of an empty slice where it would dispatch. It makes
   no allocation, no draw call and no file. A vanilla build (horizon-client, horizon-plain) is unchanged.
-- Visible text is a translation key the registrant ships in its lang files, never English in code. Values a
-  player typed (a name, a path) are the exception.
+- Visible text is a translation key the registrant ships in its lang files ([Lang files](#lang-files-horizon_platformlang)),
+  never English in code. Values a player typed (a name, a path) are the exception.
 - Splitscreen players are one process, one thread, each `Game` in turn (`game/split.rs`), so a crate's statics
   are shared by them. Every call (stores, pages, layers, hooks) happens on one player's turn, and
   `horizon_platform::hooks::seat()` (0 for P1) says whose: a crate keeps per-player state indexed by it.
@@ -500,6 +500,30 @@ fn container_draw(&self, c: &dyn Container, canvas: &mut dyn hud::Canvas);    //
 - `order` is the only text: Sorting ranks by it. The rest is ids and numbers, so the API names no engine type
   (`ItemStack` stays in the engine).
 
+### Lang files (`horizon_platform::lang`)
+
+A crate keeps the text for its keys in its own folder, `crates/<name>/assets/lang/<code>.json`, with the same
+shape as the engine's `assets/horizon/lang` files (flat `"key": "text"` lines, `en_us.json` the reference).
+It registers them as `(code, JSON)` pairs, usually `include_str!`s:
+
+```rust
+static LANG: &horizon_platform::lang::Files = &[
+    ("en_us", include_str!("../assets/lang/en_us.json")),
+    ("fr_fr", include_str!("../assets/lang/fr_fr.json")),
+];
+horizon_platform::lang::register(LANG)?;
+```
+
+- The game loads them into its `horizon` namespace right after its own bundled file for the same language, so a
+  resource pack still overrides them, and a language a crate lacks falls back to its English.
+- A key belongs to one folder. On a key the engine's file also has, the engine's text wins (and the
+  `lang.rs` test fails).
+- Regional variants read their language's file as the engine's do (`fr_ca` reads `fr_fr`, `de_ch` reads `de_de`
+  without `ß`).
+- `tools/lang_coverage.py` reports each crate's folder beside the engine's. A person's review of a crate's entry
+  is kept in `tools/lang_review/<name>/<code>.json` ([translations.md](translations.md)).
+- With nothing registered, a language loads exactly as before.
+
 ## Extras that may leave the game
 
 Horizon's extras are Horizon-layer code. Each one is a candidate to become an optional native mod that players add

docs/native-client.md

@@ -423,18 +423,13 @@ While Discord runs on the same computer, the player's Discord profile shows
 "Playing Horizon" and what they are doing: "In the menus", "Singleplayer",
 "Multiplayer" or "Hosting a world" (with the party size, of 8), the dimension
 ("In the Nether") and the time since they entered the world. It never shows a
-world's name or a server's address. The switch is on the Extras page, in its
-Multiplayer group (**Discord Rich Presence**, on by default; `discordPresence`
-in `horizon-extras.txt`; in splitscreen only the first player has it), and
-`HORIZON_NO_DISCORD=1` turns it off for one run.
+world's name or a server's address. Horizon Settings has the switch
+(**Discord Rich Presence**, on by default; `discordPresence` in
+`horizon-extras.txt`), and `HORIZON_NO_DISCORD=1` turns it off for one run.
 
-The crate `horizon-discord` (Horizon layer) speaks Discord's local IPC itself
-(the `discord-ipc-N` socket or named pipe, no SDK) from a thread of its own.
-The game hands it a status only when it changes, through the platform's
-`activity` hook (`game/activity.rs` says what the player does), and keeps the
-switch itself: its settings store and its Extras row (the platform's settings
-and pages registries). Only the official executable (`horizon-official`)
-registers it: horizon-client's own executable shows no presence and no switch. It retries every 15 s
+`crates/horizon-client/src/discord_presence.rs` speaks Discord's local IPC
+itself (the `discord-ipc-N` socket or named pipe, no SDK) from a thread of its
+own: the frame only hands it a status when it changes. It retries every 15 s
 while Discord isn't running and stays within Discord's 5 updates per 20 s.
 Dedicated servers never start it, and automated runs (offscreen, benchmarks)
 only talk to a fake Discord: `lab.game_env` sets `HORIZON_NO_DISCORD=1`, and

docs/operations.md

@@ -1,133 +0,0 @@
-# Operations: running Horizon by hand
-
-How the Horizon Team and the council keep Horizon working when no AI agent is running and the maintainer's machines
-are off. Each section says what normally happens by itself, who can do it by hand, and what to do when it breaks.
-How decisions are made is in [GOVERNANCE.md](../GOVERNANCE.md); how a change reaches players is in
-[release-flow.md](release-flow.md). This page only says how to operate them.
-
-## Who can do what
-
-| Who | Can |
-| --- | --- |
-| **Horizon Team** (GitHub team `horizon-team`, write access) | Review, label and merge pull requests; approve a fork's workflow runs; re-run failed jobs; start workflows by hand (`gh workflow run`); add `release-blocker` to an issue; merge in horizon-mods (form pull requests too) and upload its `staging` files |
-| **Trusted reviewers** (`.github/trusted-reviewers.txt`) | `/nightly`, `/close`, `/reopen`, `/label`, `/unlabel`, `/unclaim` by comment ([release-flow.md](release-flow.md#trusted-reviewers)) |
-| **Council** (🏛️ Council on Discord) | Decide by poll (`/vote`, `/poll start`); emergency actions (GOVERNANCE.md 4.6) |
-| **Organisation owners** (today: Ludovic only) | Repository variables and secrets (`SELF_HOSTED_CI`, `RELEASES_PAUSED`), branch protection, adding people to GitHub teams, merging past a missing review, the security advisories |
-| **Code owners** (`.github/CODEOWNERS`, today: Ludovic only) | Approve pull requests that touch `.github/`, `tools/ci/`, the release, signing and update code |
-
-The council's first poll gives the organisation a second owner (GOVERNANCE.md section 11). Until then, anything in
-the last two rows waits for Ludovic.
-
-## Merging a pull request
-
-Nobody merges automatically. A Team member:
-
-1. Reads the whole diff. For a fork, do it before approving its workflow runs (they wait under **Actions**:
-   "Approve and run") and before adding `run-parity`.
-2. Waits for `verify`, the one required check. A pull request that changes no Rust finishes it in about a minute.
-3. Merges with a merge commit once `verify` passed, no change request is open and every comment has been read. A
-   "don't merge" from anyone holds it. Never merge your own pull request, never use `gh pr merge --auto`, never
-   force-push a contributor's branch (merge main into it instead).
-
-Risky pull requests (saves, the network or server thread, world generation, the launcher's installs and updates,
-the harnesses, anything over ~500 lines) get `needs-proof` and wait until someone has played the change: both
-single-player paths, a LAN guest, a screenshot for anything visible. The list is in
-[release-flow.md](release-flow.md#merging).
-
-A pull request that touches a CODEOWNERS path needs a code owner's approving review: GitHub keeps its merge button
-locked until then. Leave it open and say in the thread that it waits for a code owner.
-
-Pull requests opened by the maintainer's agents (author `ludovic111`, body starting "Opened by Ludovic's AI agent")
-are ordinary pull requests: review and merge them like any other, or close them if they went stale. Closing keeps
-the branch.
-
-## Releases
-
-Everything below runs by itself on GitHub; you only step in when something is wrong.
-
-- **The Nightly** is the only build players get. The train (`release.yml`, every 10 minutes) starts one after 5
-  player-facing merges, or when the oldest has waited 6 hours, or at once for a pull request labelled
-  `release-now`. Only a commit where both `checks` and `parity-main` passed ships. Who may add `release-now` is the
-  council's choice; until it decides, leave the label to the maintainer.
-- **Stopping Nightlies:** open an issue about the problem and label it `release-blocker`. Nothing is published
-  while it is open, forced builds included. Close it when the fix is on main.
-- **Rolling back:** revert the pull request and merge the revert. Players can pick an earlier build on the
-  launcher's Versions page meanwhile.
-- **The reviewers' picks:** `/nightly status` shows the set, `/nightly clear` builds main alone.
-- **Launcher releases** follow the same train (`launcher.yml`).
-
-The Nightly's macOS builds, its smoke test and parity-main run on the maintainer's Mac mini. While it is off,
-**no Nightly and no launcher release can be published**: players keep the last ones, which keep working. See below.
-
-## Self-hosted runners are offline
-
-Some jobs run only on the maintainer's machines, because they need his own copy of Minecraft or a Mac
-([ci-runners.md](ci-runners.md)). When those machines are off, those jobs wait up to a day and then fail. The
-**runner watch** opens one issue, "CI: self-hosted runners are not taking jobs", within about 2 hours, listing what
-is waiting, and closes it once the runners are back.
-
-| Runner label | What waits | What to do |
-| --- | --- | --- |
-| `horizon-light` (bots) | Triage and claim commands, labels, overlap notes, the Mojang check | An organisation owner sets `SELF_HOSTED_CI` to `off` (Settings → Secrets and variables → Actions → Variables). Then everything runs on GitHub |
-| `horizon-checks` | `verify` of this repository's own pull requests ending in 0 or 1 | Same switch (`off` or `light`), then re-run the waiting checks. Forks' pull requests never use these runners |
-| `horizon-game` | A pull request's own parity job | It isn't required: merge on `verify`, and label pull requests that touch gameplay `needs-proof` |
-| `horizon-parity-main` | parity-main on main | Nothing can be done on GitHub. Nightlies wait for the last commit it passed on |
-| `horizon-nightly`, `horizon-release` | The Nightly's and the launcher's macOS builds | Nothing can be done on GitHub. No Nightly or launcher release until the Mac is back |
-
-What keeps working without them: `verify` and merging, triage and labels (once `SELF_HOSTED_CI=off`), Kira, the
-website, the mods registry and its checks, the official server.
-
-What the council decides about it (which pull requests may still merge without the vanilla harnesses, and who could
-host a runner with their own Minecraft) is a poll, not a rule on this page.
-
-## Mojang republished the version
-
-The hourly `mojang republish` workflow opens an issue "Mojang republished 26.3: <hash>" when Mojang changes the
-version file the game is pinned to. If its text says the jars are unchanged, a pull request that pastes the snippet
-from the issue into `research-lock.json` fixes it. New players can't prepare the game until a Nightly with that fix
-is out, so label that pull request `release-now` (or ask the council to) once it merged.
-
-## The mods registry (horizon-rust/horizon-mods)
-
-- **Submissions from the website** arrive as pull requests authored by `ludovic111` (the registry's account). A
-  Team member reviews the mod (what it does, its licence, no sign-in or token handling, no Mojang files; see
-  `MOD-POLICY.md` there), approves, and squash-merges once `check` passed. Publishing to the registry is hourly
-  (`publish.yml`).
-- **Fork pull requests:** approve their workflow run, and upload the mod's file to the `staging` release as
-  `<sha256>.<extension>` after checking its hash.
-- **Taking a mod down:** a pull request adding it to `revoked.toml`. That file is a code-owner path: today only
-  Ludovic can approve it. For malware, two council members act at once as an emergency (GOVERNANCE.md 4.6), post
-  in #mod-log, and ask Ludovic to approve.
-
-## Kira
-
-Kira runs on Railway and needs nobody's machine.
-
-- **Questions Kira can't answer** ("passed to the team") are listed in #kira-handoffs. Answer the member in their
-  thread.
-- **Switches anyone on staff can use:** `/kira-ai off|on` (AI answers), the triage pause.
-- **Polls:** `/vote question:` (council members) starts a 24-hour poll; `/poll start` for the other kinds. The
-  results are in #polls-and-decisions and in `https://kira-production-500e.up.railway.app/decisions.json`.
-- **If Kira is down:** only the account holder can reach Railway today. Post in #council so someone tells him.
-
-## The official server
-
-The server (play.playhorizon.dev) runs on its host's panel, not on the maintainer's machines, and keeps running the
-engine it has. Engine updates, backups and disk clean-ups are done by people with panel access; who has it, and the
-steps, are in the council's private notes. Players' reports go to #mod-chat as usual. If the server is down, a
-council member tells the panel holders and the host.
-
-## Security problems
-
-- **Reports** come through GitHub's private vulnerability reporting ([security.md](security.md#reporting-a-security-problem)).
-- **A leaked secret, a malicious pull request or mod, a hijacked account:** any two council members act at once
-  (GOVERNANCE.md 4.6): label an issue `release-blocker` to stop Nightlies, `/nightly clear` the picks, close the pull
-  request, take the mod down, remove the account's roles, and ask the account holder to rotate the secret. Record it
-  with `/emergency` in Kira once that command exists, else in #council.
-
-## Who to ask
-
-- Code and merges: the Horizon Team, in #horizon-team.
-- Decisions: the council, by poll.
-- Accounts (GitHub organisation, Discord ownership, Railway, the server panel, domains): the account holders; the
-  list is in GOVERNANCE.md section 11.

docs/server.md

@@ -427,8 +427,8 @@ game built in `Game::new`, the integrated server on its own thread. On that base
 **Binaries.** The release archives hold `horizon-client`, `horizon-ctl`, `horizon-prepare` and
 `horizon-server`. On Linux the release also has `horizon-server-linux-x86_64.tar.gz`: `horizon-server`,
 `horizon-prepare` and `horizon-engine`, the game built with `--no-default-features` (no sound, no
-controllers, no Play with Friends: the `friends` feature; nor Discord presence or the "I'm playing" ping, which
-only the official executable has), which links neither `libasound.so.2` nor `libudev.so.1`. `release.yml` builds it after the
+controllers, no Discord presence or Play with Friends: the `discord` and `friends` features; nor the "I'm
+playing" ping, which only the official executable has), which links neither `libasound.so.2` nor `libudev.so.1`. `release.yml` builds it after the
 client archive (`xtask package-server`) and fails if `tools/check_imports.py --server` finds either library;
 CI lints the same build. `horizon-server` runs `horizon-engine` when it is beside it or on the PATH, else
 `horizon-client`. Build it yourself with `cargo build --release -p horizon-client --no-default-features`

docs/translations.md

@@ -11,8 +11,9 @@ no difference: the mark lives in a file the game and the launcher never read.
 | | Files | Keys | Read by |
 |---|---|---|---|
 | Game | `crates/horizon-client/assets/horizon/lang/<code>.json` (`fr_fr`, `de_de`...) | `horizon.options.foo` style; `en_us.json` is the reference | `crates/horizon-client-core/src/lang.rs` (`Text::tr`, `lang::get`); a missing key falls back to English |
+| A crate's own text | `crates/<name>/assets/lang/<code>.json`, the same shape | the crate's own keys, never one of the engine's | the same, once the crate registers them ([layers.md](layers.md#lang-files-horizon_platformlang)) |
 | Launcher | `launcher/lang/<code>.json` (`fr`, `de`, `pt-br`...) | the English sentence itself | `launcher/src/i18n.rs` (`tr("…")`, `trf("… {arg} …")`) |
-| Review record | `tools/lang_review/game/<code>.json`, `tools/lang_review/launcher/<code>.json` | the same keys, with the text a person checked | `tools/lang_coverage.py` only |
+| Review record | `tools/lang_review/game/<code>.json`, `tools/lang_review/<crate name>/<code>.json`, `tools/lang_review/launcher/<code>.json` | the same keys, with the text a person checked | `tools/lang_coverage.py` only |
 
 An entry is **reviewed** when the review record holds its key with exactly its present text. Anything else is
 unreviewed: an entry the record does not hold, and one whose text changed since a person checked it (so a later

tests/test_lang_coverage.py

@@ -215,8 +215,49 @@ class ReviewTests(unittest.TestCase):
             self.assertEqual(code, 0)
             self.assertTrue((Path(tmp) / "review" / "launcher" / "xx.json").exists())
 
+    def test_a_crates_own_folder_is_reported_and_its_reviews_kept_apart(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            game, crates, review = Path(tmp) / "game", Path(tmp) / "crates", Path(tmp) / "review"
+            friends = crates / "horizon-friends" / "assets" / "lang"
+            game.mkdir()
+            friends.mkdir(parents=True)
+            (crates / "horizon-plain" / "src").mkdir(parents=True)  # no lang folder: not reported
+            write(game, "en_us.json", '{\n  "a": "Apple"\n}\n')
+            write(game, "xx_yy.json", '{\n  "a": "Manzana"\n}\n')
+            write(friends, "en_us.json", '{\n  "f.one": "One",\n  "f.two": "Two"\n}\n')
+            write(friends, "xx_yy.json", '{\n  "f.one": "Uno"\n}\n')
+            common = ("--game-dir", str(game), "--crates-dir", str(crates), "--review-dir", str(review),
+                      "--game-only")
+            code, out, _ = run(*common, "--summary")
+            self.assertEqual(code, 0)
+            self.assertIn("GAME xx_yy 1/1 keys, missing 0", out)
+            self.assertIn("GAME horizon-friends xx_yy 1/2 keys, missing 1", out)
+            self.assertNotIn("horizon-plain", out)
+            code, _, err = run(*common, "--fail-under", "90")
+            self.assertEqual(code, 1)
+            self.assertIn("xx_yy: 50.0%", err)
+            # One command marks the keys of both folders; each lands in its folder's record.
+            code, out, _ = run(*common, "--lang", "xx_yy", "--mark-reviewed", "a", "f.one")
+            self.assertEqual(code, 0, out)
+            self.assertEqual(json.loads((review / "game" / "xx_yy.json").read_text(encoding="utf-8")),
+                             {"a": "Manzana"})
+            self.assertEqual(json.loads((review / "horizon-friends" / "xx_yy.json").read_text(encoding="utf-8")),
+                             {"f.one": "Uno"})
+            # Marking the game's folder again keeps the crate's record.
+            code, _, _ = run(*common, "--lang", "xx_yy", "--mark-reviewed", "a")
+            self.assertEqual(code, 0)
+            self.assertTrue((review / "horizon-friends" / "xx_yy.json").exists())
+            code, _, err = run(*common, "--lang", "xx_yy", "--mark-reviewed", "nosuch")
+            self.assertEqual(code, 1)
+            self.assertIn("no key 'nosuch'", err)
+            # A scratch --game-dir alone leaves the repository's crates out.
+            code, out, _ = run("--game-dir", str(game), "--review-dir", str(review), "--game-only", "--summary")
+            self.assertNotIn("horizon-friends", out)
+
     def test_every_repository_record_belongs_to_a_lang_file_and_reads(self):
-        for kind, folder in (("game", lang_coverage.GAME), ("launcher", lang_coverage.LAUNCHER)):
+        folders = [("game", lang_coverage.GAME), ("launcher", lang_coverage.LAUNCHER),
+                   *lang_coverage.crate_dirs(lang_coverage.CRATES)]
+        for kind, folder in folders:
             for record in sorted((lang_coverage.REVIEW / kind).glob("*.json")):
                 with self.subTest(record=record.name, kind=kind):
                     self.assertTrue((folder / record.name).exists(), f"{record} names no lang file")

tools/command_exec_corpus.py

@@ -6291,14 +6291,6 @@ def moving_piston_presentation_diagnostic():
     return moving_piston_presentation(cmd, setup)
 
 
-def piston_mob_bounce():
-    try:
-        from .piston_bounce_corpus import piston_bounce
-    except ImportError:
-        from piston_bounce_corpus import piston_bounce
-    return piston_bounce(cmd, setup)
-
-
 def piston_entity_tick_order():
     """#9337: entities travel before moving pistons push them, not afterward."""
     ops = []
@@ -7489,7 +7481,6 @@ def groups():
         ('wither spawn', wither_spawn()),
         ('riding teleport', riding_teleport()),
         ('piston entity tick order', piston_entity_tick_order()),
-        ('piston mob bounce', piston_mob_bounce()),
         ('primed tnt box', primed_tnt_box()),
         ('primed tnt fall', primed_tnt_fall()),
         ('command block last output', command_block_last_output()),

tools/discord_presence_e2e.py

@@ -9,7 +9,7 @@ The game goes title -> world -> Nether -> quit through horizon-ctl, and the acti
     single     single player on its server thread
     lan        a host opens its world to LAN and a guest joins: the guest shows "Multiplayer",
                the host "Hosting a world" with a party of 2 of 8
-    setting    off in horizon-extras.txt: nothing reaches Discord; the Extras switch
+    setting    off in horizon-extras.txt: nothing reaches Discord; the Horizon Settings switch
                turns it on (the activity appears) and off (it is cleared)
     late       Discord starts after the game: found within the 15 s retry
 
@@ -136,7 +136,7 @@ class Game:
             self.discord.start()
         extra = {'HORIZON_HOME': self.home, 'HORIZON_TELEMETRY_URL': 'off', 'HORIZON_DISCORD_IPC_DIR': self.discord.dir}
         self.env = lab.game_env(**extra)
-        self.ctl_run('launch', '--offscreen', '--game', str(bins / 'horizon-official'), '--resources',
+        self.ctl_run('launch', '--offscreen', '--game', str(bins / 'horizon-client'), '--resources',
                      str(lab.RESOURCES.resolve()), *args)
 
     def ctl_run(self, *words, timeout=600):
@@ -207,21 +207,8 @@ def lan(bins):
                 g.close()
 
 
-def extras_row(game, label):
-    """The Extras page's row whose label starts with `label`, scrolling the list down to it: only
-    the rows on screen are widgets."""
-    first = game.ctl_run('ui')['widgets'][0]['bounds']
-    for _ in range(20):
-        found = [w for w in game.ctl_run('ui')['widgets'] if (w.get('label') or '').startswith(label)]
-        if found:
-            return found[0]
-        game.ctl_run('scroll-at', str(first[0] + 5), str(first[1] + 5), '-5')
-        time.sleep(0.3)
-    raise AssertionError(f'no {label!r} row on the Extras page')
-
-
 def setting(bins):
-    """Off in horizon-extras.txt: Discord never hears from the game. Turned on in Extras: the
+    """Off in horizon-extras.txt: Discord never hears from the game. Turned on in Horizon Settings: the
     activity appears; off again: it is cleared."""
     game = Game(bins, 'setting', extras='discordPresence:false\n')
     d = game.discord
@@ -229,8 +216,8 @@ def setting(bins):
         game.ctl_run('wait-for', 'screen', 'title')
         time.sleep(3)
         assert not d.handshakes and not d.activities, (d.handshakes, d.activities)
-        game.ctl_run('options', 'extras')
-        switch = extras_row(game, 'Discord Rich')
+        game.ctl_run('options', 'horizon')
+        switch = next(w for w in game.ctl_run('ui')['widgets'] if w.get('label', '').startswith('Discord Rich'))
         assert switch['label'] == 'Discord Rich Presence: Off', switch
         game.ctl_run('click', switch['id'])
         d.wait('turned on', shows('In the menus'))
@@ -264,14 +251,14 @@ CHECKS = {'single': single, 'lan': lan, 'setting': setting, 'late': late}
 def main():
     parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
     parser.add_argument('--check', choices=[*CHECKS, 'all'], default='all')
-    parser.add_argument('--bin-dir', help='prebuilt horizon-official and horizon-ctl (default: build with the fast profile)')
+    parser.add_argument('--bin-dir', help='prebuilt horizon-client and horizon-ctl (default: build with the fast profile)')
     args = parser.parse_args()
     if sys.platform == 'win32':
         sys.exit('the fake Discord is a Unix socket: macOS or Linux only')
     if args.bin_dir:
         bins = Path(args.bin_dir).resolve()
     else:
-        subprocess.run(['cargo', 'build', '--locked', '--profile', 'fast', '-p', 'horizon-official', '-p', 'horizon-client-lib', '--bins'],
+        subprocess.run(['cargo', 'build', '--locked', '--profile', 'fast', '-p', 'horizon-client', '-p', 'horizon-client-lib', '--bins'],
                        cwd=ROOT, check=True)
         meta = json.loads(subprocess.run(['cargo', 'metadata', '--format-version', '1', '--no-deps'], cwd=ROOT,
                                          capture_output=True, text=True, check=True).stdout)

tools/lang_coverage.py

@@ -8,6 +8,10 @@ a gap is not an error — it is an English sentence on a translated screen. That
 tests catch stale keys, repeated keys, empty values and changed placeholders, but
 deliberately not gaps, because a language is allowed to lag. This tool reports them.
 
+A crate that ships its own text keeps it in `crates/<name>/assets/lang/<code>.json`, the same
+shape with its own `en_us.json` reference (docs/layers.md, "Lang files"); each such folder is
+reported beside the game's, and its review record is `tools/lang_review/<name>/`.
+
 `launcher/lang/<code>.json` is the launcher's: its keys are the English sentence itself,
 so a file is complete by construction (`launcher/src/i18n/tests.rs` checks every `tr("…")`
 the code asks for). What it can still hold is a value identical to its English key, and a
@@ -43,6 +47,7 @@ from pathlib import Path
 
 ROOT = Path(__file__).resolve().parents[1]
 GAME = ROOT / "crates/horizon-client/assets/horizon/lang"
+CRATES = ROOT / "crates"
 LAUNCHER = ROOT / "launcher/lang"
 REVIEW = ROOT / "tools/lang_review"
 REFERENCE = "en_us.json"
@@ -192,6 +197,12 @@ def game_rows(directory: Path, codes: set[str],
     return reference, rows
 
 
+def crate_dirs(crates: Path) -> list[tuple[str, Path]]:
+    """The crates that ship their own lang files: (crate name, its `assets/lang`), by name."""
+    return sorted((path.parents[2].name, path.parent)
+                  for path in crates.glob("*/assets/lang/" + REFERENCE))
+
+
 def launcher_rows(directory: Path, codes: set[str], review: Path | None = None) -> list[dict]:
     """Every launcher language: the values still identical to their English key, the
     `{holes}` a value does not match it on, and with `review` (a `lang_review/launcher` folder)
@@ -228,8 +239,8 @@ def print_problems(rows: list[dict]) -> None:
             print(f"  ! {row['code']}: {row['problem']}")
 
 
-def print_game(reference: LangFile, directory: Path, rows: list[dict]) -> None:
-    print(f"GAME  {shown(directory)}  ({reference.code}: {len(reference.entries)} keys, the reference)")
+def print_game(reference: LangFile, directory: Path, rows: list[dict], kind: str = "GAME") -> None:
+    print(f"{kind}  {shown(directory)}  ({reference.code}: {len(reference.entries)} keys, the reference)")
     print()
     print(f"  {'code':<10}{'keys':>6}{'cover':>8}{'missing':>9}{'extra':>7}{'empty':>7}{'same':>6}"
           f"{'unreviewed':>12}")
@@ -278,9 +289,9 @@ def print_launcher_keys(rows: list[dict]) -> None:
                     print(f"  {side}: {', '.join(bad[side])}")
 
 
-def print_game_summary(reference: LangFile, rows: list[dict]) -> None:
+def print_game_summary(reference: LangFile, rows: list[dict], kind: str = "GAME") -> None:
     for row in rows:
-        line = (f"GAME {row['code']} {row['keys']}/{len(reference.entries)} keys, "
+        line = (f"{kind} {row['code']} {row['keys']}/{len(reference.entries)} keys, "
                 f"missing {len(row['missing'])}, extra {len(row['extra'])}, "
                 f"placeholders {len(row['placeholders'])}, empty {len(row['empty'])}, "
                 f"same {len(row['same'])}, unreviewed {len(row['unreviewed'])}")
@@ -336,6 +347,9 @@ def main(argv: list[str] | None = None) -> int:
     which.add_argument("--launcher-only", action="store_true", help="only the launcher's lang")
     parser.add_argument("--game-dir", type=Path, default=GAME,
                         help="the game's lang folder (default: %(default)s)")
+    parser.add_argument("--crates-dir", type=Path,
+                        help="report every <dir>/<crate>/assets/lang too (default: the repository's crates, "
+                             "unless --game-dir names another folder)")
     parser.add_argument("--launcher-dir", type=Path, default=LAUNCHER,
                         help="the launcher's lang folder (default: %(default)s)")
     parser.add_argument("--lang", nargs="+", metavar="CODE",
@@ -359,6 +373,8 @@ def main(argv: list[str] | None = None) -> int:
         sys.stdout.reconfigure(encoding="utf-8", errors="replace")
 
     codes = set(args.lang or ())
+    if args.crates_dir is None and args.game_dir == GAME:
+        args.crates_dir = CRATES
     if args.mark_reviewed is not None:
         return mark_command(args, codes)
     if args.fail_under is not None and args.launcher_only:
@@ -377,6 +393,18 @@ def main(argv: list[str] | None = None) -> int:
             print(error, file=sys.stderr)
             return 2
         result["game"] = {"reference": reference.code, "keys": len(reference.entries), "files": game}
+    # (crate name, its folder, its reference, its rows): the text crates ship.
+    crates: list[tuple[str, Path, LangFile, list[dict]]] = []
+    if not args.launcher_only and args.crates_dir is not None:
+        for name, folder in crate_dirs(args.crates_dir):
+            try:
+                crates.append((name, folder, *game_rows(folder, codes, args.review_dir / name)))
+            except ValueError as error:
+                print(error, file=sys.stderr)
+                return 2
+        if crates:
+            result["crates"] = {name: {"reference": ref.code, "keys": len(ref.entries), "files": rows}
+                                for name, _, ref, rows in crates}
     launcher: list[dict] = []
     if not args.game_only:
         if not args.launcher_dir.is_dir():
@@ -388,7 +416,7 @@ def main(argv: list[str] | None = None) -> int:
             print(error, file=sys.stderr)
             return 2
         result["launcher"] = {"files": launcher}
-    if codes and not game and not launcher:
+    if codes and not game and not launcher and not any(rows for *_, rows in crates):
         print(f"no lang file is named {' or '.join(sorted(codes))}", file=sys.stderr)
         return 2
 
@@ -397,14 +425,21 @@ def main(argv: list[str] | None = None) -> int:
     elif args.unreviewed:
         if reference:
             print_unreviewed("GAME", game, reference.entries)
+        for name, _, ref, rows in crates:
+            print_unreviewed(f"GAME {name}", rows, ref.entries)
         print_unreviewed("LAUNCHER", launcher, None)
     elif args.summary:
         if reference:
             print_game_summary(reference, game)
+        for name, _, ref, rows in crates:
+            print_game_summary(ref, rows, f"GAME {name}")
         print_launcher_summary(launcher)
     else:
         if reference:
             print_game(reference, args.game_dir, game)
+        for name, folder, ref, rows in crates:
+            print()
+            print_game(ref, folder, rows, f"GAME {name}")
         if not args.game_only:
             if reference:
                 print()
@@ -412,11 +447,14 @@ def main(argv: list[str] | None = None) -> int:
         if args.show_keys:
             if reference:
                 print_game_keys(game)
+            for *_, rows in crates:
+                print_game_keys(rows)
             if launcher:
                 print_launcher_keys(launcher)
 
     if args.fail_under is not None:
-        under = [row for row in game if 100 * row["coverage"] + 1e-9 < args.fail_under]
+        every = game + [row for *_, rows in crates for row in rows]
+        under = [row for row in every if 100 * row["coverage"] + 1e-9 < args.fail_under]
         for row in under:
             print(f"{row['code']}: {100 * row['coverage']:.1f}% < {args.fail_under:g}%", file=sys.stderr)
         if under:
@@ -425,8 +463,9 @@ def main(argv: list[str] | None = None) -> int:
 
 
 def mark_command(args, codes: set[str]) -> int:
-    """`--mark-reviewed`: one file, named by `--lang`; --game-only or --launcher-only picks the
-    folder when the code is in both."""
+    """`--mark-reviewed`: one language, named by `--lang`; --game-only or --launcher-only picks the
+    folder when the code is in both. The game's text may be split between its own folder and the
+    crates' (`--crates-dir`): each key is recorded for the folder that holds it."""
     if len(codes) != 1:
         print("--mark-reviewed needs exactly one --lang code", file=sys.stderr)
         return 2
@@ -434,31 +473,44 @@ def mark_command(args, codes: set[str]) -> int:
     if code == "en_us":
         print("en_us is the English reference, not a translation", file=sys.stderr)
         return 2
-    found = [(kind, folder / f"{code}.json") for kind, folder, skip in (
-        ("game", args.game_dir, args.launcher_only), ("launcher", args.launcher_dir, args.game_only))
-        if not skip and (folder / f"{code}.json").exists()]
-    if not found:
+    game = [("game", args.game_dir)]
+    if args.crates_dir is not None:
+        game += crate_dirs(args.crates_dir)
+    sides = [[(kind, folder / f"{code}.json") for kind, folder in folders
+              if (folder / f"{code}.json").exists()]
+             for folders, skip in ((game, args.launcher_only), ([("launcher", args.launcher_dir)], args.game_only))
+             if not skip]
+    sides = [side for side in sides if side]
+    if not sides:
         print(f"no lang file is named {code}", file=sys.stderr)
         return 2
-    if len(found) > 1:
+    if len(sides) > 1:
         print(f"{code} is a game and a launcher file: add --game-only or --launcher-only", file=sys.stderr)
         return 2
-    kind, lang = found[0]
+    found = sides[0]
     keys = list(args.mark_reviewed)
     if args.keys_file:
         keys += [line for line in args.keys_file.read_text(encoding="utf-8").splitlines() if line.strip()]
     if not keys:
         print("--mark-reviewed needs keys, on the command line or in --keys-file", file=sys.stderr)
         return 2
-    try:
-        unknown = mark_reviewed(lang, args.review_dir / kind / lang.name, keys)
-    except ValueError as error:
-        print(error, file=sys.stderr)
-        return 2
-    for key in unknown:
-        print(f"{shown(lang)} has no key {key!r}", file=sys.stderr)
-    print(f"{len(keys) - len(unknown)} entries of {shown(lang)} recorded as reviewed")
-    return 1 if unknown else 0
+    # Each key goes to the first folder that has it; a key none has is reported against them all.
+    left = list(keys)
+    for kind, lang in found:
+        entries = LangFile(lang).entries
+        mine = [key for key in left if key in entries]
+        left = [key for key in left if key not in entries]
+        if not mine and len(found) > 1:
+            continue
+        try:
+            mark_reviewed(lang, args.review_dir / kind / lang.name, mine)
+        except ValueError as error:
+            print(error, file=sys.stderr)
+            return 2
+        print(f"{len(mine)} entries of {shown(lang)} recorded as reviewed")
+    for key in left:
+        print(f"{' or '.join(shown(lang) for _, lang in found)} has no key {key!r}", file=sys.stderr)
+    return 1 if left else 0
 
 
 if __name__ == "__main__":

tools/layers.json

@@ -51,7 +51,6 @@
     "horizon-addresses": "horizon",
     "horizon-bench": "horizon",
     "horizon-cosmetics": "horizon",
-    "horizon-discord": "horizon",
     "horizon-friends": "horizon",
     "horizon-heartbeat": "horizon",
     "horizon-launcher": "horizon",
@@ -96,6 +95,7 @@
     "horizon-client -> horizon-shaders",
     "horizon-client -> horizon-telemetry",
     "horizon-client -> horizon-theme",
+    "horizon-client-input -> horizon-theme",
     "horizon-client-lib -> horizon-anticheat",
     "horizon-client-lib -> horizon-bench",
     "horizon-client-lib -> horizon-chat-filter",
@@ -106,11 +106,13 @@
     "horizon-client-lib -> horizon-shader-api",
     "horizon-client-lib -> horizon-shaders",
     "horizon-client-lib -> horizon-telemetry",
+    "horizon-client-lib -> horizon-theme",
     "horizon-client-render -> horizon-cosmetics",
     "horizon-client-render -> horizon-hdr",
     "horizon-client-render -> horizon-optifine",
     "horizon-client-render -> horizon-polytone",
     "horizon-client-render -> horizon-shader-api",
-    "horizon-client-render -> horizon-shaders"
+    "horizon-client-render -> horizon-shaders",
+    "horizon-client-render -> horizon-theme"
   ]
 }

tools/piston_bounce_corpus.py

@@ -1,64 +0,0 @@
-"""Actual downward piston pushes onto slime, including the blocked move (#12091)."""
-
-
-def piston_bounce(cmd, setup):
-    ops = setup('/tick freeze', '/gamerule spawn_mobs false',
-                '/gamerule advance_time false', '/forceload add 0 0')
-    ops.append({'op': 'settle', 'required_chunks': [[0, 0]]})
-    ops += setup('/tp @s 1.5 200 1.5', '/gamemode creative @s',
-                 '/kill @e[type=!player]', '/fill 0 199 0 15 199 15 stone',
-                 '/fill 0 200 0 15 208 15 air',
-                 '/scoreboard objectives add piston_bounce dummy',
-                 '/execute store result score start piston_bounce run time query gametime')
-    cases = [('slime_block', 'slime_block', False),
-             ('slime_block', 'stone', False),
-             ('stone', 'slime_block', False),
-             ('slime_block', 'slime_block', True)]
-    for index, (floor, top, no_ai) in enumerate(cases):
-        x, z = 4 + index % 2 * 6, 4 + index // 2 * 6
-        selector = f'@e[tag=piston_bounce_{index},limit=1]'
-        for command in (f'/setblock {x} 200 {z} {floor}',
-                        f'/setblock {x} 204 {z} {top}',
-                        f'/setblock {x} 205 {z} piston[facing=down]',
-                        f'/summon wither_skeleton {x}.5 201 {z}.5 '
-                        '{PersistenceRequired:1b,Invulnerable:1b,Motion:[0d,0d,0d],'
-                        f'NoAI:{int(no_ai)}b,Tags:["piston_bounce_{index}"]' + '}'):
-            ops.append(cmd(command, expect_result=1))
-        ops += setup(f'/attribute {selector} movement_speed base set 0')
-        fields = (f'Pos:[{x}.5d,201d,{z}.5d],Motion:[0d,0d,0d],'
-                  'Health:20f' + (',NoAI:1b' if no_ai else ''))
-        ops.append(cmd(f'/execute if entity @e[tag=piston_bounce_{index},limit=1,type=wither_skeleton,nbt={{' + fields + '}]',
-                       expect_result=1))
-        ops.append(cmd(f'/execute unless entity @e[tag=piston_bounce_{index},nbt={{NoGravity:1b}}]',
-                       expect_result=1))
-        if not no_ai:
-            ops.append(cmd(f'/execute unless entity @e[tag=piston_bounce_{index},nbt={{NoAI:1b}}]',
-                           expect_result=1))
-    for tick in range(7):
-        if tick == 1:
-            for x, z in [(4, 4), (10, 4), (4, 10), (10, 10)]:
-                ops.append(cmd(f'/setblock {x + 1} 205 {z} redstone_block', expect_result=1))
-        if tick == 3:
-            # Remove the ceiling so the bounce becomes observable travel.
-            for x, z in [(4, 4), (10, 4), (4, 10), (10, 10)]:
-                ops += setup(f'/fill {x} 203 {z} {x} 205 {z} air')
-                for y in (203, 204, 205):
-                    ops.append(cmd(f'/execute if block {x} {y} {z} air', expect_result=1))
-        if tick:
-            ops += setup('/tick step 1')
-            ops.append({'op': 'tick', 'n': 1})
-        ops += setup('/execute store result score now piston_bounce run time query gametime',
-                     '/scoreboard players operation now piston_bounce -= start piston_bounce')
-        ops.append(cmd('/scoreboard players get now piston_bounce', expect_result=tick))
-        for index in range(len(cases)):
-            selector = f'@e[tag=piston_bounce_{index},limit=1]'
-            for field in ('Pos', 'Motion', 'OnGround'):
-                ops.append(cmd(f'/data get entity {selector} {field}'))
-            if tick in (1, 2):
-                x, z = 4 + index % 2 * 6, 4 + index // 2 * 6
-                ops.append(cmd(f'/execute if block {x} 205 {z} piston[facing=down,extended=true]',
-                               expect_result=1))
-                ops.append(cmd(f'/data get block {x} 204 {z} progress'))
-    return ops + setup('/kill @e[type=!player]', '/fill 0 200 0 15 208 15 air',
-                       '/scoreboard objectives remove piston_bounce', '/forceload remove 0 0',
-                       '/tick unfreeze', '/tp @s 8.5 230 8.5 0 0')