Merge remote-tracking branch 'origin/main' into mm1-1426

2026-11-09 17:19:15 -10:00 · 2026-10-23 20:38:10 +02:00 · 2026-10-23 20:21:26 +02:00
1210 changed files with 33587 additions and 52394 deletions
@@ -1,6 +0,0 @@
-# Generated files that tests compare byte for byte with what they generate: LF on every OS, also
-# where Git for Windows' core.autocrlf would check them out with CRLF.
-docs/launcher-commands.md text eol=lf
-docs/horizon-ctl-commands.md text eol=lf
-website/src/tokens.css text eol=lf
-docs/api/*-reference.md text eol=lf
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec python3 tools/check_public_tree.py --pre-push
+exec python3 tools/check_public_tree.py --history
@@ -61,8 +61,7 @@ jobs:
        if: steps.rust.outputs.required != 'false'
        run: |
          cargo +stable fmt --all -- --check
-          # With the game's code mods (on in every release build, off by default).
-          cargo +stable clippy --workspace --all-targets --features horizon-client/mods -- -D warnings
+          cargo +stable clippy --workspace --all-targets -- -D warnings
          # The server build (released as horizon-engine): the game without sound or controllers.
          cargo +stable clippy -p horizon-client --all-targets --no-default-features -- -D warnings
      # Libraries, binaries and integration tests, then doc tests: not the ~275 examples, which clippy above already
@@ -70,8 +69,8 @@ jobs:
      - name: Test Rust core and voxel kernel correctness
        if: steps.rust.outputs.required != 'false'
        run: |
-          cargo +stable test --workspace --lib --bins --tests --features horizon-client/mods,horizon-mods/pack
-          cargo +stable test --workspace --doc --features horizon-client/mods,horizon-mods/pack
+          cargo +stable test --workspace --lib --bins --tests
+          cargo +stable test --workspace --doc
  parity:
    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
    uses: ./.github/workflows/parity.yml
@@ -430,7 +429,7 @@ jobs:
        env:
          RUSTUP_TOOLCHAIN: stable
        run: python tools/test_float_log_parity.py
-  jfr-analysis:
+  portable-mod:
    if: github.event_name == 'workflow_dispatch'
    runs-on: [self-hosted, linux, horizon-game]
    steps:
@@ -442,7 +441,101 @@ jobs:
        with:
          distribution: temurin
          java-version: '25'
+      - name: Compile original mod and test metrics
+        run: python tools/build_mod.py
      - name: Verify streaming JFR analysis against the JDK exporter
        run: python tools/test_jfr.py
      - name: Verify ZGC pause and allocation event interpretation
        run: python tools/test_jfr.py --gc zgc
+      - name: Build pinned portable packs
+        run: python tools/build_pack.py
+      - name: Measure isolated worker pacing on this platform
+        run: python -c "from tools.build_mod import benchmark_workers; benchmark_workers()"
+      - name: Measure isolated debounce queue polling
+        run: python -c "from tools.build_mod import benchmark_debounce; benchmark_debounce()"
+      - name: Measure wakeable idle queue latency
+        run: python -c "from tools.build_mod import benchmark_idle; benchmark_idle()"
+      - name: Measure object allocations with compact headers off and on
+        run: python -c "from tools.build_mod import benchmark_headers; benchmark_headers()"
+      - name: Test pack integrity and comparisons
+        run: python -m unittest discover -s tests -v
+      - name: Start recommended OpenGL macOS clients and verify framebuffer readback
+        if: runner.os == 'macOS'
+        run: |
+          python tools/test_client_graphics.py --native-display
+          cp dist/client-graphics-smoke.json dist/client-graphics-macos-title.json
+          python tools/test_client_graphics.py --native-display --world
+          cp dist/client-graphics-smoke.json dist/client-graphics-macos-world.json
+      - name: Compile the private dispatch fixture
+        run: python -c "from tools.build_mod import build_dispatch_fixture; build_dispatch_fixture()"
+      - name: Compile the private integrated-server graphics fixture
+        run: python -c "from tools.build_mod import build_integration_fixture; build_integration_fixture('server-graphics', 'dev.horizonlab.metrics.ServerGraphicsIntegration', fixture_dependencies={})"
+      - name: Compile the private tick-manager state fixture
+        run: python -c "from tools.build_mod import build_integration_fixture; build_integration_fixture('tick-state', 'dev.horizonlab.metrics.TickStateIntegration')"
+      - name: Compile the private terrain tick membership fixture
+        run: python -c "from tools.build_mod import build_tick_dedup_fixture; build_tick_dedup_fixture()"
+      - name: Compile the private culling whitelist fixture
+        run: python -c "from tools.build_mod import build_culling_empty_fixture; build_culling_empty_fixture()"
+      - name: Compile the private culling ray geometry fixture
+        run: python -c "from tools.build_mod import build_integration_fixture; build_integration_fixture('culling-rays', 'dev.horizonlab.dispatch.CullingRayIntegration', ['entityculling'], ['CullingRayAccess'])"
+      - name: Compile the private terrain position lookup fixture
+        run: python -c "from tools.build_mod import build_integration_fixture; build_integration_fixture('terrain-position', 'dev.horizonlab.dispatch.PositionIntegration')"
+      - name: Compile the private terrain quad reuse fixture
+        run: python -c "from tools.build_mod import build_integration_fixture; build_integration_fixture('quad-reuse', 'dev.horizonlab.dispatch.QuadReuseIntegration')"
+      - name: Compile the private object-size agent and terrain quad fixture
+        run: python -c "from tools.test_quad_sizes import build_agent; from tools.build_mod import build_integration_fixture; build_agent(); build_integration_fixture('quad-size', 'dev.horizonlab.dispatch.QuadSizeIntegration')"
+      - name: Compile the private terrain read shutdown fixture
+        run: python -c "from tools.build_mod import build_integration_fixture; build_integration_fixture('terrain-read', 'dev.horizonlab.dispatch.TerrainReadIntegration')"
+      - name: Install headless graphics libraries for applied-hook checks
+        if: runner.os == 'Linux'
+        run: sudo apt-get update && sudo apt-get install -y xvfb libgl1 libegl1 libvulkan1 mesa-vulkan-drivers libasound2t64 libxkbcommon0
+      - name: Verify integrated-server graphics report against the actual device
+        run: python tools/test_server_graphics.py ${{ runner.os == 'macOS' && '--native-display' || '' }}
+      - name: Exercise the applied dispatcher hooks and upstream rejection path
+        if: runner.os == 'Linux'
+        run: python tools/test_dispatch.py
+      - name: Verify applied tick membership transitions and allocation
+        if: runner.os == 'Linux'
+        run: python tools/test_tick_dedup.py
+      - name: Verify live culling whitelist registration and empty iteration
+        if: runner.os == 'Linux'
+        run: python tools/test_culling_empty.py
+      - name: Compare applied culling ray geometry and provider queries
+        if: runner.os == 'Linux'
+        run: python tools/test_culling_rays.py
+      - name: Verify actual full-data position lookup equivalence
+        if: runner.os == 'Linux'
+        run: python tools/test_terrain_position.py
+      - name: Verify actual terrain quad geometry and allocation
+        if: runner.os == 'Linux'
+        run: python tools/test_quad_reuse.py
+      - name: Measure actual builder and quad shallow sizes in both header modes
+        if: runner.os == 'Linux'
+        run: python tools/test_quad_sizes.py
+      - name: Verify interrupted DH reads and preserved shared futures
+        if: runner.os == 'Linux'
+        run: python tools/test_terrain_read.py
+      - name: Upload original mod and pack manifests only
+        uses: actions/upload-artifact@v4
+        with:
+          name: horizon-linux
+          path: |
+            dist/*.mrpack
+            dist/horizon-*.jar
+            dist/worker-pacing-benchmark.txt
+            dist/debounce-queue-benchmark.txt
+            dist/idle-queue-benchmark.txt
+            dist/object-header-benchmark.txt
+            dist/dispatch-integration.json
+            dist/tick-dedup-integration.json
+            dist/culling-empty-integration.json
+            dist/terrain-read-integration.json
+            dist/culling-rays-integration.json
+            dist/terrain-position-integration.json
+            dist/quad-reuse-integration.json
+            dist/quad-size-integration.json
+            dist/server-graphics-smoke.json
+            dist/client-graphics-smoke.json
+            dist/client-graphics-macos-title.json
+            dist/client-graphics-macos-world.json
+          retention-days: 3
@@ -1,34 +0,0 @@
-name: mod-registry
-# The submission service is its own workspace (crates/horizon-mod-registry), so the checks job doesn't build
-# it: this one does, when it or horizon-mods (the checks it shares with the launcher and the game) changes.
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'crates/horizon-mods/**'
-      - 'crates/horizon-mod-registry/**'
-      - '.github/workflows/mod-registry.yml'
-  pull_request:
-    paths:
-      - 'crates/horizon-mods/**'
-      - 'crates/horizon-mod-registry/**'
-      - '.github/workflows/mod-registry.yml'
-permissions:
-  contents: read
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    defaults:
-      run:
-        working-directory: crates/horizon-mod-registry
-    steps:
-      - uses: actions/checkout@v4
-      - run: rustup toolchain install stable --profile minimal --component rustfmt --component clippy
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: crates/horizon-mod-registry
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-      - run: cargo +stable fmt --check
-      - run: cargo +stable clippy --all-targets --locked -- -D warnings
-      - run: cargo +stable test --locked
@@ -1,8 +1,8 @@
 name: release
 # Automatic game releases (docs/release-flow.md). After every green `checks` run on main, every 10 minutes (so a
 # release waiting for merges to settle goes out without another merge) and by hand, tools/release_train.py decides:
-# a release when 5 pull requests merged since the last one changed what players run and the newest merged 5 minutes
-# ago, or when the oldest has waited 6 hours, or at once for a pull request labelled release-now.
+# a release when pull requests merged since the last one changed what players run and the newest merged 5 minutes
+# ago (the oldest 20 minutes ago, if merges never pause), or at once for a pull request labelled release-now.
 # RELEASES_PAUSED=1 (repository variable) stops them; so does an open issue labelled release-blocker, forced runs too.
 # Builds Linux (an older Ubuntu, so the binary runs on any recent distribution and on NixOS through nix-ld) and
 # Windows on GitHub, macOS on the Mac mini's runner (MAC_RUNNER=macos-latest sends it to GitHub), then
@@ -133,8 +133,7 @@ jobs:
        if: runner.os == 'Linux'
        run: sudo apt-get update && sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev
      - name: Build the client, horizon-ctl, horizon-prepare and horizon-server
-        # `horizon-client/mods`: every released game runs code mods (the feature is off in dev builds).
-        run: cargo build --release --locked --features horizon-client/mods -p horizon-client --bin horizon-client --bin horizon-ctl -p horizon-prepare --bin horizon-prepare -p horizon-server --bin horizon-server
+        run: cargo build --release --locked -p horizon-client --bin horizon-client --bin horizon-ctl -p horizon-prepare --bin horizon-prepare -p horizon-server --bin horizon-server
      - name: Every program the release folder takes was built
        run: |
          for binary in horizon-client horizon-ctl horizon-prepare horizon-server; do
@@ -256,9 +255,8 @@ jobs:
        run: |
          set -euo pipefail
          # After the client is packaged: target/release/horizon-client is rebuilt without the audio and
-          # controllers features, so it needs neither libasound nor libudev (minimal server images lack them),
-          # and with code mods like the client.
-          cargo build --release --locked -p horizon-client --no-default-features --features mods --bin horizon-client
+          # controllers features, so it needs neither libasound nor libudev (minimal server images lack them).
+          cargo build --release --locked -p horizon-client --no-default-features --bin horizon-client
          cargo run --locked -p xtask -- package-server target/release/horizon-client "dist/${{ matrix.server_dir }}"
          folder="dist/${{ matrix.server_dir }}"
          python3 tools/check_imports.py --server "$folder/horizon-engine" "$folder/horizon-server" "$folder/horizon-prepare"
@@ -367,15 +365,10 @@ jobs:
          TAG: ${{ needs.decide.outputs.tag }}
        run: |
          signature=(); [[ -f dist/SHA256SUMS.sig ]] && signature=(dist/SHA256SUMS.sig)
-          # The release and the latest at once: there is one channel (docs/release-flow.md). Each archive gets a
-          # label (file#label), which GitHub's page shows instead of the file name, so nobody takes the game's
-          # files for the download (#1647). Launchers, servers and install.sh match the name, which stays.
+          # The release and the latest at once: there is one channel (docs/release-flow.md).
          gh release create "$TAG" --target "${{ needs.decide.outputs.head }}" --title "$(cat notes/title.txt)" \
-            --notes-file notes/body.md --latest \
-            "dist/horizon-linux-x86_64.tar.gz#Game files the launcher installs: Linux (horizon-linux-x86_64.tar.gz)" \
-            "dist/horizon-windows-x64.zip#Game files the launcher installs: Windows (horizon-windows-x64.zip)" \
-            "dist/horizon-macos-arm64.zip#Game files the launcher installs: macOS (horizon-macos-arm64.zip)" \
-            "dist/horizon-server-linux-x86_64.tar.gz#Dedicated server for Linux (horizon-server-linux-x86_64.tar.gz)" \
+            --notes-file notes/body.md --latest dist/horizon-linux-x86_64.tar.gz \
+            dist/horizon-windows-x64.zip dist/horizon-macos-arm64.zip dist/horizon-server-linux-x86_64.tar.gz \
            dist/SHA256SUMS "${signature[@]}" dist/smoke-test.json
      - name: Dry run, the release that would be published
        if: needs.decide.outputs.dry_run == 'true'
@@ -12,20 +12,17 @@ Feature → files → harness for the most-changed areas: [docs/architecture.md]
  folders in `HORIZON_HOME` (the game's data), `HORIZON_LAUNCHER_HOME`, `XDG_DATA_HOME` and
  `XDG_CONFIG_HOME`, plus `HORIZON_LAUNCHER_NO_SELF_UPDATE=1` and `HORIZON_NO_AUDIO=1`. Never write to
  `~/.local/share/{applications,horizon,horizon-launcher}` or `~/.local/bin`.
- **Mark what an agent posts.** A PR body starts with a line naming whose agent opened it and with what.
-  Ludovic's agents write `> 🤖 Opened by Ludovic's AI agent (Claude), not by Ludovic himself.`, and a
-  contributor's agent names its own person and tool (issues: "Filed by", reviews: "Review by"). Every
-  comment starts with `🤖 Agent:`. Never write as Ludovic or as anyone else.
- **Attribution.** Commits end with a `Co-Authored-By:` line for the agent that wrote them, and PR bodies
-  with that agent's own "Generated with" line. Ludovic's agents use
-  `Co-Authored-By: Claude <model> <[email protected]>` and
-  `🤖 Generated with [Claude Code](https://claude.com/claude-code)`.
+- **Mark what an agent posts.** A PR body starts with
+  `> 🤖 Opened by Ludovic's AI agent (Claude), not by Ludovic himself.` (issues: "Filed by", reviews:
+  "Review by"); every comment starts with `🤖 Agent:`. Never write as Ludovic.
+- **Attribution.** Commits end with `Co-Authored-By: Claude <model> <[email protected]>`; PR bodies end
+  with `🤖 Generated with [Claude Code](https://claude.com/claude-code)`.
 - Everything players run is Rust. Python/Java only for dev tools and harness drivers in `tools/`.
 - Horizon-only features follow [docs/design-system.md](docs/design-system.md) and are off by default where
  they would change the vanilla look.
 - Small PRs (< ~500 lines). Labels: `feature` (players get something new), `skip-release` (they see no
-  change), none for a fix. Agents never add `release-now`: the maintainer decides it. Merges ship in batches of 5, or after
-  6 hours ([docs/release-flow.md](docs/release-flow.md)).
+  change), none for a fix. Agents never add `release-now`: the maintainer decides it. Every merge to main ships
+  ([docs/release-flow.md](docs/release-flow.md)).
 - Contributors first: `gh pr list --state open --search <area>` before you start; never duplicate theirs.

 ## Crates
@@ -43,13 +40,12 @@ Game workspace (root `Cargo.toml`); `launcher/` and `crates/horizon-telemetry-se
 | `horizon-server` | `horizon-server`: `server.toml`, CLI, supervisor of the headless game ([docs/hosting.md](docs/hosting.md)) |
 | `horizon-server-files` | `server.properties`, eula, ops/whitelist/bans, usercache |
 | `horizon-friends`, `horizon-relay` | Play with Friends: invite codes, encrypted tunnel, the relay ([docs/play-with-friends.md](docs/play-with-friends.md)) |
+| `horizon-shaderpack` | OptiFine/Iris packs: preprocessor, GLSL → WGSL ([docs/shader-packs.md](docs/shader-packs.md)) |
 | `horizon-mods`, `horizon-mod-sdk`, `cargo-horizon-mod` | Sandboxed WebAssembly mods: runtime, SDK + WIT, `cargo horizon-mod` ([docs/mods.md](docs/mods.md)) |
 | `horizon-port-pack` | Porting Java modpacks ([docs/modpacks.md](docs/modpacks.md)) |
-| `horizon-shader-api` | Horizon's own WGSL shader packs ([docs/api/shaders.md](docs/api/shaders.md)): `horizon-shaders.toml`, the `.hshader` package; shared by the game, the launcher and the registry |
-| `horizon-shaders` | Shader packs (the `shaders/` folder format), rebuilt clean-room from a written spec of the format; no wgpu |
 | `horizon-theme` | Design tokens and fonts for the launcher, the game's own menus and the website |
 | `horizon-telemetry`, `horizon-telemetry-server`, `horizon-bench` | Opt-in data collection, its ingest server, the benchmark report format |
-| `horizon-dualsense`, `horizon-threads`, `horizon-release-sign`, `horizon-bots`, `xtask` | DualSense output, thread priorities, signed release checksums, load-test bots, repo tasks |
+| `horizon-dualsense`, `horizon-threads`, `horizon-release-sign`, `horizon-bots`, `voxel-kernels`, `xtask` | DualSense output, thread priorities, signed release checksums, load-test bots, occupancy kernels, repo tasks |
 | `launcher/` | GPUI launcher: `main.rs` (UI), `backend.rs` (installs, updates), `cli.rs`, `mcp.rs`, `*_page.rs` |

 Other top-level folders: `tools/` (harnesses and dev scripts), `tests/` (Python unit tests: `python3 -m
@@ -127,6 +123,7 @@ python3 tools/agent_control_e2e.py         # horizon-ctl / MCP end to end
 | Input | game.rs `fn window_event`, `fn key_pressed`, `fn play_mouse`; L: `keybinds.rs`, `keymapping.rs`, `key_names.rs`, `mouse.rs`, `input.rs`, `interaction_input.rs`, `gamepad.rs`, `osk.rs`, `clipboard.rs`; G: `pad.rs`, `pad_menu.rs` |
 | Audio | L: `audio.rs` (mixer), `sound_engine.rs`, `sound_events.rs`, `music.rs`, `ambience.rs`; G: `music.rs`, `subtitle_hud.rs` |
 | Resource packs | L: `packs.rs` + `packs/`, `pack_screen.rs`, `atlas_sources.rs`, `sprites.rs`, `mipmap.rs`, `model_library.rs`, `font.rs`, `lang.rs`; crate `horizon-assets`; G: `packs.rs` |
+| Shader packs | L: `shader_pack.rs` (Horizon WGSL packs), `java_pack.rs` + crate `horizon-shaderpack` (Iris/OptiFine), `gfx/pack_stages.rs`, `gfx/java_stages.rs`; G: `shader_packs.rs` |
 | Agent control | L: `control.rs` (socket), `bin/horizon-ctl/`; G: `control.rs`, `agent.rs`, `events.rs`, `ui_control.rs` ([docs/agent-control.md](docs/agent-control.md)) |
 | Mods | crate `horizon-mods`; G: `mods.rs`; L: `mod_content.rs`, `mod_list.rs` |
 | Horizon extras, settings | L: `extras.rs`, `graphics.rs`, `settings.rs`, `minimap.rs`; G: `extras.rs`, `tweaks.rs`, `options.rs` |
@@ -151,19 +148,19 @@ python3 tools/agent_control_e2e.py         # horizon-ctl / MCP end to end

 ## The two single-player paths

-1. **Server thread (default since #1514):** `game/integrated.rs` runs a second `Game` (`serving`) on a
-   "Server thread" with one level per dimension; the window joins it as a client through memory (`remote`),
-   exactly as a LAN guest or a dedicated server's player does. This is what players run. Open
-   `[server-thread]` issues list the gaps left.
-2. **In-frame (`--in-frame`, `--no-server-thread` or `HORIZON_SERVER_THREAD=0`):** the window's `Game` ticks
-   the world itself, one level that follows the player (`fn enter_dimension`). Most harnesses test this path.
+1. **In-frame (default since #1428):** the window's `Game` ticks the world itself, one level that follows
+   the player (`fn enter_dimension`). This is what Stable players run and what harnesses test.
+2. **Server thread (`--server-thread` or `HORIZON_SERVER_THREAD=1`):** `game/integrated.rs` runs a second
+   `Game` (`serving`) on a "Server thread" with one level per dimension; the window joins it as a client
+   through memory (`remote`), exactly as a LAN guest or a dedicated server's player does. Not at parity yet:
+   open `[server-thread]` issues list the gaps.

 LAN guests and dedicated servers always use the server code, so a fix there serves both. Test both paths
 when you touch player-facing gameplay:

 ```sh
-cargo run --profile fast -p horizon-client -- --resources .local/horizon-client/26.3 --world T               # server thread
-cargo run --profile fast -p horizon-client -- --resources .local/horizon-client/26.3 --world T --in-frame    # in-frame
+cargo run --profile fast -p horizon-client -- --resources .local/horizon-client/26.3 --world T                   # in-frame
+cargo run --profile fast -p horizon-client -- --resources .local/horizon-client/26.3 --world T --server-thread   # server thread
 python3 tools/lan_e2e.py --check <name>                  # host in-frame, guest is a server client
 python3 tools/lan_e2e.py --server-thread --check <name>  # host on its server thread (portals, levels, distance, lava need it)
 python3 tools/parity.py dedicated_server server_entities server_player_damage
@@ -7,11 +7,6 @@ welcome on [Discord](https://discord.gg/HcTeMZxe5E).
 This repository holds the game, the launcher and the website, plus the tools, tests and docs that build, check and
 release them. Anything else (videos, Discord and other community material) lives elsewhere.

-**Where to start: [playhorizon.dev/hub](https://playhorizon.dev/hub).** It shows what is being done now and next
-([ROADMAP.md](ROADMAP.md) in the repository), the work board, good first tasks, and the forms to report a bug or
-suggest something. A pull request for a roadmap item carries its `roadmap:<id>` label; ideas go to the suggestion
-queue (the hub, or `/suggest` on Discord) rather than to issues, which are for bugs.
-
 ## Build it

 You need Rust (stable), Python 3.10+, JDK 25, and on Linux the ALSA and udev headers (`libasound2-dev libudev-dev`).
@@ -44,17 +39,6 @@ probe against Horizon, and compares their outputs. There are about 290 of them.

 Never commit game files, decompiled source or prepared resources (`.local/`): `tools/check_public_tree.py` rejects
 them (`git config core.hooksPath .githooks` runs it before every commit).
-The pre-push hook checks the full history reachable from the branches and tags being pushed. Run
-`python3 tools/check_public_tree.py --history` to audit the history of all local refs.
-
-## Only original code
-
-Horizon's code is written from Minecraft 26.3 itself and from public documentation, never from another mod, loader
-or renderer. Don't read, copy, translate or paraphrase the source of Iris, OptiFine, Sodium or any other project,
-and don't send code an AI tool wrote from it. Their user documentation and file formats are fine to read, and their
-packs and mods are fine to run and observe. Shader packs were removed on 24 October 2026 (#1561) because their code
-had been written from another project's source; they come back only as a clean-room rewrite from a written
-description of the pack format.

 ## Before asking for review

@@ -155,7 +155,7 @@ dependencies = [
 "objc2-foundation 0.3.2",
 "parking_lot",
 "percent-encoding",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 "wl-clipboard-rs",
 "x11rb",
 ]
@@ -178,6 +178,15 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"

+[[package]]
+name = "ascii-canvas"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1e3e699d84ab1b0911a1010c5c106aa34ae89aeac103be5ce0c3859db1e891"
+dependencies = [
+ "term",
+]
+
 [[package]]
 name = "ash"
 version = "0.38.0+1.3.281"
@@ -205,15 +214,30 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec 0.8.0",
+]
+
 [[package]]
 name = "bit-set"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2f926cc3060f09db9ebc5b52823d85268d24bb917e472c0c4bea35780a7d"
 dependencies = [
- "bit-vec",
+ "bit-vec 0.9.1",
 ]

+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
 [[package]]
 name = "bit-vec"
 version = "0.9.1"
@@ -259,6 +283,16 @@ dependencies = [
 "objc2 0.6.5",
 ]

+[[package]]
+name = "borsh"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.20.3"
@@ -428,8 +462,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
 dependencies = [
- "serde",
- "termcolor",
 "unicode-width",
 ]

@@ -452,6 +484,15 @@ dependencies = [
 "crossbeam-utils",
 ]

+[[package]]
+name = "convert_case"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "coords-hud"
 version = "0.1.0"
@@ -756,6 +797,41 @@ dependencies = [
 "syn 2.0.119",
 ]

+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "dasp_sample"
 version = "0.11.0"
@@ -773,6 +849,29 @@ dependencies = [
 "syn 3.0.6",
 ]

+[[package]]
+name = "derive_more"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 2.0.119",
+ "unicode-xid",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -859,6 +958,15 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"

+[[package]]
+name = "ena"
+version = "0.14.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabffdaee24bd1bf95c5ef7cec31260444317e72ea56c4c91750e8b7ee58d5f1"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.42"
@@ -1122,6 +1230,58 @@ version = "0.30.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19fc433e8437a212d1b6f1e68c7824af3aed907da60afa994e7f542d18d12aa9"

+[[package]]
+name = "glsl-lang"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "983a18d0c2ecad18ac9ff3c94b069d6bd03b47405a200836d9d8d63def8e34de"
+dependencies = [
+ "glsl-lang-lexer",
+ "glsl-lang-types",
+ "lalrpop",
+ "lalrpop-util",
+ "lang-util",
+ "once_cell",
+ "thiserror 2.0.21",
+]
+
+[[package]]
+name = "glsl-lang-lexer"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abdbc0bdfbc81d557f4865e695457eb23d68031bfb061fda3444f56511b26eee"
+dependencies = [
+ "glsl-lang-pp",
+ "glsl-lang-types",
+ "lalrpop-util",
+ "lang-util",
+ "thiserror 2.0.21",
+]
+
+[[package]]
+name = "glsl-lang-pp"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88677876fb27f116015d0ecebda6d77bdf65f3a6fa3f5dfeed10b8c8f04cb2c5"
+dependencies = [
+ "arrayvec",
+ "derive_more",
+ "lang-util",
+ "string_cache",
+ "string_cache_codegen",
+ "thiserror 2.0.21",
+]
+
+[[package]]
+name = "glsl-lang-types"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd8b1532b424d40df634cf2dc2be56d59f994b9ac07fa7c1e3183fd33db9cb07"
+dependencies = [
+ "lang-util",
+ "thiserror 2.0.21",
+]
+
 [[package]]
 name = "gpu-allocator"
 version = "0.28.0"
@@ -1268,7 +1428,7 @@ dependencies = [
 "horizon-mods",
 "horizon-protocol",
 "horizon-server-files",
- "horizon-shaders",
+ "horizon-shaderpack",
 "horizon-telemetry",
 "horizon-theme",
 "horizon-threads",
@@ -1281,9 +1441,9 @@ dependencies = [
 "rustix 1.1.5",
 "serde",
 "serde_json",
- "sha1",
 "sha2",
 "symphonia",
+ "toml",
 "ureq",
 "wgpu",
 "winit",
@@ -1318,7 +1478,7 @@ dependencies = [
 "serde",
 "serde_json",
 "sha2",
- "socket2 0.5.10",
+ "socket2",
 "spake2",
 ]

@@ -1333,11 +1493,10 @@ dependencies = [
 name = "horizon-mods"
 version = "0.1.0"
 dependencies = [
+ "horizon-mods",
 "log",
- "minisign-verify",
 "serde",
 "serde_json",
- "sha2",
 "toml",
 "wasmtime",
 "wit-component 0.239.0",
@@ -1383,7 +1542,6 @@ dependencies = [
 "getrandom 0.3.4",
 "horizon-core",
 "horizon-world",
- "ipconfig",
 "serde_json",
 "sha1",
 "sha2",
@@ -1438,24 +1596,12 @@ dependencies = [
 ]

 [[package]]
-name = "horizon-shader-api"
+name = "horizon-shaderpack"
 version = "0.1.0"
 dependencies = [
- "bytemuck",
- "naga",
- "serde",
- "serde_json",
- "sha2",
- "toml",
- "zip",
-]
-
-[[package]]
-name = "horizon-shaders"
-version = "0.1.0"
-dependencies = [
- "horizon-core",
+ "glsl-lang",
 "naga",
+ "pp-rs",
 "zip",
 ]

@@ -1610,6 +1756,12 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"

+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
 [[package]]
 name = "idna"
 version = "1.1.0"
@@ -1682,19 +1834,6 @@ dependencies = [
 "generic-array",
 ]

-[[package]]
-name = "ipconfig"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222"
-dependencies = [
- "socket2 0.6.5",
- "widestring",
- "windows-registry",
- "windows-result 0.4.1",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "itertools"
 version = "0.14.0"
@@ -1805,6 +1944,73 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "keccak"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lalrpop"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4ebbd48ce411c1d10fb35185f5a51a7bfa3d8b24b4e330d30c9e3a34129501"
+dependencies = [
+ "ascii-canvas",
+ "bit-set 0.8.0",
+ "ena",
+ "itertools",
+ "lalrpop-util",
+ "petgraph 0.7.1",
+ "pico-args",
+ "regex",
+ "regex-syntax",
+ "sha3",
+ "string_cache",
+ "term",
+ "unicode-xid",
+ "walkdir",
+]
+
+[[package]]
+name = "lalrpop-util"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5baa5e9ff84f1aefd264e6869907646538a52147a755d494517a8007fb48733"
+dependencies = [
+ "regex-automata",
+ "rustversion",
+]
+
+[[package]]
+name = "lang-util"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1715a1e56998f119cd6d49ac8a69802dcbe4fca96d8291243d6dae87abeb913"
+dependencies = [
+ "derive_more",
+ "lalrpop-util",
+ "lang-util-derive",
+ "line-span",
+ "smol_str 0.3.6",
+ "text-size",
+]
+
+[[package]]
+name = "lang-util-derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f2acc66aedf0e445534e0a6b3f0f6ee20ef6ebb9647dbe10735e52ea8d6a096"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.1"
@@ -1861,6 +2067,12 @@ dependencies = [
 "pkg-config",
 ]

+[[package]]
+name = "line-span"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29fc123b2f6600099ca18248f69e3ee02b09c4188c0d98e9a690d90dec3e408a"
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.15"
@@ -1939,12 +2151,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "minisign-verify"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "871285dc19d8d0ebe0eef3d0e99a205f2a71363b122632cbbfa4a6c370a960ce"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -1978,7 +2184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a616d2fb8c89516ac2723a581f69d6c18576046bed761bd6b305e5618e6ae130"
 dependencies = [
 "arrayvec",
- "bit-set",
+ "bit-set 0.10.0",
 "bitflags 2.13.2",
 "cfg-if",
 "cfg_aliases",
@@ -2040,6 +2246,12 @@ dependencies = [
 "jni-sys 0.3.1",
 ]

+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
 [[package]]
 name = "nix"
 version = "0.31.3"
@@ -2539,6 +2751,16 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"

+[[package]]
+name = "petgraph"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
+dependencies = [
+ "fixedbitset",
+ "indexmap",
+]
+
 [[package]]
 name = "petgraph"
 version = "0.8.3"
@@ -2550,6 +2772,31 @@ dependencies = [
 "indexmap",
 ]

+[[package]]
+name = "phf_generator"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pico-args"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
+
 [[package]]
 name = "pin-project"
 version = "1.1.13"
@@ -2677,6 +2924,12 @@ dependencies = [
 "unicode-xid",
 ]

+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
 [[package]]
 name = "presser"
 version = "0.3.1"
@@ -2770,6 +3023,15 @@ version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"

+[[package]]
+name = "rand"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
+dependencies = [
+ "rand_core",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.6.4"
@@ -3108,6 +3370,16 @@ dependencies = [
 "digest",
 ]

+[[package]]
+name = "sha3"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77fd7028345d415a4034cf8777cd4f8ab1851274233b45f84e3d955502d93874"
+dependencies = [
+ "digest",
+ "keccak",
+]
+
 [[package]]
 name = "shlex"
 version = "2.0.1"
@@ -3136,6 +3408,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"

+[[package]]
+name = "siphasher"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33f4fe9184a62d842c9ef383018f3306d8ba224fd9d836f56d7288308847c256"
+
 [[package]]
 name = "slab"
 version = "0.4.12"
@@ -3185,6 +3463,16 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "smol_str"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523"
+dependencies = [
+ "borsh",
+ "serde_core",
+]
+
 [[package]]
 name = "socket2"
 version = "0.5.10"
@@ -3195,16 +3483,6 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

-[[package]]
-name = "socket2"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
-dependencies = [
- "libc",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "spake2"
 version = "0.4.0"
@@ -3244,6 +3522,37 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"

+[[package]]
+name = "string_cache"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
+dependencies = [
+ "new_debug_unreachable",
+ "parking_lot",
+ "phf_shared",
+ "precomputed-hash",
+ "serde",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -3360,6 +3669,15 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"

+[[package]]
+name = "term"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8c27177b12a6399ffc08b98f76f7c9a1f4fe9fc967c784c5a071fa8d93cf7e1"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.4.1"
@@ -3369,6 +3687,12 @@ dependencies = [
 "winapi-util",
 ]

+[[package]]
+name = "text-size"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
+
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -3529,7 +3853,7 @@ checksum = "b8765b90061cba6c22b5831f675da109ae5561588290f9fa2317adab2714d5a6"
 dependencies = [
 "memchr",
 "nom",
- "petgraph",
+ "petgraph 0.8.3",
 ]

 [[package]]
@@ -3645,6 +3969,10 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"

+[[package]]
+name = "voxel-kernels"
+version = "0.1.0"
+
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -4225,7 +4553,6 @@ dependencies = [
 "hashbrown 0.17.1",
 "js-sys",
 "log",
- "naga",
 "parking_lot",
 "portable-atomic",
 "profiling",
@@ -4247,8 +4574,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c018fce9b6270aa203c2fdd56f3cce996713534bd757e4ea58c8560b121f14"
 dependencies = [
 "arrayvec",
- "bit-set",
- "bit-vec",
+ "bit-set 0.10.0",
+ "bit-vec 0.9.1",
 "bitflags 2.13.2",
 "bytemuck",
 "cfg_aliases",
@@ -4298,7 +4625,7 @@ dependencies = [
 "android_system_properties",
 "arrayvec",
 "ash",
- "bit-set",
+ "bit-set 0.10.0",
 "bitflags 2.13.2",
 "block2 0.6.2",
 "bytemuck",
@@ -4362,12 +4689,6 @@ dependencies = [
 "web-sys",
 ]

-[[package]]
-name = "widestring"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.11"
@@ -4500,17 +4821,6 @@ dependencies = [
 "windows-link",
 ]

-[[package]]
-name = "windows-registry"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
-dependencies = [
- "windows-link",
- "windows-result 0.4.1",
- "windows-strings",
-]
-
 [[package]]
 name = "windows-result"
 version = "0.1.2"
@@ -4813,7 +5123,7 @@ dependencies = [
 "rustix 0.38.44",
 "sctk-adwaita",
 "smithay-client-toolkit",
- "smol_str",
+ "smol_str 0.2.2",
 "tracing",
 "unicode-segmentation",
 "wasm-bindgen",
@@ -1,6 +1,6 @@
 [workspace]
-exclude = ["launcher", "crates/horizon-telemetry-server", "crates/horizon-mod-registry", "third_party/wgpu-hal"]
-members = ["crates/horizon-core", "crates/horizon-dualsense", "crates/horizon-threads", "crates/horizon-world", "crates/horizon-client", "crates/horizon-server-files", "crates/horizon-server", "crates/horizon-bots", "crates/horizon-assets", "crates/horizon-protocol", "crates/horizon-theme", "crates/horizon-prepare", "crates/horizon-telemetry", "crates/horizon-bench", "crates/horizon-friends", "crates/horizon-relay", "crates/horizon-mod-sdk", "crates/horizon-mods", "crates/horizon-mods/tests/guest", "crates/cargo-horizon-mod", "crates/horizon-port-pack", "crates/horizon-shaders", "crates/horizon-shader-api", "crates/horizon-release-sign", "crates/horizon-mod-sdk/examples/coords-hud", "xtask"]
+exclude = ["launcher", "crates/horizon-telemetry-server", "third_party/wgpu-hal"]
+members = ["crates/horizon-core", "crates/horizon-dualsense", "crates/horizon-threads", "crates/horizon-world", "crates/voxel-kernels", "crates/horizon-client", "crates/horizon-server-files", "crates/horizon-server", "crates/horizon-bots", "crates/horizon-assets", "crates/horizon-protocol", "crates/horizon-theme", "crates/horizon-shaderpack", "crates/horizon-prepare", "crates/horizon-telemetry", "crates/horizon-bench", "crates/horizon-friends", "crates/horizon-relay", "crates/horizon-mod-sdk", "crates/horizon-mods", "crates/horizon-mods/tests/guest", "crates/cargo-horizon-mod", "crates/horizon-port-pack", "crates/horizon-release-sign", "crates/horizon-mod-sdk/examples/coords-hud", "xtask"]
 resolver = "2"

 [workspace.package]
@@ -16,7 +16,6 @@
  <a href="#download"><b>Download</b></a> ·
  <a href="https://playhorizon.dev/docs/"><b>Documentation</b></a> ·
  <a href="https://github.com/ludovic111/horizon/releases"><b>Release notes</b></a> ·
-  <a href="ROADMAP.md"><b>Roadmap</b></a> ·
  <a href="#project-status"><b>Project status</b></a> ·
  <a href="#contributing"><b>Contributing</b></a>
 </p>
@@ -46,7 +45,7 @@ The [documentation](https://playhorizon.dev/docs/) covers each of these.

 - **The game:** singleplayer with vanilla's world generation, mobs, villagers, raids, redstone, every command, the HUD and the recipe book, on saves in vanilla's format. Worlds from 1.8 to 26.2 are upgraded as vanilla does. [Status table](#project-status).
 - **Horizon's own extras:** new menus (vanilla's are one setting away), graphics presets, distant terrain up to 1024 chunks, controller support, optional zoom, minimap and more, all off by default where they would change the vanilla look. See [Settings](https://playhorizon.dev/docs/settings).
- **Resource packs and data packs:** resource packs work, and data packs load functions, predicates and item modifiers.
+- **Resource packs, shader packs and data packs:** resource packs work, Java shader packs run their full-screen effects (experimental), and data packs load functions, predicates and item modifiers.
 - **Playing with others:** invite friends from the pause menu's Friends button with a code, Open to LAN, and joining offline-mode servers. Horizon cannot sign in to a Microsoft account yet, so it cannot join servers that check accounts. See [Multiplayer](https://playhorizon.dev/docs/multiplayer).
 - **Mods:** Horizon has its own mod system (Rust compiled to WebAssembly). Java mod jars do not run. See [Mods and data packs](https://playhorizon.dev/docs/mods).

@@ -58,7 +57,7 @@ Screenshots, captured in the Rust client itself with vanilla assets and no mods
  </tr>
  <tr>
    <td width="50%"><img src="docs/media/survival.webp" alt="Survival at dusk: a zombie walks up, with the hotbar, health, hunger and experience"></td>
-    <td width="50%"><img src="docs/media/settings.webp" alt="Vanilla's Video Settings screen with Horizon's own buttons at the top: Horizon Graphics and Advanced Graphics"></td>
+    <td width="50%"><img src="docs/media/settings.webp" alt="Vanilla's Video Settings screen with Horizon's own buttons at the top: Horizon Graphics, Advanced Graphics and Shader Packs"></td>
  </tr>
  <tr>
    <td width="50%"><img src="docs/media/village.webp" alt="A plains village among savanna hills, with farms, villagers and an iron golem"></td>
@@ -110,10 +109,6 @@ Everything prepared lands in the gitignored `.local/`. It is derived from the ga

 The client starts on the title screen. Command-line options (`--world`, `--seed`, `--creative`, `--render-distance`, `--dedicated`), controls, scripting through `horizon-ctl` and the architecture are described in [the native client guide](docs/native-client.md). The rest of the developer documentation is indexed in [docs/README.md](docs/README.md), including [the parity workflow](docs/parity-workflow.md).

-## Roadmap
-
-What is being done now, what comes next and where you can help, in plain words and in technical detail: [ROADMAP.md](ROADMAP.md). [playhorizon.dev/hub](https://playhorizon.dev/hub) shows it with the work board, the journal of what shipped and how to help.
-
 ## Contributing

 Issues and pull requests are welcome: see [CONTRIBUTING.md](CONTRIBUTING.md) for how we work (vanilla first, small pull requests, labels), or [the contributing guide](https://playhorizon.dev/docs/contributing) on the site. Questions and ideas: [Discord](https://discord.gg/HcTeMZxe5E). Before opening a pull request, run the self-check and paste the block it prints:
@@ -1,341 +0,0 @@
-# Horizon roadmap
-
-<!-- Generated by tools/roadmap.py from roadmap/roadmap.toml: edit that file, then run `python3 tools/roadmap.py build`. -->
-
-What is being done on Horizon, what comes next and where you can help. There are no dates: things are Now, Next or Later. Each item is said in plain words, with the technical picture folded under it. The same roadmap, with a Simple / Technical switch, the board, the journal and how to help, is on [playhorizon.dev/hub](https://playhorizon.dev/hub). Pull requests carry the `roadmap:<id>` label of their item.
-
-## At a glance
-
-Horizon is Minecraft: Java Edition 26.3 rewritten from scratch in Rust, so it runs faster on the same computer. Single player, LAN, servers, resource packs and Horizon's own mods work today, on your own copy of the game.
-
-**Being done now**
-
- **Steady frames at long render distances**: Making Horizon faster than vanilla on every computer, with smooth camera movement even at 32 chunks, by spreading the work better over the processor's cores.
- **Modpacks' world generation, natively**: Making the world-generation mods of popular modpacks (new structures, YUNG's dungeons and mineshafts, packs built on Lithostitched) generate their worlds in Horizon, natively and fast.
- **Playing on servers: everything shows as it should**: When you play on a server, other players, mobs, items and menus look and behave as in vanilla: skins, poses, item names, inventories and server networks.
- **Single player as a server: the last differences**: Single player now runs a small server in the background, as vanilla does. We are fixing what still behaves differently there; every fix also works for LAN and server players.
- **Horizon's mod registry**: One place for mods, modpacks and resource packs made for Horizon: browse them on the website and install them from the launcher in one click.
-
-**Next**: Microsoft sign-in (coming soon); CurseForge in the mod browser (coming soon); Fresh benchmarks against vanilla; Pistons push players and mobs; Horizon on Intel Macs.
-
-**How to help**: Play it and tell us what differs from vanilla (Discord or GitHub), run the benchmark on your computer, vote for what you want next, or pick one of the Help wanted items.
-
-**Developers**: Read CONTRIBUTING.md, pick a Help wanted item or a To do card, check vanilla's code for the behaviour, and paste the block `python3 tools/pr_ready.py` prints in your pull request.
-
-## Now
-
-### Performance
-
-#### Steady frames at long render distances
-
-Making Horizon faster than vanilla on every computer, with smooth camera movement even at 32 chunks, by spreading the work better over the processor's cores.
-
-<details><summary>Technical</summary>
-
-Frame pacing at render distance 32 ([#678](https://github.com/ludovic111/horizon/issues/678)): long frames come from work competing with the render thread. In review: world generation workers build free structure starts instead of queueing them ([#1760](https://github.com/ludovic111/horizon/issues/1760)), the worker pool leaves one core as vanilla does ([#1778](https://github.com/ludovic111/horizon/issues/1778)), and the terrain vertex arena is read as storage where flat draws run ([#1742](https://github.com/ludovic111/horizon/issues/1742)). Still open: far terrain at 48 to 64 chunks ([#718](https://github.com/ludovic111/horizon/issues/718)) and CPU-bound fields of block entities ([#717](https://github.com/ludovic111/horizon/issues/717)). Every change shows before and after numbers from `tools/perf_bench.py` against vanilla 26.3 ([docs/benchmark.md](docs/benchmark.md)).
-
-</details>
-
-#### Faster block lookups
-
-Speeding up the code that reads and writes the blocks of the world, which almost everything in the game goes through: generation, lighting, meshing and ticking.
-
-<details><summary>Technical</summary>
-
-`PalettedContainer` and `PackedStorage` find an entry's word by multiply and shift instead of an integer division ([#1790](https://github.com/ludovic111/horizon/issues/1790), [#1794](https://github.com/ludovic111/horizon/issues/1794)); meshing looks up baked models by index, not by name ([#1747](https://github.com/ludovic111/horizon/issues/1747)). Each change keeps the paletted storage harnesses identical and shows its microbenchmark ([docs/performance/paletted-container-access-results.md](docs/performance/paletted-container-access-results.md)).
-
-</details>
-
-### Modpacks
-
-#### Modpacks' world generation, natively
-
-Making the world-generation mods of popular modpacks (new structures, YUNG's dungeons and mineshafts, packs built on Lithostitched) generate their worlds in Horizon, natively and fast.
-
-<details><summary>Technical</summary>
-
-`horizon-port-pack` carries a pack's data-driven content over; structure mods that need code get a native port: YUNG's worldgen as written ([#1746](https://github.com/ludovic111/horizon/issues/1746)), Lithostitched's limited and guaranteed elements with pool and processor modifiers ([#1777](https://github.com/ludovic111/horizon/issues/1777)), its processors as the game's own types ([#1765](https://github.com/ludovic111/horizon/issues/1765)). Proved by the structure blocks and layout harnesses ([#1753](https://github.com/ludovic111/horizon/issues/1753), [#1757](https://github.com/ludovic111/horizon/issues/1757)). Mods whose Java code does more than world generation don't run ([docs/modpacks.md](docs/modpacks.md)).
-
-</details>
-
-### Servers and multiplayer
-
-#### Playing on servers: everything shows as it should
-
-When you play on a server, other players, mobs, items and menus look and behave as in vanilla: skins, poses, item names, inventories and server networks.
-
-<details><summary>Technical</summary>
-
-Client-of-a-server fixes in `game/remote*.rs` and `horizon-protocol`: mobs' aggressive and item-use flags ([#1802](https://github.com/ludovic111/horizon/issues/1802), [#1798](https://github.com/ludovic111/horizon/issues/1798)), ghost items after a remote menu ([#1795](https://github.com/ludovic111/horizon/issues/1795)), skins ([#1652](https://github.com/ludovic111/horizon/issues/1652)), cookies and transfer packets for proxy networks ([#1650](https://github.com/ludovic111/horizon/issues/1650)), firework boosts ([#1671](https://github.com/ludovic111/horizon/issues/1671)), living-entity attributes and simulation distance ([#1731](https://github.com/ludovic111/horizon/issues/1731)), styled item names ([#1702](https://github.com/ludovic111/horizon/issues/1702)), primed TNT between updates ([#1710](https://github.com/ludovic111/horizon/issues/1710)).
-
-</details>
-
-#### Server dialogs and login screens
-
-Servers that show dialogs, such as the register and login screens of AuthMe, will work in Horizon.
-
-<details><summary>Technical</summary>
-
-26.3's dialog packets and model ([#1720](https://github.com/ludovic111/horizon/issues/1720)), the dialog screen with its buttons and actions ([#1734](https://github.com/ludovic111/horizon/issues/1734)), then text and boolean inputs ([#1735](https://github.com/ludovic111/horizon/issues/1735)).
-
-</details>
-
-### Mods and API
-
-#### Horizon's mod registry
-
-One place for mods, modpacks and resource packs made for Horizon: browse them on the website and install them from the launcher in one click.
-
-<details><summary>Technical</summary>
-
-Merged: the registry index (schema 1, `.hpack`, checks before install, [#1634](https://github.com/ludovic111/horizon/issues/1634)), `cargo horizon-mod check` ([#1642](https://github.com/ludovic111/horizon/issues/1642)) and the submission service (`crates/horizon-mod-registry`, [#1659](https://github.com/ludovic111/horizon/issues/1659)). In review: the website's /mods ([#1596](https://github.com/ludovic111/horizon/issues/1596)) and /mods/submit ([#1635](https://github.com/ludovic111/horizon/issues/1635)), and in the launcher the registry as a source ([#1636](https://github.com/ludovic111/horizon/issues/1636)), install, enable and takedowns ([#1637](https://github.com/ludovic111/horizon/issues/1637)), the Mods page ([#1638](https://github.com/ludovic111/horizon/issues/1638)) and modpacks as their own profiles ([#1640](https://github.com/ludovic111/horizon/issues/1640)).
-
-More: [docs/mods.md](docs/mods.md)
-
-</details>
-
-### Gameplay parity
-
-#### Single player as a server: the last differences
-
-Single player now runs a small server in the background, as vanilla does. We are fixing what still behaves differently there; every fix also works for LAN and server players.
-
-<details><summary>Technical</summary>
-
-Since [#1514](https://github.com/ludovic111/horizon/issues/1514) single player runs on the server thread (`game/integrated.rs`) and the window joins it as a client; `--in-frame` keeps the old path. The open `[server-thread]` issues list the gaps. In review: a tool that changes a block ends the click ([#1797](https://github.com/ludovic111/horizon/issues/1797)), potions keep their potion over the connection ([#1796](https://github.com/ludovic111/horizon/issues/1796)), mobs' aggression and arm swings ([#1802](https://github.com/ludovic111/horizon/issues/1802)). [docs/server-levels.md](docs/server-levels.md).
-
-</details>
-
-#### Play in your language
-
-Item names, container titles and server messages follow the language you pick, as in vanilla. Today parts of the game stay in English.
-
-<details><summary>Technical</summary>
-
-Translatable components resolved through the selected language for items, containers and server text ([#1806](https://github.com/ludovic111/horizon/issues/1806)), on top of the bundled languages the prepared resources carry ([#1594](https://github.com/ludovic111/horizon/issues/1594)). Left: the client's own screens ([#1672](https://github.com/ludovic111/horizon/issues/1672)) and the main menu with zh_cn ([#1774](https://github.com/ludovic111/horizon/issues/1774)).
-
-</details>
-
-### Rendering
-
-#### Shader packs, written again from scratch
-
-Shader packs were removed and are being rebuilt from scratch. They come back, off by default, once the best-known packs draw properly.
-
-<details><summary>Technical</summary>
-
-A clean-room rewrite in `horizon-shaderpack`, from the packs' public format documentation only: reading packs, the preprocessor and `.properties` files are merged ([#1584](https://github.com/ludovic111/horizon/issues/1584), [#1585](https://github.com/ludovic111/horizon/issues/1585), [#1586](https://github.com/ludovic111/horizon/issues/1586)); translating programs to WGSL through naga, buffers, uniforms and the terrain, entity, sky, weather and hand stages are in review ([#1698](https://github.com/ludovic111/horizon/issues/1698) to [#1801](https://github.com/ludovic111/horizon/issues/1801)).
-
-More: [#1561](https://github.com/ludovic111/horizon/issues/1561) · [#1771](https://github.com/ludovic111/horizon/issues/1771) · [#1786](https://github.com/ludovic111/horizon/issues/1786)
-
-</details>
-
-### Horizon extras
-
-#### Discord Rich Presence
-
-Your Discord profile can show that you are playing Horizon, with a switch to turn it off.
-
-<details><summary>Technical</summary>
-
-A Discord IPC client on its own thread ([#1787](https://github.com/ludovic111/horizon/issues/1787)) and the presence with its setting ([#1788](https://github.com/ludovic111/horizon/issues/1788)). Merged: it ships with the next release.
-
-</details>
-
-### Code and tools
-
-#### A leaner codebase that builds faster
-
-Cleaning up Horizon's code: removing what nothing uses and making it quicker to build, so fixes and new features land faster.
-
-<details><summary>Technical</summary>
-
-A review of the whole tree: dead code and stubs removed ([#1432](https://github.com/ludovic111/horizon/issues/1432), [#1658](https://github.com/ludovic111/horizon/issues/1658)), one probe binary per crate ([#1453](https://github.com/ludovic111/horizon/issues/1453), [#1454](https://github.com/ludovic111/horizon/issues/1454)), shared harness helpers ([#1448](https://github.com/ludovic111/horizon/issues/1448)), clippy clean on the whole tree ([#1707](https://github.com/ludovic111/horizon/issues/1707)). [docs/architecture.md](docs/architecture.md) maps each feature to its files and harnesses.
-
-</details>
-
-## Next
-
-### Performance
-
-#### Fresh benchmarks against vanilla
-
-New public numbers comparing Horizon with vanilla on many kinds of computers, measured the same way every time, on the website's Benchmarks page.
-
-<details><summary>Technical</summary>
-
-Redo the comparison after the current performance work ([#1073](https://github.com/ludovic111/horizon/issues/1073)); reliability, coverage and presentation ([#1346](https://github.com/ludovic111/horizon/issues/1346)); a scene must count as loaded only once its first chunk arrives ([#1749](https://github.com/ludovic111/horizon/issues/1749)). Players' reports come in through `--benchmark` and `horizon-launcher data benchmark` ([docs/benchmark.md](docs/benchmark.md)).
-
-</details>
-
-### Modpacks
-
-#### CurseForge in the mod browser (coming soon)
-
-Coming soon: search and download CurseForge mods and modpacks from the launcher, as you can with Modrinth today.
-
-<details><summary>Technical</summary>
-
-The mod browser lists CurseForge as coming soon ([docs/mod-browser.md](docs/mod-browser.md)): it needs CurseForge API access. Meanwhile packs import from a CurseForge zip or instance folder, and jars only CurseForge hosts come from the player's own instance ([docs/modpacks.md](docs/modpacks.md)).
-
-</details>
-
-### Gameplay parity
-
-#### Pistons push players and mobs
-
-Pistons and slime blocks will push players, mobs and items as in vanilla. Today moving blocks pass through them.
-
-<details><summary>Technical</summary>
-
-Port `PistonMovingBlockEntity.moveCollidedEntities` and `moveStuckEntities` (honey), the slime bounce and `Entity.limitPistonMovement` for `MoverType.PISTON`, in single player and for a server's players. Issues [#1496](https://github.com/ludovic111/horizon/issues/1496), [#1609](https://github.com/ludovic111/horizon/issues/1609), [#1608](https://github.com/ludovic111/horizon/issues/1608), [#1704](https://github.com/ludovic111/horizon/issues/1704), [#1758](https://github.com/ludovic111/horizon/issues/1758).
-
-</details>
-
-### Launcher
-
-#### Microsoft sign-in (coming soon)
-
-Coming soon: sign in with your Microsoft account to play on online-mode servers. The code is ready; it waits for Microsoft's approval.
-
-<details><summary>Technical</summary>
-
-Device-code sign-in in the launcher and online-mode login in the client ([docs/microsoft-account.md](docs/microsoft-account.md)). It is turned on by setting the app's client id once Minecraft API access is approved; until then the launcher shows "Coming soon".
-
-More: [#1270](https://github.com/ludovic111/horizon/issues/1270)
-
-</details>
-
-#### Horizon on Intel Macs
-
-Builds of the game and the launcher for Macs with an Intel processor.
-
-<details><summary>Technical</summary>
-
-x86_64 game and launcher builds, picked per processor ([#1171](https://github.com/ludovic111/horizon/issues/1171)). Before it ships it needs a run on a real Intel Mac: Rosetta on Apple Silicon only proves the CPU code. Requests: [#1161](https://github.com/ludovic111/horizon/issues/1161), [#1792](https://github.com/ludovic111/horizon/issues/1792).
-
-</details>
-
-## Later
-
-### Gameplay parity
-
-#### Following new Minecraft versions
-
-When Mojang releases a new version of the game, Horizon follows it, and every system is checked against the new version again.
-
-<details><summary>Technical</summary>
-
-The port pipeline detects a release, diffs its classes against 26.3 and writes a port report ([docs/version-ports.md](docs/version-ports.md)); the harnesses then run against the new version.
-
-</details>
-
-### Horizon extras
-
-#### An optional AI teammate
-
-An AI teammate that plays beside you and that you can talk to. It is off unless you turn it on, and the No AI switch hides it completely.
-
-<details><summary>Technical</summary>
-
-Draft pull requests: the companion ([#1068](https://github.com/ludovic111/horizon/issues/1068)), its safety modes and their evaluation ([#1069](https://github.com/ludovic111/horizon/issues/1069)), and a route that finishes the game ([#1070](https://github.com/ludovic111/horizon/issues/1070)). Local models first; it ships only once the safety evaluation passes.
-
-</details>
-
-## Help wanted
-
-### Performance
-
-#### Benchmark your computer
-
-Run Horizon's built-in benchmark and share the report: every new computer makes the performance work more accurate. No coding needed.
-
-<details><summary>Technical</summary>
-
-`horizon-launcher play --arg=--benchmark --arg=standard` writes a JSON report; `horizon-launcher data benchmark <report>` shows what would be sent and uploads it ([website/docs/performance.md](website/docs/performance.md)). Results from three installs with the same hardware appear on the Benchmarks page. Example: [#1711](https://github.com/ludovic111/horizon/issues/1711).
-
-</details>
-
-### Gameplay parity
-
-#### End city banners keep their pattern
-
-Banners in End cities show as plain magenta instead of with their pattern.
-
-<details><summary>Technical</summary>
-
-Compare the banner block entities the End city templates place with vanilla's (`EndCityPieces`, the templates' block entity NBT, `BannerBlockEntity`'s patterns), in `crates/horizon-world/src/worldgen/structure/`. Issue [#1438](https://github.com/ludovic111/horizon/issues/1438); possibly related: [#526](https://github.com/ludovic111/horizon/issues/526).
-
-</details>
-
-#### Enchanted loot in End cities
-
-Armour and tools in End city chests should come enchanted, as in vanilla.
-
-<details><summary>Technical</summary>
-
-`loot.rs` implements `enchant_with_levels`: find why the End city chest table's rolls come out bare, and compare them with vanilla's for a few seeds. Issues [#1437](https://github.com/ludovic111/horizon/issues/1437), [#1660](https://github.com/ludovic111/horizon/issues/1660).
-
-</details>
-
-#### Cooldowns drawn on items
-
-After you throw an ender pearl, its slot should show the cooldown sweeping away, as in vanilla.
-
-<details><summary>Technical</summary>
-
-Vanilla draws `ItemCooldowns`' percent as a white overlay over the slot (`GuiGraphicsExtractor.itemDecorations` and `itemCooldown`) in the hotbar and in inventories. Issue [#1763](https://github.com/ludovic111/horizon/issues/1763).
-
-</details>
-
-#### Chat settings and team prefixes
-
-The Hidden and Commands Only chat settings should hide chat, and team prefixes should appear before names in chat.
-
-<details><summary>Technical</summary>
-
-Vanilla checks `ChatVisiblity` before it delivers chat and system messages ([#1376](https://github.com/ludovic111/horizon/issues/1376)), and chat uses the team-formatted display name ([#1378](https://github.com/ludovic111/horizon/issues/1378)). Both issues have exact steps to reproduce.
-
-</details>
-
-#### A pointing hand over buttons
-
-The mouse pointer should turn into a pointing hand over menu buttons, as in vanilla 26.3.
-
-<details><summary>Technical</summary>
-
-26.3's `AbstractWidget` asks for a cursor from `CursorTypes` when it is hovered; winit's `CursorIcon::Pointer` gives the same shape. Issue [#1347](https://github.com/ludovic111/horizon/issues/1347).
-
-</details>
-
-#### Ctrl+Backspace and scroll bars in menus
-
-Ctrl+Backspace should delete a whole word in the creative search, and every list's scroll bar should be draggable.
-
-<details><summary>Technical</summary>
-
-`EditBox` deletes by word with Ctrl ([#1764](https://github.com/ludovic111/horizon/issues/1764)); the Game Rules and Statistics lists' scroll bars can't be dragged ([#1782](https://github.com/ludovic111/horizon/issues/1782), after [#978](https://github.com/ludovic111/horizon/issues/978)).
-
-</details>
-
-#### Chickens flap while they fall
-
-Chickens should flap their wings while they fall, not stand still in the air.
-
-<details><summary>Technical</summary>
-
-Vanilla's `Chicken.aiStep` updates `flap` and `flapSpeed` when the chicken isn't on the ground, and the model's wings follow them. Issue [#1706](https://github.com/ludovic111/horizon/issues/1706).
-
-</details>
-
-## Recently shipped
-
- **Server resource packs** (v0.2.48): Servers can send you their resource pack: Horizon asks, downloads it and applies it, like vanilla. [#1562](https://github.com/ludovic111/horizon/issues/1562) · [#1569](https://github.com/ludovic111/horizon/issues/1569) · [#1570](https://github.com/ludovic111/horizon/issues/1570)
- **Single player on its own server thread** (v0.2.39): Single player runs on a server thread, as vanilla does, so the world keeps ticking smoothly while the window draws. [#1514](https://github.com/ludovic111/horizon/issues/1514) · [docs/server-levels.md](docs/server-levels.md)
- **GPU occlusion culling on Macs** (v0.2.17): On Macs the GPU now skips terrain hidden behind hills and caves: 8 to 48% more frames per second at 32 chunks on an M4 Pro. [#1434](https://github.com/ludovic111/horizon/issues/1434)
- **Animated textures on the GPU** (v0.2.5): Water, lava and other animated blocks are now animated by the graphics card: 1.7 to 2.4 times better 1% lows on Intel graphics. [#1239](https://github.com/ludovic111/horizon/issues/1239)
- **Far Detail for integrated graphics** (v0.2.5): An optional Reduced setting for far terrain, suggested on integrated graphics, that saves 2 to 4 ms of GPU time per frame. [#1199](https://github.com/ludovic111/horizon/issues/1199) · [#1029](https://github.com/ludovic111/horizon/issues/1029)
- **The launcher's mod browser** (launcher@0.2.0): Search Modrinth for mods, modpacks and resource packs from the launcher; it says before installing what works in Horizon. [#1154](https://github.com/ludovic111/horizon/issues/1154) · [#1242](https://github.com/ludovic111/horizon/issues/1242) · [#1243](https://github.com/ludovic111/horizon/issues/1243) · [#1246](https://github.com/ludovic111/horizon/issues/1246) · [docs/mod-browser.md](docs/mod-browser.md)
- **A blocky, Minecraft-like launcher** (launcher@0.2.0): The launcher got a new blocky look in Horizon's purple, in dark and light. [#1269](https://github.com/ludovic111/horizon/issues/1269) · [docs/design-system.md](docs/design-system.md)
- **Dynamic lights** (v2026.10.22): An optional extra: torches you hold, drop or set on fire light up what is around them. [#1162](https://github.com/ludovic111/horizon/issues/1162)
- **Host a server from the launcher** (launcher-v0.15.0): The launcher's Servers page creates, starts, backs up and updates a Horizon server with buttons, and invites friends. [#1026](https://github.com/ludovic111/horizon/issues/1026) · [docs/hosting.md](docs/hosting.md)
@@ -1,5 +1,35 @@
 # Third-party notices

+## CullLeaves
+
+The optional leaf and mangrove-root face-culling behavior is adapted from
+[CullLeaves](https://github.com/TeamMidnightDust/CullLeaves) by MidnightDust.
+Its MIT license is reproduced below.
+
+```text
+MIT License
+
+Copyright (c) 2020 MidnightDust
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
+
 ## wgpu-hal

 `third_party/wgpu-hal` is [wgpu-hal](https://github.com/gfx-rs/wgpu) 30.0.1 by the gfx-rs
@@ -131,8 +131,8 @@ average) and reached the ThinkPad over the tailnet.
  It ran with Paper's defaults except `connection-throttle: -1` in `bukkit.yml`. Every bot connects from one
  address, and the default throttle (4 s) refused all but the first. Paperclip patched the pinned server jar
  from its cache. Same Java and heap.
- Fabric + Lithium: the pinned server jar on Fabric loader 0.19.5 (`tools/benchmark-deps/fabric.lock.json`) with Lithium
-  `mc26.3-0.26.2-fabric` (`tools/benchmark-deps/mods.lock.json`, checked against its SHA-512). Lithium needs no Fabric API.
+- Fabric + Lithium: the pinned server jar on Fabric loader 0.19.5 (`packs/fabric.lock.json`) with Lithium
+  `mc26.3-0.26.2-fabric` (`packs/mods.lock.json`, checked against its SHA-512). Lithium needs no Fabric API.
  Same Java and heap.

 The Paper and Fabric jars are dev-only downloads into `.local/server-bench/jars` and are never committed or
@@ -4,10 +4,10 @@ version = "0.1.0"
 edition.workspace = true
 license.workspace = true
 rust-version = "1.86"
-description = "cargo horizon-mod new/build/run/check: make Horizon mods in Rust (docs/mods.md)"
+description = "cargo horizon-mod new/build/run: make Horizon mods in Rust (docs/mods.md)"

 [dependencies]
-horizon-mods = { path = "../horizon-mods", default-features = false, features = ["pack", "runtime", "index"] }
+horizon-mods = { path = "../horizon-mods", default-features = false, features = ["pack"] }
 serde_json = "1.0.151"

 [lints]
@@ -1,278 +0,0 @@
-//! `cargo horizon-mod check <file>`: what the registry checks of a submission,
-//! run anywhere: its kind's own checks (docs/api/mod-index.md), its signature
-//! when given a key, and for a mod a trial run in the sandbox: it must start,
-//! survive ticks, frames, a chat line and each of its commands, and import
-//! no more than its capabilities.
-use horizon_mods::{
-    Clock, Mods, Output, Package, Player, Snapshot, Status,
-    index::{self, Facts, Kind},
-    manifest::component_imports,
-};
-use serde_json::{Value, json};
-use std::path::Path;
-
-/// How long the trial run plays: two seconds of game.
-const TICKS: u64 = 40;
-const FRAMES_PER_TICK: u64 = 3;
-
-pub struct Report {
-    pub kind: Kind,
-    pub facts: Facts,
-    pub sha256: String,
-    pub size: u64,
-    pub signed: bool,
-    /// A mod has code to run (a content mod may have none).
-    pub code: bool,
-    /// A mod's component imports.
-    pub imports: Vec<String>,
-    /// A mod's commands, each run once.
-    pub commands: Vec<String>,
-    /// What the mod showed during the trial run.
-    pub output: Vec<String>,
-}
-
-impl Report {
-    pub fn json(&self) -> Value {
-        let requires: Vec<Value> = self
-            .facts
-            .requires
-            .iter()
-            .map(|r| json!({"id": r.id, "version": r.version, "sha256": r.sha256}))
-            .collect();
-        json!({
-            "kind": self.kind.name(),
-            "id": self.facts.id,
-            "version": self.facts.version,
-            "api": self.facts.api,
-            "side": self.facts.side,
-            "capabilities": self.facts.capabilities,
-            "game": self.facts.game,
-            "requires": requires,
-            "sha256": self.sha256,
-            "size": self.size,
-            "signed": self.signed,
-            "code": self.code,
-            "imports": self.imports,
-            "commands": self.commands,
-            "output": self.output,
-        })
-    }
-
-    pub fn text(&self) -> String {
-        let f = &self.facts;
-        let mut out = format!(
-            "{} {} ({}",
-            f.id.as_deref().unwrap_or("resource pack"),
-            f.version.as_deref().unwrap_or(""),
-            self.kind.name()
-        );
-        if let Some(side) = f.side {
-            let side = serde_json::to_value(side).unwrap_or_default();
-            out += &format!(", API {}, {}", f.api, side.as_str().unwrap_or("?"));
-        } else if !f.api.is_empty() {
-            out += &format!(", format {}", f.api);
-        }
-        if let Some(game) = &f.game {
-            out += &format!(", for {game}");
-        }
-        let signed = if self.signed {
-            "signature verified"
-        } else {
-            "unsigned"
-        };
-        out += &format!(
-            ")\n  {} bytes, SHA-256 {}, {signed}\n",
-            self.size, self.sha256
-        );
-        for c in &f.capabilities {
-            out += &format!("  may {}\n", c.describe());
-        }
-        for r in &f.requires {
-            out += &format!("  needs {} {} ({})\n", r.id, r.version, &r.sha256[..12]);
-        }
-        if self.kind == Kind::Mod && !self.code {
-            out += "  no code: content only, nothing to run\n";
-        } else if self.kind == Kind::Mod {
-            let commands = if self.commands.is_empty() {
-                String::new()
-            } else {
-                format!(", /{}", self.commands.join(", /"))
-            };
-            out += &format!(
-                "  trial run: started, {TICKS} ticks, {} frames, a chat line{commands}: ok\n",
-                TICKS * FRAMES_PER_TICK
-            );
-        }
-        out
-    }
-}
-
-/// The kind a file's extension says.
-pub fn kind_of(path: &Path) -> Option<Kind> {
-    match path.extension()?.to_str()? {
-        "hmod" => Some(Kind::Mod),
-        "hpack" => Some(Kind::Modpack),
-        "zip" => Some(Kind::ResourcePack),
-        _ => None,
-    }
-}
-
-/// Checks the file at `path` as `kind`; `key` and `signature` (the
-/// `.minisig` text) check its signature.
-pub fn check(
-    path: &Path,
-    kind: Kind,
-    key: Option<&str>,
-    signature: Option<&str>,
-) -> Result<Report, String> {
-    let size = std::fs::metadata(path)
-        .map_err(|e| format!("{}: {e}", path.display()))?
-        .len();
-    if size > index::MAX_FILE {
-        return Err(format!("over {} MiB", index::MAX_FILE >> 20));
-    }
-    index::open(&kind)?;
-    let facts = index::inspect(&kind, path)?;
-    let signed = match (key, signature) {
-        (Some(key), Some(sig)) => {
-            index::verify_signature(key, sig, path)?;
-            true
-        }
-        (None, None) => false,
-        _ => return Err("--key and --signature go together".into()),
-    };
-    let mut report = Report {
-        kind,
-        facts,
-        sha256: index::sha256_file(path)?,
-        size,
-        signed,
-        code: false,
-        imports: Vec::new(),
-        commands: Vec::new(),
-        output: Vec::new(),
-    };
-    if report.kind == Kind::Mod {
-        trial_run(path, &mut report)?;
-    }
-    Ok(report)
-}
-
-/// Runs a mod in the sandbox, as the game does, from a scratch copy so its
-/// storage lands in a folder removed afterwards. A content mod has no code to
-/// run: `inspect` already read its content as the game does.
-fn trial_run(path: &Path, report: &mut Report) -> Result<(), String> {
-    let package = Package::read(path)?;
-    let Some(wasm) = package.wasm.as_deref() else {
-        return Ok(());
-    };
-    report.code = true;
-    report.imports = component_imports(wasm)?;
-    package
-        .manifest
-        .check_imports(report.imports.iter().map(String::as_str))?;
-    let dir = std::env::temp_dir().join(format!("horizon-mod-check-{}", std::process::id()));
-    let _ = std::fs::remove_dir_all(&dir);
-    std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
-    let copy = dir.join("mod.hmod");
-    let result = std::fs::copy(path, &copy)
-        .map_err(|e| e.to_string())
-        .and_then(|_| play(&copy, report));
-    let _ = std::fs::remove_dir_all(&dir);
-    result
-}
-
-fn play(path: &Path, report: &mut Report) -> Result<(), String> {
-    let mut mods = Mods::load(&[path.to_path_buf()], |_| true, |_| false);
-    let failed = |mods: &Mods| match &mods.entries()[0].status {
-        Status::Failed(reason) => Some(reason.clone()),
-        _ => None,
-    };
-    if let Some(reason) = failed(&mods) {
-        return Err(format!("it didn't start: {reason}"));
-    }
-    report.commands = mods.commands().map(str::to_owned).collect();
-    for t in 0..TICKS {
-        mods.set_snapshot(Snapshot {
-            player: Some(Player {
-                x: 0.5 + t as f64 * 0.1,
-                y: 64.0,
-                z: 0.5,
-                yaw: 90.0,
-                pitch: 0.0,
-                health: 20.0,
-                food: 20,
-                dimension: "minecraft:overworld".into(),
-            }),
-            clock: Some(Clock {
-                game_time: t,
-                day_time: 1000 + t,
-            }),
-        });
-        mods.tick(t);
-        for _ in 0..FRAMES_PER_TICK {
-            mods.frame(1.0 / 60.0);
-        }
-    }
-    mods.chat("<Steve> hello");
-    for name in report.commands.clone() {
-        mods.command(&name);
-    }
-    for out in mods.drain() {
-        report.output.push(match out {
-            Output::Chat { text, .. } => format!("chat: {text}"),
-            Output::Feedback { text, error } => {
-                format!("{}: {text}", if error { "error" } else { "feedback" })
-            }
-            Output::Stopped { reason, .. } => return Err(format!("it stopped: {reason}")),
-        });
-    }
-    match failed(&mods) {
-        Some(reason) => Err(format!("it stopped: {reason}")),
-        None => Ok(()),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn fixture(name: &str) -> std::path::PathBuf {
-        Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("../horizon-mods/tests/index")
-            .join(name)
-    }
-
-    #[test]
-    fn checks_each_kind_its_own_way() {
-        let pack = fixture("cozy-1.0.0.hpack");
-        let report = check(&pack, kind_of(&pack).unwrap(), None, None).unwrap();
-        assert_eq!(report.facts.requires[0].id, "coords_hud");
-        assert!(
-            report
-                .text()
-                .contains("cozy 1.0.0 (modpack, format 1, for 26.3)")
-        );
-        // The fixture mod's code is a stand-in: its manifest reads, its run fails.
-        let hmod = fixture("coords_hud-0.1.0.hmod");
-        let key = std::fs::read_to_string(fixture("test.pub")).unwrap();
-        let sig = std::fs::read_to_string(fixture("coords_hud-0.1.0.hmod.minisig")).unwrap();
-        let key = key.lines().last().unwrap();
-        let e = check(&hmod, Kind::Mod, Some(key), Some(&sig))
-            .err()
-            .unwrap();
-        assert!(e.contains("didn't start"), "{e}");
-        let e = check(
-            &hmod,
-            Kind::Mod,
-            Some(key),
-            Some("untrusted comment: x\nRUQ=\n"),
-        )
-        .err()
-        .unwrap();
-        assert!(e.contains("signature"), "{e}");
-        let e = check(&pack, Kind::Shader, None, None).err().unwrap();
-        assert!(e.contains("shader packs open"), "{e}");
-        assert!(check(&pack, Kind::Mod, None, None).is_err());
-    }
-}
@@ -1,21 +1,13 @@
 //! `cargo horizon-mod`: make Horizon mods in Rust (`docs/mods.md`).
 //!
-//! - `new <path> [--template code|content] [--name "Name"] [--sdk-path <dir>]`:
-//!   a mod from a template: a Rust crate, or a content mod (no code).
-//! - `build [--debug]`: the `.hmod` in `target/horizon-mod/`, with the mod's
-//!   `assets/` and `data/`; a folder without `Cargo.toml` is content only.
+//! - `new <path> [--name "Name"] [--sdk-path <dir>]`: a mod crate from the template.
+//! - `build [--debug]`: the `.hmod` in `target/horizon-mod/`.
 //! - `run [--game <horizon-client>] [-- <game args>]`: build, then play with
 //!   the mod; run `build` again and the game reloads it.
-//! - `check <file> [--json]`: what the registry checks of a submission
-//!   (`.hmod`, `.hpack`, resource pack `.zip`), with a trial run for a mod.
-//! - `registry build|review|check|list`: the registry repository's CI.
 use horizon_mods::{
-    Capability, Content, Manifest, Package,
+    Manifest, Package,
    manifest::{MANIFEST, component_imports, componentize},
 };
-mod check;
-mod registry;
-
 use std::{
    path::{Path, PathBuf},
    process::{Command, ExitCode, Stdio},
@@ -36,9 +28,7 @@ fn main() -> ExitCode {
            println!("Built {}", p.display());
        }),
        Some("run") => run(&args[1..]),
-        Some("check") => check(&args[1..]),
-        Some("registry") => registry::main(&args[1..]),
-        _ => Err("usage: cargo horizon-mod new <path> [--template code|content] | build [--debug] | run [--game <horizon-client>] [-- <game args>] | check <file> [--kind <kind>] [--key <public key> --signature <file.minisig>] [--json] | registry build|review|check|list".into()),
+        _ => Err("usage: cargo horizon-mod new <path> | build [--debug] | run [--game <horizon-client>] [-- <game args>]".into()),
    };
    match result {
        Ok(()) => ExitCode::SUCCESS,
@@ -92,68 +82,19 @@ fn new(args: &[String]) -> Result<(), String> {
            .replace("{name}", &name)
            .replace("{sdk}", &sdk)
    };
-    let code = [
+    let files = [
        ("Cargo.toml", include_str!("../template/Cargo.toml.in")),
        (MANIFEST, include_str!("../template/horizon-mod.toml")),
        ("src/lib.rs", include_str!("../template/src/lib.rs")),
        (".gitignore", include_str!("../template/gitignore")),
    ];
-    // A block copying a vanilla one, with its model, name, loot, recipe and tag.
-    let content = [
-        (
-            MANIFEST,
-            include_str!("../template/content/horizon-mod.toml"),
-        ),
-        (
-            "data/{id}/horizon/block/glowing_amethyst.json",
-            include_str!("../template/content/block.json"),
-        ),
-        (
-            "assets/{id}/blockstates/glowing_amethyst.json",
-            include_str!("../template/content/blockstate.json"),
-        ),
-        (
-            "assets/{id}/models/block/glowing_amethyst.json",
-            include_str!("../template/content/model.json"),
-        ),
-        (
-            "assets/{id}/items/glowing_amethyst.json",
-            include_str!("../template/content/item.json"),
-        ),
-        (
-            "assets/{id}/lang/en_us.json",
-            include_str!("../template/content/lang.json"),
-        ),
-        (
-            "data/{id}/loot_table/blocks/glowing_amethyst.json",
-            include_str!("../template/content/loot.json"),
-        ),
-        (
-            "data/{id}/recipe/glowing_amethyst.json",
-            include_str!("../template/content/recipe.json"),
-        ),
-        (
-            "data/minecraft/tags/block/mineable/pickaxe.json",
-            include_str!("../template/content/pickaxe.json"),
-        ),
-        (".gitignore", include_str!("../template/gitignore")),
-    ];
-    let files: &[(&str, &str)] = match flag(args, "--template").unwrap_or("code") {
-        "code" => &code,
-        "content" => &content,
-        other => return Err(format!("no template {other}: code or content")),
-    };
-    for &(file, text) in files {
-        let file = fill(file);
-        let file = file.as_str();
+    for (file, text) in files {
        let to = dir.join(file);
        std::fs::create_dir_all(to.parent().expect("a file in the mod"))
            .map_err(|e| e.to_string())?;
        std::fs::write(&to, fill(text)).map_err(|e| format!("{}: {e}", to.display()))?;
    }
-    let manifest =
-        Manifest::parse(&std::fs::read_to_string(dir.join(MANIFEST)).map_err(|e| e.to_string())?)?;
-    Content::read(dir, &manifest)?;
+    Manifest::parse(&std::fs::read_to_string(dir.join(MANIFEST)).map_err(|e| e.to_string())?)?;
    println!(
        "Created {} (mod id {id}). Next: cd {path} && cargo horizon-mod run",
        dir.display()
@@ -161,53 +102,14 @@ fn new(args: &[String]) -> Result<(), String> {
    Ok(())
 }

-/// Builds the mod in the current folder and packs `target/horizon-mod/<id>.hmod`:
-/// the manifest, the crate's component (none without a `Cargo.toml`: a
-/// content mod) and the files in `assets/` and `data/`.
+/// Builds the crate in the current folder and packs `target/horizon-mod/<id>.hmod`.
 fn build(release: bool) -> Result<PathBuf, String> {
-    build_in(Path::new("."), release)
-}
-
-fn build_in(root: &Path, release: bool) -> Result<PathBuf, String> {
-    let manifest_text = std::fs::read_to_string(root.join(MANIFEST))
+    let manifest_text = std::fs::read_to_string(MANIFEST)
        .map_err(|e| format!("{MANIFEST}: {e} (run this in a mod's folder)"))?;
    let manifest = Manifest::parse(&manifest_text)?;
-    let (wasm, target_dir) = if root.join("Cargo.toml").exists() {
-        let (wasm, target) = compile(root, release)?;
-        // The game refuses a component importing capabilities the manifest lacks.
-        manifest.check_imports(component_imports(&wasm)?.iter().map(String::as_str))?;
-        (Some(wasm), target)
-    } else if manifest.capabilities.contains(&Capability::Registries) {
-        (None, root.join("target"))
-    } else {
-        return Err(format!(
-            "no Cargo.toml: only a content mod (capability registries in {MANIFEST}) has no code"
-        ));
-    };
-    // The same checks as the game's, and the files in the order it lists them.
-    let content = Content::read(root, &manifest)?;
-    let mut reader = content.reader()?;
-    let mut files = Vec::with_capacity(content.files.len());
-    for name in &content.files {
-        files.push((name.as_str(), reader.read(name)?));
-    }
-    let files: Vec<(&str, &[u8])> = files.iter().map(|(n, b)| (*n, b.as_slice())).collect();
-    let dir = target_dir.join("horizon-mod");
-    std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
-    let path = dir.join(format!("{}.hmod", manifest.id));
-    // Write then rename, so a running game never reads half a file.
-    let partial = path.with_extension("hmod.partial");
-    let bytes = Package::write_files(&manifest_text, wasm.as_deref(), &files)?;
-    std::fs::write(&partial, bytes).map_err(|e| e.to_string())?;
-    std::fs::rename(&partial, &path).map_err(|e| e.to_string())?;
-    Ok(path)
-}
-
-/// Builds the crate for WebAssembly: its component, and Cargo's target folder.
-fn compile(root: &Path, release: bool) -> Result<(Vec<u8>, PathBuf), String> {
    let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".into());
    let mut cmd = Command::new(cargo);
-    cmd.current_dir(root).args([
+    cmd.args([
        "build",
        "--lib",
        "--target",
@@ -235,39 +137,17 @@ fn compile(root: &Path, release: bool) -> Result<(Vec<u8>, PathBuf), String> {
        .rfind(|f| f.extension().is_some_and(|e| e == "wasm"))
        .ok_or("the build made no .wasm: is the crate a cdylib?")?;
    let wasm = componentize(&std::fs::read(&core).map_err(|e| e.to_string())?)?;
-    let target = core.ancestors().nth(3).ok_or("unexpected target folder")?;
-    Ok((wasm, target.to_path_buf()))
-}
-
-/// `check <file>`: the registry's checks of a submission, printed; fails
-/// when one does.
-fn check(args: &[String]) -> Result<(), String> {
-    let file = args
-        .first()
-        .filter(|a| !a.starts_with("--"))
-        .ok_or("cargo horizon-mod check <file>")?;
-    let path = Path::new(file);
-    let kind = match flag(args, "--kind") {
-        Some(k) => horizon_mods::index::Kind::from(k.to_string()),
-        None => check::kind_of(path)
-            .ok_or("pass --kind mod|modpack|resourcepack: the extension doesn't say")?,
-    };
-    let signature = flag(args, "--signature")
-        .map(|p| std::fs::read_to_string(p).map_err(|e| format!("{p}: {e}")))
-        .transpose()?;
-    let report = check::check(path, kind, flag(args, "--key"), signature.as_deref());
-    if args.iter().any(|a| a == "--json") {
-        let json = match &report {
-            Ok(r) => serde_json::json!({"ok": true, "report": r.json()}),
-            Err(e) => serde_json::json!({"ok": false, "error": e}),
-        };
-        println!("{json}");
-    }
-    let report = report?;
-    if !args.iter().any(|a| a == "--json") {
-        print!("{}", report.text());
-    }
-    Ok(())
+    // The game refuses a component importing capabilities the manifest lacks.
+    manifest.check_imports(component_imports(&wasm)?.iter().map(String::as_str))?;
+    let target_dir = core.ancestors().nth(3).ok_or("unexpected target folder")?;
+    let dir = target_dir.join("horizon-mod");
+    std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?;
+    let path = dir.join(format!("{}.hmod", manifest.id));
+    // Write then rename, so a running game never reads half a file.
+    let partial = path.with_extension("hmod.partial");
+    std::fs::write(&partial, Package::write(&manifest_text, &wasm)?).map_err(|e| e.to_string())?;
+    std::fs::rename(&partial, &path).map_err(|e| e.to_string())?;
+    Ok(path)
 }

 fn run(args: &[String]) -> Result<(), String> {
@@ -318,49 +198,4 @@ mod tests {
        );
        std::fs::remove_dir_all(&dir).unwrap();
    }
-
-    #[test]
-    fn the_content_template_builds_and_checks_with_no_code() {
-        let dir = std::env::temp_dir().join(format!("horizon-mod-content-{}", std::process::id()));
-        let path = dir.join("gems");
-        let new_args = [
-            path.display().to_string(),
-            "--template".into(),
-            "content".into(),
-        ];
-        new(&new_args).unwrap();
-        assert!(!path.join("Cargo.toml").exists());
-        let hmod = build_in(&path, true).unwrap();
-        assert_eq!(hmod, path.join("target/horizon-mod/gems.hmod"));
-        let package = Package::read(&hmod).unwrap();
-        assert!(package.wasm.is_none());
-        let content = Content::read(&hmod, &package.manifest).unwrap();
-        assert!(
-            content
-                .files
-                .contains(&"data/gems/horizon/block/glowing_amethyst.json".into())
-        );
-        assert_eq!(content.files.len(), 8, "{:?}", content.files);
-        let report = check::check(&hmod, check::kind_of(&hmod).unwrap(), None, None).unwrap();
-        assert!(!report.code);
-        assert!(
-            report.text().contains("no code: content only"),
-            "{}",
-            report.text()
-        );
-        // Without registries, a mod needs code.
-        let manifest = std::fs::read_to_string(path.join(MANIFEST)).unwrap();
-        let manifest = manifest.replace("[\"registries\"]", "[]");
-        std::fs::write(path.join(MANIFEST), manifest).unwrap();
-        assert!(build_in(&path, true).unwrap_err().contains("no Cargo.toml"));
-        assert!(
-            new(&[
-                dir.join("x").display().to_string(),
-                "--template".into(),
-                "lua".into()
-            ])
-            .is_err()
-        );
-        std::fs::remove_dir_all(&dir).unwrap();
-    }
 }
@@ -1,159 +0,0 @@
-//! `cargo horizon-mod registry build|review|check|list`: the registry repository's CI
-//! (`ludovic111/horizon-mods`, docs/api/mod-index.md). Network-free: the
-//! workflow downloads the files and publishes what this writes.
-use horizon_mods::index::{
-    FILE_HOST,
-    registry::{self, Sources},
-};
-use std::path::Path;
-
-/// Where the registry's site is published (its icons).
-const SITE: &str = "https://ludovic111.github.io/horizon-mods/";
-
-const USAGE: &str = "usage: cargo horizon-mod registry build <checkout> --files <dir> --out <index.json> [--release <url>] [--site <url>] [--generated <time>]
-       cargo horizon-mod registry review <base checkout> <head checkout> --author <login> [--json]
-       cargo horizon-mod registry check <base checkout> <head checkout> --files <dir>
-       cargo horizon-mod registry list <checkout>";
-
-fn flag<'a>(args: &'a [String], name: &str) -> Option<&'a str> {
-    super::flag(args, name)
-}
-
-fn positional(args: &[String]) -> Vec<&str> {
-    let mut out = Vec::new();
-    let mut skip = false;
-    for a in args {
-        if skip {
-            skip = false;
-        } else if a == "--json" {
-        } else if a.starts_with("--") {
-            skip = true;
-        } else {
-            out.push(a.as_str());
-        }
-    }
-    out
-}
-
-fn lines(errors: Vec<String>) -> String {
-    format!("{} problem(s):\n  {}", errors.len(), errors.join("\n  "))
-}
-
-pub fn main(args: &[String]) -> Result<(), String> {
-    let rest = args.get(1..).unwrap_or_default();
-    let pos = positional(rest);
-    match args.first().map(String::as_str) {
-        Some("build") => {
-            let [checkout] = pos[..] else {
-                return Err(USAGE.into());
-            };
-            let (files, out) = (flag(rest, "--files"), flag(rest, "--out"));
-            let (Some(files), Some(out)) = (files, out) else {
-                return Err(USAGE.into());
-            };
-            let generated = flag(rest, "--generated")
-                .map(str::to_owned)
-                .or_else(|| std::env::var("REGISTRY_GENERATED").ok())
-                .unwrap_or_default();
-            let index = registry::build(&Sources {
-                registry: Path::new(checkout),
-                files: Path::new(files),
-                release: flag(rest, "--release").unwrap_or(FILE_HOST),
-                site: flag(rest, "--site").unwrap_or(SITE),
-                generated,
-            })
-            .map_err(lines)?;
-            let text = serde_json::to_string_pretty(&index).map_err(|e| e.to_string())?;
-            std::fs::write(out, text + "\n").map_err(|e| format!("{out}: {e}"))?;
-            println!(
-                "Wrote {out}: {} project(s), {} taken down",
-                index.projects.len(),
-                index.revoked.len()
-            );
-            Ok(())
-        }
-        Some("review") => {
-            let [base, head] = pos[..] else {
-                return Err(USAGE.into());
-            };
-            let author = flag(rest, "--author").ok_or(USAGE)?;
-            let (base, _) = registry::load(Path::new(base)).map_err(lines)?;
-            let (head, _) = registry::load(Path::new(head)).map_err(lines)?;
-            let review = registry::review(&base, &head, author);
-            if rest.iter().any(|a| a == "--json") {
-                let json = serde_json::json!({"errors": review.errors, "notes": review.notes});
-                println!("{json}");
-            } else {
-                for n in &review.notes {
-                    println!("note: {n}");
-                }
-                for e in &review.errors {
-                    println!("error: {e}");
-                }
-            }
-            if review.errors.is_empty() {
-                Ok(())
-            } else {
-                Err(format!(
-                    "{} change(s) the registry refuses",
-                    review.errors.len()
-                ))
-            }
-        }
-        // `check` (and its trial run) on each file `head` lists and `base`
-        // doesn't: a pull request's new files.
-        Some("check") => {
-            let [base, head] = pos[..] else {
-                return Err(USAGE.into());
-            };
-            let files = Path::new(flag(rest, "--files").ok_or(USAGE)?);
-            let old: Vec<String> = match registry::load(Path::new(base)) {
-                Ok((entries, _)) => entries
-                    .iter()
-                    .flat_map(|e| e.versions.iter().map(|v| v.sha256.clone()))
-                    .collect(),
-                // The first pull request has no entries to compare with.
-                Err(_) => Vec::new(),
-            };
-            let (entries, _) = registry::load(Path::new(head)).map_err(lines)?;
-            let mut failed = 0;
-            for e in &entries {
-                for v in e.versions.iter().filter(|v| !old.contains(&v.sha256)) {
-                    println!("{} {} ({}):", e.id, v.version, v.file);
-                    let report = crate::check::check(
-                        &files.join(&v.sha256),
-                        e.kind.clone(),
-                        e.key.as_deref(),
-                        v.signature.as_deref(),
-                    );
-                    match report {
-                        Ok(r) => print!("{}", r.text()),
-                        Err(err) => {
-                            failed += 1;
-                            println!("  error: {err}");
-                        }
-                    }
-                }
-            }
-            if failed == 0 {
-                Ok(())
-            } else {
-                Err(format!("{failed} file(s) failed their check"))
-            }
-        }
-        // The files CI must download for `build`: `<sha256> <id> <version> <file>`.
-        Some("list") => {
-            let [checkout] = pos[..] else {
-                return Err(USAGE.into());
-            };
-            let (entries, _) = registry::load(Path::new(checkout)).map_err(lines)?;
-            for e in &entries {
-                for v in &e.versions {
-                    println!("{} {} {} {}", v.sha256, e.id, v.version, v.file);
-                }
-            }
-            Ok(())
-        }
-        _ => Err(USAGE.into()),
-    }
-}
@@ -1,4 +0,0 @@
-{
-  "template": "minecraft:amethyst_block",
-  "properties": { "hardness": 2.0, "light": 7 }
-}
@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "": { "model": "{id}:block/glowing_amethyst" }
-  }
-}
@@ -1,10 +0,0 @@
-id = "{id}"
-name = "{name}"
-version = "0.1.0"
-description = ""
-authors = []
-# A content mod: blocks and items from data/ and assets/, no code (API 0.2).
-api = "0.2"
-side = "both"
-# registries: "May add blocks and items to your worlds".
-capabilities = ["registries"]
@@ -1,3 +0,0 @@
-{
-  "model": { "type": "minecraft:model", "model": "{id}:block/glowing_amethyst" }
-}
@@ -1,3 +0,0 @@
-{
-  "block.{id}.glowing_amethyst": "Glowing Amethyst"
-}
@@ -1,11 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "condition": { "type": "minecraft:survives_explosion" },
-      "entries": [{ "type": "minecraft:item", "name": "{id}:glowing_amethyst" }],
-      "rolls": 1
-    }
-  ],
-  "random_sequence": "{id}:blocks/glowing_amethyst"
-}
@@ -1,4 +0,0 @@
-{
-  "parent": "minecraft:block/cube_all",
-  "textures": { "all": "minecraft:block/amethyst_block" }
-}
@@ -1,3 +0,0 @@
-{
-  "values": ["{id}:glowing_amethyst"]
-}
@@ -1,6 +0,0 @@
-{
-  "type": "minecraft:crafting_shapeless",
-  "category": "building",
-  "ingredients": ["minecraft:amethyst_block", "minecraft:glowstone_dust"],
-  "result": { "id": "{id}:glowing_amethyst" }
-}
@@ -4,15 +4,15 @@ use crate::json::{Result, error};
 use horizon_core::random::RandomSource;

 #[derive(Clone, Debug)]
-enum Choice<T> {
-    Single(T),
+enum Choice {
+    Single(Variant),
    Weighted {
-        variants: Vec<T>,
+        variants: Vec<Variant>,
        ends: Vec<i32>,
        total: i32,
    },
 }
-impl Choice<Variant> {
+impl Choice {
    fn new(value: &VariantSet) -> Result<Self> {
        match value {
            VariantSet::Single(value) => Ok(Self::Single(value.clone())),
@@ -41,23 +41,7 @@ impl Choice<Variant> {
            }
        }
    }
-}
-impl<T> Choice<T> {
-    fn map<U>(&self, f: &mut impl FnMut(&T) -> U) -> Choice<U> {
-        match self {
-            Self::Single(value) => Choice::Single(f(value)),
-            Self::Weighted {
-                variants,
-                ends,
-                total,
-            } => Choice::Weighted {
-                variants: variants.iter().map(&mut *f).collect(),
-                ends: ends.clone(),
-                total: *total,
-            },
-        }
-    }
-    fn select(&self, random: &mut impl RandomSource) -> &T {
+    fn select(&self, random: &mut impl RandomSource) -> &Variant {
        match self {
            Self::Single(value) => value,
            Self::Weighted {
@@ -76,11 +60,10 @@ impl<T> Choice<T> {
 }
 /// Compile once per definition and share across its bound block states. Prefix
 /// sums avoid rebuilding weight totals or scanning all entries during selection.
-/// `map` swaps each variant for what it stands for (its baked model).
 #[derive(Clone, Debug)]
-pub struct CompiledChoices<T = Variant> {
-    variants: Vec<Choice<T>>,
-    multipart: Vec<Choice<T>>,
+pub struct CompiledChoices {
+    variants: Vec<Choice>,
+    multipart: Vec<Choice>,
 }
 impl CompiledChoices {
    pub fn new(definition: &BlockStateDefinition) -> Result<Self> {
@@ -99,19 +82,10 @@ impl CompiledChoices {
                .collect::<Result<_>>()?,
        })
    }
-}
-impl<T> CompiledChoices<T> {
-    /// The same choices, with `f` of each variant in its place.
-    pub fn map<U>(&self, mut f: impl FnMut(&T) -> U) -> CompiledChoices<U> {
-        CompiledChoices {
-            variants: self.variants.iter().map(|c| c.map(&mut f)).collect(),
-            multipart: self.multipart.iter().map(|c| c.map(&mut f)).collect(),
-        }
-    }
    /// The variant `particleMaterial` comes from: the first entry of a weighted
    /// list (`WeightedVariants`) and, for a multipart root, of its first
    /// selector whether or not that selector applies (`MultiPartModel`).
-    pub fn particle_variant(&self, selected: &SelectedModels) -> Option<&T> {
+    pub fn particle_variant(&self, selected: &SelectedModels) -> Option<&Variant> {
        let choice = match selected {
            SelectedModels::Variant(index) => self.variants.get(*index)?,
            SelectedModels::Multipart(_) => self.multipart.first()?,
@@ -121,23 +95,14 @@ impl<T> CompiledChoices<T> {
            Choice::Weighted { variants, .. } => variants.first()?,
        })
    }
-    /// Append selected variants without allocating intermediate part lists.
+    /// Append selected variants without allocating intermediate part lists. A
+    /// multipart root consumes nextLong even for an empty selected subset, then
+    /// resets the same random source to that seed before each selected part.
    pub fn collect<'a>(
        &'a self,
        selected: &SelectedModels,
        random: &mut impl RandomSource,
-        output: &mut Vec<&'a T>,
-    ) -> Result<()> {
-        self.for_each(selected, random, |v| output.push(v))
-    }
-    /// Each selected variant, in order. A multipart root consumes nextLong
-    /// even for an empty selected subset, then resets the same random source
-    /// to that seed before each selected part.
-    pub fn for_each<'a>(
-        &'a self,
-        selected: &SelectedModels,
-        random: &mut impl RandomSource,
-        mut f: impl FnMut(&'a T),
+        output: &mut Vec<&'a Variant>,
    ) -> Result<()> {
        match selected {
            SelectedModels::Variant(index) => {
@@ -145,7 +110,7 @@ impl<T> CompiledChoices<T> {
                    .variants
                    .get(*index)
                    .ok_or_else(|| error("invalid variant selection"))?;
-                f(choice.select(random));
+                output.push(choice.select(random));
            }
            SelectedModels::Multipart(indices) => {
                if indices.iter().any(|index| *index >= self.multipart.len()) {
@@ -154,7 +119,7 @@ impl<T> CompiledChoices<T> {
                let seed = random.next_long();
                for index in indices {
                    random.set_seed(seed);
-                    f(self.multipart[*index].select(random));
+                    output.push(self.multipart[*index].select(random));
                }
            }
        }
@@ -1,7 +1,8 @@
 //! The machine a report was measured on. CPU, RAM and OS are detected here; the GPU and the display
 //! come from the program that rendered (the game knows its adapter, the launcher its window).

-use horizon_telemetry::system::command_output as output;
+use std::process::Command;
+
 use serde::{Deserialize, Serialize};

 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
@@ -172,6 +173,12 @@ pub fn cpu_seconds(pid: u32) -> Option<f64> {
    Some(ticks / 100.0)
 }

+fn output(program: &str, args: &[&str]) -> Option<String> {
+    let out = Command::new(program).args(args).output().ok()?;
+    let text = String::from_utf8(out.stdout).ok()?.trim().to_owned();
+    (out.status.success() && !text.is_empty()).then_some(text)
+}
+
 #[cfg(target_os = "macos")]
 fn os_version() -> Option<String> {
    output("sw_vers", &["-productVersion"])
@@ -245,19 +245,13 @@ pub struct Report {
 impl Report {
    /// An empty report for this machine, created now.
    pub fn new(kind: Kind, app: App) -> Report {
-        Self::with_hardware(kind, app, Hardware::detect())
-    }
-
-    /// Starts a report using supplied hardware, without running system probes.
-    /// Interactive apps can collect the remaining machine details after their first frame.
-    pub fn with_hardware(kind: Kind, app: App, hardware: Hardware) -> Report {
        Report {
            format: FORMAT.to_owned(),
            version: VERSION,
            kind,
            created: utc_now(),
            app,
-            hardware,
+            hardware: Hardware::detect(),
            conditions: Conditions::default(),
            metrics: BTreeMap::new(),
            frames: Vec::new(),
@@ -173,11 +173,6 @@ impl Random {
    }
 }

-/// One bot thread that panics poisons the locks it held; the others and the report go on.
-fn lock<T>(m: &Mutex<T>) -> std::sync::MutexGuard<'_, T> {
-    m.lock().unwrap_or_else(std::sync::PoisonError::into_inner)
-}
-
 fn raw(id: i32, write: impl FnOnce(&mut Writer)) -> Vec<u8> {
    let mut w = Writer::new();
    w.varint(id);
@@ -334,7 +329,7 @@ fn read(
 ) {
    use ids::play::clientbound as cb;
    use ids::play::serverbound as sb;
-    let send = |body: Vec<u8>| lock(&writer).send(&body);
+    let send = |body: Vec<u8>| writer.lock().unwrap().send(&body);
    let mut seen = HashSet::new();
    let mut batch = BatchSize::new();
    let mut teleports = 0u64;
@@ -343,7 +338,7 @@ fn read(
            Ok(packet) => packet,
            Err(e) => {
                if bot.online.swap(false, Ordering::SeqCst) {
-                    *lock(&bot.error) = Some(e.to_string());
+                    *bot.error.lock().unwrap() = Some(e.to_string());
                }
                return;
            }
@@ -361,7 +356,7 @@ fn read(
            cb::LEVEL_CHUNK_WITH_LIGHT => {
                bot.chunks.fetch_add(1, Ordering::Relaxed);
                if let (Ok(x), Ok(z)) = (r.i32(), r.i32()) {
-                    if !lock(&bot.held).insert((x, z)) {
+                    if !bot.held.lock().unwrap().insert((x, z)) {
                        bot.resent.fetch_add(1, Ordering::Relaxed);
                    }
                    if seen.insert((x, z)) {
@@ -373,7 +368,7 @@ fn read(
            cb::FORGET_LEVEL_CHUNK => {
                if let Ok(play::Clientbound::ForgetLevelChunk(p)) =
                    play::Clientbound::decode(id, &body)
-                    && lock(&bot.held).remove(&(p.pos[0], p.pos[1]))
+                    && bot.held.lock().unwrap().remove(&(p.pos[0], p.pos[1]))
                {
                    bot.forgotten.fetch_add(1, Ordering::Relaxed);
                }
@@ -394,7 +389,7 @@ fn read(
            }
            cb::PLAYER_POSITION => match play::Clientbound::decode(id, &body) {
                Ok(play::Clientbound::PlayerPosition(p)) => {
-                    let mut at = lock(&bot.teleport);
+                    let mut at = bot.teleport.lock().unwrap();
                    let previous = at.unwrap_or([0.0; 3]);
                    // Relative flags: X 1, Y 2, Z 4.
                    let pos: [f64; 3] = std::array::from_fn(|i| {
@@ -425,7 +420,7 @@ fn read(
            },
            cb::DISCONNECT | cb::START_CONFIGURATION => {
                bot.online.store(false, Ordering::SeqCst);
-                *lock(&bot.error) = Some(if id == cb::DISCONNECT {
+                *bot.error.lock().unwrap() = Some(if id == cb::DISCONNECT {
                    format!(
                        "disconnected: {}",
                        String::from_utf8_lossy(&body)
@@ -460,7 +455,7 @@ fn run_bot(
    let connection = match join(&o, &name) {
        Ok(c) => c,
        Err(e) => {
-            *lock(&bot.error) = Some(e);
+            *bot.error.lock().unwrap() = Some(e);
            return;
        }
    };
@@ -474,12 +469,12 @@ fn run_bot(
    use ids::play::serverbound as sb;
    // Wait for the spawn position.
    let spawn = loop {
-        if let Some(at) = *lock(&bot.teleport) {
+        if let Some(at) = *bot.teleport.lock().unwrap() {
            break at;
        }
        if !bot.online.load(Ordering::SeqCst) || asked.elapsed() > Duration::from_secs(60) {
-            if lock(&bot.error).is_none() {
-                *lock(&bot.error) = Some("no spawn position within 60 s".into());
+            if bot.error.lock().unwrap().is_none() {
+                *bot.error.lock().unwrap() = Some("no spawn position within 60 s".into());
            }
            return;
        }
@@ -487,7 +482,7 @@ fn run_bot(
    };
    bot.joined_after_ms
        .store(asked.elapsed().as_millis() as u64, Ordering::SeqCst);
-    let send = |body: Vec<u8>| lock(&writer).send(&body).is_ok();
+    let send = |body: Vec<u8>| writer.lock().unwrap().send(&body).is_ok();
    send(raw(sb::PLAYER_LOADED, |_| {}));
    let mut random = Random(o.seed ^ (index as u64).wrapping_mul(0x2545_F491_4F6C_DD1D));
    let mut pos = spawn;
@@ -496,15 +491,17 @@ fn run_bot(
    let mut target = pos;
    let mut next = Instant::now();
    loop {
-        if lock(&until).is_some_and(|u| Instant::now() >= u) || !bot.online.load(Ordering::SeqCst) {
+        if until.lock().unwrap().is_some_and(|u| Instant::now() >= u)
+            || !bot.online.load(Ordering::SeqCst)
+        {
            break;
        }
        // A teleport from the server wins over where the bot thought it was.
-        if let Some(at) = lock(&bot.teleport).take() {
+        if let Some(at) = bot.teleport.lock().unwrap().take() {
            pos = at;
        }
        let here = ((pos[0].floor() as i32) >> 4, (pos[2].floor() as i32) >> 4);
-        if !lock(&bot.held).contains(&here) {
+        if !bot.held.lock().unwrap().contains(&here) {
            bot.waited.fetch_add(1, Ordering::Relaxed);
        } else if pos[1] < cruise {
            pos[1] = (pos[1] + 0.5).min(cruise);
@@ -561,7 +558,7 @@ fn run_bot(
    }
    // Offline first, so the reader doesn't count the closed connection as a failure.
    bot.online.store(false, Ordering::SeqCst);
-    lock(&writer).shutdown();
+    writer.lock().unwrap().shutdown();
 }

 fn behaviour_of(mode: &str, index: usize) -> Behaviour {
@@ -615,10 +612,13 @@ fn main() {
        let total = |f: fn(&Bot) -> &AtomicU64| -> u64 {
            bots.iter().map(|b| f(b).load(Ordering::Relaxed)).sum()
        };
-        let failed = bots.iter().filter(|b| lock(&b.error).is_some()).count();
+        let failed = bots
+            .iter()
+            .filter(|b| b.error.lock().unwrap().is_some())
+            .count();
        if first.is_none() && online > 0 {
            first = Some(Instant::now());
-            *lock(&until) = Some(Instant::now() + Duration::from_secs(o.seconds));
+            *until.lock().unwrap() = Some(Instant::now() + Duration::from_secs(o.seconds));
        }
        println!(
            "{}",
@@ -636,10 +636,10 @@ fn main() {
            })
        );
        previous_chunks = chunks;
-        let over = lock(&until).is_some_and(|u| Instant::now() >= u);
+        let over = until.lock().unwrap().is_some_and(|u| Instant::now() >= u);
        let all_failed = failed == o.bots;
        if over || all_failed || (first.is_none() && start.elapsed() > Duration::from_secs(120)) {
-            *lock(&until) = Some(Instant::now());
+            *until.lock().unwrap() = Some(Instant::now());
            break;
        }
    }
@@ -669,7 +669,7 @@ fn main() {
            "forgotten": b.forgotten.load(Ordering::Relaxed),
            "pulled_back": b.pulled_back.load(Ordering::Relaxed),
            "waited_ticks": b.waited.load(Ordering::Relaxed),
-            "error": *lock(&b.error),
+            "error": *b.error.lock().unwrap(),
        })).collect::<Vec<_>>(),
    });
    if o.report.as_deref() == Some("-") {
@@ -16,26 +16,25 @@ horizon-world = { path = "../horizon-world" }
 horizon-protocol = { path = "../horizon-protocol" }
 # server.properties, eula.txt and the user lists, shared with horizon-server.
 horizon-server-files = { path = "../horizon-server-files" }
-# Shader packs: reading them and turning their GLSL into naga modules.
-horizon-shaders = { path = "../horizon-shaders" }
 horizon-friends = { path = "../horizon-friends" }
 # Horizon mods: sandboxed WebAssembly components, off unless installed and turned on (docs/mods.md).
-# Their runtime is the `mods` feature.
-horizon-mods = { path = "../horizon-mods", default-features = false }
-wgpu = { version = "30.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "metal", "wgsl", "naga-ir"] }
+horizon-mods = { path = "../horizon-mods" }
+wgpu = { version = "30.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "metal", "wgsl"] }
 winit = "0.30.13"
 pollster = "0.4"
 bytemuck = { version = "1.24", features = ["derive"] }
 glam = "0.30"
 png = "0.18"
 sha2 = "0.10.9"
-# Server resource packs are checked and cached by their SHA-1, as vanilla does.
-sha1 = "0.10"
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1.0.151", features = ["raw_value"] }
+# Shader packs: pack.toml, and WGSL checked before it reaches wgpu.
+toml = "1.1"
 # hlsl-out: the gfx.rs tests translate every shader as wgpu's DirectX 12 backend does. A normal feature,
 # not a dev-dependency's, so builds, tests and examples share one build of naga, wgpu and this crate.
 naga = { version = "30.0.1", features = ["wgsl-in", "hlsl-out"] }
+# Java (OptiFine/Iris) shader packs, translated to WGSL.
+horizon-shaderpack = { path = "../horizon-shaderpack" }
 # Sound (ALSA on Linux); the `audio` feature.
 cpal = { version = "0.16", optional = true }
 symphonia = { version = "0.5", default-features = false, features = ["ogg", "vorbis"] }
@@ -79,20 +78,8 @@ default = ["audio", "controllers"]
 audio = ["dep:cpal"]
 # Controllers: gilrs, and the DualSense's own output. Without it only `horizon-ctl pad`'s virtual pad.
 controllers = ["dep:gilrs", "dep:horizon-dualsense"]
-# Runs code mods (wasmtime and cranelift: a quarter of a clean build). On in every release build
-# (release.yml); the tests and probes don't need it. Content mods load without it.
-mods = ["horizon-mods/runtime"]
 # Records the call sites of mob random draws (`mob_ai_probe` traces).
 rng-trace = ["horizon-core/rng-trace"]

-# Its own name, not `probe`: Cargo copies every crate's examples into one target/<profile>/examples.
-[[example]]
-name = "client_probe"
-path = "examples/probe/main.rs"
-
 [lints]
 workspace = true
-
-[dev-dependencies]
-# Every WGSL shader translated as wgpu's DirectX 12 backend does (gfx.rs tests).
-naga = { version = "30.0.1", features = ["wgsl-in", "hlsl-out", "msl-out", "spv-out"] }
@@ -1,15 +0,0 @@
-{
-  "horizon.options.controller": "Controller",
-  "horizon.options.vibration": "Vibration",
-  "horizon.options.adaptive_triggers": "Adaptive Triggers",
-  "horizon.options.lightbar": "Lightbar",
-  "horizon.options.look_sensitivity": "Look Sensitivity",
-  "horizon.options.invert_x": "Invert Look X",
-  "horizon.options.invert_y": "Invert Look Y",
-  "horizon.options.sneak_button": "Sneak Button",
-  "horizon.options.move_deadzone": "Move Deadzone",
-  "horizon.options.look_deadzone": "Look Deadzone",
-  "horizon.options.button_glyphs": "Button Glyphs",
-  "horizon.options.menu_navigation": "Menu Navigation",
-  "horizon.options.on_screen_keyboard": "On-Screen Keyboard"
-}
@@ -1,15 +0,0 @@
-{
-  "horizon.options.controller": "Геймпад",
-  "horizon.options.vibration": "Вибрация",
-  "horizon.options.adaptive_triggers": "Адаптивные триггеры",
-  "horizon.options.lightbar": "Подсветка",
-  "horizon.options.look_sensitivity": "Чувствительность обзора",
-  "horizon.options.invert_x": "Инверсия обзора по X",
-  "horizon.options.invert_y": "Инверсия обзора по Y",
-  "horizon.options.sneak_button": "Кнопка приседания",
-  "horizon.options.move_deadzone": "Мёртвая зона движения",
-  "horizon.options.look_deadzone": "Мёртвая зона обзора",
-  "horizon.options.button_glyphs": "Символы кнопок",
-  "horizon.options.menu_navigation": "Навигация по меню",
-  "horizon.options.on_screen_keyboard": "Экранная клавиатура"
-}
@@ -1,7 +1,8 @@
 //! Replays `tools/test_ambient_sound_parity.py` scripts through Horizon's
 //! ambient sound handlers over its `SoundEngine`:
 //! `ambient_fixture ROOT INPUT OUTPUT`.
-use crate::audio_common as common;
+#[path = "audio_common/mod.rs"]
+mod common;
 use common::{Fake, d, f, flush};
 use horizon_client::ambience::{Ambience, AmbientContext, AmbientSounds, Mood, bubble_column_in};
 use horizon_client::sound_engine::{Bound, SoundEngine, TickContext, Ticking};
@@ -46,8 +47,8 @@ fn sounds(a: &[&str]) -> AmbientSounds {
    }
 }

-pub fn main() {
-    let args: Vec<String> = crate::args().collect();
+fn main() {
+    let args: Vec<String> = std::env::args().collect();
    let mut engine = SoundEngine::new(SoundRegistry::load(std::path::Path::new(&args[1])));
    engine.listening = true;
    let mut backend = Fake::default();
@@ -50,8 +50,8 @@ fn particle(k: ArrowParticle) -> &'static str {
        ArrowParticle::Splash => "splash",
    }
 }
-pub fn main() -> Result<()> {
-    let args: Vec<_> = crate::args().skip(1).collect();
+fn main() -> Result<()> {
+    let args: Vec<_> = std::env::args().skip(1).collect();
    if args.len() != 3 {
        return Err("usage: arrow_probe RESOURCES FIXTURE_DIRECTORY --describe|REFERENCE".into());
    }
@@ -18,8 +18,8 @@ fn music(m: Option<&Music>) -> String {
    })
 }

-pub fn main() {
-    let args: Vec<String> = crate::args().collect();
+fn main() {
+    let args: Vec<String> = std::env::args().collect();
    let root = std::path::Path::new(&args[1]);
    let tables = MusicTables::load(root);
    let ambient = AmbientTables::load(root);
@@ -24,8 +24,8 @@ fn db(v: &Value) -> f64 {
    f64::from_bits(u64::from_str_radix(v.as_str().unwrap(), 16).unwrap())
 }

-pub fn main() -> Result<()> {
-    let args: Vec<_> = crate::args().skip(1).collect();
+fn main() -> Result<()> {
+    let args: Vec<_> = std::env::args().skip(1).collect();
    let [root, input, output, scene_json] = &args[..] else {
        return Err("usage: auto_jump_probe RESOURCES INPUT OUTPUT SCENE_JSON".into());
    };
@@ -118,8 +118,8 @@ fn status(s: ShulkerStatus) -> &'static str {
    }
 }

-pub fn main() -> Result<()> {
-    let args: Vec<PathBuf> = crate::args_os().skip(1).map(PathBuf::from).collect();
+fn main() -> Result<()> {
+    let args: Vec<PathBuf> = std::env::args_os().skip(1).map(PathBuf::from).collect();
    let [root, inputs, output] = args.as_slice() else {
        return Err("usage: block_entity_anim_fixture RESOURCES INPUTS OUTPUT".into());
    };
@@ -110,8 +110,8 @@ fn intern(s: &str) -> &'static str {
    }
 }

-pub fn main() -> Result<()> {
-    let args: Vec<PathBuf> = crate::args_os().skip(1).map(PathBuf::from).collect();
+fn main() -> Result<()> {
+    let args: Vec<PathBuf> = std::env::args_os().skip(1).map(PathBuf::from).collect();
    let [root, inputs, textures, output] = args.as_slice() else {
        return Err("usage: block_entity_render_fixture RESOURCES INPUTS TEXTURES OUTPUT".into());
    };
@@ -26,8 +26,8 @@ fn entity(name: &str) -> BlockEntity {
        .unwrap_or_else(|| panic!("no block entity for {name}"))
 }

-pub fn main() {
-    let args: Vec<String> = crate::args().collect();
+fn main() {
+    let args: Vec<String> = std::env::args().collect();
    let input = std::fs::read_to_string(&args[1]).expect("input");
    let mut out = String::new();
    let mut entities = BlockEntities::default();
@@ -0,0 +1,104 @@
+//! Full production fact loading, including file reads, interning and temporary destruction.
+//! cargo run --profile fast -p horizon-client --example block_facts_bench -- ROOT [SAMPLES]
+//! Use SAMPLES=1 with an OS peak-RSS wrapper; `digest` checks all facts
+//! and the shape sharing partition (including sharing between outlines and edges).
+use horizon_client::blocks::BlockFacts;
+use horizon_world::{DATA_VERSION, nbt::Tag, registry::BlockRegistry};
+use serde_json::Value;
+use std::{
+    collections::{HashMap, hash_map::DefaultHasher},
+    fs,
+    hash::{Hash, Hasher},
+    hint::black_box,
+    path::Path,
+    time::Instant,
+};
+type Result<T> = horizon_client::Result<T>;
+
+fn tag(value: &Value) -> Result<Tag> {
+    Ok(match value {
+        Value::String(s) => Tag::String(s.as_str().into()),
+        Value::Number(n) => Tag::Int(i32::try_from(n.as_i64().ok_or("registry number")?)?),
+        Value::Array(a) => Tag::List(a.iter().map(tag).collect::<Result<_>>()?),
+        Value::Object(o) => Tag::Compound(
+            o.iter()
+                .map(|(k, v)| Ok((k.as_str().into(), tag(v)?)))
+                .collect::<Result<_>>()?,
+        ),
+        _ => return Err("registry value".into()),
+    })
+}
+fn registry(root: &Path) -> Result<BlockRegistry> {
+    let facts: Value = serde_json::from_slice(&fs::read(root.join("facts.json"))?)?;
+    Ok(BlockRegistry::from_nbt(&Tag::compound([
+        ("DataVersion", Tag::Int(DATA_VERSION)),
+        (
+            "states",
+            Tag::List(
+                facts["states"]
+                    .as_array()
+                    .ok_or("registry states")?
+                    .iter()
+                    .map(|s| tag(&s[4]))
+                    .collect::<Result<_>>()?,
+            ),
+        ),
+        ("defaults", tag(&facts["defaults"])?),
+    ]))?)
+}
+fn main() -> Result<()> {
+    let args: Vec<_> = std::env::args().skip(1).collect();
+    let root = Path::new(
+        args.first()
+            .ok_or("usage: block_facts_bench ROOT [SAMPLES|digest]")?,
+    );
+    let setup = Instant::now();
+    let registry = registry(root)?;
+    println!(
+        "registry_setup_ms={:.3}",
+        setup.elapsed().as_secs_f64() * 1000.0
+    );
+    if args.get(1).is_some_and(|s| s == "digest") {
+        let facts = BlockFacts::load(root, &registry)?;
+        let mut hash = DefaultHasher::new();
+        let mut shapes = HashMap::new();
+        facts.air.hash(&mut hash);
+        for state in &facts.states {
+            format!("{state:?}").hash(&mut hash);
+            for shape in [&state.outline, &state.outline_edges] {
+                let next = shapes.len();
+                shapes
+                    .entry((shape.as_ptr(), shape.len()))
+                    .or_insert(next)
+                    .hash(&mut hash);
+            }
+        }
+        println!(
+            "states={} shared_shapes={} digest={:016x}",
+            facts.states.len(),
+            shapes.len(),
+            hash.finish()
+        );
+        return Ok(());
+    }
+    let samples: usize = args.get(1).map(|s| s.parse()).transpose()?.unwrap_or(9);
+    assert!(samples > 0);
+    // First load is reported separately; OS file caches are not forcibly evicted.
+    let load = || -> Result<f64> {
+        let start = Instant::now();
+        let facts = black_box(BlockFacts::load(black_box(root), black_box(&registry))?);
+        let ms = start.elapsed().as_secs_f64() * 1000.0;
+        drop(facts);
+        Ok(ms)
+    };
+    println!("first_load_ms={:.3}", load()?);
+    if samples > 1 {
+        load()?;
+        load()?;
+        let mut times = (0..samples).map(|_| load()).collect::<Result<Vec<_>>>()?;
+        println!("samples_ms={times:.3?}");
+        times.sort_by(f64::total_cmp);
+        println!("median_ms={:.3}", times[times.len() / 2]);
+    }
+    Ok(())
+}
@@ -8,8 +8,8 @@ use std::{
    io::{BufRead, BufReader, BufWriter, Write},
    path::Path,
 };
-pub fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args: Vec<_> = crate::args().collect();
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let args: Vec<_> = std::env::args().collect();
    let root = Path::new(&args[1]);
    let assets = Assets::load(root)?;
    let render = assets.reload(root)?;
@@ -51,8 +51,8 @@ impl Around for Column {
    }
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: block_transform_fixture RESOURCES INPUT OUTPUT")?,
@@ -16,8 +16,8 @@ use std::{
 };
 /// The stage sprite origin the cracks carry (the oracle compares the geometry and UVs only).
 const STAGE: [f32; 2] = [0.25, 0.5];
-pub fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args: Vec<_> = crate::args().collect();
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let args: Vec<_> = std::env::args().collect();
    let root = Path::new(&args[1]);
    let assets = Assets::load(root)?;
    let render = assets.reload(root)?;
@@ -323,8 +323,8 @@ fn avatar(c: &Value, out: &mut impl Write) -> Result<()> {
    Ok(())
 }

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let input = BufReader::new(File::open(&args[1])?);
    let mut out = BufWriter::new(File::create(&args[2])?);
    for (n, line) in input.lines().enumerate() {
@@ -70,8 +70,8 @@ fn describe(state: &BlockState) -> String {
    format!("{}|{}", state.name, props.join(","))
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: cauldron_fixture RESOURCES INPUT OUTPUT")?,
@@ -5,7 +5,6 @@
 //! the oracle's JSON form.
 //!
 //! usage: chat_screen_fixture RESOURCES REGISTRIES CASES OUTPUT
-use crate::pack_screen_fixture;
 use horizon_client::{
    chat::{ChatAction, ChatScreen, Commands},
    command::vanilla,
@@ -16,11 +15,14 @@ use horizon_client::{
 use serde_json::{Value, json};
 use std::{fmt::Write as _, fs, path::PathBuf};
 use winit::keyboard::KeyCode as K;
+#[path = "pack_screen_fixture.rs"]
+#[allow(dead_code)]
+mod pack_screen_fixture;
 #[path = "chat_screen_fixture/registries.rs"]
 mod registries;

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<PathBuf> = crate::args_os().skip(1).map(PathBuf::from).collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<PathBuf> = std::env::args_os().skip(1).map(PathBuf::from).collect();
    let [root, registries, inputs, output] = args.as_slice() else {
        return Err("usage: chat_screen_fixture RESOURCES REGISTRIES CASES OUTPUT".into());
    };
@@ -0,0 +1,216 @@
+//! Resident chunk storage benchmark: generates a block of vanilla terrain, then
+//! reports the resident block/biome memory, the cost of lookups, meshing and
+//! lighting on it.
+//!
+//! chunk_bench <client resource dir> [--seed S] [--size N]
+#![forbid(unsafe_code)]
+use horizon_client::{
+    assets::Assets,
+    biome::Biomes,
+    blocks::BlockFacts,
+    chunk::{Chunk, MIN_Y, SECTIONS},
+    light::{LightTables, apply_lighting, light_chunk},
+    mesher::{MeshTables, Mesher},
+    models,
+    streaming::{ChunkGenerator, Proto},
+    vanillagen::VanillaTerrain,
+};
+use horizon_core::biome::BiomeZoom;
+use std::{path::PathBuf, sync::Arc, time::Instant};
+type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
+
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().skip(1).collect();
+    let root = PathBuf::from(args.first().ok_or("usage: chunk_bench RESOURCES")?);
+    let flag = |name: &str, default: i64| -> i64 {
+        args.iter()
+            .position(|a| a == name)
+            .and_then(|i| args.get(i + 1))
+            .and_then(|v| v.parse().ok())
+            .unwrap_or(default)
+    };
+    let (seed, size) = (flag("--seed", 12345), flag("--size", 8) as i32);
+    let assets = Assets::load(&root)?;
+    let render = assets.reload(&root)?;
+    let facts = BlockFacts::load(&root, assets.registry)?;
+    let biomes = Biomes::load(&root)?;
+    let tables = MeshTables::new(
+        &assets,
+        &render,
+        &facts,
+        models::load_visibility(&root, assets.registry)?,
+    )?;
+    let light = LightTables::load(&root, assets.registry, &facts)?;
+    let terrain = VanillaTerrain::new(&root.join("worldgen"), assets.registry, &biomes, seed)?;
+    let mut worker = terrain.worker();
+
+    // Protos for size+4 columns, decorated for the inner size+2, finished as size+2.
+    let started = Instant::now();
+    let outer = size + 4;
+    let mut protos: Vec<Option<Proto>> = (0..outer * outer)
+        .map(|i| Some(terrain.proto(&mut worker, i % outer, i / outer)))
+        .collect();
+    eprintln!("proto: {:.2}s", started.elapsed().as_secs_f64());
+    let started = Instant::now();
+    let inner = size + 2;
+    for z in 1..=inner {
+        for x in 1..=inner {
+            let mut region: [Proto; 9] = std::array::from_fn(|k| {
+                let (dx, dz) = (k as i32 % 3 - 1, k as i32 / 3 - 1);
+                protos[((z + dz) * outer + x + dx) as usize]
+                    .take()
+                    .expect("proto")
+            });
+            terrain.decorate(&mut worker, &mut region);
+            for (k, p) in region.into_iter().enumerate() {
+                let (dx, dz) = (k as i32 % 3 - 1, k as i32 / 3 - 1);
+                protos[((z + dz) * outer + x + dx) as usize] = Some(p);
+            }
+        }
+    }
+    eprintln!("decorate: {:.2}s", started.elapsed().as_secs_f64());
+    let started = Instant::now();
+    let mut chunks: Vec<Chunk> = Vec::new();
+    for z in 1..=inner {
+        for x in 1..=inner {
+            let proto = protos[(z * outer + x) as usize].take().expect("proto");
+            let mut chunk = terrain.finish(proto);
+            chunk.x = x;
+            chunk.z = z;
+            chunks.push(chunk);
+        }
+    }
+    let finish = started.elapsed().as_secs_f64();
+    println!(
+        "finish (proto -> resident chunk): {:.1} ms per chunk",
+        finish * 1e3 / chunks.len() as f64
+    );
+
+    let chunks: Vec<Arc<Chunk>> = chunks.into_iter().map(Arc::new).collect();
+    let at = |x: i32, z: i32| chunks[((z - 1) * inner + x - 1) as usize].clone();
+
+    // Light all inner-inner columns.
+    let started = Instant::now();
+    let mut lit = Vec::new();
+    for z in 2..inner {
+        for x in 2..inner {
+            let region: [[Option<Arc<Chunk>>; 3]; 3] = std::array::from_fn(|dz| {
+                std::array::from_fn(|dx| Some(at(x + dx as i32 - 1, z + dz as i32 - 1)))
+            });
+            let borrowed = horizon_client::mesher::borrow(&region);
+            lit.push(((x, z), light_chunk(&borrowed, &light, true)));
+        }
+    }
+    println!(
+        "light: {:.2} ms per column",
+        started.elapsed().as_secs_f64() * 1e3 / lit.len() as f64
+    );
+    let mut chunks: Vec<Chunk> = chunks.iter().map(|c| (**c).clone()).collect();
+    for ((x, z), sections) in lit {
+        apply_lighting(&mut chunks[((z - 1) * inner + x - 1) as usize], sections);
+    }
+    let chunks: Vec<Arc<Chunk>> = chunks.into_iter().map(Arc::new).collect();
+    let at = |x: i32, z: i32| chunks[((z - 1) * inner + x - 1) as usize].clone();
+
+    // Memory.
+    let (mut bytes, mut sections, mut uniform) = (0usize, 0usize, 0usize);
+    for chunk in &chunks {
+        bytes += chunk.heap_bytes();
+        for s in &chunk.sections {
+            sections += 1;
+            uniform += usize::from(s.is_uniform(s.get(0)));
+        }
+    }
+    println!(
+        "resident: {} chunks, {} sections ({} uniform), {:.1} KiB per chunk ({:.2} MiB total)",
+        chunks.len(),
+        sections,
+        uniform,
+        bytes as f64 / 1024.0 / chunks.len() as f64,
+        bytes as f64 / 1048576.0
+    );
+
+    // Meshing.
+    let mut mesher = Mesher {
+        nether_shading: false,
+        assets: &assets,
+        render: &render,
+        tables: &tables,
+        biomes: &biomes,
+        visibility: tables.visibility.clone(),
+        zoom: BiomeZoom::new(7),
+        blend_radius: 2,
+        smooth_lighting: true,
+        cutout_leaves: true,
+        cull_leaves: false,
+    };
+    let mut best = f64::MAX;
+    let mut quads = 0usize;
+    for _ in 0..3 {
+        let started = Instant::now();
+        let mut jobs = 0;
+        quads = 0;
+        for z in 2..inner {
+            for x in 2..inner {
+                let region: [[Option<Arc<Chunk>>; 3]; 3] = std::array::from_fn(|dz| {
+                    std::array::from_fn(|dx| Some(at(x + dx as i32 - 1, z + dz as i32 - 1)))
+                });
+                let borrowed = horizon_client::mesher::borrow(&region);
+                for sy in 0..SECTIONS as i32 {
+                    let mesh = mesher.mesh(&borrowed, sy);
+                    quads += (mesh.solid.len() + mesh.translucent.len()) / 4;
+                    jobs += 1;
+                }
+            }
+        }
+        best = best.min(started.elapsed().as_secs_f64() / f64::from(jobs));
+    }
+    println!(
+        "mesh: {:.1} us per section ({} quads total)",
+        best * 1e6,
+        quads
+    );
+
+    // Random lookups, as collision and entity queries do.
+    let mut state = 0x9E37_79B9_7F4A_7C15u64;
+    let started = Instant::now();
+    let mut sum = 0u64;
+    let lookups = 20_000_000u64;
+    for _ in 0..lookups {
+        state ^= state << 13;
+        state ^= state >> 7;
+        state ^= state << 17;
+        let cx = 2 + (state % u64::from((inner - 2) as u32)) as i32;
+        let cz = 2 + ((state >> 8) % u64::from((inner - 2) as u32)) as i32;
+        let chunk = &chunks[((cz - 1) * inner + cx - 1) as usize];
+        let (x, y, z) = (
+            (state >> 16) as i32 & 15,
+            MIN_Y + ((state >> 24) % 384) as i32,
+            (state >> 40) as i32 & 15,
+        );
+        sum += u64::from(chunk.get(x, y, z));
+    }
+    println!(
+        "random get: {:.2} ns per lookup (checksum {sum})",
+        started.elapsed().as_secs_f64() * 1e9 / lookups as f64
+    );
+    // Coherent scan, as a column or area query does.
+    let started = Instant::now();
+    let mut sum = 0u64;
+    for _ in 0..4 {
+        for chunk in &chunks {
+            for y in MIN_Y..MIN_Y + 384 {
+                for z in 0..16 {
+                    for x in 0..16 {
+                        sum += u64::from(chunk.get(x, y, z));
+                    }
+                }
+            }
+        }
+    }
+    println!(
+        "scan get: {:.2} ns per lookup (checksum {sum})",
+        started.elapsed().as_secs_f64() * 1e9 / (4.0 * chunks.len() as f64 * 98304.0)
+    );
+    Ok(())
+}
@@ -1,168 +0,0 @@
-//! What a column costs to load, on real terrain: generates and lights the
-//! columns around a point with the vanilla generator, as a world being explored
-//! does, then meshes every section of the inner columns on this one thread, so a
-//! change to generation or meshing shows as time per column and per section.
-//!
-//!     cargo run --release -p horizon-client --example chunk_load_bench -- \
-//!         .local/horizon-client/26.3 [--seed 1234] [--center CX CZ] [--radius 8]
-//!         [--threads N] [--rounds 3]
-//!
-//! The default centre is the village of `tools/perf_bench.py`. The generation
-//! figure is wall time with N workers (the game's own pool); the mesh figure is
-//! this thread's CPU time in `Mesher::mesh`, the best of `--rounds`, so other
-//! work on the machine changes it less. The checksum of the meshes shows that an
-//! A/B pair of builds made the same ones.
-use horizon_client::{
-    assets::Assets,
-    biome::Biomes,
-    blocks::BlockFacts,
-    chunk::HEIGHT,
-    light::LightTables,
-    mesher::{MeshTables, Mesher, Region, borrow},
-    models,
-    spans::thread_cpu,
-    streaming::{Streaming, WorkerContext},
-    vanillagen::VanillaTerrain,
-    world::World,
-};
-use horizon_core::biome::{BiomeZoom, obfuscate_seed};
-use horizon_world::registry::BlockStateId;
-use std::{
-    hash::{DefaultHasher, Hash, Hasher},
-    path::PathBuf,
-    sync::Arc,
-    thread,
-    time::{Duration, Instant},
-};
-
-type Error = Box<dyn std::error::Error>;
-
-fn flag<T: std::str::FromStr>(args: &[String], name: &str, default: T) -> T {
-    args.iter()
-        .position(|a| a == name)
-        .and_then(|i| args.get(i + 1)?.parse().ok())
-        .unwrap_or(default)
-}
-
-fn main() -> Result<(), Error> {
-    let args: Vec<String> = std::env::args().collect();
-    let root = PathBuf::from(args.get(1).ok_or("usage: chunk_load_bench <resources>")?);
-    let seed: i64 = flag(&args, "--seed", 1234);
-    let radius: i32 = flag(&args, "--radius", 8);
-    let rounds: usize = flag(&args, "--rounds", 3);
-    let threads: usize = flag(
-        &args,
-        "--threads",
-        thread::available_parallelism().map_or(2, |n| n.get()),
-    );
-    let center = args
-        .iter()
-        .position(|a| a == "--center")
-        .map(|i| -> Result<(i32, i32), Error> {
-            Ok((
-                args.get(i + 1).ok_or("--center CX CZ")?.parse()?,
-                args.get(i + 2).ok_or("--center CX CZ")?.parse()?,
-            ))
-        })
-        .transpose()?
-        .unwrap_or((-60, 10));
-
-    let assets = Arc::new(Assets::load(&root)?);
-    let render = Arc::new(assets.reload(&root)?);
-    let facts = BlockFacts::load(&root, assets.registry)?;
-    let visibility = models::load_visibility(&root, assets.registry)?;
-    let biomes = Arc::new(Biomes::load(&root)?);
-    let context = Arc::new(WorkerContext {
-        tables: Arc::new(MeshTables::new(&assets, &render, &facts, visibility)?),
-        light: Arc::new(LightTables::load(&root, assets.registry, &facts)?),
-        biomes: biomes.clone(),
-        assets: assets.clone(),
-        render,
-    });
-    let terrain = VanillaTerrain::new(&root.join("worldgen"), assets.registry, &biomes, seed)?;
-
-    // Generation and light, on the game's worker pool. Meshing is left out
-    // here and measured on its own below.
-    let mut streaming = Streaming::new(Arc::new(terrain), context.clone(), threads);
-    streaming.mesh = false;
-    streaming.center = center;
-    streaming.radius = radius;
-    let mut world = World::new(BlockStateId(0), 0);
-    let started = Instant::now();
-    let mut quiet = 0;
-    while quiet < 100 {
-        let before = world.chunks.len();
-        let _ = streaming.update(&mut world);
-        thread::sleep(Duration::from_millis(2));
-        quiet = if streaming.pending() == 0 && before == world.chunks.len() {
-            quiet + 1
-        } else {
-            0
-        };
-    }
-    let generated = started.elapsed() - Duration::from_millis(2 * 100);
-    let columns = world.chunks.len();
-    println!(
-        "generated and lit {columns} columns in {:.0} ms with {threads} workers ({:.2} ms per column)",
-        generated.as_secs_f64() * 1e3,
-        generated.as_secs_f64() * 1e3 / columns.max(1) as f64
-    );
-
-    // Meshing every section of the columns whose neighbours are all loaded.
-    let inner = radius - 1;
-    let regions: Vec<(Region, i32)> = (center.0 - inner..=center.0 + inner)
-        .flat_map(|x| (center.1 - inner..=center.1 + inner).map(move |z| (x, z)))
-        .filter_map(|(x, z)| {
-            let region: Region = std::array::from_fn(|dz| {
-                std::array::from_fn(|dx| {
-                    world
-                        .chunks
-                        .get(&(x + dx as i32 - 1, z + dz as i32 - 1))
-                        .cloned()
-                })
-            });
-            region
-                .iter()
-                .flatten()
-                .all(Option::is_some)
-                .then_some(region)
-        })
-        .flat_map(|region| (0..HEIGHT / 16).map(move |sy| (region.clone(), sy)))
-        .collect();
-    let mut best = Duration::MAX;
-    let (mut vertices, mut checksum) = (0, 0);
-    for _ in 0..rounds.max(1) {
-        let mut mesher = Mesher {
-            nether_shading: false,
-            zoom: BiomeZoom::new(obfuscate_seed(seed)),
-            blend_radius: 2,
-            smooth_lighting: true,
-            cutout_leaves: true,
-            assets: &context.assets,
-            render: &context.render,
-            tables: &context.tables,
-            biomes: &context.biomes,
-            visibility: context.tables.visibility.clone(),
-        };
-        vertices = 0;
-        let mut hash = DefaultHasher::new();
-        let mut spent = Duration::ZERO;
-        for (region, sy) in &regions {
-            let started = thread_cpu().ok_or("no thread CPU clock here")?;
-            let mesh = mesher.mesh(&borrow(region), *sy);
-            spent += thread_cpu().ok_or("no thread CPU clock here")? - started;
-            vertices += mesh.solid.len() + mesh.translucent.len();
-            bytemuck::cast_slice::<_, u8>(&mesh.solid).hash(&mut hash);
-            bytemuck::cast_slice::<_, u8>(&mesh.translucent).hash(&mut hash);
-        }
-        checksum = hash.finish();
-        best = best.min(spent);
-    }
-    println!(
-        "meshed {} sections ({vertices} vertices, checksum {checksum:016x}) in {:.1} ms of CPU ({:.1} us per section)",
-        regions.len(),
-        best.as_secs_f64() * 1e3,
-        best.as_secs_f64() * 1e6 / regions.len().max(1) as f64
-    );
-    Ok(())
-}
@@ -1,8 +1,8 @@
 //! CloudRenderer face selection and mesh traversal, without a GPU.
 use horizon_client::clouds;
 use std::{fmt::Write, fs};
-pub fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args: Vec<_> = crate::args().collect();
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let args: Vec<_> = std::env::args().collect();
    let mut output = String::new();
    for (case, line) in fs::read_to_string(&args[1])?.lines().enumerate() {
        let values: Vec<i32> = line
@@ -132,8 +132,8 @@ fn tree(d: &Dispatcher, node: usize) -> Value {
    v
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    if args.get(1).map(String::as_str) == Some("tree") {
        let d = &vanilla::registered(false);
        let mut v = tree(d, 0);
@@ -24,8 +24,8 @@ fn input_name(input: Input) -> &'static str {
    }
 }

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let input = BufReader::new(File::open(&args[1])?);
    let mut out = BufWriter::new(File::create(&args[2])?);
    for (n, line) in input.lines().enumerate() {
@@ -11,8 +11,8 @@ use horizon_client::{
 use serde_json::{Value, json};
 use std::{fs, path::Path};

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let usage = "usage: creative_search_fixture RESOURCES CREATIVE_JSON VANILLA_JSON OUTPUT";
    let names = Names::load(Path::new(args.get(1).ok_or(usage)?));
    let creative = Creative::from_json(&serde_json::from_slice(&fs::read(
@@ -14,8 +14,8 @@ fn d(v: f64) -> String {
    format!("{:016x}", v.to_bits())
 }

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let mut out = BufWriter::new(File::create(&args[2])?);
    for (n, line) in BufReader::new(File::open(&args[1])?).lines().enumerate() {
        let c: Value = serde_json::from_str(&line?)?;
@@ -10,8 +10,8 @@ use horizon_client::{
 };
 use std::{fmt::Write as _, fs, path::Path};

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: enchanting_fixture RESOURCES INPUT OUTPUT")?,
@@ -3,7 +3,7 @@
 //! posed model with `mobs::render::draw` under the case's living-entity root
 //! transform and writes each drawn part's packed vertex normals.
 //!
-//! cargo run --profile fast -p horizon-client --example probe -- entity_anim_fixture \
+//! cargo run --profile fast -p horizon-client --example entity_anim_fixture -- \
 //!     RESOURCES VANILLA.jsonl OUT.jsonl
 use horizon_client::mesher::Vertex;
 use horizon_client::mobs::{
@@ -288,8 +288,8 @@ fn entity_state(mob: &mut Mob, species: Species, case: &Value) {
    }
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().skip(1).collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().skip(1).collect();
    let root = PathBuf::from(&args[0]);
    let types = MobTypes::load(&root)?;
    let animations = MobData::load_animations(&root);
@@ -61,8 +61,8 @@ fn species(id: &str) -> Species {
    }
 }

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let input = BufReader::new(File::open(&args[1])?);
    let mut out = BufWriter::new(File::create(&args[2])?);
    for (n, line) in input.lines().enumerate() {
@@ -53,8 +53,8 @@ fn line(s: &LootStack) -> String {
    out
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: entity_death_loot_fixture RESOURCES INPUT OUTPUT")?,
@@ -0,0 +1,140 @@
+//! Isolated production mob-model builder benchmark; no assets, Game, GPU or full-frame work.
+//! CARGO_TARGET_DIR=/home/bob/Documents/horizon/target CARGO_INCREMENTAL=0 \
+//! cargo run --profile fast -p horizon-client --example entity_geometry_bench
+use horizon_client::{
+    mesher::Vertex,
+    mobs::{Part, Polygon, anim::Poses, render},
+};
+use std::{hint::black_box, time::Instant};
+
+fn cube(name: String, position: f32) -> Part {
+    let polygons = (0..6)
+        .map(|face| {
+            let axis = face / 2;
+            let side = (face % 2) as f32;
+            let mut normal = [0.0; 3];
+            normal[axis] = side * 2.0 - 1.0;
+            Polygon {
+                normal,
+                vertices: [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0], [0.0, 1.0]].map(|uv| {
+                    let mut vertex = [0.0; 5];
+                    vertex[axis] = side * 8.0;
+                    vertex[(axis + 1) % 3] = uv[0] * 8.0;
+                    vertex[(axis + 2) % 3] = uv[1] * 8.0;
+                    vertex[3] = uv[0];
+                    vertex[4] = uv[1];
+                    vertex
+                }),
+            }
+        })
+        .collect();
+    Part {
+        name,
+        pose: [position, 0.0, 0.0, 0.1, 0.2, 0.0, 1.0, 1.0, 1.0],
+        polygons,
+        children: Vec::new(),
+    }
+}
+
+fn build(model: &Part, poses: &Poses, count: usize, out: &mut Vec<Vertex>) {
+    for i in 0..count {
+        render::draw(
+            black_box(model),
+            glam::Mat4::from_translation(glam::Vec3::new((i % 32) as f32, 0.0, (i / 32) as f32)),
+            black_box(poses),
+            [0.125, 0.25, 0.5, 0.75],
+            0xffc0_d0e0,
+            0xf0f0,
+            0,
+            out,
+        );
+    }
+    black_box(out.as_slice());
+}
+
+fn measure(model: &Part, poses: &Poses, count: usize, iterations: usize, reuse: bool) -> f64 {
+    let mut retained = Vec::new();
+    build(model, poses, count, &mut retained); // Untimed warmup.
+    let start = Instant::now();
+    for _ in 0..iterations {
+        let mut out = if reuse {
+            std::mem::take(&mut retained)
+        } else {
+            Vec::new()
+        };
+        out.clear();
+        build(model, poses, count, &mut out);
+        if reuse {
+            retained = out;
+        }
+    }
+    start.elapsed().as_secs_f64() * 1e6 / iterations as f64
+}
+
+fn main() {
+    let mut model = cube("body".into(), 0.0);
+    model.children = (1..6).map(|i| cube(format!("part{i}"), i as f32)).collect();
+    let poses = Poses::new(&model);
+    for count in [32, 256, 1024, 4096, 8192] {
+        let mut expected = Vec::new();
+        build(&model, &poses, count, &mut expected);
+        let mut retained = Vec::new();
+        build(&model, &poses, count, &mut retained);
+        let (pointer, capacity) = (retained.as_ptr(), retained.capacity());
+        // Populated -> empty/reset -> smaller -> populated must never leave stale vertices.
+        for n in [0, count / 2, count, count] {
+            retained.clear();
+            build(&model, &poses, n, &mut retained);
+            let mut fresh = Vec::new();
+            build(&model, &poses, n, &mut fresh);
+            assert_eq!(
+                bytemuck::cast_slice::<Vertex, u8>(&retained),
+                bytemuck::cast_slice::<Vertex, u8>(&fresh)
+            );
+            assert_eq!(
+                (retained.as_ptr(), retained.capacity()),
+                (pointer, capacity)
+            );
+        }
+        assert_eq!(
+            bytemuck::cast_slice::<Vertex, u8>(&retained),
+            bytemuck::cast_slice::<Vertex, u8>(&expected)
+        );
+        let iterations = (100_000 / count).clamp(40, 1000);
+        let mut fresh = Vec::new();
+        let mut reused = Vec::new();
+        let mut paired_speedups = Vec::new();
+        // Alternate order, reporting medians over eleven warmed batches.
+        for batch in 0..11 {
+            let mut pair = [0.0; 2];
+            for reuse in if batch % 2 == 0 {
+                [false, true]
+            } else {
+                [true, false]
+            } {
+                let time = measure(&model, &poses, count, iterations, reuse);
+                pair[usize::from(reuse)] = time;
+                if reuse {
+                    reused.push(time);
+                } else {
+                    fresh.push(time);
+                }
+            }
+            paired_speedups.push(pair[0] / pair[1]);
+        }
+        paired_speedups.sort_by(f64::total_cmp);
+        fresh.sort_by(f64::total_cmp);
+        reused.sort_by(f64::total_cmp);
+        println!(
+            "entities={count} vertices={} capacity={capacity} retained_bytes={} fresh_us={:.3} reused_us={:.3} speedup={:.3}x paired_speedup_median={:.3}x paired_speedup_range={:.3}..{:.3}x iterations={iterations} batches=11 byte_equivalence=pass pointer_capacity_reuse=pass",
+            retained.len(),
+            capacity * size_of::<Vertex>(),
+            fresh[5],
+            reused[5],
+            fresh[5] / reused[5],
+            paired_speedups[5],
+            paired_speedups[0],
+            paired_speedups[10]
+        );
+    }
+}
@@ -13,8 +13,8 @@ fn d(v: f64) -> String {
    format!("{:016x}", v.to_bits())
 }

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let mut out = BufWriter::new(File::create(&args[2])?);
    for (n, line) in BufReader::new(File::open(&args[1])?).lines().enumerate() {
        let c: Value = serde_json::from_str(&line?)?;
@@ -9,8 +9,8 @@ use horizon_client::{
 };
 use std::{collections::HashMap, fmt::Write as _, fs, path::Path};

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: environment_fixture RESOURCES INPUT OUTPUT")?,
@@ -388,8 +388,8 @@ fn describe(m: &Mob, all: &[Mob], regs: &SpawnRegistries) -> String {
    t.join(" ")
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: finalize_spawn_fixture RESOURCES INPUT OUTPUT HALLOWEEN")?,
@@ -11,8 +11,8 @@ use std::{
    io::{BufRead, BufReader, BufWriter, Write},
 };

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let input = BufReader::new(File::open(&args[1])?);
    let mut out = BufWriter::new(File::create(&args[2])?);
    for line in input.lines() {
@@ -4,8 +4,8 @@
 use horizon_client::{enchant::Enchantments, item_data::parse_stack, item_tooltip::firework_lines};
 use std::{error::Error, fmt::Write, path::PathBuf};

-pub fn main() -> Result<(), Box<dyn Error>> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<(), Box<dyn Error>> {
+    let args: Vec<String> = std::env::args().collect();
    let input = std::fs::read_to_string(&args[1])?;
    let root = input
        .lines()
@@ -458,8 +458,8 @@ impl HandWorld for ResetWorld<'_, '_> {
    }
 }

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let input = BufReader::new(File::open(&args[1])?);
    let mut out = BufWriter::new(File::create(&args[2])?);
    for (n, line) in input.lines().enumerate() {
@@ -50,8 +50,8 @@ impl LimiterClock for Script {
    }
 }

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let input = BufReader::new(File::open(&args[1])?);
    let mut out = BufWriter::new(File::create(&args[2])?);
    for (n, line) in input.lines().enumerate() {
@@ -291,8 +291,8 @@ fn key(c: &Value, out: &mut impl Write) -> Result<()> {
    Ok(())
 }

-pub fn main() -> Result<()> {
-    let args: Vec<_> = crate::args().skip(1).collect();
+fn main() -> Result<()> {
+    let args: Vec<_> = std::env::args().skip(1).collect();
    let mut out = BufWriter::new(File::create(&args[1])?);
    for line in BufReader::new(File::open(&args[0])?).lines() {
        let c: Value = serde_json::from_str(&line?)?;
@@ -13,8 +13,8 @@ use horizon_client::{
 use serde_json::Value;
 use std::{fmt::Write as _, fs, path::Path};

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let usage = "usage: ghost_recipe_fixture RESOURCES CASES OUTPUT";
    let root = Path::new(args.get(1).ok_or(usage)?);
    let cases = fs::read_to_string(args.get(2).ok_or(usage)?)?;
@@ -2,7 +2,7 @@
 use horizon_client::command::args::GameMode;
 use horizon_client::items::{ItemStack, take_held_drop};

-pub fn main() {
+fn main() {
    for mode in [
        GameMode::Survival,
        GameMode::Creative,
@@ -10,8 +10,8 @@ use serde_json::Value;
 use std::path::Path;
 use std::{fmt::Write as _, fs};

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let usage = "usage: hotbar_fixture RESOURCES CASES OUTPUT";
    let items = Items::catalog(Path::new(args.first().and(args.get(1)).ok_or(usage)?))?;
    let known = |id: &str| items.get(id).is_some();
@@ -20,8 +20,8 @@ type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
 #[path = "hud_fixture/kinds.rs"]
 mod kinds;

-pub fn main() -> Result<()> {
-    let args: Vec<PathBuf> = crate::args_os().skip(1).map(PathBuf::from).collect();
+fn main() -> Result<()> {
+    let args: Vec<PathBuf> = std::env::args_os().skip(1).map(PathBuf::from).collect();
    let [root, inputs, output] = args.as_slice() else {
        return Err("usage: hud_fixture RESOURCES INPUTS OUTPUT".into());
    };
@@ -306,7 +306,6 @@ fn chat(c: &Value, h: i32, atlas: &HudAtlas) -> Vec<GuiDraw> {
        height_focused: option("chatHeightFocused"),
        height_unfocused: option("chatHeightUnfocused"),
        line_spacing: option("chatLineSpacing"),
-        colors: c["chatColors"].as_bool().unwrap_or(true),
    };
    for m in c["messages"].as_array().into_iter().flatten() {
        // GuiMessageTag indicator colours: systemSinglePlayer and chatError.
@@ -11,8 +11,8 @@ fn number(v: &Value) -> f32 {
 fn bits(v: f32) -> u32 {
    if v.is_nan() { 0x7fc00000 } else { v.to_bits() }
 }
-pub fn main() -> Result<()> {
-    let args: Vec<_> = crate::args().skip(1).collect();
+fn main() -> Result<()> {
+    let args: Vec<_> = std::env::args().skip(1).collect();
    let mut out = BufWriter::new(File::create(&args[1])?);
    for line in BufReader::new(File::open(&args[0])?).lines() {
        let f: Value = serde_json::from_str(&line?)?;
@@ -82,8 +82,8 @@ impl TargetUseWorld for World {
    }
 }

-pub fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args: Vec<_> = crate::args().collect();
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let args: Vec<_> = std::env::args().collect();
    let input = std::io::BufReader::new(std::fs::File::open(&args[1])?);
    let mut out = std::io::BufWriter::new(std::fs::File::create(&args[2])?);
    for (i, line) in input.lines().enumerate() {
@@ -0,0 +1,205 @@
+//! Compare the exact read/deserialize sequences used by the model loaders.
+//! Run with `cargo run -p horizon-client --profile fast --example json_readers_bench`.
+//! Optional arguments: resource directory, repetitions (default 9).
+use serde_json::{Map, Value, json};
+use std::{
+    collections::BTreeMap,
+    fmt::Debug,
+    fs::{self, File},
+    hint::black_box,
+    io::BufReader,
+    path::{Path, PathBuf},
+    time::Instant,
+};
+
+type Result<T> = horizon_client::Result<T>;
+
+#[derive(Clone, Copy)]
+enum Reader {
+    File,
+    Buffered,
+    Slice,
+}
+const READERS: [Reader; 3] = [Reader::File, Reader::Buffered, Reader::Slice];
+
+// These match the map types and reader expressions at all three production sites.
+macro_rules! reader {
+    ($name:ident, $map:ty) => {
+        fn $name(path: &Path, reader: Reader) -> Result<$map> {
+            Ok(match reader {
+                Reader::File => serde_json::from_reader(File::open(path)?)?,
+                Reader::Buffered => serde_json::from_reader(BufReader::new(File::open(path)?))?,
+                Reader::Slice => serde_json::from_slice(&fs::read(path)?)?,
+            })
+        }
+    };
+}
+reader!(prepare_facts, Map<String, Value>);
+reader!(catalog_facts, BTreeMap<String, Value>);
+
+struct Fixture(PathBuf);
+impl Fixture {
+    fn new() -> Result<Self> {
+        let root =
+            std::env::temp_dir().join(format!("horizon-json-readers-{}", std::process::id()));
+        fs::create_dir(&root)?;
+        Ok(Self(root))
+    }
+}
+impl Drop for Fixture {
+    fn drop(&mut self) {
+        let _ = fs::remove_dir_all(&self.0);
+    }
+}
+
+fn fixtures(root: &Path) -> Result<()> {
+    let states: Vec<_> = (0..56)
+        .map(|i| {
+            json!({"facing": (["north", "east", "south", "west"][i % 4]),
+                "powered": if i / 4 % 2 == 0 { "false" } else { "true" },
+                "age": (i / 8).to_string()})
+        })
+        .collect();
+    let mut models = Map::new();
+    let mut render = Map::new();
+    for i in 0..1024 {
+        let name = format!("minecraft:fixture_block_{i:04}");
+        models.insert(
+            name.clone(),
+            json!({
+                "schema": {"facing": {"named": ["north", "east", "south", "west"]},
+                    "powered": {"named": ["false", "true"]}, "age": {"integer": [0, 6]}},
+                "states": states
+            }),
+        );
+        render.insert(
+            name,
+            json!({"rule": "never", "can_occlude": true, "bars_tag": false}),
+        );
+    }
+    fs::write(root.join("model-states.json"), serde_json::to_vec(&models)?)?;
+    fs::write(
+        root.join("render-definitions.json"),
+        serde_json::to_vec(&render)?,
+    )?;
+    Ok(())
+}
+
+fn benchmark<T: PartialEq + Debug>(
+    label: &str,
+    path: &Path,
+    repetitions: usize,
+    read: impl Fn(&Path, Reader) -> Result<T>,
+) -> Result<()> {
+    let expected = read(path, Reader::File)?;
+    for reader in READERS {
+        assert_eq!(expected, read(path, reader)?);
+        for _ in 0..2 {
+            black_box(read(black_box(path), reader)?);
+        }
+    }
+    drop(expected);
+    let mut samples: [Vec<f64>; 3] = std::array::from_fn(|_| Vec::new());
+    for repetition in 0..repetitions {
+        // Rotate reader order to distribute drift across implementations.
+        for offset in 0..3 {
+            let index = (repetition + offset) % 3;
+            let start = Instant::now();
+            let value = black_box(read(black_box(path), READERS[index])?);
+            samples[index].push(start.elapsed().as_secs_f64() * 1000.0);
+            drop(value); // Match the loaders: retain the parsed tree after loading.
+        }
+    }
+    let median: Vec<_> = samples
+        .iter_mut()
+        .map(|s| {
+            s.sort_by(f64::total_cmp);
+            s[s.len() / 2]
+        })
+        .collect();
+    println!(
+        "{label}: {} bytes, {repetitions} samples/reader, median ms: File={:.3}, BufReader={:.3}, read+slice={:.3}; slice speedup={:.2}x",
+        fs::metadata(path)?.len(),
+        median[0],
+        median[1],
+        median[2],
+        median[0] / median[2]
+    );
+    Ok(())
+}
+
+fn main() -> Result<()> {
+    let args: Vec<_> = std::env::args().skip(1).collect();
+    let fixture = if args.is_empty() {
+        Some(Fixture::new()?)
+    } else {
+        None
+    };
+    let root = fixture
+        .as_ref()
+        .map(|f| f.0.clone())
+        .unwrap_or_else(|| PathBuf::from(&args[0]));
+    if fixture.is_some() {
+        fixtures(&root)?;
+        println!(
+            "Generated representative fixtures: 1024 blocks, 57344 model states; warm filesystem cache."
+        );
+    }
+    let repetitions = args.get(1).map(|s| s.parse()).transpose()?.unwrap_or(9);
+    assert!(repetitions > 0, "repetitions must be positive");
+    benchmark(
+        "prepare model states",
+        &root.join("model-states.json"),
+        repetitions,
+        prepare_facts,
+    )?;
+    benchmark(
+        "catalog model states",
+        &root.join("model-states.json"),
+        repetitions,
+        catalog_facts,
+    )?;
+    benchmark(
+        "render definitions",
+        &root.join("render-definitions.json"),
+        repetitions,
+        catalog_facts,
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn reader_equivalence_and_errors() -> Result<()> {
+        let fixture = Fixture::new()?;
+        let path = fixture.0.join("test.json");
+        fs::write(&path, br#"{"minecraft:stone":{"schema":{},"states":[{}]},"unicode":"\u2603","duplicate":1,"duplicate":2}"#)?;
+        let expected = prepare_facts(&path, Reader::File)?;
+        for reader in READERS {
+            assert_eq!(expected, prepare_facts(&path, reader)?);
+            assert_eq!(
+                expected.iter().collect::<BTreeMap<_, _>>(),
+                catalog_facts(&path, reader)?.iter().collect()
+            );
+        }
+        for invalid in [b"{\"a\": ".as_slice(), b"{} trailing", b"{\"a\":\"\xff\"}"] {
+            fs::write(&path, invalid)?;
+            for reader in READERS {
+                let error = prepare_facts(&path, reader).unwrap_err();
+                assert!(error.downcast_ref::<serde_json::Error>().is_some());
+                assert!(catalog_facts(&path, reader).is_err());
+            }
+        }
+        fs::remove_file(&path)?;
+        for reader in READERS {
+            let error = prepare_facts(&path, reader).unwrap_err();
+            assert_eq!(
+                error.downcast_ref::<std::io::Error>().unwrap().kind(),
+                std::io::ErrorKind::NotFound
+            );
+        }
+        Ok(())
+    }
+}
@@ -0,0 +1,144 @@
+//! Serve a small flat world on the LAN server without the game, for joining
+//! with a real client while developing the protocol:
+//! `cargo run --release --example lan_flat -- RESOURCES PORT`.
+use horizon_client::{
+    assets::Assets,
+    blocks::BlockFacts,
+    chunk::{Chunk, MIN_Y},
+    lan::{
+        Lan,
+        chunks::ChunkEncoder,
+        data::SyncData,
+        hub::{HostEvent, HostState, Hub, HubConfig, TickCtx},
+    },
+    world::World,
+};
+use horizon_protocol::packets::play::Serverbound as S;
+use std::{path::PathBuf, sync::Arc, time::Duration};
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let mut args = std::env::args().skip(1);
+    let root = PathBuf::from(args.next().ok_or("RESOURCES PORT")?);
+    let port: u16 = args.next().ok_or("port")?.parse()?;
+    let assets = Assets::load(&root)?;
+    let facts = BlockFacts::load(&root, assets.registry)?;
+    let state = |name: &str| assets.registry.default_state(name).map_or(0, |s| s.0);
+    let sync = Arc::new(SyncData::load(&root)?);
+    let biomes: Vec<String> = sync
+        .dynamic
+        .registries
+        .get("minecraft:worldgen/biome")
+        .map(|v| v.iter().map(|(n, _)| n.clone()).collect())
+        .unwrap_or_default();
+    let encoder = ChunkEncoder::new(
+        facts
+            .states
+            .iter()
+            .map(|s| (s.name.clone(), s.fluid_level > 0 || s.waterlogged)),
+        &sync.builtin,
+        &biomes,
+        &biomes,
+    );
+    let (stone, dirt, grass) = (
+        state("minecraft:stone"),
+        state("minecraft:dirt"),
+        state("minecraft:grass_block"),
+    );
+    let mut world = World::new(facts.air, 0);
+    for cz in -8..=8 {
+        for cx in -8..=8 {
+            let mut chunk = Chunk::empty(cx, cz);
+            for z in 0..16 {
+                for x in 0..16 {
+                    for y in MIN_Y..60 {
+                        let v = if y == 59 {
+                            grass
+                        } else if y > 55 {
+                            dirt
+                        } else {
+                            stone
+                        };
+                        chunk.set(x, y, z, v);
+                    }
+                }
+            }
+            chunk.lit = true;
+            world.chunks.insert((cx, cz), Arc::new(chunk));
+        }
+    }
+    let lan = Lan::start(sync.clone(), port, "Flat - Example".into(), 8)?;
+    println!("listening on {}", lan.port);
+    let mut hub = Hub::new(
+        lan,
+        sync,
+        encoder,
+        HubConfig {
+            default_game_mode: 1,
+            guest_commands: true,
+            force_game_mode: false,
+            hardcore: false,
+            view_distance: 8,
+            simulation_distance: 8,
+            dimension: "minecraft:overworld".into(),
+            seed: 0,
+            max_players: 8,
+            dedicated: false,
+            integrated: false,
+        },
+    );
+    let mut next_entity = 100u32;
+    let host = HostState {
+        uuid: 42,
+        name: "Host".into(),
+        entity_id: 1,
+        position: [0.5, 60.0, 0.5],
+        yaw: 0.0,
+        pitch: 0.0,
+        head_yaw: 0.0,
+        on_ground: true,
+        game_mode: 1,
+        sneaking: false,
+        sprinting: false,
+        equipment: Default::default(),
+        health: 20.0,
+        attributes: Vec::new(),
+        bed: None,
+        living_flags: 0,
+    };
+    loop {
+        world.game_time += 1;
+        world.day_time += 1;
+        let mut ctx = TickCtx {
+            world: &mut world,
+            host: Some(&host),
+            entities: &[],
+            next_entity: &mut next_entity,
+            spawn: [8.5, 60.0, 8.5],
+            difficulty: 2,
+            difficulty_locked: false,
+            clock_rate: 1.0,
+            tick_rate: 20.0,
+            tick_frozen: false,
+            tick_steps: (0, 0),
+            collision: None,
+            border: &horizon_client::worldborder::WorldBorder::default(),
+        };
+        for event in hub.tick(&mut ctx) {
+            match event {
+                HostEvent::Joined(conn) => hub.place_new_player(conn, &mut ctx),
+                HostEvent::Packet(_, packet) => {
+                    if std::env::var_os("HORIZON_NET_DEBUG").is_some()
+                        && !matches!(*packet, S::ClientTickEnd(_))
+                    {
+                        eprintln!("[lan] {packet:?}");
+                    }
+                }
+                HostEvent::Chat { line, .. } | HostEvent::Warn(line) | HostEvent::Error(line) => {
+                    println!("{line}")
+                }
+                HostEvent::Left(_) => {}
+            }
+        }
+        std::thread::sleep(Duration::from_millis(50));
+    }
+}
@@ -14,8 +14,8 @@ fn unhex(s: &str) -> Vec<u8> {
        .collect()
 }

-pub fn main() {
-    let args: Vec<String> = crate::args().collect();
+fn main() {
+    let args: Vec<String> = std::env::args().collect();
    let cases = std::fs::read_to_string(&args[1]).unwrap();
    let mut out = String::new();
    let mut games: Vec<LanGame> = Vec::new();
@@ -2,7 +2,7 @@
 //! server with Horizon's light engine and compare every SkyLight/BlockLight
 //! value with the arrays vanilla stored.
 //!
-//! cargo run --profile fast -p horizon-client --example probe -- light_parity \
+//! cargo run --profile fast -p horizon-client --example light_parity -- \
 //!     RESOURCES DIMENSION_DIR [--nether] [--chunks X0 Z0 X1 Z1]
 use horizon_client::{
    assets::Assets,
@@ -21,8 +21,8 @@ use std::{collections::HashMap, path::PathBuf};

 type Arrays = HashMap<i32, (Option<Vec<u8>>, Option<Vec<u8>>)>;

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().skip(1).collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().skip(1).collect();
    let root = PathBuf::from(
        args.first()
            .ok_or("usage: light_parity RESOURCES DIMENSION_DIR")?,
@@ -0,0 +1,153 @@
+//! Read-only saved chunk benchmark. All timings exclude resource/corpus setup.
+//!
+//! load_bench RESOURCES DIMENSION_DIR [--rounds N] [--limit N] [--checksum]
+//! Add --profile-worker when a sampling collector cannot sample the main thread.
+//! Reports warm filesystem SaveDir::load (read, inflate, NBT, decode and light),
+//! plus isolated inflate/NBT and native decode. No files in the save are changed.
+use horizon_client::{
+    assets::Assets,
+    biome::Biomes,
+    blocks::BlockFacts,
+    save::{SaveDir, SaveTables, decode_with},
+};
+use horizon_world::{nbt::Limits, region::RegionFile};
+use sha2::{Digest, Sha256};
+use std::{hint::black_box, path::PathBuf, sync::Arc, time::Instant};
+
+type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
+
+fn main() -> Result<()> {
+    if std::env::args().any(|a| a == "--profile-worker") {
+        std::thread::spawn(|| run().map_err(|e| e.to_string()))
+            .join()
+            .expect("benchmark worker")
+            .map_err(Into::into)
+    } else {
+        run()
+    }
+}
+
+fn run() -> Result<()> {
+    let args: Vec<String> = std::env::args().skip(1).collect();
+    let usage = "load_bench RESOURCES DIMENSION_DIR [--rounds N] [--limit N] [--checksum]";
+    let root = PathBuf::from(args.first().ok_or(usage)?);
+    let dimension = PathBuf::from(args.get(1).ok_or(usage)?);
+    let flag = |name: &str, default: usize| -> Result<usize> {
+        Ok(match args.iter().position(|a| a == name) {
+            Some(i) => args.get(i + 1).ok_or(usage)?.parse()?,
+            None => default,
+        })
+    };
+    let rounds = flag("--rounds", 5)?;
+    let limit = flag("--limit", 256)?;
+    if rounds == 0 || limit == 0 {
+        return Err("rounds and limit must be positive".into());
+    }
+    let assets = Assets::load(&root)?;
+    let facts = BlockFacts::load(&root, assets.registry)?;
+    let biomes = Biomes::load(&root)?;
+    let tables = Arc::new(SaveTables::new(&assets).with_block_entities(&facts));
+    let source = SaveDir::new(dimension.clone());
+    let _ = source.tables.set(tables.clone());
+    let mut paths: Vec<_> = std::fs::read_dir(dimension.join("region"))?
+        .map(|e| e.map(|e| e.path()))
+        .collect::<std::io::Result<_>>()?;
+    paths.retain(|p| p.extension().is_some_and(|e| e == "mca"));
+    paths.sort();
+    let mut corpus = Vec::new();
+    'regions: for path in paths {
+        let mut region = RegionFile::open(path)?;
+        let mut positions: Vec<_> = region.chunks().map(|(pos, _)| pos).collect();
+        positions.sort_by_key(|p| (p.x, p.z));
+        for pos in positions {
+            let record = region.read(pos)?.ok_or("missing record")?;
+            let tag = record.nbt(Limits::default())?;
+            if decode_with(&tag, assets.registry, &biomes, Some(&tables)).is_none() {
+                continue;
+            }
+            corpus.push((pos, record, tag));
+            if corpus.len() == limit {
+                break 'regions;
+            }
+        }
+    }
+    if corpus.is_empty() {
+        return Err("no full chunks in corpus".into());
+    }
+    let mut records_hash = Sha256::new();
+    for (pos, record, _) in &corpus {
+        records_hash.update(pos.x.to_le_bytes());
+        records_hash.update(pos.z.to_le_bytes());
+        records_hash.update((record.compressed.len() as u64).to_le_bytes());
+        records_hash.update(&record.compressed);
+    }
+    println!(
+        "{}",
+        serde_json::json!({"corpus": dimension, "chunks": corpus.len(), "rounds": rounds,
+            "compressed_records_sha256": format!("{:x}", records_hash.finalize()),
+            "compressed_bytes": corpus.iter().map(|(_, r, _)| r.compressed.len()).sum::<usize>()})
+    );
+    // Prime SaveDir's region handles and the filesystem cache before measurement.
+    for (pos, _, _) in &corpus {
+        black_box(
+            source
+                .load(pos.x, pos.z, assets.registry, &biomes)
+                .ok_or("load failed")?,
+        );
+    }
+    for round in 0..rounds {
+        let started = Instant::now();
+        for (pos, _, _) in &corpus {
+            black_box(
+                source
+                    .load(pos.x, pos.z, assets.registry, &biomes)
+                    .ok_or("load failed")?,
+            );
+        }
+        let load_s = started.elapsed().as_secs_f64();
+        let started = Instant::now();
+        for (_, record, _) in &corpus {
+            black_box(record.nbt(Limits::default())?);
+        }
+        let nbt_s = started.elapsed().as_secs_f64();
+        let started = Instant::now();
+        for (_, _, tag) in &corpus {
+            black_box(
+                decode_with(tag, assets.registry, &biomes, Some(&tables)).ok_or("decode failed")?,
+            );
+        }
+        let decode_s = started.elapsed().as_secs_f64();
+        println!(
+            "{}",
+            serde_json::json!({"round": round, "load_s": load_s,
+            "inflate_nbt_s": nbt_s, "decode_s": decode_s})
+        );
+    }
+    if args.iter().any(|a| a == "--checksum") {
+        let mut hash = Sha256::new();
+        let mut light_loaded = 0;
+        for (pos, _, _) in &corpus {
+            let chunk = source
+                .load(pos.x, pos.z, assets.registry, &biomes)
+                .ok_or("load failed")?;
+            hash.update(pos.x.to_le_bytes());
+            hash.update(pos.z.to_le_bytes());
+            light_loaded += usize::from(chunk.light_loaded);
+            for section in &chunk.sections {
+                for i in 0..4096 {
+                    hash.update(section.get(i).to_le_bytes());
+                    hash.update([section.light(i)]);
+                }
+                for i in 0..64 {
+                    hash.update(section.biomes.get(i).to_le_bytes());
+                }
+            }
+        }
+        println!(
+            "{}",
+            serde_json::json!({"blocks_biomes_light_sha256": format!("{:x}", hash.finalize()),
+            "light_loaded": light_loaded})
+        );
+    }
+    Ok(())
+}
@@ -22,8 +22,8 @@ use std::{
    sync::Arc,
 };

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(".local/horizon-client/26.3");
    let assets = Assets::load(root)?;
    let facts = BlockFacts::load(root, assets.registry)?;
@@ -58,12 +58,11 @@ fn state(menu: &Menu) -> String {
        .map(|(slot, stack)| format!("{slot}:{}", canon_stack(stack.as_ref())))
        .collect();
    let line = format!(
-        "{} | {} |{data} | {} | {} | {}",
+        "{} | {} |{data} | {} | {}",
        slots.join(" "),
        canon_stack(menu.carried.as_ref()),
        menu.drops.join(";"),
-        equipped.join(";"),
-        menu.player_sounds.join(";")
+        equipped.join(";")
    );
    if menu.kind() != Kind::Lectern {
        return line;
@@ -75,8 +74,8 @@ fn state(menu: &Menu) -> String {
    format!("{line} | inv{items}")
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: menu_fixture RESOURCES INPUT OUTPUT")?,
@@ -172,7 +171,6 @@ pub fn main() -> horizon_client::Result<()> {
        });
        menu.drops.clear();
        menu.equipped.clear();
-        menu.player_sounds.clear();
        out += &format!("init {}\n", state(&menu));
        for op in case["ops"].as_array().ok_or("ops")? {
            let slot = op[0].as_i64().unwrap_or(0) as i32;
@@ -4,8 +4,8 @@
 //! rows like VanillaMipmapOracle.
 use std::{fmt::Write as _, fs, path::Path};

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().skip(1).collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().skip(1).collect();
    let input = fs::read_to_string(&args[0])?;
    let mut lines = input.lines();
    let root = Path::new(lines.next().ok_or("no resources root")?);
@@ -293,47 +293,6 @@ fn spawn_seed(index: usize) -> i64 {
    1000 + 7919 * index as i64
 }

-/// `Villager.spawnGolemIfNeeded` for villager `a`, the game's way: the golem
-/// draws from the level's random and joins the scenario's mobs next tick,
-/// seeded as the oracle seeds what a tick spawned.
-fn summon_golem(
-    mobs: &mut [Mob],
-    a: usize,
-    needed: usize,
-    w: &MobWorld,
-    types: &MobTypes,
-    born: &mut Vec<Mob>,
-    level_random: &mut LegacyRandom,
-) {
-    use horizon_client::mobs::{villager, villager_brain};
-    let Some(near) = villager::golem_summoners(mobs, a, w.game_time, needed) else {
-        return;
-    };
-    let kind = Arc::new(
-        types
-            .types
-            .get("minecraft:iron_golem")
-            .expect("iron golem")
-            .clone(),
-    );
-    let index = mobs.len() + born.len();
-    let p = mobs[a].position;
-    let start = [p.x.floor() as i32, p.y.floor() as i32, p.z.floor() as i32];
-    let golem = villager::summon_golem(w, start, level_random, |random, at, yaw| {
-        let mut m = Mob::new(100_000 + index as u32, kind.clone(), at, yaw);
-        villager::finalize_summoned_golem(&mut m, random);
-        m
-    });
-    let Some(mut golem) = golem else {
-        return;
-    };
-    golem.random = LegacyRandom::new(spawn_seed(index));
-    born.push(golem);
-    for j in near {
-        villager_brain::golem_detected(&mut mobs[j], w.game_time);
-    }
-}
-
 /// Villager events that act at once in vanilla (`TradeWithVillager` and
 /// `VillagerMakeLove` write the other villager directly).
 fn villager_events(
@@ -345,7 +304,6 @@ fn villager_events(
    items: &Items,
    born: &mut Vec<Mob>,
    day_time: i64,
-    level_random: &mut LegacyRandom,
 ) {
    use horizon_client::mobs::villager;
    let index = |mobs: &[Mob], id: u32| {
@@ -356,7 +314,6 @@ fn villager_events(
    while i < events.len() {
        match events[i] {
            MobEvent::VillagerMeet { mob, other } => {
-                events.remove(i);
                if let (Some(a), Some(b)) = (index(mobs, mob), index(mobs, other)) {
                    let meeting = villager::meet(mobs, a, b, w.game_time, |item| {
                        items.get(item).map_or(64, |i| i.max_stack)
@@ -365,16 +322,8 @@ fn villager_events(
                        meeting.thrown.is_empty(),
                        "villagers toss items: not modelled here"
                    );
-                    if meeting.gossiped {
-                        summon_golem(mobs, a, 5, w, types, born, level_random);
-                    }
                }
-            }
-            MobEvent::GolemCheck { mob, needed } => {
                events.remove(i);
-                if let Some(a) = index(mobs, mob) {
-                    summon_golem(mobs, a, needed, w, types, born, level_random);
-                }
            }
            MobEvent::VillagerBirth {
                parent,
@@ -810,8 +759,8 @@ fn villager(m: &Mob) -> String {
    s
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().skip(1).collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().skip(1).collect();
    if args.len() != 3 {
        return Err("usage: mob_ai_probe RESOURCES SCENARIOS OUTPUT".into());
    }
@@ -1218,7 +1167,6 @@ pub fn main() -> horizon_client::Result<()> {
                    &items,
                    &mut born,
                    s.time,
-                    &mut scratch,
                );
                horizon_client::mobs::warden::hear_mob_events(&mut mobs, &events, from, &w);
                // Melee hits on other mobs land during the attacker's tick
@@ -1375,31 +1323,6 @@ pub fn main() -> horizon_client::Result<()> {
                    world.set(at[0], at[1], at[2], registry.resolve(&st)?)?;
                }
            }
-            // Doors villagers opened or closed (DoorBlock.setOpen), both halves.
-            let doors: Vec<([i32; 3], bool)> = events
-                .iter()
-                .filter_map(|e| match e {
-                    MobEvent::SetDoorOpen { pos, open } => Some((*pos, *open)),
-                    _ => None,
-                })
-                .collect();
-            for (at, open) in doors {
-                let Some(half) = registry
-                    .state(world.block(at[0], at[1], at[2]))
-                    .and_then(|s| s.properties.get("half").cloned())
-                else {
-                    continue;
-                };
-                let other = if half == "lower" { 1 } else { -1 };
-                for y in [at[1], at[1] + other] {
-                    if let Some(mut st) = registry.state(world.block(at[0], y, at[2])).cloned()
-                        && st.properties.contains_key("open")
-                    {
-                        st.properties.insert("open".to_owned(), open.to_string());
-                        world.set(at[0], y, at[2], registry.resolve(&st)?)?;
-                    }
-                }
-            }
            mobs.append(&mut born);
            mobs.append(&mut added);
            for e in &heart_events {
@@ -6,8 +6,8 @@ use horizon_client::mobs::{Mob, MobTypes};
 use horizon_core::geometry::Vec3;
 use std::{fmt::Write as _, fs, path::Path, sync::Arc};

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: mob_attributes_fixture RESOURCES OUTPUT")?,
@@ -1,6 +1,7 @@
 //! Replays `tools/test_music_parity.py` scripts through Horizon's
 //! `MusicManager` over its `SoundEngine`: `music_fixture ROOT INPUT OUTPUT`.
-use crate::audio_common as common;
+#[path = "audio_common/mod.rs"]
+mod common;
 use common::{Fake, describe, f, flush};
 use horizon_client::music::{Music, MusicFrequency, MusicManager};
 use horizon_client::sound_engine::{Bound, MUSIC, SoundEngine, TickContext};
@@ -20,8 +21,8 @@ fn music(spec: &str) -> Option<Music> {
    ))
 }

-pub fn main() {
-    let args: Vec<String> = crate::args().collect();
+fn main() {
+    let args: Vec<String> = std::env::args().collect();
    let mut engine = SoundEngine::new(SoundRegistry::load(std::path::Path::new(&args[1])));
    engine.listening = true;
    let mut backend = Fake::default();
@@ -508,8 +508,8 @@ fn yaw_text(entity: &str, v: f32) -> String {
    }
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: natural_spawn_fixture RESOURCES INPUT OUTPUT")?,
@@ -7,8 +7,8 @@ use horizon_client::{
 };
 use std::{fs, io::Write};

-pub fn main() -> Result<()> {
-    let args: Vec<_> = crate::args().skip(1).collect();
+fn main() -> Result<()> {
+    let args: Vec<_> = std::env::args().skip(1).collect();
    let mut names: Vec<_> = fs::read_dir(&args[0])?
        .map(|e| e.map(|e| e.path()))
        .collect::<std::io::Result<_>>()?;
@@ -30,8 +30,8 @@ fn types(root: &std::path::Path, file: PathBuf, key: &str) -> String {
        })
        .collect()
 }
-pub fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args: Vec<_> = crate::args().collect();
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let args: Vec<_> = std::env::args().collect();
    let input = fs::read_to_string(&args[1])?;
    let mut lines = input.lines();
    let root: Vec<&str> = lines.next().ok_or("empty input")?.split(' ').collect();
@@ -5,7 +5,7 @@
 //!
 //! usage: pack_screen_fixture RESOURCES CASES OUTPUT
 use horizon_client::{
-    hud::{HudAtlas, PACK_ICON_SIZE},
+    hud::HudAtlas,
    lang,
    pack_screen::{Compat, PackInfo, PackScreen, Source},
    packs::{self, Position},
@@ -13,7 +13,7 @@ use horizon_client::{
    text::Text,
 };
 use serde_json::{Value, json};
-use std::{fmt::Write as _, fs, path::PathBuf, sync::Arc};
+use std::{fmt::Write as _, fs, path::PathBuf};

 /// Styled runs: [text, rgb or null, bold, italic, underlined, strikethrough, obfuscated].
 pub fn runs(t: &Text) -> Value {
@@ -66,8 +66,8 @@ pub fn encode(draws: &[Draw]) -> Value {
    )
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<PathBuf> = crate::args_os().skip(1).map(PathBuf::from).collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<PathBuf> = std::env::args_os().skip(1).map(PathBuf::from).collect();
    let [root, inputs, output] = args.as_slice() else {
        return Err("usage: pack_screen_fixture RESOURCES CASES OUTPUT".into());
    };
@@ -105,9 +105,7 @@ pub fn main() -> horizon_client::Result<()> {
                        Some("unknown") => Compat::Unknown,
                        _ => Compat::Compatible,
                    },
-                    icon: p["icon"].as_bool().unwrap_or(false).then(|| {
-                        Arc::from(vec![0; (PACK_ICON_SIZE * PACK_ICON_SIZE * 4) as usize])
-                    }),
+                    icon: p["icon"].as_bool().unwrap_or(false),
                    required: p["required"].as_bool().unwrap_or(false),
                    position: if p["position"] == "top" {
                        Position::Top
@@ -35,8 +35,8 @@ fn lists(m: &SelectionModel) -> Value {
    json!({"unselected": side(false), "selected": side(true)})
 }

-pub fn main() -> Result<()> {
-    let args: Vec<PathBuf> = crate::args_os().skip(1).map(PathBuf::from).collect();
+fn main() -> Result<()> {
+    let args: Vec<PathBuf> = std::env::args_os().skip(1).map(PathBuf::from).collect();
    let [inputs, output] = args.as_slice() else {
        return Err("usage: pack_selection_fixture INPUTS OUTPUT".into());
    };
@@ -140,8 +140,8 @@ fn world(assets: &Assets, facts: &BlockFacts, floor: bool, water: bool) -> Resul
    Ok(world)
 }

-pub fn main() -> Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = &Path::new(".local/horizon-client").join(horizon_core::VANILLA_VERSION);
    let assets = Assets::load(root)?;
    let facts = BlockFacts::load(root, assets.registry)?;
@@ -78,8 +78,8 @@ fn case(line: &str) -> Option<String> {
    Some(out)
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let input = fs::read_to_string(
        args.get(1)
            .ok_or("usage: pick_block_data_fixture INPUT OUTPUT")?,
@@ -28,8 +28,8 @@ fn state(menu: &Menu) -> String {
    )
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let usage = "usage: place_recipe_fixture RESOURCES CASES ORDERS OUTPUT";
    let root = Path::new(args.get(1).ok_or(usage)?);
    let cases = fs::read_to_string(args.get(2).ok_or(usage)?)?;
@@ -8,8 +8,8 @@ fn number(value: &Value) -> f64 {
    f64::from_bits(u64::from_str_radix(value.as_str().unwrap(), 16).unwrap())
 }

-pub fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let args: Vec<_> = crate::args().collect();
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let args: Vec<_> = std::env::args().collect();
    let input = std::io::BufReader::new(std::fs::File::open(&args[1])?);
    let mut out = std::io::BufWriter::new(std::fs::File::create(&args[2])?);
    for line in input.lines() {
@@ -1,49 +0,0 @@
-//! How the probe binary runs a probe. main.rs lists the probes and nothing else (tools/parity.py leaves it out of
-//! the harnesses' dependencies); code every probe relies on goes here.
-use std::process::ExitCode;
-
-/// `probes! { a, b, }` declares the binary's `main`, which runs the probe module named by its first argument.
-macro_rules! probes {
-    ($($name:ident,)*) => {
-        fn run(name: &str) -> Option<std::process::ExitCode> {
-            use std::process::Termination;
-            Some(match name {
-                $(stringify!($name) => $name::main().report(),)*
-                _ => return None,
-            })
-        }
-
-        fn main() -> std::process::ExitCode {
-            dispatch::main(&[$(stringify!($name)),*], run)
-        }
-    };
-}
-
-/// The probe's command line as its own example saw it: the program, then the arguments after the probe's name.
-pub fn args() -> std::vec::IntoIter<String> {
-    let mut args: Vec<String> = std::env::args().collect();
-    if args.len() > 1 {
-        args.remove(1);
-    }
-    args.into_iter()
-}
-
-/// args(), as OsStrings.
-pub fn args_os() -> std::vec::IntoIter<std::ffi::OsString> {
-    let mut args: Vec<_> = std::env::args_os().collect();
-    if args.len() > 1 {
-        args.remove(1);
-    }
-    args.into_iter()
-}
-
-pub fn main(names: &[&str], run: fn(&str) -> Option<ExitCode>) -> ExitCode {
-    let name = std::env::args().nth(1).unwrap_or_default();
-    run(&name).unwrap_or_else(|| {
-        eprintln!(
-            "usage: client_probe <name> [arguments...]\nprobes: {}",
-            names.join(" ")
-        );
-        ExitCode::from(2)
-    })
-}
@@ -1,180 +0,0 @@
-//! Every horizon-client parity probe in one binary: `probe <name> [arguments]` runs `<name>.rs` as its own
-//! example did (tools/test_*_parity.py, tools/oracle_harness.py, tools/audio_harness.py). Linking ~80 examples,
-//! each with the whole client in it, was most of the parity job's probe build; one binary builds it once.
-//!
-//! This file only lists the probes, so that adding one reruns no harness: tools/parity.py leaves it out of
-//! their dependencies. How a probe runs is in dispatch.rs.
-#[macro_use]
-mod dispatch;
-
-use dispatch::{args, args_os};
-
-mod ambient_fixture;
-mod arrow_probe;
-mod audio_attributes_fixture;
-/// Sound-engine fakes the audio probes share.
-mod audio_common;
-mod auto_jump_probe;
-mod block_entity_anim_fixture;
-mod block_entity_render_fixture;
-mod block_entity_tickers_fixture;
-mod block_particles_fixture;
-mod block_transform_fixture;
-mod breaking_fixture;
-mod camera_probe;
-mod cauldron_fixture;
-mod chat_screen_fixture;
-mod cloud_fixture;
-mod command_parse_fixture;
-mod container_screen_probe;
-mod creative_search_fixture;
-mod emitter_particles_probe;
-mod enchanting_fixture;
-mod entity_anim_fixture;
-mod entity_components_probe;
-mod entity_death_loot_fixture;
-mod entity_particles_probe;
-mod environment_fixture;
-mod finalize_spawn_fixture;
-mod fire_starter_sound_probe;
-mod firework_tooltip_fixture;
-mod first_person_probe;
-mod frame_limiter_probe;
-mod game_loop_probe;
-mod ghost_recipe_fixture;
-mod held_drop_fixture;
-mod hotbar_fixture;
-mod hud_fixture;
-mod input_probe;
-mod interaction_input_fixture;
-mod lan_probe;
-mod light_parity;
-mod marker_particles_probe;
-mod menu_fixture;
-mod mipmap_probe;
-mod mob_ai_probe;
-mod mob_attributes_fixture;
-mod music_fixture;
-mod natural_spawn_fixture;
-mod options_probe;
-mod pack_resources_fixture;
-mod pack_screen_fixture;
-mod pack_selection_fixture;
-mod particle_providers_probe;
-mod pick_block_data_fixture;
-mod place_recipe_fixture;
-mod player_sync_fixture;
-mod raid_fixture;
-mod random_tick_sections_probe;
-mod recipe_book_fixture;
-mod recipe_book_render_fixture;
-mod recipe_book_view_fixture;
-mod recipe_fixture;
-mod scene_collision_probe;
-mod scene_motion_probe;
-mod scoreboard_fixture;
-mod screen_layout_fixture;
-mod section_mesh_fixture;
-mod server_files_probe;
-mod situational_music_fixture;
-mod skin_image_fixture;
-mod sound_engine_fixture;
-mod sound_event_fixture;
-mod spawn_rules_fixture;
-mod sprint_probe;
-mod subtitle_fixture;
-mod tab_list_fixture;
-mod team_rules_fixture;
-mod text_display_fixture;
-mod toggle_keys_probe;
-mod tooltip_display_fixture;
-mod trading_fixture;
-mod translucency_fixture;
-mod weather_fixture;
-mod world_border_render_fixture;
-mod world_options_fixture;
-
-probes! {
-    ambient_fixture,
-    arrow_probe,
-    audio_attributes_fixture,
-    auto_jump_probe,
-    block_entity_anim_fixture,
-    block_entity_render_fixture,
-    block_entity_tickers_fixture,
-    block_particles_fixture,
-    block_transform_fixture,
-    breaking_fixture,
-    camera_probe,
-    cauldron_fixture,
-    chat_screen_fixture,
-    cloud_fixture,
-    command_parse_fixture,
-    container_screen_probe,
-    creative_search_fixture,
-    emitter_particles_probe,
-    enchanting_fixture,
-    entity_anim_fixture,
-    entity_components_probe,
-    entity_death_loot_fixture,
-    entity_particles_probe,
-    environment_fixture,
-    finalize_spawn_fixture,
-    fire_starter_sound_probe,
-    firework_tooltip_fixture,
-    first_person_probe,
-    frame_limiter_probe,
-    game_loop_probe,
-    ghost_recipe_fixture,
-    held_drop_fixture,
-    hotbar_fixture,
-    hud_fixture,
-    input_probe,
-    interaction_input_fixture,
-    lan_probe,
-    light_parity,
-    marker_particles_probe,
-    menu_fixture,
-    mipmap_probe,
-    mob_ai_probe,
-    mob_attributes_fixture,
-    music_fixture,
-    natural_spawn_fixture,
-    options_probe,
-    pack_resources_fixture,
-    pack_screen_fixture,
-    pack_selection_fixture,
-    particle_providers_probe,
-    pick_block_data_fixture,
-    place_recipe_fixture,
-    player_sync_fixture,
-    raid_fixture,
-    random_tick_sections_probe,
-    recipe_book_fixture,
-    recipe_book_render_fixture,
-    recipe_book_view_fixture,
-    recipe_fixture,
-    scene_collision_probe,
-    scene_motion_probe,
-    scoreboard_fixture,
-    screen_layout_fixture,
-    section_mesh_fixture,
-    server_files_probe,
-    situational_music_fixture,
-    skin_image_fixture,
-    sound_engine_fixture,
-    sound_event_fixture,
-    spawn_rules_fixture,
-    sprint_probe,
-    subtitle_fixture,
-    tab_list_fixture,
-    team_rules_fixture,
-    toggle_keys_probe,
-    tooltip_display_fixture,
-    text_display_fixture,
-    trading_fixture,
-    translucency_fixture,
-    weather_fixture,
-    world_border_render_fixture,
-    world_options_fixture,
-}
@@ -1,37 +0,0 @@
-use horizon_client::text_display::TextDisplayData;
-use horizon_protocol::{ids, packets::play::Clientbound};
-use std::{error::Error, io::Write};
-
-pub fn main() -> Result<(), Box<dyn Error>> {
-    let args: Vec<String> = crate::args().collect();
-    let mut out = std::fs::File::create(&args[2])?;
-    for line in std::fs::read_to_string(&args[1])?.lines() {
-        let input: serde_json::Value = serde_json::from_str(line)?;
-        let hex = input["wire"].as_str().unwrap();
-        let bytes: Vec<u8> = (0..hex.len())
-            .step_by(2)
-            .map(|i| u8::from_str_radix(&hex[i..i + 2], 16))
-            .collect::<Result<_, _>>()?;
-        let Clientbound::SetEntityData(packet) =
-            Clientbound::decode(ids::play::clientbound::SET_ENTITY_DATA, &bytes)?
-        else {
-            unreachable!()
-        };
-        let mut display = TextDisplayData::default();
-        display.apply(&packet.values);
-        if let Some(angles) = input["angles"].as_array() {
-            let a: Vec<_> = angles.iter().map(|v| v.as_f64().unwrap() as f32).collect();
-            writeln!(
-                out,
-                "{}",
-                serde_json::to_string(&display.matrix([a[0], a[1]], [a[2], a[3]]).to_cols_array())?
-            )?;
-            continue;
-        }
-        let mut state = serde_json::to_value(&display)?;
-        state["text"] = display.text.plain().into();
-        state["alignment"] = format!("{:?}", display.align()).to_uppercase().into();
-        writeln!(out, "{}", state)?;
-    }
-    Ok(())
-}
@@ -459,8 +459,8 @@ fn run_codec(c: &BTreeMap<&str, &str>) -> Result<String, String> {
    Ok(log.join(" ; "))
 }

-pub fn main() -> horizon_client::Result<()> {
-    let args: Vec<String> = crate::args().collect();
+fn main() -> horizon_client::Result<()> {
+    let args: Vec<String> = std::env::args().collect();
    let root = Path::new(
        args.get(1)
            .ok_or("usage: raid_fixture RESOURCES INPUT OUTPUT")?,
Author	SHA1	Message	Date
Ludovic Marie	8674aa784d	Merge remote-tracking branch 'origin/main' into mm1-1426	2026-10-23 20:38:10 +02:00
Ludovic Marie	f08a1016fd	Merge remote-tracking branch 'origin/main' into mm1-1426	2026-10-23 20:21:26 +02:00