Add GOVERNANCE.md: the council, theme groups and how roles are earned

The governance the founder adopted on 2026-11-09 as his last decision as head of the project: a council of equals deciding by 24-hour polls, theme groups with leads, the selection filter, moderation and appeals, the 18+ rule for roles of trust, the agents, and the account handover path. README and CONTRIBUTING link to it with one line each. Co-Authored-By: Claude Opus 5.5 <[email protected]>
2026-11-09 10:39:46 -10:00 · 2026-11-09 21:21:45 +01:00
41 changed files with 695 additions and 1268 deletions
@@ -198,3 +198,5 @@ 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).
@@ -0,0 +1,483 @@
+# 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.
@@ -135,6 +135,8 @@ 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.
@@ -233,8 +233,6 @@ pub struct FogInputs<'a> {
    pub night_vision: f32,
    /// The packs' `environment` fog settings (Polytone's).
    pub environment: crate::pack_palette::Environment,
-    /// The packs' fluid modifiers' fog.
-    pub fluid_fog: crate::pack_palette::FluidFogs,
 }

 /// `FogRenderer.setupFog` + `computeFogColor`.
@@ -399,24 +397,6 @@ pub fn setup_fog(tables: &FogTables, state: &FogState, input: &FogInputs) -> Fog
            }
        }
    }
-    // A pack's fluid modifier over its fluid's fog, after everything else (wiki "Custom Colors").
-    let fluid = match input.fog_type {
-        FogType::Lava => input.fluid_fog.lava,
-        FogType::Water if input.blindness.is_none() && input.darkness.is_none() => {
-            input.fluid_fog.water
-        }
-        _ => None,
-    };
-    if let Some(f) = fluid {
-        if let Some(rgb) = f.color {
-            let [r, g, b] = self::rgb(rgb);
-            fog.color = [r, g, b, 1.0];
-        }
-        let end = fog.environmental_end * f.radius;
-        let start = end - (end - fog.environmental_start * f.radius) * f.fade;
-        (fog.environmental_start, fog.environmental_end) = (start, end);
-        (fog.sky_end, fog.cloud_end) = (end, end);
-    }
    let span = (rd / 10.0).clamp(4.0, 64.0);
    fog.render_distance_start = rd - span;
    fog.render_distance_end = rd;
@@ -515,7 +495,6 @@ mod tests {
            full_water_vision: false,
            night_vision: 0.0,
            environment: Default::default(),
-            fluid_fog: Default::default(),
        }
    }
    #[test]
@@ -632,38 +611,6 @@ mod tests {
        let kept = setup_fog(&tables, &state, &input).color;
        assert_eq!(&kept[..3], &[0.1, 0.2, 0.4]);
    }
-    #[test]
-    fn a_fluid_modifier_scales_and_colours_its_fog_last() {
-        let sky = Sky {
-            fog_start: 10.0,
-            fog_end: 96.0,
-            ..Sky::default()
-        };
-        let tables = FogTables {
-            water_fog_end: vec![1.0],
-        };
-        let mut input = inputs(&sky);
-        input.fog_type = FogType::Lava;
-        input.fire_resistance = true;
-        let vanilla = setup_fog(&tables, &FogState::default(), &input);
-        assert_eq!(
-            (vanilla.environmental_start, vanilla.environmental_end),
-            (0.0, 5.0)
-        );
-        input.fluid_fog.lava = Some(crate::pack_palette::FluidFog {
-            color: Some(0x00FF00),
-            radius: 2.0,
-            fade: 0.5,
-        });
-        let fog = setup_fog(&tables, &FogState::default(), &input);
-        assert_eq!(fog.color, [0.0, 1.0, 0.0, 1.0]);
-        // The end doubles; half the fade from 0 to 10 starts it at 5.
-        assert_eq!(
-            (fog.environmental_start, fog.environmental_end),
-            (5.0, 10.0)
-        );
-        assert_eq!((fog.sky_end, fog.cloud_end), (10.0, 10.0));
-    }
    fn inputs_with<'a>(
        input: &FogInputs<'a>,
        environment: crate::pack_palette::Environment,
@@ -7041,10 +7041,8 @@ impl Renderer {
        }
    }
    /// This renderer's output as applied, with what its destination offers and reports.
-    pub fn output(&self) -> output::EffectiveOutput {
-        let native = self.native.as_ref().map(|n| n.frame.api);
-        self.output
-            .with_pack(self.shader_pack_kind() == Some("iris"), native)
+    pub fn output(&self) -> &output::EffectiveOutput {
+        &self.output
    }
    /// What this renderer's display last reported: a renderer made again for the window
    /// starts from it (`Renderer::new`'s `display`).
@@ -8321,7 +8319,9 @@ impl Renderer {
        let taa = !frame.title
            && self.pack_post.as_ref().is_none_or(|p| p.1.is_none())
            && self.native.as_ref().is_none_or(|n| n.post.is_none());
-        let hdr_lighting = self.shader_pack_kind().is_none();
+        let hdr_lighting = self.native.is_none()
+            && self.pack_post.as_ref().is_none_or(|p| p.1.is_none())
+            && std::env::var_os("HORIZON_HDR_LIGHTING").is_none_or(|v| v != "0");
        if let Some(hdr) = &mut self.hdr {
            hdr.lighting = hdr_lighting && hdr.look;
        }
@@ -191,7 +191,7 @@ pub struct Hdr {
    pub masks: Masks,
    /// HDR lighting, whether Horizon lifts this frame's world: off under a Horizon shader pack
    /// that draws, while a `shaders/` pack's post or material stage runs (the pack's own),
-    /// and with HDR Lighting (`look`) off.
+    /// with HDR Lighting (`look`) off, and with `HORIZON_HDR_LIGHTING=0`, to compare.
    pub lighting: bool,
    /// The HDR Lighting setting: off, nothing in the world is lifted, light sources and the
    /// sun included, so the picture is SDR's on the HDR canvas.
@@ -144,9 +144,6 @@ pub struct EffectiveOutput {
    pub(crate) nits: [f32; 3],
    /// The HUD and menus' brightness, as a share of paper white: their nits over its.
    pub(crate) ui_brightness: f32,
-    /// The running shader pack lights the world itself: Horizon lifts none of it, so HDR
-    /// Lighting has nothing to switch (`with_pack`).
-    pub(crate) pack_lights: bool,
 }
 impl Default for EffectiveOutput {
    fn default() -> Self {
@@ -169,22 +166,7 @@ impl EffectiveOutput {
        },
        nits: [203.0, 1000.0, 0.0],
        ui_brightness: 1.0,
-        pack_lights: false,
    };
-    /// This output under the running shader pack: a `shaders/` one (`shaders`), or one of
-    /// Horizon's own of API `native`. Under a 0.1 pack on the 8- or 16-bit frame the last pass
-    /// still lifts the light sources and the sun its marks hold (`lifts_world` in
-    /// `Renderer::render`); under the rest Horizon lifts nothing.
-    pub(crate) fn with_pack(self, shaders: bool, native: Option<horizon_shader_api::Api>) -> Self {
-        let pack_lights = shaders
-            || native.is_some_and(|api| {
-                api != horizon_shader_api::Api::V0_1 || self.frame.format == super::LINEAR_FRAME
-            });
-        Self {
-            pack_lights,
-            ..self
-        }
-    }
    /// Whether the destination offers HDR output.
    pub fn hdr_offered(&self) -> bool {
        self.offered.is_some()
@@ -291,7 +273,6 @@ pub(crate) fn resolve_output(
        ],
        ui_brightness: settings.ui_nits(reading.luminance) as f32
            / settings.paper_white_nits(reading.luminance) as f32,
-        pack_lights: false,
    }
 }

@@ -1110,8 +1110,7 @@ impl Item {
    /// active; saved values wait for it. Translucent Batching switches where the device can batch
    /// (`graphics::translucent_batching_offered`), its saved value waiting for one that can,
    /// Smooth Gradients only where it can draw the 16-bit frame, the same way, and GPU Culling
-    /// only where it is offered (`graphics::gpu_culling_offer`), with the reason it isn't. HDR
-    /// Lighting has nothing to switch where the running shader pack lights the world itself.
+    /// only where it is offered (`graphics::gpu_culling_offer`), with the reason it isn't.
    fn blocked(self, s: &Settings, out: &EffectiveOutput) -> Option<&'static str> {
        if !self.available() {
            return Some("This feature is not yet available in Horizon.");
@@ -1142,9 +1141,6 @@ impl Item {
            } else {
                "Turn HDR on to use it."
            }),
-            Item::Horizon(H::HdrLighting) if out.pack_lights => {
-                Some("The shader pack lights the world itself.")
-            }
            Item::Horizon(H::TranslucentBatching)
                if !crate::graphics::translucent_batching_offered() =>
            {
@@ -31,49 +31,6 @@ fn smooth_gradients_wait_for_a_device_that_draws_the_16_bit_frame() {
    assert_eq!(item.blocked(&s, &out), Some("Turn HDR on to use it."));
 }

-#[test]
-fn hdr_lighting_is_greyed_only_where_the_running_pack_lights_the_world() {
-    use horizon_shader_api::Api;
-    let mut s = Settings::default();
-    s.horizon.hdr = HdrMode::On;
-    let item = Item::Horizon(H::HdrLighting);
-    let lights = Some("The shader pack lights the world itself.");
-    let out = offering(true, None);
-    // No pack running, as with one picked but refused, missing or its mod off: live.
-    assert_eq!(item.blocked(&s, &out.with_pack(false, None)), None);
-    // A 0.1 pack on the 16-bit frame: the light sources and the sun still shine.
-    assert_eq!(
-        item.blocked(&s, &out.with_pack(false, Some(Api::V0_1))),
-        None
-    );
-    assert_eq!(
-        item.blocked(&s, &out.with_pack(false, Some(Api::V0_2))),
-        lights
-    );
-    assert_eq!(item.blocked(&s, &out.with_pack(true, None)), lights);
-    let float = EffectiveOutput {
-        frame: crate::gfx::FrameConfiguration {
-            format: wgpu::TextureFormat::Rgba16Float,
-            ..out.frame
-        },
-        ..out
-    };
-    assert_eq!(
-        item.blocked(&s, &float.with_pack(false, Some(Api::V0_1))),
-        lights
-    );
-    // HDR's own reasons come first.
-    assert_eq!(
-        item.blocked(&s, &NONE.with_pack(true, None)),
-        Some("Your display or system doesn't offer HDR output.")
-    );
-    s.horizon.hdr = HdrMode::Off;
-    assert_eq!(
-        item.blocked(&s, &out.with_pack(true, None)),
-        Some("Turn HDR on to use it.")
-    );
-}
-
 #[test]
 fn hdr_auto_can_be_selected_before_querying_and_brightness_waits_for_output() {
    let mut s = Settings::default();
@@ -7,14 +7,6 @@ use horizon_polytone::colors::PackColors;
 use crate::block_entity_render::DYES;
 use crate::pack_palette::{self, Environment};

-fn fluid(fog: horizon_polytone::colors::FluidFog) -> pack_palette::FluidFog {
-    pack_palette::FluidFog {
-        color: fog.color,
-        radius: fog.radius,
-        fade: fog.fade,
-    }
-}
-
 /// The colours of every namespace's file under the pack overlay at `root`.
 pub fn read(root: &Path) -> pack_palette::PackColors {
    let colors = PackColors::read(root);
@@ -37,10 +29,6 @@ pub fn read(root: &Path) -> pack_palette::PackColors {
            water_fog_brightening_time: env.water_fog_brightening_time,
            horizon_height: env.horizon_height,
        },
-        fluid_fog: pack_palette::FluidFogs {
-            water: colors.fluid_fog.water.map(fluid),
-            lava: colors.fluid_fog.lava.map(fluid),
-        },
    }
 }

@@ -59,24 +59,6 @@ pub struct PackColors {
    pub xp_bar: [Option<u32>; 2],
    /// The effect fogs' settings: the fog reads them every frame.
    pub env: Environment,
-    /// The fog the packs' fluid modifiers give water and lava.
-    pub fluid_fog: FluidFogs,
-}
-
-/// A fluid modifier's fog: a flat colour (RGB), and the fog's radius and fade multipliers (1 is
-/// vanilla's).
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct FluidFog {
-    pub color: Option<u32>,
-    pub radius: f32,
-    pub fade: f32,
-}
-
-/// The fog the packs' fluid modifiers give water and lava.
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
-pub struct FluidFogs {
-    pub water: Option<FluidFog>,
-    pub lava: Option<FluidFog>,
 }

 impl Default for PackColors {
@@ -90,7 +72,6 @@ impl Default for PackColors {
            entity_shadows: true,
            xp_bar: [None; 2],
            env: Environment::default(),
-            fluid_fog: FluidFogs::default(),
        }
    }
 }
@@ -337,13 +337,6 @@ impl Settings {
            .and_then(|mode| self.video_modes.iter().position(|m| *m == mode))
            .map_or(-1, |i| i as i32)
    }
-    /// Loads only the crates' settings stores (`horizon_hooks::settings`) from the files next to
-    /// `path`, into the seat whose turn it is (`horizon_hooks::seat`): a splitscreen player whose
-    /// settings were made from P1's rather than loaded.
-    pub fn load_stores(path: &Path) {
-        let dir = path.parent();
-        horizon_hooks::settings::engine::load(&mut |file| fs::read_to_string(dir?.join(file)).ok());
-    }
    pub fn load(path: &Path) -> Self {
        let mut horizon = path
            .parent()
@@ -287,7 +287,6 @@
  "This feature is not yet available in Horizon.": "This feature is not yet available in Horizon.",
  "Your display or system doesn't offer HDR output.": "Your display or system doesn't offer HDR output.",
  "Turn HDR on to use it.": "Turn HDR on to use it.",
-  "The shader pack lights the world itself.": "The shader pack lights the world itself.",
  "Your GPU or graphics API doesn't support it.": "Your GPU or graphics API doesn't support it.",
  "Not with software rendering, which runs it on the CPU.": "Not with software rendering, which runs it on the CPU.",
  "Out of video memory: off until the next start.": "Out of video memory: off until the next start.",
@@ -42,25 +42,12 @@ impl Game<'_> {
        self.trial_spawner_tick_positions.clear();
        self.item_columns = Some(Default::default());
        self.pass_mobs = Some(Default::default());
-        let tickers = self.world.block_entity_tickers();
-        let mut last_chunk = (i32::MIN, i32::MIN);
-        let mut last_chunk_ticking = false;
-        for slot in tickers.iter().copied() {
+        for slot in self.world.block_entity_tickers().iter().copied() {
            let pos = slot.0;
-            let chunk = (pos.0 >> 4, pos.2 >> 4);
-            let chunk_ticking = if chunk == last_chunk {
-                last_chunk_ticking
-            } else {
-                last_chunk = chunk;
-                last_chunk_ticking = ticking(pos.0, pos.2);
-                last_chunk_ticking
-            };
-            if !chunk_ticking {
-                continue;
-            }
            // Ticks before this one can remove it (`TickingBlockEntity.isRemoved`).
            if self.world.block_entities.is_asleep(&pos)
                || !self.world.block_entities.is_live(slot)
+                || !ticking(pos.0, pos.2)
                || !self.border.contains(f64::from(pos.0), f64::from(pos.2))
            {
                continue;
@@ -223,14 +210,8 @@ impl Game<'_> {
    /// (`ServerLevel.areEntitiesLoaded`).
    pub(super) fn block_ticking_area(&self) -> impl Fn(i32, i32) -> bool + use<> {
        let levels = self.tickets.levels();
-        let has_pending = !self.world.entities_pending.is_empty();
-        let pending = has_pending.then(|| self.world.entities_pending.clone());
-        move |x, z| {
-            levels.block_ticking_at(x, z)
-                && pending
-                    .as_ref()
-                    .is_none_or(|p| !p.contains(&(x >> 4, z >> 4)))
-        }
+        let pending = self.world.entities_pending.clone();
+        move |x, z| levels.block_ticking_at(x, z) && !pending.contains(&(x >> 4, z >> 4))
    }
    /// `DaylightDetectorBlock.tickEntity` of the detector at `pos`.
    fn tick_daylight_detector(&mut self, pos: Pos) {
@@ -3831,9 +3831,12 @@ impl Game<'_> {
                    return;
                }
                g.spawn = None;
-                g.respawn_config = Some(super::respawn_anchor::RespawnConfig::forced(
-                    level, pos, yaw, pitch,
-                ));
+                g.respawn_config = Some(super::respawn_anchor::RespawnConfig {
+                    dim: level,
+                    pos,
+                    yaw,
+                    forced: true,
+                });
            });
        }
        let dim = Text::literal(self.dim.id());
@@ -353,7 +353,7 @@ impl Game<'_> {
            let found =
                self.find_respawn_and_use(config, op["consume"].as_bool().unwrap_or(true))?;
            used.push(match found {
-                Some((p, yaw, _pitch)) => format!(
+                Some((p, yaw)) => format!(
                    "respawn {} {} {} {}",
                    num(p.x),
                    num(p.y),
@@ -579,7 +579,6 @@ impl Game<'_> {
                dim: self.dim,
                pos: [p(0), p(1), p(2)],
                yaw: 0.0,
-                pitch: 0.0,
                forced: false,
            });
        }
@@ -739,8 +739,7 @@ impl Game<'_> {
        // anchor puts the player, facing it; else onto the spawn column.
        let mut target = target;
        if let Some(c) = self.respawn_config.filter(|c| c.dim == self.dim) {
-            // This existing owner transition adapter carries yaw only; its pitch path remains open.
-            if let Some((at, yaw, _pitch)) = self.find_respawn_and_use(c, false)? {
+            if let Some((at, yaw)) = self.find_respawn_and_use(c, false)? {
                return Ok(Some((at, Some(yaw))));
            }
            target = fallback_spawn(self.spawn, self.level.world_spawn);
@@ -70,10 +70,9 @@ fn overworld_spawnpoint_is_validated_at_both_player_blocks() {
            assert_eq!(actual.is_some(), allowed, "{block} at height {height}");
            assert_eq!(game.respawn_config.is_some(), allowed);
            assert_eq!(game.level.world_spawn, Some([0, 80, 0]));
-            if let Some((at, yaw, pitch)) = actual {
+            if let Some((at, yaw)) = actual {
                assert_eq!(at, Vec3::new(5.5, 64.1, 5.5));
                assert_eq!(yaw, 0.0);
-                assert_eq!(pitch.to_bits(), 0.0f32.to_bits());
            }
        }
    }
@@ -4190,8 +4190,8 @@ impl Game<'_> {
                .map_or([0.5, 80.0, 0.5], |[x, y, z]| {
                    [f64::from(x) + 0.5, f64::from(y), f64::from(z) + 0.5]
                });
-            let at = found.map_or(world, |(at, yaw, pitch)| {
-                (host.hub.guests[i].yaw, host.hub.guests[i].pitch) = (yaw, pitch);
+            let at = found.map_or(world, |(at, yaw)| {
+                host.hub.guests[i].yaw = yaw;
                [at.x, at.y, at.z]
            });
            if found.is_none() {
@@ -118,78 +118,34 @@ impl View {
        }
        None
    }
-    /// `WorldlyContainer.getSlotsForFace` or every slot, zero-allocation iterator.
-    pub(super) fn slots_for_face_iter(&self, face: Option<Direction>) -> Slots<'_> {
+    /// `WorldlyContainer.getSlotsForFace` or every slot.
+    fn slots_for_face(&self, face: Option<Direction>) -> Vec<usize> {
        match (self.kind, face) {
-            (Kind::Furnace, Some(Direction::Down)) => Slots::Slice(&[2, 1]),
-            (Kind::Furnace, Some(Direction::Up)) => Slots::Slice(&[0]),
-            (Kind::Furnace, Some(_)) => Slots::Slice(&[1]),
-            (Kind::Brewing, Some(Direction::Up)) => Slots::Slice(&[3]),
-            (Kind::Brewing, Some(Direction::Down)) => Slots::Slice(&[0, 1, 2, 3]),
-            (Kind::Brewing, Some(_)) => Slots::Slice(&[0, 1, 2, 4]),
-            (Kind::Composter(8), Some(Direction::Down)) => Slots::Slice(&[0]),
-            (Kind::Composter(level), Some(Direction::Up)) if level < 7 => Slots::Slice(&[0]),
-            (Kind::Composter(_), _) => Slots::Slice(&[]),
+            (Kind::Furnace, Some(Direction::Down)) => vec![2, 1],
+            (Kind::Furnace, Some(Direction::Up)) => vec![0],
+            (Kind::Furnace, Some(_)) => vec![1],
+            (Kind::Brewing, Some(Direction::Up)) => vec![3],
+            (Kind::Brewing, Some(Direction::Down)) => vec![0, 1, 2, 3],
+            (Kind::Brewing, Some(_)) => vec![0, 1, 2, 4],
+            (Kind::Composter(8), Some(Direction::Down)) => vec![0],
+            (Kind::Composter(level), Some(Direction::Up)) if level < 7 => vec![0],
+            (Kind::Composter(_), _) => vec![],
            (Kind::Mod, Some(face)) => self
                .container
                .as_ref()
-                .map_or(Slots::Slice(&[]), |c| Slots::Mod(&c.faces[face as usize])),
-            _ => Slots::Range(0..self.len()),
+                .map_or_else(Vec::new, |c| c.faces[face as usize].clone()),
+            _ => (0..self.len()).collect(),
        }
    }
-    /// The slots `HopperBlockEntity.addItem` tries through `face`, zero-allocation iterator.
-    pub(super) fn slots_to_add_iter(&self, face: Option<Direction>) -> Slots<'_> {
-        if matches!(self.kind, Kind::Furnace | Kind::Brewing | Kind::Mod) && face.is_some() {
-            self.slots_for_face_iter(face)
-        } else {
-            Slots::Range(0..self.len())
-        }
-    }
-    /// `WorldlyContainer.getSlotsForFace` or every slot.
-    fn slots_for_face(&self, face: Option<Direction>) -> Vec<usize> {
-        self.slots_for_face_iter(face).collect()
-    }
    /// The slots `HopperBlockEntity.addItem` tries through `face`.
    fn slots_to_add(&self, face: Option<Direction>) -> Vec<usize> {
-        self.slots_to_add_iter(face).collect()
-    }
-}
-
-pub(super) enum Slots<'a> {
-    Range(std::ops::Range<usize>),
-    Slice(&'static [usize]),
-    Mod(&'a [usize]),
-}
-
-impl Iterator for Slots<'_> {
-    type Item = usize;
-    #[inline]
-    fn next(&mut self) -> Option<usize> {
-        match self {
-            Slots::Range(r) => r.next(),
-            Slots::Slice(s) => {
-                let (&first, rest) = s.split_first()?;
-                *s = rest;
-                Some(first)
-            }
-            Slots::Mod(s) => {
-                let (&first, rest) = s.split_first()?;
-                *s = rest;
-                Some(first)
-            }
+        if matches!(self.kind, Kind::Furnace | Kind::Brewing | Kind::Mod) && face.is_some() {
+            self.slots_for_face(face)
+        } else {
+            (0..self.len()).collect()
        }
    }
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let len = match self {
-            Slots::Range(r) => r.len(),
-            Slots::Slice(s) => s.len(),
-            Slots::Mod(s) => s.len(),
-        };
-        (len, Some(len))
-    }
 }
-impl ExactSizeIterator for Slots<'_> {}

 pub(super) fn dir_from_name(name: &str) -> Option<Direction> {
    Some(match name {
@@ -224,6 +180,8 @@ struct Containers<'a> {
    registry: &'static horizon_world::registry::BlockRegistry,
    /// Brewing recipes, for what a brewing stand accepts (not needed for signals).
    brewing: Option<&'a horizon_client::brewing::Brewing>,
+    /// The stack of a full composter's `OutputContainer`.
+    bone_meal: ItemStack,
 }
 impl Containers<'_> {
    fn prop(&self, state: BlockStateId, key: &str) -> Option<&str> {
@@ -388,7 +346,7 @@ impl Containers<'_> {
    fn get(&self, view: &View, slot: usize) -> Option<&ItemStack> {
        if let Kind::Composter(level) = view.kind {
            // OutputContainer holds one bone meal; InputContainer composts at once.
-            return (level == 8 && slot == 0).then_some(bone_meal_stack());
+            return (level == 8 && slot == 0).then_some(&self.bone_meal);
        }
        let (pos, i) = view.locate(slot)?;
        self.world
@@ -494,7 +452,7 @@ impl Containers<'_> {
    }
    /// `HopperBlockEntity.isFullContainer`.
    fn is_full(&self, view: &View, face: Direction) -> bool {
-        view.slots_for_face_iter(Some(face)).all(|i| {
+        view.slots_for_face(Some(face)).into_iter().all(|i| {
            self.insertion_item(view, i)
                .is_some_and(|s| s.count >= self.max_stack(&s))
        })
@@ -540,9 +498,6 @@ impl ItemColumns {
        x: i32,
        z: i32,
    ) -> bool {
-        if items.is_empty() {
-            return false;
-        }
        let (len, last) = (items.len(), items.last().map(|i| i.id));
        let stale = self
            .seen
@@ -601,14 +556,13 @@ impl StampedItemColumns {
    }
 }

-fn bone_meal_stack() -> &'static ItemStack {
-    static STACK: std::sync::LazyLock<ItemStack> = std::sync::LazyLock::new(|| ItemStack {
+fn bone_meal() -> ItemStack {
+    ItemStack {
        item: "minecraft:bone_meal".into(),
        count: 1,
        damage: 0,
        extra: None,
-    });
-    &STACK
+    }
 }

 /// Comparator input from a container block entity (0 when there is none).
@@ -625,6 +579,7 @@ pub(super) fn container_signal(
        items,
        registry,
        brewing: None,
+        bone_meal: bone_meal(),
    };
    c.view((pos.x, pos.y, pos.z), true)
        .filter(|v| !matches!(v.kind, Kind::Composter(_)))
@@ -680,6 +635,7 @@ impl Game<'_> {
            items: self.items(),
            registry: self.pack.assets.registry,
            brewing: Some(&self.stations().brewing),
+            bone_meal: bone_meal(),
        }
    }
    pub(super) fn block_can_place(&self, pos: [i32; 3], slot: usize, stack: &ItemStack) -> bool {
@@ -891,7 +847,7 @@ impl Game<'_> {
            return self.composter_container_insert([x, y, z], stack, face == Some(Direction::Up));
        }
        let mut rest = Some(stack);
-        for slot in view.slots_to_add_iter(face) {
+        for slot in view.slots_to_add(face) {
            let Some(stack) = rest.take() else { break };
            rest = self.try_move_in_item(from_hopper, view, stack, slot, face);
        }
@@ -924,31 +880,32 @@ impl Game<'_> {
    /// is still a hopper (`BlockEntityType.isValid`).
    pub(super) fn tick_hopper(&mut self, pos: Pos) {
        let time = self.world.game_time;
-        // Every hopper keeps its cooldown and the tick it last ticked
-        // (`HopperBlockEntity.tickedGameTime`), idle ones too: a hopper that
-        // receives an item reads it for its cooldown (8, or 7 once it ticked).
-        let state = self.hoppers.entry(pos).or_default();
-        state.cooldown = state.cooldown.wrapping_sub(1);
-        state.ticked = time;
-        if state.cooldown > 0 {
+        let waiting = {
+            let state = self.hoppers.entry(pos).or_default();
+            state.cooldown = state.cooldown.wrapping_sub(1);
+            state.ticked = time;
+            state.cooldown > 0
+        };
+        if waiting {
            return;
        }
-        state.cooldown = 0;
        // Most ticks only advance the cooldown: the block is checked when the
        // hopper is about to move, not on every tick it waits.
-        let state = self.world.block(pos.0, pos.1, pos.2);
-        let Some(info) = self.pack.assets.registry.state(state) else {
-            self.hoppers.remove(&pos);
-            return;
-        };
-        if info.name != "minecraft:hopper" {
+        let hopper = self
+            .res
+            .facts()
+            .get(self.world.block(pos.0, pos.1, pos.2))
+            .name
+            .as_ref()
+            == "minecraft:hopper";
+        if !hopper {
            self.hoppers.remove(&pos);
            return;
        }
-        if info.properties.get("enabled").is_some_and(|v| v == "false") {
-            return;
+        if let Some(state) = self.hoppers.get_mut(&pos) {
+            state.cooldown = 0;
        }
-        self.hopper_try_move_items_with_state(pos, state);
+        self.hopper_try_move_items(pos);
    }
    /// Drops the cooldowns of hoppers whose block entity is gone.
    pub(super) fn forget_gone_hoppers(&mut self) {
@@ -960,69 +917,23 @@ impl Game<'_> {
    /// `HopperBlockEntity.tryMoveItems` with `suckInItems`.
    pub(super) fn hopper_try_move_items(&mut self, pos: Pos) {
        let state = self.world.block(pos.0, pos.1, pos.2);
-        self.hopper_try_move_items_with_state(pos, state);
-    }
-    fn hopper_try_move_items_with_state(&mut self, pos: Pos, state: BlockStateId) {
-        let Some(info) = self.pack.assets.registry.state(state) else {
+        let c = self.containers();
+        let enabled = c.prop(state, "enabled") != Some("false");
+        let Some(view) = c.view(pos, false) else {
            return;
        };
-        if info.properties.get("enabled").is_some_and(|v| v == "false") {
+        if self.hoppers.get(&pos).is_some_and(|h| h.cooldown > 0) || !enabled {
            return;
        }
-        if self.hoppers.get(&pos).is_some_and(|h| h.cooldown > 0) {
-            return;
-        }
-        let Some(BlockEntity::Chest(items)) = self.world.block_entities.get(&pos) else {
-            return;
-        };
-        if items.len() != HOPPER_SLOTS {
-            return;
-        }
-        let is_empty = items
-            .iter()
-            .all(|s| s.as_ref().is_none_or(|s| s.count == 0));
-        let has_empty_slot = items
-            .iter()
-            .any(|s| s.as_ref().is_none_or(|s| s.count == 0));
-
-        let above = (pos.0, pos.1 + 1, pos.2);
-        // Fast path for empty hopper with no source container and no item entities:
-        // if empty, cannot eject; if no container above, cannot suck container;
-        // if no dropped items nearby, cannot suck entities -> nothing can happen!
-        if is_empty
-            && self.world.block_entities.get(&above).is_none()
-            && self.carts.is_empty()
-            && self.boats.is_empty()
-            && (self.dropped.is_empty()
-                || self
-                    .item_columns
-                    .as_mut()
-                    .is_some_and(|c| !c.may_reach(&self.dropped, pos.0, pos.2)))
-            && self
-                .pack
-                .assets
-                .registry
-                .state(self.world.block(above.0, above.1, above.2))
-                .is_none_or(|s| s.name != "minecraft:composter")
-        {
-            return;
-        }
-
        self.native_prepare_hopper_transfer([pos.0, pos.1, pos.2]);
-        let view = View {
-            parts: vec![(pos, HOPPER_SLOTS)],
-            kind: Kind::Hopper,
-            container: None,
-        };
        let mut changed = false;
-        if !is_empty {
-            changed = self.hopper_eject_with_state(pos, state, &view);
+        if !c.is_empty(&view) {
+            changed = self.hopper_eject(pos, &view);
        }
-        let is_full = !changed && !has_empty_slot && {
-            let c = self.containers();
-            (0..HOPPER_SLOTS).all(|i| c.get(&view, i).is_some_and(|s| s.count >= c.max_stack(s)))
-        };
-        if !is_full {
+        let c = self.containers();
+        let full =
+            (0..view.len()).all(|i| c.get(&view, i).is_some_and(|s| s.count == c.max_stack(s)));
+        if !full {
            changed |= self.hopper_suck(pos, &view);
        }
        if changed {
@@ -1084,20 +995,19 @@ impl Game<'_> {
    /// `tryMoveItems(…, () -> addItem(hopper, itemEntity))`; true when the
    /// item entity was taken whole.
    fn hopper_take_item(&mut self, pos: Pos, i: usize) -> bool {
-        if self.hoppers.get(&pos).is_some_and(|h| h.cooldown > 0) {
-            return false;
-        }
        let state = self.world.block(pos.0, pos.1, pos.2);
        let c = self.containers();
-        if c.prop(state, "enabled") == Some("false") {
-            return false;
-        }
        let Some(view) = c.view(pos, false) else {
            return false;
        };
+        if c.prop(state, "enabled") == Some("false")
+            || self.hoppers.get(&pos).is_some_and(|h| h.cooldown > 0)
+        {
+            return false;
+        }
        let mut changed = false;
        if !c.is_empty(&view) {
-            changed = self.hopper_eject_with_state(pos, state, &view);
+            changed = self.hopper_eject(pos, &view);
        }
        let c = self.containers();
        let full =
@@ -1133,7 +1043,8 @@ impl Game<'_> {
    }
    /// `HopperBlockEntity.ejectItems`: into the block container in front, else
    /// a container entity there (`getContainerAt`).
-    fn hopper_eject_with_state(&mut self, pos: Pos, state: BlockStateId, hopper: &View) -> bool {
+    fn hopper_eject(&mut self, pos: Pos, hopper: &View) -> bool {
+        let state = self.world.block(pos.0, pos.1, pos.2);
        let c = self.containers();
        let Some(facing) = c.prop(state, "facing").and_then(dir_from_name) else {
            return false;
@@ -1245,9 +1156,6 @@ impl Game<'_> {
        if blocked {
            return false;
        }
-        if self.dropped.is_empty() {
-            return false;
-        }
        // Hopper.SUCK_AABB: the hopper bowl and the block above.
        let (min, max) = (
            [
@@ -1306,7 +1214,7 @@ impl Game<'_> {
            // second setChanged after the move or, when the hopper has no
            // room, the setItem putting the bone meal back into the detached
            // container (whose bone meal is lost with it).
-            let bone_meal = bone_meal_stack().clone();
+            let bone_meal = c.bone_meal.clone();
            if !horizon_client::mod_api::mods().is_empty() {
                let mut cancel = false;
                self.native_inventory_move_item(
@@ -1336,15 +1244,13 @@ impl Game<'_> {
        source: &View,
        hopper: &View,
    ) -> bool {
-        for slot in source.slots_for_face_iter(Some(Direction::Down)) {
-            {
-                let c = self.containers();
-                let Some(stack) = c.get(source, slot) else {
-                    continue;
-                };
-                if !c.can_take(source, slot, stack, Direction::Down) {
-                    continue;
-                }
+        for slot in source.slots_for_face(Some(Direction::Down)) {
+            let c = self.containers();
+            let Some(stack) = c.get(source, slot) else {
+                continue;
+            };
+            if !c.can_take(source, slot, stack, Direction::Down) {
+                continue;
            }
            if self.hopper_move_canceled(source, slot, source, hopper) {
                continue;
@@ -1363,9 +1269,7 @@ impl Game<'_> {
                    }
                    return true;
                }
-                Some(rest) => {
-                    self.put_back(source, slot, rest);
-                }
+                Some(rest) => self.put_back(source, slot, rest),
            }
        }
        false
@@ -1375,9 +1279,6 @@ impl Game<'_> {
    /// minecarts, chest boats) whose box meets the 1x1x1 box around `at`,
    /// picked at random.
    fn entity_container_at(&mut self, at: [f64; 3]) -> Option<u32> {
-        if self.carts.is_empty() && self.boats.is_empty() {
-            return None;
-        }
        let meets = |b: horizon_core::geometry::Aabb| {
            let (lo, hi) = (b.min_position(), b.max_position());
            lo.x < at[0] + 0.5
@@ -471,7 +471,6 @@ pub(crate) mod tests {
            dim: game.dim,
            pos: [1, 2, 3],
            yaw: 0.0,
-            pitch: 0.0,
            forced: false,
        };
        let spawn = Vec3::new(1.0, 2.0, 3.0);
@@ -46,8 +46,6 @@ pub(super) struct SpawnScratch {
    /// dx/dz order, that no earlier player's square holds.
    segments: Vec<Vec<(i32, i32)>>,
    stale: Vec<bool>,
-    /// Reusable buffer for spawn players across ticks to avoid heap allocation.
-    pub(super) spawn_players: Vec<SpawnPlayer>,
 }
 impl SpawnScratch {
    fn chunk(p: &LevelPlayer) -> (i32, i32) {
@@ -130,20 +128,6 @@ impl SpawnScratch {
        self.prepare(players);
        self.candidates.clear();
        let mut count = 0;
-        if players.len() == 1 {
-            let p = &players[0];
-            count = self.segments.first().map_or(0, |s| s.len());
-            if !p.spectator
-                && let Some(segment) = self.segments.first()
-            {
-                for &c in segment {
-                    if close_enough_for_spawning(p, c) && keep(c) {
-                        self.candidates.push(c);
-                    }
-                }
-            }
-            return count as i32;
-        }
        for (i, segment) in self.segments.iter().enumerate() {
            count += segment.len();
            let near = &self.neighbours[i];
@@ -666,10 +650,8 @@ fn spawn_cost_types(biomes: &horizon_client::biome::Biomes) -> Vec<&str> {
    types
 }
 impl<'a> Game<'a> {
-    pub(super) fn natural_level_with_players(
-        &self,
-        players: Vec<LevelPlayer>,
-    ) -> GameLevel<'_, 'a> {
+    pub(super) fn natural_level(&self) -> GameLevel<'_, 'a> {
+        let players = self.level_players();
        let nearest = players
            .iter()
            .filter(|p| !p.spectator)
@@ -688,9 +670,6 @@ impl<'a> Game<'a> {
            costed: spawn_cost_types(world_biomes!(self)),
        }
    }
-    pub(super) fn natural_level(&self) -> GameLevel<'_, 'a> {
-        self.natural_level_with_players(self.level_players())
-    }
    /// Creates a mob the spawner accepted, finalized the game's way; the
    /// caller adds it with [`Game::add_spawned`].
    fn finalize_spawned(&self, r: &SpawnRequest, pending: &mut Vec<Mob>) -> Option<Spawned> {
@@ -794,8 +773,6 @@ impl<'a> Game<'a> {
        scratch: &mut SpawnScratch,
    ) -> i32 {
        let levels = self.tickets.levels();
-        // Recomputed each pass: a chunk's ticket level and entity loading change without the
-        // players moving or the chunk count changing.
        scratch.collect(players, |(cx, cz)| {
            levels.loaded_ticking(cx, cz) && super::ticking_chunk(&self.world, cx, cz)
        })
@@ -842,28 +819,31 @@ impl<'a> Game<'a> {
        {
            let level = self.natural_level();
            laps.lap("sn_level");
-            let counted = self.mobs.iter().map(|m| Counted {
-                entity: &m.kind.id,
-                category: Category::from_name(&m.kind.category),
-                block: [
-                    m.position.x.floor() as i32,
-                    m.position.y.floor() as i32,
-                    m.position.z.floor() as i32,
-                ],
-                is_mob: true,
-                persistent: m.persistent
-                    || horizon_client::mobs::ai::requires_custom_persistence(m),
-            });
-            scratch.spawn_players.clear();
-            scratch
-                .spawn_players
-                .extend(players.iter().map(|p| SpawnPlayer {
+            let counted: Vec<Counted> = self
+                .mobs
+                .iter()
+                .map(|m| Counted {
+                    entity: &m.kind.id,
+                    category: Category::from_name(&m.kind.category),
+                    block: [
+                        m.position.x.floor() as i32,
+                        m.position.y.floor() as i32,
+                        m.position.z.floor() as i32,
+                    ],
+                    is_mob: true,
+                    persistent: m.persistent
+                        || horizon_client::mobs::ai::requires_custom_persistence(m),
+                })
+                .collect();
+            let players = players
+                .iter()
+                .map(|p| SpawnPlayer {
                    position: [p.position.x, p.position.y, p.position.z],
                    spectator: p.spectator,
-                }));
-            let spawn_players = std::mem::take(&mut scratch.spawn_players);
+                })
+                .collect();
            laps.lap("sn_materialize");
-            let mut state = SpawnState::new(&level, spawnable, spawn_players, counted, |cx, cz| {
+            let mut state = SpawnState::new(&level, spawnable, players, &counted, |cx, cz| {
                self.world.chunks.contains_key(&(cx, cz))
            });
            laps.lap("sn_state");
@@ -874,8 +854,7 @@ impl<'a> Game<'a> {
                Vec::new()
            };
            laps.lap("sn_categories");
-            // Util.shuffle, every pass: it draws from the level's random even when no
-            // category may spawn.
+            // Util.shuffle.
            for i in (1..scratch.candidates.len()).rev() {
                let j = random.next_int_bound(i as i32 + 1).unwrap_or(0) as usize;
                scratch.candidates.swap(i, j);
@@ -906,7 +885,6 @@ impl<'a> Game<'a> {
                    );
                }
            }
-            scratch.spawn_players = state.into_players();
        }
        spawn_selection::attempt_counters(true);
        laps.lap("sn_attempts");
@@ -185,7 +185,7 @@ impl Game<'_> {
        let output = self
            .renderer
            .as_ref()
-            .map_or(Default::default(), |r| r.output());
+            .map_or(Default::default(), |r| *r.output());
        ui.draw(&self.settings, output, batch, &self.gui.atlas, self.cursor);
        self.ui.options = ui;
        self.show_calibration((batch.width, batch.height));
@@ -3110,6 +3110,33 @@ impl Game<'_> {
                index.get(mobs, id as u32).map(mob_tracking_body)
            });
    }
+    fn remove_entity(&mut self, id: i32) {
+        self.detach_remote_tracking_entity(id);
+        self.audio.remove_sound_entity(id as u32);
+        // Entity.setRemoved detaches every passenger, even when no empty
+        // SetPassengers packet preceded the vehicle's removal. Otherwise
+        // mobs and other players keep their passenger pose after it is gone.
+        self.remote_set_passengers(id, &[]);
+        self.mobs.retain(|m| m.id != id as u32);
+        self.orbs.retain(|o| o.id != id as u32);
+        self.dropped.retain(|d| d.id != id as u32);
+        // Before the crystals go: the dragon's beam index follows them.
+        self.remove_remote_dragon(id);
+        self.remove_remote_object(id as u32);
+        self.remove_remote_projectile(id as u32);
+        self.persist.uuids.remove(&(id as u32));
+        if let Some(r) = self.remote.as_mut() {
+            r.glowing.remove(&id);
+            r.entities.remove(&id);
+            r.passenger_vehicles.remove(&(id as u32));
+            r.passenger_vehicles.retain(|_, v| *v != id as u32);
+            r.lerps.remove(&id);
+            r.cart_lerps.remove(&id);
+            r.stepped.remove(&id);
+            r.head_lerps.remove(&id);
+            r.pending_items.remove(&id);
+        }
+    }
    /// Map a menu slot to Horizon's inventory screen slot ids.
    pub(super) fn menu_slot(menu: &str, slot: i32) -> Option<usize> {
        let s = usize::try_from(slot).ok()?;
@@ -3680,7 +3707,7 @@ impl Game<'_> {
                self.move_remote_interaction(p.id, p.position);
            }
            C::RemoveEntities(p) => {
-                for &id in &p.ids {
+                for id in p.ids {
                    if let Some(r) = self.remote.as_mut() {
                        if let Some(uuid) = r.level_players.remove(&id) {
                            r.attachments.remove(&Holder::Player(uuid));
@@ -3689,8 +3716,8 @@ impl Game<'_> {
                        r.level_player_textures.remove(&id);
                        r.attachments.remove(&Holder::Entity(id as u32));
                    }
+                    self.remove_entity(id);
                }
-                self.remove_entities(&p.ids);
            }
            C::MoveEntityPos(play::MoveEntityPos(m))
            | C::MoveEntityPosRot(play::MoveEntityPosRot(m))
@@ -11615,9 +11642,6 @@ fn in_storage_range(view_distance: i32, center: (i32, i32), x: i32, z: i32) -> b
    x.abs_diff(center.0) <= range && z.abs_diff(center.1) <= range
 }

-// A packet's removals (`RemoveEntities`), apart: this file may not grow.
-#[path = "remote_removal.rs"]
-mod removal;
 #[cfg(test)]
 mod tests {
    #[test]
@@ -793,17 +793,13 @@ impl Game<'_> {
    }

    pub(super) fn remove_remote_projectile(&mut self, id: u32) {
+        self.fangs.list.retain(|f| f.id != id);
        self.tnts.retain(|t| t.id != id);
        self.falling.retain(|f| f.id != id);
-        self.crystals.retain(|c| c.id != id);
-        self.remove_remote_small_projectiles(id);
-    }
-
-    pub(super) fn remove_remote_small_projectiles(&mut self, id: u32) {
-        self.fangs.list.retain(|f| f.id != id);
        self.creatures.projectiles.retain(|p| p.id != id);
        self.tridents.retain(|t| t.id != id);
        self.rockets.retain(|r| r.id != id);
+        self.crystals.retain(|c| c.id != id);
        self.potions.remove_remote_thrown(id);
        self.potions.clouds.retain(|c| c.id != id);
        self.end.remove_remote_eye(id);
@@ -1,142 +0,0 @@
-//! Removing entities a server dropped (`RemoveEntities`), out of remote.rs,
-//! which may not grow.
-use super::super::Game;
-
-impl Game<'_> {
-    pub(super) fn remove_entity(&mut self, id: i32) {
-        self.remove_entities(&[id]);
-    }
-
-    /// `ClientboundRemoveEntitiesPacket`: a packet's ids go together, the big
-    /// entity lists filtered once (#13007), each id's own cleanup in order.
-    pub(super) fn remove_entities(&mut self, ids: &[i32]) {
-        for &id in ids {
-            self.detach_remote_tracking_entity(id);
-            self.audio.remove_sound_entity(id as u32);
-            // Entity.setRemoved detaches every passenger, even when no empty
-            // SetPassengers packet preceded the vehicle's removal. Otherwise
-            // mobs and other players keep their passenger pose after it is gone.
-            self.remote_set_passengers(id, &[]);
-            // Before the crystals go: the dragon's beam index follows them.
-            self.remove_remote_dragon(id);
-            self.crystals.retain(|c| c.id != id as u32);
-            self.remove_remote_object(id as u32);
-            self.remove_remote_small_projectiles(id as u32);
-            self.persist.uuids.remove(&(id as u32));
-            if let Some(r) = self.remote.as_mut() {
-                r.glowing.remove(&id);
-                r.entities.remove(&id);
-                r.passenger_vehicles.remove(&(id as u32));
-                r.lerps.remove(&id);
-                r.cart_lerps.remove(&id);
-                r.stepped.remove(&id);
-                r.head_lerps.remove(&id);
-                r.pending_items.remove(&id);
-            }
-        }
-        let removed: horizon_client::fast_hash::FxHashSet<u32> = if ids.len() > 1 {
-            ids.iter().map(|&id| id as u32).collect()
-        } else {
-            Default::default()
-        };
-        let keep = |id: u32| {
-            if ids.len() > 1 {
-                !removed.contains(&id)
-            } else {
-                ids.first().is_none_or(|&removed| id != removed as u32)
-            }
-        };
-        self.mobs.retain(|m| keep(m.id));
-        self.orbs.retain(|o| keep(o.id));
-        self.dropped.retain(|d| keep(d.id));
-        self.falling.retain(|f| keep(f.id));
-        self.tnts.retain(|t| keep(t.id));
-        if let Some(r) = self.remote.as_mut() {
-            r.passenger_vehicles.retain(|_, v| keep(*v));
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    #[test]
-    #[ignore = "needs prepared resources in HORIZON_TEST_RESOURCES and scratch homes/cwd"]
-    fn remove_entities_filters_mixed_entity_lists() {
-        use crate::game::{
-            Audio, Game, Options, Progress, Settings, execution_role::ExecutionRole, load_resources,
-        };
-        use horizon_protocol::packets::play::{self, Clientbound as C};
-
-        let root = std::path::PathBuf::from(std::env::var_os("HORIZON_TEST_RESOURCES").unwrap());
-        let settings = Settings::default();
-        let loaded = load_resources(
-            root.clone(),
-            None,
-            &root,
-            &settings,
-            std::time::Instant::now(),
-            false,
-            true,
-            &Progress::new(),
-            &mut |_, _| unreachable!(),
-        )
-        .unwrap();
-        let mut options = Options::parse(std::iter::empty()).unwrap().unwrap();
-        options.resources = root.clone();
-        options.execution_role = ExecutionRole::Client;
-        let mut game = Game::new(
-            &loaded.resources,
-            loaded.pack,
-            loaded.gui.unwrap(),
-            options,
-            settings,
-            Audio::silent(&root),
-            None,
-        )
-        .unwrap();
-        let (client, _server) = horizon_protocol::connection::Pipe::pair();
-        game.connect_local(client, "RemovalTest").unwrap();
-        for (id, kind) in [
-            (40, "minecraft:falling_block"),
-            (41, "minecraft:falling_block"),
-            (42, "minecraft:falling_block"),
-            (43, "minecraft:tnt"),
-            (44, "minecraft:tnt"),
-            (45, "minecraft:experience_orb"),
-            (46, "minecraft:experience_orb"),
-            (47, "minecraft:zombie"),
-            (48, "minecraft:zombie"),
-        ] {
-            if matches!(kind, "minecraft:falling_block" | "minecraft:tnt") {
-                assert!(game.spawn_remote_projectile(
-                    id,
-                    kind,
-                    [0.0, 64.0, 0.0],
-                    (0.0, 0.0),
-                    [0.0; 3],
-                    0
-                ));
-            } else {
-                game.spawn_entity(id, kind, [0.0, 64.0, 0.0], [0.0; 3]);
-            }
-        }
-        for id in [49, 50] {
-            game.dropped.push(horizon_client::entities::ItemEntity::new(
-                id,
-                horizon_client::items::ItemStack::new("minecraft:sand", 1),
-                horizon_core::geometry::Vec3::new(0.0, 64.0, 0.0),
-                horizon_core::geometry::Vec3::ZERO,
-                0.0,
-            ));
-        }
-        game.handle_packet(C::RemoveEntities(play::RemoveEntities {
-            ids: vec![40, 42, 43, 45, 47, 49],
-        }))
-        .unwrap();
-        assert_eq!(game.falling.iter().map(|e| e.id).collect::<Vec<_>>(), [41]);
-        assert_eq!(game.tnts.iter().map(|e| e.id).collect::<Vec<_>>(), [44]);
-        assert_eq!(game.orbs.iter().map(|e| e.id).collect::<Vec<_>>(), [46]);
-        assert_eq!(game.mobs.iter().map(|e| e.id).collect::<Vec<_>>(), [48]);
-        assert_eq!(game.dropped.iter().map(|e| e.id).collect::<Vec<_>>(), [50]);
-    }
-}
@@ -168,7 +168,6 @@ impl Game<'_> {
            full_water_vision: self.settings.extras.pvp.tweaks.clear_water,
            night_vision: self.fog_night_vision(),
            environment: self.pack.polytone_colors.env,
-            fluid_fog: self.pack.polytone_colors.fluid_fog,
        };
        let mut fog = horizon_client::fog::setup_fog(tables, &self.fog, &input);
        if !self.settings.horizon.fog {
@@ -29,13 +29,12 @@ pub(super) struct RespawnConfig {
    pub dim: Dim,
    pub pos: [i32; 3],
    pub yaw: f32,
-    pub pitch: f32,
    pub forced: bool,
 }

 /// A respawn point as a player's save keeps it (`respawn`): dimension,
-/// block, yaw, pitch and whether it is forced.
-pub(super) type SavedRespawn = (String, [i32; 3], f32, f32, bool);
+/// block, yaw and whether it is forced.
+pub(super) type SavedRespawn = (String, [i32; 3], f32, bool);

 impl RespawnConfig {
    /// `RespawnData.of`: the yaw wrapped to [-180, 180).
@@ -44,37 +43,19 @@ impl RespawnConfig {
            dim,
            pos,
            yaw: wrap_degrees(f64::from(yaw)) as f32,
-            pitch: 0.0,
            forced,
        }
    }
-    /// `SetSpawnCommand`: the forced literal, with its already parsed angles.
-    pub(super) fn forced(dim: Dim, pos: [i32; 3], yaw: f32, pitch: f32) -> Self {
-        Self {
-            dim,
-            pos,
-            yaw,
-            pitch,
-            forced: true,
-        }
-    }
-    pub(super) fn from_saved((dim, pos, yaw, pitch, forced): &SavedRespawn) -> Self {
+    pub(super) fn from_saved((dim, pos, yaw, forced): &SavedRespawn) -> Self {
        Self {
            dim: Dim::from_id(dim),
            pos: *pos,
            yaw: *yaw,
-            pitch: *pitch,
            forced: *forced,
        }
    }
    pub(super) fn saved(&self) -> SavedRespawn {
-        (
-            self.dim.id().to_owned(),
-            self.pos,
-            self.yaw,
-            self.pitch,
-            self.forced,
-        )
+        (self.dim.id().to_owned(), self.pos, self.yaw, self.forced)
    }
 }

@@ -199,7 +180,6 @@ impl Game<'_> {
            dim: self.dim,
            pos,
            yaw: 0.0,
-            pitch: 0.0,
            forced: false,
        };
        // RespawnConfig.isSamePosition: dimension and block.
@@ -498,14 +478,14 @@ impl Game<'_> {
        rule.can_set_spawn.test(self.dark_outside())
    }
    /// `ServerPlayer.findRespawnAndUseSpawnBlock` for a config in the loaded
-    /// dimension: position and angles, using an anchor's charge; a bed's
+    /// dimension: the position and yaw, using an anchor's charge; a bed's
    /// stand-up spot. A forced point (`spawnpoint`) that is no anchor or bed
    /// holds if a player fits in it; anything else is gone.
    pub(super) fn find_respawn_and_use(
        &mut self,
        c: RespawnConfig,
        consume: bool,
-    ) -> Result<Option<(Vec3, f32, f32)>> {
+    ) -> Result<Option<(Vec3, f32)>> {
        let state = self.world.block(c.pos[0], c.pos[1], c.pos[2]);
        if !(self.is_anchor(state)
            && (c.forced || self.anchor_charges(state) > 0)
@@ -515,7 +495,7 @@ impl Game<'_> {
            if self.is_bed(state) && self.bed_sets_spawn(state) {
                let facing = self.bed_forward(state);
                let stand = self.bed_stand_up(c.pos, facing, c.yaw);
-                return Ok(stand.map(|p| (p, look_at_yaw(p, c.pos), 0.0)));
+                return Ok(stand.map(|p| (p, look_at_yaw(p, c.pos))));
            }
            let [x, y, z] = c.pos;
            let free = c.forced
@@ -523,7 +503,7 @@ impl Game<'_> {
                && self.possible_to_respawn_in(state)
                && self.possible_to_respawn_in(self.world.block(x, y + 1, z));
            let at = Vec3::new(f64::from(x) + 0.5, f64::from(y) + 0.1, f64::from(z) + 0.5);
-            return Ok(free.then_some((at, c.yaw, c.pitch)));
+            return Ok(free.then_some((at, c.yaw)));
        }
        let stand = self.anchor_stand_up(c.pos);
        if !c.forced
@@ -533,7 +513,7 @@ impl Game<'_> {
        {
            self.level_set(c.pos, next)?;
        }
-        Ok(stand.map(|p| (p, look_at_yaw(p, c.pos), 0.0)))
+        Ok(stand.map(|p| (p, look_at_yaw(p, c.pos))))
    }
 }

@@ -580,354 +560,3 @@ mod tests {
        assert!((look_at_yaw(east, head) - 90.0).abs() < 1.0e-4);
    }
 }
-
-#[cfg(test)]
-mod connected_spawnpoint_rotation_tests {
-    use crate::game::{Game, lan::LanSettings};
-    use horizon_client::{
-        chunk::Chunk,
-        lan::{Joined, NetConfig, Out, PlayerSender, guest::Guest, hub::HubConfig, playerdata},
-    };
-    use horizon_protocol::packets::{
-        configuration::ClientInformation,
-        play::{self, Clientbound as C, Serverbound as S},
-    };
-    use std::sync::{Arc, atomic::AtomicI32, mpsc};
-
-    fn command(game: &mut Game<'_>, text: &str) {
-        game.chat_capture = Some(Vec::new());
-        game.ui.registries.permission = 4;
-        let dispatcher = horizon_client::command::vanilla::build_for(false, true);
-        let parsed = dispatcher.parse(text, &game.ui.registries);
-        let (ctx, _) = parsed
-            .executable()
-            .expect("actual registered dedicated command");
-        let (root, ctx) = (parsed.context.clone(), ctx.clone());
-        assert_eq!(game.run_chain(&root, &ctx).unwrap(), 1, "{text}");
-        assert!(
-            !game.chat_capture.take().unwrap().is_empty(),
-            "actual command feedback {text}"
-        );
-    }
-
-    #[test]
-    #[ignore = "prepared resources and isolated scratch homes/cwd"]
-    fn command_forced_free_point_survives_real_guest_death_and_respawn_packet() {
-        let mut game = crate::game::native_machines::tests::server_game();
-        game.set_allow_commands(true);
-        let scratch = std::env::temp_dir().join(format!(
-            "horizon-forced-spawn-{}-{}",
-            std::process::id(),
-            std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .unwrap()
-                .as_nanos()
-        ));
-        std::fs::create_dir_all(&scratch).unwrap();
-        game.world_root = scratch.clone();
-        // Fixture setup through the existing column insertion API; admit every lit column below.
-        for x in -2..=2 {
-            for z in -2..=2 {
-                game.streaming
-                    .insert_remote(&mut game.world, Chunk::empty(x, z));
-                assert!(game.streaming.is_lit(x, z));
-            }
-        }
-        let stone = game
-            .pack
-            .assets
-            .registry
-            .default_state("minecraft:stone")
-            .unwrap();
-        let air = game
-            .pack
-            .assets
-            .registry
-            .default_state("minecraft:air")
-            .unwrap();
-        game.world.set(12, 99, 12, stone).unwrap();
-        for y in [100, 101] {
-            game.world.set(12, y, 12, air).unwrap();
-        }
-        assert_eq!(game.world.block(12, 99, 12), stone);
-        assert!(game.world.loaded(12, 12));
-        game.level.world_spawn = Some([4, 100, 4]);
-        game.level.world_spawn_angle = [-30.0, -5.0];
-        game.lan_host(
-            LanSettings {
-                port: 0,
-                guest_commands: true,
-                force_game_mode: false,
-            },
-            NetConfig {
-                listen: false,
-                announce: false,
-                ..NetConfig::loopback(0, String::new(), 2)
-            },
-            HubConfig {
-                default_game_mode: 0,
-                guest_commands: true,
-                force_game_mode: false,
-                hardcore: false,
-                view_distance: 2,
-                simulation_distance: 2,
-                dimension: "minecraft:overworld".into(),
-                allow_flight: false,
-                seed: 0,
-                max_players: 2,
-                integrated: false,
-                levels: Default::default(),
-            },
-        )
-        .unwrap();
-        let (tx, rx) = mpsc::channel();
-        let mut guest = Guest::new(
-            Joined {
-                conn: 7,
-                uuid: 77,
-                name: "Alice".into(),
-                properties: Vec::new(),
-                info: ClientInformation::new(2),
-                brand: "test".into(),
-                sender: PlayerSender::new(tx, Arc::default()),
-                latency: Arc::new(AtomicI32::new(0)),
-                address: "127.0.0.1:7".parse().unwrap(),
-                expected: false,
-                configured: Default::default(),
-            },
-            7,
-            [4.5, 100.0, 4.5],
-            2,
-        );
-        guest.dimension = "minecraft:overworld".into();
-        guest.placed = true;
-        guest.loaded = true;
-        guest.health = 20.0;
-        guest.game_mode = 0;
-        guest.yaw = 0.0;
-        guest.pitch = 0.0;
-        game.lan.as_mut().unwrap().hub.guests.push(guest);
-        let clock = game.world.game_time;
-        command(&mut game, "spawnpoint Alice 12 100 12 45 10");
-        let host = game.lan.as_ref().unwrap();
-        assert!(host.owner.is_none());
-        let guest = &host.hub.guests[0];
-        assert_eq!(
-            (guest.uuid, guest.health, guest.game_mode, guest.position),
-            (77, 20.0, 0, [4.5, 100.0, 4.5])
-        );
-        let tag = playerdata::player_tag(guest);
-        let respawn = tag
-            .get("respawn")
-            .expect("actual serialized personal configuration")
-            .clone();
-        assert_eq!(
-            respawn.get("yaw"),
-            Some(&horizon_world::nbt::Tag::Float(45f32.to_bits()))
-        );
-        assert_eq!(
-            respawn.get("pos"),
-            Some(&horizon_world::nbt::Tag::IntArray(vec![12, 100, 12]))
-        );
-        command(&mut game, "kill Alice");
-        game.tick_lan(false);
-        let mut host = game.lan.take().unwrap();
-        assert_eq!(host.hub.guests[0].uuid, 77);
-        assert_eq!(host.hub.guests[0].health, 0.0);
-        assert!(
-            host.hub.guests[0].dead,
-            "actual command death before request"
-        );
-        for _ in rx.try_iter() {}
-        game.lan_guest_packet(
-            &mut host,
-            7,
-            S::ClientCommand(play::ClientCommand { action: 0 }),
-        );
-        game.tick_server_travel(&mut host);
-        assert!(
-            !game.on_server_trip(7),
-            "admitted lit columns permit actual arrival"
-        );
-        let guest = &host.hub.guests[0];
-        assert_eq!(guest.uuid, 77);
-        assert_eq!(guest.health, 20.0);
-        assert!(!guest.dead);
-        assert_eq!(guest.position, [12.5, 100.1, 12.5]);
-        assert_eq!(game.level.world_spawn, Some([4, 100, 4]));
-        assert_eq!(game.level.world_spawn_angle, [-30.0, -5.0]);
-        assert_eq!(game.world.game_time, clock);
-        let physical = [guest.yaw.to_bits(), guest.pitch.to_bits()];
-        let awaiting_id = guest
-            .awaiting_teleport
-            .expect("actual final arrival awaits its acknowledgement")
-            .0;
-        let mut packets = Vec::new();
-        for out in rx.try_iter() {
-            match out {
-                Out::Packet(p) => packets.push(p),
-                Out::Packets(p) => packets.extend(p),
-                Out::Disconnect(_) => panic!("unexpected disconnect"),
-            }
-        }
-        let mut positions = Vec::new();
-        let mut respawns = 0;
-        for p in packets {
-            println!("complete actual Hub frame {p:?}");
-            let mut r = horizon_protocol::buf::Reader::new(&p);
-            let id = r.varint().unwrap();
-            match C::decode(id, r.rest()).unwrap() {
-                C::PlayerPosition(p) => positions.push(p),
-                C::Respawn(_) => respawns += 1,
-                _ => {}
-            }
-        }
-        assert_eq!(respawns, 1);
-        assert!(!positions.is_empty());
-        println!("all actual arrival positions {positions:?}");
-        let selected: Vec<_> = positions
-            .iter()
-            .filter(|p| p.teleport == awaiting_id)
-            .collect();
-        assert_eq!(
-            selected.len(),
-            1,
-            "select by actual authoritative pending id, never expected position/pitch"
-        );
-        let p = selected[0];
-        assert_eq!(p.position, [12.5, 100.1, 12.5]);
-        // All successful command/death/arrival/identity/world controls precede the intended regression.
-        assert_eq!(
-            (
-                respawn.get("pitch"),
-                physical,
-                [p.yaw.to_bits(), p.pitch.to_bits()]
-            ),
-            (
-                Some(&horizon_world::nbt::Tag::Float(10f32.to_bits())),
-                [45f32.to_bits(), 10f32.to_bits()],
-                [45f32.to_bits(), 10f32.to_bits()]
-            )
-        );
-        drop(host);
-        drop(game);
-        std::fs::remove_dir_all(scratch).unwrap();
-    }
-}
-
-#[cfg(test)]
-mod pitch_preservation_controls {
-    use super::*;
-
-    #[test]
-    fn wrapped_existing_callers_default_to_positive_zero_pitch() {
-        let c = RespawnConfig::wrapped(Dim::Overworld, [5, 100, 5], 45.0, false);
-        assert_eq!(c.yaw.to_bits(), 45f32.to_bits());
-        assert_eq!(c.pitch.to_bits(), 0.0f32.to_bits());
-        assert!(!c.forced);
-    }
-
-    /// Added source/model controls; these do not add a connected bed/anchor runtime claim.
-    #[test]
-    #[ignore = "prepared resources and isolated scratch homes/cwd"]
-    fn bed_anchor_facing_and_invalid_personal_fallback_ignore_stored_pitch() {
-        let mut game = crate::game::native_machines::tests::server_game();
-        let stone = game
-            .pack
-            .assets
-            .registry
-            .default_state("minecraft:stone")
-            .unwrap();
-        for x in 0..16 {
-            for z in 0..16 {
-                game.world.set(x, 99, z, stone).unwrap();
-            }
-        }
-        let state = |game: &Game<'_>, name: &str, properties: &[(&str, &str)]| {
-            let registry = game.pack.assets.registry;
-            let id = registry.default_state(name).unwrap();
-            let mut value = registry.state(id).unwrap().clone();
-            for (key, value_) in properties {
-                value.properties.insert((*key).into(), (*value_).into());
-            }
-            registry.resolve(&value).unwrap()
-        };
-        let head = state(
-            &game,
-            "minecraft:red_bed",
-            &[("facing", "north"), ("part", "head")],
-        );
-        let foot = state(
-            &game,
-            "minecraft:red_bed",
-            &[("facing", "north"), ("part", "foot")],
-        );
-        game.world.set(5, 100, 5, head).unwrap();
-        game.world.set(5, 100, 6, foot).unwrap();
-        assert!(game.is_bed(head) && game.bed_sets_spawn(head));
-        let bed = RespawnConfig {
-            dim: Dim::Overworld,
-            pos: [5, 100, 5],
-            yaw: 45.0,
-            pitch: 0.0,
-            forced: true,
-        };
-        let zero = game
-            .find_respawn_and_use(bed, false)
-            .unwrap()
-            .expect("valid bed geometry");
-        let stored = game
-            .find_respawn_and_use(RespawnConfig { pitch: 75.0, ..bed }, false)
-            .unwrap()
-            .unwrap();
-        assert_eq!(stored, zero);
-        assert_eq!(stored.2.to_bits(), 0.0f32.to_bits());
-        assert_eq!(stored.1.to_bits(), look_at_yaw(stored.0, bed.pos).to_bits());
-
-        // Existing built-in dimension facts select the anchor rule; no new world or actor API.
-        game.dim = Dim::Nether;
-        let anchor = state(&game, "minecraft:respawn_anchor", &[("charges", "2")]);
-        game.world.set(10, 100, 10, anchor).unwrap();
-        assert!(game.anchor_works() && game.is_anchor(anchor));
-        let c = RespawnConfig {
-            dim: Dim::Nether,
-            pos: [10, 100, 10],
-            yaw: 45.0,
-            pitch: 0.0,
-            forced: true,
-        };
-        let zero = game
-            .find_respawn_and_use(c, false)
-            .unwrap()
-            .expect("valid anchor geometry");
-        let stored = game
-            .find_respawn_and_use(RespawnConfig { pitch: 75.0, ..c }, true)
-            .unwrap()
-            .unwrap();
-        assert_eq!(stored, zero);
-        assert_eq!(stored.2.to_bits(), 0.0f32.to_bits());
-        assert_eq!(stored.1.to_bits(), look_at_yaw(stored.0, c.pos).to_bits());
-        assert_eq!(
-            game.world.block(10, 100, 10),
-            anchor,
-            "existing forced-charge behavior"
-        );
-
-        game.dim = Dim::Overworld;
-        game.level.world_spawn = Some([4, 100, 4]);
-        game.level.world_spawn_angle = [-30.0, -5.0];
-        game.world.set(12, 100, 12, stone).unwrap();
-        let invalid = RespawnConfig {
-            dim: Dim::Overworld,
-            pos: [12, 100, 12],
-            yaw: 45.0,
-            pitch: 10.0,
-            forced: true,
-        };
-        game.respawn_config = Some(invalid);
-        assert!(game.resolve_server_respawn(invalid).is_none());
-        assert!(game.respawn_config.is_none());
-        assert_eq!(game.level.world_spawn, Some([4, 100, 4]));
-        assert_eq!(game.level.world_spawn_angle, [-30.0, -5.0]);
-    }
-}
@@ -644,14 +644,11 @@ impl Game<'_> {
    /// in the level in place: where it stands up, facing the anchor (with
    /// the deplete sound) or the bed; else the point is forgotten, and the
    /// caller tells the player (`Hub::missing_respawn_block`).
-    pub(super) fn resolve_server_respawn(
-        &mut self,
-        config: RespawnConfig,
-    ) -> Option<(Vec3, f32, f32)> {
+    pub(super) fn resolve_server_respawn(&mut self, config: RespawnConfig) -> Option<(Vec3, f32)> {
        let [x, y, z] = config.pos;
        let anchor = self.is_anchor(self.world.block(x, y, z));
        match self.find_respawn_and_use(config, true) {
-            Ok(Some((at, yaw, pitch))) => {
+            Ok(Some((at, yaw))) => {
                if !config.forced && anchor {
                    let [x, y, z] = config.pos.map(f64::from);
                    self.audio.play(
@@ -661,7 +658,7 @@ impl Game<'_> {
                        1.0,
                    );
                }
-                Some((at, yaw, pitch))
+                Some((at, yaw))
            }
            Ok(None) | Err(_) => {
                let mut cancel = false;
@@ -799,10 +796,7 @@ impl Game<'_> {
            let yaw = host.hub.guests[i].yaw;
            let (position, yaw) = if let Some(config) = trip.respawn {
                match self.as_guest(host, trip.conn, |g| g.resolve_server_respawn(config)) {
-                    Some(Some((at, yaw, pitch))) => {
-                        host.hub.guests[i].pitch = pitch;
-                        (at, yaw)
-                    }
+                    Some(Some(found)) => found,
                    _ => {
                        host.hub.missing_respawn_block(trip.conn);
                        self.respawn_at_world_spawn(host, trip.conn);
@@ -261,8 +261,6 @@ impl<'a> Split<'a> {
                .get(i.wrapping_sub(1))
                .map(|g| g.options.clone()),
        );
-        let seat = self.guests.get(i.wrapping_sub(1)).map_or(1, |g| g.seat);
-        horizon_hooks::engine::set_seat(seat - 1);
        self.turn = i;
    }

@@ -126,7 +126,6 @@ impl Split<'_> {
        // Until it has a profile, a scratch options file: never P1's.
        let options = Self::folder()?.join(".joining/options.txt");
        OPTIONS.set(Some(options.clone()));
-        horizon_hooks::engine::set_seat(seat - 1);
        let mut settings = self.host.settings.clone();
        if pad.is_some() {
            // The Controller setting is P1's own: a player who pressed a pad to join plays
@@ -136,7 +135,6 @@ impl Split<'_> {
        }
        let game = self.start_guest(seat, &options, settings);
        OPTIONS.set(None);
-        horizon_hooks::engine::set_seat(0);
        let mut game = game?;
        if let Some(pad) = pad {
            // The press that joined it doesn't act in its game.
@@ -301,31 +299,16 @@ impl Split<'_> {
        }
        let profile = profiles.join(&name);
        let options = profile.join("options.txt");
-        let made = if options.exists() {
-            None
+        let mut settings = if options.exists() {
+            horizon_client::settings::Settings::load(&options)
        } else {
            std::fs::create_dir_all(&profile)?;
            let mut new = self.host.settings.clone();
            // The Controller setting is P1's, as on the profile page (`join`).
            new.controller.enabled |= self.guests[i].pad.is_some();
-            // On P1's seat, so the crates' settings stores write P1's values too.
-            let turn = horizon_hooks::seat();
-            horizon_hooks::engine::set_seat(0);
            new.save(&options);
-            horizon_hooks::engine::set_seat(turn);
-            Some(new)
+            new
        };
-        // The crates' stores load into the guest's seat, before its turn starts below.
-        let turn = horizon_hooks::seat();
-        horizon_hooks::engine::set_seat(self.guests[i].seat - 1);
-        let mut settings = match made {
-            Some(new) => {
-                horizon_client::settings::Settings::load_stores(&options);
-                new
-            }
-            None => horizon_client::settings::Settings::load(&options),
-        };
-        horizon_hooks::engine::set_seat(turn);
        // A profile an earlier join saved with P1's off, or the player's pad would be dead.
        settings.controller.enabled |= self.guests[i].pad.is_some();
        // P1's own world through memory (`Ok`), else P1's server over the network (`Err`).
@@ -1268,7 +1268,7 @@ impl Loading {
            let output = self
                .renderer
                .as_ref()
-                .map_or(Default::default(), |r| r.output());
+                .map_or(Default::default(), |r| *r.output());
            self.menu
                .options
                .draw(&self.settings, output, batch, &gui.atlas, self.menu.cursor);
@@ -173,10 +173,10 @@ pub struct Guest {
    /// Where the player respawns (a bed's spot; `ServerPlayer.respawnConfig`),
    /// None for the world spawn.
    pub spawn: Option<[f64; 3]>,
-    /// A block-resolved personal respawn point: its dimension, block, yaw,
-    /// pitch and whether it is forced, as the player's save keeps it
-    /// (`respawn`).
-    pub respawn_elsewhere: Option<(String, [i32; 3], f32, f32, bool)>,
+    /// A respawn point outside the Overworld (a respawn anchor, or one
+    /// `spawnpoint` set there): its dimension, block, yaw and whether it is
+    /// forced, as the player's save keeps it (`respawn`).
+    pub respawn_elsewhere: Option<(String, [i32; 3], f32, bool)>,
    /// Pending ClientboundPlayerPositionPacket id; movement is ignored until
    /// the client accepts it (ServerGamePacketListenerImpl.awaitingPositionFromClient).
    pub awaiting_teleport: Option<(i32, [f64; 3])>,
@@ -343,7 +343,7 @@ struct Kept {
    effects: Option<crate::effects::PlayerEffects>,
    game_mode: Option<(i32, bool, f32)>,
    position: Option<([f64; 3], [f64; 3], f32, f32, f32, bool, Option<[i32; 4]>)>,
-    spawn: Option<(Option<[f64; 3]>, Option<(String, [i32; 3], f32, f32, bool)>)>,
+    spawn: Option<(Option<[f64; 3]>, Option<(String, [i32; 3], f32, bool)>)>,
    recipes: Option<crate::recipe_book::Settings>,
    /// The body's values: its fall goes with the position, its air and fire with the
    /// health.
@@ -21,12 +21,7 @@ use horizon_core::{
    random::RandomSource,
 };
 use serde_json::Value;
-use std::{
-    borrow::{Borrow, Cow},
-    collections::HashMap,
-    fs,
-    path::Path,
-};
+use std::{borrow::Cow, collections::HashMap, fs, path::Path};

 pub use crate::biome::{SpawnCost, parse_costs, parse_entries};

@@ -884,17 +879,13 @@ impl SpawnState {
    /// `NaturalSpawner.createState`: every non-persistent entity of a
    /// spawning category in a loaded chunk adds its biome's spawn charge, its
    /// category count and (for mobs) the local caps of the players near it.
-    pub fn new<'a, L: NaturalLevel, I>(
+    pub fn new<L: NaturalLevel>(
        l: &L,
        spawnable_chunks: i32,
        players: Vec<SpawnPlayer>,
-        entities: I,
+        entities: &[Counted],
        chunk_loaded: impl Fn(i32, i32) -> bool,
-    ) -> Self
-    where
-        I: IntoIterator,
-        I::Item: std::borrow::Borrow<Counted<'a>>,
-    {
+    ) -> Self {
        let mut state = Self {
            spawnable_chunks,
            counts: [0; 8],
@@ -907,7 +898,6 @@ impl SpawnState {
            last_checked: None,
        };
        for e in entities {
-            let e = e.borrow();
            if e.is_mob && e.persistent || e.category == Category::Misc {
                continue;
            }
@@ -925,10 +915,6 @@ impl SpawnState {
        }
        state
    }
-    /// Reclaims the player buffer for reuse across passes.
-    pub fn into_players(self) -> Vec<SpawnPlayer> {
-        self.players
-    }
    fn add_charge(&mut self, pos: [i32; 3], charge: f64) {
        if charge != 0.0 {
            self.charges.push((pos, charge));
@@ -13,8 +13,6 @@
 //! game rules) is kept from the loaded files and written back unchanged.
 //! Worlds saved by older Horizon builds (`region/`, `DIM-1/`, `Player` in
 //! `level.dat`) are migrated on open.
-mod respawn;
-
 use crate::{
    Result,
    beehive::BeehiveExt,
@@ -3947,8 +3945,8 @@ pub struct Level {
    pub spawn: Option<[f64; 3]>,
    /// A respawn point resolved through its block when the player respawns
    /// (a bed, a respawn anchor, a forced point in any dimension):
-    /// dimension, block, yaw, pitch and `forced`.
-    pub respawn_elsewhere: Option<(String, [i32; 3], f32, f32, bool)>,
+    /// dimension, block, yaw and `forced`.
+    pub respawn_elsewhere: Option<(String, [i32; 3], f32, bool)>,
    pub position: Option<[f64; 3]>,
    pub rotation: [f32; 2],
    pub health: f32,
@@ -4294,8 +4292,20 @@ impl Level {
        if let Some(d) = text(p.get("Dimension")) {
            self.dimension = d;
        }
-        if let Some(respawn) = respawn::read(p) {
-            self.respawn_elsewhere = Some(respawn);
+        if let Some(respawn) = p.get("respawn")
+            && let Some(Tag::IntArray(pos)) = respawn.get("pos")
+            && pos.len() == 3
+        {
+            let dimension =
+                text(respawn.get("dimension")).unwrap_or_else(|| "minecraft:overworld".into());
+            let forced = number(respawn.get("forced")).is_some_and(|v| v != 0);
+            // Forced points, including Overworld ones, are validated through
+            // their blocks on death, just like beds and respawn anchors.
+            let yaw = match respawn.get("yaw") {
+                Some(Tag::Float(b)) => f32::from_bits(*b),
+                _ => 0.0,
+            };
+            self.respawn_elsewhere = Some((dimension, [pos[0], pos[1], pos[2]], yaw, forced));
        }
        let mut inventory = Vec::new();
        let mut inventory_components = HashMap::new();
@@ -4526,8 +4536,17 @@ impl Level {
            ));
        }
        // A respawn point other than the world spawn: an anchor elsewhere, or a bed.
-        if let Some(saved) = &self.respawn_elsewhere {
-            entries.push(("respawn", respawn::write(saved)));
+        if let Some((dimension, block, yaw, forced)) = &self.respawn_elsewhere {
+            let mut respawn = vec![
+                ("dimension", string(dimension)),
+                ("pos", Tag::IntArray(block.to_vec())),
+                ("yaw", Tag::Float(yaw.to_bits())),
+                ("pitch", Tag::Float(0f32.to_bits())),
+            ];
+            if *forced {
+                respawn.push(("forced", Tag::Byte(1)));
+            }
+            entries.push(("respawn", Tag::compound(respawn)));
        } else if let Some(s) = self.spawn {
            let block = [
                s[0].floor() as i32,
@@ -7679,7 +7698,7 @@ mod tests {
        assert_eq!(back.spawn, Some([8.0, 64.0, 8.0]));
        assert_eq!(
            back.respawn_elsewhere,
-            Some(("minecraft:overworld".into(), [20, 70, 20], 0.0, 0.0, true))
+            Some(("minecraft:overworld".into(), [20, 70, 20], 0.0, true))
        );
        assert!(back.difficulty_locked);
        assert!(back.weather.raining);
@@ -7950,7 +7969,7 @@ mod tests {
        // A personal point coinciding with the world spawn must still keep
        // its forced flag and yaw, rather than turning into a world fallback.
        for pos in [[5, 64, 5], [0, 80, 0]] {
-            let point = ("minecraft:overworld".to_owned(), pos, 37.0, 0.0, true);
+            let point = ("minecraft:overworld".to_owned(), pos, 37.0, true);
            let level = Level {
                respawn_elsewhere: Some(point.clone()),
                ..Level::default()
@@ -1,104 +0,0 @@
-//! Personal respawn record leaves from Level, using its existing typed NBT rules.
-use super::{Tag, number, string, text};
-
-pub(super) fn read(p: &Tag) -> Option<(String, [i32; 3], f32, f32, bool)> {
-    let mut value = None;
-    if let Some(respawn) = p.get("respawn")
-        && let Some(Tag::IntArray(pos)) = respawn.get("pos")
-        && pos.len() == 3
-    {
-        let dimension =
-            text(respawn.get("dimension")).unwrap_or_else(|| "minecraft:overworld".into());
-        let forced = number(respawn.get("forced")).is_some_and(|v| v != 0);
-        // Forced points, including Overworld ones, are validated through
-        // their blocks on death, just like beds and respawn anchors.
-        let yaw = match respawn.get("yaw") {
-            Some(Tag::Float(b)) => f32::from_bits(*b),
-            _ => 0.0,
-        };
-        let pitch = match respawn.get("pitch") {
-            Some(Tag::Float(b)) => f32::from_bits(*b),
-            _ => 0.0,
-        };
-        value = Some((dimension, [pos[0], pos[1], pos[2]], yaw, pitch, forced));
-    }
-    value
-}
-
-pub(super) fn write(
-    (dimension, block, yaw, pitch, forced): &(String, [i32; 3], f32, f32, bool),
-) -> Tag {
-    let mut respawn = vec![
-        ("dimension", string(dimension)),
-        ("pos", Tag::IntArray(block.to_vec())),
-        ("yaw", Tag::Float(yaw.to_bits())),
-        ("pitch", Tag::Float(pitch.to_bits())),
-    ];
-    if *forced {
-        respawn.push(("forced", Tag::Byte(1)));
-    }
-    Tag::compound(respawn)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::super::{Level, read_dat, write_dat};
-    use super::*;
-
-    /// Added model control: old records without pitch retain the existing positive-zero default.
-    #[test]
-    fn personal_respawn_missing_pitch_loads_positive_zero() {
-        let tag = Tag::compound(vec![(
-            "respawn",
-            Tag::compound(vec![
-                ("dimension", string("minecraft:overworld")),
-                ("pos", Tag::IntArray(vec![12, 100, 12])),
-                ("yaw", Tag::Float(45f32.to_bits())),
-                ("forced", Tag::Byte(1)),
-            ]),
-        )]);
-        let mut level = Level::default();
-        level.read_player(&tag);
-        let (_, pos, yaw, pitch, forced) = level.respawn_elsewhere.unwrap();
-        assert_eq!(pos, [12, 100, 12]);
-        assert_eq!(yaw.to_bits(), 45f32.to_bits());
-        assert_eq!(pitch.to_bits(), 0.0f32.to_bits());
-        assert!(forced);
-    }
-
-    /// Added model/I/O control, separate from the connected runtime proof.
-    #[test]
-    fn personal_respawn_nonzero_pitch_survives_actual_player_file_write_and_read() {
-        let root = std::env::temp_dir().join(format!(
-            "horizon-personal-pitch-{}-{}",
-            std::process::id(),
-            std::time::SystemTime::now()
-                .duration_since(std::time::UNIX_EPOCH)
-                .unwrap()
-                .as_nanos()
-        ));
-        std::fs::create_dir_all(&root).unwrap();
-        let file = root.join("player.dat");
-        let original = Level {
-            respawn_elsewhere: Some((
-                "minecraft:overworld".into(),
-                [12, 100, 12],
-                45.0,
-                10.0,
-                true,
-            )),
-            ..Level::default()
-        };
-        write_dat(&file, original.player_tag()).unwrap();
-        let tag = read_dat(&file).expect("actual written NBT player file");
-        assert_eq!(
-            tag.get("respawn").unwrap().get("pitch"),
-            Some(&Tag::Float(10f32.to_bits()))
-        );
-        let mut loaded = Level::default();
-        loaded.read_player(&tag);
-        assert_eq!(loaded.respawn_elsewhere, original.respawn_elsewhere);
-        println!("actual saved personal respawn {:?}", tag.get("respawn"));
-        std::fs::remove_dir_all(root).unwrap();
-    }
-}
@@ -24,7 +24,6 @@ pub mod settings;
 pub mod tunnel;

 use registry::Registry;
-use std::cell::Cell;
 use std::sync::atomic::{AtomicBool, Ordering};

 /// What a crate above the engine hears from the game. Every method has an empty default:
@@ -90,27 +89,10 @@ fn all() -> &'static [&'static dyn Hooks] {
    HOOKS.all()
 }

-thread_local! {
-    static SEAT: Cell<usize> = const { Cell::new(0) };
-}
-
-/// The splitscreen player whose turn it is: 0 for P1 (and without splitscreen), 1 for P2...
-/// Splitscreen players are one process, each `Game` in turn on the game's thread, so a crate's
-/// statics are shared by them: a crate that keeps per-player state (settings, pages, HUD) indexes
-/// it by this. A player keeps its seat while it plays. Other threads always see 0.
-pub fn seat() -> usize {
-    SEAT.get()
-}
-
 /// The engine's side: where it calls the hooks. Only the engine calls these.
 pub mod engine {
    use super::*;

-    /// The player whose turn starts on this thread ([`seat`]).
-    pub fn set_seat(seat: usize) {
-        SEAT.set(seat);
-    }
-
    /// Seals every list (hooks and the registries); their first use does it anyway. Call where
    /// registration ends.
    pub fn seal() {
@@ -46,7 +46,7 @@ pub use horizon_server_files as server_files;
 /// [`hooks::register`] it before the game starts (docs/layers.md, "How a Horizon crate plugs
 /// in"). The engine's dispatch side is not part of the API.
 pub mod hooks {
-    pub use horizon_hooks::{Hooks, Started, TooLate, register, seat, tunnel};
+    pub use horizon_hooks::{Hooks, Started, TooLate, register, tunnel};
 }

 /// The settings store (`horizon_hooks::settings`): a crate's own `key:value` lines in the game
@@ -50,111 +50,12 @@ pub enum BiomeColor {
    Colormap(String),
 }

-/// A fluid modifier's fog (`fluid_modifiers`): `fog_colormap` as a flat colour (RGB), and the
-/// `fog_radius` and `fog_fade` multipliers (1 is vanilla).
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct FluidFog {
-    pub color: Option<u32>,
-    pub radius: f32,
-    pub fade: f32,
-}
-
-/// The fog the packs' fluid modifiers give water and lava, read with the colours.
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
-pub struct FluidFogs {
-    pub water: Option<FluidFog>,
-    pub lava: Option<FluidFog>,
-}
-
-impl FluidFogs {
-    /// Every `assets/<namespace>/polytone/fluid_modifiers/**.json` under a pack overlay root that
-    /// sets a fog field and targets `minecraft:water` or `minecraft:lava` (still or flowing). A
-    /// colormap id or an expression isn't read (a warning names it).
-    pub fn read(root: &Path) -> Self {
-        let mut fogs = Self::default();
-        for namespace in std::fs::read_dir(root.join("assets"))
-            .into_iter()
-            .flatten()
-            .flatten()
-        {
-            let mut stack = vec![namespace.path().join("polytone/fluid_modifiers")];
-            while let Some(dir) = stack.pop() {
-                for entry in std::fs::read_dir(&dir).into_iter().flatten().flatten() {
-                    let path = entry.path();
-                    if path.is_dir() {
-                        stack.push(path);
-                    } else if path.extension().is_some_and(|e| e == "json") {
-                        fogs.add(root, &path);
-                    }
-                }
-            }
-        }
-        fogs
-    }
-
-    fn add(&mut self, root: &Path, path: &Path) {
-        let Ok(text) = std::fs::read_to_string(path) else {
-            return;
-        };
-        let Ok(json) = serde_json::from_str::<Json>(&text) else {
-            return;
-        };
-        let relative = path.strip_prefix(root).unwrap_or(path).to_string_lossy();
-        let number = |key: &str| match json.get(key) {
-            None => Some(1.0),
-            Some(Json::Number(n)) => n.as_f64().map(|v| v as f32),
-            Some(Json::String(s)) => s.trim().parse().ok().or_else(|| {
-                log::warn!("{relative}: {key} expressions aren't read yet");
-                None
-            }),
-            _ => None,
-        };
-        let color = match json.get("fog_colormap") {
-            None => None,
-            Some(value) => match parse_color(value) {
-                Some(c) => Some(c & 0xFF_FFFF),
-                None => {
-                    log::warn!("{relative}: only flat fog colours are read");
-                    None
-                }
-            },
-        };
-        let fog = FluidFog {
-            color,
-            radius: number("fog_radius").unwrap_or(1.0),
-            fade: number("fog_fade").unwrap_or(1.0),
-        };
-        if fog
-            == (FluidFog {
-                color: None,
-                radius: 1.0,
-                fade: 1.0,
-            })
-        {
-            return;
-        }
-        let implicit = crate::implicit_id(&relative, "fluid_modifiers");
-        let Ok(targets) = crate::Targets::parse(json.get("targets"), implicit.as_deref()) else {
-            return;
-        };
-        let aims = |id: &str| targets.matches(id, |_| false);
-        if aims("minecraft:water") || aims("minecraft:flowing_water") {
-            self.water = Some(fog);
-        }
-        if aims("minecraft:lava") || aims("minecraft:flowing_lava") {
-            self.lava = Some(fog);
-        }
-    }
-}
-
 /// Every pack's custom colours, by dotted key.
 #[derive(Clone, Debug, Default)]
 pub struct PackColors {
    entries: BTreeMap<String, Json>,
    /// [`Self::environment`], read once with the packs: the fog reads it every frame.
    pub env: Environment,
-    /// The packs' fluid modifiers' fog.
-    pub fluid_fog: FluidFogs,
 }

 impl PackColors {
@@ -182,7 +83,6 @@ impl PackColors {
            }
        }
        colors.env = colors.environment();
-        colors.fluid_fog = FluidFogs::read(root);
        colors
    }

@@ -476,31 +376,6 @@ mod tests {
        assert_eq!(c.biome_color("dry_foliage"), None);
    }

-    #[test]
-    fn fluid_modifiers_give_water_and_lava_their_fog() {
-        let root = std::env::temp_dir().join(format!("fluid-fog-{}", std::process::id()));
-        let dir = root.join("assets/minecraft/polytone/fluid_modifiers");
-        std::fs::create_dir_all(&dir).unwrap();
-        std::fs::write(
-            dir.join("water.json"),
-            r#"{"targets": ["minecraft:water", "minecraft:flowing_water"], "fog_colormap": "ff0000", "fog_radius": 0.3}"#,
-        )
-        .unwrap();
-        std::fs::write(dir.join("lava.json"), r#"{"fog_fade": "0"}"#).unwrap();
-        std::fs::write(dir.join("honey.json"), r#"{"colormap": "foliage_color"}"#).unwrap();
-        let fogs = FluidFogs::read(&root);
-        let fog = |color, radius, fade| {
-            Some(FluidFog {
-                color,
-                radius,
-                fade,
-            })
-        };
-        assert_eq!(fogs.water, fog(Some(0xff0000), 0.3, 1.0));
-        assert_eq!(fogs.lava, fog(None, 1.0, 0.0));
-        std::fs::remove_dir_all(&root).unwrap();
-    }
-
    #[test]
    fn dyes_name_their_colour_kind() {
        let mut c = PackColors::default();
@@ -49,7 +49,7 @@ Every setting applies at once, except worker threads, the graphics API and trans

 With `HORIZON_HDR_FRAME=float`, HDR on and no shader pack or a 0.2 one, devices with independent blending draw the frame in layers ([hdr-linear-light.md](design/hdr-linear-light.md), The HUD and menus). The world's shaders write their own light into the frame instead of a mark (`hdr_written`, `hdr_light.wgsl`), a whole frame at a time, so glass, water, clouds and particles each lay their own light over the light behind them. Improved Transparency's layers write their own light too, before they are weighted and composited. No float frame holds marks: under a 0.2 pack Horizon's own draws keep their colour, alpha 1 where opaque and coverage where blended, HDR output lifts nothing, and the pack's `[tonemap]` takes the tone curve's place below (one or the other runs, never both); without the HUD layer (HDR off, or a device without independent blending) its float frame finishes on the swapchain's 8 bits before the camera overlays, which then draw with the HUD as in SDR, and HDR output stays off. The camera overlays (vignette, pumpkin, powder snow, portal, nausea), post effects and entity outlines draw on light. After the post effects and before the camera overlays, the tone curve eases that light into the peak (`Hdr::tonemap`) in place of HDR lighting's own easing and the light sources' cap at the peak: up to 60% of the peak light stays as it is, and above it ITU-R BT.2390's EETF in PQ rolls it off, on its brightest channel so it keeps its hue. The HUD and menus then draw on an 8-bit target of their own, the world clipped to white, as they found the frame before (each draw clips at white as there), and write how much of the world they hide into an R8 coverage target. The last pass lays the HUD over the world's light by that coverage, in gamma as the HUD blends: light behind see-through HUD shows as vanilla weights the HUD over it, and none shows through what covers it. The menu blur blurs that picture, light above white included, and the menu draws over the result. UI Brightness scales the HUD's own part, not the world under it. A screenshot maps the world's light into SDR, unchanged up to 0.6 of paper white in linear light and smoothly rolled towards white above it, with one scale for all RGB channels to keep their hue (where Horizon lifts nothing, with HDR Lighting off or under a 0.2 pack, the world is clipped at white as SDR draws it); the HUD's own part stays as drawn, whatever UI Brightness is, over the mapped world by its coverage. The world's icon uses the same mapping without the HUD; the `-hdr.png` beside a screenshot keeps the whole HDR picture. `HORIZON_HDR_DEBUG=coverage` tints the coverage magenta for inspection.

-HDR also lights the world past paper white: surfaces at block or sky light levels 11 to 15 rise above it, up to 4 times for the strongest light, sky light by how a face meets the sun, easing into the peak from 60% of it so bright textures keep their detail. The frame's alpha between 0.76 and 1 carries it to the last pass, where it amounts to the lightmap going past 1. Darker light stays as in SDR. It's off while a shader pack runs. **HDR Lighting** (`hdrLighting`, on by default) is the whole of this lift: light sources, the sun and the lit surfaces above; off, HDR shows SDR's picture. Under a `shaders/` pack or a 0.2 one Horizon lifts nothing, so the row is greyed and says why; under a 0.1 pack it still lifts the light sources and the sun.
+HDR also lights the world past paper white: surfaces at block or sky light levels 11 to 15 rise above it, up to 4 times for the strongest light, sky light by how a face meets the sun, easing into the peak from 60% of it so bright textures keep their detail. The frame's alpha between 0.76 and 1 carries it to the last pass, where it amounts to the lightmap going past 1. Darker light stays as in SDR. It's off while a shader pack's post or material stage runs, and `HORIZON_HDR_LIGHTING=0` turns it off to compare.

 HDR's light sources shine by the kind of light rather than its level (`mesher::hdr_tier`): the sun most, then glowstone, campfires and the soul fires, then flames and lava, torch and candle flames among them (particles too), then faint glowers such as a redstone torch or magma; glow lichen stays as in SDR. Each tier has its share of the headroom and the brightness its lift starts and ends at, the texel's own before lighting, so a light source shines alike at any light level and on every face (`gfx/hdr.rs` `TIERS`); `HORIZON_HDR_DEBUG=1` greys what isn't lifted and tints what is magenta.