Loot tables from horizon-data.bin, parsed on first use (#4267)

horizon-prepare writes the prepared folder's data file with the loot
tables as their exported bytes, after parsing each one, and
--verify-data parses every table and compares it with its file. The game
maps it and parses a table when it is first read; a data pack's or
content mod's table still replaces the file's. A missing or stale file
(keyed by each source file's id, size and time) is rebuilt with the same
writer; a folder it can't write parses every table at load as before.

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

.claude/skills/vanilla-parity/SKILL.md

@@ -47,7 +47,7 @@ line are in the output) and the Rust fn before changing anything.
   That one line is what makes the next agent find it.
 - Fix the path players run: single player is a client of the integrated server, so server logic lives in
   `game/lan*.rs` and `src/lan/`, and what only the client's copy shows (particles, local sounds, hand
-  animation) must be reached from `game/remote*.rs`.
+  animation) must be reached from `game/remote*.rs`. A fix on the old in-frame path alone fixes nothing.
 - Look at the neighbours the ledger lists for the same class: a `client` or `seam` gap next to your fix is
   usually the same bug on the other path.
 

.github/pull_request_template.md

@@ -21,12 +21,6 @@
 <!-- The vanilla classes and methods this follows (tools/rea_vanilla.py), and the harness that checks it.
      "Horizon-only" for a feature vanilla doesn't have; "none" for tooling or docs. -->
 
-## Other projects' code
-
-<!-- "none", or for each project you read or copied from: its link at the commit, its license (only MIT,
-     BSD-2-Clause, BSD-3-Clause, Apache-2.0, ISC, zlib, 0BSD, MIT-0, Unlicense or CC0-1.0), and what you took.
-     CONTRIBUTING.md "Only original code". -->
-
 ## Self-check
 
 <!-- Paste the block `python3 tools/pr_ready.py` prints (`--base upstream/main` from a fork). -->

.github/trusted-reviewers.txt

@@ -7,4 +7,3 @@ kacpherek    # added by Ludovic, 2026-10-27
 rdbtCVS      # added by Ludovic, 2026-10-27
 Online5277   # added by Ludovic, 2026-10-27 (his top three by merged pull requests)
 levzzz5154   # added by Ludovic, 2026-10-28 (Horizon Team; author of horizon-mixins)
-Qwerner88880 # added by Ludovic, 2026-10-31 (Discord vladislav_hagen; native-mod hooks)

.github/workflows/cancel-on-close.yml

@@ -9,9 +9,7 @@ permissions:
   actions: write
 jobs:
   cancel:
-    # One of our small runners (horizon-light), out of GitHub's pool: no checkout, no code of the pull request
-    # (docs/ci-runners.md). SELF_HOSTED_CI=off: GitHub's runners.
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && fromJSON('["self-hosted", "linux", "horizon-light"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel the pull request's unfinished runs
         env:

.github/workflows/cargo-horizon-mod.yml

@@ -1,107 +0,0 @@
-name: cargo-horizon-mod
-# `cargo binstall --git https://github.com/horizon-rust/horizon cargo-horizon-mod` (#2120): binstall reads
-# [package.metadata.binstall] from crates/cargo-horizon-mod/Cargo.toml and downloads the archive this workflow
-# attaches to the tag `cargo-horizon-mod-v<version>`, whose version must be the manifest's. The targets come from
-# tools/horizon_mod_binstall.py, the same file the manifest's template is checked against, so a platform added there
-# is built here and one nobody publishes is caught before it ships. A pull request builds the archives and publishes
-# nothing.
-on:
-  push:
-    tags: ['cargo-horizon-mod-v*']
-  pull_request:
-    paths:
-      - 'crates/cargo-horizon-mod/**'
-      - 'tools/horizon_mod_binstall.py'
-      - '.github/workflows/cargo-horizon-mod.yml'
-permissions:
-  contents: read
-jobs:
-  plan:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    outputs:
-      platforms: ${{ steps.platforms.outputs.platforms }}
-    steps:
-      - uses: actions/checkout@v4
-      - id: platforms
-        run: echo "platforms=$(python3 -c 'import json, tools.horizon_mod_binstall as m; print(json.dumps(m.PLATFORMS))')" >> "$GITHUB_OUTPUT"
-  build:
-    needs: plan
-    name: build ${{ matrix.target }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(needs.plan.outputs.platforms) }}
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
-      - name: The aarch64 Linux linker
-        if: matrix.target == 'aarch64-unknown-linux-gnu'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gcc-aarch64-linux-gnu
-          echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> "$GITHUB_ENV"
-      - name: Build
-        run: cargo build --release --locked -p cargo-horizon-mod --target ${{ matrix.target }}
-      - name: It starts
-        if: matrix.run
-        shell: bash
-        run: |
-          set -euo pipefail
-          binary="target/${{ matrix.target }}/release/cargo-horizon-mod"
-          [ -f "$binary.exe" ] && binary="$binary.exe"
-          out=$("$binary" 2>&1 || true)
-          case "$out" in
-            *"usage: cargo horizon-mod"*) ;;
-            *) echo "$out"; echo "::error::$binary does not start"; exit 1 ;;
-          esac
-      - name: Package
-        shell: bash
-        run: |
-          set -euo pipefail
-          binary="target/${{ matrix.target }}/release/cargo-horizon-mod"
-          [ -f "$binary.exe" ] && binary="$binary.exe"
-          mkdir -p dist
-          tar -czf "dist/$(basename "$binary" | sed 's/\.exe$//')-${{ matrix.target }}.tar.gz" -C "$(dirname "$binary")" "$(basename "$binary")"
-      - uses: actions/upload-artifact@v4
-        with:
-          name: cargo-horizon-mod-${{ matrix.target }}
-          path: dist/*.tar.gz
-          if-no-files-found: error
-          retention-days: 3
-  publish:
-    needs: build
-    if: startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: cargo-horizon-mod-*
-          path: dist
-          merge-multiple: true
-      - name: The tag and the manifest name the same release and archives
-        run: python3 tools/horizon_mod_binstall.py dist "$GITHUB_REF_NAME"
-      - name: Checksums
-        run: |
-          set -euo pipefail
-          cd dist
-          for file in *.tar.gz; do sha256sum "$file" | cut -d' ' -f1 > "$file.sha256"; done
-      - name: Publish
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          set -euo pipefail
-          notes="\`cargo binstall --git https://github.com/horizon-rust/horizon cargo-horizon-mod\`"
-          if gh release view "$GITHUB_REF_NAME" >/dev/null 2>&1; then
-            gh release upload "$GITHUB_REF_NAME" dist/* --clobber
-          else
-            gh release create "$GITHUB_REF_NAME" dist/* --latest=false --title "cargo-horizon-mod ${GITHUB_REF_NAME#cargo-horizon-mod-v}" --notes "$notes"
-          fi

.github/workflows/ci.yml

@@ -24,28 +24,14 @@ env:
   HORIZON_TELEMETRY_URL: "off"
 
 jobs:
-  # One job, not one per check: each job takes a runner from the organisation's shared pool, and with every pull request
-  # and every merge to main starting this workflow, three jobs a run left the pool's queue tens of minutes deep.
-  #
-  # Where (docs/ci-runners.md): our checks runners (label horizon-checks: the desktop's, an isolated user, so a fork's
-  # pull request runs there too) take the pull requests whose number ends in 0 or 1, about what their three runners
-  # can do; GitHub's runners take the others and main's pushes (which also save the Rust cache GitHub's pull request
-  # runs read), so both pools work at once. The repository variable SELF_HOSTED_CI moves them: `all` every job to
-  # ours, `light` (the desktop paused) or `off` every job to GitHub's. On ours the build folder persists
-  # (CARGO_TARGET_DIR, outside the checkout), so the apt packages, Python and the Rust cache steps are GitHub's only.
   verify:
-    runs-on: >-
-      ${{ vars.SELF_HOSTED_CI != 'off' && vars.SELF_HOSTED_CI != 'light' && (vars.SELF_HOSTED_CI == 'all' ||
-      github.event_name == 'pull_request' && (endsWith(format('{0}', github.event.pull_request.number), '0') ||
-      endsWith(format('{0}', github.event.pull_request.number), '1'))) &&
-      fromJSON('["self-hosted", "linux", "horizon-checks"]') || 'ubuntu-latest' }}
-    timeout-minutes: 45
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v5
-        if: runner.environment == 'github-hosted'
         with:
           python-version: '3.12'
       - name: Does this pull request need Rust checks?
@@ -55,43 +41,20 @@ jobs:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: python3 tools/ci/rust_changes.py "$BASE_SHA" "$HEAD_SHA" >> "$GITHUB_OUTPUT"
-      # A pull request adds only its own commits to main, so it reads those; main's pushes read every ref's history.
       - name: Keep game artifacts out of Git
-        env:
-          EVENT: ${{ github.event_name }}
-          BASE_SHA: ${{ github.event.pull_request.base.sha }}
-          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
           python tools/check_public_tree.py
-          if [ "$EVENT" = pull_request ]; then
-            python tools/check_public_tree.py --range "$BASE_SHA..$HEAD_SHA"
-          else
-            python tools/check_public_tree.py --history
-          fi
-      # Our runners as GitHub's: some Python tests compile Rust with a bare `rustc` (GitHub's image has a default
-      # toolchain, our runners' own rustup homes may not), and the GPU tests find no adapter there, so they return
-      # early. Ours have Mesa's software Vulkan for parity; a backend Linux lacks keeps the tests from it, so a pull
-      # request's verify doesn't depend on which pool took it (#8627: a GPU test that flakes on lavapipe).
-      - name: Our runners as GitHub's (a default Rust toolchain, no GPU)
-        if: runner.environment != 'github-hosted'
-        run: |
-          rustup toolchain install stable --profile minimal --component rustfmt --component clippy
-          rustup default stable
-          echo "WGPU_BACKEND=dx12" >> "$GITHUB_ENV"
+          python tools/check_public_tree.py --history
       - name: Test offline research tooling
         run: python -m unittest discover -s tests -v
       - name: Install Rust toolchain and the ALSA and udev headers the client links against
         if: steps.rust.outputs.required != 'false'
-        env:
-          HOSTED: ${{ runner.environment == 'github-hosted' }}
         run: |
-          if [ "$HOSTED" = true ]; then
-            sudo apt-get update && sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev
-          fi
+          sudo apt-get update && sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev
           rustup toolchain install stable --profile minimal --component rustfmt --component clippy
       # Dependencies and the workspace's own build, saved from main's runs (pull requests read main's cache).
       - uses: Swatinem/rust-cache@v2
-        if: steps.rust.outputs.required != 'false' && runner.environment == 'github-hosted'
+        if: steps.rust.outputs.required != 'false'
         with:
           shared-key: verify
           save-if: ${{ github.ref == 'refs/heads/main' }}
@@ -104,27 +67,20 @@ jobs:
           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
       # type-checks and the parity job builds and runs (they were most of this step's build and link time).
-      # cargo test, not nextest: nextest's process per test reloads each binary's shared tables for every test, and on
-      # these 4-core runners it was no faster (#4978).
       - name: Test Rust core and voxel kernel correctness
         if: steps.rust.outputs.required != 'false'
         run: |
           cargo +stable test --workspace --lib --bins --tests
           # The full content-root tests (#[ignore]d: minutes each on a laptop). The same build as above; they need the
-          # prepared vanilla data, so without it they pass at once. Keep the target selection identical to avoid
-          # recompiling the workspace with a different dependency graph.
-          cargo +stable test --workspace --lib --bins --tests mod_content::tests:: -- --ignored
+          # prepared vanilla data, so without it they pass at once.
+          cargo +stable test --workspace --lib mod_content::tests:: -- --ignored
           cargo +stable test --workspace --doc
   # The launcher is its own workspace (launcher/Cargo.toml), so verify's cargo runs never build it. A pull request that
   # changes it or a crate it builds is checked here, and so is every push to main: two pull requests can each pass
   # alone and break it together (#2059 and the registry ratings did, 2026-10-26).
   launcher:
-    runs-on: >-
-      ${{ vars.SELF_HOSTED_CI != 'off' && vars.SELF_HOSTED_CI != 'light' && (vars.SELF_HOSTED_CI == 'all' ||
-      github.event_name == 'pull_request' && (endsWith(format('{0}', github.event.pull_request.number), '0') ||
-      endsWith(format('{0}', github.event.pull_request.number), '1'))) &&
-      fromJSON('["self-hosted", "linux", "horizon-checks"]') || 'ubuntu-latest' }}
-    timeout-minutes: 45
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
         with:
@@ -138,16 +94,12 @@ jobs:
         run: python3 tools/ci/rust_changes.py --launcher "$BASE_SHA" "$HEAD_SHA" >> "$GITHUB_OUTPUT"
       - name: Install Rust and the headers GPUI links against
         if: steps.launcher.outputs.required != 'false'
-        env:
-          HOSTED: ${{ runner.environment == 'github-hosted' }}
         run: |
-          if [ "$HOSTED" = true ]; then
-            sudo apt-get update && sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev libwayland-dev \
-              libx11-xcb-dev libfontconfig-dev libvulkan-dev libasound2-dev libudev-dev
-          fi
+          sudo apt-get update && sudo apt-get install -y --no-install-recommends libxkbcommon-x11-dev libwayland-dev \
+            libx11-xcb-dev libfontconfig-dev libvulkan-dev libasound2-dev libudev-dev
           rustup toolchain install stable --profile minimal --component rustfmt --component clippy
       - uses: Swatinem/rust-cache@v2
-        if: steps.launcher.outputs.required != 'false' && runner.environment == 'github-hosted'
+        if: steps.launcher.outputs.required != 'false'
         with:
           workspaces: launcher
           shared-key: launcher
@@ -164,8 +116,7 @@ jobs:
   # a harness, an oracle, a probe or the runner, or carries the run-parity label (run-parity.yml, when it is added).
   parity-scope:
     if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
-    # A git diff of this repository's own branch: one of our small runners (horizon-light, docs/ci-runners.md).
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && fromJSON('["self-hosted", "linux", "horizon-light"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     outputs:
       run: ${{ steps.scope.outputs.run }}
     steps:

.github/workflows/claim-command.yml

@@ -29,8 +29,7 @@ jobs:
     # the skipped runs of ordinary comments must not cancel a waiting one.
     concurrency:
       group: claim-${{ github.event.issue.number }}
-    # One of our small runners (horizon-light), out of GitHub's pool: main's script only (docs/ci-runners.md).
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && fromJSON('["self-hosted", "linux", "horizon-light"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     timeout-minutes: 5
     permissions:
       contents: read
@@ -56,8 +55,7 @@ jobs:
         run: python3 tools/ci/claim_command.py command
   release:
     if: github.event_name != 'issue_comment' && github.repository == 'horizon-rust/horizon'
-    # One of our small runners (horizon-light), out of GitHub's pool: main's script only (docs/ci-runners.md).
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && fromJSON('["self-hosted", "linux", "horizon-light"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     timeout-minutes: 10
     permissions:
       contents: read

.github/workflows/game-build.yml

@@ -1,7 +1,6 @@
 name: game build
 # Builds the game for every platform from `ref`: the Java exporters, then Linux and the Linux server and Windows on
-# GitHub, macOS on the Mac mini's runner with a 1500-frame offscreen run of a new world (smoke-test.json): Apple
-# Silicon, and Intel cross-built there for x86_64-apple-darwin and checked under Rosetta 2 (#1161). Called by
+# GitHub, macOS on the Mac mini's runner with a 1500-frame offscreen run of a new world (smoke-test.json). Called by
 # release.yml (the releases) and nightly-build.yml (the opt-in Nightly), always from main's copy of this file: the
 # caller's commit, never the one being built. It holds no secrets: signing the checksums is the callers' own job,
 # which never runs what this one built. See docs/release-flow.md.
@@ -105,13 +104,6 @@ jobs:
             mac: true
             dir: horizon-macos-arm64
             asset: horizon-macos-arm64.zip
-          # Intel Macs: built on the same runner for another target; its checks and smoke test run the x86_64
-          # programs under Rosetta 2.
-          - name: macos-x64
-            mac: true
-            target: x86_64-apple-darwin
-            dir: horizon-macos-x64
-            asset: horizon-macos-x64.zip
     runs-on: ${{ matrix.mac && (inputs.trusted && vars.MAC_RUNNER || fromJSON('["self-hosted", "macOS", "horizon-nightly"]')) || matrix.os }}
     # Notarizing the zip can take a few minutes.
     timeout-minutes: ${{ matrix.mac && 60 || 40 }}
@@ -122,8 +114,6 @@ jobs:
       HORIZON_VERSION: ${{ inputs.version }}
       # A nightly's date and commit ("2026-10-28 0c02067"), which the game shows; empty for a release.
       HORIZON_NIGHTLY: ${{ inputs.nightly }}
-      # Where cargo puts the programs: target/release, or target/<target>/release for another target.
-      BIN: ${{ matrix.target && format('target/{0}/release', matrix.target) || 'target/release' }}
     defaults:
       run:
         shell: bash
@@ -138,8 +128,6 @@ jobs:
           # keeps its preparations outside the checkout.
           clean: true
       - uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
       - uses: Swatinem/rust-cache@v2
         if: runner.environment == 'github-hosted'
         with:
@@ -150,11 +138,11 @@ 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
-        run: cargo build --release --locked ${{ matrix.target && format('--target {0}', matrix.target) || '' }} -p horizon-client -p horizon-client-lib --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
-            test -f "$BIN/$binary${{ matrix.exe }}" || { echo "::error::$BIN/$binary${{ matrix.exe }} is missing"; exit 1; }
+            test -f "target/release/$binary${{ matrix.exe }}" || { echo "::error::target/release/$binary${{ matrix.exe }} is missing"; exit 1; }
           done
       - name: The signing keychain, unlocked
         if: runner.os == 'macOS' && vars.MACOS_SIGN_IDENTITY != '' && inputs.developer_id
@@ -169,15 +157,15 @@ jobs:
         run: |
           for binary in horizon-client horizon-ctl horizon-prepare horizon-server; do
             codesign --force --options runtime --timestamp --keychain "$MACOS_SIGN_KEYCHAIN" \
-              --identifier "dev.horizon.${binary#horizon-}" --sign "$MACOS_SIGN_IDENTITY" "$BIN/$binary"
-            codesign --verify --strict --verbose=2 "$BIN/$binary"
+              --identifier "dev.horizon.${binary#horizon-}" --sign "$MACOS_SIGN_IDENTITY" "target/release/$binary"
+            codesign --verify --strict --verbose=2 "target/release/$binary"
           done
       - name: Only system libraries
         # Windows: no non-system DLL (a "DLL not found" dialog on some players' machines). Linux: the standard
         # loader and libraries every desktop distribution has. macOS: only the system's own libraries.
         run: |
           for binary in horizon-client horizon-ctl horizon-prepare horizon-server; do
-            file="$BIN/$binary${{ matrix.exe }}"
+            file="target/release/$binary${{ matrix.exe }}"
             if [[ "$RUNNER_OS" == macOS ]]; then
               others=$(otool -L "$file" | tail -n +2 | awk '{print $1}' | grep -v -E '^(/usr/lib/|/System/Library/)' || true)
               [[ -z "$others" ]] || { echo "::error::$binary links $others"; exit 1; }
@@ -185,19 +173,10 @@ jobs:
               ${{ runner.os == 'Windows' && 'python' || 'python3' }} tools/check_imports.py "$file"
             fi
           done
-      - name: Baseline x86-64 CPUs only
-        # No POPCNT or LZCNT at all (the script says why only those): a C library's count intrinsic killed the
-        # game before main on a Core 2 (#7264). Not the Mac builds: every Intel Mac that runs macOS 11 has both.
-        if: runner.os != 'macOS'
-        run: |
-          set -euo pipefail
-          rustup component add llvm-tools
-          ${{ runner.os == 'Windows' && 'python' || 'python3' }} tools/check_cpu_baseline.py \
-            $(for binary in horizon-client horizon-ctl horizon-prepare horizon-server; do echo "$BIN/$binary${{ matrix.exe }}"; done)
       - name: Every program starts
         run: |
           set -euo pipefail
-          bin=$BIN
+          bin=target/release
           "$bin/horizon-client${{ matrix.exe }}" --help | grep -q -- '--resources'
           "$bin/horizon-ctl${{ matrix.exe }}" --help > /dev/null
           "$bin/horizon-prepare${{ matrix.exe }}" --help | grep -q -- '--minecraft-dir'
@@ -223,7 +202,7 @@ jobs:
           home="$RUNNER_TEMP/horizon-smoke"
           rm -rf "$home" && mkdir -p "$home"
           version=$(sed -n 's/.*"version": *"\([^"]*\)".*/\1/p' research-lock.json | head -1)
-          client="$PWD/$BIN/horizon-client"
+          client="$PWD/target/release/horizon-client"
           resources="$PWD/.local/horizon-client/$version"
           (cd "$home" && HORIZON_HOME="$home" HORIZON_NO_AUDIO=1 "$client" --resources "$resources" --offscreen \
             --world smoke --seed 1 --render-distance 4 --world-frames 1500 --timeout-seconds 180 \
@@ -238,9 +217,8 @@ jobs:
           EOF
           # Published with the release; the publish job checks it again before it publishes anything.
           cp "$home/smoke.json" "$RUNNER_TEMP/smoke-test.json"
-      # One smoke-test.json per build, the Apple Silicon one's; the Intel build must pass its own run too.
       - uses: actions/upload-artifact@v4
-        if: runner.environment == 'self-hosted' && !matrix.target
+        if: runner.environment == 'self-hosted'
         with:
           name: smoke-test.json
           path: ${{ runner.temp }}/smoke-test.json
@@ -253,7 +231,7 @@ jobs:
       - name: Package
         run: |
           set -euo pipefail
-          cargo run --locked -p xtask -- package "$BIN/horizon-client${{ matrix.exe }}" "dist/${{ matrix.dir }}"
+          cargo run --locked -p xtask -- package "target/release/horizon-client${{ matrix.exe }}" "dist/${{ matrix.dir }}"
           cd dist
           rm -f "${{ matrix.asset }}"
           case "${{ matrix.asset }}" in

.github/workflows/launcher.yml

@@ -8,15 +8,9 @@ name: launcher
 # feature. The version and the tag are given to the build (HORIZON_LAUNCHER_VERSION, HORIZON_LAUNCHER_TAG): no bump
 # commits.
 # Never marked latest. Pushes to launcher branches only build. RELEASES_PAUSED=1 stops releases.
-# Linux ships two archives of one binary: the .tar.gz the launcher updates itself from, and an
-# AppImage (packaging/linux/appimage.sh) for players without a distribution package, which replaces
-# itself instead (launcher/src/backend.rs).
-# macOS: Apple Silicon, and Intel cross-built for x86_64-apple-darwin on the same runner, its tests and smoke test
-# under Rosetta 2 (#1161). With the repository variable MACOS_SIGN_IDENTITY set, Horizon.app and the .dmg are signed with
+# macOS: with the repository variable MACOS_SIGN_IDENTITY set, Horizon.app and the .dmg are signed with
 # Developer ID, notarized and stapled, from the runner's signing keychain (packaging/macos/README.md);
 # unset (forks), they are signed ad hoc.
-# Windows ships the launcher's own binary twice: in the ZIP (what a launcher updates itself from) and as
-# horizon-launcher-setup.exe, which opens the per-user installer instead of Home (launcher/src/installer.rs).
 #   gh workflow run launcher --ref <branch>                    # dry run: builds everything, publishes nothing
 #   gh workflow run launcher --ref main -f dry_run=false -f force=true
 
@@ -24,19 +18,16 @@ on:
   push:
     branches: [main, launcher, 'launcher-*']
     paths:
-      # Everything the launcher is built and packaged from, as tools/release_train.py's LAUNCHER_PATHS.
+      # Every crate the launcher builds in, as tools/release_train.py's LAUNCHER_PATHS.
       - 'launcher/**'
       - 'crates/horizon-bench/**'
       - 'crates/horizon-friends/**'
-      - 'crates/horizon-mcp/**'
       - 'crates/horizon-mods/**'
       - 'crates/horizon-port-pack/**'
       - 'crates/horizon-prepare/**'
       - 'crates/horizon-release-sign/**'
       - 'crates/horizon-telemetry/**'
       - 'crates/horizon-theme/**'
-      - 'packaging/linux/**'
-      - 'packaging/icons/**'
       - '.github/workflows/launcher.yml'
   schedule:
     - cron: '7-59/10 * * * *'
@@ -114,13 +105,6 @@ jobs:
             mac: true
             asset: horizon-launcher-macos-arm64.zip
             binary: horizon-launcher
-            mac_arch: arm64
-          - name: macos-x64
-            mac: true
-            target: x86_64-apple-darwin
-            asset: horizon-launcher-macos-x64.zip
-            binary: horizon-launcher
-            mac_arch: x64
           - name: windows
             os: windows-latest
             asset: horizon-launcher-windows-x64.zip
@@ -133,8 +117,6 @@ jobs:
     timeout-minutes: ${{ matrix.mac && 60 || 40 }}
     env:
       RUSTFLAGS: ${{ matrix.rustflags }}
-      # Where cargo puts the launcher: target/release, or target/<target>/release for another target.
-      BIN: ${{ matrix.target && format('target/{0}/release', matrix.target) || 'target/release' }}
       # Horizon's Azure app for Microsoft sign-in (docs/microsoft-account.md): a repository
       # variable, not a secret. Unset, the launcher says sign-in is not configured.
       HORIZON_MSA_CLIENT_ID: ${{ vars.HORIZON_MSA_CLIENT_ID }}
@@ -158,8 +140,6 @@ jobs:
           # parity jobs, and nothing they leave may end up in a launcher release (target/ is rebuilt from scratch).
           clean: true
       - uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
       - uses: Swatinem/rust-cache@v2
         if: runner.environment == 'github-hosted'
         with:
@@ -169,7 +149,7 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libxkbcommon-x11-dev libwayland-dev libx11-xcb-dev libfontconfig-dev libvulkan-dev libasound2-dev patchelf
+          sudo apt-get install -y libxkbcommon-x11-dev libwayland-dev libx11-xcb-dev libfontconfig-dev libvulkan-dev libasound2-dev
       - name: Metal shaders compiled now, or at run time without the Metal toolchain
         # GPUI compiles its Metal shaders when it builds; the Mac mini has Xcode without the Metal toolchain
         # (xcodebuild -downloadComponent MetalToolchain), so there they are compiled when the launcher starts.
@@ -177,20 +157,20 @@ jobs:
         run: |
           if ! xcrun metal --version > /dev/null 2>&1; then
             echo "::notice::No Metal toolchain on this runner: GPUI compiles its shaders at run time"
-            echo "LAUNCHER_FEATURES=gpui_platform/runtime_shaders" >> "$GITHUB_ENV"
+            echo "LAUNCHER_FEATURES=gpui/runtime_shaders" >> "$GITHUB_ENV"
           fi
       # Every test target (the library, the binary, tests/), on each system the launcher ships for.
-      - run: cargo test --release --locked ${{ matrix.target && format('--target {0}', matrix.target) || '' }} ${LAUNCHER_FEATURES:+--features "$LAUNCHER_FEATURES"}
-      - run: cargo build --release --locked ${{ matrix.target && format('--target {0}', matrix.target) || '' }} ${LAUNCHER_FEATURES:+--features "$LAUNCHER_FEATURES"}
+      - run: cargo test --release --locked ${LAUNCHER_FEATURES:+--features "$LAUNCHER_FEATURES"}
+      - run: cargo build --release --locked ${LAUNCHER_FEATURES:+--features "$LAUNCHER_FEATURES"}
       - name: The version is the release's
         run: |
-          out=$("$BIN/${{ matrix.binary }}" --version)
+          out=$(target/release/${{ matrix.binary }} --version)
           echo "$out"
           expected="${HORIZON_LAUNCHER_VERSION:-$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -1)}"
           [[ "$out" == "horizon-launcher $expected" ]] || { echo "::error::expected horizon-launcher $expected"; exit 1; }
       - name: Only system libraries
         run: |
-          file="$BIN/${{ matrix.binary }}"
+          file=target/release/${{ matrix.binary }}
           case "$RUNNER_OS" in
             Windows) python ../tools/check_imports.py "$file" ;;
             macOS) others=$(otool -L "$file" | tail -n +2 | awk '{print $1}' | grep -v -E '^(/usr/lib/|/System/Library/)' || true)
@@ -205,28 +185,13 @@ jobs:
           export HORIZON_LAUNCHER_HOME="${RUNNER_TEMP//\\//}/horizon-launcher-smoke"
           export HORIZON_HOME="$HORIZON_LAUNCHER_HOME/game"
           rm -rf "$HORIZON_LAUNCHER_HOME"
-          launcher="$PWD/$BIN/${{ matrix.binary }}"
+          launcher="$PWD/target/release/${{ matrix.binary }}"
           # GitHub's API rate-limits shared runner addresses now and then: try a few times.
           retry() { for i in 1 2 3 4; do "$@" && return 0; sleep $((i * 15)); done; return 1; }
           retry "$launcher" versions
-          "$launcher" links --json
-          # The Intel Mac launcher can come out before any game build has its asset (#1161): then there is nothing
-          # to install yet. Only that entry skips, and only on a version list that parsed and had no build here
-          # (exit 3); a launcher or a script that fails still fails the step.
-          if [[ "${{ matrix.name }}" == macos-x64 ]]; then
-            versions=$(retry "$launcher" --json versions)
-            no_build='import json, sys; sys.exit(3 if not any(r["available_here"] for r in json.load(sys.stdin)) else 0)'
-            status=0
-            python3 -c "$no_build" <<<"$versions" || status=$?
-            if [[ $status == 3 ]]; then
-              echo "::warning::No game build has an asset for ${{ matrix.name }} yet: install not tested"
-              rm -rf "$HORIZON_LAUNCHER_HOME"
-              exit 0
-            fi
-            [[ $status == 0 ]] || exit $status
-          fi
           retry "$launcher" install latest
           "$launcher" versions --installed
+          "$launcher" links --json
           # `install latest` is the Nightly since #3342 (versions/nightly-<date>-<commit>), a vX.Y.Z before.
           clients=("$HORIZON_LAUNCHER_HOME"/versions/*/horizon-client*)
           client="${clients[0]}"
@@ -243,18 +208,6 @@ jobs:
           # The client starts: --help prints before any window or GPU is needed.
           help() { "$client" --help > "$RUNNER_TEMP/help.txt" 2>&1 && head -3 "$RUNNER_TEMP/help.txt" && grep -q -- '--resources' "$RUNNER_TEMP/help.txt"; }
           soft help
-          # The per-user Windows setup: the same binary under the setup's name installs into a scratch
-          # folder, and the copy it installs uninstalls itself. HKCU of the runner only.
-          if [[ "$RUNNER_OS" == "Windows" ]]; then
-            setup="$RUNNER_TEMP/setup-smoke"
-            cp "$launcher" "$RUNNER_TEMP/horizon-launcher-setup.exe"
-            "$RUNNER_TEMP/horizon-launcher-setup.exe" setup --quiet --dir "$setup"
-            installed="$setup/Horizon Launcher/horizon-launcher.exe"
-            [[ -f "$installed" ]] || { echo "::error::the setup copied no launcher"; exit 1; }
-            "$installed" uninstall --quiet
-            [[ ! -f "$installed" ]] || { echo "::error::uninstall left the launcher"; exit 1; }
-            rm -rf "$setup"
-          fi
           rm -rf "$HORIZON_LAUNCHER_HOME"
       - name: The signing keychain, unlocked
         if: runner.os == 'macOS' && vars.MACOS_SIGN_IDENTITY != ''
@@ -271,18 +224,11 @@ jobs:
             # Developer ID): packaging/macos.
             python3 -m venv "$RUNNER_TEMP/dmg" && "$RUNNER_TEMP/dmg/bin/pip" install --quiet dmgbuild==1.6.5
             version=${HORIZON_LAUNCHER_VERSION:-$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -1)}
-            DMGBUILD="$RUNNER_TEMP/dmg/bin/dmgbuild" ../packaging/macos/package.sh "$BIN/${{ matrix.binary }}" "$version" out ${{ matrix.mac_arch }}
+            DMGBUILD="$RUNNER_TEMP/dmg/bin/dmgbuild" ../packaging/macos/package.sh target/release/${{ matrix.binary }} "$version" out
             rm -rf out/Horizon.app
           else
-            version=${HORIZON_LAUNCHER_VERSION:-$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -1)}
-            if [[ "$RUNNER_OS" == "Linux" ]]; then
-              # The .tar.gz below is what the launcher updates itself from; the AppImage is what a
-              # player downloads and double-clicks, and it replaces itself instead
-              # (packaging/linux/appimage.sh, launcher/src/backend.rs).
-              ../packaging/linux/appimage.sh "$BIN/${{ matrix.binary }}" "$version" out
-            fi
             mkdir -p dist
-            cp "$BIN/${{ matrix.binary }}" dist/
+            cp target/release/${{ matrix.binary }} dist/
             if [[ "${{ matrix.asset }}" == *.tar.gz ]]; then
               (cd dist && tar czf ../out/${{ matrix.asset }} ${{ matrix.binary }})
             else
@@ -290,12 +236,6 @@ jobs:
             fi
           fi
           ls -l out
-      - name: Setup exe (Windows)
-        # The launcher's binary under another name: started with no arguments it shows the per-user
-        # installer instead of Home (launcher/src/installer.rs). Its name is what makes it the setup,
-        # so the ZIP's copy stays the launcher. Both go into the release's signed SHA256SUMS.
-        if: runner.os == 'Windows'
-        run: cp "$BIN/${{ matrix.binary }}" out/horizon-launcher-setup.exe
       - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.asset }}

.github/workflows/mod-registry.yml

@@ -15,13 +15,9 @@ on:
       - '.github/workflows/mod-registry.yml'
 permissions:
   contents: read
-concurrency:
-  group: mod-registry-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 jobs:
   check:
-    # Our checks runners (label horizon-checks, docs/ci-runners.md); SELF_HOSTED_CI=light or off: GitHub's.
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && vars.SELF_HOSTED_CI != 'light' && fromJSON('["self-hosted", "linux", "horizon-checks"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     timeout-minutes: 20
     defaults:
       run:
@@ -29,9 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: rustup toolchain install stable --profile minimal --component rustfmt --component clippy
-      # Ours keep their build folder between jobs.
       - uses: Swatinem/rust-cache@v2
-        if: runner.environment == 'github-hosted'
         with:
           workspaces: crates/horizon-mod-registry
           save-if: ${{ github.ref == 'refs/heads/main' }}

.github/workflows/mojang-republish.yml

@@ -1,32 +0,0 @@
-name: mojang republish
-# Hourly: does Mojang's version manifest list a pinned-version JSON that research-lock.json does not know?
-# If so, one issue "Mojang republished <version>: <sha8>" with the hashes and a lock snippet
-# (tools/ci/mojang_republish.py). Reads only Mojang's public manifest.
-#   gh workflow run "mojang republish" -f dry_run=true
-on:
-  schedule:
-    - cron: '23 * * * *'  # hourly: a republished JSON breaks horizon-prepare for every new player until accepted
-  workflow_dispatch:
-    inputs:
-      dry_run:
-        description: Only print what it would do with issues
-        type: boolean
-        default: false
-permissions:
-  contents: read
-  issues: write
-concurrency:
-  group: mojang-republish
-  cancel-in-progress: false
-
-jobs:
-  check:
-    # One of our small runners (label horizon-light, docs/ci-runners.md): main's script, Mojang's public manifest.
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && fromJSON('["self-hosted", "linux", "horizon-light"]') || 'ubuntu-latest' }}
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-      - name: Check the manifest
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: python3 tools/ci/mojang_republish.py ${{ inputs.dry_run && '--dry-run' || '' }}

.github/workflows/native-hook-stamp.yml

@@ -1,55 +0,0 @@
-name: native hook stamp
-# Opens a PR that numbers pending fragments after they merge. Only pushes to
-# main run main's own tool; fragments are read as data, not PR code.
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'tools/native-hook-fragments/*.json'
-
-permissions:
-  contents: read
-
-concurrency:
-  group: native-hook-stamp
-  cancel-in-progress: false
-
-jobs:
-  stamp:
-    if: github.repository == 'horizon-rust/horizon'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: main
-          fetch-depth: 0
-      - name: Open a stamp pull request
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          set -eu
-          branch=automation/native-hook-stamp
-          if [ -n "$(gh pr list --state open --head "$branch" --json number --jq '.[0].number // empty')" ]; then
-            echo "A stamp pull request is already open."
-            exit 0
-          fi
-          python3 tools/stamp_native_hooks.py
-          if git diff --quiet; then
-            echo "No fragments to stamp."
-            exit 0
-          fi
-          git config user.name 'github-actions[bot]'
-          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
-          git checkout -b "$branch"
-          git add -u
-          git commit -m 'Stamp native hook API fragments'
-          if git ls-remote --exit-code --heads origin "$branch" >/dev/null; then
-            git fetch origin "+refs/heads/$branch:refs/remotes/origin/$branch"
-          fi
-          git push --force-with-lease origin "$branch"
-          gh pr create --base main --head "$branch" --title 'Stamp native hook API fragments' --body 'Assign API numbers to the pending native hook fragments. Close and reopen this PR to run CI.'

.github/workflows/nightly-build.yml

@@ -172,8 +172,7 @@ jobs:
           EPHEMERAL: ${{ needs.pick.outputs.dry_run == 'true' && 'yes' || '' }}
         run: |
           bash tools/ci/sign_release.sh nightly dist/horizon-linux-x86_64.tar.gz dist/horizon-windows-x64.zip \
-            dist/horizon-macos-arm64.zip dist/horizon-macos-x64.zip dist/horizon-server-linux-x86_64.tar.gz \
-            dist/horizon-source.tar.gz
+            dist/horizon-macos-arm64.zip dist/horizon-server-linux-x86_64.tar.gz dist/horizon-source.tar.gz
       - uses: actions/upload-artifact@v4
         with:
           name: signature
@@ -234,10 +233,9 @@ jobs:
           # before the Nightly-only switch keep (they don't read Nightlies).
           gh release create nightly --prerelease --latest=false --target "$SHA" \
             --title "Nightly $DATE · ${SHA:0:7}" --notes-file dist/nightly-notes.md \
-            "dist/horizon-linux-x86_64.tar.gz#Game files the launcher installs (Nightly): Linux (horizon-linux-x86_64.tar.gz)" \
-            "dist/horizon-windows-x64.zip#Game files the launcher installs (Nightly): Windows (horizon-windows-x64.zip)" \
-            "dist/horizon-macos-arm64.zip#Game files the launcher installs (Nightly): macOS on Apple Silicon (horizon-macos-arm64.zip)" \
-            "dist/horizon-macos-x64.zip#Game files the launcher installs (Nightly): macOS on Intel (horizon-macos-x64.zip)" \
+            "dist/horizon-linux-x86_64.tar.gz#Nightly game files: Linux (horizon-linux-x86_64.tar.gz)" \
+            "dist/horizon-windows-x64.zip#Nightly game files: Windows (horizon-windows-x64.zip)" \
+            "dist/horizon-macos-arm64.zip#Nightly game files: macOS (horizon-macos-arm64.zip)" \
             "dist/horizon-server-linux-x86_64.tar.gz#Nightly dedicated server for Linux (horizon-server-linux-x86_64.tar.gz)" \
             "dist/horizon-source.tar.gz#Source of this Nightly, commit ${SHA:0:7} (horizon-source.tar.gz; kept for good as the tag $SOURCE_TAG)" \
             dist/SHA256SUMS "${signature[@]}" dist/smoke-test.json
@@ -253,8 +251,7 @@ jobs:
     # Tells the thread that asked for this build how it ended. A conflict `pick` already explained there.
     needs: [pick, build, sign, publish]
     if: always() && inputs.issue != '' && needs.pick.result == 'success'
-    # One comment, no checkout and no secret: one of our small runners (label horizon-light, docs/ci-runners.md).
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && fromJSON('["self-hosted", "linux", "horizon-light"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     timeout-minutes: 5
     permissions:
       issues: write

.github/workflows/overlap-note.yml

@@ -19,9 +19,7 @@ jobs:
     concurrency:
       group: overlap-note-${{ github.event.pull_request.number }}
       cancel-in-progress: true
-    # One of our small runners (horizon-light), out of GitHub's pool: it runs main's script only (above), so a fork's
-    # pull request runs none of its code there (docs/ci-runners.md). SELF_HOSTED_CI=off: GitHub's runners.
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && fromJSON('["self-hosted", "linux", "horizon-light"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     timeout-minutes: 10
     permissions:
       contents: read

.github/workflows/pack-bench.yml

@@ -1,72 +0,0 @@
-name: pack load bench
-# How long resource packs take to load: crates/horizon-client-render/examples/pack_load_bench.rs on generated packs
-# (no game files), on the branch and then on `base` with the branch's copy of the bench, on the same runner, so a pull
-# request can show its numbers next to main's. Started by hand, or by a push to a `pack-bench/*` branch (a fork can't
-# start a workflow its main lacks), against horizon-rust/horizon's main.
-on:
-  push:
-    branches: ['pack-bench/**']
-  workflow_dispatch:
-    inputs:
-      base:
-        description: Ref to compare against
-        default: main
-      scale:
-        description: How many times the default pack sizes
-        default: '1'
-permissions:
-  contents: read
-env:
-  HORIZON_TELEMETRY_URL: "off"
-  CARGO_TERM_COLOR: never
-
-jobs:
-  bench:
-    # Our checks runners (label horizon-checks, docs/ci-runners.md): the branch and the base on the same machine, as
-    # the comparison needs. SELF_HOSTED_CI=light or off: GitHub's.
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && vars.SELF_HOSTED_CI != 'light' && fromJSON('["self-hosted", "linux", "horizon-checks"]') || 'ubuntu-latest' }}
-    timeout-minutes: 90
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Install Rust and the ALSA and udev headers
-        env:
-          HOSTED: ${{ runner.environment == 'github-hosted' }}
-        run: |
-          if [ "$HOSTED" = true ]; then
-            sudo apt-get update && sudo apt-get install -y --no-install-recommends libasound2-dev libudev-dev
-          fi
-          rustup toolchain install stable --profile minimal
-      - uses: Swatinem/rust-cache@v2
-        if: runner.environment == 'github-hosted'
-        with:
-          shared-key: pack-bench
-      - name: Bench the branch
-        env:
-          SCALE: ${{ inputs.scale || '1' }}
-        run: |
-          cargo run --profile fast -p horizon-client-render --example pack_load_bench -- --scale "$SCALE" > head.md
-      - name: Bench the base, with the branch's bench
-        env:
-          BASE: ${{ inputs.base || 'main' }}
-          SCALE: ${{ inputs.scale || '1' }}
-        run: |
-          git fetch https://github.com/horizon-rust/horizon.git "$BASE"
-          # Our runners keep the folder beside the checkout between jobs.
-          git worktree remove --force ../base 2> /dev/null || rm -rf ../base
-          git worktree prune
-          git worktree add ../base FETCH_HEAD
-          cp crates/horizon-client-render/examples/pack_load_bench.rs ../base/crates/horizon-client-render/examples/
-          # A bench row that times a function the base lacks keeps it from building there: then
-          # the branch's own rows compare the two ways.
-          target=${CARGO_TARGET_DIR:-$GITHUB_WORKSPACE/target}
-          (cd ../base && CARGO_TARGET_DIR="$target" cargo run --profile fast -p horizon-client-render \
-            --example pack_load_bench -- --scale "$SCALE") > base.md \
-            || echo "The bench does not build on the base." > base.md
-      - name: Summary
-        run: |
-          {
-            echo "### Branch ($(git rev-parse --short HEAD))"; cat head.md
-            echo; echo "### Base (${{ inputs.base || 'main' }})"; cat base.md
-          } | tee -a "$GITHUB_STEP_SUMMARY"

.github/workflows/pr-labels.yml

@@ -16,9 +16,7 @@ jobs:
   label:
     # Title-only edits change nothing: skip them before a runner starts.
     if: github.event.action != 'edited' || github.event.changes.body != null
-    # One of our small runners (horizon-light), out of GitHub's pool: it runs main's script only (above), so a fork's
-    # pull request runs none of its code there (docs/ci-runners.md). SELF_HOSTED_CI=off: GitHub's runners.
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && fromJSON('["self-hosted", "linux", "horizon-light"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     timeout-minutes: 5
     permissions:
       contents: read

.github/workflows/telemetry-server.yml

@@ -15,13 +15,9 @@ on:
       - '.github/workflows/telemetry-server.yml'
 permissions:
   contents: read
-concurrency:
-  group: telemetry-server-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 jobs:
   check:
-    # Our checks runners (label horizon-checks, docs/ci-runners.md); SELF_HOSTED_CI=light or off: GitHub's.
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && vars.SELF_HOSTED_CI != 'light' && fromJSON('["self-hosted", "linux", "horizon-checks"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     timeout-minutes: 20
     defaults:
       run:
@@ -29,9 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: rustup toolchain install stable --profile minimal --component rustfmt --component clippy
-      # Ours keep their build folder between jobs.
       - uses: Swatinem/rust-cache@v2
-        if: runner.environment == 'github-hosted'
         with:
           workspaces: crates/horizon-telemetry-server
           save-if: ${{ github.ref == 'refs/heads/main' }}

.github/workflows/triage-command.yml

@@ -21,8 +21,7 @@ jobs:
       startsWith(github.event.comment.body, '/reopen') ||
       startsWith(github.event.comment.body, '/label') ||
       startsWith(github.event.comment.body, '/unlabel'))
-    # One of our small runners (label horizon-light, docs/ci-runners.md): main's script only, as above.
-    runs-on: ${{ vars.SELF_HOSTED_CI != 'off' && fromJSON('["self-hosted", "linux", "horizon-light"]') || 'ubuntu-latest' }}
+    runs-on: ubuntu-latest
     timeout-minutes: 5
     permissions:
       contents: read

.gitignore

@@ -21,7 +21,6 @@
 .DS_Store
 # What the client writes to its working directory when run from the repo root.
 /options.txt
-/debug-profile.json
 /horizon.txt
 /horizon-graphics.txt
 /horizon-controller.txt

AGENTS.md

@@ -30,7 +30,6 @@ Feature → files → harness for the most-changed areas: [docs/architecture.md]
   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)).
 - Contributors first: `gh pr list --state open --search <area>` before you start; never duplicate theirs.
-- **No hardcoded user-facing strings.** Keep UI translation-ready from the start. In the launcher (`launcher/`), wrap visible text with `tr("...")` or `trf("... {arg} ...", &[("arg", &val)])` from `crate::i18n` instead of raw string literals or `format!`. In the game, use translation keys (`Text::tr`, `lang::get`), never hardcoded English strings.
 - **Claim before you start**: comment `/claim` on the issue (no issue yet: open one, then claim it). An assigned
   issue is taken: pick another. `/unclaim` when you stop; a claim with no open PR linking it is released after 5 days.
 
@@ -40,8 +39,7 @@ Game workspace (root `Cargo.toml`); `launcher/` and `crates/horizon-telemetry-se
 
 | Crate | Owns |
 |---|---|
-| `horizon-client` | Gameplay library (`src/lib.rs`: `game.rs` + `game/`, `entry.rs`) and thin executable (`src/main.rs`). Also the dedicated server (`--dedicated`). Re-exports `horizon-client-lib` for existing mod paths. |
-| `horizon-client-lib` | Reusable client systems, `horizon-ctl`, probes and their tests. Its manifest points to the existing sources under `crates/horizon-client/`; the library root is `src/client_lib.rs`. It never depends on gameplay. |
+| `horizon-client` | The game: a lib (`src/lib.rs`, ~100 flat modules: gameplay, networking, title screens) and the bin (`src/main.rs` → `game.rs` + `game/`), plus `horizon-ctl` (`src/bin/horizon-ctl/`). Also the dedicated server (`--dedicated`) |
 | `horizon-items` | Blocks and items below gameplay: `blocks.rs` (block facts), `items.rs`, `item_data.rs` (components), `enchant.rs`, `cooldowns.rs`, `bundle.rs`, `item_nbt.rs`. Re-exported as `horizon_client::items`... |
 | `horizon-command` | Command parsing (Brigadier): the vanilla tree, argument types, selectors, suggestions, the tree's network form. Re-exported as `horizon_client::command` |
 | `horizon-client-core` | The client lib's bottom layer: `text.rs`, `lang.rs`, `snbt.rs`, `nbt_path.rs`, `component.rs`, `scoreboard.rs`, `bossbar.rs`, `gamerules.rs`, `block_entity_nbt.rs`, registry/particle/sound tables. Re-exported under the old paths (`horizon_client::text`...) |
@@ -54,12 +52,9 @@ Game workspace (root `Cargo.toml`); `launcher/` and `crates/horizon-telemetry-se
 | `horizon-prepare` | Builds `.local/horizon-client/26.3` from the player's own Minecraft install (runs the Java exporters) |
 | `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-anticheat` | The dedicated server's anticheat, off by default: `[anticheat]` settings, violation levels, the checks' rules; the hub runs them (`lan/anticheat.rs`) ([docs/anticheat.md](docs/anticheat.md)) |
-| `horizon-cosmetics` | Cosmetic items Horizon clients draw on players (off by default): the item format, bones and animations ([docs/cosmetics.md](docs/cosmetics.md)) |
 | `horizon-friends`, `horizon-relay` | Play with Friends: invite codes, encrypted tunnel, the relay ([docs/play-with-friends.md](docs/play-with-friends.md)) |
 | `horizon-mods`, `cargo-horizon-mod` | Content mods (`.hmod`: manifest, content fence, no code), the registry index and `.hpack`, and `cargo horizon-mod` (`new`, `build`, `run`, `check`, `registry`) ([docs/mods.md](docs/mods.md)). Code mods are native, built by the launcher ([docs/native-mods.md](docs/native-mods.md)) |
 | `horizon-port-pack` | Porting Java modpacks ([docs/modpacks.md](docs/modpacks.md)) |
-| `horizon-optifine` | OptiFine-format pack files below every feature that reads them: `.properties`, the name/range/block matchers, paths and `optifine/` folders, and custom entity models (`cem/`: `.jem`/`.jpm` parsing and baking) |
 | `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 |
@@ -72,23 +67,13 @@ unittest discover -s tests`), `mods/horizon/src/test/java/dev/horizonlab/parity/
 `docs/`, `.github/workflows/`. The website (playhorizon.dev) is the private horizon-rust/horizon-site: its build
 reads `README.md`, `launcher/links.json`, `docs/api/`, `roadmap/roadmap.json` and `crates/horizon-theme/tokens.css` from main.
 
-## Write tests with signal
-
-- Test observable behavior, not words in docs, comments or source. Keep checks for machine-consumed contracts.
-- Use independent expected values or a vanilla oracle; do not derive the answer from the code under test.
-- Test outcomes, not only calls to stubs. Use mocks to isolate behavior, not as the behavior itself.
-- Skip tests of trivial constants, derives and getters, or behavior already covered by another test.
-- Avoid pinning implementation details; a harmless refactor should not break a behavior test.
-- Make slow tests faster without removing cases or weakening their coverage.
-- Never delete parity harnesses or tests that pin vanilla behaviour: they are the spec.
-
 ## Build and test fast
 
 ```sh
 python3 tools/pr_ready.py                  # the self-check: fmt, clippy -D warnings, touched crates' tests, harnesses; paste its block in the PR
 python3 tools/pr_ready.py --quick          # same without harnesses
-cargo test -p horizon-client -p horizon-client-lib --lib --bins --tests   # skips the 104 examples (pr_ready does this); `--doc` separately
-cargo test -p horizon-client-lib --lib mod_content::tests:: -- --ignored   # the 5 slow content-root tests, #[ignore]d; pr_ready runs them when mod content, assets, blocks or items change
+cargo test -p horizon-client --lib --bins --tests   # skips the 104 examples (pr_ready does this); `--doc` separately
+cargo test -p horizon-client --lib mod_content::tests:: -- --ignored   # the 5 slow content-root tests, #[ignore]d; pr_ready runs them when mod content, assets, blocks or items change
 cargo build --profile fast -p horizon-client        # optimized, quick to link: use it to play or run lan_e2e
 python3 tools/parity.py --changed origin/main       # the harnesses your branch can affect (CI's parity job)
 python3 tools/parity.py --changed-files paths.txt --list   # which harnesses cover these files, without running them
@@ -104,16 +89,9 @@ python3 tools/agent_control_e2e.py         # horizon-ctl / MCP end to end
   + a Rust probe: `crates/<crate>/examples/<name>_{probe,fixture}.rs` (horizon-world 175, horizon-client 104),
   or the game binary with a fixture env var (`game/dispense_fixture.rs`, `game/sculk_fixture.rs`,
   `game/command_harness.rs`, `game/net_harness.rs`). Copy a nearby harness for a new one.
-- Developing a native mod? Run `horizon-launcher settings native-profile dev` once. `dev` builds the game crate
-  unoptimized: a mod edit rebuilds about 6× faster than with `performance`, while game logic runs up to about twice as
-  slow. Use it while developing, not for playing; `performance` stays the default for players and releases
-  ([docs/native-mods.md](docs/native-mods.md)).
 - Probes build into `.local/parity-target/`; harnesses find binaries via `lab.cargo_target()`, never `target/`.
-- Harness selection uses Cargo dep-info and reachable-code narrowing (`tools/parity_reach.py`).
-  `horizon-client-lib` builds the control tool and client probes without gameplay; their dep-info
-  excludes `game.rs` and `game/`, so gameplay edits do not rebuild or select those probes.
-  Source paths remain in `crates/horizon-client/`. Measure actual harness selection on refreshed
-  records with `tools/parity.py --changed-files paths.txt --list`; historical counts are not a guarantee.
+- What a change reruns (of 329 harnesses, measured 2026-10-23): a file of the game binary (`game.rs`, `game/`)
+  ~25, a file of the client lib ~103, of `horizon-world` ~103–109, of `horizon-core` ~119. Plan for it.
 - Rust integration tests: `crates/horizon-client/tests/` (`lan_bot.rs`, `generation_saves.rs`, `streaming_meshes.rs`).
 - Linux needs `libasound2-dev libudev-dev`; `--no-default-features` drops audio and controllers (the server build).
 - Run and drive the game (starts the `horizon-client` beside `horizon-ctl`; other arguments go to the game):
@@ -138,17 +116,14 @@ python3 tools/agent_control_e2e.py         # horizon-ctl / MCP end to end
 ## horizon-client: where things live
 
 `L:` = lib (`crates/horizon-client/src/`, or `crates/horizon-client-render/src/` for the modules that crate holds, under
-the same `horizon_client::<module>` paths), `G:` = gameplay (`crates/horizon-client/src/game/`), also in the lib in normal builds.
-Gameplay keeps its `horizon_client::<module>` imports through a self-crate alias. The executable
-contains only the allocator, mod API marker and a call to `entry::main`. For unit tests, the lib
-excludes `entry` and `game`, and the executable test target owns `game` so its process-wide test
-state stays separate from the library tests. This compiles gameplay twice for executable tests.
+the same `horizon_client::<module>` paths), `G:` = bin (`crates/horizon-client/src/game/`). The lib can't see
+`Game`; bin code reaches the lib as `horizon_client::<module>`.
 
 | Subsystem | Files |
 |---|---|
 | Game loop, tick, frame | `game.rs`: `fn run`, `impl ApplicationHandler for Game` (`window_event`, `about_to_wait`), `fn tick`, `fn tick_world`, `fn render`; L: `clock.rs`, `spans.rs`; `horizon-client-input/src/window.rs` |
 | Rendering | L: `gfx.rs` (`Renderer::new`, `Renderer::render`), `gfx/` (cull, occlusion, translucency, upload, timing, lod, weather, stars, end_sky), `*.wgsl`, `particles.rs`, `block_entity_render.rs`, `item_render.rs`, `fog.rs`, `clouds.rs`, `camera.rs`, `first_person.rs`; G: `render_tick.rs`, `item_draw.rs` |
-| Chunks, streaming, light | L: `streaming.rs` (worker pool: generate, light, mesh), `world.rs`, `chunk.rs`, `chunk_map.rs`, `light.rs`, `mesher.rs` + `mesher/`, `vanillagen.rs` (binds horizon-world's generator), `lod.rs` + `lod/`, `server_terrain.rs` (a server's kept chunks), `bluemap.rs` + `bluemap_detect.rs` (far terrain from its web map), `ticket_levels.rs`; G: `world_loading.rs`, `postprocess.rs`; game.rs `fn update_world` |
+| Chunks, streaming, light | L: `streaming.rs` (worker pool: generate, light, mesh), `world.rs`, `chunk.rs`, `chunk_map.rs`, `light.rs`, `mesher.rs` + `mesher/`, `vanillagen.rs` (binds horizon-world's generator), `lod.rs` + `lod/`, `ticket_levels.rs`; G: `world_loading.rs`, `postprocess.rs`; game.rs `fn update_world` |
 | World generation | `crates/horizon-world/src/worldgen/` (`generator*.rs`, `feature_graph.rs`, `structure/`, `carver/`) |
 | Block behaviour | `crates/horizon-world/src/level/` (`mod.rs`, `tick.rs`, `hooks.rs`, `redstone.rs`, `place.rs`, `interact.rs`); game.rs `fn tick_blocks`, `fn process_level_events` |
 | Mobs | L: `mobs.rs` (types), `mobs/` (`ai.rs`, `goals.rs`, `brain.rs`, `*_brain.rs`, `nav.rs`, `path.rs`, `species.rs`, `spawning.rs`, `render.rs`, `anim.rs`); G: `creatures.rs` (ticking, spawning, mob events), one file per mob family (`dragon.rs`, `wither.rs`, `villagers.rs`, `piglins.rs`, `golems.rs`...), `natural_spawning.rs` |
@@ -160,11 +135,11 @@ state stays separate from the library tests. This compiles gameplay twice for ex
 | Multiplayer client | L: `net.rs` (network thread); G: `remote.rs` (`fn handle_packet`, `fn tick_remote`), `remote_*.rs` (mob data, objects, projectiles, vehicles, stations) |
 | LAN host / server side | L: `lan/` (`conn.rs` handshake + login threads, `hub.rs` + `hub/` play state, `chunks.rs`, `entity.rs`, `tracking.rs`, `guest.rs`, `playerdata.rs`); G: `lan.rs` (`LanHost`), `lan_actions.rs` (`fn as_guest`, `fn tick_guests`), `lan_*.rs` per feature, `lan_entities.rs` (tracked entities) |
 | Integrated server | G: `integrated.rs` (the server thread), `levels.rs` (one level per dimension, `fn tick_server`), `server_travel.rs` |
-| Dedicated server | G: `dedicated.rs`, `dedicated/status.rs`; crates `horizon-server-files`, `horizon-server`, `horizon-anticheat` (L: `lan/anticheat.rs`) |
+| Dedicated server | G: `dedicated.rs`, `dedicated/status.rs`; crates `horizon-server-files`, `horizon-server` |
 | Save and load | L: `save.rs` (level.dat, regions, playerdata), `entity_nbt.rs`, `options_file.rs`; `horizon-client-core/src/block_entity_nbt.rs`; G: `saving.rs`, `persist.rs` (entities); `crates/horizon-world/src/{region.rs,nbt.rs,datafix/}` |
 | Input | game.rs `fn window_event`, `fn key_pressed`, `fn play_mouse`; crate `horizon-client-input` (`keybinds.rs`, `keymapping.rs`, `key_names.rs`, `mouse.rs`, `input.rs`, `interaction_input.rs`, `gamepad.rs`, `clipboard.rs`); L: `osk.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`, `mobs/cem.rs` + `mobs/cem_anim.rs` (OptiFine/EMF entity models and their animations); `horizon-client-core/src/lang.rs`; crates `horizon-assets`, `horizon-optifine`; G: `packs.rs` |
+| Resource packs | L: `packs.rs` + `packs/`, `pack_screen.rs`, `atlas_sources.rs`, `sprites.rs`, `mipmap.rs`, `model_library.rs`, `font.rs`; `horizon-client-core/src/lang.rs`; crate `horizon-assets`; G: `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` |
@@ -173,30 +148,34 @@ state stays separate from the library tests. This compiles gameplay twice for ex
 
 - `struct Game` (game.rs, ~290 fields) holds everything. Its methods are spread over ~180 files: game.rs keeps
   the core (tick, render, input, inventory, world open/close) and each `game/<feature>.rs` adds an
-  `impl Game<'_>` block for one feature, with its own state types. Fields stay private to the gameplay module and its descendants. Gameplay tests run in the gameplay library, separate from reusable-library tests.
+  `impl Game<'_>` block for one feature, with its own state types. Fields are private to the bin.
 - Find a feature's code: `grep -rn "fn tick_<thing>\|fn <verb>_<thing>" crates/horizon-client/src/game*`;
   the file is usually `game/<thing>s.rs`. Who calls it: grep the name in game.rs's `fn tick` / `fn tick_world`.
 - Fields that say which mode runs: `remote` (this window is a client of a server: multiplayer, LAN guest, or
   single player on its server thread), `lan` (`LanHost`: this world is open to the network), `integrated`
   (the window's own server thread), `serving` (this `Game` *is* that server thread), `options.dedicated`.
-  `fn tick` returns `tick_remote()` when `remote` is set; a server ticks its levels (`fn tick_world`).
-- A server's players run through the shared gameplay code: `as_guest` swaps the guest's
+  `fn tick` returns `tick_remote()` when `remote` is set; nothing else of the local simulation runs.
+- A server's players run through the same gameplay code as the local player: `as_guest` swaps the guest's
   state (position, inventory, mode, mining, item use) into `Game` for one call (`game/lan_actions.rs`), and
   `levels.rs` swaps whole dimensions in the same way. Changes reach clients through the block log, level
   events and the entity tracker (`lan/tracking.rs`, `game/lan_entities.rs`).
 - Shared read-only data: `Resources` (`res`: blocks, items, recipes, mob types, biomes) and `PackResources`
   (`pack`), both in game.rs.
 
-## Single player runs on a server thread
+## The two single-player paths
 
-`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 (#1514). A window's `Game` never ticks a world itself: the old in-frame path is gone
-(`--in-frame` and `--no-server-thread` only print a notice; `HORIZON_SERVER_THREAD` is ignored).
-Open `[server-thread]` issues list the gaps left.
+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`): DEPRECATED, never use it, it
+   will be removed soon.** The window's `Game` ticks the world itself, one level that follows the player
+   (`fn enter_dimension`). Compatibility does not matter: don't add features or fixes for it, don't write new
+   tests against it, and move code off it when you touch it. The deterministic rule fixtures still run on it
+   until they are ported.
 
-Single player, LAN guests and dedicated servers all run the server code, so a fix there serves all three.
-Test the server thread when you touch player-facing gameplay:
+LAN guests and dedicated servers always use the server code, so a fix there serves both. Test the server
+thread when you touch player-facing gameplay:
 
 ```sh
 cargo run --profile fast -p horizon-client -- --resources .local/horizon-client/26.3 --world T               # server thread

CONTRIBUTING.md

@@ -2,11 +2,10 @@
 
 Thanks for helping. Horizon is Minecraft: Java Edition 26.3 rewritten in Rust, and the one rule that shapes
 everything is that **it plays exactly like vanilla**. This page is the short version of how we work; questions are
-welcome on [Discord](https://discord.gg/playhorizon).
+welcome on [Discord](https://discord.gg/HcTeMZxe5E).
 
 This repository holds the game and the launcher, plus the tools, tests and docs that build, check and release them.
-The website (playhorizon.dev) is built in a separate repository from this one's README, `docs/api/` and roadmap. Anything
-else (videos, Discord and other community material) lives elsewhere.
+The website (playhorizon.dev) is built in a separate repository from this one's README, `docs/api/` and roadmap. 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
@@ -15,25 +14,23 @@ queue (the hub, or `/suggest` on Discord) rather than to issues, which are for b
 
 ## Build it
 
-- **Prerequisites:** Rust (stable), Python 3.10+, JDK 25, and on Linux the ALSA and udev headers
-  (`libasound2-dev libudev-dev`).
-- **Resources:** Horizon never downloads the game; it prepares its resources from your own copy of Minecraft 26.3, as
-  described in [Build from source](README.md#build-from-source).
-- **Commands:**
+You need Rust (stable), Python 3.10+, JDK 25, and on Linux the ALSA and udev headers (`libasound2-dev libudev-dev`).
+Horizon never downloads the game: it prepares its resources from your own copy of Minecraft 26.3, as described in
+[Build from source](README.md#build-from-source).
 
-  ```sh
-  cargo run --release -p horizon-prepare -- --prepare --server-jar ~/Downloads/server.jar
-  cargo run --release -p horizon-client
-  ```
+```sh
+cargo run --release -p horizon-prepare -- --prepare --server-jar ~/Downloads/server.jar
+cargo run --release -p horizon-client
+```
 
-- **Launcher:** its own Cargo workspace in `launcher/` (`cd launcher && cargo run`; on NixOS, `nix-shell` first).
+The launcher is its own Cargo workspace in `launcher/` (`cd launcher && cargo run`; on NixOS, `nix-shell` first).
 
 ## Vanilla first
 
-Wherever vanilla has a feature, vanilla is the specification, down to the order of random calls. "Parity" here means
-Horizon gives the same results as the pinned 26.3 client and server for the same inputs, checked by a **harness**: a
-`tools/test_*_parity.py` script that runs a small Java oracle against the real game and a Rust probe against Horizon,
-and compares their outputs. There are about 290 of them.
+Wherever vanilla has a feature, vanilla is the specification, down to the order of random calls. "Parity" here
+means Horizon gives the same results as the pinned 26.3 client and server for the same inputs, checked by a
+**harness**: a `tools/test_*_parity.py` script that runs a small Java oracle against the real game and a Rust
+probe against Horizon, and compares their outputs. There are about 290 of them.
 
 - **Read the vanilla code before writing Horizon's.** `tools/rea_vanilla.py` queries the pinned game bytecode:
   `python3 tools/rea_vanilla.py method net.minecraft.world.level.block.DispenserBlock dispenseFrom`.
@@ -44,35 +41,20 @@ and compares their outputs. There are about 290 of them.
   off by default wherever they would change the vanilla look.
 - **Everything players run is Rust.** Python and Java are fine for dev tools and harness drivers in `tools/`, never
   for player-facing code.
-- **No game files in the repo.** 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, or code whose license allows it
+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.
 
-Horizon is MIT. Its code is written from Minecraft 26.3 itself and from public documentation. Since 30 October 2026
-another project's source may also be read and used, **only when that project's license allows it**:
+## Only original code
 
-- **Allowed:** MIT, MIT-0, BSD-2-Clause, BSD-3-Clause, 0BSD, ISC, zlib, Apache-2.0, Unlicense, and the CC0-1.0
-  public-domain dedication. That code may be read, copied or adapted.
-- **Off limits, even to read:** GPL, LGPL (Iris), AGPL, MPL, EPL, Polyform (Sodium), the Creative Commons licenses
-  (CC BY, CC BY-SA, CC BY-NC and the others; CC0 is a public-domain dedication, not one of them), custom or
-  "source available" licenses, all rights reserved (OptiFine), and any project with no license or an unclear one.
-  Don't read, copy, translate or paraphrase their source, and don't send code an AI tool wrote from it. Being able
-  to download a mod or a pack does not give you the right to read its files.
-- **Check the license yourself.** Read the LICENSE file at the commit you use and the header of each file you take:
-  some repositories mix licenses, and a file under another license is off limits. A license that changed: the one at
-  your commit counts. In doubt, don't: ask in #contributors first.
-- **Say it in the pull request:** the project, a link to the commit, its license, and what you read or copied. A
-  pull request that used another project's source without saying so is closed.
-- **Copied or adapted code** keeps its copyright line and license notice at the top of the file, and gets an entry
-  in [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md). Apache-2.0 code also keeps its NOTICE text and says what
-  was changed.
-
-User documentation and file formats are fine to read, and packs and mods are fine to run and observe, whatever their
-license. Shader packs are a clean-room rewrite of the pack format, produced from a written description of it (see
-#1561); they carry no foreign source, and the rules above still apply to anything you read while working on them.
+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
 
@@ -88,8 +70,8 @@ your change can affect. Without the vanilla data on your machine it lists those
 `--quick` skips the harnesses. It exits non-zero when something fails.
 
 For the game workspace, Clippy checks all targets of the touched crates and their transitive workspace dependents,
-including examples. The dependency scope includes optional, platform, build and development dependencies. Tests run
-library, binary, integration and doc tests without building unrelated example executables. Shared Cargo
+including examples. The dependency scope includes optional, platform, build and development dependencies.
+Tests run library, binary, integration and doc tests without building unrelated example executables. Shared Cargo
 configuration and toolchain changes select the whole workspace; CI also keeps its workspace-wide checks.
 
 ## Claim before you start
@@ -97,12 +79,10 @@ configuration and toolchain changes select the whole workspace; CI also keeps it
 Work is tracked in GitHub issues, and an issue that is assigned is taken (so is one with the `in progress` label:
 claimed on Discord with Kira's `/claim`): pick another, or ask its holder in the thread. Before you start, comment
 **`/claim`** on the issue; you are assigned at once, no role needed. No issue for your work yet? Open one (a line is
-enough), then claim it. `/unclaim` gives it back. Issues labelled `tracker`, `proposal` or `not claimable` aren't
-claimed whole: claim one of the issues a tracker lists, or open one for the part you take.
+enough), then claim it. `/unclaim` gives it back.
 
 A claim with no open pull request linking the issue (`Fixes #123` in the description, or a draft) is released after
-5 days, with a comment: open a draft early. You can hold 8 open issues at a time, not counting the ones your
-pull requests already fix. Agents claim the same way.
+5 days, with a comment: open a draft early. You can hold 5 open issues at a time. Agents claim the same way.
 
 When your pull request changes the same functions as another open one, or closes the same issue, a bot comment names
 it (edited on every push, never repeated): talk to its author in the thread before you both finish the same work.
@@ -115,17 +95,13 @@ it (edited on every push, never repeated): talk to its author in the thread befo
   can see.
 - **Tick "Allow edits by maintainers".** When something small is left (a lint, a rebase, a nit) we push the fixup
   ourselves instead of sending it back to you; only design questions come back.
-- **Once we've pushed to your branch, merge main into it; don't rebase or force-push.** A rebase or force-push
-  replaces our commits with yours and erases the fixes we added (it happened on #5188 and #5203). Tell your agent
-  too: `git merge origin/main`, never `git rebase` or `git push --force` on a branch a maintainer has touched. If
-  our fixes get erased anyway, we finish the work in our own pull request that keeps your commits and credits you.
 - **Tick its kind** in the template: `parity` (Horizon now does what vanilla does), `bug` (a crash or breakage),
   `perf`, `feature` (new for players), `extra` (Horizon-only, off by default), `tooling` or `docs`. A workflow sets
   that label, and area labels (`launcher`, `mobs`, `worldgen`, `rendering`...) from the paths you change.
   `label:parity` is the list of real progress toward vanilla.
 - **Release labels** (we set them if you can't): `feature` also puts it under "New" in the release notes,
-  `skip-release` when players see no change (tooling, docs, tests), nothing for a fix. `release-now` is for crash
-  fixes that shouldn't wait. pr_ready suggests one.
+  `skip-release` when players see no change (tooling, docs, tests), nothing for a fix.
+  `release-now` is for crash fixes that shouldn't wait. pr_ready suggests one.
 
 Who reviews and merges: the Horizon Team, on CI for ordinary pull requests; risky ones (saves, network, world
 generation, the launcher's updates) wait for a local proof first ([merging](docs/release-flow.md#merging)).
@@ -142,5 +118,5 @@ new pushes, we add it again.
 
 ## Talk to us
 
-[Discord](https://discord.gg/playhorizon) for questions and ideas, [issues](https://github.com/horizon-rust/horizon/issues)
+[Discord](https://discord.gg/HcTeMZxe5E) for questions and ideas, [issues](https://github.com/horizon-rust/horizon/issues)
 for bugs. To take something on, `/claim` its issue ([above](#claim-before-you-start)).

Cargo.toml

@@ -1,25 +1,18 @@
 [workspace]
-exclude = ["launcher", "crates/horizon-telemetry-server", "crates/horizon-mod-registry", "third_party/wgpu-hal", "third_party/naga", "third_party/libmimalloc-sys"]
+exclude = ["launcher", "crates/horizon-telemetry-server", "crates/horizon-mod-registry", "third_party/wgpu-hal"]
 members = [
     "crates/horizon-core",
     "crates/horizon-dualsense",
-    "crates/horizon-narrator",
     "crates/horizon-threads",
     "crates/horizon-hdr",
     "crates/horizon-world",
     "crates/horizon-client",
-    "crates/horizon-client-lib",
     "crates/horizon-client-core",
     "crates/horizon-client-input",
     "crates/horizon-client-render",
-    "crates/horizon-cosmetics",
     "crates/horizon-command",
     "crates/horizon-items",
     "crates/horizon-server-files",
-    "crates/horizon-anticheat",
-    "crates/horizon-chat-filter",
-    # The Model Context Protocol, shared by horizon-ctl, horizon-server and the launcher.
-    "crates/horizon-mcp",
     "crates/horizon-server",
     "crates/horizon-bots",
     "crates/horizon-assets",
@@ -31,14 +24,12 @@ members = [
     "crates/horizon-friends",
     "crates/horizon-relay",
     "crates/horizon-mods",
-    "crates/horizon-mod-api-gen",
-    "crates/horizon-mod-api-gen/dispatch-tests",
     "crates/cargo-horizon-mod",
     "crates/horizon-port-pack",
     "crates/horizon-shaders",
-    "crates/horizon-optifine",
     "crates/horizon-shader-api",
     "crates/horizon-release-sign",
+    "crates/horizon-data-file",
     "xtask",
 ]
 resolver = "2"
@@ -62,18 +53,9 @@ large_enum_variant = "allow"
 # UHD 620/630) crashes on it with an access violation (#746). It also fixes the
 # Metal backend's lookup of the CoreGraphics HDR colour space names, which handed
 # CoreGraphics a symbol's address as the string and crashed HDR output on macOS.
-# And gfx-rs/wgpu#10714: on Windows, Vulkan waits for the acquire fence only in
-# FIFO (VSync), where it was meant to pace frames; with VSync off it made every
-# frame wait for the GPU to finish the one before (#4604).
-# Drop this and the folder once a wgpu release has these fixes.
+# Drop this and the folder once a wgpu release has both fixes.
 [patch.crates-io]
 wgpu-hal = { path = "third_party/wgpu-hal" }
-# naga 30.0.1, with the fixes to its GLSL frontend that shader packs need (THIRD_PARTY_NOTICES.md).
-naga = { path = "third_party/naga" }
-# libmimalloc-sys 0.1.49 whose mimalloc v3 counts bits without POPCNT when MSVC builds it: the
-# game died before main on CPUs without it (Core 2, #7264; THIRD_PARTY_NOTICES.md). Drop this and
-# the folder once a libmimalloc-sys release has microsoft/mimalloc#1291's fix.
-libmimalloc-sys = { path = "third_party/libmimalloc-sys" }
 
 # Line tables keep file:line in backtraces; full debug info made every
 # example and test binary hundreds of megabytes and slow to link.

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="docs/media/banner.webp" alt="The Horizon website: the game you know, rebuilt in Rust" width="100%">
+  <img src="docs/media/banner.webp" alt="Horizon: Minecraft: Java Edition 26.3, rewritten in Rust and checked against vanilla by more than 300 differential harnesses" width="100%">
 </p>
 
 <p align="center">
@@ -7,7 +7,7 @@
   <img src="https://img.shields.io/badge/Minecraft-Java%2026.3-5D9C3F" alt="Minecraft Java 26.3">
   <img src="https://img.shields.io/badge/Rust-stable-B7410E?logo=rust&logoColor=white" alt="Rust">
   <img src="https://img.shields.io/badge/vanilla%20parity-100%25-F0795A" alt="Vanilla parity 100%">
-  <a href="#project-status"><img src="https://img.shields.io/badge/player--visible%20gaps-0%20open-F0795A" alt="Player-visible gaps open"></a>
+  <a href="#project-status"><img src="https://img.shields.io/badge/player--visible%20gaps-833%20open-F0795A" alt="Player-visible gaps open"></a>
   <img src="https://img.shields.io/badge/platform-Linux%20%7C%20macOS%20%7C%20Windows-2A2470" alt="Linux, macOS and Windows">
   <a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-3B2F7E" alt="MIT license"></a>
 </p>
@@ -24,32 +24,34 @@
 
 # Horizon
 
-Minecraft: Java Edition 26.3, rewritten in Rust. Same worlds, same rules, same terrain, checked against the Java game by more than 300 differential harnesses. Free, open source and unofficial.
+Horizon is Minecraft: Java Edition 26.3 rewritten in Rust: a native game that reads the same worlds, follows the same rules and generates the same terrain as the Java game, and is checked against it by more than 300 differential harnesses. You play it through a small launcher, on the files from your own copy of Minecraft. It is free, open source and unofficial.
 
-> Not an official Minecraft product, nor approved by or associated with Mojang or Microsoft. Horizon contains no Minecraft code, assets or data: you need your own copy of Java Edition 26.3.
+> Not an official Minecraft product. Not approved by or associated with Mojang or Microsoft. Horizon contains no Minecraft code, assets or data: you need your own legally obtained copy of Minecraft: Java Edition 26.3.
 
 ## Download
 
-Get **the Horizon launcher** from [playhorizon.dev](https://playhorizon.dev) or [the launcher releases](https://github.com/horizon-rust/horizon/releases?q=launcher-v&expanded=true) (Linux x86-64, macOS on Apple Silicon, macOS on Intel from the next Nightly, Windows x64). It installs and updates the game, prepares its files from your copy of Minecraft, and updates itself.
+Horizon is installed through **the Horizon launcher**. Get it from [playhorizon.dev](https://playhorizon.dev) (the Download button picks your system) or from [the launcher releases](https://github.com/horizon-rust/horizon/releases?q=launcher-v&expanded=true), for Linux x86-64, macOS on Apple Silicon or Windows x64. The launcher installs the game and keeps it up to date with each new build (Horizon ships on one channel, the Nightly), prepares its files from your copy of Minecraft (your own install, or downloaded from Mojang for your account), and updates itself.
 
-**You need** a Microsoft account that owns Java Edition ([why](docs/microsoft-account.md)) and a GPU with Vulkan or OpenGL 3.3 (Linux), Vulkan or DirectX 12 (Windows), or a Mac (Apple Silicon, or Intel from the next Nightly). An existing Minecraft install (official launcher, Prism, MultiMC...) is reused; without one, Play downloads 26.3 from Mojang for your account. Step by step: [Install and first launch](https://playhorizon.dev/docs/install).
+**You need** a Microsoft account that owns Minecraft: Java Edition (the launcher signs in with it, as other launchers do; see [Microsoft account](docs/microsoft-account.md)) and a GPU with Vulkan or OpenGL 3.3 on Linux, Vulkan or DirectX 12 on Windows, or any Apple Silicon Mac. Nothing else: with no Minecraft on your computer, Play downloads 26.3 and the Java it needs from Mojang for your account, as the official launcher does, then prepares it once. An install you already have (the official launcher, Prism, MultiMC and other launchers all work) is used instead. Step by step, with macOS's first-open prompt and the first launch: [Install and first launch](https://playhorizon.dev/docs/install).
 
 <table>
   <tr>
-    <td width="50%"><img src="docs/media/launcher-play.webp" alt="The launcher's Home page: the selected instance ready to play, the version picker, Join a friend and the instance's tabs"></td>
-    <td width="50%"><img src="docs/media/launcher-settings.webp" alt="The launcher's Settings page: Microsoft account, offline name, updates, appearance and accent colour"></td>
+    <td width="50%"><img src="docs/media/launcher-play.webp" alt="The launcher's Play page: a version ready to play, its summary, Client and Server, the version picker and Play"></td>
+    <td width="50%"><img src="docs/media/launcher-patch-notes.webp" alt="The launcher's Patch notes page"></td>
   </tr>
 </table>
 
 ## What works today
 
-- **The game:** vanilla world generation, mobs, villagers, raids, redstone, every command, the HUD and the recipe book, on vanilla saves. Worlds from 1.8 to 26.2 are upgraded. [Status](#project-status).
-- **Extras:** new menus, graphics presets, distant terrain up to 1024 chunks, controllers, zoom, minimap and more, off by default where they change the vanilla look. [Settings](https://playhorizon.dev/docs/settings).
-- **Packs:** resource packs, and data packs with functions, predicates, item modifiers and world generation.
-- **Multiplayer:** invite friends with a code, Open to LAN, join servers (online mode included). [Multiplayer](https://playhorizon.dev/docs/multiplayer).
-- **Mods:** content mods (blocks, items, data) and native Rust mods, built by the launcher with nothing to install. Java mod jars do not run. [Mods](https://playhorizon.dev/docs/mods).
+The [documentation](https://playhorizon.dev/docs/) covers each of these.
 
-In the Rust client, with vanilla assets and no mods or shaders:
+- **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, item modifiers and world generation (vanilla's heights and biomes for now).
+- **Playing with others:** invite friends from the pause menu's Friends button with a code, Open to LAN, and joining servers, online-mode ones with the Microsoft account the launcher signs in with. See [Multiplayer](https://playhorizon.dev/docs/multiplayer).
+- **Mods:** content mods add blocks, items and data, and native mods change the game's own Rust code, built by the launcher on your copy, with no Rust to install. Horizon's own (Zoom, FPS Counter, Keystrokes, Minimap, Recipes and Coordinates HUD) are native mods. Java mod jars do not run in Horizon. See [Mods and data packs](https://playhorizon.dev/docs/mods).
+
+Screenshots, captured in the Rust client itself with vanilla assets and no mods or shaders:
 
 <table>
   <tr>
@@ -67,15 +69,15 @@ In the Rust client, with vanilla assets and no mods or shaders:
 
 ## Host a server
 
-The launcher's **Servers** page creates, starts, backs up and updates a server, and invites friends over Tailscale. On a VPS, `horizon-server` installs with one command and needs no Java. [Host a server](https://playhorizon.dev/docs/hosting) ([reference](docs/hosting.md)).
+The launcher's **Servers** page creates, starts, backs up and updates a Horizon server with buttons, and invites friends over Tailscale. On a VPS, `horizon-server` installs with one command and runs without Java. Guide: [Host a server](https://playhorizon.dev/docs/hosting) ([reference](docs/hosting.md)).
 
 ## Modpacks
 
-The launcher imports Modrinth and CurseForge packs and plays the mods Horizon can carry over: today, content mods made of data and assets, not Java code. [Modpacks](https://playhorizon.dev/docs/modpacks).
+The launcher's **Modpacks** page imports a Modrinth or CurseForge pack, shows which of its mods Horizon can carry over, and plays the ones it can as their own profile. Today that means content mods made of data and assets; mods with Java code are not ported yet. See [Modpacks](https://playhorizon.dev/docs/modpacks).
 
 ## Agent control
 
-AI agents and scripts can play Horizon. `horizon-ctl`, shipped with the game, reads its state as JSON and acts like a player; `horizon-ctl mcp` serves the same commands over MCP.
+AI agents and scripts can play Horizon. `horizon-ctl`, shipped beside the game in every release folder, is a command line that reads the game as JSON and acts like a player; `horizon-ctl mcp` serves the same commands as an MCP server (one tool per command, screenshots returned as images).
 
 ```sh
 horizon-ctl launch --world Survival --seed 5 --wait   # finds the version the launcher installed
@@ -86,14 +88,16 @@ horizon-ctl break -1 65 -3                              # mines it; replies with
 horizon-ctl open-inventory && horizon-ctl click-slot 0  # menus: slots, buttons by label, text fields
 ```
 
-Commands block until done and reply with the result; `horizon-ctl help` lists them all. [Agent control](docs/native-client.md#agent-control-horizon-ctl-and-mcp).
+Commands block until the action is done and reply with what happened; errors are JSON with distinct exit codes, `horizon-ctl help` lists every command and `horizon-ctl COMMAND --help` explains one with examples. It talks to the game over a Unix socket on Linux and macOS and over a token-protected localhost port on Windows. See [Agent control in the native client guide](docs/native-client.md#agent-control-horizon-ctl-and-mcp).
 
 ## Build from source
 
-Needs Rust 1.90+, Python 3.10+, JDK 25, and on Linux `libasound2-dev libudev-dev`. `horizon-prepare` builds the game's resources from **your own copy** of Java Edition 26.3 (checked against `research-lock.json`) and never downloads it:
+For developers. Requirements: Rust 1.90 or newer, Python 3.10 or newer, JDK 25, and on Linux the ALSA and udev development headers (`libasound2-dev libudev-dev` on Debian and Ubuntu). Development and the vanilla harnesses run on Linux.
 
-1. **Client:** play 26.3 once in the official launcher. Horizon reads `~/.minecraft` (or `--minecraft-dir` / `HORIZON_MINECRAFT_DIR`).
-2. **Server jar:** the 26.3 server jar (`downloads.server.url` in `versions/26.3/26.3.json`), passed once with `--server-jar` or `HORIZON_SERVER_JAR`.
+Horizon contains no game files, and `horizon-prepare` never downloads them (the launcher downloads them from Mojang only for a signed-in account that owns the game). It builds its resources from **your own copy** of Minecraft: Java Edition 26.3, verified against the checksums in `research-lock.json`:
+
+1. **Client:** install Java Edition with the official launcher and play 26.3 once. Horizon reads `versions/26.3/`, `libraries/` and `assets/` from the launcher's game directory (`~/.minecraft` on Linux). If yours lives elsewhere, pass `--minecraft-dir` or set `HORIZON_MINECRAFT_DIR`.
+2. **Server jar:** the 26.3 server jar, from the `downloads.server.url` in your launcher's `versions/26.3/26.3.json` (or [minecraft.net/download/server](https://www.minecraft.net/en-us/download/server) while 26.3 is the current release). Pass it with `--server-jar` or set `HORIZON_SERVER_JAR`. It is only needed the first time.
 
 ```sh
 git clone https://github.com/horizon-rust/horizon.git
@@ -103,57 +107,72 @@ cargo run --release -p horizon-prepare -- sounds   # optional: sounds from your
 cargo run --release -p horizon-client
 ```
 
-Prepared files land in the gitignored `.local/`: never commit or share them. Options, controls and architecture: [the native client guide](docs/native-client.md); all developer docs: [docs/README.md](docs/README.md).
+Everything prepared lands in the gitignored `.local/`. It is derived from the game: never commit it or share it.
+
+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 in progress, what comes next and where to help: [ROADMAP.md](ROADMAP.md), or [playhorizon.dev/hub](https://playhorizon.dev/hub) with the work board and what shipped.
+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: read [CONTRIBUTING.md](CONTRIBUTING.md) (vanilla first, small pull requests). Questions: [Discord](https://discord.gg/playhorizon). Before a pull request, run the self-check and paste its output:
+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:
 
 ```sh
 git config core.hooksPath .githooks
 python3 tools/pr_ready.py
 ```
 
-It runs rustfmt, clippy, the touched crates' tests, the Python tests, the public-tree check and the vanilla harnesses your change affects. Never commit game files, decompiled source or prepared resources.
+It runs rustfmt, clippy with warnings denied, the tests of the crates you touched, the Python tests, the public-tree check, and the vanilla harnesses your change can affect. CI runs the same checks on GitHub's Linux runners; the vanilla harnesses need the game, which Horizon never downloads, so they run on a maintainer's computer holding their own copy. Never commit game files, decompiled source or prepared resources: `tools/check_public_tree.py` rejects them, and tracked Java is allowed only under the project's own `dev/horizonlab` namespace.
 
 ## Project status
 
-**Player-visible gaps: 0 open** of the 833 the [port ledger](tools/port_ledger.py) found, reading every vanilla 26.3 method against Horizon's code: vanilla behaviour a player would notice that Horizon doesn't have yet. By area: Animals [0](https://github.com/horizon-rust/horizon/issues/3512); Monsters and bosses [0](https://github.com/horizon-rust/horizon/issues/3513); Entities, projectiles, vehicles and decorations [0](https://github.com/horizon-rust/horizon/issues/3514); Items, enchantments and inventories [0](https://github.com/horizon-rust/horizon/issues/3515); Blocks, redstone and fluids [0](https://github.com/horizon-rust/horizon/issues/3516); World, world generation and saves [0](https://github.com/horizon-rust/horizon/issues/3517); Screens, HUD and client packets [0](https://github.com/horizon-rust/horizon/issues/3518); Entity and block rendering, models [0](https://github.com/horizon-rust/horizon/issues/3519); Server and players on the server [0](https://github.com/horizon-rust/horizon/issues/3520); Mob AI, villagers and raids [0](https://github.com/horizon-rust/horizon/issues/3521). This number goes down as gaps close (`tools/parity_gaps.py`); the harness results below say that what is tested matches.
+**Player-visible gaps: 833 open** of the 833 the [port ledger](tools/port_ledger.py) found, reading every vanilla 26.3 method against Horizon's code: vanilla behaviour a player would notice that Horizon doesn't have yet. By area: Screens, HUD and client packets [197](https://github.com/horizon-rust/horizon/issues/3518); Entity and block rendering, models [129](https://github.com/horizon-rust/horizon/issues/3519); Animals [110](https://github.com/horizon-rust/horizon/issues/3512); Server and players on the server [106](https://github.com/horizon-rust/horizon/issues/3520); Blocks, redstone and fluids [86](https://github.com/horizon-rust/horizon/issues/3516); Entities, projectiles, vehicles and decorations [64](https://github.com/horizon-rust/horizon/issues/3514); Monsters and bosses [53](https://github.com/horizon-rust/horizon/issues/3513); Mob AI, villagers and raids [35](https://github.com/horizon-rust/horizon/issues/3521); World, world generation and saves [32](https://github.com/horizon-rust/horizon/issues/3517); Items, enchantments and inventories [21](https://github.com/horizon-rust/horizon/issues/3515). This number goes down as gaps close (`tools/parity_gaps.py`); the harness results below say that what is tested matches.
 
-The table is the project's own audit: every subsystem matches vanilla in every harness that compares it. 100% means 100% of what the harnesses compare, not that nothing else differs.
+The table below is the project's own audit of each subsystem. Every subsystem now matches vanilla in every harness that compares it. 100% means 100% of what the harnesses compare, not proof that nothing else differs. The remaining known differences are listed below.
 
 ### Java parity: 100%
 
-Scores: 0 (absent), 0.25 (started), 0.5 (playable, major features missing), 0.75 (mostly complete) or 1 (complete and verified by differential tests); the percentage is their average. Last audited 2026-10-13: the harnesses pass on Linux and macOS. The [port ledger](tools/port_ledger.py) adds a method-by-method view of what is ported.
+Each subsystem scores 0 (absent), 0.25 (started, not playable), 0.5 (playable,
+major vanilla features missing), 0.75 (playable, mostly complete) or 1 (complete
+and verified against vanilla by differential tests). The percentage is the
+average; `tests/test_parity.py` keeps it in sync with this table. Last audited
+2026-10-13 against the harness results: all 281 harnesses pass on Linux, each
+rerun whenever one of its inputs changed, and the Mac mini now runs every one of
+them too (Rust uses Java's own float maths on each platform).
+
+The harnesses measure behaviour. A second measure is method by method: the [port ledger](tools/port_ledger.py)
+lists every method of vanilla 26.3 next to the Rust functions that port it, with a verdict for each one
+(ported, folded into another function, missing, or needing no port), and the untested ports. Run
+`python3 tools/port_ledger.py build`, then `coverage`, with the vanilla data in `.local/`.
 
 | Subsystem | Score | Main gaps |
 | --- | ---: | --- |
-| Window, input and game loop | 1 | None: game loop, options, camera, auto-jump, toggle sprint/sneak and frame limiter match |
-| Assets and resources | 1 | None: item models match over 196,290 stacks; the resource pack screen over 3,000 sessions |
-| Network protocol and multiplayer | 1 | None: joins vanilla servers; the dedicated server matches vanilla's files, login, configuration, play and command tree; LAN discovery over 462 cases (offline mode only) |
+| Window, input and game loop | 1 | None: the game loop, options, camera, auto-jump, toggle sprint/sneak, local input and the frame limiter match vanilla |
+| Assets and resources | 1 | None: item models match vanilla over 196,290 stacks and the client draws every item through them; the resource pack screen matches vanilla's drawing over 3,000 sessions of clicks, scrolling and searching, its incompatibility confirmation included |
+| Network protocol and multiplayer | 1 | None: joins vanilla servers; the dedicated server (`--dedicated`) matches vanilla's files, status ping, login, configuration, play, chunks, chat, recipes, advancements and command tree, a client built from vanilla's packet code joins it, Horizon joins a vanilla server, and LAN discovery matches over 462 cases (offline mode only) |
 | Chunk storage and palettes | 1 | None: client and saves share paletted containers, identical to vanilla over 266 scenarios |
 | Section meshing | 1 | None: 112 scenes and over a million quads identical to vanilla |
-| Rendering | 1 | None: entity models, block entity renderers (407 cases) and animations (296), HUD overlays (2,200 states), the recipe book (600), player list, subtitles and world border match |
+| Rendering | 1 | None: entity models, block entity renderers (407 cases, End portals, gateways and the loom's banner preview included) and their animations (296 cases, End gateway beams included), the HUD overlays (2,200 states), the recipe book (600 states), the player list, subtitles and the world border match vanilla |
 | Lighting | 1 | None: saved and relit light matches vanilla, slabs and stairs included |
 | World generation | 1 | None: 2,352 whole chunks over 225 structure sites, in all three dimensions, identical to vanilla |
-| Region files and saves | 1 | None: saves round-trip with vanilla; worlds from 1.8 to 26.2 upgrade as vanilla's DataFixers do |
-| Entities and physics | 1 | None: attributes, spawn rules, natural spawning (15,500 cases), raids and patrols (1,900), `finalizeSpawn` (24,000) and mob AI (92 scenarios) match |
-| Interaction and inventory | 1 | None: menu clicks over 8,000 sequences; recipe book placement (6,000), buttons (1,200), saved book (1,500), loom and crafter screens (1,600) |
-| Menus, HUD and chat | 1 | None: every command (758 over 39,685 inputs), scoreboards (81,000 operations), the player list (872,000 draw calls), chat and its suggestions (3,000 sessions) match |
+| Region files and saves | 1 | None: saves round-trip with vanilla, and worlds from 1.8 to 26.2 upgrade as vanilla's DataFixers do, superflat worlds included; old options.txt and hotbar.nbt files are upgraded too |
+| Entities and physics | 1 | None: attributes, dimensions, death loot, spawn rules, natural spawning (15,500 cases), raids and patrols (1,900 cases), spawned mobs' gear, enchantments and state (`finalizeSpawn`, 24,000 cases) and mob AI (92 scenarios: villager breeding and gossip, the warden, ghastlings and copper golems included) match vanilla |
+| Interaction and inventory | 1 | None: menu clicks match over 8,000 click sequences, the loom and the crafter included; recipe book placement (6,000 cases), its buttons (1,200), the saved book (1,500) and the loom and crafter screens (1,600) match vanilla |
+| Menus, HUD and chat | 1 | None: every command runs as vanilla (758 commands over 39,685 parsed inputs), scoreboards and teams match (81,000 operations), the player list matches over 872,000 draw calls with heads drawn from players' skins (authlib's textures, SkinManager's lookup, legacy skin conversion), and the chat matches focused and scrolled; the resource pack screen (selection over 4,000 cases, drawing and its incompatibility confirmation over 3,000 sessions) and the chat input with its command suggestions, usage lines, Tab completion and history (3,000 sessions on vanilla's client command tree) match vanilla |
 | Audio | 1 | None: the sound engine, sound events, music, situational music, ambience and subtitles match vanilla |
-| Block behaviours and ticking | 1 | None: block updates, random ticks, redstone, dispensers (6,000 cases), crafters (4,000), container spills (4,000), copper golems and the sculk family (435 scenarios) match |
+| Block behaviours and ticking | 1 | None: block updates, random ticks, redstone, dispensers (6,000 cases), crafters (4,000 crafts), block entity removal (containers spill, 4,000 cases), copper golem chest sorting and the sculk family (435 scenarios: shrieker warnings and warden summoning included) match vanilla |
 
 ### Known issues
 
-Skins served over https show the default skin unless already cached; pack icons show the unknown-pack texture in game; item tooltips lack attribute lines.
+Skins served over https show the default skin unless already cached; pack icons show the unknown-pack texture in game; the creative hotbar keys (C/X) aren't wired to the hotbar loader; item tooltips lack attribute lines.
 
 ## Licence
 
-[MIT](LICENSE), for the project's original work; dependencies keep their own licences ([notices](THIRD_PARTY_NOTICES.md)). Minecraft is a trademark of Mojang Synergies AB; its code and assets belong to Mojang and Microsoft under the [Minecraft EULA](https://www.minecraft.net/en-us/eula).
+[MIT](LICENSE), for the project's original work only. Dependencies keep their own licences. Minecraft is a trademark of Mojang Synergies AB; Minecraft code and assets belong to Mojang and Microsoft and are covered by the [Minecraft EULA](https://www.minecraft.net/en-us/eula). Decompiled game source and prepared resources stay on your machine and are never published.
+
+Third-party credits and licenses: [Third-party notices](THIRD_PARTY_NOTICES.md).
 
 ## Author
 

ROADMAP.md

@@ -76,9 +76,9 @@ Owner: [levzzz5154](https://github.com/levzzz5154) · Tracking: [#3911](https://
 
 <details><summary>Technical</summary>
 
-One item for all modding work ([#3911](https://github.com/horizon-rust/horizon/issues/3911)), led by levzzz5154 with vladislav_hagen; the order between the parts is theirs. Native mods on stable hook points (game/native_hooks.rs, [#3345](https://github.com/horizon-rust/horizon/issues/3345), [#3346](https://github.com/horizon-rust/horizon/issues/3346), [#3434](https://github.com/horizon-rust/horizon/issues/3434), [#3435](https://github.com/horizon-rust/horizon/issues/3435)) built by the launcher ([#3388](https://github.com/horizon-rust/horizon/issues/3388), [#3855](https://github.com/horizon-rust/horizon/issues/3855)); server-side hooks ([#3878](https://github.com/horizon-rust/horizon/issues/3878), [#3706](https://github.com/horizon-rust/horizon/issues/3706)); mod-owned screens, input and drawing; tools for mod makers (templates, `native.py check`); the registry ([#1634](https://github.com/horizon-rust/horizon/issues/1634), [#1642](https://github.com/horizon-rust/horizon/issues/1642), [#1659](https://github.com/horizon-rust/horizon/issues/1659)); machines with inventories and menus ([#1189](https://github.com/horizon-rust/horizon/issues/1189)); mods that read and change the world through the server. [docs/native-mods.md](docs/native-mods.md).
+One item for all modding work ([#3911](https://github.com/horizon-rust/horizon/issues/3911)), led by levzzz5154 with vladislav_hagen; the order between the parts is theirs. Native mods on stable hook points (game/native_hooks.rs, [#3345](https://github.com/horizon-rust/horizon/issues/3345), [#3346](https://github.com/horizon-rust/horizon/issues/3346), [#3434](https://github.com/horizon-rust/horizon/issues/3434), [#3435](https://github.com/horizon-rust/horizon/issues/3435)) built by the launcher ([#3388](https://github.com/horizon-rust/horizon/issues/3388), [#3855](https://github.com/horizon-rust/horizon/issues/3855)); server-side hooks ([#3878](https://github.com/horizon-rust/horizon/issues/3878), [#3706](https://github.com/horizon-rust/horizon/issues/3706)); mod-owned screens, input and drawing; tools for mod makers (templates, `native.py check`); the registry ([#1634](https://github.com/horizon-rust/horizon/issues/1634), [#1642](https://github.com/horizon-rust/horizon/issues/1642), [#1659](https://github.com/horizon-rust/horizon/issues/1659)); machines with inventories and menus ([#1189](https://github.com/horizon-rust/horizon/issues/1189)); mods that read and change the world through the server. The WebAssembly runtime is removed ([#3350](https://github.com/horizon-rust/horizon/issues/3350), [#3351](https://github.com/horizon-rust/horizon/issues/3351), [#3353](https://github.com/horizon-rust/horizon/issues/3353)). [docs/native-mods.md](docs/native-mods.md).
 
-More: [#3351](https://github.com/horizon-rust/horizon/issues/3351) · [#3353](https://github.com/horizon-rust/horizon/issues/3353) · [#3360](https://github.com/horizon-rust/horizon/issues/3360) · [#1596](https://github.com/horizon-rust/horizon/issues/1596) · [#1635](https://github.com/horizon-rust/horizon/issues/1635)
+More: [#3360](https://github.com/horizon-rust/horizon/issues/3360) · [#1596](https://github.com/horizon-rust/horizon/issues/1596) · [#1635](https://github.com/horizon-rust/horizon/issues/1635)
 
 </details>
 
@@ -92,7 +92,7 @@ Owner: [ludovic111](https://github.com/ludovic111) · Tracking: [#3914](https://
 
 <details><summary>Technical</summary>
 
-Since [#1514](https://github.com/horizon-rust/horizon/issues/1514) single player runs on the server thread (`game/integrated.rs`) and the window joins it as a client. The open `[server-thread]` issues list the gaps. In review: breeding's advancement and statistic ([#3873](https://github.com/horizon-rust/horizon/issues/3873)), the client's menu when the server replaces the player ([#3841](https://github.com/horizon-rust/horizon/issues/3841)), splashes when falling in water ([#3621](https://github.com/horizon-rust/horizon/issues/3621)). [docs/server-levels.md](docs/server-levels.md).
+Since [#1514](https://github.com/horizon-rust/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: breeding's advancement and statistic ([#3873](https://github.com/horizon-rust/horizon/issues/3873)), the client's menu when the server replaces the player ([#3841](https://github.com/horizon-rust/horizon/issues/3841)), splashes when falling in water ([#3621](https://github.com/horizon-rust/horizon/issues/3621)). [docs/server-levels.md](docs/server-levels.md).
 
 </details>
 
@@ -234,11 +234,11 @@ Client-of-a-server fixes in `game/remote*.rs` and `horizon-protocol`: mobs' aggr
 
 #### One single-player path: remove the in-frame world
 
-Single player has one way to run, the server thread, so every fix works everywhere and there are fewer bugs. The older in-frame mode is removed.
+Single player will have one way to run, the server thread, so every fix works everywhere and there are fewer bugs. The older in-frame mode goes once everything passes without it.
 
 <details><summary>Technical</summary>
 
-`--in-frame` (also `--no-server-thread` and `HORIZON_SERVER_THREAD=0`) ticked the world inside the window's `Game`. [#6473](https://github.com/horizon-rust/horizon/issues/6473) removes it with the code only it reached (the window's world loader and player tick, its portal travel and loading screen, the in-frame LAN host); the harnesses run on the server thread. See also 'Single player as a server' and [docs/server-levels.md](docs/server-levels.md).
+`--in-frame` (also `--no-server-thread` and `HORIZON_SERVER_THREAD=0`) still ticks the world inside the window's `Game`, and most harnesses test that path. Delete it once `lan_e2e --server-thread` and the parity harnesses pass on the server thread, which also halves the bug surface. See also 'Single player as a server' and [docs/server-levels.md](docs/server-levels.md).
 
 </details>
 
@@ -326,11 +326,11 @@ A mapping table from intermediary and SRG names so pre-26.1 jars can be classifi
 
 #### A modpack's own resource and shader packs
 
-Imported modpacks carry their resource packs into a profile of their own. Shader-pack conversion is still pending.
+Importing a modpack also brings the resource packs and shader packs it ships with, where Horizon can use them.
 
 <details><summary>Technical</summary>
 
-Resource-pack carry-over is implemented locally: Modrinth common/client overrides, CurseForge's override folder, installed instances (ZIP and directory packs), and hash-checked indexed ZIP downloads. The launcher keeps profile edits and lets resource-only profiles play; packs are enabled in Resource Packs. Synthetic import and profile tests cover the file pipeline; in-game rendering has not been verified. Shader-pack conversion is still pending, so this combined item remains partial ([docs/modpacks.md](docs/modpacks.md)).
+Porting a pack carries data, assets and worldgen today; the resource packs and shader packs bundled with it are left out. Resource packs can be carried as they are; shader packs go through the converter ([docs/modpacks.md](docs/modpacks.md)).
 
 </details>
 
@@ -490,7 +490,7 @@ Small mods written as scripts, in the style of KubeJS, with no compiler.
 
 <details><summary>Technical</summary>
 
-Waits for native mods to settle: a script layer over the native hook points is to be designed.
+Waits for native mods to settle: the earlier plan ran Lua inside the WebAssembly sandbox, which is removed. A script layer over the native hook points is to be designed.
 
 More: [docs/native-mods.md](docs/native-mods.md)
 
@@ -634,6 +634,16 @@ A spike with ray-traced sun shadows, off by default, is a draft ([#1180](https:/
 
 </details>
 
+#### HDR monitors
+
+Output for HDR monitors: brighter highlights and richer colour where your screen supports it.
+
+<details><summary>Technical</summary>
+
+Issue [#1441](https://github.com/horizon-rust/horizon/issues/1441). Needs a surface format and a tone-mapping path per backend, and tests on real HDR screens on Windows, macOS and Linux.
+
+</details>
+
 #### MSAA, anisotropic filtering, exclusive fullscreen
 
 More graphics options: multisample anti-aliasing, anisotropic filtering and an exclusive fullscreen mode. Today Horizon has FXAA and borderless fullscreen.
@@ -708,7 +718,7 @@ Versions of Horizon for Android, iOS and web browsers. Nothing official yet; con
 
 <details><summary>Technical</summary>
 
-No official build. Android was first closed as not planned, with touch controls, a mobile interface, packaging and loading the player's own assets all missing; the roadmap now includes it, iOS and a build for the browser as long-term goals. First pieces from contributors: `horizon-dualsense` compiling on iOS ([#1813](https://github.com/horizon-rust/horizon/issues/1813)) and helper-thread limits on Android ([#1751](https://github.com/horizon-rust/horizon/issues/1751)). Preparing without Java ([#1750](https://github.com/horizon-rust/horizon/issues/1750)) matters here too. Horizon ships none of Mojang's files on any platform.
+No official build. Android was first closed as not planned, with touch controls, a mobile interface, packaging and loading the player's own assets all missing; the roadmap now includes it, iOS and a WebAssembly build for the browser as long-term goals. First pieces from contributors: `horizon-dualsense` compiling on iOS ([#1813](https://github.com/horizon-rust/horizon/issues/1813)) and helper-thread limits on Android ([#1751](https://github.com/horizon-rust/horizon/issues/1751)). Preparing without Java ([#1750](https://github.com/horizon-rust/horizon/issues/1750)) matters here too. Horizon ships none of Mojang's files on any platform.
 
 </details>
 
@@ -732,13 +742,13 @@ Open: the GUI Scale is clamped to 2 after a restart under Hyprland, while XWayla
 
 </details>
 
-#### A Nix flake
+#### AppImage and a Nix flake
 
-Install Horizon on NixOS through a Nix flake.
+Install Horizon on any Linux distribution as an AppImage, and on NixOS through a Nix flake.
 
 <details><summary>Technical</summary>
 
-A player's idea (#horizon-ideas). The launcher's AppImage ships with each launcher release ([packaging/linux/appimage.sh](packaging/linux/appimage.sh)): one file with the libraries GPUI needs, which replaces itself when it updates. A flake.nix packaging the release binaries with their runtime libraries (Vulkan loader, X11/Wayland, ALSA) is still missing, the way horizon-parity's NixOS setup runs them today.
+A player's idea (#horizon-ideas). An AppImage of the launcher and game from the release workflow, and a flake.nix packaging the release binaries with their runtime libraries (Vulkan loader, X11/Wayland, ALSA), the way horizon-parity's NixOS setup runs them today.
 
 </details>
 
@@ -894,7 +904,6 @@ Armour and tools in End city chests should come enchanted, as in vanilla.
 - **Discord Rich Presence** (v0.2.58): Your Discord profile can show that you are playing Horizon, with a switch to turn it off. [#1787](https://github.com/horizon-rust/horizon/issues/1787) · [#1788](https://github.com/horizon-rust/horizon/issues/1788)
 - **Server dialogs and login screens** (v0.2.67): Servers that show dialogs, such as the register and login screens of AuthMe, will work in Horizon. [#1720](https://github.com/horizon-rust/horizon/issues/1720) · [#1734](https://github.com/horizon-rust/horizon/issues/1734) · [#1735](https://github.com/horizon-rust/horizon/issues/1735)
 - **Microsoft sign-in** (launcher@0.2.17): Sign in with your Microsoft account in the launcher to play on online-mode servers. [docs/microsoft-account.md](docs/microsoft-account.md) · [#2879](https://github.com/horizon-rust/horizon/issues/2879)
-- **HDR monitors** (v0.2.74): Output for HDR monitors: brighter highlights and richer colour where your screen supports it. [#1441](https://github.com/horizon-rust/horizon/issues/1441) · [#2021](https://github.com/horizon-rust/horizon/issues/2021) · [#2292](https://github.com/horizon-rust/horizon/issues/2292)
 - **OpenGL for old computers** (v0.2.63): Horizon now starts on old PCs whose graphics card has no Vulkan or DirectX 12 driver: it switches to OpenGL by itself, and Options > Graphics can pick OpenGL by hand. [#1917](https://github.com/horizon-rust/horizon/issues/1917) · [#1920](https://github.com/horizon-rust/horizon/issues/1920) · [#1936](https://github.com/horizon-rust/horizon/issues/1936)
 - **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/horizon-rust/horizon/issues/1562) · [#1569](https://github.com/horizon-rust/horizon/issues/1569) · [#1570](https://github.com/horizon-rust/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/horizon-rust/horizon/issues/1514) · [docs/server-levels.md](docs/server-levels.md)

THIRD_PARTY_NOTICES.md

@@ -3,29 +3,10 @@
 ## wgpu-hal
 
 `third_party/wgpu-hal` is [wgpu-hal](https://github.com/gfx-rs/wgpu) 30.0.1 by the gfx-rs
-developers, with upstream fixes applied
-([gfx-rs/wgpu#10124](https://github.com/gfx-rs/wgpu/pull/10124),
-[gfx-rs/wgpu#10714](https://github.com/gfx-rs/wgpu/pull/10714)). It is licensed under MIT or
+developers, with one upstream fix applied
+([gfx-rs/wgpu#10124](https://github.com/gfx-rs/wgpu/pull/10124)). It is licensed under MIT or
 Apache-2.0; both licenses are in that folder (`LICENSE.MIT`, `LICENSE.APACHE`).
 
-## naga
-
-`third_party/naga` is [naga](https://github.com/gfx-rs/wgpu) 30.0.1 by the gfx-rs developers, with
-fixes to its GLSL frontend that shader packs need, each applied in the commit that needed it. It is licensed under MIT or Apache-2.0; both licenses
-are in that folder (`LICENSE.MIT`, `LICENSE.APACHE`).
-
-The GLSL frontend also resets the common type for each comma-separated declarator so one
-variable's array specifier does not change later variables.
-
-## libmimalloc-sys and mimalloc
-
-`third_party/libmimalloc-sys` is [libmimalloc-sys](https://github.com/purpleprotocol/mimalloc_rust)
-0.1.49 by Octavian Oncescu, with the [mimalloc](https://github.com/microsoft/mimalloc) v3 sources it
-bundles (Copyright (c) 2018-2025 Microsoft Corporation, Daan Leijen), both under the MIT license
-(`LICENSE.txt` and `c_src/mimalloc/v3/LICENSE` in that folder). It holds only the v3 sources. One
-change: `mi_popcount` in `include/mimalloc/bits.h` uses mimalloc's portable bit count on MSVC
-x86/x64 instead of the POPCNT instruction, which CPUs before Nehalem lack (#7264).
-
 ## Pixelify Sans
 
 `crates/horizon-theme/fonts/PixelifySans-*.ttf` is [Pixelify Sans](https://github.com/eifetx/Pixelify-Sans)
@@ -38,133 +19,3 @@ by The Pixelify Sans Project Authors, licensed under the SIL Open Font License 1
 [Pixelarticons](https://github.com/halfmage/pixelarticons) by Gerrit Halfmann, under the MIT
 license (`crates/horizon-theme/icons/pixel/LICENSE-pixelarticons.txt`). `star.svg` is Horizon's own, drawn on
 the same grid.
-
-## Hugeicons
-
-`crates/horizon-theme/icons/glass/*.svg` are icons from the free set of
-[Hugeicons](https://github.com/hugeicons/hugeicons) (`@hugeicons/core-free-icons` 4.4.0), under
-the MIT license (`crates/horizon-theme/icons/glass/LICENSE-hugeicons.txt`), exported with a 1.6
-stroke in `currentColor`.
-
-`crates/horizon-theme/icons/glass/discord.svg` is Discord's logo as drawn by
-[Simple Icons](https://github.com/simple-icons/simple-icons) 13.21.0 (CC0 1.0). The logo is Discord's
-trademark, used only on the button that opens Horizon's Discord server.
-
-## AMD FidelityFX SDK (FSR 3.1 frame generation)
-
-`crates/horizon-client-render/src/gfx/frame_gen/optical_flow.wgsl` and `interpolation.wgsl` are
-ports to WGSL of the optical flow and frame interpolation shaders of the
-[AMD FidelityFX SDK](https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK) 1.1.4
-(`sdk/include/FidelityFX/gpu/{opticalflow,frameinterpolation}`, at commit
-[c6efa6bf7f20](https://github.com/GPUOpen-LibrariesAndSDKs/FidelityFX-SDK/tree/c6efa6bf7f2027b3ec94f28578bb5965eabb9e55)),
-and `optical_flow.rs` follows the SDK's `sdk/src/components/opticalflow/ffx_opticalflow.cpp`
-(its passes, their order and their dispatch sizes). Copyright (C) 2024 Advanced Micro Devices,
-Inc., under the MIT license, whose text heads each file. AMD and FidelityFX are AMD's
-trademarks; Horizon is not affiliated with AMD.
-
-## Mod loader logos
-
-The launcher shows the logo of the mod loader an instance plays with, and offers the logos as
-instance icons.
-
-- `launcher/assets/logos/{fabric,quilt,neoforge,forge}.png` are the loaders' logos as the launcher
-  mockup on [playhorizon.dev/launcher](https://playhorizon.dev/launcher) shows them (horizon-site
-  `public/media/launcher/*.webp`, converted to PNG), each its project's own mark:
-  [Fabric](https://fabricmc.net/), [Quilt](https://quiltmc.org/) (its art is
-  [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/)),
-  [NeoForged](https://neoforged.net/) (its art, by Ridanisaurus, is
-  [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/)) and
-  [Minecraft Forge](https://minecraftforge.net/). They name the loader an instance runs.
-
-Each logo belongs to its project. Showing it says which loader an instance runs; it does not mean
-the project endorses Horizon.
-
-## Sign in with Microsoft
-
-The launcher's sign-in buttons follow Microsoft's published branding guidelines for apps that sign in
-with Microsoft accounts
-([Sign in with Microsoft branding](https://learn.microsoft.com/en-us/entra/identity-platform/howto-add-branding-in-apps)).
-The four-square Microsoft symbol in `launcher/src/microsoft.rs` reproduces the squares, positions and
-colours of Microsoft's official `ms-symbollockup_mssymbol_19.svg` from that page, unmodified. Microsoft
-and its logo are trademarks of the Microsoft group of companies; Horizon is not endorsed by Microsoft.
-
-## CIT Resewn
-
-`crates/horizon-optifine/src/cit.rs` and `crates/horizon-client-render/src/cit.rs` follow the
-condition semantics of [CIT Resewn Continuation](https://github.com/EthanVisagie/CIT-Resewn-Continuation-1.21.11)
-(at `b792f9a`), a continuation of [CIT Resewn](https://github.com/SHsuperCM/CITResewn) by SHsuperCM: the
-1.21 component paths, enchantment levels, percent damage, text matching and rule ordering. It is
-licensed under the MIT license:
-
-> Copyright (c) 2021 SHsuperCM
->
-> 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.
-
-## FusionExamples
-
-The tile tables in `crates/horizon-optifine/src/fusion/layout.rs` were read off the connecting
-texture templates (`templates/template <layout>.png`) of
-[FusionExamples](https://github.com/SuperMartijn642/FusionExamples) (at `8c9c56e`), which is
-licensed under the MIT license:
-
-> Copyright (c) 2024 Martijn van den Brand
->
-> 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.
-
-## BlueMap
-
-`crates/horizon-client-render/src/bluemap.rs` reads the lowres tiles of a server's
-[BlueMap](https://github.com/BlueMap-Minecraft/BlueMap) web map. It follows three of BlueMap's files:
-`core/src/main/java/de/bluecolored/bluemap/core/map/lowres/LowresLayer.java` (`saveTile`) for the
-tiles' pixel layout, `common/webapp/src/js/util/Utils.js` (`pathFromCoords`) for their paths, and
-`core/src/main/java/de/bluecolored/bluemap/core/map/MapSettingsSerializer.java` for a map's
-`settings.json`, at commit
-[96ae320d1d39](https://github.com/BlueMap-Minecraft/BlueMap/tree/96ae320d1d39581c10058d8222f2290f2fcb5333).
-BlueMap is licensed under the MIT license:
-
-> Copyright (c) Blue (Lukas Rieger) <https://bluecolored.de>
-> Copyright (c) contributors
->
-> 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.

benchmarks/particle-culling/2026-11-02/README.md

@@ -1,27 +0,0 @@
-# Particle culling review measurements — 2026-11-02
-
-Ordinary-scene captures and measurements for PR #7054. The scene contains 24 mobs, about 9,400–10,100 rain particles, and about 50–100 campfire smoke particles. Two opposite-order passes were run with 2 s warmup and 8 s measurement per condition. Host: Intel Core i7-3770S, Intel HD Graphics 4000, Vulkan/Mesa, 675×727, render distance 4, VSync off, 260 FPS cap.
-
-These are means of the two samples. CPU is the harness's average CPU time per frame; p99 is frame time. The normal scene is not expected to show large gains because most particles are visible.
-
-| Condition | FPS | CPU ms/frame | Frame p99 ms |
-| --- | ---: | ---: | ---: |
-| Main, culling Off | 88.39 | 1.930 | 23.85 |
-| Particle branch, culling Off | 88.55 | 1.828 | 24.88 |
-| Main, Entity Culling Synchronous | 89.12 | 1.887 | 23.07 |
-| Particle branch, Entity Culling Synchronous, Particle Culling Off | 89.06 | 1.897 | 25.18 |
-| Particle Culling Synchronous | 88.87 | 1.774 | 24.94 |
-| Particle Culling Asynchronous* | 89.00 | 1.754 | 24.90 |
-
-*The asynchronous samples predate the final switch to a dedicated particle worker. They are retained only as historical context and are not a measurement of the final worker implementation. No FPS improvement is claimed from these ordinary-scene runs. The Off path delegates directly to `render`; `disabled_culled_render_matches_the_regular_particle_path` checks that it produces the same vertices.
-
-The FPS and CPU differences are within run-to-run variability for this GPU-limited scene. The first four conditions are the reviewer's requested Main-versus-branch default and existing synchronous-mode comparisons. Particle Sync/Async rows are branch-internal mode comparisons.
-
-## Captures
-
-The screenshots show the same ordinary test world and FPS overlay:
-
-- `main-off.png`
-- `particle-off.png`
-- `particle-sync.png`
-- `particle-async.png`

benchmarks/perf/horizon-m4pro-1080p-rd16.json

@@ -1,758 +0,0 @@
-{
- "format": "horizon-benchmark-report",
- "version": 1,
- "kind": "game",
- "created": "2026-11-01T22:55:52Z",
- "app": {
-  "name": "horizon-client",
-  "version": "0.1.0",
-  "commit": "1bd24e4042"
- },
- "hardware": {
-  "os": "macos",
-  "arch": "aarch64",
-  "cpu_threads": 14,
-  "os_version": "27.0.1",
-  "cpu": "Apple M4 Pro",
-  "ram_mb": 65536,
-  "gpu": {
-   "name": "Apple M4 Pro",
-   "vendor": "",
-   "driver": "",
-   "backend": "metal",
-   "kind": "integrated"
-  }
- },
- "conditions": {
-  "scenario": "perf_bench:village,forest,ocean,mountain",
-  "seed": "1234",
-  "render_distance": 16,
-  "simulation_distance": 12,
-  "vsync": false,
-  "offscreen": true,
-  "repeats": 3,
-  "warmup_s": 2.0,
-  "load_avg_1m": 113.978,
-  "window": [
-   1920,
-   1080
-  ]
- },
- "metrics": {
-  "startup.title_ms": {
-   "n": 3,
-   "mean": 1524.333,
-   "stdev": 364.142,
-   "min": 1112.127,
-   "max": 1802.295,
-   "ci95": 904.651
-  },
-  "startup.world_ms": {
-   "n": 3,
-   "mean": 14001.774,
-   "stdev": 8119.623,
-   "min": 7466.904,
-   "max": 23091.569,
-   "ci95": 20171.889
-  },
-  "chunks.village.load_ms": {
-   "n": 3,
-   "mean": 8159.696,
-   "stdev": 3897.327,
-   "min": 5313.528,
-   "max": 12601.663,
-   "ci95": 9682.279
-  },
-  "chunks.village.meshed_count": {
-   "n": 3,
-   "mean": 25431.333,
-   "stdev": 1389.728,
-   "min": 24149.0,
-   "max": 26908.0,
-   "ci95": 3452.555
-  },
-  "fps.village.avg_fps": {
-   "n": 3,
-   "mean": 568.391,
-   "stdev": 11.948,
-   "min": 558.517,
-   "max": 581.673,
-   "ci95": 29.684
-  },
-  "fps.village.low_1pct_fps": {
-   "n": 3,
-   "mean": 270.644,
-   "stdev": 9.955,
-   "min": 259.156,
-   "max": 276.728,
-   "ci95": 24.732
-  },
-  "fps.village.low_01pct_fps": {
-   "n": 3,
-   "mean": 209.951,
-   "stdev": 30.24,
-   "min": 191.819,
-   "max": 244.86,
-   "ci95": 75.126
-  },
-  "chunks.forest.load_ms": {
-   "n": 3,
-   "mean": 8879.707,
-   "stdev": 1758.259,
-   "min": 7205.686,
-   "max": 10711.562,
-   "ci95": 4368.11
-  },
-  "chunks.forest.meshed_count": {
-   "n": 3,
-   "mean": 29366.667,
-   "stdev": 273.35,
-   "min": 29053.0,
-   "max": 29554.0,
-   "ci95": 679.094
-  },
-  "fps.forest.avg_fps": {
-   "n": 3,
-   "mean": 333.026,
-   "stdev": 1.469,
-   "min": 331.478,
-   "max": 334.4,
-   "ci95": 3.649
-  },
-  "fps.forest.low_1pct_fps": {
-   "n": 3,
-   "mean": 193.014,
-   "stdev": 11.504,
-   "min": 185.57,
-   "max": 206.264,
-   "ci95": 28.58
-  },
-  "fps.forest.low_01pct_fps": {
-   "n": 3,
-   "mean": 137.067,
-   "stdev": 28.701,
-   "min": 108.337,
-   "max": 165.738,
-   "ci95": 71.302
-  },
-  "chunks.ocean.load_ms": {
-   "n": 3,
-   "mean": 6399.435,
-   "stdev": 2268.592,
-   "min": 4346.111,
-   "max": 8834.786,
-   "ci95": 5635.949
-  },
-  "chunks.ocean.meshed_count": {
-   "n": 3,
-   "mean": 25436.0,
-   "stdev": 813.154,
-   "min": 24718.0,
-   "max": 26319.0,
-   "ci95": 2020.149
-  },
-  "fps.ocean.avg_fps": {
-   "n": 3,
-   "mean": 411.986,
-   "stdev": 1.42,
-   "min": 410.981,
-   "max": 413.61,
-   "ci95": 3.527
-  },
-  "fps.ocean.low_1pct_fps": {
-   "n": 3,
-   "mean": 209.307,
-   "stdev": 10.427,
-   "min": 197.391,
-   "max": 216.759,
-   "ci95": 25.905
-  },
-  "fps.ocean.low_01pct_fps": {
-   "n": 3,
-   "mean": 126.88,
-   "stdev": 17.642,
-   "min": 106.534,
-   "max": 137.93,
-   "ci95": 43.829
-  },
-  "chunks.mountain.load_ms": {
-   "n": 3,
-   "mean": 14672.976,
-   "stdev": 9832.9,
-   "min": 8230.723,
-   "max": 25990.951,
-   "ci95": 24428.25
-  },
-  "chunks.mountain.meshed_count": {
-   "n": 3,
-   "mean": 27715.0,
-   "stdev": 1706.033,
-   "min": 26572.0,
-   "max": 29676.0,
-   "ci95": 4238.362
-  },
-  "fps.mountain.avg_fps": {
-   "n": 3,
-   "mean": 357.149,
-   "stdev": 2.391,
-   "min": 355.009,
-   "max": 359.73,
-   "ci95": 5.941
-  },
-  "fps.mountain.low_1pct_fps": {
-   "n": 3,
-   "mean": 199.658,
-   "stdev": 12.172,
-   "min": 187.504,
-   "max": 211.847,
-   "ci95": 30.238
-  },
-  "fps.mountain.low_01pct_fps": {
-   "n": 3,
-   "mean": 154.465,
-   "stdev": 13.484,
-   "min": 144.923,
-   "max": 169.891,
-   "ci95": 33.498
-  },
-  "memory.rss_peak_mb": {
-   "n": 3,
-   "mean": 1892.0,
-   "stdev": 49.025,
-   "min": 1835.406,
-   "max": 1921.438,
-   "ci95": 121.794
-  },
-  "memory.rss_steady_mb": {
-   "n": 3,
-   "mean": 1616.755,
-   "stdev": 47.256,
-   "min": 1564.734,
-   "max": 1657.031,
-   "ci95": 117.4
-  },
-  "memory.footprint_peak_mb": {
-   "n": 3,
-   "mean": 3083.815,
-   "stdev": 25.002,
-   "min": 3062.456,
-   "max": 3111.315,
-   "ci95": 62.113
-  },
-  "memory.footprint_steady_mb": {
-   "n": 3,
-   "mean": 2495.271,
-   "stdev": 36.569,
-   "min": 2453.284,
-   "max": 2520.151,
-   "ci95": 90.85
-  }
- },
- "frames": [
-  {
-   "phase": "village",
-   "repeat": 0,
-   "frames": 6981,
-   "seconds": 12.002,
-   "avg_fps": 581.673,
-   "low_1pct_fps": 276.049,
-   "low_01pct_fps": 191.819,
-   "p50_ms": 1.655,
-   "p95_ms": 2.267,
-   "p99_ms": 3.277,
-   "p999_ms": 4.174,
-   "max_ms": 7.418,
-   "cpu_p50_ms": 0.955,
-   "gpu_p50_ms": 1.646,
-   "histogram": [
-    0,
-    6445,
-    353,
-    176,
-    3,
-    3,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 1,
-   "frames": 6703,
-   "seconds": 12.001,
-   "avg_fps": 558.517,
-   "low_1pct_fps": 276.728,
-   "low_01pct_fps": 244.86,
-   "p50_ms": 1.725,
-   "p95_ms": 2.341,
-   "p99_ms": 3.396,
-   "p999_ms": 3.939,
-   "max_ms": 4.185,
-   "cpu_p50_ms": 0.767,
-   "gpu_p50_ms": 1.708,
-   "histogram": [
-    17,
-    6041,
-    442,
-    202,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 2,
-   "frames": 6780,
-   "seconds": 12.0,
-   "avg_fps": 564.982,
-   "low_1pct_fps": 259.156,
-   "low_01pct_fps": 193.174,
-   "p50_ms": 1.707,
-   "p95_ms": 2.311,
-   "p99_ms": 3.407,
-   "p999_ms": 4.984,
-   "max_ms": 5.322,
-   "cpu_p50_ms": 0.923,
-   "gpu_p50_ms": 1.698,
-   "histogram": [
-    5,
-    6118,
-    480,
-    163,
-    8,
-    6,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 0,
-   "frames": 3978,
-   "seconds": 12.001,
-   "avg_fps": 331.478,
-   "low_1pct_fps": 187.208,
-   "low_01pct_fps": 137.127,
-   "p50_ms": 2.93,
-   "p95_ms": 3.969,
-   "p99_ms": 4.719,
-   "p999_ms": 6.451,
-   "max_ms": 8.835,
-   "cpu_p50_ms": 0.857,
-   "gpu_p50_ms": 2.92,
-   "histogram": [
-    0,
-    29,
-    2279,
-    1541,
-    109,
-    14,
-    4,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 1,
-   "frames": 3999,
-   "seconds": 12.002,
-   "avg_fps": 333.199,
-   "low_1pct_fps": 185.57,
-   "low_01pct_fps": 108.337,
-   "p50_ms": 2.921,
-   "p95_ms": 3.862,
-   "p99_ms": 4.679,
-   "p999_ms": 6.817,
-   "max_ms": 11.683,
-   "cpu_p50_ms": 0.828,
-   "gpu_p50_ms": 2.903,
-   "histogram": [
-    3,
-    16,
-    2356,
-    1511,
-    97,
-    12,
-    1,
-    0,
-    2,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 2,
-   "frames": 4013,
-   "seconds": 12.001,
-   "avg_fps": 334.4,
-   "low_1pct_fps": 206.264,
-   "low_01pct_fps": 165.738,
-   "p50_ms": 2.915,
-   "p95_ms": 3.809,
-   "p99_ms": 4.525,
-   "p999_ms": 5.078,
-   "max_ms": 8.228,
-   "cpu_p50_ms": 0.861,
-   "gpu_p50_ms": 2.899,
-   "histogram": [
-    1,
-    18,
-    2357,
-    1553,
-    77,
-    5,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 0,
-   "frames": 4932,
-   "seconds": 12.001,
-   "avg_fps": 410.981,
-   "low_1pct_fps": 216.759,
-   "low_01pct_fps": 137.93,
-   "p50_ms": 2.353,
-   "p95_ms": 3.181,
-   "p99_ms": 4.01,
-   "p999_ms": 5.767,
-   "max_ms": 9.713,
-   "cpu_p50_ms": 0.888,
-   "gpu_p50_ms": 2.343,
-   "histogram": [
-    0,
-    163,
-    4474,
-    264,
-    23,
-    4,
-    1,
-    2,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 1,
-   "frames": 4937,
-   "seconds": 12.001,
-   "avg_fps": 411.366,
-   "low_1pct_fps": 213.772,
-   "low_01pct_fps": 136.177,
-   "p50_ms": 2.349,
-   "p95_ms": 3.258,
-   "p99_ms": 4.015,
-   "p999_ms": 5.985,
-   "max_ms": 8.539,
-   "cpu_p50_ms": 0.871,
-   "gpu_p50_ms": 2.339,
-   "histogram": [
-    0,
-    202,
-    4406,
-    295,
-    25,
-    5,
-    1,
-    2,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 2,
-   "frames": 4963,
-   "seconds": 11.999,
-   "avg_fps": 413.61,
-   "low_1pct_fps": 197.391,
-   "low_01pct_fps": 106.534,
-   "p50_ms": 2.335,
-   "p95_ms": 3.214,
-   "p99_ms": 4.111,
-   "p999_ms": 7.65,
-   "max_ms": 11.399,
-   "cpu_p50_ms": 0.878,
-   "gpu_p50_ms": 2.323,
-   "histogram": [
-    2,
-    228,
-    4417,
-    274,
-    28,
-    7,
-    2,
-    2,
-    1,
-    2,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 0,
-   "frames": 4317,
-   "seconds": 12.001,
-   "avg_fps": 359.73,
-   "low_1pct_fps": 211.847,
-   "low_01pct_fps": 169.891,
-   "p50_ms": 2.7,
-   "p95_ms": 3.753,
-   "p99_ms": 4.366,
-   "p999_ms": 5.041,
-   "max_ms": 8.726,
-   "cpu_p50_ms": 1.113,
-   "gpu_p50_ms": 2.687,
-   "histogram": [
-    0,
-    68,
-    3445,
-    718,
-    80,
-    5,
-    0,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 1,
-   "frames": 4281,
-   "seconds": 12.001,
-   "avg_fps": 356.707,
-   "low_1pct_fps": 199.624,
-   "low_01pct_fps": 144.923,
-   "p50_ms": 2.712,
-   "p95_ms": 3.806,
-   "p99_ms": 4.535,
-   "p999_ms": 5.453,
-   "max_ms": 8.354,
-   "cpu_p50_ms": 1.111,
-   "gpu_p50_ms": 2.694,
-   "histogram": [
-    0,
-    64,
-    3353,
-    717,
-    138,
-    5,
-    2,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 2,
-   "frames": 4261,
-   "seconds": 12.003,
-   "avg_fps": 355.009,
-   "low_1pct_fps": 187.504,
-   "low_01pct_fps": 148.582,
-   "p50_ms": 2.727,
-   "p95_ms": 4.083,
-   "p99_ms": 4.744,
-   "p999_ms": 6.091,
-   "max_ms": 7.442,
-   "cpu_p50_ms": 1.126,
-   "gpu_p50_ms": 2.711,
-   "histogram": [
-    0,
-    155,
-    3198,
-    719,
-    165,
-    17,
-    6,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  }
- ],
- "label": "horizon-m4pro-1080p"
-}

benchmarks/perf/horizon-m4pro-1080p-rd32.json

@@ -1,758 +0,0 @@
-{
- "format": "horizon-benchmark-report",
- "version": 1,
- "kind": "game",
- "created": "2026-11-01T23:17:23Z",
- "app": {
-  "name": "horizon-client",
-  "version": "0.1.0",
-  "commit": "1bd24e4042"
- },
- "hardware": {
-  "os": "macos",
-  "arch": "aarch64",
-  "cpu_threads": 14,
-  "os_version": "27.0.1",
-  "cpu": "Apple M4 Pro",
-  "ram_mb": 65536,
-  "gpu": {
-   "name": "Apple M4 Pro",
-   "vendor": "",
-   "driver": "",
-   "backend": "metal",
-   "kind": "integrated"
-  }
- },
- "conditions": {
-  "scenario": "perf_bench:village,forest,ocean,mountain",
-  "seed": "1234",
-  "render_distance": 32,
-  "simulation_distance": 12,
-  "vsync": false,
-  "offscreen": true,
-  "repeats": 3,
-  "warmup_s": 2.0,
-  "load_avg_1m": 28.236,
-  "window": [
-   1920,
-   1080
-  ]
- },
- "metrics": {
-  "startup.title_ms": {
-   "n": 3,
-   "mean": 2190.186,
-   "stdev": 1780.667,
-   "min": 906.481,
-   "max": 4223.028,
-   "ci95": 4423.779
-  },
-  "startup.world_ms": {
-   "n": 3,
-   "mean": 14254.027,
-   "stdev": 4604.903,
-   "min": 10130.899,
-   "max": 19223.339,
-   "ci95": 11440.138
-  },
-  "chunks.village.load_ms": {
-   "n": 3,
-   "mean": 6509.117,
-   "stdev": 1616.283,
-   "min": 5457.214,
-   "max": 8370.17,
-   "ci95": 4015.394
-  },
-  "chunks.village.meshed_count": {
-   "n": 3,
-   "mean": 48522.333,
-   "stdev": 1713.943,
-   "min": 46732.0,
-   "max": 50148.0,
-   "ci95": 4258.014
-  },
-  "fps.village.avg_fps": {
-   "n": 3,
-   "mean": 326.473,
-   "stdev": 6.811,
-   "min": 319.588,
-   "max": 333.208,
-   "ci95": 16.921
-  },
-  "fps.village.low_1pct_fps": {
-   "n": 3,
-   "mean": 152.497,
-   "stdev": 34.142,
-   "min": 116.575,
-   "max": 184.525,
-   "ci95": 84.82
-  },
-  "fps.village.low_01pct_fps": {
-   "n": 3,
-   "mean": 122.567,
-   "stdev": 33.914,
-   "min": 87.235,
-   "max": 154.858,
-   "ci95": 84.254
-  },
-  "chunks.forest.load_ms": {
-   "n": 3,
-   "mean": 10363.339,
-   "stdev": 3122.178,
-   "min": 6760.012,
-   "max": 12265.121,
-   "ci95": 7756.547
-  },
-  "chunks.forest.meshed_count": {
-   "n": 3,
-   "mean": 82591.667,
-   "stdev": 1489.69,
-   "min": 81053.0,
-   "max": 84027.0,
-   "ci95": 3700.895
-  },
-  "fps.forest.avg_fps": {
-   "n": 3,
-   "mean": 165.414,
-   "stdev": 4.368,
-   "min": 162.757,
-   "max": 170.455,
-   "ci95": 10.851
-  },
-  "fps.forest.low_1pct_fps": {
-   "n": 3,
-   "mean": 103.992,
-   "stdev": 20.41,
-   "min": 83.527,
-   "max": 124.346,
-   "ci95": 50.705
-  },
-  "fps.forest.low_01pct_fps": {
-   "n": 3,
-   "mean": 94.785,
-   "stdev": 24.344,
-   "min": 69.796,
-   "max": 118.428,
-   "ci95": 60.478
-  },
-  "chunks.ocean.load_ms": {
-   "n": 3,
-   "mean": 10450.642,
-   "stdev": 2599.832,
-   "min": 7510.454,
-   "max": 12445.71,
-   "ci95": 6458.863
-  },
-  "chunks.ocean.meshed_count": {
-   "n": 3,
-   "mean": 76405.667,
-   "stdev": 649.936,
-   "min": 75681.0,
-   "max": 76937.0,
-   "ci95": 1614.662
-  },
-  "fps.ocean.avg_fps": {
-   "n": 3,
-   "mean": 210.179,
-   "stdev": 5.279,
-   "min": 205.559,
-   "max": 215.932,
-   "ci95": 13.114
-  },
-  "fps.ocean.low_1pct_fps": {
-   "n": 3,
-   "mean": 128.777,
-   "stdev": 30.982,
-   "min": 93.017,
-   "max": 147.571,
-   "ci95": 76.97
-  },
-  "fps.ocean.low_01pct_fps": {
-   "n": 3,
-   "mean": 115.916,
-   "stdev": 39.398,
-   "min": 70.443,
-   "max": 139.838,
-   "ci95": 97.879
-  },
-  "chunks.mountain.load_ms": {
-   "n": 3,
-   "mean": 17168.619,
-   "stdev": 3613.606,
-   "min": 13749.902,
-   "max": 20949.796,
-   "ci95": 8977.42
-  },
-  "chunks.mountain.meshed_count": {
-   "n": 3,
-   "mean": 91622.667,
-   "stdev": 482.189,
-   "min": 91089.0,
-   "max": 92027.0,
-   "ci95": 1197.921
-  },
-  "fps.mountain.avg_fps": {
-   "n": 3,
-   "mean": 190.088,
-   "stdev": 2.175,
-   "min": 187.78,
-   "max": 192.099,
-   "ci95": 5.403
-  },
-  "fps.mountain.low_1pct_fps": {
-   "n": 3,
-   "mean": 108.92,
-   "stdev": 14.244,
-   "min": 92.641,
-   "max": 119.094,
-   "ci95": 35.388
-  },
-  "fps.mountain.low_01pct_fps": {
-   "n": 3,
-   "mean": 91.132,
-   "stdev": 12.82,
-   "min": 76.343,
-   "max": 99.09,
-   "ci95": 31.849
-  },
-  "memory.rss_peak_mb": {
-   "n": 3,
-   "mean": 2536.536,
-   "stdev": 40.31,
-   "min": 2506.281,
-   "max": 2582.297,
-   "ci95": 100.144
-  },
-  "memory.rss_steady_mb": {
-   "n": 3,
-   "mean": 2195.922,
-   "stdev": 37.757,
-   "min": 2167.078,
-   "max": 2238.656,
-   "ci95": 93.8
-  },
-  "memory.footprint_peak_mb": {
-   "n": 3,
-   "mean": 5559.837,
-   "stdev": 47.18,
-   "min": 5505.457,
-   "max": 5589.863,
-   "ci95": 117.211
-  },
-  "memory.footprint_steady_mb": {
-   "n": 3,
-   "mean": 4373.034,
-   "stdev": 82.743,
-   "min": 4311.909,
-   "max": 4467.191,
-   "ci95": 205.561
-  }
- },
- "frames": [
-  {
-   "phase": "village",
-   "repeat": 0,
-   "frames": 3920,
-   "seconds": 12.002,
-   "avg_fps": 326.623,
-   "low_1pct_fps": 116.575,
-   "low_01pct_fps": 87.235,
-   "p50_ms": 2.938,
-   "p95_ms": 4.356,
-   "p99_ms": 7.397,
-   "p999_ms": 9.497,
-   "max_ms": 13.274,
-   "cpu_p50_ms": 1.611,
-   "gpu_p50_ms": 2.871,
-   "histogram": [
-    0,
-    115,
-    2297,
-    1271,
-    149,
-    33,
-    10,
-    24,
-    18,
-    1,
-    2,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 1,
-   "frames": 3835,
-   "seconds": 12.0,
-   "avg_fps": 319.588,
-   "low_1pct_fps": 156.39,
-   "low_01pct_fps": 125.608,
-   "p50_ms": 3.04,
-   "p95_ms": 4.322,
-   "p99_ms": 5.265,
-   "p999_ms": 7.732,
-   "max_ms": 8.183,
-   "cpu_p50_ms": 1.733,
-   "gpu_p50_ms": 2.936,
-   "histogram": [
-    0,
-    1,
-    1610,
-    2006,
-    142,
-    51,
-    15,
-    10,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 2,
-   "frames": 3999,
-   "seconds": 12.002,
-   "avg_fps": 333.208,
-   "low_1pct_fps": 184.525,
-   "low_01pct_fps": 154.858,
-   "p50_ms": 2.9,
-   "p95_ms": 4.01,
-   "p99_ms": 4.955,
-   "p999_ms": 6.193,
-   "max_ms": 6.805,
-   "cpu_p50_ms": 1.51,
-   "gpu_p50_ms": 2.788,
-   "histogram": [
-    0,
-    8,
-    2499,
-    1328,
-    132,
-    25,
-    7,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 0,
-   "frames": 1957,
-   "seconds": 12.004,
-   "avg_fps": 163.03,
-   "low_1pct_fps": 83.527,
-   "low_01pct_fps": 69.796,
-   "p50_ms": 6.011,
-   "p95_ms": 8.032,
-   "p99_ms": 10.903,
-   "p999_ms": 14.322,
-   "max_ms": 14.333,
-   "cpu_p50_ms": 1.555,
-   "gpu_p50_ms": 5.857,
-   "histogram": [
-    0,
-    5,
-    26,
-    16,
-    36,
-    883,
-    739,
-    194,
-    29,
-    22,
-    5,
-    2,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 1,
-   "frames": 1954,
-   "seconds": 12.006,
-   "avg_fps": 162.757,
-   "low_1pct_fps": 104.102,
-   "low_01pct_fps": 96.13,
-   "p50_ms": 5.98,
-   "p95_ms": 7.665,
-   "p99_ms": 9.049,
-   "p999_ms": 10.323,
-   "max_ms": 10.482,
-   "cpu_p50_ms": 1.584,
-   "gpu_p50_ms": 5.715,
-   "histogram": [
-    0,
-    0,
-    0,
-    1,
-    9,
-    1028,
-    737,
-    130,
-    46,
-    3,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 2,
-   "frames": 2046,
-   "seconds": 12.003,
-   "avg_fps": 170.455,
-   "low_1pct_fps": 124.346,
-   "low_01pct_fps": 118.428,
-   "p50_ms": 5.719,
-   "p95_ms": 7.342,
-   "p99_ms": 7.815,
-   "p999_ms": 8.38,
-   "max_ms": 8.506,
-   "cpu_p50_ms": 1.384,
-   "gpu_p50_ms": 5.572,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    26,
-    1452,
-    396,
-    169,
-    3,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 0,
-   "frames": 2467,
-   "seconds": 12.001,
-   "avg_fps": 205.559,
-   "low_1pct_fps": 93.017,
-   "low_01pct_fps": 70.443,
-   "p50_ms": 4.708,
-   "p95_ms": 6.6,
-   "p99_ms": 9.432,
-   "p999_ms": 13.566,
-   "max_ms": 15.228,
-   "cpu_p50_ms": 1.664,
-   "gpu_p50_ms": 4.483,
-   "histogram": [
-    0,
-    18,
-    55,
-    87,
-    1811,
-    290,
-    143,
-    27,
-    20,
-    13,
-    2,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 1,
-   "frames": 2509,
-   "seconds": 12.002,
-   "avg_fps": 209.045,
-   "low_1pct_fps": 145.742,
-   "low_01pct_fps": 139.838,
-   "p50_ms": 4.642,
-   "p95_ms": 6.15,
-   "p99_ms": 6.72,
-   "p999_ms": 7.081,
-   "max_ms": 7.254,
-   "cpu_p50_ms": 1.74,
-   "gpu_p50_ms": 4.376,
-   "histogram": [
-    0,
-    0,
-    0,
-    78,
-    2008,
-    277,
-    142,
-    4,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 2,
-   "frames": 2591,
-   "seconds": 11.999,
-   "avg_fps": 215.932,
-   "low_1pct_fps": 147.571,
-   "low_01pct_fps": 137.466,
-   "p50_ms": 4.466,
-   "p95_ms": 5.947,
-   "p99_ms": 6.512,
-   "p999_ms": 7.262,
-   "max_ms": 7.283,
-   "cpu_p50_ms": 1.422,
-   "gpu_p50_ms": 4.286,
-   "histogram": [
-    0,
-    2,
-    0,
-    111,
-    2114,
-    248,
-    111,
-    5,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 0,
-   "frames": 2285,
-   "seconds": 12.002,
-   "avg_fps": 190.386,
-   "low_1pct_fps": 92.641,
-   "low_01pct_fps": 76.343,
-   "p50_ms": 5.038,
-   "p95_ms": 7.005,
-   "p99_ms": 9.383,
-   "p999_ms": 11.731,
-   "max_ms": 15.266,
-   "cpu_p50_ms": 2.239,
-   "gpu_p50_ms": 4.915,
-   "histogram": [
-    0,
-    0,
-    54,
-    45,
-    916,
-    985,
-    168,
-    78,
-    22,
-    15,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 1,
-   "frames": 2306,
-   "seconds": 12.004,
-   "avg_fps": 192.099,
-   "low_1pct_fps": 119.094,
-   "low_01pct_fps": 99.09,
-   "p50_ms": 5.017,
-   "p95_ms": 6.58,
-   "p99_ms": 7.586,
-   "p999_ms": 9.195,
-   "max_ms": 11.428,
-   "cpu_p50_ms": 2.261,
-   "gpu_p50_ms": 4.823,
-   "histogram": [
-    0,
-    0,
-    3,
-    12,
-    1070,
-    1003,
-    165,
-    43,
-    9,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 2,
-   "frames": 2254,
-   "seconds": 12.003,
-   "avg_fps": 187.78,
-   "low_1pct_fps": 115.026,
-   "low_01pct_fps": 97.962,
-   "p50_ms": 5.175,
-   "p95_ms": 6.791,
-   "p99_ms": 7.916,
-   "p999_ms": 9.284,
-   "max_ms": 11.986,
-   "cpu_p50_ms": 2.158,
-   "gpu_p50_ms": 4.942,
-   "histogram": [
-    0,
-    0,
-    0,
-    17,
-    774,
-    1199,
-    182,
-    69,
-    12,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  }
- ],
- "label": "horizon-m4pro-1080p"
-}

benchmarks/perf/horizon-m4pro-1080p-rd8.json

@@ -1,758 +0,0 @@
-{
- "format": "horizon-benchmark-report",
- "version": 1,
- "kind": "game",
- "created": "2026-11-01T22:55:52Z",
- "app": {
-  "name": "horizon-client",
-  "version": "0.1.0",
-  "commit": "1bd24e4042"
- },
- "hardware": {
-  "os": "macos",
-  "arch": "aarch64",
-  "cpu_threads": 14,
-  "os_version": "27.0.1",
-  "cpu": "Apple M4 Pro",
-  "ram_mb": 65536,
-  "gpu": {
-   "name": "Apple M4 Pro",
-   "vendor": "",
-   "driver": "",
-   "backend": "metal",
-   "kind": "integrated"
-  }
- },
- "conditions": {
-  "scenario": "perf_bench:village,forest,ocean,mountain",
-  "seed": "1234",
-  "render_distance": 8,
-  "simulation_distance": 12,
-  "vsync": false,
-  "offscreen": true,
-  "repeats": 3,
-  "warmup_s": 2.0,
-  "load_avg_1m": 73.292,
-  "window": [
-   1920,
-   1080
-  ]
- },
- "metrics": {
-  "startup.title_ms": {
-   "n": 3,
-   "mean": 7204.239,
-   "stdev": 1586.64,
-   "min": 5409.683,
-   "max": 8421.051,
-   "ci95": 3941.749
-  },
-  "startup.world_ms": {
-   "n": 3,
-   "mean": 11407.51,
-   "stdev": 2085.692,
-   "min": 9027.004,
-   "max": 12913.993,
-   "ci95": 5181.563
-  },
-  "chunks.village.load_ms": {
-   "n": 3,
-   "mean": 5116.146,
-   "stdev": 744.611,
-   "min": 4548.096,
-   "max": 5959.13,
-   "ci95": 1849.865
-  },
-  "chunks.village.meshed_count": {
-   "n": 3,
-   "mean": 7220.0,
-   "stdev": 137.292,
-   "min": 7092.0,
-   "max": 7365.0,
-   "ci95": 341.079
-  },
-  "fps.village.avg_fps": {
-   "n": 3,
-   "mean": 540.213,
-   "stdev": 182.263,
-   "min": 432.911,
-   "max": 750.659,
-   "ci95": 452.803
-  },
-  "fps.village.low_1pct_fps": {
-   "n": 3,
-   "mean": 195.561,
-   "stdev": 75.888,
-   "min": 141.859,
-   "max": 282.38,
-   "ci95": 188.533
-  },
-  "fps.village.low_01pct_fps": {
-   "n": 3,
-   "mean": 134.559,
-   "stdev": 74.125,
-   "min": 87.663,
-   "max": 220.016,
-   "ci95": 184.153
-  },
-  "chunks.forest.load_ms": {
-   "n": 3,
-   "mean": 7185.67,
-   "stdev": 4093.192,
-   "min": 4323.79,
-   "max": 11874.133,
-   "ci95": 10168.874
-  },
-  "chunks.forest.meshed_count": {
-   "n": 3,
-   "mean": 8302.667,
-   "stdev": 538.894,
-   "min": 7853.0,
-   "max": 8900.0,
-   "ci95": 1338.794
-  },
-  "fps.forest.avg_fps": {
-   "n": 3,
-   "mean": 364.068,
-   "stdev": 8.947,
-   "min": 355.173,
-   "max": 373.067,
-   "ci95": 22.229
-  },
-  "fps.forest.low_1pct_fps": {
-   "n": 3,
-   "mean": 145.064,
-   "stdev": 21.824,
-   "min": 121.995,
-   "max": 165.382,
-   "ci95": 54.218
-  },
-  "fps.forest.low_01pct_fps": {
-   "n": 3,
-   "mean": 97.299,
-   "stdev": 15.364,
-   "min": 81.075,
-   "max": 111.627,
-   "ci95": 38.17
-  },
-  "chunks.ocean.load_ms": {
-   "n": 3,
-   "mean": 4944.497,
-   "stdev": 1598.757,
-   "min": 3816.976,
-   "max": 6774.175,
-   "ci95": 3971.854
-  },
-  "chunks.ocean.meshed_count": {
-   "n": 3,
-   "mean": 7041.0,
-   "stdev": 276.949,
-   "min": 6821.0,
-   "max": 7352.0,
-   "ci95": 688.036
-  },
-  "fps.ocean.avg_fps": {
-   "n": 3,
-   "mean": 410.281,
-   "stdev": 35.314,
-   "min": 370.881,
-   "max": 439.08,
-   "ci95": 87.731
-  },
-  "fps.ocean.low_1pct_fps": {
-   "n": 3,
-   "mean": 161.057,
-   "stdev": 15.769,
-   "min": 144.003,
-   "max": 175.109,
-   "ci95": 39.175
-  },
-  "fps.ocean.low_01pct_fps": {
-   "n": 3,
-   "mean": 111.852,
-   "stdev": 16.415,
-   "min": 93.045,
-   "max": 123.299,
-   "ci95": 40.78
-  },
-  "chunks.mountain.load_ms": {
-   "n": 3,
-   "mean": 8844.497,
-   "stdev": 4291.678,
-   "min": 5269.587,
-   "max": 13604.075,
-   "ci95": 10661.98
-  },
-  "chunks.mountain.meshed_count": {
-   "n": 3,
-   "mean": 7381.0,
-   "stdev": 88.606,
-   "min": 7290.0,
-   "max": 7467.0,
-   "ci95": 220.127
-  },
-  "fps.mountain.avg_fps": {
-   "n": 3,
-   "mean": 466.294,
-   "stdev": 2.738,
-   "min": 464.707,
-   "max": 469.455,
-   "ci95": 6.801
-  },
-  "fps.mountain.low_1pct_fps": {
-   "n": 3,
-   "mean": 164.71,
-   "stdev": 21.73,
-   "min": 141.437,
-   "max": 184.468,
-   "ci95": 53.984
-  },
-  "fps.mountain.low_01pct_fps": {
-   "n": 3,
-   "mean": 90.643,
-   "stdev": 14.864,
-   "min": 76.851,
-   "max": 106.387,
-   "ci95": 36.928
-  },
-  "memory.rss_peak_mb": {
-   "n": 3,
-   "mean": 1536.969,
-   "stdev": 19.205,
-   "min": 1516.188,
-   "max": 1554.063,
-   "ci95": 47.711
-  },
-  "memory.rss_steady_mb": {
-   "n": 3,
-   "mean": 1379.422,
-   "stdev": 9.712,
-   "min": 1371.438,
-   "max": 1390.234,
-   "ci95": 24.129
-  },
-  "memory.footprint_peak_mb": {
-   "n": 3,
-   "mean": 2093.701,
-   "stdev": 13.714,
-   "min": 2078.862,
-   "max": 2105.909,
-   "ci95": 34.07
-  },
-  "memory.footprint_steady_mb": {
-   "n": 3,
-   "mean": 1883.495,
-   "stdev": 10.346,
-   "min": 1871.987,
-   "max": 1892.026,
-   "ci95": 25.702
-  }
- },
- "frames": [
-  {
-   "phase": "village",
-   "repeat": 0,
-   "frames": 9008,
-   "seconds": 12.0,
-   "avg_fps": 750.659,
-   "low_1pct_fps": 282.38,
-   "low_01pct_fps": 220.016,
-   "p50_ms": 1.047,
-   "p95_ms": 2.169,
-   "p99_ms": 3.163,
-   "p999_ms": 4.077,
-   "max_ms": 5.462,
-   "cpu_p50_ms": 0.447,
-   "gpu_p50_ms": 1.021,
-   "histogram": [
-    3979,
-    3877,
-    1033,
-    112,
-    6,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 1,
-   "frames": 5245,
-   "seconds": 12.0,
-   "avg_fps": 437.07,
-   "low_1pct_fps": 141.859,
-   "low_01pct_fps": 87.663,
-   "p50_ms": 1.822,
-   "p95_ms": 4.165,
-   "p99_ms": 5.399,
-   "p999_ms": 10.052,
-   "max_ms": 12.712,
-   "cpu_p50_ms": 0.652,
-   "gpu_p50_ms": 1.943,
-   "histogram": [
-    831,
-    1968,
-    606,
-    1582,
-    154,
-    82,
-    3,
-    3,
-    10,
-    4,
-    2,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 2,
-   "frames": 5195,
-   "seconds": 12.0,
-   "avg_fps": 432.911,
-   "low_1pct_fps": 162.445,
-   "low_01pct_fps": 95.997,
-   "p50_ms": 1.806,
-   "p95_ms": 4.202,
-   "p99_ms": 5.259,
-   "p999_ms": 7.591,
-   "max_ms": 17.328,
-   "cpu_p50_ms": 0.636,
-   "gpu_p50_ms": 1.876,
-   "histogram": [
-    297,
-    2502,
-    650,
-    1469,
-    192,
-    73,
-    6,
-    1,
-    3,
-    1,
-    0,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 0,
-   "frames": 4262,
-   "seconds": 12.0,
-   "avg_fps": 355.173,
-   "low_1pct_fps": 165.382,
-   "low_01pct_fps": 111.627,
-   "p50_ms": 2.917,
-   "p95_ms": 3.854,
-   "p99_ms": 5.022,
-   "p999_ms": 7.808,
-   "max_ms": 9.769,
-   "cpu_p50_ms": 0.59,
-   "gpu_p50_ms": 2.91,
-   "histogram": [
-    98,
-    416,
-    2506,
-    1080,
-    118,
-    29,
-    10,
-    1,
-    4,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 1,
-   "frames": 4477,
-   "seconds": 12.001,
-   "avg_fps": 373.067,
-   "low_1pct_fps": 121.995,
-   "low_01pct_fps": 81.075,
-   "p50_ms": 2.243,
-   "p95_ms": 4.687,
-   "p99_ms": 5.835,
-   "p999_ms": 11.831,
-   "max_ms": 13.367,
-   "cpu_p50_ms": 0.541,
-   "gpu_p50_ms": 2.346,
-   "histogram": [
-    183,
-    1975,
-    392,
-    887,
-    903,
-    99,
-    12,
-    6,
-    11,
-    6,
-    3,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 2,
-   "frames": 4368,
-   "seconds": 12.001,
-   "avg_fps": 363.964,
-   "low_1pct_fps": 147.816,
-   "low_01pct_fps": 99.196,
-   "p50_ms": 2.264,
-   "p95_ms": 4.763,
-   "p99_ms": 5.86,
-   "p999_ms": 7.641,
-   "max_ms": 11.427,
-   "cpu_p50_ms": 0.562,
-   "gpu_p50_ms": 2.203,
-   "histogram": [
-    73,
-    1978,
-    472,
-    695,
-    1004,
-    104,
-    35,
-    3,
-    1,
-    3,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 0,
-   "frames": 4451,
-   "seconds": 12.001,
-   "avg_fps": 370.881,
-   "low_1pct_fps": 175.109,
-   "low_01pct_fps": 119.212,
-   "p50_ms": 2.858,
-   "p95_ms": 4.279,
-   "p99_ms": 5.045,
-   "p999_ms": 6.057,
-   "max_ms": 10.866,
-   "cpu_p50_ms": 0.609,
-   "gpu_p50_ms": 2.922,
-   "histogram": [
-    193,
-    1245,
-    964,
-    1732,
-    270,
-    42,
-    2,
-    0,
-    1,
-    2,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 1,
-   "frames": 5269,
-   "seconds": 12.0,
-   "avg_fps": 439.08,
-   "low_1pct_fps": 144.003,
-   "low_01pct_fps": 93.045,
-   "p50_ms": 1.767,
-   "p95_ms": 4.188,
-   "p99_ms": 5.191,
-   "p999_ms": 10.375,
-   "max_ms": 11.271,
-   "cpu_p50_ms": 0.545,
-   "gpu_p50_ms": 1.815,
-   "histogram": [
-    1239,
-    1550,
-    644,
-    1555,
-    201,
-    59,
-    1,
-    4,
-    10,
-    6,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 2,
-   "frames": 5051,
-   "seconds": 12.001,
-   "avg_fps": 420.881,
-   "low_1pct_fps": 164.058,
-   "low_01pct_fps": 123.299,
-   "p50_ms": 1.872,
-   "p95_ms": 4.455,
-   "p99_ms": 5.38,
-   "p999_ms": 6.923,
-   "max_ms": 11.189,
-   "cpu_p50_ms": 0.548,
-   "gpu_p50_ms": 1.874,
-   "histogram": [
-    519,
-    2114,
-    673,
-    1086,
-    577,
-    65,
-    13,
-    3,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 0,
-   "frames": 5635,
-   "seconds": 12.003,
-   "avg_fps": 469.455,
-   "low_1pct_fps": 184.468,
-   "low_01pct_fps": 106.387,
-   "p50_ms": 1.626,
-   "p95_ms": 3.874,
-   "p99_ms": 4.614,
-   "p999_ms": 5.913,
-   "max_ms": 18.185,
-   "cpu_p50_ms": 0.564,
-   "gpu_p50_ms": 1.604,
-   "histogram": [
-    1491,
-    1599,
-    704,
-    1688,
-    128,
-    20,
-    1,
-    2,
-    0,
-    1,
-    0,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 1,
-   "frames": 5578,
-   "seconds": 12.003,
-   "avg_fps": 464.72,
-   "low_1pct_fps": 141.437,
-   "low_01pct_fps": 76.851,
-   "p50_ms": 1.587,
-   "p95_ms": 4.127,
-   "p99_ms": 5.085,
-   "p999_ms": 10.138,
-   "max_ms": 21.644,
-   "cpu_p50_ms": 0.588,
-   "gpu_p50_ms": 1.625,
-   "histogram": [
-    1321,
-    1798,
-    770,
-    1453,
-    173,
-    41,
-    2,
-    5,
-    7,
-    6,
-    1,
-    0,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 2,
-   "frames": 5576,
-   "seconds": 11.999,
-   "avg_fps": 464.707,
-   "low_1pct_fps": 168.226,
-   "low_01pct_fps": 88.692,
-   "p50_ms": 1.627,
-   "p95_ms": 4.154,
-   "p99_ms": 4.908,
-   "p999_ms": 9.555,
-   "max_ms": 14.784,
-   "cpu_p50_ms": 0.595,
-   "gpu_p50_ms": 1.64,
-   "histogram": [
-    1054,
-    2049,
-    837,
-    1377,
-    217,
-    32,
-    3,
-    0,
-    2,
-    4,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  }
- ],
- "label": "horizon-m4pro-1080p"
-}

benchmarks/perf/macmini-m4pro-loaded-2026-11-01.md

@@ -1,68 +0,0 @@
-# Horizon main vs vanilla 26.3 on a loaded Mac mini M4 Pro (2026-11-01)
-
-`tools/perf_bench.py` reports for Horizon main 1bd24e4042, vanilla 26.3 and vanilla with performance mods, render distances
-8, 16 and 32, three games each, every game from a fresh world. **These are not player numbers:** the Mac mini was running other
-work the whole time (1-minute load average 15-114 on 14 cores), and every game rendered without presenting. They are kept because
-they're the first Mac reports and show how each game behaves under heavy CPU contention. The reports are the
-`*-m4pro-1080p-rd*.json` files next to this page.
-
-## Setup
-
-- **Machine:** Mac mini, Apple M4 Pro (10 performance + 4 efficiency cores, 20-core GPU), 64 GB, macOS 27.0.1. Screen
-  1920x1080; the session was locked, so every game ran `offscreen` (Horizon renders into a texture; vanilla draws into a
-  window nobody sees).
-- **Horizon:** main 1bd24e4042, `cargo build --release -p horizon-client`, Metal.
-- **Vanilla:** the 26.3 client jar with Fabric Loader and the driver mod, Java 25 (Temurin), `-Xmx2G` with the launcher's G1
-  flags, OpenGL 4.1 (Apple's Metal-backed driver).
-- **Vanilla + mods:** the same with Sodium mc26.3-0.9.2, Lithium mc26.3-0.26.2, FerriteCore 9.0.0, ImmediatelyFast 1.17.1 and
-  Fabric API (`tools/benchmark-deps/mods.lock.json`).
-- **Order:** the games took turns inside each repeat (vanilla, mods, Horizon; then mods, Horizon, vanilla; then Horizon, vanilla,
-  mods), one game at a time.
-
-## Why these numbers aren't a fair comparison
-
-- **Load.** Load before each game: RD 8 46-82, RD 16 43-114, RD 32 15-59 (the later RD 32 games ran at 15-30). Horizon raises its
-  render and server threads to the user-interactive QoS class, and the JVM's threads stay at the default, so under this
-  contention macOS runs Horizon's frame first. Vanilla's 1% lows of 2-15 FPS show that, more than how fast either game is.
-- **Resolution.** Vanilla's 1920x1080 window was shrunk to **1920x930** by the 1080p screen (menu and title bars); Horizon,
-  offscreen, rendered 1920x1080. Vanilla drew 14% fewer pixels, which favours it in GPU-bound scenes. Because the recorded
-  windows differ, `perf_bench.py --table` refuses to compare these reports. The tables below were made with the window check
-  skipped. A rerun at a size that fits the screen (1600x900) would avoid it.
-
-## Results
-
-Mean of 3 games ± 95% confidence interval. FPS over the 12-second flight (average / 1% low / 0.1% low):
-
-| RD | scene | Horizon main | Vanilla 26.3 | Vanilla + mods |
-| --- | --- | --- | --- | --- |
-| 8 | forest | 364 ±22 / 145 ±54 / 97 ±38 | 66 ±22 / 8 ±10 / 6 ±8 | 47 ±42 / 4 ±2 / 3 ±1 |
-| 8 | mountain | 466 ±7 / 165 ±54 / 91 ±37 | 46 ±37 / 5 ±7 / 4 ±6 | 67 ±35 / 8 ±5 / 4 ±4 |
-| 8 | ocean | 410 ±88 / 161 ±39 / 112 ±41 | 50 ±44 / 6 ±13 / 5 ±11 | 35 ±16 / 5 ±4 / 4 ±4 |
-| 8 | village | 540 ±453 / 196 ±189 / 135 ±184 | 42 ±16 / 4 ±3 / 3 ±0 | 33 ±46 / 4 ±6 / 3 ±4 |
-| 16 | forest | 333 ±4 / 193 ±29 / 137 ±71 | 23 ±9 / 2 ±1 / 2 ±1 | 62 ±94 / 10 ±21 / 7 ±14 |
-| 16 | mountain | 357 ±6 / 200 ±30 / 154 ±33 | 44 ±12 / 7 ±2 / 4 ±1 | 36 ±44 / 4 ±5 / 3 ±5 |
-| 16 | ocean | 412 ±4 / 209 ±26 / 127 ±44 | 51 ±16 / 6 ±8 / 4 ±7 | 75 ±159 / 13 ±33 / 7 ±16 |
-| 16 | village | 568 ±30 / 271 ±25 / 210 ±75 | 46 ±110 / 9 ±27 / 7 ±17 | 46 ±45 / 7 ±9 / 5 ±4 |
-| 32 | forest | 165 ±11 / 104 ±51 / 95 ±60 | 68 ±122 / 18 ±49 / 14 ±42 | 114 ±132 / 29 ±44 / 21 ±34 |
-| 32 | mountain | 190 ±5 / 109 ±35 / 91 ±32 | 29 ±19 / 3 ±2 / 2 ±3 | 57 ±49 / 7 ±2 / 3 ±3 |
-| 32 | ocean | 210 ±13 / 129 ±77 / 116 ±98 | 44 ±80 / 5 ±4 / 2 ±1 | 119 ±176 / 32 ±66 / 17 ±37 |
-| 32 | village | 326 ±17 / 152 ±85 / 123 ±84 | 81 ±99 / 15 ±20 / 11 ±11 | 92 ±28 / 13 ±6 / 9 ±3 |
-
-Start to title / in-world, mean scene load, RSS steady / peak, physical footprint steady / peak (macOS `footprint`, which on Apple
-Silicon includes the game's GPU allocations), load average before the first game:
-
-| RD | Horizon main | Vanilla 26.3 | Vanilla + mods |
-| --- | --- | --- | --- |
-| 8 | 7.2 / 11.4, 6.5, 1379 / 1537, 1883 / 2094, 73 | 49.9 / 89.1, 18.2, 1811 / 1877, 2635 / 2709, 66 | 56.3 / 97.7, 17.9, 1927 / 2019, 2396 / 2441, 74 |
-| 16 | 1.5 / 14.0, 9.5, 1617 / 1892, 2495 / 3084, 114 | 19.4 / 78.9, 33.3, 2431 / 2555, 3450 / 3713, 76 | 23.8 / 76.9, 27.1, 2355 / 2566, 3212 / 3431, 70 |
-| 32 | 2.2 / 14.3, 11.1, 2196 / 2537, 4373 / 5560, 28 | 20.6 / 124.2, 44.2, 2838 / 2958, 4265 / 4618, 59 | 13.5 / 63.2, 29.9, 3705 / 4078, 4647 / 5250, 37 |
-
-## What it shows
-
-- Horizon is GPU-bound on the M4 Pro in every scene at every distance: its median GPU time per frame is 1.6-2.5 ms at RD 8 and
-  2.9-5.7 ms at RD 32, its render thread's CPU time 0.6-2.2 ms.
-- In the least-loaded RD 32 games (load 15-22), vanilla + mods matched Horizon's average FPS over the forest (162 vs 163-170) and
-  the ocean (187 vs 209-216); Horizon's 1% lows were 2.4 times the modded client's there, and 15-17 times over the village and the
-  mountain.
-- Horizon's resident memory is 1.2-1.7 times smaller than both clients'. Its physical footprint, GPU memory included, is level
-  with vanilla's at RD 32 (4373 vs 4265 MB steady) and above it at peak (5560 vs 4618 MB).

benchmarks/perf/vanilla-m4pro-1080p-rd16.json

@@ -1,707 +0,0 @@
-{
- "format": "horizon-benchmark-report",
- "version": 1,
- "kind": "game",
- "created": "2026-11-01T22:55:52Z",
- "app": {
-  "name": "minecraft",
-  "version": "26.3",
-  "mods": [
-   {
-    "name": "fabric-loader",
-    "version": "0.19.5"
-   }
-  ]
- },
- "hardware": {
-  "os": "macos",
-  "arch": "aarch64",
-  "cpu_threads": 14,
-  "os_version": "27.0.1",
-  "cpu": "Apple M4 Pro",
-  "ram_mb": 65536,
-  "gpu": {
-   "name": "Apple M4 Pro",
-   "vendor": "Apple",
-   "driver": "4.1 Metal - 91.7",
-   "backend": "opengl",
-   "kind": ""
-  }
- },
- "conditions": {
-  "scenario": "perf_bench:village,forest,ocean,mountain",
-  "seed": "1234",
-  "render_distance": 16,
-  "simulation_distance": 12,
-  "vsync": false,
-  "offscreen": true,
-  "repeats": 3,
-  "warmup_s": 2.0,
-  "load_avg_1m": 75.854,
-  "window": [
-   1920,
-   930
-  ]
- },
- "metrics": {
-  "startup.title_ms": {
-   "n": 3,
-   "mean": 19419.646,
-   "stdev": 10653.755,
-   "min": 8240.178,
-   "max": 29455.403,
-   "ci95": 26467.531
-  },
-  "startup.world_ms": {
-   "n": 3,
-   "mean": 78944.646,
-   "stdev": 36737.011,
-   "min": 51495.357,
-   "max": 120678.403,
-   "ci95": 91267.16
-  },
-  "chunks.village.load_ms": {
-   "n": 3,
-   "mean": 21947.683,
-   "stdev": 10432.774,
-   "min": 10427.451,
-   "max": 30758.368,
-   "ci95": 25918.54
-  },
-  "fps.village.avg_fps": {
-   "n": 3,
-   "mean": 45.524,
-   "stdev": 44.352,
-   "min": 15.749,
-   "max": 96.497,
-   "ci95": 110.185
-  },
-  "fps.village.low_1pct_fps": {
-   "n": 3,
-   "mean": 9.141,
-   "stdev": 10.812,
-   "min": 1.86,
-   "max": 21.565,
-   "ci95": 26.862
-  },
-  "fps.village.low_01pct_fps": {
-   "n": 3,
-   "mean": 6.727,
-   "stdev": 6.902,
-   "min": 1.785,
-   "max": 14.612,
-   "ci95": 17.146
-  },
-  "chunks.forest.load_ms": {
-   "n": 3,
-   "mean": 39062.839,
-   "stdev": 21806.234,
-   "min": 15037.908,
-   "max": 57603.235,
-   "ci95": 54174.061
-  },
-  "fps.forest.avg_fps": {
-   "n": 3,
-   "mean": 23.347,
-   "stdev": 3.693,
-   "min": 20.154,
-   "max": 27.392,
-   "ci95": 9.175
-  },
-  "fps.forest.low_1pct_fps": {
-   "n": 3,
-   "mean": 2.419,
-   "stdev": 0.269,
-   "min": 2.196,
-   "max": 2.718,
-   "ci95": 0.669
-  },
-  "fps.forest.low_01pct_fps": {
-   "n": 3,
-   "mean": 1.972,
-   "stdev": 0.438,
-   "min": 1.551,
-   "max": 2.425,
-   "ci95": 1.088
-  },
-  "chunks.ocean.load_ms": {
-   "n": 3,
-   "mean": 22097.713,
-   "stdev": 4463.742,
-   "min": 18053.319,
-   "max": 26887.066,
-   "ci95": 11089.445
-  },
-  "fps.ocean.avg_fps": {
-   "n": 3,
-   "mean": 51.279,
-   "stdev": 6.309,
-   "min": 44.786,
-   "max": 57.386,
-   "ci95": 15.673
-  },
-  "fps.ocean.low_1pct_fps": {
-   "n": 3,
-   "mean": 6.15,
-   "stdev": 3.128,
-   "min": 3.444,
-   "max": 9.574,
-   "ci95": 7.77
-  },
-  "fps.ocean.low_01pct_fps": {
-   "n": 3,
-   "mean": 4.161,
-   "stdev": 2.739,
-   "min": 2.487,
-   "max": 7.321,
-   "ci95": 6.803
-  },
-  "chunks.mountain.load_ms": {
-   "n": 3,
-   "mean": 50257.39,
-   "stdev": 34798.619,
-   "min": 25919.598,
-   "max": 90115.595,
-   "ci95": 86451.54
-  },
-  "fps.mountain.avg_fps": {
-   "n": 3,
-   "mean": 44.346,
-   "stdev": 4.882,
-   "min": 39.246,
-   "max": 48.975,
-   "ci95": 12.128
-  },
-  "fps.mountain.low_1pct_fps": {
-   "n": 3,
-   "mean": 6.637,
-   "stdev": 0.69,
-   "min": 5.888,
-   "max": 7.246,
-   "ci95": 1.714
-  },
-  "fps.mountain.low_01pct_fps": {
-   "n": 3,
-   "mean": 4.444,
-   "stdev": 0.6,
-   "min": 3.937,
-   "max": 5.107,
-   "ci95": 1.491
-  },
-  "memory.rss_peak_mb": {
-   "n": 3,
-   "mean": 2554.552,
-   "stdev": 218.163,
-   "min": 2328.859,
-   "max": 2764.313,
-   "ci95": 541.991
-  },
-  "memory.rss_steady_mb": {
-   "n": 3,
-   "mean": 2430.854,
-   "stdev": 230.654,
-   "min": 2186.328,
-   "max": 2644.531,
-   "ci95": 573.023
-  },
-  "memory.footprint_peak_mb": {
-   "n": 3,
-   "mean": 3713.311,
-   "stdev": 191.61,
-   "min": 3512.331,
-   "max": 3893.925,
-   "ci95": 476.025
-  },
-  "memory.footprint_steady_mb": {
-   "n": 3,
-   "mean": 3450.061,
-   "stdev": 76.233,
-   "min": 3370.253,
-   "max": 3522.128,
-   "ci95": 189.388
-  }
- },
- "frames": [
-  {
-   "phase": "village",
-   "repeat": 0,
-   "frames": 189,
-   "seconds": 12.001,
-   "avg_fps": 15.749,
-   "low_1pct_fps": 1.86,
-   "low_01pct_fps": 1.785,
-   "p50_ms": 22.219,
-   "p95_ms": 254.854,
-   "p99_ms": 515.134,
-   "p999_ms": 560.079,
-   "max_ms": 560.079,
-   "histogram": [
-    0,
-    0,
-    0,
-    1,
-    2,
-    2,
-    7,
-    9,
-    10,
-    16,
-    12,
-    11,
-    14,
-    16,
-    22,
-    9,
-    6,
-    5,
-    11,
-    10,
-    15,
-    9,
-    2,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 1,
-   "frames": 292,
-   "seconds": 12.004,
-   "avg_fps": 24.325,
-   "low_1pct_fps": 3.998,
-   "low_01pct_fps": 3.783,
-   "p50_ms": 15.477,
-   "p95_ms": 165.164,
-   "p99_ms": 242.898,
-   "p999_ms": 264.363,
-   "max_ms": 264.363,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    4,
-    26,
-    20,
-    32,
-    20,
-    20,
-    17,
-    12,
-    12,
-    10,
-    17,
-    14,
-    20,
-    14,
-    16,
-    16,
-    21,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 2,
-   "frames": 1158,
-   "seconds": 12.0,
-   "avg_fps": 96.497,
-   "low_1pct_fps": 21.565,
-   "low_01pct_fps": 14.612,
-   "p50_ms": 7.567,
-   "p95_ms": 22.849,
-   "p99_ms": 34.806,
-   "p999_ms": 62.86,
-   "max_ms": 74.011,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    1,
-    38,
-    452,
-    158,
-    102,
-    94,
-    125,
-    68,
-    34,
-    42,
-    30,
-    7,
-    4,
-    2,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 0,
-   "frames": 271,
-   "seconds": 12.047,
-   "avg_fps": 22.496,
-   "low_1pct_fps": 2.196,
-   "low_01pct_fps": 1.551,
-   "p50_ms": 18.263,
-   "p95_ms": 189.284,
-   "p99_ms": 317.823,
-   "p999_ms": 644.675,
-   "max_ms": 644.675,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    3,
-    22,
-    23,
-    13,
-    22,
-    22,
-    19,
-    24,
-    22,
-    14,
-    17,
-    12,
-    13,
-    9,
-    16,
-    15,
-    4,
-    1,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 1,
-   "frames": 242,
-   "seconds": 12.007,
-   "avg_fps": 20.154,
-   "low_1pct_fps": 2.343,
-   "low_01pct_fps": 1.939,
-   "p50_ms": 19.762,
-   "p95_ms": 157.949,
-   "p99_ms": 376.292,
-   "p999_ms": 515.678,
-   "max_ms": 515.678,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    13,
-    17,
-    16,
-    26,
-    19,
-    11,
-    9,
-    10,
-    11,
-    9,
-    16,
-    17,
-    12,
-    21,
-    19,
-    9,
-    6,
-    1,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 2,
-   "frames": 331,
-   "seconds": 12.084,
-   "avg_fps": 27.392,
-   "low_1pct_fps": 2.718,
-   "low_01pct_fps": 2.425,
-   "p50_ms": 13.0,
-   "p95_ms": 162.797,
-   "p99_ms": 325.827,
-   "p999_ms": 412.349,
-   "max_ms": 412.349,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    3,
-    5,
-    26,
-    34,
-    42,
-    41,
-    24,
-    27,
-    15,
-    21,
-    22,
-    8,
-    10,
-    11,
-    10,
-    14,
-    10,
-    8,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 0,
-   "frames": 620,
-   "seconds": 12.001,
-   "avg_fps": 51.664,
-   "low_1pct_fps": 3.444,
-   "low_01pct_fps": 2.487,
-   "p50_ms": 10.358,
-   "p95_ms": 54.808,
-   "p99_ms": 181.112,
-   "p999_ms": 402.152,
-   "max_ms": 402.152,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    30,
-    79,
-    95,
-    86,
-    90,
-    60,
-    54,
-    28,
-    28,
-    19,
-    9,
-    8,
-    8,
-    6,
-    8,
-    7,
-    5,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 1,
-   "frames": 689,
-   "seconds": 12.006,
-   "avg_fps": 57.386,
-   "low_1pct_fps": 9.574,
-   "low_01pct_fps": 7.321,
-   "p50_ms": 12.76,
-   "p95_ms": 43.737,
-   "p99_ms": 69.357,
-   "p999_ms": 136.592,
-   "max_ms": 136.592,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    23,
-    46,
-    80,
-    80,
-    92,
-    68,
-    74,
-    54,
-    49,
-    51,
-    24,
-    22,
-    16,
-    6,
-    4,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 2,
-   "frames": 538,
-   "seconds": 12.013,
-   "avg_fps": 44.786,
-   "low_1pct_fps": 5.431,
-   "low_01pct_fps": 2.674,
-   "p50_ms": 14.011,
-   "p95_ms": 71.23,
-   "p99_ms": 141.423,
-   "p999_ms": 373.913,
-   "max_ms": 373.913,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    1,
-    8,
-    38,
-    84,
-    83,
-    53,
-    62,
-    52,
-    54,
-    29,
-    12,
-    15,
-    13,
-    22,
-    10,
-    1,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 0,
-   "frames": 588,
-   "seconds": 12.006,
-   "avg_fps": 48.975,
-   "low_1pct_fps": 6.777,
-   "low_01pct_fps": 3.937,
-   "p50_ms": 12.678,
-   "p95_ms": 64.221,
-   "p99_ms": 108.513,
-   "p999_ms": 254.008,
-   "max_ms": 254.008,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    4,
-    34,
-    21,
-    41,
-    108,
-    62,
-    55,
-    55,
-    40,
-    45,
-    41,
-    21,
-    16,
-    17,
-    18,
-    9,
-    0,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 1,
-   "frames": 471,
-   "seconds": 12.001,
-   "avg_fps": 39.246,
-   "low_1pct_fps": 5.888,
-   "low_01pct_fps": 4.289,
-   "p50_ms": 17.65,
-   "p95_ms": 73.314,
-   "p99_ms": 135.3,
-   "p999_ms": 233.136,
-   "max_ms": 233.136,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    3,
-    12,
-    22,
-    29,
-    36,
-    40,
-    43,
-    38,
-    41,
-    46,
-    62,
-    29,
-    20,
-    19,
-    22,
-    5,
-    4,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 2,
-   "frames": 538,
-   "seconds": 12.004,
-   "avg_fps": 44.818,
-   "low_1pct_fps": 7.246,
-   "low_01pct_fps": 5.107,
-   "p50_ms": 15.959,
-   "p95_ms": 63.485,
-   "p99_ms": 109.639,
-   "p999_ms": 195.815,
-   "max_ms": 195.815,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    4,
-    6,
-    21,
-    75,
-    56,
-    54,
-    78,
-    54,
-    69,
-    36,
-    23,
-    22,
-    18,
-    14,
-    7,
-    1,
-    0,
-    0,
-    0
-   ]
-  }
- ],
- "label": "vanilla-m4pro-1080p"
-}

benchmarks/perf/vanilla-m4pro-1080p-rd32.json

@@ -1,707 +0,0 @@
-{
- "format": "horizon-benchmark-report",
- "version": 1,
- "kind": "game",
- "created": "2026-11-01T23:17:23Z",
- "app": {
-  "name": "minecraft",
-  "version": "26.3",
-  "mods": [
-   {
-    "name": "fabric-loader",
-    "version": "0.19.5"
-   }
-  ]
- },
- "hardware": {
-  "os": "macos",
-  "arch": "aarch64",
-  "cpu_threads": 14,
-  "os_version": "27.0.1",
-  "cpu": "Apple M4 Pro",
-  "ram_mb": 65536,
-  "gpu": {
-   "name": "Apple M4 Pro",
-   "vendor": "Apple",
-   "driver": "4.1 Metal - 91.7",
-   "backend": "opengl",
-   "kind": ""
-  }
- },
- "conditions": {
-  "scenario": "perf_bench:village,forest,ocean,mountain",
-  "seed": "1234",
-  "render_distance": 32,
-  "simulation_distance": 12,
-  "vsync": false,
-  "offscreen": true,
-  "repeats": 3,
-  "warmup_s": 2.0,
-  "load_avg_1m": 58.672,
-  "window": [
-   1920,
-   930
-  ]
- },
- "metrics": {
-  "startup.title_ms": {
-   "n": 3,
-   "mean": 20579.57,
-   "stdev": 13060.035,
-   "min": 10660.541,
-   "max": 35376.471,
-   "ci95": 32445.545
-  },
-  "startup.world_ms": {
-   "n": 3,
-   "mean": 124180.237,
-   "stdev": 102723.197,
-   "min": 51510.541,
-   "max": 241702.471,
-   "ci95": 255199.163
-  },
-  "chunks.village.load_ms": {
-   "n": 3,
-   "mean": 23389.087,
-   "stdev": 5416.249,
-   "min": 18538.934,
-   "max": 29233.632,
-   "ci95": 13455.795
-  },
-  "fps.village.avg_fps": {
-   "n": 3,
-   "mean": 81.421,
-   "stdev": 39.944,
-   "min": 35.32,
-   "max": 105.706,
-   "ci95": 99.234
-  },
-  "fps.village.low_1pct_fps": {
-   "n": 3,
-   "mean": 15.288,
-   "stdev": 8.185,
-   "min": 5.907,
-   "max": 20.97,
-   "ci95": 20.334
-  },
-  "fps.village.low_01pct_fps": {
-   "n": 3,
-   "mean": 10.544,
-   "stdev": 4.403,
-   "min": 5.804,
-   "max": 14.505,
-   "ci95": 10.938
-  },
-  "chunks.forest.load_ms": {
-   "n": 3,
-   "mean": 48382.741,
-   "stdev": 32005.955,
-   "min": 26161.003,
-   "max": 85067.56,
-   "ci95": 79513.616
-  },
-  "fps.forest.avg_fps": {
-   "n": 3,
-   "mean": 67.82,
-   "stdev": 49.16,
-   "min": 12.722,
-   "max": 107.193,
-   "ci95": 122.129
-  },
-  "fps.forest.low_1pct_fps": {
-   "n": 3,
-   "mean": 17.769,
-   "stdev": 19.765,
-   "min": 2.609,
-   "max": 40.124,
-   "ci95": 49.103
-  },
-  "fps.forest.low_01pct_fps": {
-   "n": 3,
-   "mean": 13.876,
-   "stdev": 16.851,
-   "min": 2.308,
-   "max": 33.21,
-   "ci95": 41.864
-  },
-  "chunks.ocean.load_ms": {
-   "n": 3,
-   "mean": 37630.797,
-   "stdev": 33094.177,
-   "min": 14901.304,
-   "max": 75599.155,
-   "ci95": 82217.128
-  },
-  "fps.ocean.avg_fps": {
-   "n": 3,
-   "mean": 44.125,
-   "stdev": 32.286,
-   "min": 13.532,
-   "max": 77.872,
-   "ci95": 80.209
-  },
-  "fps.ocean.low_1pct_fps": {
-   "n": 3,
-   "mean": 4.619,
-   "stdev": 1.694,
-   "min": 3.247,
-   "max": 6.512,
-   "ci95": 4.208
-  },
-  "fps.ocean.low_01pct_fps": {
-   "n": 3,
-   "mean": 2.354,
-   "stdev": 0.44,
-   "min": 1.967,
-   "max": 2.833,
-   "ci95": 1.094
-  },
-  "chunks.mountain.load_ms": {
-   "n": 3,
-   "mean": 67242.203,
-   "stdev": 17886.115,
-   "min": 56354.348,
-   "max": 87884.948,
-   "ci95": 44435.159
-  },
-  "fps.mountain.avg_fps": {
-   "n": 3,
-   "mean": 28.745,
-   "stdev": 7.77,
-   "min": 20.237,
-   "max": 35.466,
-   "ci95": 19.304
-  },
-  "fps.mountain.low_1pct_fps": {
-   "n": 3,
-   "mean": 3.013,
-   "stdev": 0.849,
-   "min": 2.273,
-   "max": 3.94,
-   "ci95": 2.109
-  },
-  "fps.mountain.low_01pct_fps": {
-   "n": 3,
-   "mean": 2.377,
-   "stdev": 1.031,
-   "min": 1.246,
-   "max": 3.263,
-   "ci95": 2.561
-  },
-  "memory.rss_peak_mb": {
-   "n": 3,
-   "mean": 2958.083,
-   "stdev": 22.425,
-   "min": 2937.734,
-   "max": 2982.125,
-   "ci95": 55.71
-  },
-  "memory.rss_steady_mb": {
-   "n": 3,
-   "mean": 2837.568,
-   "stdev": 165.159,
-   "min": 2648.188,
-   "max": 2951.719,
-   "ci95": 410.31
-  },
-  "memory.footprint_peak_mb": {
-   "n": 3,
-   "mean": 4618.337,
-   "stdev": 95.349,
-   "min": 4543.347,
-   "max": 4725.644,
-   "ci95": 236.878
-  },
-  "memory.footprint_steady_mb": {
-   "n": 3,
-   "mean": 4264.652,
-   "stdev": 87.422,
-   "min": 4173.589,
-   "max": 4347.91,
-   "ci95": 217.185
-  }
- },
- "frames": [
-  {
-   "phase": "village",
-   "repeat": 0,
-   "frames": 424,
-   "seconds": 12.004,
-   "avg_fps": 35.32,
-   "low_1pct_fps": 5.907,
-   "low_01pct_fps": 5.804,
-   "p50_ms": 17.195,
-   "p95_ms": 95.694,
-   "p99_ms": 164.6,
-   "p999_ms": 172.292,
-   "max_ms": 172.292,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    5,
-    19,
-    39,
-    45,
-    44,
-    52,
-    42,
-    41,
-    38,
-    21,
-    20,
-    21,
-    19,
-    12,
-    6,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 1,
-   "frames": 1239,
-   "seconds": 12.001,
-   "avg_fps": 103.238,
-   "low_1pct_fps": 20.97,
-   "low_01pct_fps": 14.505,
-   "p50_ms": 8.073,
-   "p95_ms": 18.618,
-   "p99_ms": 34.704,
-   "p999_ms": 53.789,
-   "max_ms": 84.091,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    2,
-    275,
-    412,
-    260,
-    117,
-    60,
-    35,
-    25,
-    23,
-    14,
-    7,
-    5,
-    3,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 2,
-   "frames": 1271,
-   "seconds": 12.024,
-   "avg_fps": 105.706,
-   "low_1pct_fps": 18.988,
-   "low_01pct_fps": 11.324,
-   "p50_ms": 7.988,
-   "p95_ms": 16.852,
-   "p99_ms": 35.156,
-   "p999_ms": 65.46,
-   "max_ms": 111.155,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    3,
-    220,
-    500,
-    318,
-    101,
-    43,
-    21,
-    15,
-    19,
-    17,
-    4,
-    4,
-    5,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 0,
-   "frames": 154,
-   "seconds": 12.105,
-   "avg_fps": 12.722,
-   "low_1pct_fps": 2.609,
-   "low_01pct_fps": 2.308,
-   "p50_ms": 54.156,
-   "p95_ms": 216.738,
-   "p99_ms": 333.238,
-   "p999_ms": 433.205,
-   "max_ms": 433.205,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    1,
-    4,
-    5,
-    7,
-    9,
-    13,
-    25,
-    5,
-    7,
-    12,
-    17,
-    26,
-    18,
-    5,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 1,
-   "frames": 1287,
-   "seconds": 12.006,
-   "avg_fps": 107.193,
-   "low_1pct_fps": 40.124,
-   "low_01pct_fps": 33.21,
-   "p50_ms": 8.355,
-   "p95_ms": 14.243,
-   "p99_ms": 22.791,
-   "p999_ms": 29.023,
-   "max_ms": 31.2,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    627,
-    416,
-    130,
-    43,
-    33,
-    16,
-    18,
-    4,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 2,
-   "frames": 1003,
-   "seconds": 12.005,
-   "avg_fps": 83.546,
-   "low_1pct_fps": 10.575,
-   "low_01pct_fps": 6.111,
-   "p50_ms": 9.556,
-   "p95_ms": 22.218,
-   "p99_ms": 53.64,
-   "p999_ms": 143.879,
-   "max_ms": 183.38,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    57,
-    515,
-    239,
-    64,
-    45,
-    21,
-    30,
-    12,
-    4,
-    4,
-    5,
-    3,
-    3,
-    1,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 0,
-   "frames": 163,
-   "seconds": 12.045,
-   "avg_fps": 13.532,
-   "low_1pct_fps": 3.247,
-   "low_01pct_fps": 2.833,
-   "p50_ms": 52.758,
-   "p95_ms": 208.496,
-   "p99_ms": 263.074,
-   "p999_ms": 352.963,
-   "max_ms": 352.963,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    1,
-    2,
-    4,
-    5,
-    5,
-    14,
-    23,
-    10,
-    12,
-    17,
-    30,
-    18,
-    20,
-    2,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 1,
-   "frames": 951,
-   "seconds": 12.212,
-   "avg_fps": 77.872,
-   "low_1pct_fps": 6.512,
-   "low_01pct_fps": 1.967,
-   "p50_ms": 8.895,
-   "p95_ms": 31.377,
-   "p99_ms": 72.053,
-   "p999_ms": 508.284,
-   "max_ms": 508.284,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    359,
-    306,
-    104,
-    47,
-    29,
-    31,
-    16,
-    18,
-    10,
-    9,
-    10,
-    6,
-    2,
-    3,
-    0,
-    1,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 2,
-   "frames": 495,
-   "seconds": 12.082,
-   "avg_fps": 40.97,
-   "low_1pct_fps": 4.097,
-   "low_01pct_fps": 2.261,
-   "p50_ms": 11.995,
-   "p95_ms": 80.625,
-   "p99_ms": 146.758,
-   "p999_ms": 442.316,
-   "max_ms": 442.316,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    3,
-    80,
-    109,
-    56,
-    31,
-    37,
-    24,
-    30,
-    28,
-    17,
-    17,
-    27,
-    24,
-    8,
-    2,
-    2,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 0,
-   "frames": 243,
-   "seconds": 12.008,
-   "avg_fps": 20.237,
-   "low_1pct_fps": 2.827,
-   "low_01pct_fps": 2.623,
-   "p50_ms": 21.487,
-   "p95_ms": 177.814,
-   "p99_ms": 315.716,
-   "p999_ms": 381.289,
-   "max_ms": 381.289,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    5,
-    20,
-    26,
-    24,
-    32,
-    25,
-    21,
-    8,
-    19,
-    13,
-    18,
-    15,
-    10,
-    7,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 1,
-   "frames": 431,
-   "seconds": 12.153,
-   "avg_fps": 35.466,
-   "low_1pct_fps": 2.273,
-   "low_01pct_fps": 1.246,
-   "p50_ms": 12.232,
-   "p95_ms": 106.955,
-   "p99_ms": 249.209,
-   "p999_ms": 802.438,
-   "max_ms": 802.438,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    66,
-    137,
-    62,
-    41,
-    21,
-    23,
-    20,
-    3,
-    14,
-    11,
-    11,
-    10,
-    8,
-    2,
-    2,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 2,
-   "frames": 367,
-   "seconds": 12.02,
-   "avg_fps": 30.533,
-   "low_1pct_fps": 3.94,
-   "low_01pct_fps": 3.263,
-   "p50_ms": 21.354,
-   "p95_ms": 104.182,
-   "p99_ms": 218.448,
-   "p999_ms": 306.483,
-   "max_ms": 306.483,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    4,
-    52,
-    38,
-    32,
-    44,
-    53,
-    47,
-    20,
-    21,
-    19,
-    16,
-    15,
-    4,
-    2,
-    0,
-    0
-   ]
-  }
- ],
- "label": "vanilla-m4pro-1080p"
-}

benchmarks/perf/vanilla-m4pro-1080p-rd8.json

@@ -1,707 +0,0 @@
-{
- "format": "horizon-benchmark-report",
- "version": 1,
- "kind": "game",
- "created": "2026-11-01T22:55:52Z",
- "app": {
-  "name": "minecraft",
-  "version": "26.3",
-  "mods": [
-   {
-    "name": "fabric-loader",
-    "version": "0.19.5"
-   }
-  ]
- },
- "hardware": {
-  "os": "macos",
-  "arch": "aarch64",
-  "cpu_threads": 14,
-  "os_version": "27.0.1",
-  "cpu": "Apple M4 Pro",
-  "ram_mb": 65536,
-  "gpu": {
-   "name": "Apple M4 Pro",
-   "vendor": "Apple",
-   "driver": "4.1 Metal - 91.7",
-   "backend": "opengl",
-   "kind": ""
-  }
- },
- "conditions": {
-  "scenario": "perf_bench:village,forest,ocean,mountain",
-  "seed": "1234",
-  "render_distance": 8,
-  "simulation_distance": 12,
-  "vsync": false,
-  "offscreen": true,
-  "repeats": 3,
-  "warmup_s": 2.0,
-  "load_avg_1m": 66.477,
-  "window": [
-   1920,
-   930
-  ]
- },
- "metrics": {
-  "startup.title_ms": {
-   "n": 3,
-   "mean": 49895.61,
-   "stdev": 37830.08,
-   "min": 27410.441,
-   "max": 93571.631,
-   "ci95": 93982.713
-  },
-  "startup.world_ms": {
-   "n": 3,
-   "mean": 89080.61,
-   "stdev": 49418.222,
-   "min": 59243.441,
-   "max": 146123.631,
-   "ci95": 122771.577
-  },
-  "chunks.village.load_ms": {
-   "n": 3,
-   "mean": 29280.957,
-   "stdev": 15620.91,
-   "min": 18681.538,
-   "max": 47219.974,
-   "ci95": 38807.625
-  },
-  "fps.village.avg_fps": {
-   "n": 3,
-   "mean": 42.245,
-   "stdev": 6.241,
-   "min": 36.416,
-   "max": 48.83,
-   "ci95": 15.506
-  },
-  "fps.village.low_1pct_fps": {
-   "n": 3,
-   "mean": 4.137,
-   "stdev": 1.2,
-   "min": 3.03,
-   "max": 5.412,
-   "ci95": 2.981
-  },
-  "fps.village.low_01pct_fps": {
-   "n": 3,
-   "mean": 2.891,
-   "stdev": 0.196,
-   "min": 2.777,
-   "max": 3.118,
-   "ci95": 0.488
-  },
-  "chunks.forest.load_ms": {
-   "n": 3,
-   "mean": 16212.425,
-   "stdev": 1584.155,
-   "min": 14800.702,
-   "max": 17925.672,
-   "ci95": 3935.576
-  },
-  "fps.forest.avg_fps": {
-   "n": 3,
-   "mean": 66.392,
-   "stdev": 8.735,
-   "min": 57.65,
-   "max": 75.119,
-   "ci95": 21.699
-  },
-  "fps.forest.low_1pct_fps": {
-   "n": 3,
-   "mean": 8.327,
-   "stdev": 3.862,
-   "min": 6.012,
-   "max": 12.786,
-   "ci95": 9.595
-  },
-  "fps.forest.low_01pct_fps": {
-   "n": 3,
-   "mean": 6.154,
-   "stdev": 3.399,
-   "min": 3.873,
-   "max": 10.06,
-   "ci95": 8.444
-  },
-  "chunks.ocean.load_ms": {
-   "n": 3,
-   "mean": 9054.345,
-   "stdev": 1795.805,
-   "min": 7429.882,
-   "max": 10982.71,
-   "ci95": 4461.386
-  },
-  "fps.ocean.avg_fps": {
-   "n": 3,
-   "mean": 49.891,
-   "stdev": 17.901,
-   "min": 29.637,
-   "max": 63.591,
-   "ci95": 44.472
-  },
-  "fps.ocean.low_1pct_fps": {
-   "n": 3,
-   "mean": 6.144,
-   "stdev": 5.262,
-   "min": 2.948,
-   "max": 12.218,
-   "ci95": 13.074
-  },
-  "fps.ocean.low_01pct_fps": {
-   "n": 3,
-   "mean": 5.254,
-   "stdev": 4.377,
-   "min": 2.603,
-   "max": 10.306,
-   "ci95": 10.874
-  },
-  "chunks.mountain.load_ms": {
-   "n": 3,
-   "mean": 18171.415,
-   "stdev": 5234.921,
-   "min": 12170.39,
-   "max": 21800.551,
-   "ci95": 13005.314
-  },
-  "fps.mountain.avg_fps": {
-   "n": 3,
-   "mean": 45.9,
-   "stdev": 14.757,
-   "min": 29.055,
-   "max": 56.549,
-   "ci95": 36.661
-  },
-  "fps.mountain.low_1pct_fps": {
-   "n": 3,
-   "mean": 4.83,
-   "stdev": 2.815,
-   "min": 2.104,
-   "max": 7.727,
-   "ci95": 6.994
-  },
-  "fps.mountain.low_01pct_fps": {
-   "n": 3,
-   "mean": 3.986,
-   "stdev": 2.385,
-   "min": 1.597,
-   "max": 6.366,
-   "ci95": 5.924
-  },
-  "memory.rss_peak_mb": {
-   "n": 3,
-   "mean": 1877.276,
-   "stdev": 149.19,
-   "min": 1724.094,
-   "max": 2022.125,
-   "ci95": 370.639
-  },
-  "memory.rss_steady_mb": {
-   "n": 3,
-   "mean": 1810.693,
-   "stdev": 157.376,
-   "min": 1671.984,
-   "max": 1981.719,
-   "ci95": 390.975
-  },
-  "memory.footprint_peak_mb": {
-   "n": 3,
-   "mean": 2708.649,
-   "stdev": 200.476,
-   "min": 2538.472,
-   "max": 2929.644,
-   "ci95": 498.051
-  },
-  "memory.footprint_steady_mb": {
-   "n": 3,
-   "mean": 2635.498,
-   "stdev": 241.221,
-   "min": 2402.909,
-   "max": 2884.511,
-   "ci95": 599.274
-  }
- },
- "frames": [
-  {
-   "phase": "village",
-   "repeat": 0,
-   "frames": 586,
-   "seconds": 12.001,
-   "avg_fps": 48.83,
-   "low_1pct_fps": 3.03,
-   "low_01pct_fps": 2.779,
-   "p50_ms": 6.298,
-   "p95_ms": 102.59,
-   "p99_ms": 300.171,
-   "p999_ms": 359.883,
-   "max_ms": 359.883,
-   "histogram": [
-    0,
-    0,
-    30,
-    105,
-    67,
-    75,
-    58,
-    68,
-    43,
-    24,
-    14,
-    15,
-    8,
-    4,
-    8,
-    4,
-    7,
-    8,
-    18,
-    11,
-    11,
-    8,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 1,
-   "frames": 498,
-   "seconds": 12.003,
-   "avg_fps": 41.489,
-   "low_1pct_fps": 5.412,
-   "low_01pct_fps": 3.118,
-   "p50_ms": 14.331,
-   "p95_ms": 81.666,
-   "p99_ms": 133.706,
-   "p999_ms": 320.73,
-   "max_ms": 320.73,
-   "histogram": [
-    0,
-    0,
-    0,
-    5,
-    15,
-    23,
-    21,
-    37,
-    43,
-    41,
-    55,
-    45,
-    50,
-    45,
-    30,
-    15,
-    18,
-    18,
-    21,
-    13,
-    2,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 2,
-   "frames": 437,
-   "seconds": 12.0,
-   "avg_fps": 36.416,
-   "low_1pct_fps": 3.97,
-   "low_01pct_fps": 2.777,
-   "p50_ms": 12.279,
-   "p95_ms": 133.385,
-   "p99_ms": 203.287,
-   "p999_ms": 360.113,
-   "max_ms": 360.113,
-   "histogram": [
-    0,
-    0,
-    0,
-    9,
-    28,
-    21,
-    19,
-    41,
-    52,
-    41,
-    31,
-    33,
-    27,
-    25,
-    27,
-    13,
-    13,
-    17,
-    12,
-    14,
-    12,
-    2,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 0,
-   "frames": 797,
-   "seconds": 12.002,
-   "avg_fps": 66.407,
-   "low_1pct_fps": 6.184,
-   "low_01pct_fps": 4.528,
-   "p50_ms": 7.208,
-   "p95_ms": 64.408,
-   "p99_ms": 126.005,
-   "p999_ms": 220.846,
-   "max_ms": 220.846,
-   "histogram": [
-    0,
-    0,
-    2,
-    22,
-    78,
-    137,
-    123,
-    136,
-    77,
-    58,
-    31,
-    14,
-    13,
-    14,
-    13,
-    10,
-    11,
-    21,
-    20,
-    13,
-    4,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 1,
-   "frames": 692,
-   "seconds": 12.003,
-   "avg_fps": 57.65,
-   "low_1pct_fps": 6.012,
-   "low_01pct_fps": 3.873,
-   "p50_ms": 10.783,
-   "p95_ms": 48.101,
-   "p99_ms": 121.963,
-   "p999_ms": 258.167,
-   "max_ms": 258.167,
-   "histogram": [
-    0,
-    0,
-    0,
-    13,
-    52,
-    52,
-    41,
-    62,
-    83,
-    88,
-    50,
-    46,
-    40,
-    50,
-    43,
-    20,
-    23,
-    9,
-    11,
-    6,
-    2,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 2,
-   "frames": 902,
-   "seconds": 12.008,
-   "avg_fps": 75.119,
-   "low_1pct_fps": 12.786,
-   "low_01pct_fps": 10.06,
-   "p50_ms": 9.096,
-   "p95_ms": 38.051,
-   "p99_ms": 67.18,
-   "p999_ms": 99.405,
-   "max_ms": 99.405,
-   "histogram": [
-    0,
-    0,
-    0,
-    26,
-    115,
-    72,
-    65,
-    100,
-    118,
-    90,
-    66,
-    51,
-    54,
-    50,
-    39,
-    16,
-    17,
-    13,
-    10,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 0,
-   "frames": 687,
-   "seconds": 12.171,
-   "avg_fps": 56.446,
-   "low_1pct_fps": 3.267,
-   "low_01pct_fps": 2.853,
-   "p50_ms": 4.938,
-   "p95_ms": 103.639,
-   "p99_ms": 257.27,
-   "p999_ms": 350.504,
-   "max_ms": 350.504,
-   "histogram": [
-    0,
-    0,
-    28,
-    199,
-    125,
-    99,
-    51,
-    35,
-    32,
-    18,
-    5,
-    7,
-    11,
-    10,
-    11,
-    6,
-    2,
-    4,
-    7,
-    14,
-    15,
-    8,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 1,
-   "frames": 764,
-   "seconds": 12.014,
-   "avg_fps": 63.591,
-   "low_1pct_fps": 12.218,
-   "low_01pct_fps": 10.306,
-   "p50_ms": 11.549,
-   "p95_ms": 45.214,
-   "p99_ms": 67.493,
-   "p999_ms": 97.034,
-   "max_ms": 97.034,
-   "histogram": [
-    0,
-    0,
-    0,
-    9,
-    45,
-    41,
-    59,
-    58,
-    87,
-    101,
-    71,
-    85,
-    42,
-    56,
-    49,
-    15,
-    16,
-    22,
-    8,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 2,
-   "frames": 357,
-   "seconds": 12.046,
-   "avg_fps": 29.637,
-   "low_1pct_fps": 2.948,
-   "low_01pct_fps": 2.603,
-   "p50_ms": 10.947,
-   "p95_ms": 173.526,
-   "p99_ms": 311.134,
-   "p999_ms": 384.135,
-   "max_ms": 384.135,
-   "histogram": [
-    0,
-    0,
-    0,
-    11,
-    47,
-    31,
-    12,
-    34,
-    32,
-    23,
-    15,
-    26,
-    21,
-    14,
-    15,
-    7,
-    6,
-    16,
-    18,
-    6,
-    15,
-    8,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 0,
-   "frames": 355,
-   "seconds": 12.218,
-   "avg_fps": 29.055,
-   "low_1pct_fps": 2.104,
-   "low_01pct_fps": 1.597,
-   "p50_ms": 7.766,
-   "p95_ms": 145.251,
-   "p99_ms": 368.51,
-   "p999_ms": 626.205,
-   "max_ms": 626.205,
-   "histogram": [
-    0,
-    0,
-    41,
-    53,
-    25,
-    28,
-    15,
-    22,
-    7,
-    16,
-    10,
-    15,
-    17,
-    12,
-    15,
-    11,
-    11,
-    8,
-    14,
-    19,
-    7,
-    7,
-    2,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 1,
-   "frames": 680,
-   "seconds": 12.025,
-   "avg_fps": 56.549,
-   "low_1pct_fps": 7.727,
-   "low_01pct_fps": 6.366,
-   "p50_ms": 11.633,
-   "p95_ms": 52.508,
-   "p99_ms": 111.848,
-   "p999_ms": 157.09,
-   "max_ms": 157.09,
-   "histogram": [
-    0,
-    0,
-    1,
-    32,
-    38,
-    43,
-    49,
-    71,
-    55,
-    55,
-    54,
-    57,
-    53,
-    41,
-    54,
-    21,
-    19,
-    17,
-    12,
-    7,
-    1,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 2,
-   "frames": 632,
-   "seconds": 12.132,
-   "avg_fps": 52.095,
-   "low_1pct_fps": 4.66,
-   "low_01pct_fps": 3.995,
-   "p50_ms": 8.601,
-   "p95_ms": 78.611,
-   "p99_ms": 172.405,
-   "p999_ms": 250.342,
-   "max_ms": 250.342,
-   "histogram": [
-    0,
-    0,
-    9,
-    75,
-    86,
-    53,
-    32,
-    57,
-    40,
-    41,
-    30,
-    38,
-    25,
-    24,
-    39,
-    16,
-    23,
-    7,
-    12,
-    15,
-    9,
-    1,
-    0,
-    0
-   ]
-  }
- ],
- "label": "vanilla-m4pro-1080p"
-}

benchmarks/perf/vanilla-mods-m4pro-1080p-rd16.json

@@ -1,723 +0,0 @@
-{
- "format": "horizon-benchmark-report",
- "version": 1,
- "kind": "game",
- "created": "2026-11-01T22:55:52Z",
- "app": {
-  "name": "minecraft",
-  "version": "26.3",
-  "mods": [
-   {
-    "name": "fabric-loader",
-    "version": "0.19.5"
-   },
-   {
-    "name": "sodium",
-    "version": "mc26.3-0.9.2-fabric"
-   },
-   {
-    "name": "lithium",
-    "version": "mc26.3-0.26.2-fabric"
-   },
-   {
-    "name": "ferrite-core",
-    "version": "9.0.0-fabric"
-   },
-   {
-    "name": "immediatelyfast",
-    "version": "1.17.1+26.3-fabric"
-   }
-  ]
- },
- "hardware": {
-  "os": "macos",
-  "arch": "aarch64",
-  "cpu_threads": 14,
-  "os_version": "27.0.1",
-  "cpu": "Apple M4 Pro",
-  "ram_mb": 65536,
-  "gpu": {
-   "name": "Apple M4 Pro",
-   "vendor": "Apple",
-   "driver": "4.1 Metal - 91.7",
-   "backend": "opengl",
-   "kind": ""
-  }
- },
- "conditions": {
-  "scenario": "perf_bench:village,forest,ocean,mountain",
-  "seed": "1234",
-  "render_distance": 16,
-  "simulation_distance": 12,
-  "vsync": false,
-  "offscreen": true,
-  "repeats": 3,
-  "warmup_s": 2.0,
-  "load_avg_1m": 69.878,
-  "window": [
-   1920,
-   930
-  ]
- },
- "metrics": {
-  "startup.title_ms": {
-   "n": 3,
-   "mean": 23843.039,
-   "stdev": 7524.513,
-   "min": 16643.766,
-   "max": 31655.294,
-   "ci95": 18693.436
-  },
-  "startup.world_ms": {
-   "n": 3,
-   "mean": 76908.706,
-   "stdev": 36719.804,
-   "min": 45051.766,
-   "max": 117069.294,
-   "ci95": 91224.412
-  },
-  "chunks.village.load_ms": {
-   "n": 3,
-   "mean": 19608.485,
-   "stdev": 9449.035,
-   "min": 13510.149,
-   "max": 30492.958,
-   "ci95": 23474.6
-  },
-  "fps.village.avg_fps": {
-   "n": 3,
-   "mean": 46.159,
-   "stdev": 17.954,
-   "min": 31.413,
-   "max": 66.152,
-   "ci95": 44.604
-  },
-  "fps.village.low_1pct_fps": {
-   "n": 3,
-   "mean": 6.544,
-   "stdev": 3.452,
-   "min": 3.225,
-   "max": 10.116,
-   "ci95": 8.577
-  },
-  "fps.village.low_01pct_fps": {
-   "n": 3,
-   "mean": 4.689,
-   "stdev": 1.808,
-   "min": 2.647,
-   "max": 6.085,
-   "ci95": 4.491
-  },
-  "chunks.forest.load_ms": {
-   "n": 3,
-   "mean": 23344.685,
-   "stdev": 5493.145,
-   "min": 17038.709,
-   "max": 27089.821,
-   "ci95": 13646.83
-  },
-  "fps.forest.avg_fps": {
-   "n": 3,
-   "mean": 61.892,
-   "stdev": 37.939,
-   "min": 22.354,
-   "max": 98.0,
-   "ci95": 94.254
-  },
-  "fps.forest.low_1pct_fps": {
-   "n": 3,
-   "mean": 9.736,
-   "stdev": 8.597,
-   "min": 2.296,
-   "max": 19.148,
-   "ci95": 21.359
-  },
-  "fps.forest.low_01pct_fps": {
-   "n": 3,
-   "mean": 6.651,
-   "stdev": 5.574,
-   "min": 2.202,
-   "max": 12.903,
-   "ci95": 13.847
-  },
-  "chunks.ocean.load_ms": {
-   "n": 3,
-   "mean": 27267.052,
-   "stdev": 21587.34,
-   "min": 10640.097,
-   "max": 51663.797,
-   "ci95": 53630.253
-  },
-  "fps.ocean.avg_fps": {
-   "n": 3,
-   "mean": 75.493,
-   "stdev": 63.885,
-   "min": 25.975,
-   "max": 147.604,
-   "ci95": 158.711
-  },
-  "fps.ocean.low_1pct_fps": {
-   "n": 3,
-   "mean": 13.396,
-   "stdev": 13.366,
-   "min": 4.634,
-   "max": 28.78,
-   "ci95": 33.205
-  },
-  "fps.ocean.low_01pct_fps": {
-   "n": 3,
-   "mean": 7.356,
-   "stdev": 6.609,
-   "min": 3.26,
-   "max": 14.98,
-   "ci95": 16.418
-  },
-  "chunks.mountain.load_ms": {
-   "n": 3,
-   "mean": 38284.867,
-   "stdev": 4237.4,
-   "min": 33922.931,
-   "max": 42385.65,
-   "ci95": 10527.134
-  },
-  "fps.mountain.avg_fps": {
-   "n": 3,
-   "mean": 35.918,
-   "stdev": 17.742,
-   "min": 18.135,
-   "max": 53.619,
-   "ci95": 44.077
-  },
-  "fps.mountain.low_1pct_fps": {
-   "n": 3,
-   "mean": 3.999,
-   "stdev": 2.132,
-   "min": 2.453,
-   "max": 6.431,
-   "ci95": 5.297
-  },
-  "fps.mountain.low_01pct_fps": {
-   "n": 3,
-   "mean": 3.017,
-   "stdev": 1.831,
-   "min": 1.775,
-   "max": 5.12,
-   "ci95": 4.549
-  },
-  "memory.rss_peak_mb": {
-   "n": 3,
-   "mean": 2566.339,
-   "stdev": 218.228,
-   "min": 2339.094,
-   "max": 2774.266,
-   "ci95": 542.153
-  },
-  "memory.rss_steady_mb": {
-   "n": 3,
-   "mean": 2354.852,
-   "stdev": 240.105,
-   "min": 2082.984,
-   "max": 2537.867,
-   "ci95": 596.503
-  },
-  "memory.footprint_peak_mb": {
-   "n": 3,
-   "mean": 3430.598,
-   "stdev": 77.063,
-   "min": 3345.395,
-   "max": 3495.426,
-   "ci95": 191.451
-  },
-  "memory.footprint_steady_mb": {
-   "n": 3,
-   "mean": 3211.931,
-   "stdev": 99.984,
-   "min": 3124.098,
-   "max": 3320.738,
-   "ci95": 248.394
-  }
- },
- "frames": [
-  {
-   "phase": "village",
-   "repeat": 0,
-   "frames": 377,
-   "seconds": 12.002,
-   "avg_fps": 31.413,
-   "low_1pct_fps": 3.225,
-   "low_01pct_fps": 2.647,
-   "p50_ms": 15.145,
-   "p95_ms": 128.716,
-   "p99_ms": 276.685,
-   "p999_ms": 377.749,
-   "max_ms": 377.749,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    17,
-    26,
-    21,
-    30,
-    23,
-    43,
-    16,
-    25,
-    28,
-    28,
-    35,
-    16,
-    14,
-    12,
-    15,
-    13,
-    11,
-    4,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 1,
-   "frames": 794,
-   "seconds": 12.003,
-   "avg_fps": 66.152,
-   "low_1pct_fps": 10.116,
-   "low_01pct_fps": 6.085,
-   "p50_ms": 11.137,
-   "p95_ms": 41.078,
-   "p99_ms": 73.531,
-   "p999_ms": 164.347,
-   "max_ms": 164.347,
-   "histogram": [
-    0,
-    0,
-    0,
-    20,
-    57,
-    65,
-    52,
-    70,
-    82,
-    88,
-    80,
-    67,
-    53,
-    48,
-    52,
-    18,
-    20,
-    10,
-    10,
-    1,
-    1,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 2,
-   "frames": 491,
-   "seconds": 12.001,
-   "avg_fps": 40.912,
-   "low_1pct_fps": 6.291,
-   "low_01pct_fps": 5.336,
-   "p50_ms": 15.962,
-   "p95_ms": 71.604,
-   "p99_ms": 137.056,
-   "p999_ms": 187.401,
-   "max_ms": 187.401,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    1,
-    5,
-    10,
-    32,
-    54,
-    60,
-    45,
-    49,
-    44,
-    49,
-    50,
-    22,
-    21,
-    20,
-    18,
-    8,
-    3,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 0,
-   "frames": 784,
-   "seconds": 12.002,
-   "avg_fps": 65.322,
-   "low_1pct_fps": 7.763,
-   "low_01pct_fps": 4.848,
-   "p50_ms": 10.024,
-   "p95_ms": 43.46,
-   "p99_ms": 94.19,
-   "p999_ms": 206.286,
-   "max_ms": 206.286,
-   "histogram": [
-    0,
-    0,
-    0,
-    17,
-    40,
-    69,
-    80,
-    95,
-    88,
-    82,
-    53,
-    58,
-    39,
-    49,
-    52,
-    21,
-    15,
-    14,
-    7,
-    3,
-    2,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 1,
-   "frames": 1176,
-   "seconds": 12.0,
-   "avg_fps": 98.0,
-   "low_1pct_fps": 19.148,
-   "low_01pct_fps": 12.903,
-   "p50_ms": 6.214,
-   "p95_ms": 30.125,
-   "p99_ms": 41.199,
-   "p999_ms": 73.675,
-   "max_ms": 81.328,
-   "histogram": [
-    0,
-    0,
-    3,
-    179,
-    205,
-    175,
-    115,
-    111,
-    79,
-    39,
-    21,
-    25,
-    34,
-    79,
-    77,
-    20,
-    10,
-    2,
-    2,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 2,
-   "frames": 271,
-   "seconds": 12.123,
-   "avg_fps": 22.354,
-   "low_1pct_fps": 2.296,
-   "low_01pct_fps": 2.202,
-   "p50_ms": 14.989,
-   "p95_ms": 214.282,
-   "p99_ms": 404.5,
-   "p999_ms": 454.134,
-   "max_ms": 454.134,
-   "histogram": [
-    0,
-    0,
-    0,
-    1,
-    5,
-    18,
-    19,
-    19,
-    28,
-    28,
-    13,
-    19,
-    20,
-    12,
-    21,
-    14,
-    5,
-    8,
-    4,
-    9,
-    18,
-    10,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 0,
-   "frames": 1772,
-   "seconds": 12.005,
-   "avg_fps": 147.604,
-   "low_1pct_fps": 28.78,
-   "low_01pct_fps": 14.98,
-   "p50_ms": 5.328,
-   "p95_ms": 15.261,
-   "p99_ms": 25.961,
-   "p999_ms": 58.586,
-   "max_ms": 74.925,
-   "histogram": [
-    0,
-    0,
-    34,
-    421,
-    331,
-    290,
-    175,
-    163,
-    122,
-    83,
-    44,
-    33,
-    26,
-    28,
-    16,
-    2,
-    2,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 1,
-   "frames": 635,
-   "seconds": 12.004,
-   "avg_fps": 52.9,
-   "low_1pct_fps": 6.774,
-   "low_01pct_fps": 3.828,
-   "p50_ms": 9.578,
-   "p95_ms": 61.195,
-   "p99_ms": 112.118,
-   "p999_ms": 261.228,
-   "max_ms": 261.228,
-   "histogram": [
-    0,
-    0,
-    0,
-    38,
-    49,
-    64,
-    63,
-    63,
-    51,
-    60,
-    27,
-    29,
-    27,
-    17,
-    37,
-    28,
-    30,
-    27,
-    15,
-    8,
-    1,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 2,
-   "frames": 312,
-   "seconds": 12.011,
-   "avg_fps": 25.975,
-   "low_1pct_fps": 4.634,
-   "low_01pct_fps": 3.26,
-   "p50_ms": 24.629,
-   "p95_ms": 115.493,
-   "p99_ms": 169.827,
-   "p999_ms": 306.737,
-   "max_ms": 306.737,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    2,
-    5,
-    10,
-    10,
-    24,
-    39,
-    33,
-    38,
-    47,
-    16,
-    16,
-    21,
-    23,
-    22,
-    5,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 0,
-   "frames": 218,
-   "seconds": 12.021,
-   "avg_fps": 18.135,
-   "low_1pct_fps": 2.453,
-   "low_01pct_fps": 2.156,
-   "p50_ms": 17.447,
-   "p95_ms": 257.129,
-   "p99_ms": 377.63,
-   "p999_ms": 463.802,
-   "max_ms": 463.802,
-   "histogram": [
-    0,
-    0,
-    7,
-    13,
-    15,
-    18,
-    11,
-    9,
-    7,
-    16,
-    8,
-    3,
-    11,
-    10,
-    14,
-    7,
-    5,
-    16,
-    8,
-    15,
-    12,
-    13,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 1,
-   "frames": 653,
-   "seconds": 12.179,
-   "avg_fps": 53.619,
-   "low_1pct_fps": 6.431,
-   "low_01pct_fps": 5.12,
-   "p50_ms": 8.427,
-   "p95_ms": 58.968,
-   "p99_ms": 141.423,
-   "p999_ms": 195.302,
-   "max_ms": 195.302,
-   "histogram": [
-    0,
-    0,
-    0,
-    38,
-    66,
-    76,
-    79,
-    64,
-    45,
-    38,
-    20,
-    29,
-    22,
-    24,
-    46,
-    25,
-    36,
-    17,
-    14,
-    10,
-    4,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 2,
-   "frames": 432,
-   "seconds": 12.0,
-   "avg_fps": 35.999,
-   "low_1pct_fps": 3.112,
-   "low_01pct_fps": 1.775,
-   "p50_ms": 16.724,
-   "p95_ms": 83.13,
-   "p99_ms": 220.496,
-   "p999_ms": 563.493,
-   "max_ms": 563.493,
-   "histogram": [
-    0,
-    0,
-    0,
-    7,
-    14,
-    17,
-    23,
-    35,
-    35,
-    26,
-    24,
-    33,
-    34,
-    43,
-    43,
-    23,
-    27,
-    20,
-    15,
-    5,
-    4,
-    3,
-    1,
-    0
-   ]
-  }
- ],
- "label": "vanilla-mods-m4pro-1080p"
-}

benchmarks/perf/vanilla-mods-m4pro-1080p-rd32.json

@@ -1,723 +0,0 @@
-{
- "format": "horizon-benchmark-report",
- "version": 1,
- "kind": "game",
- "created": "2026-11-01T23:17:23Z",
- "app": {
-  "name": "minecraft",
-  "version": "26.3",
-  "mods": [
-   {
-    "name": "fabric-loader",
-    "version": "0.19.5"
-   },
-   {
-    "name": "sodium",
-    "version": "mc26.3-0.9.2-fabric"
-   },
-   {
-    "name": "lithium",
-    "version": "mc26.3-0.26.2-fabric"
-   },
-   {
-    "name": "ferrite-core",
-    "version": "9.0.0-fabric"
-   },
-   {
-    "name": "immediatelyfast",
-    "version": "1.17.1+26.3-fabric"
-   }
-  ]
- },
- "hardware": {
-  "os": "macos",
-  "arch": "aarch64",
-  "cpu_threads": 14,
-  "os_version": "27.0.1",
-  "cpu": "Apple M4 Pro",
-  "ram_mb": 65536,
-  "gpu": {
-   "name": "Apple M4 Pro",
-   "vendor": "Apple",
-   "driver": "4.1 Metal - 91.7",
-   "backend": "opengl",
-   "kind": ""
-  }
- },
- "conditions": {
-  "scenario": "perf_bench:village,forest,ocean,mountain",
-  "seed": "1234",
-  "render_distance": 32,
-  "simulation_distance": 12,
-  "vsync": false,
-  "offscreen": true,
-  "repeats": 3,
-  "warmup_s": 2.0,
-  "load_avg_1m": 37.185,
-  "window": [
-   1920,
-   930
-  ]
- },
- "metrics": {
-  "startup.title_ms": {
-   "n": 3,
-   "mean": 13521.661,
-   "stdev": 573.908,
-   "min": 13085.942,
-   "max": 14171.935,
-   "ci95": 1425.783
-  },
-  "startup.world_ms": {
-   "n": 3,
-   "mean": 63229.994,
-   "stdev": 6185.388,
-   "min": 56237.942,
-   "max": 67987.935,
-   "ci95": 15366.595
-  },
-  "chunks.village.load_ms": {
-   "n": 3,
-   "mean": 14807.746,
-   "stdev": 2020.358,
-   "min": 13414.414,
-   "max": 17124.849,
-   "ci95": 5019.253
-  },
-  "fps.village.avg_fps": {
-   "n": 3,
-   "mean": 91.753,
-   "stdev": 11.452,
-   "min": 78.555,
-   "max": 99.067,
-   "ci95": 28.451
-  },
-  "fps.village.low_1pct_fps": {
-   "n": 3,
-   "mean": 13.105,
-   "stdev": 2.514,
-   "min": 10.354,
-   "max": 15.282,
-   "ci95": 6.244
-  },
-  "fps.village.low_01pct_fps": {
-   "n": 3,
-   "mean": 9.203,
-   "stdev": 1.382,
-   "min": 7.689,
-   "max": 10.396,
-   "ci95": 3.432
-  },
-  "chunks.forest.load_ms": {
-   "n": 3,
-   "mean": 24180.167,
-   "stdev": 777.711,
-   "min": 23290.973,
-   "max": 24733.555,
-   "ci95": 1932.098
-  },
-  "fps.forest.avg_fps": {
-   "n": 3,
-   "mean": 113.871,
-   "stdev": 53.305,
-   "min": 56.542,
-   "max": 161.938,
-   "ci95": 132.428
-  },
-  "fps.forest.low_1pct_fps": {
-   "n": 3,
-   "mean": 28.748,
-   "stdev": 17.633,
-   "min": 12.823,
-   "max": 47.698,
-   "ci95": 43.807
-  },
-  "fps.forest.low_01pct_fps": {
-   "n": 3,
-   "mean": 20.551,
-   "stdev": 13.547,
-   "min": 8.937,
-   "max": 35.433,
-   "ci95": 33.655
-  },
-  "chunks.ocean.load_ms": {
-   "n": 3,
-   "mean": 19314.547,
-   "stdev": 5853.258,
-   "min": 15068.272,
-   "max": 25991.528,
-   "ci95": 14541.473
-  },
-  "fps.ocean.avg_fps": {
-   "n": 3,
-   "mean": 119.116,
-   "stdev": 71.027,
-   "min": 45.498,
-   "max": 187.231,
-   "ci95": 176.454
-  },
-  "fps.ocean.low_1pct_fps": {
-   "n": 3,
-   "mean": 31.721,
-   "stdev": 26.624,
-   "min": 8.585,
-   "max": 60.822,
-   "ci95": 66.144
-  },
-  "fps.ocean.low_01pct_fps": {
-   "n": 3,
-   "mean": 16.8,
-   "stdev": 14.937,
-   "min": 5.876,
-   "max": 33.821,
-   "ci95": 37.109
-  },
-  "chunks.mountain.load_ms": {
-   "n": 3,
-   "mean": 61290.415,
-   "stdev": 15063.343,
-   "min": 49453.256,
-   "max": 78246.003,
-   "ci95": 37422.439
-  },
-  "fps.mountain.avg_fps": {
-   "n": 3,
-   "mean": 56.905,
-   "stdev": 19.674,
-   "min": 37.807,
-   "max": 77.109,
-   "ci95": 48.878
-  },
-  "fps.mountain.low_1pct_fps": {
-   "n": 3,
-   "mean": 7.384,
-   "stdev": 0.62,
-   "min": 6.67,
-   "max": 7.784,
-   "ci95": 1.539
-  },
-  "fps.mountain.low_01pct_fps": {
-   "n": 3,
-   "mean": 3.48,
-   "stdev": 1.306,
-   "min": 2.526,
-   "max": 4.968,
-   "ci95": 3.244
-  },
-  "memory.rss_peak_mb": {
-   "n": 3,
-   "mean": 4078.01,
-   "stdev": 79.593,
-   "min": 4020.391,
-   "max": 4168.828,
-   "ci95": 197.735
-  },
-  "memory.rss_steady_mb": {
-   "n": 3,
-   "mean": 3705.104,
-   "stdev": 149.415,
-   "min": 3541.375,
-   "max": 3834.078,
-   "ci95": 371.196
-  },
-  "memory.footprint_peak_mb": {
-   "n": 3,
-   "mean": 5250.386,
-   "stdev": 54.229,
-   "min": 5200.662,
-   "max": 5308.208,
-   "ci95": 134.723
-  },
-  "memory.footprint_steady_mb": {
-   "n": 3,
-   "mean": 4647.172,
-   "stdev": 29.179,
-   "min": 4613.552,
-   "max": 4665.911,
-   "ci95": 72.492
-  }
- },
- "frames": [
-  {
-   "phase": "village",
-   "repeat": 0,
-   "frames": 1172,
-   "seconds": 12.004,
-   "avg_fps": 97.637,
-   "low_1pct_fps": 15.282,
-   "low_01pct_fps": 10.396,
-   "p50_ms": 7.394,
-   "p95_ms": 26.126,
-   "p99_ms": 50.505,
-   "p999_ms": 79.614,
-   "max_ms": 112.764,
-   "histogram": [
-    0,
-    0,
-    0,
-    24,
-    111,
-    198,
-    193,
-    170,
-    129,
-    109,
-    59,
-    42,
-    43,
-    23,
-    38,
-    10,
-    10,
-    7,
-    5,
-    1,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 1,
-   "frames": 1189,
-   "seconds": 12.002,
-   "avg_fps": 99.067,
-   "low_1pct_fps": 13.678,
-   "low_01pct_fps": 9.523,
-   "p50_ms": 7.061,
-   "p95_ms": 28.029,
-   "p99_ms": 58.166,
-   "p999_ms": 103.326,
-   "max_ms": 106.682,
-   "histogram": [
-    0,
-    0,
-    0,
-    59,
-    132,
-    223,
-    172,
-    171,
-    107,
-    90,
-    59,
-    39,
-    36,
-    28,
-    35,
-    14,
-    9,
-    9,
-    4,
-    2,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 2,
-   "frames": 943,
-   "seconds": 12.004,
-   "avg_fps": 78.555,
-   "low_1pct_fps": 10.354,
-   "low_01pct_fps": 7.689,
-   "p50_ms": 8.817,
-   "p95_ms": 31.62,
-   "p99_ms": 70.58,
-   "p999_ms": 130.049,
-   "max_ms": 130.049,
-   "histogram": [
-    0,
-    0,
-    0,
-    8,
-    34,
-    97,
-    118,
-    168,
-    126,
-    106,
-    69,
-    58,
-    49,
-    36,
-    32,
-    8,
-    9,
-    13,
-    8,
-    4,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 0,
-   "frames": 679,
-   "seconds": 12.009,
-   "avg_fps": 56.542,
-   "low_1pct_fps": 12.823,
-   "low_01pct_fps": 8.937,
-   "p50_ms": 14.344,
-   "p95_ms": 42.09,
-   "p99_ms": 65.756,
-   "p999_ms": 111.897,
-   "max_ms": 111.897,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    2,
-    33,
-    50,
-    62,
-    68,
-    60,
-    48,
-    67,
-    84,
-    76,
-    64,
-    27,
-    18,
-    14,
-    5,
-    1,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 1,
-   "frames": 1478,
-   "seconds": 12.003,
-   "avg_fps": 123.133,
-   "low_1pct_fps": 25.723,
-   "low_01pct_fps": 17.282,
-   "p50_ms": 6.388,
-   "p95_ms": 17.972,
-   "p99_ms": 29.029,
-   "p999_ms": 57.659,
-   "max_ms": 58.069,
-   "histogram": [
-    0,
-    0,
-    0,
-    3,
-    336,
-    298,
-    222,
-    186,
-    144,
-    77,
-    70,
-    57,
-    39,
-    23,
-    13,
-    5,
-    3,
-    2,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 2,
-   "frames": 1944,
-   "seconds": 12.005,
-   "avg_fps": 161.938,
-   "low_1pct_fps": 47.698,
-   "low_01pct_fps": 35.433,
-   "p50_ms": 5.168,
-   "p95_ms": 12.12,
-   "p99_ms": 17.337,
-   "p999_ms": 26.48,
-   "max_ms": 29.965,
-   "histogram": [
-    0,
-    0,
-    0,
-    18,
-    793,
-    527,
-    243,
-    125,
-    91,
-    47,
-    41,
-    34,
-    15,
-    7,
-    3,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 0,
-   "frames": 548,
-   "seconds": 12.044,
-   "avg_fps": 45.498,
-   "low_1pct_fps": 8.585,
-   "low_01pct_fps": 5.876,
-   "p50_ms": 15.416,
-   "p95_ms": 62.523,
-   "p99_ms": 98.757,
-   "p999_ms": 170.17,
-   "max_ms": 170.17,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    2,
-    15,
-    26,
-    52,
-    53,
-    58,
-    37,
-    56,
-    39,
-    58,
-    60,
-    27,
-    24,
-    18,
-    21,
-    1,
-    1,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 1,
-   "frames": 1496,
-   "seconds": 12.005,
-   "avg_fps": 124.619,
-   "low_1pct_fps": 25.756,
-   "low_01pct_fps": 10.702,
-   "p50_ms": 6.649,
-   "p95_ms": 15.751,
-   "p99_ms": 26.208,
-   "p999_ms": 76.546,
-   "max_ms": 110.33,
-   "histogram": [
-    0,
-    0,
-    0,
-    15,
-    250,
-    299,
-    266,
-    216,
-    163,
-    115,
-    68,
-    40,
-    32,
-    13,
-    14,
-    3,
-    0,
-    0,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 2,
-   "frames": 2247,
-   "seconds": 12.001,
-   "avg_fps": 187.231,
-   "low_1pct_fps": 60.822,
-   "low_01pct_fps": 33.821,
-   "p50_ms": 4.73,
-   "p95_ms": 8.497,
-   "p99_ms": 12.315,
-   "p999_ms": 21.724,
-   "max_ms": 42.26,
-   "histogram": [
-    0,
-    0,
-    0,
-    347,
-    987,
-    453,
-    211,
-    122,
-    67,
-    32,
-    15,
-    6,
-    4,
-    2,
-    0,
-    0,
-    1,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 0,
-   "frames": 670,
-   "seconds": 12.007,
-   "avg_fps": 55.799,
-   "low_1pct_fps": 7.784,
-   "low_01pct_fps": 2.526,
-   "p50_ms": 12.887,
-   "p95_ms": 45.129,
-   "p99_ms": 76.315,
-   "p999_ms": 395.821,
-   "max_ms": 395.821,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    16,
-    54,
-    79,
-    75,
-    81,
-    68,
-    60,
-    53,
-    70,
-    54,
-    17,
-    16,
-    9,
-    17,
-    0,
-    0,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 1,
-   "frames": 455,
-   "seconds": 12.035,
-   "avg_fps": 37.807,
-   "low_1pct_fps": 6.67,
-   "low_01pct_fps": 4.968,
-   "p50_ms": 15.986,
-   "p95_ms": 82.012,
-   "p99_ms": 117.987,
-   "p999_ms": 201.279,
-   "max_ms": 201.279,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    3,
-    27,
-    37,
-    47,
-    49,
-    37,
-    39,
-    31,
-    39,
-    34,
-    20,
-    24,
-    30,
-    26,
-    10,
-    2,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 2,
-   "frames": 933,
-   "seconds": 12.1,
-   "avg_fps": 77.109,
-   "low_1pct_fps": 7.697,
-   "low_01pct_fps": 2.946,
-   "p50_ms": 8.593,
-   "p95_ms": 34.696,
-   "p99_ms": 79.266,
-   "p999_ms": 339.486,
-   "max_ms": 339.486,
-   "histogram": [
-    0,
-    0,
-    0,
-    0,
-    0,
-    45,
-    176,
-    209,
-    196,
-    95,
-    45,
-    43,
-    26,
-    19,
-    30,
-    9,
-    9,
-    14,
-    13,
-    2,
-    1,
-    1,
-    0,
-    0
-   ]
-  }
- ],
- "label": "vanilla-mods-m4pro-1080p"
-}

benchmarks/perf/vanilla-mods-m4pro-1080p-rd8.json

@@ -1,723 +0,0 @@
-{
- "format": "horizon-benchmark-report",
- "version": 1,
- "kind": "game",
- "created": "2026-11-01T22:55:52Z",
- "app": {
-  "name": "minecraft",
-  "version": "26.3",
-  "mods": [
-   {
-    "name": "fabric-loader",
-    "version": "0.19.5"
-   },
-   {
-    "name": "sodium",
-    "version": "mc26.3-0.9.2-fabric"
-   },
-   {
-    "name": "lithium",
-    "version": "mc26.3-0.26.2-fabric"
-   },
-   {
-    "name": "ferrite-core",
-    "version": "9.0.0-fabric"
-   },
-   {
-    "name": "immediatelyfast",
-    "version": "1.17.1+26.3-fabric"
-   }
-  ]
- },
- "hardware": {
-  "os": "macos",
-  "arch": "aarch64",
-  "cpu_threads": 14,
-  "os_version": "27.0.1",
-  "cpu": "Apple M4 Pro",
-  "ram_mb": 65536,
-  "gpu": {
-   "name": "Apple M4 Pro",
-   "vendor": "Apple",
-   "driver": "4.1 Metal - 91.7",
-   "backend": "opengl",
-   "kind": ""
-  }
- },
- "conditions": {
-  "scenario": "perf_bench:village,forest,ocean,mountain",
-  "seed": "1234",
-  "render_distance": 8,
-  "simulation_distance": 12,
-  "vsync": false,
-  "offscreen": true,
-  "repeats": 3,
-  "warmup_s": 2.0,
-  "load_avg_1m": 74.321,
-  "window": [
-   1920,
-   930
-  ]
- },
- "metrics": {
-  "startup.title_ms": {
-   "n": 3,
-   "mean": 56311.461,
-   "stdev": 26982.658,
-   "min": 36031.835,
-   "max": 86935.815,
-   "ci95": 67034.048
-  },
-  "startup.world_ms": {
-   "n": 3,
-   "mean": 97731.794,
-   "stdev": 21691.925,
-   "min": 72951.835,
-   "max": 113284.815,
-   "ci95": 53890.078
-  },
-  "chunks.village.load_ms": {
-   "n": 3,
-   "mean": 13954.335,
-   "stdev": 10146.301,
-   "min": 7679.006,
-   "max": 25660.115,
-   "ci95": 25206.843
-  },
-  "fps.village.avg_fps": {
-   "n": 3,
-   "mean": 33.239,
-   "stdev": 18.526,
-   "min": 12.03,
-   "max": 46.264,
-   "ci95": 46.026
-  },
-  "fps.village.low_1pct_fps": {
-   "n": 3,
-   "mean": 3.772,
-   "stdev": 2.399,
-   "min": 1.734,
-   "max": 6.416,
-   "ci95": 5.96
-  },
-  "fps.village.low_01pct_fps": {
-   "n": 3,
-   "mean": 2.866,
-   "stdev": 1.762,
-   "min": 1.433,
-   "max": 4.834,
-   "ci95": 4.379
-  },
-  "chunks.forest.load_ms": {
-   "n": 3,
-   "mean": 19803.961,
-   "stdev": 14910.114,
-   "min": 8220.752,
-   "max": 36626.588,
-   "ci95": 37041.766
-  },
-  "fps.forest.avg_fps": {
-   "n": 3,
-   "mean": 47.303,
-   "stdev": 17.044,
-   "min": 32.698,
-   "max": 66.03,
-   "ci95": 42.343
-  },
-  "fps.forest.low_1pct_fps": {
-   "n": 3,
-   "mean": 4.365,
-   "stdev": 0.709,
-   "min": 3.658,
-   "max": 5.076,
-   "ci95": 1.761
-  },
-  "fps.forest.low_01pct_fps": {
-   "n": 3,
-   "mean": 3.128,
-   "stdev": 0.564,
-   "min": 2.651,
-   "max": 3.751,
-   "ci95": 1.402
-  },
-  "chunks.ocean.load_ms": {
-   "n": 3,
-   "mean": 18639.188,
-   "stdev": 8912.103,
-   "min": 11960.198,
-   "max": 28758.72,
-   "ci95": 22140.678
-  },
-  "fps.ocean.avg_fps": {
-   "n": 3,
-   "mean": 34.908,
-   "stdev": 6.372,
-   "min": 29.271,
-   "max": 41.822,
-   "ci95": 15.831
-  },
-  "fps.ocean.low_1pct_fps": {
-   "n": 3,
-   "mean": 4.614,
-   "stdev": 1.558,
-   "min": 2.986,
-   "max": 6.09,
-   "ci95": 3.869
-  },
-  "fps.ocean.low_01pct_fps": {
-   "n": 3,
-   "mean": 4.06,
-   "stdev": 1.662,
-   "min": 2.224,
-   "max": 5.463,
-   "ci95": 4.13
-  },
-  "chunks.mountain.load_ms": {
-   "n": 3,
-   "mean": 19191.558,
-   "stdev": 2902.338,
-   "min": 15845.729,
-   "max": 21030.7,
-   "ci95": 7210.388
-  },
-  "fps.mountain.avg_fps": {
-   "n": 3,
-   "mean": 67.004,
-   "stdev": 13.923,
-   "min": 51.98,
-   "max": 79.471,
-   "ci95": 34.589
-  },
-  "fps.mountain.low_1pct_fps": {
-   "n": 3,
-   "mean": 7.862,
-   "stdev": 1.987,
-   "min": 6.339,
-   "max": 10.109,
-   "ci95": 4.936
-  },
-  "fps.mountain.low_01pct_fps": {
-   "n": 3,
-   "mean": 3.993,
-   "stdev": 1.679,
-   "min": 2.06,
-   "max": 5.088,
-   "ci95": 4.172
-  },
-  "memory.rss_peak_mb": {
-   "n": 3,
-   "mean": 2019.089,
-   "stdev": 53.398,
-   "min": 1960.188,
-   "max": 2064.328,
-   "ci95": 132.657
-  },
-  "memory.rss_steady_mb": {
-   "n": 3,
-   "mean": 1927.195,
-   "stdev": 108.077,
-   "min": 1813.609,
-   "max": 2028.758,
-   "ci95": 268.5
-  },
-  "memory.footprint_peak_mb": {
-   "n": 3,
-   "mean": 2440.727,
-   "stdev": 72.508,
-   "min": 2375.394,
-   "max": 2518.738,
-   "ci95": 180.134
-  },
-  "memory.footprint_steady_mb": {
-   "n": 3,
-   "mean": 2395.53,
-   "stdev": 71.597,
-   "min": 2318.504,
-   "max": 2460.05,
-   "ci95": 177.872
-  }
- },
- "frames": [
-  {
-   "phase": "village",
-   "repeat": 0,
-   "frames": 146,
-   "seconds": 12.136,
-   "avg_fps": 12.03,
-   "low_1pct_fps": 1.734,
-   "low_01pct_fps": 1.433,
-   "p50_ms": 28.465,
-   "p95_ms": 339.625,
-   "p99_ms": 455.663,
-   "p999_ms": 697.859,
-   "max_ms": 697.859,
-   "histogram": [
-    0,
-    0,
-    1,
-    4,
-    9,
-    9,
-    5,
-    5,
-    8,
-    6,
-    5,
-    5,
-    1,
-    10,
-    9,
-    6,
-    11,
-    10,
-    5,
-    8,
-    15,
-    13,
-    1,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 1,
-   "frames": 556,
-   "seconds": 12.018,
-   "avg_fps": 46.264,
-   "low_1pct_fps": 6.416,
-   "low_01pct_fps": 4.834,
-   "p50_ms": 13.72,
-   "p95_ms": 71.774,
-   "p99_ms": 120.078,
-   "p999_ms": 206.87,
-   "max_ms": 206.87,
-   "histogram": [
-    0,
-    0,
-    0,
-    6,
-    5,
-    16,
-    22,
-    57,
-    55,
-    64,
-    62,
-    62,
-    50,
-    38,
-    29,
-    19,
-    23,
-    16,
-    21,
-    9,
-    2,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "village",
-   "repeat": 2,
-   "frames": 498,
-   "seconds": 12.022,
-   "avg_fps": 41.423,
-   "low_1pct_fps": 3.166,
-   "low_01pct_fps": 2.331,
-   "p50_ms": 7.7,
-   "p95_ms": 114.025,
-   "p99_ms": 246.232,
-   "p999_ms": 428.98,
-   "max_ms": 428.98,
-   "histogram": [
-    0,
-    0,
-    15,
-    63,
-    55,
-    58,
-    33,
-    38,
-    31,
-    22,
-    23,
-    17,
-    24,
-    24,
-    20,
-    11,
-    9,
-    10,
-    14,
-    15,
-    12,
-    4,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 0,
-   "frames": 521,
-   "seconds": 12.065,
-   "avg_fps": 43.182,
-   "low_1pct_fps": 4.362,
-   "low_01pct_fps": 3.751,
-   "p50_ms": 8.121,
-   "p95_ms": 110.621,
-   "p99_ms": 191.925,
-   "p999_ms": 266.575,
-   "max_ms": 266.575,
-   "histogram": [
-    0,
-    0,
-    1,
-    63,
-    27,
-    49,
-    61,
-    67,
-    39,
-    45,
-    27,
-    17,
-    13,
-    17,
-    7,
-    11,
-    13,
-    11,
-    18,
-    22,
-    11,
-    2,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 1,
-   "frames": 793,
-   "seconds": 12.01,
-   "avg_fps": 66.03,
-   "low_1pct_fps": 5.076,
-   "low_01pct_fps": 2.651,
-   "p50_ms": 8.218,
-   "p95_ms": 44.767,
-   "p99_ms": 143.139,
-   "p999_ms": 377.207,
-   "max_ms": 377.207,
-   "histogram": [
-    0,
-    0,
-    0,
-    60,
-    106,
-    55,
-    58,
-    127,
-    97,
-    64,
-    41,
-    28,
-    32,
-    31,
-    39,
-    12,
-    7,
-    8,
-    14,
-    9,
-    4,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "forest",
-   "repeat": 2,
-   "frames": 395,
-   "seconds": 12.08,
-   "avg_fps": 32.698,
-   "low_1pct_fps": 3.658,
-   "low_01pct_fps": 2.983,
-   "p50_ms": 10.283,
-   "p95_ms": 171.818,
-   "p99_ms": 231.998,
-   "p999_ms": 335.242,
-   "max_ms": 335.242,
-   "histogram": [
-    0,
-    0,
-    6,
-    19,
-    13,
-    27,
-    42,
-    31,
-    53,
-    36,
-    22,
-    25,
-    20,
-    19,
-    10,
-    8,
-    7,
-    6,
-    11,
-    15,
-    23,
-    2,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 0,
-   "frames": 405,
-   "seconds": 12.043,
-   "avg_fps": 33.63,
-   "low_1pct_fps": 4.765,
-   "low_01pct_fps": 4.492,
-   "p50_ms": 14.686,
-   "p95_ms": 115.893,
-   "p99_ms": 196.822,
-   "p999_ms": 222.615,
-   "max_ms": 222.615,
-   "histogram": [
-    0,
-    0,
-    0,
-    5,
-    6,
-    16,
-    18,
-    49,
-    42,
-    36,
-    22,
-    30,
-    35,
-    32,
-    23,
-    10,
-    10,
-    22,
-    22,
-    16,
-    11,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 1,
-   "frames": 502,
-   "seconds": 12.003,
-   "avg_fps": 41.822,
-   "low_1pct_fps": 6.09,
-   "low_01pct_fps": 5.463,
-   "p50_ms": 15.264,
-   "p95_ms": 76.822,
-   "p99_ms": 144.7,
-   "p999_ms": 183.045,
-   "max_ms": 183.045,
-   "histogram": [
-    0,
-    0,
-    0,
-    9,
-    14,
-    12,
-    13,
-    47,
-    43,
-    52,
-    41,
-    40,
-    52,
-    40,
-    50,
-    15,
-    26,
-    17,
-    17,
-    9,
-    5,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "ocean",
-   "repeat": 2,
-   "frames": 353,
-   "seconds": 12.06,
-   "avg_fps": 29.271,
-   "low_1pct_fps": 2.986,
-   "low_01pct_fps": 2.224,
-   "p50_ms": 10.806,
-   "p95_ms": 150.281,
-   "p99_ms": 268.607,
-   "p999_ms": 449.56,
-   "max_ms": 449.56,
-   "histogram": [
-    0,
-    0,
-    0,
-    29,
-    16,
-    24,
-    36,
-    35,
-    23,
-    31,
-    13,
-    16,
-    12,
-    18,
-    14,
-    9,
-    8,
-    16,
-    18,
-    17,
-    12,
-    6,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 0,
-   "frames": 624,
-   "seconds": 12.005,
-   "avg_fps": 51.98,
-   "low_1pct_fps": 7.137,
-   "low_01pct_fps": 5.088,
-   "p50_ms": 12.033,
-   "p95_ms": 75.22,
-   "p99_ms": 115.345,
-   "p999_ms": 196.553,
-   "max_ms": 196.553,
-   "histogram": [
-    0,
-    0,
-    4,
-    29,
-    48,
-    34,
-    38,
-    40,
-    61,
-    56,
-    50,
-    57,
-    54,
-    41,
-    33,
-    13,
-    15,
-    15,
-    28,
-    6,
-    2,
-    0,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 1,
-   "frames": 835,
-   "seconds": 12.004,
-   "avg_fps": 69.562,
-   "low_1pct_fps": 6.339,
-   "low_01pct_fps": 2.06,
-   "p50_ms": 9.818,
-   "p95_ms": 37.917,
-   "p99_ms": 81.491,
-   "p999_ms": 485.481,
-   "max_ms": 485.481,
-   "histogram": [
-    0,
-    0,
-    6,
-    62,
-    63,
-    59,
-    75,
-    84,
-    75,
-    94,
-    59,
-    77,
-    55,
-    31,
-    36,
-    27,
-    10,
-    10,
-    5,
-    5,
-    1,
-    1,
-    0,
-    0
-   ]
-  },
-  {
-   "phase": "mountain",
-   "repeat": 2,
-   "frames": 954,
-   "seconds": 12.004,
-   "avg_fps": 79.471,
-   "low_1pct_fps": 10.109,
-   "low_01pct_fps": 4.832,
-   "p50_ms": 7.91,
-   "p95_ms": 38.672,
-   "p99_ms": 79.104,
-   "p999_ms": 206.935,
-   "max_ms": 206.935,
-   "histogram": [
-    0,
-    0,
-    13,
-    55,
-    70,
-    136,
-    119,
-    109,
-    93,
-    98,
-    52,
-    49,
-    48,
-    21,
-    30,
-    17,
-    14,
-    11,
-    17,
-    1,
-    1,
-    0,
-    0,
-    0
-   ]
-  }
- ],
- "label": "vanilla-mods-m4pro-1080p"
-}

crates/cargo-horizon-mod/Cargo.toml

@@ -6,20 +6,9 @@ license.workspace = true
 rust-version = "1.86"
 description = "cargo horizon-mod new/build/run/check: make Horizon content mods (docs/mods.md)"
 
-# `cargo binstall --git https://github.com/horizon-rust/horizon cargo-horizon-mod` (#2120) reads this: the archive
-# `cargo-horizon-mod`'s workflow attaches to the `cargo-horizon-mod-v<version>` release for the runner's target,
-# holding the binary at its root. tools/horizon_mod_binstall.py expands it for the workflow's targets.
-[package.metadata.binstall]
-pkg-url = "https://github.com/horizon-rust/horizon/releases/download/cargo-horizon-mod-v{ version }/{ name }-{ target }.tar.gz"
-bin-dir = "{ bin }{ binary-ext }"
-pkg-fmt = "tgz"
-
 [dependencies]
 horizon-mods = { path = "../horizon-mods", default-features = false, features = ["index"] }
 serde_json = "1.0.151"
 
-[dev-dependencies]
-zip = { version = "9.1.3", default-features = false, features = ["deflate"] }
-
 [lints]
 workspace = true

crates/cargo-horizon-mod/src/main.rs

@@ -1,8 +1,7 @@
 //! `cargo horizon-mod`: make Horizon content mods (`docs/modpacks.md`): blocks,
 //! items, data and assets, no code. Code mods are native (docs/native-mods.md).
 //!
-//! - `new <path> [--name "Name"]`: a content mod from the template; with
-//!   `--template native [--horizon <commit>]`, a native trait mod's bundle.
+//! - `new <path> [--name "Name"]`: a content mod from the template.
 //! - `build`: the `.hmod` in `target/horizon-mod/`, with the mod's `assets/`
 //!   and `data/`.
 //! - `run [--game <horizon-client>] [-- <game args>]`: build, then play with
@@ -33,7 +32,7 @@ fn main() -> ExitCode {
         Some("run") => run(&args[1..]),
         Some("check") => check(&args[1..]),
         Some("registry") => registry::main(&args[1..]),
-        _ => Err("usage: cargo horizon-mod new <path> [--name \"Name\"] [--template content|native [--horizon <commit>]] | build | 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> [--name \"Name\"] | build | run [--game <horizon-client>] [-- <game args>] | check <file> [--kind <kind>] [--key <public key> --signature <file.minisig>] [--json] | registry build|review|check|list".into()),
     };
     match result {
         Ok(()) => ExitCode::SUCCESS,
@@ -75,11 +74,6 @@ fn new(args: &[String]) -> Result<(), String> {
         .collect();
     let name = flag(args, "--name").map_or_else(|| base.replace(['-', '_'], " "), str::to_string);
     let fill = |t: &str| t.replace("{id}", &id).replace("{name}", &name);
-    match flag(args, "--template") {
-        None | Some("content") => {}
-        Some("native") => return new_native(dir, &id, flag(args, "--horizon"), fill),
-        Some(_) => return Err("--template is content or native".into()),
-    }
     // A block copying a vanilla one, with its model, name, loot, recipe and tag.
     let files = [
         (
@@ -120,6 +114,11 @@ fn new(args: &[String]) -> Result<(), String> {
         ),
         (".gitignore", include_str!("../template/gitignore")),
     ];
+    if flag(args, "--template").is_some_and(|t| t != "content") {
+        return Err(
+            "only content mods are made here: code mods are native (docs/native-mods.md)".into(),
+        );
+    }
     for (file, text) in files {
         let file = fill(file);
         let file = file.as_str();
@@ -138,67 +137,6 @@ fn new(args: &[String]) -> Result<(), String> {
     Ok(())
 }
 
-/// A native trait mod's bundle in `dir` (docs/native-mods.md, "Trait mods"): its
-/// `horizon-mixin.toml` and an `[api]` crate with one hook. It is what the launcher
-/// builds (`native-build <dir>`) and packs as `mixins/<id>/` of a `.hnmod`
-/// (docs/api/mod-files.md). `horizon` pins the Horizon commit it is made for.
-fn new_native(
-    dir: &Path,
-    id: &str,
-    horizon: Option<&str>,
-    fill: impl Fn(&str) -> String,
-) -> Result<(), String> {
-    // `[mod] id`, as `horizon-native.json` needs it: the template keeps to its characters.
-    if id.len() > 64 {
-        return Err(format!("mod id {id}: 64 characters at most"));
-    }
-    let (compatibility, rev) = match horizon {
-        Some(commit) if horizon_mods::index::native::revision(commit) => (
-            format!("[compatibility]\nhorizon_revision = \"{commit}\"\n"),
-            format!(", rev = \"{commit}\""),
-        ),
-        Some(commit) => {
-            return Err(format!(
-                "--horizon {commit}: a Horizon commit is 40 lowercase hex digits"
-            ));
-        }
-        // Unpinned, it builds on the instance's own Horizon.
-        None => (
-            "# The Horizon commit it is made for; unpinned, it builds on the instance's own.\n\
-             # [compatibility]\n# horizon_revision = \"<40 hex digits>\"\n"
-                .to_owned(),
-            String::new(),
-        ),
-    };
-    let files = [
-        (
-            "horizon-mixin.toml",
-            include_str!("../template/native/horizon-mixin.toml"),
-        ),
-        (
-            "api/Cargo.toml",
-            include_str!("../template/native/api.toml"),
-        ),
-        ("api/src/lib.rs", include_str!("../template/native/lib.rs")),
-        (".gitignore", include_str!("../template/gitignore")),
-    ];
-    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())?;
-        let text = fill(text)
-            .replace("{compatibility}", &compatibility)
-            .replace("{rev}", &rev);
-        std::fs::write(&to, text).map_err(|e| format!("{}: {e}", to.display()))?;
-    }
-    println!(
-        "Created {} (native mod id {id}). Next: horizon-launcher native-build {} --instance <instance> --trust-native-code",
-        dir.display(),
-        dir.display()
-    );
-    Ok(())
-}
-
 /// Packs the content mod in the current folder into `target/horizon-mod/<id>.hmod`: the
 /// manifest and the files in `assets/` and `data/`.
 fn build() -> Result<PathBuf, String> {
@@ -334,68 +272,4 @@ mod tests {
         );
         std::fs::remove_dir_all(&dir).unwrap();
     }
-
-    #[test]
-    fn the_native_template_packs_into_an_hnmod_the_registry_accepts() {
-        use std::io::Write;
-        let dir = std::env::temp_dir().join(format!("horizon-mod-native-{}", std::process::id()));
-        let path = dir.join("machine-mod");
-        let commit = "0123456789abcdef0123456789abcdef01234567";
-        let args = [
-            path.display().to_string(),
-            "--template".into(),
-            "native".into(),
-            "--horizon".into(),
-            commit.into(),
-        ];
-        new(&args).unwrap();
-        let api = std::fs::read_to_string(path.join("api/Cargo.toml")).unwrap();
-        assert!(api.contains(&format!("rev = \"{commit}\"")), "{api}");
-        // Packed as the launcher packs a mod folder: the manifest, then the bundle under
-        // `mixins/<id>/` (docs/api/mod-files.md).
-        let manifest = serde_json::json!({
-            "schema": 1, "id": "machine_mod", "version": "0.1.0", "game": "26.3",
-            "horizon": commit, "mixins": "b".repeat(40),
-        });
-        let hnmod = dir.join("machine_mod.hnmod");
-        let mut zip = zip::ZipWriter::new(std::fs::File::create(&hnmod).unwrap());
-        let options = zip::write::SimpleFileOptions::default();
-        zip.start_file("horizon-native.json", options).unwrap();
-        zip.write_all(manifest.to_string().as_bytes()).unwrap();
-        for file in [
-            "horizon-mixin.toml",
-            "api/Cargo.toml",
-            "api/src/lib.rs",
-            ".gitignore",
-        ] {
-            assert!(horizon_mods::index::native::allowed(file), "{file}");
-            zip.start_file(format!("mixins/machine_mod/{file}"), options)
-                .unwrap();
-            zip.write_all(&std::fs::read(path.join(file)).unwrap())
-                .unwrap();
-        }
-        zip.finish().unwrap();
-        let report = check::check(&hnmod, check::kind_of(&hnmod).unwrap(), None, None).unwrap();
-        assert!(report.text().contains("machine_mod"), "{}", report.text());
-        // A pin that is not a commit is refused; with none, the folder builds on the
-        // instance's Horizon.
-        let bad = [
-            dir.join("bad").display().to_string(),
-            "--template".into(),
-            "native".into(),
-            "--horizon".into(),
-            "main".into(),
-        ];
-        assert!(new(&bad).unwrap_err().contains("40 lowercase hex"));
-        let free = dir.join("free");
-        new(&[
-            free.display().to_string(),
-            "--template".into(),
-            "native".into(),
-        ])
-        .unwrap();
-        let mixin = std::fs::read_to_string(free.join("horizon-mixin.toml")).unwrap();
-        assert!(!mixin.contains("\nhorizon_revision"), "{mixin}");
-        std::fs::remove_dir_all(&dir).unwrap();
-    }
 }

crates/cargo-horizon-mod/src/registry.rs

@@ -13,9 +13,7 @@ const SITE: &str = "https://horizon-rust.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>
-       cargo horizon-mod registry release <checkout> <id> <file> --tag <tag> --published <YYYY-MM-DD> [--notes <file>] [--signature <file>] [--game <version>]
-       cargo horizon-mod registry page <checkout> <id> <horizon-registry.toml>";
+       cargo horizon-mod registry list <checkout>";
 
 fn flag<'a>(args: &'a [String], name: &str) -> Option<&'a str> {
     super::flag(args, name)
@@ -156,74 +154,6 @@ pub fn main(args: &[String]) -> Result<(), String> {
             }
             Ok(())
         }
-        // A release of a project's repository, downloaded: the checks of a submission, then the
-        // version as the index lists it (JSON on stdout), for the registry's release sync.
-        Some("release") => {
-            let [checkout, id, file] = pos[..] else {
-                return Err(USAGE.into());
-            };
-            let (tag, published) = (
-                flag(rest, "--tag").ok_or(USAGE)?,
-                flag(rest, "--published").ok_or(USAGE)?,
-            );
-            let read = |name: &str| {
-                flag(rest, name)
-                    .map(|p| std::fs::read_to_string(p).map_err(|e| format!("{p}: {e}")))
-                    .transpose()
-            };
-            let (notes, signature) = (read("--notes")?, read("--signature")?);
-            let entry = entry_of(checkout, id)?;
-            let path = Path::new(file);
-            let cache = registry::Cache::read(Path::new(checkout), id)?;
-            let entry = entry.resolved(&cache.page);
-            let name = path.file_name().and_then(|n| n.to_str()).unwrap_or("");
-            crate::check::check(
-                path,
-                entry.kind.clone(),
-                entry.key.as_deref(),
-                signature.as_deref(),
-            )?;
-            let version = registry::release_version(
-                &entry,
-                &registry::Release {
-                    tag,
-                    published,
-                    notes: notes.as_deref().unwrap_or(""),
-                    asset: flag(rest, "--name").unwrap_or(name),
-                    game: flag(rest, "--game").unwrap_or("26.3"),
-                    signature: signature.as_deref(),
-                },
-                path,
-            )?;
-            println!(
-                "{}",
-                serde_json::to_string(&version).map_err(|e| e.to_string())?
-            );
-            Ok(())
-        }
-        // The page file of a project's repository, checked against its entry: the page as JSON.
-        Some("page") => {
-            let [checkout, id, file] = pos[..] else {
-                return Err(USAGE.into());
-            };
-            let entry = entry_of(checkout, id)?;
-            let text = std::fs::read_to_string(file).map_err(|e| format!("{file}: {e}"))?;
-            let page = registry::page(&entry, &text)?;
-            println!(
-                "{}",
-                serde_json::to_string(&page).map_err(|e| e.to_string())?
-            );
-            Ok(())
-        }
         _ => Err(USAGE.into()),
     }
 }
-
-/// `mods/<id>.toml` of the checkout, which must name a repository.
-fn entry_of(checkout: &str, id: &str) -> Result<registry::Entry, String> {
-    let (entries, _) = registry::load(Path::new(checkout)).map_err(lines)?;
-    entries
-        .into_iter()
-        .find(|e| e.id == id && e.repo.is_some())
-        .ok_or_else(|| format!("{id}: no entry with a repo"))
-}

crates/cargo-horizon-mod/template/content/horizon-mod.toml

@@ -3,8 +3,8 @@ name = "{name}"
 version = "0.1.0"
 description = ""
 authors = []
-# A content mod: blocks, items and mob effects from data/ and assets/, no code (API 0.2).
+# A content mod: blocks and items from data/ and assets/, no code (API 0.2).
 api = "0.2"
 side = "both"
-# registries: "May add blocks, items, mob effects and entity types to your worlds".
+# registries: "May add blocks and items to your worlds".
 capabilities = ["registries"]

crates/cargo-horizon-mod/template/native/api.toml

@@ -1,9 +0,0 @@
-[package]
-name = "mod-{id}"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-# The launcher points this at the Horizon source it builds the game from. Any other
-# dependency must be a crate and version in Horizon's Cargo.lock.
-horizon-client = { git = "https://github.com/horizon-rust/horizon"{rev} }

crates/cargo-horizon-mod/template/native/horizon-mixin.toml

@@ -1,9 +0,0 @@
-# {name}: a native trait mod (docs/native-mods.md, "Trait mods"). Build it with
-# `horizon-launcher native-build <this folder> --instance <instance> --trust-native-code`.
-[mod]
-id = "{id}"
-version = "0.1.0"
-
-{compatibility}
-[api]
-path = "api"

crates/cargo-horizon-mod/template/native/lib.rs

@@ -1,18 +0,0 @@
-//! The trait mod: the launcher links this crate into the game and calls `hooks()`. Each
-//! method of `Hooks` is one of Horizon's hook points; implement the ones the mod needs
-//! (docs/native-mods.md, "Trait mods").
-use horizon_client::mod_api::{Hooks, Host, PlayerLoggedInEvent, Text};
-
-pub fn hooks() -> Box<dyn Hooks> {
-    Box::new(Mod)
-}
-
-struct Mod;
-
-impl Hooks for Mod {
-    /// A player joined the server (NeoForge's `PlayerLoggedInEvent`): greet them.
-    fn player_logged_in(&self, host: &mut dyn Host, event: &mut PlayerLoggedInEvent<'_>) {
-        let line = format!("{id} says hello, {}!", event.name);
-        host.tell(event.player, Text::literal(line));
-    }
-}

crates/horizon-anticheat/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "horizon-anticheat"
-version = "0.1.0"
-edition.workspace = true
-license.workspace = true
-rust-version = "1.85"
-description = "The dedicated server's anticheat: its [anticheat] settings, violation levels and the checks' rules, with no game state (docs/anticheat.md)"
-
-[dependencies]
-serde = { version = "1", features = ["derive"] }
-toml = "1.1"
-
-[lints]
-workspace = true

crates/horizon-anticheat/src/combat.rs

@@ -1,99 +0,0 @@
-//! Combat: attacks vanilla's client can't send (docs/anticheat.md).
-//!
-//! Vanilla's client sends ServerboundAttackPacket from one place only, `Minecraft.startAttack`, run from
-//! `handleKeybinds` once per client tick. It attacks the entity of the tick's `hitResult`, which
-//! `Minecraft.tick` picks once before the keys are handled, so every attack of one client tick is on the
-//! same entity. And each attack swings the arm (ServerboundPunchPacket) in the same call, so a client
-//! tick never has more attacks than swings: a tick that does comes from a kill aura hiding its swing.
-//! The swing is counted before or after the attack, as older clients behind a version proxy swing
-//! first; a swing without an attack (a miss, a block) is fine.
-
-/// What breaks vanilla's way of attacking.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Foul {
-    /// A client tick with more attacks than swings: how many more.
-    NoSwing(u32),
-    /// A second entity attacked in the same client tick: the first one and this one.
-    TwoTargets(i32, i32),
-}
-
-/// The attacks of the client tick being heard.
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
-pub struct Attacks {
-    /// The entity this tick attacked first.
-    target: Option<i32>,
-    attacks: u32,
-    swings: u32,
-}
-
-impl Attacks {
-    /// ServerboundAttackPacket on entity `target`.
-    pub fn attack(&mut self, target: i32) -> Option<Foul> {
-        self.attacks = self.attacks.saturating_add(1);
-        let first = *self.target.get_or_insert(target);
-        (first != target).then_some(Foul::TwoTargets(first, target))
-    }
-
-    /// ServerboundPunchPacket: the arm swung.
-    pub fn swing(&mut self) {
-        self.swings = self.swings.saturating_add(1);
-    }
-
-    /// ServerboundClientTickEndPacket: the tick's attacks are counted, and the next tick picks its
-    /// target again.
-    pub fn tick_end(&mut self) -> Option<Foul> {
-        let unswung = self.attacks.saturating_sub(self.swings);
-        *self = Self::default();
-        (unswung > 0).then_some(Foul::NoSwing(unswung))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn a_vanilla_tick_is_clean() {
-        let mut a = Attacks::default();
-        // Two clicks in one tick on the same entity, each swung for.
-        for _ in 0..2 {
-            assert_eq!(a.attack(7), None);
-            a.swing();
-        }
-        assert_eq!(a.tick_end(), None);
-        // The next tick may attack another entity, swinging first (an older client).
-        a.swing();
-        assert_eq!(a.attack(8), None);
-        assert_eq!(a.tick_end(), None);
-        // A swing on its own (a miss, a block) is fine.
-        a.swing();
-        assert_eq!(a.tick_end(), None);
-    }
-
-    #[test]
-    fn an_attack_not_swung_for_is_caught() {
-        let mut a = Attacks::default();
-        a.attack(7);
-        assert_eq!(a.tick_end(), Some(Foul::NoSwing(1)));
-        // A swing in the tick before doesn't count for this one.
-        a.swing();
-        a.tick_end();
-        a.attack(7);
-        a.attack(7);
-        a.swing();
-        assert_eq!(a.tick_end(), Some(Foul::NoSwing(1)));
-    }
-
-    #[test]
-    fn two_entities_in_one_tick_are_caught() {
-        let mut a = Attacks::default();
-        a.attack(7);
-        a.swing();
-        assert_eq!(a.attack(8), Some(Foul::TwoTargets(7, 8)));
-        a.swing();
-        // Still against the tick's first target.
-        assert_eq!(a.attack(9), Some(Foul::TwoTargets(7, 9)));
-        a.swing();
-        assert_eq!(a.tick_end(), None);
-    }
-}

crates/horizon-anticheat/src/lib.rs

@@ -1,426 +0,0 @@
-//! The dedicated server's anticheat (docs/anticheat.md), without the game: the `[anticheat]` section of
-//! `server.toml`, each player's violation levels, and the rules of the checks. The server's hub
-//! (`horizon_client::lan`) feeds it what players send and carries out what it decides.
-//!
-//! It is on by default, and so is every check, but only the checks a vanilla client can't trip act on
-//! their own (`combat`); the others log only until they have shown no false positive with real
-//! players (their `setback`, `alert` and `kick` are 0). `enabled = false` turns the anticheat, or one
-//! check, off. A check that fails *flags* the player: its violation level (VL) rises by the flag's
-//! weight and falls back by `decay` a second. From `setback` on, the move or action is cancelled (the
-//! player is sent back where the server last had them); from `alert` on, online operators and the
-//! console are told; from `kick` on, the player is disconnected. A check's kicks are counted per player
-//! across sessions ([`Strikes`]), and the kick that reaches its `ban_after` bans the player instead
-//! (`banned-players.json`, reason "Horizon anticheat: <check>"). Any threshold at 0 turns that action
-//! off.
-//!
-//! The checks are written from vanilla 26.3's own rules and from what cheats are publicly described to
-//! do, never from another anticheat's code.
-
-use std::collections::BTreeMap;
-
-use serde::{Deserialize, Serialize};
-
-pub mod combat;
-pub mod prediction;
-pub mod timer;
-
-/// What one check's violation level leads to.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Actions {
-    pub setback: f32,
-    pub alert: f32,
-    pub kick: f32,
-    /// Violation level lost each second.
-    pub decay: f32,
-    /// The kick, counting this check's earlier ones for the player, that bans instead; 0: never.
-    pub ban_after: u32,
-}
-
-macro_rules! checks {
-    ($(
-        $(#[$doc:meta])*
-        $field:ident: $Check:ident => $Config:ident [$setback:expr, $alert:expr, $kick:expr, $decay:expr, $ban_after:expr] {
-            $( $(#[$xdoc:meta])* $extra:ident: $ty:ty = $default:expr, )*
-        }
-    )*) => {
-        /// Every check, in the order of the players' violation levels.
-        #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-        pub enum Check { $($Check,)* }
-
-        impl Check {
-            pub const ALL: &[Check] = &[$(Check::$Check,)*];
-            /// Its name in `server.toml` and in alerts.
-            pub fn name(self) -> &'static str {
-                match self { $(Check::$Check => stringify!($field),)* }
-            }
-        }
-
-        $(
-            $(#[$doc])*
-            #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-            #[serde(default, deny_unknown_fields)]
-            pub struct $Config {
-                pub enabled: bool,
-                pub setback: f32,
-                pub alert: f32,
-                pub kick: f32,
-                pub decay: f32,
-                pub ban_after: u32,
-                $( $(#[$xdoc])* pub $extra: $ty, )*
-            }
-
-            impl Default for $Config {
-                fn default() -> Self {
-                    Self {
-                        enabled: true,
-                        setback: $setback,
-                        alert: $alert,
-                        kick: $kick,
-                        decay: $decay,
-                        ban_after: $ban_after,
-                        $($extra: $default,)*
-                    }
-                }
-            }
-        )*
-
-        /// `server.toml`'s `[anticheat]`: on by default.
-        #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-        #[serde(default, deny_unknown_fields)]
-        pub struct Config {
-            pub enabled: bool,
-            /// Tell online operators of an alert in their chat (the console and the log always are).
-            pub alerts: bool,
-            /// The permission level a player needs to see alerts.
-            pub alert_level: u8,
-            /// Every flag, one line each, relative to the server's folder; empty: no file.
-            pub log: String,
-            /// The players' kicks by check ([`Strikes`]), relative to the server's folder; empty: kept
-            /// only while the server runs.
-            pub strikes: String,
-            $(pub $field: $Config,)*
-        }
-
-        impl Default for Config {
-            fn default() -> Self {
-                Self {
-                    enabled: true,
-                    alerts: true,
-                    alert_level: 2,
-                    log: "logs/anticheat.log".into(),
-                    strikes: "anticheat-strikes.json".into(),
-                    $($field: $Config::default(),)*
-                }
-            }
-        }
-
-        impl Config {
-            /// Whether `check` runs: the anticheat and the check both on.
-            pub fn runs(&self, check: Check) -> bool {
-                self.enabled && match check { $(Check::$Check => self.$field.enabled,)* }
-            }
-
-            pub fn actions(&self, check: Check) -> Actions {
-                match check {
-                    $(Check::$Check => {
-                        let c = &self.$field;
-                        Actions {
-                            setback: c.setback,
-                            alert: c.alert,
-                            kick: c.kick,
-                            decay: c.decay,
-                            ban_after: c.ban_after,
-                        }
-                    })*
-                }
-            }
-        }
-    };
-}
-
-checks! {
-    /// Timer: more client ticks than the server's clock allows (a sped-up game). Vanilla's client ends
-    /// every tick with ServerboundClientTickEndPacket, at the server's tick rate; each one spends a tick's
-    /// time from a balance that wall-clock time fills, capped so a pause can't be saved up for a burst.
-    /// It logs only by default; once trusted: `setback = 2`, `alert = 5`, `kick = 20`.
-    timer: Timer => TimerConfig [0.0, 0.0, 0.0, 0.02, 0] {
-        /// How far ahead of the clock, in milliseconds, a client may get before it is flagged.
-        tolerance_ms: f64 = 300.0,
-        /// The most time, in milliseconds, a quiet connection banks for the ticks that follow (a lag
-        /// spike's backlog arrives at once).
-        max_lag_ms: f64 = 1000.0,
-    }
-
-    /// Ground: a move that says it ends on the ground with nothing there to stand on: no-fall (claiming
-    /// the ground to skip fall damage) and walking on water. The claim is dropped, so vanilla's
-    /// fall damage follows (the player is never sent back: `setback = 0` makes the check log only), and
-    /// a player that keeps claiming is kicked, then banned at the second kick (`ban_after = 2`). A claim standing still isn't
-    /// judged (no fall to skip). On the official server's first two hours (67 players), every player who
-    /// wasn't flying or walking on water peaked at level 7 (4 claims standing still in one second); the
-    /// ones who were, at 113 to 3749.
-    ground: Ground => GroundConfig [10.0, 15.0, 30.0, 2.0, 2] {}
-
-    /// Prediction: each move played again from the client's own inputs with vanilla's movement code,
-    /// and compared (speed, step, fly, jesus...). Each player's client ticks are recorded
-    /// (`prediction::Record`), with a ping a tick to place what the server changes, and played again
-    /// (horizon-client's `lan::prediction`). A move that lands farther than `tolerance` from the
-    /// replay flags, by how far it lands (one `tolerance` off weighs 1, at most 5 a tick), and the
-    /// setback puts the player back where its moves last agreed. A tick near what the replay can't
-    /// play yet (another entity, a block change or abilities the client hadn't seen, a moving piston,
-    /// a chunk the client doesn't have, a riptide launch) is excused, and so are the ticks after it
-    /// until the moves agree again. It logs only by default; once trusted: `setback = 5`, `alert = 15`,
-    /// `kick = 60`.
-    prediction: Prediction => PredictionConfig [0.0, 0.0, 0.0, 2.0, 0] {
-        /// How far, in blocks, a move may land from where the replay puts it.
-        tolerance: f64 = 0.03,
-    }
-
-    /// Combat: attacks vanilla's client can't send (`combat`): one with no swing after it (a kill aura
-    /// that hides its swing), or a second entity attacked in the same client tick (vanilla attacks the
-    /// one entity under the crosshair, picked once a tick). Each flags once; from `setback` on the
-    /// player's attacks are dropped. A vanilla client never trips it, so it acts by default: the first
-    /// kick warns, the second bans (`ban_after = 2`).
-    combat: Combat => CombatConfig [2.0, 5.0, 20.0, 0.5, 2] {}
-}
-
-/// How many checks there are.
-pub const CHECKS: usize = Check::ALL.len();
-
-impl Config {
-    /// The `[anticheat]` section of a whole `server.toml`; the default (off) when it has none.
-    pub fn from_server_toml(text: &str) -> Result<Self, String> {
-        #[derive(Deserialize)]
-        struct File {
-            #[serde(default)]
-            anticheat: Config,
-        }
-        // Other sections are the supervisor's to check: only this one is read here.
-        let mut table: toml::Table = toml::from_str(text).map_err(|e| e.to_string())?;
-        let mut only = toml::Table::new();
-        if let Some(section) = table.remove("anticheat") {
-            only.insert("anticheat".into(), section);
-        }
-        let file: File = only
-            .try_into()
-            .map_err(|e: toml::de::Error| format!("[anticheat]: {e}"))?;
-        file.anticheat.check()?;
-        Ok(file.anticheat)
-    }
-
-    /// Thresholds can't be negative.
-    pub fn check(&self) -> Result<(), String> {
-        for &c in Check::ALL {
-            let a = self.actions(c);
-            if [a.setback, a.alert, a.kick, a.decay]
-                .iter()
-                .any(|v| !v.is_finite() || *v < 0.0)
-            {
-                return Err(format!(
-                    "anticheat.{}: setback, alert, kick and decay are numbers from 0 up",
-                    c.name()
-                ));
-            }
-        }
-        let tolerance = self.prediction.tolerance;
-        if !tolerance.is_finite() || tolerance <= 0.0 {
-            return Err("anticheat.prediction: tolerance is a number of blocks above 0".into());
-        }
-        Ok(())
-    }
-}
-
-/// How many times each check kicked each player, kept across sessions (`strikes`, a JSON object of
-/// players' UUIDs to check names to counts): the kick that reaches a check's `ban_after` is a ban.
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct Strikes(pub BTreeMap<String, BTreeMap<String, u32>>);
-
-impl Strikes {
-    /// Player `uuid` was kicked by `check`: its kicks by it so far, this one included, and whether this
-    /// one bans. A ban starts the count again, so a player an operator pardons is kicked before the
-    /// next ban.
-    pub fn kick(&mut self, uuid: &str, check: Check, ban_after: u32) -> (u32, bool) {
-        let count = self
-            .0
-            .entry(uuid.to_owned())
-            .or_default()
-            .entry(check.name().to_owned())
-            .or_default();
-        *count = count.saturating_add(1);
-        let kicks = *count;
-        let ban = ban_after > 0 && kicks >= ban_after;
-        if ban {
-            *count = 0;
-        }
-        (kicks, ban)
-    }
-}
-
-/// What a flag leads to.
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
-pub struct Verdict {
-    /// The check's violation level after the flag.
-    pub vl: f32,
-    /// Cancel the move or action.
-    pub setback: bool,
-    /// Tell operators and the console (at most once a second per check).
-    pub alert: bool,
-    pub kick: bool,
-}
-
-/// One player's anticheat state. Clean players cost nothing: levels only change when a check flags.
-#[derive(Clone, Debug, Default)]
-pub struct Player {
-    vl: [f32; CHECKS],
-    /// The server tick of each check's last flag (its decay runs from there).
-    flagged: [u64; CHECKS],
-    /// The server tick of each check's last alert.
-    alerted: [Option<u64>; CHECKS],
-    pub timer: timer::Balance,
-    /// The server tick and height where the ground last held the player.
-    pub ground: Option<(u64, f64)>,
-    /// The client ticks the prediction plays again (only while it runs).
-    pub record: Option<Box<prediction::Record>>,
-    /// Sprinting as the client's own commands left it (ServerboundPlayerCommandPacket's
-    /// START_SPRINTING and STOP_SPRINTING: LocalPlayer.wasSprinting), which the record's ticks take.
-    /// Not the server's player: a hit with extra knockback stops its sprint
-    /// (Player.causeExtraKnockback), the client's own `Player.attack` doesn't (a mob's `hurtClient`
-    /// is false), and once the server's flag reaches it LocalPlayer.aiStep starts the sprint again
-    /// while the sprint key is held, with nothing to say: wasSprinting never changed.
-    pub sprinting: bool,
-    /// The attacks of the client tick being heard.
-    pub attacks: combat::Attacks,
-}
-
-impl Player {
-    /// The check's violation level at `tick`, with its decay since the last flag.
-    pub fn vl(&self, config: &Config, check: Check, tick: u64) -> f32 {
-        let i = check as usize;
-        let seconds = tick.saturating_sub(self.flagged[i]) as f32 / 20.0;
-        (self.vl[i] - config.actions(check).decay * seconds).max(0.0)
-    }
-
-    /// `check` failed with this weight at server tick `tick`.
-    pub fn flag(&mut self, config: &Config, check: Check, weight: f32, tick: u64) -> Verdict {
-        let i = check as usize;
-        let a = config.actions(check);
-        let vl = self.vl(config, check, tick) + weight;
-        self.vl[i] = vl;
-        self.flagged[i] = tick;
-        let reached = |threshold: f32| threshold > 0.0 && vl >= threshold;
-        let alert = reached(a.alert) && self.alerted[i].is_none_or(|t| tick >= t + 20);
-        if alert {
-            self.alerted[i] = Some(tick);
-        }
-        Verdict {
-            vl,
-            setback: reached(a.setback),
-            alert,
-            kick: reached(a.kick),
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn on() -> Config {
-        Config {
-            enabled: true,
-            ..Config::default()
-        }
-    }
-
-    #[test]
-    fn on_by_default_but_only_combat_and_ground_act() {
-        let c = Config::from_server_toml("[server]\nport = 25565\n").unwrap();
-        assert_eq!(c, Config::default());
-        for &check in Check::ALL {
-            assert!(c.runs(check), "{}", check.name());
-            let a = c.actions(check);
-            let acts = [a.setback, a.alert, a.kick] != [0.0; 3];
-            assert_eq!(
-                acts,
-                matches!(check, Check::Combat | Check::Ground),
-                "{}",
-                check.name()
-            );
-        }
-        let off = Config::from_server_toml("[anticheat]\nenabled = false\n").unwrap();
-        assert!(Check::ALL.iter().all(|&check| !off.runs(check)));
-    }
-
-    #[test]
-    fn reads_its_section() {
-        let text = "[server]\nport = 1\n[anticheat]\nenabled = true\n[anticheat.timer]\nkick = 0\ntolerance_ms = 500\n";
-        let c = Config::from_server_toml(text).unwrap();
-        assert!(c.runs(Check::Timer));
-        assert_eq!(c.timer.kick, 0.0);
-        assert_eq!(c.timer.tolerance_ms, 500.0);
-        assert_eq!(c.timer.alert, TimerConfig::default().alert);
-        let zero = "[anticheat]\n[anticheat.prediction]\ntolerance = 0\n";
-        assert!(Config::from_server_toml(zero).is_err());
-        let off = "[anticheat]\nenabled = true\n[anticheat.timer]\nenabled = false\n";
-        assert!(!Config::from_server_toml(off).unwrap().runs(Check::Timer));
-    }
-
-    #[test]
-    fn refuses_unknown_keys_and_negative_levels() {
-        assert!(Config::from_server_toml("[anticheat]\nenable = true\n").is_err());
-        assert!(Config::from_server_toml("[anticheat.timer]\nkick = -1\n").is_err());
-    }
-
-    #[test]
-    fn levels_rise_decay_and_act_in_order() {
-        let mut c = on();
-        c.timer = TimerConfig {
-            setback: 2.0,
-            alert: 3.0,
-            kick: 5.0,
-            decay: 1.0,
-            ..TimerConfig::default()
-        };
-        let mut p = Player::default();
-        let v = p.flag(&c, Check::Timer, 1.0, 100);
-        assert_eq!((v.setback, v.alert, v.kick), (false, false, false));
-        let v = p.flag(&c, Check::Timer, 1.0, 100);
-        assert_eq!((v.vl, v.setback, v.alert), (2.0, true, false));
-        let v = p.flag(&c, Check::Timer, 1.0, 100);
-        assert!(v.alert && !v.kick);
-        // At most one alert a second.
-        assert!(!p.flag(&c, Check::Timer, 0.5, 110).alert);
-        // 3 at tick 110 (half a level gone, half added); two seconds later two more are gone.
-        assert_eq!(p.vl(&c, Check::Timer, 150), 1.0);
-        assert_eq!(p.vl(&c, Check::Timer, 10_000), 0.0);
-        let v = p.flag(&c, Check::Timer, 5.0, 10_000);
-        assert!(v.kick && v.alert);
-    }
-
-    #[test]
-    fn the_kick_that_reaches_ban_after_bans() {
-        let c = Config::default();
-        assert_eq!(c.actions(Check::Combat).ban_after, 2);
-        assert_eq!(c.actions(Check::Prediction).ban_after, 0);
-        let mut s = Strikes::default();
-        assert_eq!(s.kick("a", Check::Combat, 2), (1, false));
-        // Another player, another check: their own counts.
-        assert_eq!(s.kick("b", Check::Combat, 2), (1, false));
-        assert_eq!(s.kick("a", Check::Timer, 2), (1, false));
-        assert_eq!(s.kick("a", Check::Combat, 2), (2, true));
-        // Pardoned, the player is kicked once more before the next ban.
-        assert_eq!(s.kick("a", Check::Combat, 2), (1, false));
-        // 0 never bans; 1 bans at the first kick.
-        assert_eq!(s.kick("c", Check::Timer, 0), (1, false));
-        assert_eq!(s.kick("c", Check::Timer, 0), (2, false));
-        assert_eq!(s.kick("d", Check::Ground, 1), (1, true));
-    }
-
-    #[test]
-    fn zero_turns_an_action_off() {
-        let mut c = on();
-        c.timer.kick = 0.0;
-        let mut p = Player::default();
-        assert!(!p.flag(&c, Check::Timer, 1000.0, 1).kick);
-    }
-}

crates/horizon-anticheat/src/prediction.rs

@@ -1,416 +0,0 @@
-//! The movement prediction's record: each of a player's client ticks as the server heard them, so
-//! the server can play the tick again with vanilla's movement code and compare (docs/anticheat.md).
-//!
-//! A vanilla client ends every tick with ServerboundClientTickEndPacket, after the tick's input
-//! (ServerboundPlayerInputPacket, sent when the keys change) and its move (ServerboundMovePlayerPacket,
-//! when it moved or turned). Those packets arrive in order, so the packets between two tick ends are one
-//! client tick.
-//!
-//! What the server changes about the player (a push, a teleport, an effect) takes effect on the client
-//! when it handles the packet, which is some client ticks after the server sent it. At the end of each of
-//! its ticks the server sends a ClientboundPingPacket whose id is that server tick; the client answers
-//! with ServerboundPongPacket as soon as it handles it, before its next tick runs. A client tick knows
-//! the last server tick it had handled: every change of that server tick or an earlier one was in effect
-//! during the client tick, none of a later one.
-
-use std::collections::VecDeque;
-
-/// Client ticks kept: two seconds at 20 a second.
-pub const KEPT: usize = 40;
-
-/// Server changes kept, the oldest dropped first.
-const CHANGES_KEPT: usize = 64;
-
-/// Changes near the player kept until every kept tick has seen them.
-const NEAR_KEPT: usize = 1024;
-
-/// Something the server sent the player that changes how its client moves. The client applies it when
-/// it handles the packet, before its next tick.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum Change {
-    /// ClientboundSetEntityMotionPacket for the player itself: its new velocity, as the client
-    /// decodes it.
-    Velocity([f64; 3]),
-    /// ClientboundExplodePacket's player knockback, added to the velocity.
-    Knockback([f64; 3]),
-    /// ClientboundUpdateAttributesPacket for the player itself: the server's attributes as they
-    /// are when the replay reaches it, but for the movement speed's sprint modifier, which the
-    /// client's sprinting decides: `sprint` is whether the packet had it when it carried the
-    /// movement speed (the client takes the modifiers as sent, so a sprint modifier the packet
-    /// lacks is gone while the client sprints), None when it didn't (the client keeps its own).
-    Attributes { sprint: Option<bool> },
-    /// ClientboundSetEntityDataPacket for the player itself with its shared flags: their sprinting
-    /// bit, which the client takes as sent (SynchedEntityData.assignValues sets the flag alone, its
-    /// speed modifier and wasSprinting stay). A client whose sprint the server cleared this way
-    /// starts it again in its next aiStep, which adds the modifier back, and says nothing.
-    Sprinting(bool),
-    /// ClientboundUpdateMobEffectPacket or ClientboundRemoveMobEffectPacket for the player itself:
-    /// the server's effects, as they are when the replay reaches it. (Their attribute modifiers
-    /// are the server's: they reach the client as attributes.)
-    Effects,
-    /// ClientboundPlayerAbilitiesPacket (a game mode, flight given or taken), or the player's chest
-    /// slot (a glider put on or taken off): the replay takes these from the server every tick, so a
-    /// tick played before the client had them may be off.
-    Abilities,
-}
-
-/// A teleport the client accepted: the replay starts again from it.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Restart {
-    /// Where it put the player.
-    pub at: [f64; 3],
-    /// It kept the player's motion (an End gateway's).
-    pub kept_motion: bool,
-    /// Client ticks ended and changes heard before it: the ones after are the replay's.
-    pub ended: u64,
-    pub changed: u64,
-}
-
-/// One client tick.
-#[derive(Clone, Copy, Debug, Default, PartialEq)]
-pub struct ClientTick {
-    /// The keys held (ServerboundPlayerInputPacket's flags: forward, backward, left, right, jump,
-    /// shift, sprint), as last sent.
-    pub input: u8,
-    /// Sprinting, as the player's commands left it (ServerboundPlayerCommandPacket).
-    pub sprinting: bool,
-    /// The rotation the client last sent.
-    pub yaw: f32,
-    pub pitch: f32,
-    /// Where the tick's move said the player is, if it said: a move with a position.
-    pub position: Option<[f64; 3]>,
-    /// The tick's move packet's flags (1: on the ground, 2: against a wall), if it sent one.
-    pub flags: Option<u8>,
-    /// The last server tick whose packets the client had handled (its pong) before this tick ended.
-    pub seen: Option<u64>,
-}
-
-/// A player's last client ticks.
-#[derive(Clone, Debug, Default)]
-pub struct Record {
-    /// The tick being heard.
-    current: ClientTick,
-    /// The ended ones, oldest first, at most [`KEPT`].
-    ticks: VecDeque<ClientTick>,
-    /// The last server tick the client answered for.
-    seen: Option<u64>,
-    /// Client ticks ended since the record began.
-    ended: u64,
-    /// Where an accepted teleport put the player, until the replay starts again from there.
-    restart: Option<Restart>,
-    /// What the server changed, with the server tick that sent it, oldest first.
-    changes: VecDeque<(u64, Change)>,
-    /// Changes heard since the record began.
-    changed: u64,
-    /// The blocks the server changed near the player (None: an entity it stopped showing the player
-    /// from near it, which counts wherever the player has gone since), with the server tick that sent
-    /// each, until every kept tick has seen them.
-    near: VecDeque<(u64, Option<[i32; 3]>)>,
-    /// The server tick of the last of them dropped early ([`NEAR_KEPT`] came after it).
-    near_dropped: Option<u64>,
-}
-
-impl Record {
-    /// The tick's move: its position if it has one, the rotation if it has one, and its flags.
-    pub fn moved(&mut self, position: Option<[f64; 3]>, rotation: Option<(f32, f32)>, flags: u8) {
-        if position.is_some() {
-            self.current.position = position;
-        }
-        if let Some((yaw, pitch)) = rotation {
-            (self.current.yaw, self.current.pitch) = (yaw, pitch);
-        }
-        self.current.flags = Some(flags);
-    }
-
-    /// ServerboundPongPacket for the ping sent at the end of `server_tick`. False for an answer to a
-    /// ping that was never sent, or one older than an answer already heard: a vanilla client answers
-    /// every ping, once, in order.
-    pub fn pong(&mut self, server_tick: u64, sent_up_to: u64) -> bool {
-        if server_tick > sent_up_to || self.seen.is_some_and(|seen| server_tick <= seen) {
-            return false;
-        }
-        self.seen = Some(server_tick);
-        true
-    }
-
-    /// ServerboundClientTickEndPacket: the tick ends with these keys held and this sprinting. The
-    /// next tick starts with the same keys and rotation, until the client says otherwise.
-    pub fn tick_end(&mut self, input: u8, sprinting: bool) -> &ClientTick {
-        self.current.input = input;
-        self.current.sprinting = sprinting;
-        self.current.seen = self.seen;
-        let next = ClientTick {
-            yaw: self.current.yaw,
-            pitch: self.current.pitch,
-            ..ClientTick::default()
-        };
-        let ended = std::mem::replace(&mut self.current, next);
-        if self.ticks.len() == KEPT {
-            self.ticks.pop_front();
-        }
-        self.ticks.push_back(ended);
-        self.ended += 1;
-        // What the oldest tick kept had seen, every later one had too.
-        if let Some(seen) = self.ticks.front().and_then(|t| t.seen) {
-            while self.near.front().is_some_and(|&(sent, _)| sent <= seen) {
-                self.near.pop_front();
-            }
-            self.near_dropped = self.near_dropped.filter(|&sent| sent > seen);
-        }
-        self.ticks.back().expect("just pushed")
-    }
-
-    /// The ended ticks, oldest first.
-    pub fn ticks(&self) -> impl DoubleEndedIterator<Item = &ClientTick> + ExactSizeIterator {
-        self.ticks.iter()
-    }
-
-    /// The last server tick the client answered for.
-    pub fn seen(&self) -> Option<u64> {
-        self.seen
-    }
-
-    /// Client ticks ended since the record began.
-    pub fn ended(&self) -> u64 {
-        self.ended
-    }
-
-    /// The ticks ended after the first `played`, oldest first; None when some of them are no longer
-    /// kept.
-    pub fn since(&self, played: u64) -> Option<impl Iterator<Item = &ClientTick>> {
-        let new = self.ended.checked_sub(played)?;
-        let new = usize::try_from(new)
-            .ok()
-            .filter(|&n| n <= self.ticks.len())?;
-        Some(self.ticks.iter().skip(self.ticks.len() - new))
-    }
-
-    /// `change`, sent during server tick `server_tick` (before that tick's ping).
-    pub fn changed(&mut self, server_tick: u64, change: Change) {
-        if self.changes.len() == CHANGES_KEPT {
-            self.changes.pop_front();
-        }
-        self.changes.push_back((server_tick, change));
-        self.changed += 1;
-    }
-
-    /// Changes heard since the record began.
-    pub fn changes(&self) -> u64 {
-        self.changed
-    }
-
-    /// The changes after the first `applied`, oldest first; None when some of them are no longer kept.
-    pub fn changes_since(
-        &self,
-        applied: u64,
-    ) -> Option<impl Iterator<Item = &(u64, Change)> + Clone> {
-        let new = self.changed.checked_sub(applied)?;
-        let new = usize::try_from(new)
-            .ok()
-            .filter(|&n| n <= self.changes.len())?;
-        Some(self.changes.iter().skip(self.changes.len() - new))
-    }
-
-    /// During server tick `server_tick` (before that tick's ping) the server sent the client the block
-    /// at `pos`.
-    pub fn changed_near(&mut self, server_tick: u64, pos: [i32; 3]) {
-        self.note_near(server_tick, Some(pos));
-    }
-
-    /// During server tick `server_tick` the server stopped showing the client an entity near it (a
-    /// firework it flew with, a mob that pushed it): the client may still have it, wherever it goes.
-    pub fn entity_gone(&mut self, server_tick: u64) {
-        if self.near.back() != Some(&(server_tick, None)) {
-            self.note_near(server_tick, None);
-        }
-    }
-
-    fn note_near(&mut self, server_tick: u64, pos: Option<[i32; 3]>) {
-        if self.near.len() == NEAR_KEPT {
-            self.near_dropped = self.near.pop_front().map(|(sent, _)| sent);
-        }
-        self.near.push_back((server_tick, pos));
-    }
-
-    /// Whether a client tick that had `seen` up to that server tick (its [`ClientTick::seen`]) may
-    /// not have had a change at a position for which `near` holds: it still had the old block, or the
-    /// entity, where the server no longer has it.
-    pub fn unseen_near(&self, seen: Option<u64>, near: impl Fn([i32; 3]) -> bool) -> bool {
-        let unseen = |sent: u64| seen.is_none_or(|seen| sent > seen);
-        self.near_dropped.is_some_and(unseen)
-            || self
-                .near
-                .iter()
-                .any(|&(sent, pos)| unseen(sent) && pos.is_none_or(&near))
-    }
-
-    /// The client accepted a teleport to `at` (ServerboundAcceptTeleportationPacket): it goes on from
-    /// there, standing still unless the teleport `kept_motion` (an End gateway's). The ticks it ended
-    /// before stay, for a replay that hasn't played them yet; the one under way starts again.
-    pub fn teleported(&mut self, at: [f64; 3], kept_motion: bool) {
-        self.restart_tick();
-        self.restart = Some(Restart {
-            at,
-            kept_motion,
-            ended: self.ended,
-            changed: self.changed,
-        });
-    }
-
-    /// The last teleport the client accepted, once.
-    pub fn take_restart(&mut self) -> Option<Restart> {
-        self.restart.take()
-    }
-
-    /// The ticks before now say nothing about the ones after.
-    pub fn clear(&mut self) {
-        self.ticks.clear();
-        self.restart_tick();
-    }
-
-    fn restart_tick(&mut self) {
-        self.current = ClientTick {
-            yaw: self.current.yaw,
-            pitch: self.current.pitch,
-            ..ClientTick::default()
-        };
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn a_change_near_is_unseen_by_the_ticks_before_its_pong() {
-        let mut r = Record::default();
-        r.changed_near(4, [1, 2, 3]);
-        r.changed_near(5, [7, 2, 3]);
-        let near = |p: [i32; 3]| p[0] < 5;
-        assert!(r.unseen_near(None, near));
-        assert!(r.unseen_near(Some(3), near));
-        assert!(!r.unseen_near(Some(4), near));
-        assert!(r.unseen_near(Some(4), |_| true));
-        // Kept until the oldest tick kept had seen it: one that ended before the pong hadn't.
-        r.tick_end(0, false);
-        assert!(r.pong(5, 5));
-        r.tick_end(0, false);
-        assert!(r.unseen_near(Some(3), near));
-        for _ in 0..KEPT {
-            r.tick_end(0, false);
-        }
-        assert!(!r.unseen_near(None, |_| true));
-        // An entity gone counts anywhere.
-        r.entity_gone(5);
-        r.entity_gone(5);
-        assert!(r.unseen_near(Some(4), |_| false));
-        assert!(!r.unseen_near(Some(5), |_| false));
-        // One dropped early counts for the ticks that hadn't seen it.
-        for i in 0..=NEAR_KEPT as u64 {
-            r.changed_near(6 + i, [100, 0, 0]);
-        }
-        assert!(
-            r.unseen_near(Some(5), near),
-            "a change dropped unseen counts"
-        );
-        assert!(!r.unseen_near(Some(6), near));
-    }
-
-    #[test]
-    fn a_tick_is_the_packets_between_two_tick_ends() {
-        let mut r = Record::default();
-        r.moved(Some([1.0, 2.0, 3.0]), Some((90.0, 10.0)), 1);
-        let t = *r.tick_end(0b1001, true);
-        assert_eq!(t.position, Some([1.0, 2.0, 3.0]));
-        assert_eq!((t.yaw, t.pitch, t.flags), (90.0, 10.0, Some(1)));
-        assert_eq!((t.input, t.sprinting, t.seen), (0b1001, true, None));
-        // A tick without a move keeps the rotation and has no position.
-        let t = *r.tick_end(0, false);
-        assert_eq!((t.position, t.flags, t.yaw), (None, None, 90.0));
-        assert_eq!(r.ticks().len(), 2);
-    }
-
-    #[test]
-    fn pongs_say_which_server_ticks_a_client_tick_had_seen() {
-        let mut r = Record::default();
-        assert!(r.pong(5, 6));
-        r.tick_end(0, false);
-        assert!(r.pong(6, 6));
-        r.tick_end(0, false);
-        r.tick_end(0, false);
-        let seen: Vec<_> = r.ticks().map(|t| t.seen).collect();
-        assert_eq!(seen, [Some(5), Some(6), Some(6)]);
-        // Never sent, answered twice, or out of order.
-        assert!(!r.pong(9, 6));
-        assert!(!r.pong(6, 6));
-        assert!(!r.pong(4, 6));
-        assert_eq!(r.seen(), Some(6));
-    }
-
-    #[test]
-    fn only_the_last_two_seconds_are_kept() {
-        let mut r = Record::default();
-        for i in 0..KEPT + 5 {
-            r.moved(Some([i as f64, 0.0, 0.0]), None, 0);
-            r.tick_end(0, false);
-        }
-        assert_eq!(r.ticks().len(), KEPT);
-        assert_eq!(r.ticks().next().unwrap().position, Some([5.0, 0.0, 0.0]));
-        r.clear();
-        assert_eq!(r.ticks().len(), 0);
-    }
-
-    #[test]
-    fn the_replay_takes_the_ticks_it_has_not_played() {
-        let mut r = Record::default();
-        for i in 0..3 {
-            r.moved(Some([i as f64, 0.0, 0.0]), None, 0);
-            r.tick_end(0, false);
-        }
-        fn x(r: &Record, played: u64) -> Option<Vec<f64>> {
-            r.since(played)
-                .map(|t| t.map(|t| t.position.unwrap()[0]).collect())
-        }
-        assert_eq!(x(&r, 1), Some(vec![1.0, 2.0]));
-        assert_eq!(x(&r, 3), Some(vec![]));
-        // Played ahead of the record, or so far behind the ticks are gone.
-        assert_eq!(x(&r, 4), None);
-        r.clear();
-        assert_eq!(x(&r, 2), None);
-        assert_eq!(x(&r, 3), Some(vec![]));
-        r.moved(Some([8.0, 0.0, 0.0]), None, 0);
-        r.tick_end(0, false);
-        r.moved(Some([9.0, 0.0, 0.0]), None, 0);
-        r.teleported([5.0, 6.0, 7.0], false);
-        // A tick that ends before the replay starts again is still one after the teleport.
-        r.tick_end(0, false);
-        let restart = r.take_restart().unwrap();
-        assert_eq!((restart.at, restart.kept_motion), ([5.0, 6.0, 7.0], false));
-        assert_eq!(r.since(restart.ended).unwrap().count(), 1);
-        // The tick ended before it stays for a replay that hasn't played it; the move of the one
-        // under way is gone.
-        let positions: Vec<_> = r.since(3).unwrap().map(|t| t.position).collect();
-        assert_eq!(positions, [Some([8.0, 0.0, 0.0]), None]);
-        assert_eq!(r.take_restart(), None);
-    }
-
-    #[test]
-    fn changes_keep_the_server_tick_that_sent_them() {
-        let mut r = Record::default();
-        r.changed(3, Change::Velocity([0.0, 0.4, 0.0]));
-        r.changed(5, Change::Effects);
-        let all: Vec<_> = r.changes_since(0).unwrap().copied().collect();
-        assert_eq!(
-            all,
-            [(3, Change::Velocity([0.0, 0.4, 0.0])), (5, Change::Effects)]
-        );
-        assert_eq!(r.changes_since(1).unwrap().count(), 1);
-        assert!(r.changes_since(3).is_none());
-        for i in 0..CHANGES_KEPT as u64 {
-            r.changed(6 + i, Change::Effects);
-        }
-        // The first two are gone.
-        assert!(r.changes_since(1).is_none());
-        assert_eq!(r.changes_since(2).unwrap().count(), CHANGES_KEPT);
-    }
-}

crates/horizon-anticheat/src/timer.rs

@@ -1,111 +0,0 @@
-//! The timer check's balance: how far a client's ticks are behind (positive) or ahead (negative) of the
-//! server's clock, in milliseconds.
-//!
-//! The server adds the wall-clock time of each of its ticks, and every ServerboundClientTickEndPacket
-//! takes away the length of one tick at the server's tick rate (vanilla's client ticks at that rate,
-//! `TickRateManager.millisecondsPerTick`). The balance is capped at `max_lag_ms` *after* the tick's
-//! packets are counted: a slow server tick that handles a second of packets at once also added that
-//! second, and a quiet connection banks at most `max_lag_ms` for the burst that ends a lag spike.
-
-use crate::TimerConfig;
-
-#[derive(Clone, Debug, Default)]
-pub struct Balance {
-    pub ms: f64,
-}
-
-impl Balance {
-    /// The start of a server tick that came `elapsed_ms` after the previous one.
-    pub fn elapse(&mut self, elapsed_ms: f64, config: &TimerConfig) {
-        self.ms = self.ms.min(config.max_lag_ms) + elapsed_ms;
-    }
-
-    /// One client tick ended, at a tick rate of `tick_rate` a second. Some(how far ahead, in ms) when the
-    /// client is further ahead than the tolerance; the balance starts again from zero then, so a
-    /// sustained speed-up is flagged again each time it gets that far ahead.
-    pub fn tick_end(&mut self, tick_rate: f32, config: &TimerConfig) -> Option<f64> {
-        self.ms -= 1000.0 / f64::from(tick_rate.max(1.0));
-        if self.ms < -config.tolerance_ms {
-            let ahead = -self.ms;
-            self.ms = 0.0;
-            return Some(ahead);
-        }
-        None
-    }
-
-    /// The tick rate changed or the player arrived: start again.
-    pub fn reset(&mut self) {
-        self.ms = 0.0;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    /// `seconds` of server ticks of `server_ms` each, with `per_tick` client ticks handled in each.
-    fn run(b: &mut Balance, server_ms: f64, per_tick: f64, seconds: f64) -> usize {
-        let c = TimerConfig::default();
-        let mut owed = 0.0;
-        let mut flags = 0;
-        for _ in 0..(seconds * 1000.0 / server_ms) as usize {
-            b.elapse(server_ms, &c);
-            owed += per_tick;
-            while owed >= 1.0 {
-                owed -= 1.0;
-                flags += usize::from(b.tick_end(20.0, &c).is_some());
-            }
-        }
-        flags
-    }
-
-    #[test]
-    fn a_vanilla_client_is_never_flagged() {
-        let mut b = Balance::default();
-        assert_eq!(run(&mut b, 50.0, 1.0, 600.0), 0);
-        // A server that runs at 10 ticks a second handles two client ticks in each.
-        assert_eq!(run(&mut b, 100.0, 2.0, 600.0), 0);
-    }
-
-    #[test]
-    fn a_slow_server_tick_with_its_backlog_is_not_flagged() {
-        let (mut b, c) = (Balance::default(), TimerConfig::default());
-        b.elapse(3000.0, &c);
-        for _ in 0..60 {
-            assert_eq!(b.tick_end(20.0, &c), None);
-        }
-    }
-
-    #[test]
-    fn a_short_network_stall_is_not_flagged() {
-        let (mut b, c) = (Balance::default(), TimerConfig::default());
-        // 800 ms with nothing arriving, then the 16 ticks sent meanwhile.
-        for _ in 0..16 {
-            b.elapse(50.0, &c);
-        }
-        b.elapse(50.0, &c);
-        for _ in 0..17 {
-            assert_eq!(b.tick_end(20.0, &c), None);
-        }
-    }
-
-    #[test]
-    fn a_sped_up_client_is_flagged_again_and_again() {
-        let mut b = Balance::default();
-        // 10 % faster: 5 ms ahead each tick, 300 ms after 3 s, so close to 20 flags a minute.
-        let flags = run(&mut b, 50.0, 1.1, 60.0);
-        assert!((15..=20).contains(&flags), "{flags}");
-        // Twice as fast: a flag every 7 ticks.
-        assert!(run(&mut Balance::default(), 50.0, 2.0, 10.0) >= 25);
-    }
-
-    #[test]
-    fn a_pause_cant_be_saved_for_a_burst() {
-        let (mut b, c) = (Balance::default(), TimerConfig::default());
-        for _ in 0..200 {
-            b.elapse(50.0, &c);
-        }
-        let flagged = (0..60).any(|_| b.tick_end(20.0, &c).is_some());
-        assert!(flagged);
-    }
-}

crates/horizon-assets/Cargo.toml

@@ -8,7 +8,6 @@ description = "Horizon version-specific model and resource decoding"
 
 [dependencies]
 horizon-core = { path = "../horizon-core" }
-log = "0.4"
 serde = "1.0.229"
 serde_json = { version = "1.0.151", features = ["raw_value"] }
 

crates/horizon-assets/src/bake.rs

@@ -1,10 +1,5 @@
 //! Cuboid geometry in block units, including blockstate rotation and UV locking.
-use crate::{
-    json::*,
-    model::*,
-    obj::{MtlTexture, ObjFace, ObjModel},
-    resolve::{ResolvedCuboidModel, ResolvedLoader},
-};
+use crate::{json::*, model::*, resolve::ResolvedCuboidModel};
 mod transform;
 pub use transform::BlockModelTransform;
 
@@ -18,40 +13,7 @@ pub struct ModelQuad {
     pub material: Material,
     pub tint_index: i32,
     pub shade_direction_override: Option<Direction>,
-    /// The face's or element's `light_emission`.
     pub light_emission: u8,
-    /// Least (block, sky) light the quad is drawn with: its emission, raised by `neoforge_data`.
-    pub light: [u8; 2],
-    /// `neoforge_data` colour (ARGB) multiplied into the quad's tint.
-    pub color: Option<i32>,
-    /// `neoforge_data` override of the model's ambient occlusion for this quad.
-    pub ambient_occlusion: Option<bool>,
-    pub render_type: Option<RenderType>,
-    /// False for a loader quad that takes no directional shading.
-    pub shade: bool,
-}
-
-/// NeoForge's `render_type` names.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum RenderType {
-    Solid,
-    Cutout,
-    CutoutMipped,
-    Translucent,
-    Tripwire,
-}
-impl RenderType {
-    /// Accepts a bare or `minecraft:` name; others (mods' own types) are `None`.
-    pub fn by_name(name: &str) -> Option<Self> {
-        match name.strip_prefix("minecraft:").unwrap_or(name) {
-            "solid" => Some(Self::Solid),
-            "cutout" => Some(Self::Cutout),
-            "cutout_mipped" => Some(Self::CutoutMipped),
-            "translucent" => Some(Self::Translucent),
-            "tripwire" => Some(Self::Tripwire),
-            _ => None,
-        }
-    }
 }
 
 #[derive(Clone, Copy, Debug)]
@@ -224,17 +186,6 @@ fn bake_elements(
     skip_flat: bool,
 ) -> Result<Vec<ModelQuad>> {
     let mut output = Vec::new();
-    bake_into(model, transform, skip_flat, &mut output)?;
-    Ok(output)
-}
-/// The elements, then what the model's loader adds.
-fn bake_into(
-    model: &ResolvedCuboidModel,
-    transform: BlockModelTransform,
-    skip_flat: bool,
-    output: &mut Vec<ModelQuad>,
-) -> Result<()> {
-    let render_type = model.render_type.as_deref().and_then(RenderType::by_name);
     for element in model.elements() {
         let element = element
             .as_ref()
@@ -256,108 +207,11 @@ fn bake_into(
                 force_translucent: false,
             });
             output.push(bake_face(
-                element,
-                face,
-                *direction,
-                matrix,
-                material,
-                transform,
-                render_type,
+                element, face, *direction, matrix, material, transform,
             )?);
         }
     }
-    match model.loader() {
-        Some(ResolvedLoader::Composite(children)) => {
-            for child in children {
-                bake_into(child, transform, skip_flat, output)?;
-            }
-        }
-        Some(ResolvedLoader::Obj {
-            model: Some(obj),
-            flip_v,
-            shade,
-            hidden,
-        }) => bake_obj(model, obj, *flip_v, *shade, hidden, transform, output)?,
-        Some(ResolvedLoader::Obj { model: None, .. }) | None => {}
-    }
-    Ok(())
-}
-/// Obj faces are unculled quads in block units; the blockstate transform moves them whole.
-fn bake_obj(
-    model: &ResolvedCuboidModel,
-    obj: &ObjModel,
-    flip_v: bool,
-    shade: bool,
-    hidden: &std::collections::BTreeSet<String>,
-    transform: BlockModelTransform,
-    output: &mut Vec<ModelQuad>,
-) -> Result<()> {
-    let render_type = model.render_type.as_deref().and_then(RenderType::by_name);
-    for face in obj.faces.iter().filter(|f| !hidden.contains(&f.object)) {
-        let slot = match obj.materials.get(&face.material) {
-            Some(MtlTexture::Sprite(sprite)) => {
-                output.push(obj_quad(
-                    face,
-                    Material {
-                        sprite: identifier(sprite)?,
-                        force_translucent: false,
-                    },
-                    flip_v,
-                    shade,
-                    render_type,
-                    transform,
-                ));
-                continue;
-            }
-            Some(MtlTexture::Slot(slot)) => slot,
-            None => &face.material,
-        };
-        let material = if slot.is_empty() {
-            None
-        } else {
-            model.material(slot)?
-        };
-        let material = material.cloned().unwrap_or(Material {
-            sprite: "minecraft:missingno".to_owned(),
-            force_translucent: false,
-        });
-        output.push(obj_quad(
-            face,
-            material,
-            flip_v,
-            shade,
-            render_type,
-            transform,
-        ));
-    }
-    Ok(())
-}
-fn obj_quad(
-    face: &ObjFace,
-    material: Material,
-    flip_v: bool,
-    shade: bool,
-    render_type: Option<RenderType>,
-    transform: BlockModelTransform,
-) -> ModelQuad {
-    let positions = face.vertices.map(|v| transform.position(v.position));
-    ModelQuad {
-        positions,
-        uv: face
-            .vertices
-            .map(|v| [v.uv[0], if flip_v { 1.0 - v.uv[1] } else { v.uv[1] }]),
-        facing: facing(&positions).unwrap_or(Direction::Up),
-        cull: None,
-        material,
-        tint_index: -1,
-        shade_direction_override: None,
-        light_emission: 0,
-        light: [0; 2],
-        color: None,
-        ambient_occlusion: None,
-        render_type,
-        shade,
-    }
+    Ok(output)
 }
 /// `FaceBakery.bakeQuad` for a quad with explicit corners and unit-atlas UVs
 /// (`uv` in 0..16 texels), as `ItemModelGenerator` builds its layers.
@@ -376,7 +230,6 @@ pub fn bake_flat_face(
         rotation: None,
         shade_direction_override: None,
         light_emission: 0,
-        neoforge_data: None,
     };
     let face = Face {
         cull: None,
@@ -384,8 +237,6 @@ pub fn bake_flat_face(
         texture: String::new(),
         uv: Some(uv),
         rotation: 0,
-        light_emission: None,
-        neoforge_data: None,
     };
     bake_face(
         &element,
@@ -394,7 +245,6 @@ pub fn bake_flat_face(
         None,
         material,
         BlockModelTransform::new([0; 3], false),
-        None,
     )
 }
 fn bake_face(
@@ -404,7 +254,6 @@ fn bake_face(
     matrix: Option<ElementMatrix>,
     material: Material,
     transform: BlockModelTransform,
-    render_type: Option<RenderType>,
 ) -> Result<ModelQuad> {
     let mut positions = corners(element.from, element.to, direction).map(|v| v.map(|c| c / 16.0));
     if let (Some(rotation), Some(matrix)) = (&element.rotation, matrix) {
@@ -454,11 +303,6 @@ fn bake_face(
             uv.swap(index, found);
         }
     }
-    let data = face
-        .neoforge_data
-        .unwrap_or_default()
-        .over(element.neoforge_data.unwrap_or_default());
-    let light_emission = face.light_emission.unwrap_or(element.light_emission);
     Ok(ModelQuad {
         positions,
         uv,
@@ -467,196 +311,6 @@ fn bake_face(
         material,
         tint_index: face.tint_index,
         shade_direction_override: element.shade_direction_override,
-        light_emission,
-        light: [data.block_light, data.sky_light].map(|l| l.unwrap_or(0).max(light_emission)),
-        color: data.color,
-        ambient_occlusion: data.ambient_occlusion,
-        render_type,
-        shade: true,
+        light_emission: element.light_emission,
     })
 }
-
-#[cfg(test)]
-mod loader_tests {
-    use super::*;
-    use crate::resolve::{AssetReader, ModelLibrary};
-    use std::{collections::BTreeMap, sync::Arc};
-
-    struct Files(BTreeMap<&'static str, &'static str>);
-    impl AssetReader for Files {
-        fn read_text(&self, location: &str) -> Option<String> {
-            self.0.get(location).map(|text| (*text).to_owned())
-        }
-    }
-
-    fn library(models: &[(&str, &str)], files: &[(&'static str, &'static str)]) -> ModelLibrary {
-        let models = models
-            .iter()
-            .map(|(name, json)| ((*name).to_owned(), CuboidModel::from_json(json).unwrap()))
-            .collect();
-        ModelLibrary::new(models)
-            .unwrap()
-            .with_assets(Arc::new(Files(files.iter().copied().collect())))
-    }
-    fn bake(library: &ModelLibrary, name: &str) -> Vec<ModelQuad> {
-        bake_block_model(
-            &library.resolve(name).unwrap(),
-            BlockModelTransform::new([0; 3], false),
-        )
-        .unwrap()
-    }
-    fn sprites(quads: &[ModelQuad]) -> Vec<&str> {
-        quads.iter().map(|q| q.material.sprite.as_str()).collect()
-    }
-    const CUBE: &str =
-        r##"{"elements":[{"from":[0,0,0],"to":[16,16,16],"faces":{"up":{"texture":"#all"}}}]}"##;
-    const COMPOSITE: &str = r#"{"loader":"neoforge:composite","textures":{"all":"block/shared"},
-        "children":{"zeta":{"parent":"t:cube","textures":{"all":"block/own"}},"alpha":{"parent":"t:cube"}}}"#;
-
-    #[test]
-    fn composite_bakes_children_in_document_order_with_slot_fallback() {
-        let library = library(&[("t:cube", CUBE), ("t:comp", COMPOSITE)], &[]);
-        let quads = bake(&library, "t:comp");
-        assert_eq!(
-            sprites(&quads),
-            ["minecraft:block/own", "minecraft:block/shared"]
-        );
-    }
-    #[test]
-    fn composite_visibility_hides_a_child() {
-        let hidden =
-            COMPOSITE.replace(r#""children""#, r#""visibility":{"zeta":false},"children""#);
-        let library = library(&[("t:cube", CUBE), ("t:comp", &hidden)], &[]);
-        assert_eq!(
-            sprites(&bake(&library, "t:comp")),
-            ["minecraft:block/shared"]
-        );
-    }
-    #[test]
-    fn an_inheriting_model_overrides_which_children_are_visible() {
-        let hidden =
-            COMPOSITE.replace(r#""children""#, r#""visibility":{"zeta":false},"children""#);
-        let shown = r#"{"parent":"t:hidden","visibility":{"zeta":true,"alpha":false}}"#;
-        let library = library(
-            &[("t:cube", CUBE), ("t:hidden", &hidden), ("t:shown", shown)],
-            &[],
-        );
-        assert_eq!(sprites(&bake(&library, "t:shown")), ["minecraft:block/own"]);
-    }
-    #[test]
-    fn loader_is_inherited_by_parent_after_own_elements() {
-        let derived = r##"{"parent":"t:comp","textures":{"all":"block/derived"},
-            "elements":[{"from":[0,0,0],"to":[16,16,16],"faces":{"down":{"texture":"#all"}}}]}"##;
-        let library = library(
-            &[
-                ("t:cube", CUBE),
-                ("t:comp", COMPOSITE),
-                ("t:derived", derived),
-            ],
-            &[],
-        );
-        let quads = bake(&library, "t:derived");
-        assert_eq!(quads[0].facing, Direction::Down);
-        assert_eq!(
-            sprites(&quads),
-            [
-                "minecraft:block/derived",
-                "minecraft:block/own",
-                "minecraft:block/derived"
-            ]
-        );
-    }
-    #[test]
-    fn own_loader_wins_and_unknown_loader_adds_nothing() {
-        let other = r#"{"parent":"t:comp","loader":"somemod:thing"}"#;
-        let library = library(
-            &[("t:cube", CUBE), ("t:comp", COMPOSITE), ("t:other", other)],
-            &[],
-        );
-        assert!(bake(&library, "t:other").is_empty());
-    }
-    #[test]
-    fn composites_that_nest_through_themselves_are_an_error() {
-        let looping = r#"{"loader":"neoforge:composite","children":{"a":{"parent":"t:loop"}}}"#;
-        let library = library(&[("t:loop", looping)], &[]);
-        assert!(library.resolve("t:loop").is_err());
-    }
-
-    const OBJ: &str = "mtllib m.mtl\nv 0 0 0\nv 1 0 0\nv 1 0 1\nv 0 0 1\nv 0 1 0\n\
-        vt 0 0\nvt 1 0\nvt 1 1\nvt 0 1\n\
-        usemtl top\nf 1/1 4/4 3/3 2/2\nusemtl side\nf 1/1 2/2 5/4\nusemtl bare\nf 1/1 2/2 5/4\n";
-    const MTL: &str = "newmtl top\nmap_Kd #lid\nnewmtl side\nmap_Kd #wall\nnewmtl bare\nKd 1 1 1\n";
-    const OBJ_FILES: [(&str, &str); 2] = [("t:models/x.obj", OBJ), ("t:models/m.mtl", MTL)];
-    const OBJ_MODEL: &str = r#"{"loader":"neoforge:obj","model":"t:models/x.obj","flip_v":true,
-        "textures":{"lid":"block/lid","wall":"block/wall"}}"#;
-
-    #[test]
-    fn obj_faces_become_quads_with_materials_and_flipped_v() {
-        let flat = OBJ_MODEL.replace(r#""flip_v":true,"#, "");
-        let library = library(&[("t:o", OBJ_MODEL), ("t:flat", &flat)], &OBJ_FILES);
-        let quads = bake(&library, "t:o");
-        assert_eq!(
-            sprites(&quads),
-            [
-                "minecraft:block/lid",
-                "minecraft:block/wall",
-                "minecraft:missingno"
-            ]
-        );
-        assert_eq!(quads[0].facing, Direction::Up);
-        assert_eq!(quads[1].facing, Direction::South);
-        assert_eq!(quads[0].positions[1], [0.0, 0.0, 1.0]);
-        assert_eq!(quads[0].uv[0], [0.0, 1.0]);
-        assert_eq!(quads[0].uv[2], [1.0, 0.0]);
-        // A triangle repeats its last vertex.
-        assert_eq!(quads[1].positions[3], quads[1].positions[2]);
-        assert_eq!(quads[1].uv[3], quads[1].uv[2]);
-        assert!(quads.iter().all(|q| q.cull.is_none() && q.shade));
-        assert_eq!(bake(&library, "t:flat")[0].uv[0], [0.0, 0.0]);
-    }
-    #[test]
-    fn obj_shade_quads_false_and_mtl_override() {
-        let unshaded = r#"{"loader":"neoforge:obj","model":"t:models/x.obj","shade_quads":false,
-            "mtl_override":"t:models/o.mtl","textures":{"s":"block/s"}}"#;
-        let files = [
-            ("t:models/x.obj", OBJ),
-            ("t:models/o.mtl", "newmtl top\nmap_Kd #s\n"),
-        ];
-        let library = library(&[("t:u", unshaded)], &files);
-        let quads = bake(&library, "t:u");
-        assert!(quads.iter().all(|q| !q.shade));
-        assert_eq!(quads[0].material.sprite, "minecraft:block/s");
-    }
-    #[test]
-    fn missing_or_broken_obj_bakes_nothing() {
-        let missing = library(&[("t:o", OBJ_MODEL)], &[]);
-        assert!(bake(&missing, "t:o").is_empty());
-        let broken = library(
-            &[("t:o", OBJ_MODEL)],
-            &[("t:models/x.obj", "v 0 0 0\nf 1 2 3\n")],
-        );
-        assert!(bake(&broken, "t:o").is_empty());
-    }
-    #[test]
-    fn obj_visibility_skips_the_objects_a_model_hides() {
-        let two = "v 0 0 0\nv 1 0 0\nv 1 0 1\nv 0 0 1\no a\nusemtl m\nf 1 2 3 4\no b\nf 4 3 2 1\n";
-        let files = [("t:models/two.obj", two)];
-        let base =
-            r#"{"loader":"neoforge:obj","model":"t:models/two.obj","textures":{"m":"block/m"}}"#;
-        let hiding = r#"{"parent":"t:base","visibility":{"b":false}}"#;
-        let restoring = r#"{"parent":"t:hiding","visibility":{"b":true}}"#;
-        let library = library(
-            &[
-                ("t:base", base),
-                ("t:hiding", hiding),
-                ("t:restoring", restoring),
-            ],
-            &files,
-        );
-        assert_eq!(bake(&library, "t:base").len(), 2);
-        let quads = bake(&library, "t:hiding");
-        assert_eq!(quads.len(), 1);
-        assert_eq!(quads[0].facing, Direction::Down);
-        assert_eq!(bake(&library, "t:restoring").len(), 2);
-    }
-}

crates/horizon-assets/src/item_bake.rs

@@ -7,7 +7,7 @@ use crate::{
     json::Result,
     math::{Mat4, quaternion_xyz},
     model::{Direction, DisplayTransform, GuiLight, ItemTransform, Material},
-    resolve::{ModelLibrary, ResolvedCuboidModel},
+    resolve::ModelLibrary,
 };
 use std::{collections::BTreeSet, f32::consts::PI};
 
@@ -110,15 +110,6 @@ pub fn bake_item_model(
     let model = library
         .resolve(name)
         .or_else(|_| library.resolve(crate::resolve::MISSING_MODEL))?;
-    bake_resolved(&model, sprites)
-}
-
-/// Bake an already resolved model, e.g. one from
-/// [`ModelLibrary::resolve_with_textures`].
-pub fn bake_resolved(
-    model: &ResolvedCuboidModel,
-    sprites: &dyn SpriteLookup,
-) -> Result<BakedItemModel> {
     let known = |sprite: &str| sprite == MISSING_SPRITE || sprites.mask(sprite).is_some();
     let material = |m: &Material| {
         if known(&m.sprite) {
@@ -152,7 +143,7 @@ pub fn bake_resolved(
         quads
     } else {
         let mut quads =
-            bake_block_model(model, crate::bake::BlockModelTransform::new([0; 3], false))?;
+            bake_block_model(&model, crate::bake::BlockModelTransform::new([0; 3], false))?;
         for q in &mut quads {
             q.material = material(&q.material);
         }
@@ -307,87 +298,3 @@ fn extrude_layer(mask: &SpriteMask, material: &Material, layer: i32) -> Result<V
     }
     Ok(quads)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::model::{CuboidModel, TextureSlot};
-    use std::collections::BTreeMap;
-
-    /// The stick: 2x2 with one transparent pixel. `item/cit`: one opaque pixel, so a bake
-    /// shows whose mask it extruded.
-    struct Sprites;
-    impl SpriteLookup for Sprites {
-        fn mask(&self, sprite: &str) -> Option<SpriteMask> {
-            match sprite {
-                "minecraft:item/stick" => Some(SpriteMask {
-                    width: 2,
-                    height: 2,
-                    frames: vec![vec![true, false, false, false]],
-                }),
-                "horizon_cit:item/cit" => Some(SpriteMask {
-                    width: 1,
-                    height: 1,
-                    frames: vec![vec![false]],
-                }),
-                _ => None,
-            }
-        }
-    }
-    fn library() -> ModelLibrary {
-        ModelLibrary::with_item_generator(BTreeMap::from(
-            [
-                ("item/generated", r#"{"parent":"builtin/generated","display":{"gui":{"scale":[2,2,2]}}}"#),
-                ("item/stick", r#"{"parent":"item/generated","textures":{"layer0":"item/stick"}}"#),
-                ("horizon:loop", r#"{"parent":"horizon:loop2"}"#),
-                ("horizon:loop2", r#"{"parent":"horizon:loop"}"#),
-                ("block/slab", r##"{"textures":{"particle":"#side","side":"block/absent"},"elements":[{"from":[0,0,0],"to":[16,8,16],"faces":{"up":{"texture":"#side"},"down":{"texture":"#side","cullface":"down"}}}]}"##),
-            ]
-            .map(|(name, json)| (name.to_owned(), CuboidModel::from_json(json).unwrap())),
-        ))
-        .unwrap()
-    }
-    #[test]
-    fn baking_by_name_falls_back_to_the_missing_model() {
-        let library = library();
-        // Front, back, and the 8 unit edges around the L of 3 opaque pixels.
-        let stick = bake_item_model(&library, &Sprites, "item/stick").unwrap();
-        assert_eq!(stick.quads.len(), 10);
-        // An unknown sprite bakes as the missing sprite.
-        let slab = bake_item_model(&library, &Sprites, "block/slab").unwrap();
-        assert_eq!(slab.quads.len(), 2);
-        assert_eq!(slab.particle.sprite, MISSING_SPRITE);
-        // A cyclic chain, an error to `resolve`, bakes as the missing cube.
-        let cyclic = bake_item_model(&library, &Sprites, "horizon:loop").unwrap();
-        assert_eq!(cyclic.quads.len(), 6);
-        assert!(
-            cyclic
-                .quads
-                .iter()
-                .all(|q| q.material.sprite == MISSING_SPRITE)
-        );
-    }
-    #[test]
-    fn replaced_layer_bakes_with_its_own_sprite() {
-        let library = library();
-        let child = BTreeMap::from([(
-            "layer0".to_owned(),
-            TextureSlot::Material(Material {
-                sprite: "horizon_cit:item/cit".to_owned(),
-                force_translucent: false,
-            }),
-        )]);
-        let model = library.resolve_with_textures("item/stick", &child).unwrap();
-        let baked = bake_resolved(&model, &Sprites).unwrap();
-        // The CIT sprite's own mask, one opaque pixel: front, back and 4 edges.
-        assert_eq!(baked.quads.len(), 6);
-        assert!(
-            baked
-                .quads
-                .iter()
-                .all(|q| q.material.sprite == "horizon_cit:item/cit")
-        );
-        assert_eq!(baked.particle.sprite, "horizon_cit:item/cit");
-        assert_eq!(baked.transforms[5].as_ref().unwrap().scale, [2.0; 3]);
-    }
-}

crates/horizon-assets/src/item_model.rs

@@ -16,8 +16,6 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-mod component_predicate;
-mod foreign;
 mod special;
 pub use special::{SpecialKind, SpecialModel};
 
@@ -432,17 +430,6 @@ impl ItemModelNode {
     pub fn decode(v: &Value) -> Result<Self> {
         let m = object(v)?;
         let kind = ident(required(m, "type")?)?;
-        if kind == "minecraft:condition" {
-            let property = ident(required(m, "property")?)?;
-            if !property.starts_with("minecraft:") {
-                return Ok(Self::Condition {
-                    transformation: optional_transformation(m)?,
-                    property: ConditionProperty::Custom(property),
-                    on_true: Box::new(Self::decode(required(m, "on_true")?)?),
-                    on_false: Box::new(Self::decode(required(m, "on_false")?)?),
-                });
-            }
-        }
         Ok(match kind.as_str() {
             "minecraft:empty" => Self::Empty,
             "minecraft:model" => Self::Model(ModelLeaf {
@@ -463,21 +450,12 @@ impl ItemModelNode {
                     .collect::<Result<_>>()?,
                 transformation: optional_transformation(m)?,
             },
-            "minecraft:condition" if foreign::property_is_foreign(m)? => foreign::wrap(
-                Self::decode(required(m, "on_false")?)?,
-                optional_transformation(m)?,
-            ),
             "minecraft:condition" => Self::Condition {
                 transformation: optional_transformation(m)?,
                 property: ConditionProperty::decode(m)?,
                 on_true: Box::new(Self::decode(required(m, "on_true")?)?),
                 on_false: Box::new(Self::decode(required(m, "on_false")?)?),
             },
-            "minecraft:select" if foreign::property_is_foreign(m)? => {
-                // No case can match a property Horizon cannot read.
-                let fallback = get(m, "fallback").map(Self::decode).transpose()?;
-                foreign::wrap(fallback.unwrap_or(Self::Empty), optional_transformation(m)?)
-            }
             "minecraft:select" => {
                 let transformation = optional_transformation(m)?;
                 let property = SelectProperty::decode(m)?;
@@ -505,7 +483,6 @@ impl ItemModelNode {
                 }
             }
             "minecraft:range_dispatch" => {
-                let foreign_property = foreign::property_is_foreign(m)?;
                 let mut entries = list(required(m, "entries")?)?
                     .iter()
                     .map(|e| {
@@ -518,17 +495,6 @@ impl ItemModelNode {
                     .collect::<Result<Vec<_>>>()?;
                 // `Comparator.comparingDouble`: Double.compare, a total order.
                 entries.sort_by(|a, b| f64::from(a.0).total_cmp(&f64::from(b.0)));
-                if foreign_property {
-                    // A property Horizon cannot read is 0.
-                    let fallback = get(m, "fallback").map(Self::decode).transpose()?;
-                    let chosen = last_index_less_or_equal(&entries, 0.0)
-                        .map(|i| entries.swap_remove(i).1)
-                        .or(fallback);
-                    return Ok(foreign::wrap(
-                        chosen.unwrap_or(Self::Empty),
-                        optional_transformation(m)?,
-                    ));
-                }
                 Self::RangeDispatch {
                     transformation: optional_transformation(m)?,
                     property: NumericProperty::decode(m)?,
@@ -539,21 +505,12 @@ impl ItemModelNode {
                         .transpose()?,
                 }
             }
-            "minecraft:special" if SpecialModel::is_foreign(required(m, "model")?) => {
-                // The mod's own renderer is not run: the base model stands in.
-                Self::Model(ModelLeaf {
-                    model: ident(required(m, "base")?)?,
-                    transformation: optional_transformation(m)?,
-                    tints: Vec::new(),
-                })
-            }
             "minecraft:special" => Self::Special {
                 base: ident(required(m, "base")?)?,
                 transformation: optional_transformation(m)?,
                 model: SpecialModel::decode(required(m, "model")?)?,
             },
             "minecraft:bundle/selected_item" => Self::BundleSelectedItem,
-            other if foreign::is_foreign(other) => foreign::decode_node(other, m),
             _ => return Err(err("unknown item model type")),
         })
     }
@@ -645,8 +602,6 @@ impl TintSource {
             "minecraft:firework" => Self::Firework(default()?),
             "minecraft:potion" => Self::Potion(default()?),
             "minecraft:team" => Self::Team(default()?),
-            // A mod's own tint source, which its Java code computes: untinted here.
-            other if foreign::is_foreign(other) => Self::Constant(-1),
             _ => return Err(err("unknown item tint source")),
         })
     }
@@ -658,7 +613,6 @@ impl TintSource {
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum ConditionProperty {
-    Custom(String),
     CustomModelData(i32),
     UsingItem,
     Broken,
@@ -674,7 +628,7 @@ pub enum ConditionProperty {
     ExtendedView,
     KeybindDown(String),
     ViewEntity,
-    /// A single `component` predicate; external predicate types use the host.
+    /// A `component` predicate, evaluated by the host.
     Component(Value),
 }
 impl ConditionProperty {
@@ -697,7 +651,13 @@ impl ConditionProperty {
             "minecraft:extended_view" => Self::ExtendedView,
             "minecraft:keybind_down" => Self::KeybindDown(string(required(m, "keybind")?)?),
             "minecraft:view_entity" => Self::ViewEntity,
-            "minecraft:component" => Self::Component(component_predicate::decode(m)?),
+            "minecraft:component" => {
+                let predicate = required(m, "predicate")?;
+                if object(predicate)?.len() != 1 {
+                    return Err(err("a single component predicate is expected"));
+                }
+                Self::Component(predicate.clone())
+            }
             _ => return Err(err("unknown condition property")),
         })
     }
@@ -991,10 +951,6 @@ pub struct Context<'a> {
 
 /// Host services the resolver cannot derive from data alone.
 pub trait ItemEnv {
-    /// A mod's namespaced conditional property, false when no mod supplies it.
-    fn item_model_property(&self, _property: &str, _stack: &StackView) -> bool {
-        false
-    }
     /// `PotionContents.getColorOr` for the potion/effects part: the mixed
     /// effect colour, or `None` when the contents have no visible effects.
     fn potion_effect_color(&self, _potion_contents: &Value) -> Option<i32> {
@@ -1008,14 +964,10 @@ pub trait ItemEnv {
     fn bundle_fullness(&self, _stack: &StackView, _components: &Components) -> f32 {
         0.0
     }
-    /// Additional component predicate types supplied by the host.
+    /// `ItemStack.getMaxStackSize` when the prototype has no component.
     fn component_matches(&self, _stack: &StackView, _predicate: &Value) -> bool {
         false
     }
-    /// Membership in the level's enchantment registry tags.
-    fn enchantment_in_tag(&self, _enchantment: &str, _tag: &str) -> bool {
-        false
-    }
     fn is_keybind_down(&self, _keybind: &str) -> bool {
         false
     }
@@ -1348,9 +1300,6 @@ impl Resolve<'_> {
     fn condition(&self, property: &ConditionProperty) -> bool {
         let owner = self.ctx.owner;
         match property {
-            ConditionProperty::Custom(property) => {
-                self.env.item_model_property(property, self.stack)
-            }
             ConditionProperty::CustomModelData(i) => {
                 self.component("minecraft:custom_model_data")
                     .and_then(|d| custom_data_at(d, "flags", *i))
@@ -1386,8 +1335,7 @@ impl Resolve<'_> {
             ConditionProperty::KeybindDown(key) => self.env.is_keybind_down(key),
             ConditionProperty::ViewEntity => owner.is_some_and(|o| o.is_view_entity),
             ConditionProperty::Component(predicate) => {
-                component_predicate::matches(predicate, self.components, self.env)
-                    .unwrap_or_else(|| self.env.component_matches(self.stack, predicate))
+                self.env.component_matches(self.stack, predicate)
             }
         }
     }
@@ -1769,7 +1717,5 @@ fn binary_search(a: &[f32], key: f32) -> std::result::Result<usize, usize> {
     Err(low as usize)
 }
 
-#[cfg(test)]
-mod foreign_tests;
 #[cfg(test)]
 mod tests;

crates/horizon-assets/src/item_model/component_predicate.rs

@@ -1,177 +0,0 @@
-//! Component conditions used by enchantment-dependent item models.
-use super::*;
-
-/// `DataComponentPredicate.singleCodec`: a single predicate's type discriminator
-/// (`predicate`) and its wrapped codec's separate `value` field.
-pub(super) fn decode(m: &Map<String, Value>) -> Result<Value> {
-    let id = component_type(required(m, "predicate")?)?;
-    let mut value = required(m, "value")?.clone();
-    if matches!(
-        id.as_str(),
-        "minecraft:enchantments" | "minecraft:stored_enchantments"
-    ) {
-        let mut entries = Vec::new();
-        for entry in list(&value)? {
-            let mut entry = object(entry)?.clone();
-            if let Some(selector) = get(&entry, "enchantments") {
-                let selector = match selector {
-                    Value::Array(ids) => Value::Array(
-                        ids.iter()
-                            .map(ident)
-                            .map(|r| r.map(Value::String))
-                            .collect::<Result<_>>()?,
-                    ),
-                    Value::String(name) if name.starts_with('#') => {
-                        Value::String(format!("#{}", identifier(&name[1..])?))
-                    }
-                    _ => Value::String(ident(selector)?),
-                };
-                entry.insert("enchantments".into(), selector);
-            }
-            if let Some(levels) = get(&entry, "levels") {
-                let levels = if levels.is_object() {
-                    let mut bounds = Map::new();
-                    for key in ["min", "max"] {
-                        if let Some(n) = get(object(levels)?, key) {
-                            bounds.insert(key.into(), Value::from(int(n)?));
-                        }
-                    }
-                    // MinMaxBounds.Bounds.validateSwappedBoundsInCodec.
-                    if bounds
-                        .get("min")
-                        .and_then(Value::as_i64)
-                        .zip(bounds.get("max").and_then(Value::as_i64))
-                        .is_some_and(|(min, max)| min > max)
-                    {
-                        return Err(err("minimum exceeds maximum"));
-                    }
-                    Value::Object(bounds)
-                } else {
-                    Value::from(int(levels)?)
-                };
-                entry.insert("levels".into(), levels);
-            }
-            entries.push(Value::Object(entry));
-        }
-        value = Value::Array(entries);
-    }
-    Ok(Value::Object(Map::from_iter([(id, value)])))
-}
-
-/// `EnchantmentsPredicate.matches` and `EnchantmentPredicate.containedIn`:
-/// all entries must match; each entry needs one selected, present enchantment
-/// with a matching level. An empty predicate list still needs the component.
-pub(super) fn matches(
-    predicate: &Value,
-    components: &Components,
-    env: &dyn ItemEnv,
-) -> Option<bool> {
-    let (id, expected) = predicate.as_object()?.iter().next()?;
-    if !matches!(
-        id.as_str(),
-        "minecraft:enchantments" | "minecraft:stored_enchantments"
-    ) {
-        return None;
-    }
-    let Some(have) = components.get(id).and_then(Value::as_object) else {
-        return Some(false);
-    };
-    Some(expected.as_array()?.iter().all(|entry| {
-        let Some(entry) = entry.as_object() else {
-            return false;
-        };
-        have.iter().any(|(id, level)| {
-            let level = level.as_i64().unwrap_or(0);
-            let selector = get(entry, "enchantments");
-            let selected = match selector {
-                None => true,
-                Some(Value::String(s)) => s
-                    .strip_prefix('#')
-                    .map_or(s == id, |tag| env.enchantment_in_tag(id, tag)),
-                Some(Value::Array(ids)) => ids.iter().any(|s| s.as_str() == Some(id)),
-                _ => false,
-            };
-            selected
-                && if selector.is_some() {
-                    matches_enchantment(level, get(entry, "levels"))
-                } else {
-                    level_matches(level, get(entry, "levels"))
-                }
-        })
-    }))
-}
-
-/// `EnchantmentPredicate.matchesEnchantment`: a named enchantment needs a
-/// nonzero level even when its bounds accept zero.
-fn matches_enchantment(level: i64, bounds: Option<&Value>) -> bool {
-    level != 0 && level_matches(level, bounds)
-}
-
-/// `MinMaxBounds.Ints.matches`: inclusive bounds, or an exact integer.
-fn level_matches(level: i64, bounds: Option<&Value>) -> bool {
-    match bounds {
-        None => true,
-        Some(Value::Number(n)) => n.as_i64() == Some(level),
-        Some(Value::Object(bounds)) => {
-            get(bounds, "min")
-                .and_then(Value::as_i64)
-                .is_none_or(|min| level >= min)
-                && get(bounds, "max")
-                    .and_then(Value::as_i64)
-                    .is_none_or(|max| level <= max)
-        }
-        _ => false,
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use serde_json::json;
-
-    struct Tags;
-    impl ItemEnv for Tags {
-        fn enchantment_in_tag(&self, enchantment: &str, tag: &str) -> bool {
-            enchantment == "minecraft:density" && tag == "horizon:mace"
-        }
-    }
-
-    #[test]
-    fn unnamed_predicates_inspect_entries_but_named_ones_require_a_nonzero_level() {
-        let components = Components::from_iter([(
-            "minecraft:enchantments".into(),
-            json!({"minecraft:density":0}),
-        )]);
-        assert_eq!(
-            matches(&json!({"minecraft:enchantments":[{}]}), &components, &NoEnv),
-            Some(true)
-        );
-        assert_eq!(
-            matches(
-                &json!({"minecraft:enchantments":[{"enchantments":"minecraft:density"}]}),
-                &components,
-                &NoEnv
-            ),
-            Some(false)
-        );
-    }
-
-    #[test]
-    fn enchantment_selectors_use_the_hosts_registry_tags() {
-        let condition = json!({"predicate":"enchantments", "value":[
-            {"enchantments":"#horizon:mace", "levels":{"min":3}}
-        ]});
-        let predicate = decode(condition.as_object().unwrap()).unwrap();
-        let mut components = Components::from_iter([(
-            "minecraft:enchantments".into(),
-            json!({"minecraft:density":3}),
-        )]);
-        assert_eq!(matches(&predicate, &components, &Tags), Some(true));
-        assert_eq!(matches(&predicate, &components, &NoEnv), Some(false));
-        components.insert(
-            "minecraft:enchantments".into(),
-            json!({"minecraft:density":2}),
-        );
-        assert_eq!(matches(&predicate, &components, &Tags), Some(false));
-    }
-}

crates/horizon-assets/src/item_model/foreign.rs

@@ -1,114 +0,0 @@
-//! Nodes and properties of other namespaces (a mod's, NeoForge's) decode to the closest vanilla behaviour.
-use super::{
-    ItemModelNode, ModelLeaf, Result, TintSource, get, ident, identifier, list, object,
-    optional_transformation,
-};
-use crate::{json::error as err, math::Mat4};
-use serde_json::{Map, Value};
-
-/// Keys a mod's node usually keeps its real model under, in order of preference.
-const MODEL_KEYS: [&str; 4] = ["model", "base_model", "base", "fallback"];
-
-pub fn is_foreign(id: &str) -> bool {
-    !id.starts_with("minecraft:")
-}
-
-/// A composite carries the transformation a collapsed node had.
-pub fn wrap(node: ItemModelNode, transformation: Option<Mat4>) -> ItemModelNode {
-    match transformation {
-        None => node,
-        Some(_) => ItemModelNode::Composite {
-            models: vec![node],
-            transformation,
-        },
-    }
-}
-
-pub fn property_is_foreign(m: &Map<String, Value>) -> Result<bool> {
-    let property = m
-        .get("property")
-        .ok_or_else(|| err("missing property"))
-        .and_then(ident)?;
-    Ok(is_foreign(&property))
-}
-
-fn leaf(model: String, m: &Map<String, Value>) -> ItemModelNode {
-    let tints = get(m, "tints")
-        .and_then(|t| list(t).ok())
-        .map(|t| {
-            t.iter()
-                .filter_map(|t| TintSource::decode(t).ok())
-                .collect()
-        })
-        .unwrap_or_default();
-    ItemModelNode::Model(ModelLeaf {
-        model,
-        transformation: optional_transformation(m).ok().flatten(),
-        tints,
-    })
-}
-
-/// A node of an unknown non-vanilla type: its nested node, else its model id, else nothing.
-pub fn decode_node(kind: &str, m: &Map<String, Value>) -> ItemModelNode {
-    if kind == "neoforge:fluid_container" {
-        return fluid_container(m);
-    }
-    for key in MODEL_KEYS {
-        match m.get(key) {
-            Some(nested @ Value::Object(_)) => {
-                if let Ok(node) = ItemModelNode::decode(nested) {
-                    return wrap(node, optional_transformation(m).ok().flatten());
-                }
-            }
-            Some(Value::String(id)) => {
-                if let Ok(id) = identifier(id) {
-                    return leaf(id, m);
-                }
-            }
-            _ => {}
-        }
-    }
-    let by_suffix = m
-        .iter()
-        .filter(|(k, _)| k.ends_with("_model"))
-        .find_map(|(_, v)| v.as_str().and_then(|id| identifier(id).ok()));
-    match by_suffix {
-        Some(id) => leaf(id, m),
-        None => ItemModelNode::Empty,
-    }
-}
-
-// The fluid is not drawn: only the base (and an unmasked cover) texture, taken as a model id (a bucket's).
-fn fluid_container(m: &Map<String, Value>) -> ItemModelNode {
-    let textures = m.get("textures").and_then(|t| object(t).ok());
-    let texture = |key: &str| {
-        textures
-            .and_then(|t| t.get(key))
-            .and_then(Value::as_str)
-            .and_then(|id| identifier(id).ok())
-    };
-    let mut layers = vec![texture("base")];
-    if m.get("cover_is_mask") == Some(&Value::Bool(false)) {
-        layers.push(texture("cover"));
-    }
-    let mut models: Vec<ItemModelNode> = layers
-        .into_iter()
-        .flatten()
-        .map(|model| {
-            ItemModelNode::Model(ModelLeaf {
-                model,
-                transformation: None,
-                tints: Vec::new(),
-            })
-        })
-        .collect();
-    let transformation = optional_transformation(m).ok().flatten();
-    match models.len() {
-        0 => ItemModelNode::Empty,
-        1 => wrap(models.remove(0), transformation),
-        _ => ItemModelNode::Composite {
-            models,
-            transformation,
-        },
-    }
-}

crates/horizon-assets/src/item_model/foreign_tests.rs

@@ -1,185 +0,0 @@
-use super::*;
-
-fn node(json: &str) -> Result<ItemModelNode> {
-    ItemModelNode::decode(&serde_json::from_str(json).unwrap())
-}
-fn model_id(n: &ItemModelNode) -> &str {
-    match n {
-        ItemModelNode::Model(leaf) => &leaf.model,
-        other => panic!("not a model: {other:?}"),
-    }
-}
-
-#[test]
-fn node_with_a_model_id_draws_that_model() {
-    let n = node(r#"{"type":"mod:thing","model":"mod:item/thing","tints":[{"type":"mod:tint"}]}"#)
-        .unwrap();
-    assert_eq!(model_id(&n), "mod:item/thing");
-    let ItemModelNode::Model(leaf) = n else {
-        unreachable!()
-    };
-    assert_eq!(leaf.tints, vec![TintSource::Constant(-1)]);
-    let n = node(r#"{"type":"mod:thing","base_model":"mod:item/base"}"#).unwrap();
-    assert_eq!(model_id(&n), "mod:item/base");
-    let n = node(r#"{"type":"mod:thing","on_model":"mod:item/a"}"#).unwrap();
-    assert_eq!(model_id(&n), "mod:item/a");
-}
-
-#[test]
-fn node_with_a_nested_node_decodes_it() {
-    let n = node(
-        r#"{"type":"neoforge:trimmed_armor","base_model":{"type":"minecraft:model","model":"mod:item/boots"}}"#,
-    )
-    .unwrap();
-    assert_eq!(model_id(&n), "mod:item/boots");
-    let n = node(
-        r#"{"type":"mod:x","model":{"type":"mod:y","model":"mod:item/inner"},"transformation":[1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1]}"#,
-    )
-    .unwrap();
-    let ItemModelNode::Composite {
-        models,
-        transformation,
-    } = n
-    else {
-        panic!("a transformation wraps the nested node")
-    };
-    assert!(transformation.is_some());
-    assert_eq!(model_id(&models[0]), "mod:item/inner");
-}
-
-#[test]
-fn node_with_nothing_usable_is_empty() {
-    assert!(matches!(
-        node(r#"{"type":"mod:facade"}"#).unwrap(),
-        ItemModelNode::Empty
-    ));
-    assert!(matches!(
-        node(r#"{"type":"mod:x","model":7}"#).unwrap(),
-        ItemModelNode::Empty
-    ));
-    assert!(ClientItem::from_json(r#"{"model":{"type":"ae2:facade"}}"#).is_ok());
-}
-
-#[test]
-fn unknown_vanilla_names_still_fail() {
-    assert!(node(r#"{"type":"minecraft:nope"}"#).is_err());
-    assert!(node(r#"{"type":"nope","model":"a:b"}"#).is_err());
-    let leaf = r#"{"type":"minecraft:model","model":"a:b"}"#;
-    for json in [
-        format!(
-            r#"{{"type":"minecraft:condition","property":"minecraft:nope","on_true":{leaf},"on_false":{leaf}}}"#
-        ),
-        format!(
-            r#"{{"type":"minecraft:select","property":"minecraft:nope","cases":[],"fallback":{leaf}}}"#
-        ),
-        format!(
-            r#"{{"type":"minecraft:range_dispatch","property":"minecraft:nope","entries":[],"fallback":{leaf}}}"#
-        ),
-    ] {
-        assert!(node(&json).is_err(), "{json}");
-    }
-    assert!(
-        node(r#"{"type":"minecraft:special","base":"a:b","model":{"type":"minecraft:nope"}}"#)
-            .is_err()
-    );
-    assert!(ClientItem::from_json(r#"{"model":{"type":"minecraft:nope"}}"#).is_err());
-}
-
-#[test]
-fn condition_property_is_false() {
-    let n = node(
-        r#"{"type":"minecraft:condition","property":"mod:flag",
-            "on_true":{"type":"minecraft:model","model":"a:yes"},
-            "on_false":{"type":"minecraft:model","model":"a:no"}}"#,
-    )
-    .unwrap();
-    // A mod's property stays a condition its mod answers per stack
-    // (`item_model_property`); with no mod answering it, `on_false` is drawn.
-    let ItemModelNode::Condition {
-        property: ConditionProperty::Custom(property),
-        on_false,
-        ..
-    } = &n
-    else {
-        panic!("not a custom condition: {n:?}")
-    };
-    assert_eq!(property, "mod:flag");
-    assert_eq!(model_id(on_false), "a:no");
-}
-
-#[test]
-fn select_property_takes_the_fallback_or_nothing() {
-    let n = node(
-        r#"{"type":"minecraft:select","property":"mod:level",
-            "cases":[{"when":"low","model":{"type":"minecraft:model","model":"a:low"}}],
-            "fallback":{"type":"minecraft:model","model":"a:other"}}"#,
-    )
-    .unwrap();
-    assert_eq!(model_id(&n), "a:other");
-    let n = node(r#"{"type":"minecraft:select","property":"mod:level","cases":[]}"#).unwrap();
-    assert!(matches!(n, ItemModelNode::Empty));
-}
-
-#[test]
-fn range_property_reads_zero() {
-    let entry = |t: f32, m: &str| {
-        format!(r#"{{"threshold":{t},"model":{{"type":"minecraft:model","model":"{m}"}}}}"#)
-    };
-    let fallback = r#","fallback":{"type":"minecraft:model","model":"a:fb"}"#;
-    let make = |entries: &[String], fallback: &str| {
-        node(&format!(
-            r#"{{"type":"minecraft:range_dispatch","property":"mod:fill","entries":[{}]{fallback}}}"#,
-            entries.join(",")
-        ))
-        .unwrap()
-    };
-    let n = make(&[entry(0.2, "a:one"), entry(0.4, "a:two")], fallback);
-    assert_eq!(model_id(&n), "a:fb");
-    let n = make(
-        &[
-            entry(0.0, "a:zero"),
-            entry(-1.0, "a:neg"),
-            entry(0.5, "a:half"),
-        ],
-        fallback,
-    );
-    assert_eq!(model_id(&n), "a:zero");
-    let n = make(&[entry(0.2, "a:one")], "");
-    assert!(matches!(n, ItemModelNode::Empty));
-}
-
-#[test]
-fn special_type_keeps_its_base_model() {
-    let n = node(
-        r#"{"type":"minecraft:special","base":"mod:item/cube","model":{"type":"mod:energy_cube"}}"#,
-    )
-    .unwrap();
-    assert_eq!(model_id(&n), "mod:item/cube");
-    let n =
-        node(r#"{"type":"minecraft:special","base":"a:b","model":{"type":"minecraft:shield"}}"#)
-            .unwrap();
-    assert!(matches!(n, ItemModelNode::Special { .. }));
-}
-
-#[test]
-fn fluid_container_draws_its_base_without_the_fluid() {
-    let n = node(
-        r#"{"type":"neoforge:fluid_container","fluid":"mod:gas","cover_is_mask":false,"flip_gas":true,
-            "textures":{"base":"minecraft:item/bucket","fluid":"neoforge:item/mask/bucket_fluid"}}"#,
-    )
-    .unwrap();
-    assert_eq!(model_id(&n), "minecraft:item/bucket");
-    let n = node(
-        r#"{"type":"neoforge:fluid_container","cover_is_mask":false,
-            "textures":{"base":"a:item/flask","cover":"a:item/flask_cover"}}"#,
-    )
-    .unwrap();
-    let ItemModelNode::Composite { models, .. } = n else {
-        panic!("base and cover")
-    };
-    assert_eq!(models.len(), 2);
-    assert!(matches!(
-        node(r#"{"type":"neoforge:fluid_container"}"#).unwrap(),
-        ItemModelNode::Empty
-    ));
-}

crates/horizon-assets/src/item_model/special.rs

@@ -77,13 +77,6 @@ fn one_of(v: &Value, names: &[&str]) -> Result<String> {
 }
 
 impl SpecialModel {
-    /// A special model type of another namespace, which Horizon has no renderer for.
-    pub fn is_foreign(v: &Value) -> bool {
-        v.get("type")
-            .and_then(Value::as_str)
-            .and_then(|t| super::identifier(t).ok())
-            .is_some_and(|t| super::foreign::is_foreign(&t))
-    }
     pub fn decode(v: &Value) -> Result<Self> {
         let m = object(v)?;
         let float_or = |key: &str, default: f32| get(m, key).map_or(Ok(default), float);

crates/horizon-assets/src/item_model/tests.rs

@@ -18,96 +18,3 @@ fn display_context_names_round_trip() {
         assert_eq!(DisplayContext::by_name(name).unwrap().name(), name);
     }
 }
-
-#[test]
-fn a_mods_tint_source_is_untinted_and_an_unknown_vanilla_one_fails() {
-    let tint = |json: &str| TintSource::decode(&serde_json::from_str(json).unwrap());
-    assert_eq!(
-        tint(r#"{"type":"ae2:storage_cell_state"}"#).unwrap(),
-        TintSource::Constant(-1)
-    );
-    assert!(tint(r#"{"type":"minecraft:nonsense"}"#).is_err());
-}
-
-#[test]
-fn custom_condition_is_evaluated_per_stack_at_branch_selection() {
-    struct Env;
-    impl ItemEnv for Env {
-        fn item_model_property(&self, property: &str, stack: &StackView) -> bool {
-            assert_eq!(property, "example:charged");
-            stack.count > 1 && stack.patch.get("example:charged") == Some(&Some(Value::Bool(true)))
-        }
-    }
-    let definition = ClientItem::from_json(
-        r#"{"model":{
-        "type":"minecraft:condition", "property":"example:charged",
-        "on_true":{"type":"minecraft:model","model":"example:item/charged"},
-        "on_false":{"type":"minecraft:model","model":"example:item/idle"}
-    }}"#,
-    )
-    .unwrap();
-    let mut models = ItemModels::default();
-    models.definitions.insert("example:tool".into(), definition);
-    models.prototypes.insert(
-        "example:tool".into(),
-        BTreeMap::from([(
-            "minecraft:item_model".into(),
-            Value::String("example:tool".into()),
-        )]),
-    );
-    let context = Context {
-        display: DisplayContext::Gui,
-        owner: None,
-        level: None,
-        seed: 0,
-    };
-    let mut stack = StackView::new("example:tool", 1);
-    let chosen = |stack: &StackView, env: &dyn ItemEnv| {
-        let resolved = models.resolve(stack, &context, env);
-        assert_eq!(resolved.layers.len(), 1);
-        let LayerContent::Model { model } = &resolved.layers[0].content else {
-            panic!("expected model leaf")
-        };
-        model.clone()
-    };
-    assert_eq!(chosen(&stack, &NoEnv), "example:item/idle");
-    assert_eq!(chosen(&stack, &Env), "example:item/idle");
-    stack
-        .patch
-        .insert("example:charged".into(), Some(Value::Bool(true)));
-    assert_eq!(chosen(&stack, &Env), "example:item/idle");
-    stack.count = 2;
-    assert_eq!(chosen(&stack, &Env), "example:item/charged");
-    assert_eq!(chosen(&stack, &NoEnv), "example:item/idle");
-    stack.patch.insert("example:charged".into(), None);
-    assert_eq!(chosen(&stack, &Env), "example:item/idle");
-}
-
-#[test]
-fn custom_condition_validates_its_name_and_both_branches() {
-    let node = |property: &str, on_true: Value| {
-        ItemModelNode::decode(&serde_json::json!({
-            "type": "minecraft:condition", "property": property,
-            "on_true": on_true, "on_false": {"type": "minecraft:empty"}
-        }))
-    };
-    let empty = serde_json::json!({"type": "minecraft:empty"});
-    for name in [
-        "minecraft:unknown",
-        "unknown",
-        "example:Bad",
-        "bad name:charged",
-    ] {
-        assert!(node(name, empty.clone()).is_err(), "{name}");
-    }
-    assert!(node("example:charged", Value::Null).is_err());
-    assert!(matches!(
-        node("minecraft:damaged", empty.clone()).unwrap(),
-        ItemModelNode::Condition {
-            property: ConditionProperty::Damaged,
-            ..
-        }
-    ));
-    assert!(matches!(node("example:charged", empty).unwrap(),
-        ItemModelNode::Condition { property: ConditionProperty::Custom(name), .. } if name == "example:charged"));
-}

crates/horizon-assets/src/json.rs

@@ -87,39 +87,6 @@ pub(crate) fn object(raw: &RawValue) -> Result<Object<'_>> {
     }
     Ok(serde_json::from_str(raw.get())?)
 }
-/// The members of an object in document order, which `object` loses.
-pub(crate) fn ordered_object(raw: &RawValue) -> Result<Vec<(String, &RawValue)>> {
-    struct Members<'a>(Vec<(String, &'a RawValue)>);
-    impl<'de> serde::Deserialize<'de> for Members<'de> {
-        fn deserialize<D: serde::Deserializer<'de>>(
-            deserializer: D,
-        ) -> std::result::Result<Self, D::Error> {
-            struct Visitor;
-            impl<'de> serde::de::Visitor<'de> for Visitor {
-                type Value = Members<'de>;
-                fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
-                    f.write_str("an object")
-                }
-                fn visit_map<A: serde::de::MapAccess<'de>>(
-                    self,
-                    mut map: A,
-                ) -> std::result::Result<Self::Value, A::Error> {
-                    let mut members: Vec<(String, &'de RawValue)> = Vec::new();
-                    while let Some(entry) = map.next_entry::<String, &'de RawValue>()? {
-                        members.retain(|(name, _)| *name != entry.0);
-                        members.push(entry);
-                    }
-                    Ok(Members(members))
-                }
-            }
-            deserializer.deserialize_map(Visitor)
-        }
-    }
-    if !raw.get().starts_with('{') {
-        return Err(error("expected object"));
-    }
-    Ok(serde_json::from_str::<Members>(raw.get())?.0)
-}
 pub(crate) fn array(raw: &RawValue) -> Result<Vec<&RawValue>> {
     Ok(serde_json::from_str(raw.get())?)
 }

crates/horizon-assets/src/lib.rs

@@ -9,7 +9,6 @@ pub mod item_model;
 mod json;
 pub mod math;
 pub mod model;
-pub mod obj;
 pub mod palette;
 pub mod resolve;
 

crates/horizon-assets/src/math.rs

@@ -335,177 +335,6 @@ pub fn quaternion_from_axis_angle(angle: f32, axis: [f32; 3]) -> [f32; 4] {
     [axis[0] * sin, axis[1] * sin, axis[2] * sin, cos]
 }
 
-/// A JOML `Matrix3f`: `m[column][row]`.
-type Mat3 = [[f32; 3]; 3];
-
-/// `Matrix3f.mul`: `a * b`.
-fn mul3(a: &Mat3, b: &Mat3) -> Mat3 {
-    std::array::from_fn(|c| {
-        std::array::from_fn(|r| fma(a[0][r], b[c][0], fma(a[1][r], b[c][1], a[2][r] * b[c][2])))
-    })
-}
-/// `Matrix3f.transpose`.
-fn transpose3(m: &Mat3) -> Mat3 {
-    std::array::from_fn(|c| std::array::from_fn(|r| m[r][c]))
-}
-/// `Matrix3f.rotate(Quaternionfc)`: `m * R(q)`, without fma.
-fn rotate3(m: &Mat3, q: [f32; 4]) -> Mat3 {
-    let [x, y, z, w] = q;
-    let (w2, x2, y2, z2) = (w * w, x * x, y * y, z * z);
-    let (zw, xy, xz, yw, yz, xw) = (z * w, x * y, x * z, y * w, y * z, x * w);
-    let (zw, xy, xz, yw, yz, xw) = (zw + zw, xy + xy, xz + xz, yw + yw, yz + yz, xw + xw);
-    let rotation = [
-        [w2 + x2 - z2 - y2, xy + zw, xz - yw],
-        [xy - zw, y2 - z2 + w2 - x2, yz + xw],
-        [yw + xz, yz - xw, z2 - y2 - x2 + w2],
-    ];
-    std::array::from_fn(|c| {
-        let rc = rotation[c];
-        std::array::from_fn(|r| m[0][r] * rc[0] + m[1][r] * rc[1] + m[2][r] * rc[2])
-    })
-}
-/// `Quaternionf.mul`: `a * b`.
-fn quaternion_mul(a: [f32; 4], b: [f32; 4]) -> [f32; 4] {
-    let ([x, y, z, w], [qx, qy, qz, qw]) = (a, b);
-    [
-        fma(w, qx, fma(x, qw, fma(y, qz, -z * qy))),
-        fma(w, qy, fma(-x, qz, fma(y, qw, z * qx))),
-        fma(w, qz, fma(x, qy, fma(-y, qx, z * qw))),
-        fma(w, qw, fma(-x, qx, fma(-y, qy, -z * qz))),
-    ]
-}
-
-/// `GivensParameters`: the half angle's sine and cosine.
-#[derive(Clone, Copy)]
-struct Givens(f32, f32);
-
-impl Givens {
-    /// `GivensParameters.fromUnnormalized`.
-    fn unnormalized(sin_half: f32, cos_half: f32) -> Self {
-        let inv = 1.0 / (sin_half * sin_half + cos_half * cos_half).sqrt();
-        Self(inv * sin_half, inv * cos_half)
-    }
-    /// `MatrixUtil.PI_4`: `fromPositiveAngle(π / 4)`.
-    fn quarter_pi() -> Self {
-        let half = std::f32::consts::FRAC_PI_4 / 2.0;
-        let sin = joml_sin(half);
-        Self(sin, cos_from_sin(sin, half))
-    }
-    fn inverse(self) -> Self {
-        Self(-self.0, self.1)
-    }
-    fn cos(self) -> f32 {
-        self.1 * self.1 - self.0 * self.0
-    }
-    fn sin(self) -> f32 {
-        2.0 * self.0 * self.1
-    }
-    /// `aroundX/Y/Z(Quaternionf)` (axis 0, 1, 2).
-    fn quaternion(self, axis: usize) -> [f32; 4] {
-        let mut q = [0.0, 0.0, 0.0, self.1];
-        q[axis] = self.0;
-        q
-    }
-    /// `aroundX/Y/Z(Matrix3f)` (axis 0, 1, 2).
-    fn matrix(self, axis: usize) -> Mat3 {
-        let (cos, sin) = (self.cos(), self.sin());
-        let (a, b) = ((axis + 1) % 3, (axis + 2) % 3);
-        let mut m = [[0.0; 3]; 3];
-        m[axis][axis] = 1.0;
-        m[a][a] = cos;
-        m[b][b] = cos;
-        m[a][b] = sin;
-        m[b][a] = -sin;
-        m
-    }
-}
-
-/// `MatrixUtil.approxGivensQuat`.
-fn approx_givens(a11: f32, a12: f32, a22: f32) -> Givens {
-    let g = 3.0 + 2.0 * 2.0f32.sqrt();
-    let (cos_half, sin_half) = (2.0 * (a11 - a22), a12);
-    if g * sin_half * sin_half < cos_half * cos_half {
-        Givens::unnormalized(sin_half, cos_half)
-    } else {
-        Givens::quarter_pi()
-    }
-}
-/// `MatrixUtil.qrGivensQuat`.
-fn qr_givens(a1: f32, a2: f32) -> Givens {
-    let p = f64::from(a1).hypot(f64::from(a2)) as f32;
-    let mut sin_half = if p > 1.0e-6 { a2 } else { 0.0 };
-    let mut cos_half = a1.abs() + if p > 1.0e-6 { p } else { 1.0e-6 };
-    if a1 < 0.0 {
-        std::mem::swap(&mut sin_half, &mut cos_half);
-    }
-    Givens::unnormalized(sin_half, cos_half)
-}
-/// `MatrixUtil.stepJacobi`: the xy, xz then yz pairs, each by
-/// `similarityTransform` (`R^T * m * R`).
-fn step_jacobi(m: &mut Mat3, q: &mut [f32; 4]) {
-    let mut rotate = |m: &mut Mat3, g: Givens, axis: usize| {
-        *q = quaternion_mul(*q, g.quaternion(axis));
-        let r = g.matrix(axis);
-        *m = mul3(&transpose3(&r), &mul3(m, &r));
-    };
-    if m[0][1] * m[0][1] + m[1][0] * m[1][0] > 1.0e-6 {
-        let g = approx_givens(m[0][0], 0.5 * (m[0][1] + m[1][0]), m[1][1]);
-        rotate(m, g, 2);
-    }
-    if m[0][2] * m[0][2] + m[2][0] * m[2][0] > 1.0e-6 {
-        let g = approx_givens(m[0][0], 0.5 * (m[0][2] + m[2][0]), m[2][2]).inverse();
-        rotate(m, g, 1);
-    }
-    if m[1][2] * m[1][2] + m[2][1] * m[2][1] > 1.0e-6 {
-        let g = approx_givens(m[1][1], 0.5 * (m[1][2] + m[2][1]), m[2][2]);
-        rotate(m, g, 0);
-    }
-}
-
-/// `MatrixUtil.svdDecompose(Matrix4fc, ...)`, how `new Transformation(matrix)`
-/// splits a matrix: translation, left rotation, scale, right rotation. The
-/// right rotation diagonalizes `a^T * a` (`eigenvalueJacobi`, 5 steps), then
-/// QR Givens rotations about z, y and x bring `a * R(right)` to the scale.
-pub fn svd_decompose(m: &Mat4) -> ([f32; 3], [f32; 4], [f32; 3], [f32; 4]) {
-    let inv = 1.0 / m.0[3][3];
-    let a: Mat3 = std::array::from_fn(|c| std::array::from_fn(|r| m.0[c][r] * inv));
-    let mut b = mul3(&transpose3(&a), &a);
-    let mut right = [0.0, 0.0, 0.0, 1.0];
-    for _ in 0..5 {
-        step_jacobi(&mut b, &mut right);
-    }
-    right = normalize_quaternion(right);
-    let (x_small, y_small) = (f64::from(b[0][0]) < 1.0e-6, f64::from(b[1][1]) < 1.0e-6);
-    let mut left = [0.0, 0.0, 0.0, 1.0];
-    let mut r = rotate3(&a, right);
-    let mut qr = |r: &mut Mat3, g: Givens, axis: usize| {
-        left = quaternion_mul(left, g.quaternion(axis));
-        *r = mul3(&transpose3(&g.matrix(axis)), r);
-    };
-    let g = if x_small {
-        qr_givens(r[1][1], -r[1][0])
-    } else {
-        qr_givens(r[0][0], r[0][1])
-    };
-    qr(&mut r, g, 2);
-    let g = if x_small {
-        qr_givens(r[2][2], -r[2][0])
-    } else {
-        qr_givens(r[0][0], r[0][2])
-    };
-    qr(&mut r, g.inverse(), 1);
-    let g = if y_small {
-        qr_givens(r[2][2], -r[2][1])
-    } else {
-        qr_givens(r[1][1], r[1][2])
-    };
-    qr(&mut r, g, 0);
-    let scale = [r[0][0], r[1][1], r[2][2]];
-    let translation = std::array::from_fn(|i| m.0[3][i] * inv);
-    let [x, y, z, w] = right;
-    (translation, left, scale, [-x, -y, -z, w])
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -526,51 +355,6 @@ mod tests {
         assert!((m.0[0][1] - 1.0).abs() < 1e-6 && m.0[0][0].abs() < 1e-6);
     }
     #[test]
-    fn svd_decomposes_like_matrix_util() {
-        let bits = |v: &[f32]| v.iter().map(|f| f.to_bits()).collect::<Vec<_>>();
-        let parts = |m: [f32; 16]| {
-            let (t, l, s, r) = svd_decompose(&Mat4::from_row_major(m));
-            [bits(&t), bits(&l), bits(&s), bits(&r)]
-        };
-        // Values from MatrixUtil.svdDecompose on the 26.3 jar.
-        let scaled = [
-            2.0, 0.0, 0.0, 1.0, 0.0, 3.0, 0.0, -2.0, 0.0, 0.0, 0.5, 0.25, 0.0, 0.0, 0.0, 1.0,
-        ];
-        assert_eq!(
-            parts(scaled),
-            [
-                vec![0x3f80_0000u32, 0xc000_0000, 0x3e80_0000],
-                vec![0u32, 0, 0, 0x3f80_0000],
-                vec![0x4000_0000u32, 0x4040_0000, 0x3f00_0000],
-                vec![0x8000_0000u32, 0x8000_0000, 0x8000_0000, 0x3f80_0000],
-            ]
-        );
-        let quarter_turn = [
-            0.0, -1.0, 0.0, 0.5, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0,
-        ];
-        assert_eq!(
-            parts(quarter_turn),
-            [
-                vec![0x3f00_0000u32, 0, 0],
-                vec![0u32, 0, 0x3f35_04f3, 0x3f35_04f3],
-                vec![0x3f7f_ffffu32, 0x3f7f_ffff, 0x3f80_0000],
-                vec![0x8000_0000u32, 0x8000_0000, 0x8000_0000, 0x3f80_0000],
-            ]
-        );
-        let sheared = [
-            1.0, 0.5, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.25, 0.0, 2.0, 3.0, 0.0, 0.0, 0.0, 2.0,
-        ];
-        assert_eq!(
-            parts(sheared),
-            [
-                vec![0u32, 0, 0x3fc0_0000],
-                vec![0x3c03_7010u32, 0x3d38_d722, 0x3ea8_ef95, 0x3f71_60d9],
-                vec![0x3f23_2630u32, 0x3ec6_bdde, 0x3f81_5b1f],
-                vec![0xbcc5_7e11u32, 0xbda8_1e36, 0xbee2_916d, 0x3f64_860a],
-            ]
-        );
-    }
-    #[test]
     fn half_turn_has_exact_zeros_like_joml() {
         let half_turn = 180.0 * (std::f64::consts::PI / 180.0) as f32;
         assert_eq!(quaternion_xyz(0.0, half_turn, 0.0), [0.0, 1.0, 0.0, 0.0]);

crates/horizon-assets/src/model.rs

@@ -5,7 +5,7 @@
 //! does; render preparation must diagnose these before baking.
 use crate::json::*;
 use serde_json::value::RawValue;
-use std::{collections::BTreeMap, sync::Arc};
+use std::collections::BTreeMap;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Direction {
@@ -59,92 +59,11 @@ pub enum TextureSlot {
 #[derive(Clone, Debug, PartialEq)]
 pub struct CuboidModel {
     pub parent: Option<String>,
-    pub loader: Option<Loader>,
     pub ambient_occlusion: Option<bool>,
     pub gui_light: Option<GuiLight>,
     pub textures: BTreeMap<String, TextureSlot>,
     pub elements: Option<Vec<Option<Element>>>,
     pub display: Option<ItemTransforms>,
-    /// NeoForge's `render_type`, without a `minecraft:` prefix.
-    pub render_type: Option<String>,
-    /// A model's `visibility`: an obj object or composite child name to shown; absent is shown.
-    pub visibility: BTreeMap<String, bool>,
-}
-/// A custom model loader's payload; a model inherits its parent's loader unless it names its own.
-#[derive(Clone, Debug, PartialEq)]
-pub enum Loader {
-    /// `neoforge:composite`: children in document order.
-    Composite {
-        children: Vec<(String, Arc<CuboidModel>)>,
-        /// Child name to shown; a child absent from the map is shown.
-        visibility: BTreeMap<String, bool>,
-    },
-    /// `neoforge:obj`: `model` and `mtl_override` are asset locations.
-    Obj {
-        model: String,
-        flip_v: bool,
-        shade_quads: Option<bool>,
-        mtl_override: Option<String>,
-    },
-    /// A loader this decoder does not know: it adds no geometry.
-    Unknown(String),
-}
-/// NeoForge's `neoforge_data` of an element or a face; a face's keys win.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub struct NeoforgeData {
-    pub block_light: Option<u8>,
-    pub sky_light: Option<u8>,
-    /// ARGB.
-    pub color: Option<i32>,
-    pub ambient_occlusion: Option<bool>,
-}
-impl NeoforgeData {
-    /// `self` over `base`, key by key.
-    pub fn over(self, base: Self) -> Self {
-        Self {
-            block_light: self.block_light.or(base.block_light),
-            sky_light: self.sky_light.or(base.sky_light),
-            color: self.color.or(base.color),
-            ambient_occlusion: self.ambient_occlusion.or(base.ambient_occlusion),
-        }
-    }
-    fn decode(raw: &RawValue) -> Result<Self> {
-        let obj = object(raw)?;
-        let light = |key: &str| -> Result<Option<u8>> {
-            Ok(obj
-                .get(key)
-                .map(|r| integer(r))
-                .transpose()?
-                .map(|v| v.clamp(0, 15) as u8))
-        };
-        // Some mods spell both lights as one `light_emission`.
-        let emission = light("light_emission")?;
-        let color = match obj.get("color") {
-            Some(raw) if raw.get().starts_with('"') => {
-                let text = string(raw)?;
-                let text = text.trim();
-                let hex = text
-                    .strip_prefix('#')
-                    .or_else(|| text.strip_prefix("0x"))
-                    .or_else(|| text.strip_prefix("0X"));
-                match hex {
-                    Some(hex) => u32::from_str_radix(hex, 16).ok().map(|v| v as i32),
-                    None => text.parse::<u32>().ok().map(|v| v as i32),
-                }
-            }
-            Some(raw) => Some(integer(raw)?),
-            None => None,
-        };
-        Ok(Self {
-            block_light: light("block_light")?.or(emission),
-            sky_light: light("sky_light")?.or(emission),
-            color,
-            ambient_occlusion: obj
-                .get("ambient_occlusion")
-                .map(|r| boolean(r))
-                .transpose()?,
-        })
-    }
 }
 #[derive(Clone, Debug, PartialEq)]
 pub struct Element {
@@ -154,7 +73,6 @@ pub struct Element {
     pub rotation: Option<ElementRotation>,
     pub shade_direction_override: Option<Direction>,
     pub light_emission: u8,
-    pub neoforge_data: Option<NeoforgeData>,
 }
 #[derive(Clone, Debug, PartialEq)]
 pub struct Face {
@@ -164,9 +82,6 @@ pub struct Face {
     pub uv: Option<[f32; 4]>,
     /// Normalized counterclockwise quadrants, in the range 0..4.
     pub rotation: u8,
-    /// A face-level `light_emission`, which wins over its element's.
-    pub light_emission: Option<u8>,
-    pub neoforge_data: Option<NeoforgeData>,
 }
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Axis {
@@ -239,11 +154,6 @@ impl CuboidModel {
         } else {
             Some(identifier(&parent)?)
         };
-        let loader = obj
-            .get("loader")
-            .filter(|raw| raw.get() != "null")
-            .map(|raw| Loader::decode(raw, &obj))
-            .transpose()?;
         let ambient_occlusion = obj
             .get("ambientocclusion")
             .map(|r| boolean(r))
@@ -275,83 +185,15 @@ impl CuboidModel {
             .get("display")
             .map(|r| ItemTransforms::decode(r))
             .transpose()?;
-        let render_type = obj
-            .get("render_type")
-            .filter(|raw| raw.get().starts_with('"'))
-            .map(|raw| string(raw))
-            .transpose()?
-            .map(|name| name.strip_prefix("minecraft:").unwrap_or(&name).to_owned());
         Ok(Self {
             parent,
-            loader,
             ambient_occlusion,
             gui_light,
             textures,
             elements,
             display,
-            render_type,
-            visibility: visibility(&obj)?,
         })
     }
-    /// The models this one needs besides itself: its parent and its composite children's parents.
-    pub fn referenced_models(&self) -> Vec<String> {
-        let mut names: Vec<String> = self.parent.iter().cloned().collect();
-        if let Some(Loader::Composite { children, .. }) = &self.loader {
-            for (_, child) in children {
-                names.extend(child.referenced_models());
-            }
-        }
-        names
-    }
-}
-fn visibility(obj: &Object<'_>) -> Result<BTreeMap<String, bool>> {
-    let mut visibility = BTreeMap::new();
-    if let Some(raw) = obj.get("visibility") {
-        for (key, raw) in object(raw)? {
-            visibility.insert(key, boolean(raw)?);
-        }
-    }
-    Ok(visibility)
-}
-impl Loader {
-    fn decode(raw: &RawValue, obj: &Object<'_>) -> Result<Self> {
-        let name = primitive_string(raw)?;
-        match name.as_str() {
-            "neoforge:composite" => {
-                let mut children = Vec::new();
-                if let Some(raw) = obj.get("children") {
-                    for (name, raw) in ordered_object(raw)? {
-                        children.push((name, Arc::new(CuboidModel::decode(raw)?)));
-                    }
-                }
-                Ok(Self::Composite {
-                    children,
-                    visibility: visibility(obj)?,
-                })
-            }
-            "neoforge:obj" => {
-                let optional = |key: &str| {
-                    obj.get(key)
-                        .filter(|raw| raw.get() != "null")
-                        .map(|raw| primitive_string(raw))
-                        .transpose()
-                };
-                Ok(Self::Obj {
-                    model: identifier(&optional("model")?.ok_or_else(|| error("missing model"))?)?,
-                    flip_v: obj
-                        .get("flip_v")
-                        .map(|r| boolean(r))
-                        .transpose()?
-                        .unwrap_or(false),
-                    shade_quads: obj.get("shade_quads").map(|r| boolean(r)).transpose()?,
-                    mtl_override: optional("mtl_override")?
-                        .map(|name| identifier(&name))
-                        .transpose()?,
-                })
-            }
-            _ => Ok(Self::Unknown(name)),
-        }
-    }
 }
 fn nullable<T>(raw: &RawValue, decode: impl FnOnce(&RawValue) -> Result<T>) -> Result<Option<T>> {
     if raw.get() == "null" {
@@ -431,10 +273,6 @@ impl Element {
             rotation,
             shade_direction_override,
             light_emission: light_emission as u8,
-            neoforge_data: obj
-                .get("neoforge_data")
-                .map(|r| NeoforgeData::decode(r))
-                .transpose()?,
         })
     }
 }
@@ -468,15 +306,6 @@ impl Face {
             texture,
             uv,
             rotation: (rotation / 90) as u8,
-            light_emission: obj
-                .get("light_emission")
-                .map(|r| integer(r))
-                .transpose()?
-                .map(|v| v.clamp(0, 15) as u8),
-            neoforge_data: obj
-                .get("neoforge_data")
-                .map(|r| NeoforgeData::decode(r))
-                .transpose()?,
         })
     }
 }

crates/horizon-assets/src/obj.rs

@@ -1,183 +0,0 @@
-//! Wavefront OBJ and MTL text, as obj-loader models use them.
-use std::collections::BTreeMap;
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct ObjVertex {
-    /// Block units.
-    pub position: [f32; 3],
-    /// Texture coordinates as written, 0..1 across the sprite.
-    pub uv: [f32; 2],
-}
-/// One quad; a triangle repeats its last vertex.
-#[derive(Clone, Debug, PartialEq)]
-pub struct ObjFace {
-    /// Empty before any `usemtl`.
-    pub material: String,
-    /// The `o` (else `g`) it belongs to, which a model's `visibility` names.
-    pub object: String,
-    pub vertices: [ObjVertex; 4],
-}
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct ParsedObj {
-    pub mtllib: Option<String>,
-    pub faces: Vec<ObjFace>,
-}
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub enum MtlTexture {
-    /// `map_Kd #name`: a texture slot of the model.
-    Slot(String),
-    /// `map_Kd namespace:path`: a sprite.
-    Sprite(String),
-}
-/// A parsed OBJ with its materials.
-#[derive(Clone, Debug, Default, PartialEq)]
-pub struct ObjModel {
-    pub faces: Vec<ObjFace>,
-    pub materials: BTreeMap<String, MtlTexture>,
-}
-
-pub fn parse_obj(text: &str) -> Result<ParsedObj, String> {
-    let mut positions: Vec<[f32; 3]> = Vec::new();
-    let mut uvs: Vec<[f32; 2]> = Vec::new();
-    let mut parsed = ParsedObj::default();
-    let mut material = String::new();
-    let mut object = String::new();
-    for (number, line) in text.lines().enumerate() {
-        let mut words = line.split_whitespace();
-        let Some(keyword) = words.next() else {
-            continue;
-        };
-        let at = |message: &str| format!("line {}: {message}", number + 1);
-        match keyword {
-            _ if keyword.starts_with('#') => {}
-            "v" => positions.push(floats::<3>(words).ok_or_else(|| at("bad vertex"))?),
-            "vt" => {
-                let mut words = words;
-                let u = words.next().and_then(|w| w.parse().ok());
-                let v = words.next().map_or(Some(0.0), |w| w.parse().ok());
-                let (Some(u), Some(v)) = (u, v) else {
-                    return Err(at("bad texture coordinate"));
-                };
-                uvs.push([u, v]);
-            }
-            "mtllib" => parsed.mtllib = words.next().map(str::to_owned),
-            "usemtl" => material = words.next().unwrap_or("").to_owned(),
-            "o" | "g" => object = words.next().unwrap_or("").to_owned(),
-            "f" => {
-                let mut corners = Vec::new();
-                for word in words {
-                    let mut parts = word.split('/');
-                    let position = index(parts.next(), positions.len())
-                        .ok_or_else(|| at("bad vertex index"))?;
-                    let uv = match parts.next() {
-                        None | Some("") => [0.0; 2],
-                        some => {
-                            uvs[index(some, uvs.len()).ok_or_else(|| at("bad texture index"))?]
-                        }
-                    };
-                    corners.push(ObjVertex {
-                        position: positions[position],
-                        uv,
-                    });
-                }
-                if corners.len() < 3 {
-                    return Err(at("face needs three vertices"));
-                }
-                let mut push = |vertices: [ObjVertex; 4]| {
-                    parsed.faces.push(ObjFace {
-                        material: material.clone(),
-                        object: object.clone(),
-                        vertices,
-                    });
-                };
-                if corners.len() <= 4 {
-                    let last = corners[corners.len() - 1];
-                    push(std::array::from_fn(|i| {
-                        corners.get(i).copied().unwrap_or(last)
-                    }));
-                } else {
-                    for i in 1..corners.len() - 1 {
-                        push([corners[0], corners[i], corners[i + 1], corners[i + 1]]);
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-    Ok(parsed)
-}
-fn floats<'a, const N: usize>(mut words: impl Iterator<Item = &'a str>) -> Option<[f32; N]> {
-    let mut result = [0.0; N];
-    for value in &mut result {
-        *value = words.next()?.parse().ok()?;
-    }
-    Some(result)
-}
-/// A 1-based index, or a negative one counted from the end.
-fn index(word: Option<&str>, len: usize) -> Option<usize> {
-    let value: i64 = word?.parse().ok()?;
-    let index = if value < 0 {
-        len as i64 + value
-    } else {
-        value - 1
-    };
-    (0..len as i64).contains(&index).then_some(index as usize)
-}
-
-/// Material name to its `map_Kd`; other statements are ignored.
-pub fn parse_mtl(text: &str) -> BTreeMap<String, MtlTexture> {
-    let mut materials = BTreeMap::new();
-    let mut current = None;
-    for line in text.lines() {
-        let mut words = line.split_whitespace();
-        match words.next() {
-            Some("newmtl") => current = words.next().map(str::to_owned),
-            Some("map_Kd") => {
-                let (Some(name), Some(value)) = (&current, words.last()) else {
-                    continue;
-                };
-                let texture = match value.strip_prefix('#') {
-                    Some(slot) => MtlTexture::Slot(slot.to_owned()),
-                    None => MtlTexture::Sprite(value.to_owned()),
-                };
-                materials.insert(name.clone(), texture);
-            }
-            _ => {}
-        }
-    }
-    materials
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn quads_triangles_and_negative_indices() {
-        let text = "mtllib a.mtl\nv 0 0 0\nv 1 0 0\nv 1 1 0\nv 0 1 0\nvt 0 0\nvt 1 0\nvt 1 1\nvt 0 1\n\
-                    usemtl first\nf 1/1/1 2/2/1 3/3/1 4/4/1\nusemtl second\nf -4//1 -3//1 -2//1\n";
-        let parsed = parse_obj(text).unwrap();
-        assert_eq!(parsed.mtllib.as_deref(), Some("a.mtl"));
-        assert_eq!(parsed.faces.len(), 2);
-        assert_eq!(parsed.faces[0].material, "first");
-        assert_eq!(parsed.faces[0].vertices[2].uv, [1.0, 1.0]);
-        let triangle = &parsed.faces[1];
-        assert_eq!(triangle.material, "second");
-        assert_eq!(triangle.vertices[0].position, [0.0, 0.0, 0.0]);
-        assert_eq!(triangle.vertices[3], triangle.vertices[2]);
-        assert_eq!(triangle.vertices[2].position, [1.0, 1.0, 0.0]);
-    }
-    #[test]
-    fn bad_indices_are_errors() {
-        assert!(parse_obj("v 0 0 0\nf 1 2 3\n").is_err());
-        assert!(parse_obj("v 0 0 0\nv 1 0 0\nf 1 2\n").is_err());
-    }
-    #[test]
-    fn mtl_maps_slots_and_sprites() {
-        let materials =
-            parse_mtl("newmtl a\nKd 1 1 1\nmap_Kd #top\nnewmtl b\nmap_Kd mod:block/x\nnewmtl c\n");
-        assert_eq!(materials["a"], MtlTexture::Slot("top".into()));
-        assert_eq!(materials["b"], MtlTexture::Sprite("mod:block/x".into()));
-        assert!(!materials.contains_key("c"));
-    }
-}

crates/horizon-assets/src/resolve.rs

@@ -1,45 +1,18 @@
 //! Cuboid parent inheritance and texture-slot resolution.
-use crate::{
-    json::*,
-    model::*,
-    obj::{ObjModel, parse_mtl, parse_obj},
-};
+use crate::{json::*, model::*};
 use std::{
     collections::{BTreeMap, BTreeSet},
-    sync::{Arc, Mutex},
+    sync::Arc,
 };
 
 pub const MISSING_MODEL: &str = "minecraft:builtin/missing";
 /// `ItemModelGenerator.GENERATED_ITEM_MODEL_ID`.
 pub const GENERATED_MODEL: &str = "minecraft:builtin/generated";
-/// Composite children nest through parents that may name the composite again.
-const MAX_LOADER_DEPTH: u8 = 8;
 
-/// Reads asset files that models point at (`namespace:path` is `assets/namespace/path`).
-pub trait AssetReader: Send + Sync {
-    fn read_text(&self, location: &str) -> Option<String>;
-}
 /// Decoded models are immutable and their inherited geometry is shared.
 pub struct ModelLibrary {
     models: BTreeMap<String, Arc<CuboidModel>>,
     missing: Arc<CuboidModel>,
-    assets: Option<Arc<dyn AssetReader>>,
-    /// Keyed by obj and mtl override; `None` is a file that failed, already warned about.
-    objs: Mutex<BTreeMap<(String, Option<String>), Option<Arc<ObjModel>>>>,
-}
-/// What a model's loader adds to its own elements.
-#[derive(Clone, Debug)]
-pub enum ResolvedLoader {
-    /// The shown children, resolved on their own, in order.
-    Composite(Vec<ResolvedCuboidModel>),
-    Obj {
-        /// `None` when the file failed to load.
-        model: Option<Arc<ObjModel>>,
-        flip_v: bool,
-        shade: bool,
-        /// Objects the model chain's `visibility` hides.
-        hidden: BTreeSet<String>,
-    },
 }
 #[derive(Clone, Debug)]
 pub struct ResolvedCuboidModel {
@@ -49,17 +22,10 @@ pub struct ResolvedCuboidModel {
     pub textures: BTreeMap<String, Material>,
     /// Cyclic and dangling aliases are absent from `textures`.
     pub unresolved_textures: BTreeSet<String>,
-    /// NeoForge's `render_type`; the leaf-most model that sets one wins.
-    pub render_type: Option<String>,
     geometry: Option<Arc<CuboidModel>>,
     generated: bool,
-    loader: Option<ResolvedLoader>,
 }
 impl ResolvedCuboidModel {
-    /// Geometry from a custom loader, baked after the elements.
-    pub fn loader(&self) -> Option<&ResolvedLoader> {
-        self.loader.as_ref()
-    }
     /// Whether the top geometry is `builtin/generated`'s layer extrusion
     /// (no model closer to the leaf has elements of its own).
     pub fn uses_item_generator(&self) -> bool {
@@ -100,7 +66,6 @@ impl ModelLibrary {
     fn item_generator_model() -> CuboidModel {
         CuboidModel {
             parent: None,
-            loader: None,
             ambient_occlusion: None,
             gui_light: Some(GuiLight::Front),
             textures: BTreeMap::from([(
@@ -109,8 +74,6 @@ impl ModelLibrary {
             )]),
             elements: None,
             display: None,
-            render_type: None,
-            visibility: BTreeMap::new(),
         }
     }
     pub fn new(models: BTreeMap<String, CuboidModel>) -> Result<Self> {
@@ -137,112 +100,27 @@ impl ModelLibrary {
         Ok(Self {
             models: decoded,
             missing,
-            assets: None,
-            objs: Mutex::default(),
-        })
-    }
-    /// Where `neoforge:obj` models find their files.
-    pub fn with_assets(mut self, assets: Arc<dyn AssetReader>) -> Self {
-        self.assets = Some(assets);
-        self
-    }
-    /// This library plus `extra` models; an `extra` model replaces a
-    /// same-named one, but not the built-in missing and generated models.
-    /// Every existing model is shared, not copied.
-    pub fn overlaid(&self, extra: BTreeMap<String, CuboidModel>) -> Result<Self> {
-        let mut models = self.models.clone();
-        let mut added = BTreeSet::new();
-        for (name, model) in extra {
-            let name = identifier(&name)?;
-            if !added.insert(name.clone()) {
-                return Err(error("duplicate normalized model identifier"));
-            }
-            // The built-ins win, as `from_models` keeps `missing` and
-            // `with_item_generator` keeps `generated`.
-            if name != MISSING_MODEL && name != GENERATED_MODEL {
-                models.insert(name, Arc::new(model));
-            }
-        }
-        Ok(Self {
-            models,
-            missing: Arc::clone(&self.missing),
-            assets: self.assets.clone(),
-            objs: Mutex::default(),
         })
     }
     /// Follow the complete parent chain. A missing resource uses the built-in
     /// model; a cyclic chain is rejected, as native discovery excludes it.
     /// The returned model can outlive this library without copying its elements.
     pub fn resolve(&self, name: &str) -> Result<ResolvedCuboidModel> {
-        self.resolve_name(name, None)
-    }
-    /// Whether `name` and every parent it reaches are models of this library,
-    /// with no cycle: `resolve` puts the missing model in for any other.
-    pub fn resolves(&self, name: &str) -> bool {
-        let Ok(mut name) = identifier(name) else {
-            return false;
-        };
+        let mut name = identifier(name)?;
         let mut visited = BTreeSet::new();
+        let mut chain = Vec::new();
+        let mut names = Vec::new();
         loop {
-            let Some(model) = self.models.get(&name) else {
-                return false;
-            };
-            if !visited.insert(name.clone()) {
-                return false;
-            }
-            match &model.parent {
-                Some(parent) => name = parent.clone(),
-                None => return true,
-            }
-        }
-    }
-    /// `name`'s resolved model with a virtual child in front of it that has
-    /// only `textures`: the child's slots win, and `#references` anywhere in
-    /// the chain re-bind through them (so `builtin/generated`'s
-    /// `particle: #layer0` follows a replaced `layer0`). The child's slots are
-    /// taken as given: sprites namespaced, references without their `#`, as
-    /// the JSON decoder leaves them. A cyclic chain is an
-    /// error, as for `resolve`: a caller wanting the missing model falls
-    /// back to it.
-    pub fn resolve_with_textures(
-        &self,
-        name: &str,
-        child: &BTreeMap<String, TextureSlot>,
-    ) -> Result<ResolvedCuboidModel> {
-        self.resolve_name(name, Some(child))
-    }
-    fn resolve_name(
-        &self,
-        name: &str,
-        child: Option<&BTreeMap<String, TextureSlot>>,
-    ) -> Result<ResolvedCuboidModel> {
-        let next = Some(identifier(name)?);
-        self.resolve_chain(Vec::new(), Vec::new(), next, &BTreeMap::new(), child, 0)
-    }
-    /// `chain` and `names` start with models that are not in the library (a
-    /// composite child); `next` is the parent to follow. `fallback` slots lose
-    /// to any slot the chain defines.
-    fn resolve_chain(
-        &self,
-        mut chain: Vec<Arc<CuboidModel>>,
-        mut names: Vec<String>,
-        mut next: Option<String>,
-        fallback: &BTreeMap<String, TextureSlot>,
-        child: Option<&BTreeMap<String, TextureSlot>>,
-        depth: u8,
-    ) -> Result<ResolvedCuboidModel> {
-        if depth > MAX_LOADER_DEPTH {
-            return Err(error("composite models nest too deeply"));
-        }
-        let mut visited = BTreeSet::new();
-        while let Some(name) = next.take() {
             if !visited.insert(name.clone()) {
                 return Err(error("cyclic model parent"));
             }
             let model = self.models.get(&name).unwrap_or(&self.missing);
-            chain.push(Arc::clone(model));
-            names.push(name);
-            next = model.parent.clone();
+            chain.push(model);
+            names.push(name.clone());
+            match &model.parent {
+                Some(parent) => name = parent.clone(),
+                None => break,
+            }
         }
         let ambient_occlusion = chain
             .iter()
@@ -252,8 +130,10 @@ impl ModelLibrary {
             .iter()
             .find_map(|m| m.gui_light)
             .unwrap_or(GuiLight::Side);
-        let render_type = chain.iter().find_map(|m| m.render_type.clone());
-        let geometry = chain.iter().find(|m| m.elements.is_some()).map(Arc::clone);
+        let geometry = chain
+            .iter()
+            .find(|m| m.elements.is_some())
+            .map(|m| Arc::clone(m));
         let generated = chain
             .iter()
             .zip(&names)
@@ -272,68 +152,10 @@ impl ModelLibrary {
         };
         // Resolve aliases only after applying every child override. A reference
         // inherited from a parent binds to the child's final slot definition.
-        let mut slots: BTreeMap<String, &TextureSlot> =
-            fallback.iter().map(|(k, v)| (k.clone(), v)).collect();
-        for model in chain.iter().rev() {
+        let mut slots = BTreeMap::new();
+        for model in chain.into_iter().rev() {
             slots.extend(model.textures.iter().map(|(k, v)| (k.clone(), v)));
         }
-        if let Some(child) = child {
-            slots.extend(child.iter().map(|(k, v)| (k.clone(), v)));
-        }
-        let loader = match chain.iter().find_map(|m| m.loader.as_ref()) {
-            Some(Loader::Composite {
-                children,
-                visibility,
-            }) => {
-                let inherited: BTreeMap<String, TextureSlot> = slots
-                    .iter()
-                    .map(|(k, v)| (k.clone(), (*v).clone()))
-                    .collect();
-                // A model closer to the leaf overrides the loader's own map.
-                let mut visibility = visibility.clone();
-                for model in chain.iter().rev() {
-                    visibility.extend(model.visibility.iter().map(|(k, v)| (k.clone(), *v)));
-                }
-                let mut resolved = Vec::new();
-                for (child_name, child_model) in children {
-                    if visibility.get(child_name) == Some(&false) {
-                        continue;
-                    }
-                    resolved.push(self.resolve_chain(
-                        vec![Arc::clone(child_model)],
-                        vec![format!("{}#{child_name}", names[0])],
-                        child_model.parent.clone(),
-                        &inherited,
-                        None,
-                        depth + 1,
-                    )?);
-                }
-                Some(ResolvedLoader::Composite(resolved))
-            }
-            Some(Loader::Obj {
-                model,
-                flip_v,
-                shade_quads,
-                mtl_override,
-            }) => {
-                // Leaf wins: a model closer to the leaf overrides its parents' entries.
-                let mut visibility = BTreeMap::new();
-                for model in chain.iter().rev() {
-                    visibility.extend(model.visibility.iter().map(|(k, v)| (k.clone(), *v)));
-                }
-                Some(ResolvedLoader::Obj {
-                    model: self.load_obj(&names[0], model, mtl_override.as_deref()),
-                    flip_v: *flip_v,
-                    shade: shade_quads.unwrap_or(true),
-                    hidden: visibility
-                        .into_iter()
-                        .filter(|(_, shown)| !shown)
-                        .map(|(name, _)| name)
-                        .collect(),
-                })
-            }
-            Some(Loader::Unknown(_)) | None => None,
-        };
         let mut textures = BTreeMap::<String, Material>::new();
         let mut unresolved_textures = BTreeSet::<String>::new();
         for start in slots.keys() {
@@ -375,61 +197,12 @@ impl ModelLibrary {
             display,
             textures,
             unresolved_textures,
-            render_type,
             geometry,
             generated,
-            loader,
-        })
-    }
-    /// Parse an obj and its materials once; a failure warns once and yields no geometry.
-    fn load_obj(&self, label: &str, model: &str, mtl: Option<&str>) -> Option<Arc<ObjModel>> {
-        let key = (model.to_owned(), mtl.map(str::to_owned));
-        let mut cache = self.objs.lock().unwrap_or_else(|e| e.into_inner());
-        if let Some(found) = cache.get(&key) {
-            return found.clone();
-        }
-        let loaded = self.read_obj(model, mtl);
-        if let Err(message) = &loaded {
-            log::warn!("Horizon: obj model {label} ({model}): {message}");
-        }
-        let loaded = loaded.ok().map(Arc::new);
-        cache.insert(key, loaded.clone());
-        loaded
-    }
-    fn read_obj(&self, model: &str, mtl: Option<&str>) -> std::result::Result<ObjModel, String> {
-        let assets = self.assets.as_ref().ok_or("no asset source")?;
-        let text = assets.read_text(model).ok_or("file not found")?;
-        let parsed = parse_obj(&text)?;
-        let mtl = match (mtl, &parsed.mtllib) {
-            (Some(location), _) => Some(location.to_owned()),
-            (None, Some(file)) if file.contains(':') => Some(file.clone()),
-            (None, Some(file)) => {
-                let (namespace, path) = model.split_once(':').unwrap_or(("minecraft", model));
-                let directory = path.rsplit_once('/').map_or("", |(dir, _)| dir);
-                Some(if directory.is_empty() {
-                    format!("{namespace}:{file}")
-                } else {
-                    format!("{namespace}:{directory}/{file}")
-                })
-            }
-            (None, None) => None,
-        };
-        let materials = match mtl {
-            Some(location) => match assets.read_text(&location) {
-                Some(text) => parse_mtl(&text),
-                None => {
-                    log::warn!("Horizon: obj material file {location} not found");
-                    BTreeMap::new()
-                }
-            },
-            None => BTreeMap::new(),
-        };
-        Ok(ObjModel {
-            faces: parsed.faces,
-            materials,
         })
     }
 }
+
 /// The native missing-model cube uses slot names without a leading '#'.
 pub fn missing_model() -> CuboidModel {
     let faces = Direction::ALL
@@ -443,15 +216,12 @@ pub fn missing_model() -> CuboidModel {
                     texture: "missingno".to_owned(),
                     uv: Some([0.0, 0.0, 16.0, 16.0]),
                     rotation: 0,
-                    light_emission: None,
-                    neoforge_data: None,
                 }),
             )
         })
         .collect();
     CuboidModel {
         parent: None,
-        loader: None,
         ambient_occlusion: None,
         gui_light: None,
         elements: Some(vec![Some(Element {
@@ -461,12 +231,10 @@ pub fn missing_model() -> CuboidModel {
             rotation: None,
             shade_direction_override: None,
             light_emission: 0,
-            neoforge_data: None,
         })]),
         display: Some(ItemTransforms {
             contexts: std::array::from_fn(|_| DisplayTransform::Inherit),
         }),
-        render_type: None,
         textures: BTreeMap::from([
             (
                 "particle".to_owned(),
@@ -480,7 +248,6 @@ pub fn missing_model() -> CuboidModel {
                 }),
             ),
         ]),
-        visibility: BTreeMap::new(),
     }
 }
 
@@ -507,195 +274,6 @@ mod tests {
             }
         );
     }
-    fn library(models: &[(&str, &str)]) -> ModelLibrary {
-        ModelLibrary::with_item_generator(
-            models
-                .iter()
-                .map(|(name, json)| (name.to_string(), CuboidModel::from_json(json).unwrap()))
-                .collect(),
-        )
-        .unwrap()
-    }
-    const GENERATED: &str = r#"{"parent":"builtin/generated","display":{"ground":{"translation":[0,2,0],"scale":[0.5,0.5,0.5]}}}"#;
-    const CIT: &str = "horizon_cit:minecraft/optifine/cit/x";
-    #[test]
-    fn child_textures_replace_slots_and_rebind_the_generated_particle() {
-        let library = library(&[
-            ("item/generated", GENERATED),
-            (
-                "item/stick",
-                r#"{"parent":"item/generated","textures":{"layer0":"item/stick"}}"#,
-            ),
-        ]);
-        let child = BTreeMap::from([(
-            "layer0".to_owned(),
-            TextureSlot::Material(Material {
-                sprite: CIT.to_owned(),
-                force_translucent: false,
-            }),
-        )]);
-        let model = library.resolve_with_textures("item/stick", &child).unwrap();
-        assert!(model.uses_item_generator());
-        assert_eq!(model.material("layer0").unwrap().unwrap().sprite, CIT);
-        assert_eq!(model.material("particle").unwrap().unwrap().sprite, CIT);
-        assert_eq!(
-            model.display.contexts[6],
-            DisplayTransform::Explicit(Some(ItemTransform {
-                rotation: [0.0; 3],
-                translation: [0.0, 0.125, 0.0],
-                scale: [0.5; 3],
-            }))
-        );
-        // The library itself is untouched.
-        let plain = library.resolve("item/stick").unwrap();
-        assert_eq!(
-            plain.material("particle").unwrap().unwrap().sprite,
-            "minecraft:item/stick"
-        );
-    }
-    #[test]
-    fn overlaid_models_inherit_from_the_library_and_share_the_rest() {
-        let base = library(&[
-            ("item/generated", GENERATED),
-            (
-                "item/handheld",
-                r#"{"parent":"item/generated","display":{"thirdperson_righthand":{"rotation":[0,-90,55]}}}"#,
-            ),
-            (
-                "item/stick",
-                r#"{"parent":"item/generated","textures":{"layer0":"item/stick"}}"#,
-            ),
-            (
-                "item/apple",
-                r#"{"parent":"item/generated","textures":{"layer0":"item/apple"}}"#,
-            ),
-        ]);
-        let cit = format!(r#"{{"parent":"item/handheld","textures":{{"layer0":"{CIT}"}}}}"#);
-        let over = base
-            .overlaid(BTreeMap::from([
-                (CIT.to_owned(), CuboidModel::from_json(&cit).unwrap()),
-                (
-                    "item/stick".to_owned(),
-                    CuboidModel::from_json(
-                        r#"{"parent":"item/generated","textures":{"layer0":"item/bone"}}"#,
-                    )
-                    .unwrap(),
-                ),
-            ]))
-            .unwrap();
-        let model = over.resolve(CIT).unwrap();
-        assert!(model.uses_item_generator());
-        assert_eq!(model.material("particle").unwrap().unwrap().sprite, CIT);
-        let DisplayTransform::Explicit(Some(right)) = &model.display.contexts[1] else {
-            panic!("handheld's right-hand transform is inherited");
-        };
-        assert_eq!(right.rotation, [0.0, -90.0, 55.0]);
-        let sprite = |l: &ModelLibrary| {
-            l.resolve("item/stick").unwrap().textures["layer0"]
-                .sprite
-                .clone()
-        };
-        assert_eq!(sprite(&over), "minecraft:item/bone");
-        assert_eq!(sprite(&base), "minecraft:item/stick");
-        assert!(!base.resolve(CIT).unwrap().uses_item_generator());
-        assert!(Arc::ptr_eq(
-            &base.models["minecraft:item/apple"],
-            &over.models["minecraft:item/apple"]
-        ));
-    }
-    fn material(sprite: &str) -> TextureSlot {
-        TextureSlot::Material(Material {
-            sprite: sprite.to_owned(),
-            force_translucent: false,
-        })
-    }
-    #[test]
-    fn child_slots_take_part_in_reference_chains() {
-        let library = library(&[
-            (
-                "item/two",
-                r##"{"textures":{"layer0":"#tex","layer1":"item/b","tex":"item/a"}}"##,
-            ),
-            ("horizon:loop", r#"{"parent":"horizon:loop2"}"#),
-            ("horizon:loop2", r#"{"parent":"horizon:loop"}"#),
-        ]);
-        let child = BTreeMap::from([
-            // A base alias binds through a slot only the child sets...
-            ("tex".to_owned(), material(CIT)),
-            // ...and a child alias through the base's slots.
-            (
-                "particle".to_owned(),
-                TextureSlot::Reference("layer1".to_owned()),
-            ),
-            // A child alias to itself resolves to nothing, without looping.
-            ("self".to_owned(), TextureSlot::Reference("self".to_owned())),
-        ]);
-        let model = library.resolve_with_textures("item/two", &child).unwrap();
-        assert_eq!(model.material("layer0").unwrap().unwrap().sprite, CIT);
-        assert_eq!(
-            model.material("particle").unwrap().unwrap().sprite,
-            "minecraft:item/b"
-        );
-        assert_eq!(model.material("self").unwrap(), None);
-        assert!(model.unresolved_textures.contains("self"));
-        // An absent base is the missing cube under the child; a cyclic one an error.
-        let absent = library
-            .resolve_with_textures("item/absent", &child)
-            .unwrap();
-        assert_eq!(absent.elements().len(), 1);
-        assert!(
-            library
-                .resolve_with_textures("horizon:loop", &child)
-                .is_err()
-        );
-    }
-    #[test]
-    fn an_overlay_replaces_parents_but_not_the_built_ins_and_refuses_twins() {
-        let base = library(&[
-            ("item/generated", GENERATED),
-            ("item/handheld", r#"{"parent":"item/generated"}"#),
-            (
-                "item/sword",
-                r#"{"parent":"item/handheld","textures":{"layer0":"item/sword"}}"#,
-            ),
-        ]);
-        let model = |json: &str| CuboidModel::from_json(json).unwrap();
-        let over = base
-            .overlaid(BTreeMap::from([
-                (
-                    "item/handheld".to_owned(),
-                    model(
-                        r#"{"parent":"item/generated","display":{"head":{"rotation":[0,45,0]}}}"#,
-                    ),
-                ),
-                // Neither built-in can be replaced.
-                ("builtin/missing".to_owned(), model(r#"{"elements":[]}"#)),
-                ("builtin/generated".to_owned(), model("{}")),
-            ]))
-            .unwrap();
-        // The base's sword sees the overlay's parent; the base library does not.
-        let head = |l: &ModelLibrary| l.resolve("item/sword").unwrap().display.contexts[4].clone();
-        let DisplayTransform::Explicit(Some(rotated)) = head(&over) else {
-            panic!("the replaced parent's head transform");
-        };
-        assert_eq!(rotated.rotation, [0.0, 45.0, 0.0]);
-        assert_ne!(head(&base), head(&over));
-        // The generator kept: its `particle: #layer0`, which `{}` would drop.
-        let sword = over.resolve("item/sword").unwrap();
-        assert_eq!(
-            sword.material("particle").unwrap().unwrap().sprite,
-            "minecraft:item/sword"
-        );
-        // The missing cube kept, looked up by its own name, not as a fallback.
-        let missing = over.resolve("builtin/missing").unwrap();
-        assert_eq!(missing.elements().len(), 1);
-        // Two spellings of one id.
-        let twins = BTreeMap::from([
-            ("item/x".to_owned(), model("{}")),
-            ("minecraft:item/x".to_owned(), model("{}")),
-        ]);
-        assert!(base.overlaid(twins).is_err());
-    }
     #[test]
     fn absent_parents_fall_back_but_cycles_invalidate_descendants() {
         let a = CuboidModel::from_json(r#"{"parent":"horizon:b"}"#).unwrap();
@@ -715,115 +293,4 @@ mod tests {
             "minecraft:missingno"
         );
     }
-    #[test]
-    fn a_model_resolves_only_with_its_whole_parent_chain() {
-        let library = library(&[
-            ("item/generated", GENERATED),
-            (
-                "item/stick",
-                r#"{"parent":"item/generated","textures":{"layer0":"item/stick"}}"#,
-            ),
-            ("item/orphan", r#"{"parent":"item/gone"}"#),
-            ("item/a", r#"{"parent":"item/b"}"#),
-            ("item/b", r#"{"parent":"item/a"}"#),
-        ]);
-        assert!(library.resolves("item/stick"));
-        assert!(library.resolves("minecraft:item/stick"));
-        assert!(!library.resolves("item/absent"));
-        assert!(!library.resolves("item/orphan"));
-        assert!(!library.resolves("item/a"));
-        assert!(!library.resolves("Item/Stick"));
-    }
-    const LIGHTS: &str = r##"{"textures":{"a":"block/a"},"render_type":"minecraft:cutout","elements":[
-        {"from":[0,0,0],"to":[16,16,16],"light_emission":4,"neoforge_data":{"block_light":9,"color":-65536,"ambient_occlusion":false},
-         "faces":{"north":{"texture":"#a","neoforge_data":{"block_light":2,"sky_light":15,"unknown":1}},
-                  "south":{"texture":"#a","light_emission":11},
-                  "up":{"texture":"#a"}}}]}"##;
-    #[test]
-    fn neoforge_data_of_a_face_overrides_its_element_key_by_key() {
-        use crate::bake::bake_block_model;
-        let library = library(&[("block/lights", LIGHTS)]);
-        let model = library.resolve("block/lights").unwrap();
-        let quads =
-            bake_block_model(&model, crate::bake::BlockModelTransform::new([0; 3], false)).unwrap();
-        let by = |d| quads.iter().find(|q| q.facing == d).unwrap();
-        let north = by(Direction::North);
-        assert_eq!(north.light, [4, 15]);
-        assert_eq!(north.color, Some(-65536));
-        assert_eq!(north.ambient_occlusion, Some(false));
-        assert_eq!(by(Direction::South).light, [11, 11]);
-        assert_eq!(by(Direction::South).light_emission, 11);
-        assert_eq!(by(Direction::Up).light, [9, 4]);
-        assert!(
-            quads
-                .iter()
-                .all(|q| q.render_type == Some(crate::bake::RenderType::Cutout))
-        );
-    }
-    #[test]
-    fn vanilla_models_bake_without_extra_face_data() {
-        use crate::bake::bake_block_model;
-        let library = library(&[(
-            "block/plain",
-            r##"{"textures":{"a":"block/a"},"elements":[{"from":[0,0,0],"to":[16,16,16],"light_emission":6,"faces":{"up":{"texture":"#a"}}}]}"##,
-        )]);
-        let model = library.resolve("block/plain").unwrap();
-        let quad = &bake_block_model(&model, crate::bake::BlockModelTransform::new([0; 3], false))
-            .unwrap()[0];
-        assert_eq!((quad.light, quad.light_emission), ([6, 6], 6));
-        assert_eq!(
-            (quad.color, quad.ambient_occlusion, quad.render_type),
-            (None, None, None)
-        );
-    }
-    #[test]
-    fn render_type_comes_from_the_leaf_most_model_and_loses_its_prefix() {
-        let library = library(&[
-            ("block/base", r#"{"render_type":"translucent"}"#),
-            ("block/mid", r#"{"parent":"block/base"}"#),
-            (
-                "block/leaf",
-                r#"{"parent":"block/mid","render_type":"minecraft:cutout_mipped"}"#,
-            ),
-            ("block/bare", r#"{"parent":"block/mid"}"#),
-        ]);
-        let render = |name| library.resolve(name).unwrap().render_type;
-        assert_eq!(render("block/leaf").as_deref(), Some("cutout_mipped"));
-        assert_eq!(render("block/bare").as_deref(), Some("translucent"));
-        assert_eq!(render("block/absent"), None);
-        assert_eq!(
-            crate::bake::RenderType::by_name("minecraft:tripwire"),
-            Some(crate::bake::RenderType::Tripwire)
-        );
-        assert_eq!(crate::bake::RenderType::by_name("mod:glow"), None);
-    }
-    #[test]
-    fn neoforge_data_colour_and_legacy_emission_spellings() {
-        let model = CuboidModel::from_json(
-            r##"{"elements":[{"from":[0,0,0],"to":[1,1,1],"faces":{
-                "up":{"texture":"#a","neoforge_data":{"color":"#80FF0000","light_emission":7}},
-                "down":{"texture":"#a","neoforge_data":{"color":4294967295,"block_light":99}}}}]}"##,
-        )
-        .unwrap();
-        let elements = model.elements.unwrap();
-        let faces = &elements[0].as_ref().unwrap().faces;
-        let up = faces[&Direction::Up]
-            .as_ref()
-            .unwrap()
-            .neoforge_data
-            .unwrap();
-        assert_eq!(
-            (up.color, up.block_light, up.sky_light),
-            (Some(0x80FF0000u32 as i32), Some(7), Some(7))
-        );
-        let down = faces[&Direction::Down]
-            .as_ref()
-            .unwrap()
-            .neoforge_data
-            .unwrap();
-        assert_eq!(
-            (down.color, down.block_light, down.sky_light),
-            (Some(-1), Some(15), None)
-        );
-    }
 }

crates/horizon-bench/src/hardware.rs

@@ -202,8 +202,10 @@ fn os_version() -> Option<String> {
 #[cfg(target_os = "linux")]
 fn cpu() -> Option<String> {
     let info = std::fs::read_to_string("/proc/cpuinfo").ok()?;
-    // x86 names the CPU per core; arm64 only gives the core's implementer and part.
-    horizon_telemetry::system::linux_cpu_name(&info)
+    // x86 names the CPU per core; ARM boards name the machine once.
+    key_value(&info, "model name", ':')
+        .or_else(|| key_value(&info, "Model", ':'))
+        .map(str::to_owned)
 }
 
 #[cfg(target_os = "linux")]
@@ -225,12 +227,12 @@ fn key_value<'a>(text: &'a str, key: &str, sep: char) -> Option<&'a str> {
 
 #[cfg(target_os = "windows")]
 fn os_version() -> Option<String> {
-    horizon_telemetry::system::windows_version()
+    output("cmd", &["/C", "ver"])
 }
 
 #[cfg(target_os = "windows")]
 fn cpu() -> Option<String> {
-    horizon_telemetry::system::windows_cpu()
+    std::env::var("PROCESSOR_IDENTIFIER").ok()
 }
 
 #[cfg(target_os = "windows")]
@@ -279,16 +281,4 @@ mod tests {
             assert!(cpu_seconds(std::process::id()).unwrap() >= 0.0);
         }
     }
-
-    /// `hardware.cpu` is the brand name, not the family and model `PROCESSOR_IDENTIFIER` holds.
-    #[cfg(windows)]
-    #[test]
-    fn windows_reports_the_cpu_brand() {
-        let cpu = Hardware::detect().cpu.expect("a CPU name");
-        assert!(
-            !cpu.is_empty() && !cpu.contains(" Family ") && !cpu.contains("Stepping"),
-            "family and model, not a name: {cpu:?}"
-        );
-        assert_eq!(cpu, cpu.trim());
-    }
 }

crates/horizon-chat-filter/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "horizon-chat-filter"
-version = "0.1.0"
-edition.workspace = true
-license.workspace = true
-rust-version = "1.88"
-description = "The dedicated server's chat filter: its [chat_filter] settings, the slur list's matcher and the mutes, with no game state (docs/chat-filter.md)"
-
-[dependencies]
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-toml = "1.1"
-
-[lints]
-workspace = true

crates/horizon-chat-filter/data/slurs.txt

@@ -1,63 +0,0 @@
-# Horizon's chat filter: the hate slurs a server refuses in chat, private messages, /say, /me, team
-# messages, signs, anvil names and book titles (docs/chat-filter.md). This is a moderation list: the
-# words are written here only so the filter can recognise them, because players spammed them on the
-# official server (2026-10-31). Add a word when players find a way around the list; keep insults that
-# aren't slurs out of it (moderators handle those).
-#
-# One entry a line, matched after normalising the text: lower case, accents and look-alike letters
-# (Cyrillic, Greek, full-width, small capitals...), leetspeak (1 i, 3 e, 4 a, 0 o, @ a, $ s, 9 g),
-# separators between letters (n.i.g, n_i_g) and repeated letters. A doubled letter in an entry must be
-# doubled in the text: "niger", the river and the country, isn't "nigger".
-#   word    matches inside a longer word too
-#   =word   only as a whole word ("spic", not "suspicious")
-#   ~word   also when it's spread over several words ("nig ger", "n i g g e r")
-#   !word   never a match: a word that contains an entry ("snigger"); !word* any word starting so
-
-~nigger
-~nigga
-nigguh
-niggah
-niqqa
-niqqer
-nlgger
-nlgga
-kneegrow
-=nig
-=nigs
-=niglet
-=niglets
-=nibba
-=nibbas
-=nibber
-=nibbers
-jigaboo
-porchmonkey
-=coon
-=coons
-~faggot
-=fag
-=fags
-=faggy
-=fagot
-=fagots
-=tranny
-=trannies
-=kike
-=kikes
-=chink
-=chinks
-=gook
-=gooks
-=spic
-=spics
-wetback
-=beaner
-=beaners
-raghead
-towelhead
-zipperhead
-=paki
-=pakis
-
-!snigger*
-!niggard*

crates/horizon-chat-filter/src/lib.rs

@@ -1,550 +0,0 @@
-//! The dedicated server's chat filter (docs/chat-filter.md), without the game: `server.toml`'s
-//! `[chat_filter]`, the matcher for the slur list (`data/slurs.txt`, or the owner's `words_file`), and
-//! the escalation (a refused message, then a mute, then a temporary ban), with the mutes kept in a file
-//! so that they outlive a restart. The server's hub (`horizon_client::lan`) asks it before it relays a
-//! player's text and carries out what it decides.
-
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::path::{Path, PathBuf};
-
-mod normalise;
-
-pub use normalise::{Run, Text};
-
-/// The list built into the game, used when `words_file` is empty.
-pub const DEFAULT_WORDS: &str = include_str!("../data/slurs.txt");
-
-/// The mutes, beside server.properties.
-pub const MUTES_FILE: &str = "chat-filter-mutes.json";
-
-/// `server.toml`'s `[chat_filter]`: on by default.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default, deny_unknown_fields)]
-pub struct Config {
-    pub enabled: bool,
-    /// The hit, counted within `window_minutes`, that mutes the player; 0: never.
-    pub mute_after: u32,
-    /// The hit that bans the player for `tempban_hours`; 0: never.
-    pub tempban_after: u32,
-    /// How long a hit counts towards the next ones (the time spent muted doesn't count).
-    pub window_minutes: u32,
-    pub mute_minutes: u32,
-    pub tempban_hours: u32,
-    /// The slur list, relative to the server's folder; empty: the list built into the game.
-    pub words_file: String,
-    /// Every refused text with the player and what followed, relative to the server's folder.
-    pub log: String,
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            enabled: true,
-            mute_after: 2,
-            tempban_after: 3,
-            window_minutes: 10,
-            mute_minutes: 10,
-            tempban_hours: 24,
-            words_file: String::new(),
-            log: "logs/chat-filter.log".into(),
-        }
-    }
-}
-
-impl Config {
-    /// The `[chat_filter]` section of a whole `server.toml`; the default without it.
-    pub fn from_server_toml(text: &str) -> Result<Self, String> {
-        #[derive(Deserialize)]
-        struct File {
-            #[serde(default)]
-            chat_filter: Config,
-        }
-        // Other sections are the supervisor's to check: only this one is read here.
-        let mut table: toml::Table = toml::from_str(text).map_err(|e| e.to_string())?;
-        let mut only = toml::Table::new();
-        if let Some(section) = table.remove("chat_filter") {
-            only.insert("chat_filter".into(), section);
-        }
-        let file: File = only
-            .try_into()
-            .map_err(|e: toml::de::Error| format!("[chat_filter]: {e}"))?;
-        file.chat_filter.check()?;
-        Ok(file.chat_filter)
-    }
-
-    pub fn check(&self) -> Result<(), String> {
-        if self.window_minutes == 0 {
-            return Err("chat_filter.window_minutes must be 1 or more".into());
-        }
-        Ok(())
-    }
-}
-
-/// How an entry of the list matches.
-#[derive(Clone, Copy, Debug, PartialEq)]
-enum Kind {
-    /// Inside a longer word too.
-    Embedded,
-    /// Only as a whole word.
-    Whole,
-    /// Inside a word, or spread over several words from the start of one.
-    Spread,
-}
-
-#[derive(Debug)]
-struct Entry {
-    runs: Vec<Run>,
-    kind: Kind,
-}
-
-/// The slur list, compiled: each entry's letters as runs, indexed by first letter.
-#[derive(Debug)]
-pub struct Filter {
-    entries: Vec<Entry>,
-    by_first: [Vec<u16>; 27],
-    /// Words never matched: exact (`false`) or as a prefix (`true`).
-    allowed: Vec<(Vec<Run>, bool)>,
-}
-
-impl Filter {
-    /// Compiles a list in `data/slurs.txt`'s format.
-    pub fn new(list: &str) -> Self {
-        let mut f = Filter {
-            entries: Vec::new(),
-            by_first: Default::default(),
-            allowed: Vec::new(),
-        };
-        for line in list.lines() {
-            let line = line.trim();
-            if line.is_empty() || line.starts_with('#') {
-                continue;
-            }
-            if let Some(word) = line.strip_prefix('!') {
-                let (word, prefix) = match word.strip_suffix('*') {
-                    Some(w) => (w, true),
-                    None => (word, false),
-                };
-                // An allow entry with no letters would allow every word (an empty prefix).
-                let runs = normalise::word(word);
-                if !runs.is_empty() {
-                    f.allowed.push((runs, prefix));
-                }
-                continue;
-            }
-            let (kind, word) = match line.as_bytes()[0] {
-                b'=' => (Kind::Whole, &line[1..]),
-                b'~' => (Kind::Spread, &line[1..]),
-                _ => (Kind::Embedded, line),
-            };
-            let runs = normalise::word(word);
-            let Some(first) = runs.first() else {
-                continue;
-            };
-            f.by_first[usize::from(first.letter)].push(f.entries.len() as u16);
-            f.entries.push(Entry { runs, kind });
-        }
-        f
-    }
-
-    /// The built-in list.
-    pub fn default_list() -> Self {
-        Self::new(DEFAULT_WORDS)
-    }
-
-    pub fn len(&self) -> usize {
-        self.entries.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.entries.is_empty()
-    }
-
-    /// Whether `text` holds a slur of the list.
-    pub fn matches(&self, text: &str) -> bool {
-        let t = Text::new(text);
-        let runs = &t.runs;
-        for &(start, end) in t.words.iter().chain(&t.spaced) {
-            let word = &runs[start..end];
-            if self.is_allowed(word) {
-                continue;
-            }
-            for at in 0..word.len() {
-                for &e in &self.by_first[usize::from(word[at].letter)] {
-                    let e = &self.entries[usize::from(e)];
-                    let whole = e.kind == Kind::Whole;
-                    if (!whole || at == 0) && fits(&e.runs, &word[at..], whole) {
-                        return true;
-                    }
-                }
-            }
-        }
-        // Spread entries over the whole text, from the start of a word, across at least two.
-        for (w, &at) in t.joined_at.iter().enumerate() {
-            for &e in &self.by_first[usize::from(t.joined[at].letter)] {
-                let e = &self.entries[usize::from(e)];
-                if e.kind == Kind::Spread
-                    && fits(&e.runs, &t.joined[at..], false)
-                    && t.spans_words(w, e.runs.len())
-                {
-                    return true;
-                }
-            }
-        }
-        false
-    }
-
-    fn is_allowed(&self, word: &[Run]) -> bool {
-        self.allowed.iter().any(|(a, prefix)| {
-            if *prefix {
-                // A prefix: its last run may be part of a longer one.
-                word.len() >= a.len() && fits(a, word, false)
-            } else {
-                fits(a, word, true)
-            }
-        })
-    }
-}
-
-/// Whether `entry`'s runs start `runs` (are all of it with `whole`): the same letters, each at least
-/// as many times as the entry has it.
-fn fits(entry: &[Run], runs: &[Run], whole: bool) -> bool {
-    if runs.len() < entry.len() || (whole && runs.len() != entry.len()) {
-        return false;
-    }
-    entry
-        .iter()
-        .zip(runs)
-        .all(|(e, r)| e.letter == r.letter && r.count >= e.count)
-}
-
-/// What a hit leads to.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum Action {
-    /// The text is refused, nothing more.
-    Refused,
-    /// Refused, and the player can't chat until then (epoch milliseconds).
-    Muted { until: i64 },
-    /// Refused, and the player is banned until then.
-    Banned { until: i64 },
-}
-
-impl Action {
-    pub fn name(self) -> &'static str {
-        match self {
-            Action::Refused => "refused",
-            Action::Muted { .. } => "muted",
-            Action::Banned { .. } => "banned",
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct Mute {
-    pub uuid: String,
-    pub name: String,
-    /// Epoch milliseconds; `None`: until `/unmute`.
-    pub until: Option<i64>,
-    /// The operator who muted them (`/mute`, `/tempmute`); `None`: the filter.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub by: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub reason: Option<String>,
-}
-
-impl Mute {
-    pub fn active(&self, now: i64) -> bool {
-        self.until.is_none_or(|until| until > now)
-    }
-}
-
-#[derive(Default, Serialize, Deserialize)]
-struct MutesFile {
-    mutes: Vec<Mute>,
-}
-
-/// One player's hits: how many, and when the last one stops counting.
-#[derive(Clone, Copy, Debug)]
-struct Strikes {
-    count: u32,
-    counts_until: i64,
-}
-
-/// The filter, the players' hits and the mutes.
-pub struct Guard {
-    pub config: Config,
-    pub filter: Filter,
-    strikes: HashMap<u128, Strikes>,
-    mutes: HashMap<u128, Mute>,
-    /// Where the mutes are kept; `None` keeps them in memory only (tests).
-    file: Option<PathBuf>,
-}
-
-const MINUTE: i64 = 60_000;
-
-impl Guard {
-    pub fn new(config: Config, filter: Filter, file: Option<PathBuf>) -> Self {
-        let mut mutes = HashMap::new();
-        if let Some(text) = file.as_ref().and_then(|f| std::fs::read_to_string(f).ok())
-            && let Ok(saved) = serde_json::from_str::<MutesFile>(&text)
-        {
-            for m in saved.mutes {
-                if let Some(uuid) = parse_uuid(&m.uuid) {
-                    mutes.insert(uuid, m);
-                }
-            }
-        }
-        Self {
-            config,
-            filter,
-            strikes: HashMap::new(),
-            mutes,
-            file,
-        }
-    }
-
-    /// The server's guard: `words_file` or the built-in list, the mutes in `dir`. An unreadable
-    /// `words_file` falls back to the built-in list, with why.
-    pub fn load(config: Config, dir: &Path) -> (Self, Option<String>) {
-        let mut problem = None;
-        let filter = if config.words_file.is_empty() {
-            Filter::default_list()
-        } else {
-            match std::fs::read_to_string(dir.join(&config.words_file)) {
-                Ok(text) => Filter::new(&text),
-                Err(e) => {
-                    problem = Some(format!(
-                        "chat_filter.words_file {}: {e}; using the built-in list",
-                        config.words_file
-                    ));
-                    Filter::default_list()
-                }
-            }
-        };
-        (
-            Self::new(config, filter, Some(dir.join(MUTES_FILE))),
-            problem,
-        )
-    }
-
-    /// The player's mute, if they are muted at `now`.
-    pub fn muted(&self, uuid: u128, now: i64) -> Option<&Mute> {
-        self.mutes.get(&uuid).filter(|m| m.active(now))
-    }
-
-    /// The mutes in force at `now`, by name.
-    pub fn mutes(&self, now: i64) -> Vec<&Mute> {
-        let mut mutes: Vec<&Mute> = self.mutes.values().filter(|m| m.active(now)).collect();
-        mutes.sort_by(|a, b| a.name.cmp(&b.name));
-        mutes
-    }
-
-    /// An operator's `/mute` (`until` `None`) or `/tempmute`: replaces the player's mute.
-    pub fn mute(
-        &mut self,
-        uuid: u128,
-        name: &str,
-        until: Option<i64>,
-        by: &str,
-        reason: Option<String>,
-    ) {
-        self.mutes.insert(
-            uuid,
-            Mute {
-                uuid: uuid_string(uuid),
-                name: name.to_owned(),
-                until,
-                by: Some(by.to_owned()),
-                reason,
-            },
-        );
-        self.save();
-    }
-
-    /// A hit by the player at `now`: the hit's number in the window, and what it leads to.
-    pub fn strike(&mut self, uuid: u128, name: &str, now: i64) -> (u32, Action) {
-        let c = &self.config;
-        let window = i64::from(c.window_minutes) * MINUTE;
-        let s = self.strikes.entry(uuid).or_insert(Strikes {
-            count: 0,
-            counts_until: 0,
-        });
-        if now > s.counts_until {
-            s.count = 0;
-        }
-        s.count += 1;
-        s.counts_until = now + window;
-        let count = s.count;
-        let action = if c.tempban_after > 0 && count >= c.tempban_after {
-            self.strikes.remove(&uuid);
-            Action::Banned {
-                until: now + i64::from(c.tempban_hours) * 60 * MINUTE,
-            }
-        } else if c.mute_after > 0 && count >= c.mute_after {
-            let until = now + i64::from(c.mute_minutes) * MINUTE;
-            // The window starts again when the mute ends.
-            s.counts_until = until + window;
-            // An operator's longer mute stays.
-            if !self
-                .mutes
-                .get(&uuid)
-                .is_some_and(|m| m.until.is_none_or(|u| u >= until))
-            {
-                self.mutes.insert(
-                    uuid,
-                    Mute {
-                        uuid: uuid_string(uuid),
-                        name: name.to_owned(),
-                        until: Some(until),
-                        by: None,
-                        reason: None,
-                    },
-                );
-                self.save();
-            }
-            Action::Muted { until }
-        } else {
-            Action::Refused
-        };
-        (count, action)
-    }
-
-    /// Lifts a player's mute (and forgets their hits), by name; the name as muted, if they were.
-    pub fn unmute(&mut self, name: &str) -> Option<String> {
-        let uuid = *self
-            .mutes
-            .iter()
-            .find(|(_, m)| m.name.eq_ignore_ascii_case(name))?
-            .0;
-        let mute = self.mutes.remove(&uuid)?;
-        self.strikes.remove(&uuid);
-        self.save();
-        Some(mute.name)
-    }
-
-    fn save(&mut self) {
-        let Some(file) = &self.file else {
-            return;
-        };
-        let now = now_millis();
-        self.mutes.retain(|_, m| m.active(now));
-        let mut mutes: Vec<Mute> = self.mutes.values().cloned().collect();
-        mutes.sort_by(|a, b| a.name.cmp(&b.name));
-        if let Ok(text) = serde_json::to_string_pretty(&MutesFile { mutes }) {
-            let tmp = file.with_extension("json.tmp");
-            if std::fs::write(&tmp, text).is_ok() {
-                let _ = std::fs::rename(&tmp, file);
-            }
-        }
-    }
-}
-
-/// One line of `logs/chat-filter.log`, without its newline.
-pub fn log_line(
-    now: i64,
-    name: &str,
-    uuid: u128,
-    place: &str,
-    count: u32,
-    action: Action,
-    text: &str,
-) -> String {
-    let text: String = text
-        .chars()
-        .map(|c| if c == '\n' { ' ' } else { c })
-        .collect();
-    format!(
-        "{} {name} {} {place} hit {count} {}: {text}",
-        utc(now),
-        uuid_string(uuid),
-        action.name()
-    )
-}
-
-/// Appends a line to the log at `path` (its folder made if needed).
-pub fn append_log(path: &Path, line: &str) -> std::io::Result<()> {
-    use std::io::Write;
-    if let Some(dir) = path.parent() {
-        std::fs::create_dir_all(dir)?;
-    }
-    let mut f = std::fs::OpenOptions::new()
-        .create(true)
-        .append(true)
-        .open(path)?;
-    writeln!(f, "{line}")
-}
-
-/// `/tempmute`'s duration in milliseconds: a positive whole number and a unit, `s`, `m`, `h`, `d` or
-/// `w` (`10m`, `2h`, `1d`).
-pub fn parse_duration(text: &str) -> Option<i64> {
-    let unit = match text.chars().last()? {
-        's' => 1_000,
-        'm' => MINUTE,
-        'h' => 60 * MINUTE,
-        'd' => 24 * 60 * MINUTE,
-        'w' => 7 * 24 * 60 * MINUTE,
-        _ => return None,
-    };
-    let count: i64 = text[..text.len() - 1].parse().ok()?;
-    (count > 0).then(|| count.checked_mul(unit)).flatten()
-}
-
-/// `millis` for players, rounded up: minutes up to an hour, hours up to two days, then days.
-pub fn duration_text(millis: i64) -> String {
-    let up = |unit: i64| (millis + unit - 1) / unit;
-    let (count, unit) = if millis <= 60 * MINUTE {
-        (up(MINUTE), "minute")
-    } else if millis <= 48 * 60 * MINUTE {
-        (up(60 * MINUTE), "hour")
-    } else {
-        (up(24 * 60 * MINUTE), "day")
-    };
-    format!("{count} {unit}{}", if count == 1 { "" } else { "s" })
-}
-
-pub fn now_millis() -> i64 {
-    std::time::SystemTime::now()
-        .duration_since(std::time::UNIX_EPOCH)
-        .map_or(0, |d| d.as_millis() as i64)
-}
-
-/// `YYYY-MM-DDTHH:MM:SSZ` for epoch milliseconds.
-pub fn utc(millis: i64) -> String {
-    let secs = millis.div_euclid(1000);
-    let (days, rest) = (secs.div_euclid(86_400), secs.rem_euclid(86_400));
-    // Howard Hinnant's civil_from_days.
-    let z = days + 719_468;
-    let era = z.div_euclid(146_097);
-    let doe = z.rem_euclid(146_097);
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let day = doy - (153 * mp + 2) / 5 + 1;
-    let month = if mp < 10 { mp + 3 } else { mp - 9 };
-    let year = yoe + era * 400 + i64::from(month <= 2);
-    format!(
-        "{year:04}-{month:02}-{day:02}T{:02}:{:02}:{:02}Z",
-        rest / 3600,
-        rest / 60 % 60,
-        rest % 60
-    )
-}
-
-fn uuid_string(u: u128) -> String {
-    let h = format!("{u:032x}");
-    format!(
-        "{}-{}-{}-{}-{}",
-        &h[..8],
-        &h[8..12],
-        &h[12..16],
-        &h[16..20],
-        &h[20..]
-    )
-}
-
-fn parse_uuid(s: &str) -> Option<u128> {
-    u128::from_str_radix(&s.replace('-', ""), 16).ok()
-}
-
-#[cfg(test)]
-mod tests;

crates/horizon-chat-filter/src/normalise.rs

@@ -1,255 +0,0 @@
-//! A text as the filter sees it: words of letters `a`..`z`, each letter with how many times it repeats.
-//! Case, accents, look-alike letters (Cyrillic, Greek, full-width, small capitals, styled mathematical
-//! letters, circled and squared letters), leetspeak and invisible characters are folded away;
-//! separators inside a word are dropped (`n.i.g` is `nig`), and whitespace ends a word.
-
-/// The letter code of anything that is a letter but none of `a`..`z`: it never matches.
-const OTHER: u8 = 26;
-
-/// One letter and how many times it repeats (`gg` is `g` twice).
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct Run {
-    /// 0..=25 for `a`..`z`, 26 for any other letter.
-    pub letter: u8,
-    pub count: u8,
-    /// Every one of its characters was punctuation read as a letter (`!` as `i`, `@` as `a`).
-    pub weak: bool,
-}
-
-/// A whole message, normalised.
-#[derive(Debug, Default)]
-pub struct Text {
-    pub runs: Vec<Run>,
-    /// Each word's runs, `runs[start..end]`.
-    pub words: Vec<(usize, usize)>,
-    /// More ranges of `runs` to match as words: letters spaced out (`n i g g a`), joined, and words
-    /// without the punctuation they end with (`fag!`).
-    pub spaced: Vec<(usize, usize)>,
-    /// Every word one after the other, a letter that ends one and starts the next merged.
-    pub joined: Vec<Run>,
-    /// Where each word starts in `joined`.
-    pub joined_at: Vec<usize>,
-    /// The last word each run of `joined` belongs to.
-    joined_last: Vec<usize>,
-}
-
-enum Fold {
-    Letter(u8, bool),
-    Separator,
-    Space,
-    Skip,
-}
-
-impl Text {
-    pub fn new(text: &str) -> Self {
-        let mut t = Text::default();
-        let mut start = 0;
-        for c in text.chars() {
-            match fold(c) {
-                Fold::Letter(letter, weak) => {
-                    let in_word = t.runs.len() > start;
-                    match t.runs.last_mut() {
-                        Some(last) if in_word && last.letter == letter => {
-                            last.count = last.count.saturating_add(1);
-                            last.weak &= weak;
-                        }
-                        _ => t.runs.push(Run {
-                            letter,
-                            count: 1,
-                            weak,
-                        }),
-                    }
-                }
-                Fold::Space => {
-                    t.end_word(start);
-                    start = t.runs.len();
-                }
-                Fold::Separator | Fold::Skip => {}
-            }
-        }
-        t.end_word(start);
-        t.add_spaced();
-        t.join();
-        t
-    }
-
-    fn end_word(&mut self, start: usize) {
-        if self.runs.len() > start {
-            self.words.push((start, self.runs.len()));
-        }
-    }
-
-    /// Spaced-out letters and words without their trailing punctuation, as extra words (their runs
-    /// copied after the real words').
-    fn add_spaced(&mut self) {
-        let words = self.words.len();
-        let mut w = 0;
-        while w < words {
-            let mut end = w;
-            while end < words && self.words[end].1 - self.words[end].0 == 1 {
-                end += 1;
-            }
-            if end - w >= 2 {
-                let first = self.runs.len();
-                for k in w..end {
-                    let run = self.runs[self.words[k].0];
-                    let in_word = self.runs.len() > first;
-                    match self.runs.last_mut() {
-                        Some(last) if in_word && last.letter == run.letter => {
-                            last.count = last.count.saturating_add(run.count);
-                        }
-                        _ => self.runs.push(run),
-                    }
-                }
-                self.spaced.push((first, self.runs.len()));
-                w = end;
-            } else {
-                w += 1;
-            }
-        }
-        for k in 0..words {
-            let (start, mut end) = self.words[k];
-            while end > start + 1 && self.runs[end - 1].weak {
-                end -= 1;
-            }
-            if end < self.words[k].1 {
-                self.spaced.push((start, end));
-            }
-        }
-    }
-
-    fn join(&mut self) {
-        for (w, &(start, end)) in self.words.iter().enumerate() {
-            let mut first = true;
-            for run in &self.runs[start..end] {
-                match self.joined.last_mut() {
-                    Some(last) if first && last.letter == run.letter => {
-                        last.count = last.count.saturating_add(run.count);
-                        self.joined_at.push(self.joined.len() - 1);
-                        *self.joined_last.last_mut().expect("beside joined") = w;
-                    }
-                    _ => {
-                        if first {
-                            self.joined_at.push(self.joined.len());
-                        }
-                        self.joined.push(*run);
-                        self.joined_last.push(w);
-                    }
-                }
-                first = false;
-            }
-        }
-    }
-
-    /// Whether `len` runs of `joined` from word `w`'s start reach into a later word.
-    pub fn spans_words(&self, w: usize, len: usize) -> bool {
-        self.joined_last
-            .get(self.joined_at[w] + len - 1)
-            .is_some_and(|&last| last > w)
-    }
-}
-
-/// An entry of the list, normalised the same way (one word, whitespace ignored).
-pub fn word(text: &str) -> Vec<Run> {
-    let t = Text::new(&text.replace(char::is_whitespace, ""));
-    t.words
-        .first()
-        .map_or_else(Vec::new, |&(s, e)| t.runs[s..e].to_vec())
-}
-
-fn letter(c: char) -> Fold {
-    Fold::Letter(c as u8 - b'a', false)
-}
-
-fn fold(c: char) -> Fold {
-    if c.is_ascii_alphabetic() {
-        return letter(c.to_ascii_lowercase());
-    }
-    if c.is_ascii() {
-        return match c {
-            '0' => letter('o'),
-            '1' => letter('i'),
-            '3' => letter('e'),
-            '4' => letter('a'),
-            '5' => letter('s'),
-            '6' | '9' => letter('g'),
-            '7' => letter('t'),
-            '8' => letter('b'),
-            '!' | '|' => Fold::Letter(b'i' - b'a', true),
-            '@' => Fold::Letter(0, true),
-            '$' => Fold::Letter(b's' - b'a', true),
-            c if c.is_ascii_whitespace() => Fold::Space,
-            _ => Fold::Separator,
-        };
-    }
-    let u = c as u32;
-    let from = |base: u32, span: u32| char::from(b'a' + ((u - base) % span) as u8);
-    let mapped = match u {
-        // Zero-width characters, soft hyphen, combining marks, variation selectors.
-        0xAD | 0x34F | 0x200B..=0x200F | 0x2060..=0x2064 | 0xFEFF | 0x180E => return Fold::Skip,
-        0x300..=0x36F
-        | 0x1AB0..=0x1AFF
-        | 0x1DC0..=0x1DFF
-        | 0x20D0..=0x20FF
-        | 0xFE00..=0xFE0F
-        | 0xFE20..=0xFE2F
-        | 0xE0100..=0xE01EF => return Fold::Skip,
-        // Full-width Latin and digits.
-        0xFF21..=0xFF3A => from(0xFF21, 26),
-        0xFF41..=0xFF5A => from(0xFF41, 26),
-        0xFF10..=0xFF19 => return fold(char::from(b'0' + (u - 0xFF10) as u8)),
-        // Mathematical alphanumerics: 52 letters a style, then digits.
-        0x1D400..=0x1D6A3 => from(0x1D400, 26),
-        0x1D7CE..=0x1D7FF => return fold(char::from(b'0' + ((u - 0x1D7CE) % 10) as u8)),
-        // Circled, parenthesised, squared and negative letters, regional indicators.
-        0x24B6..=0x24CF => from(0x24B6, 26),
-        0x24D0..=0x24E9 => from(0x24D0, 26),
-        0x249C..=0x24B5 => from(0x249C, 26),
-        0x1F130..=0x1F149 => from(0x1F130, 26),
-        0x1F150..=0x1F169 => from(0x1F150, 26),
-        0x1F170..=0x1F189 => from(0x1F170, 26),
-        0x1F1E6..=0x1F1FF => from(0x1F1E6, 26),
-        _ => {
-            if c.is_whitespace() {
-                return Fold::Space;
-            }
-            let lower = c.to_lowercase().next().unwrap_or(c);
-            match LOOK_ALIKES.iter().find(|(_, chars)| chars.contains(lower)) {
-                Some((base, _)) => *base,
-                None if c.is_alphabetic() => return Fold::Letter(OTHER, false),
-                None => return Fold::Separator,
-            }
-        }
-    };
-    letter(mapped)
-}
-
-/// Letters with accents and letters that look like a Latin one, by the letter they read as (lower case).
-const LOOK_ALIKES: &[(char, &str)] = &[
-    ('a', "àáâãäåāăąǎǟǡǻȁȃȧạảấầẩẫậắằẳẵặⱥɐаαᴀᵃª"),
-    ('b', "ƀɓḃḅḇвьъβʙᵇ"),
-    ('c', "çćĉċčƈḉȼсϲᴄᶜ"),
-    ('d', "ďđɗḋḍḏḑḓԁδᴅᵈ"),
-    ('e', "èéêëēĕėęěȅȇȩẹẻẽếềểễệḕḗḙḛḝɇеёєεᴇᵉ€"),
-    ('f', "ƒḟꜰᶠ"),
-    ('g', "ĝğġģǥǧǵɠḡɡɢᵍ"),
-    ('h', "ĥħȟḣḥḧḩḫẖнһʜʰ"),
-    ('i', "ìíîïĩīĭįıǐȉȋḭḯỉịіїιɪⁱ¡ӏ"),
-    ('j', "ĵǰјᴊʲ"),
-    ('k', "ķĸǩḱḳḵкκᴋᵏ"),
-    ('l', "ĺļľŀłḷḹḻḽʟˡ"),
-    ('m', "мᴍᵐ"),
-    ('n', "ñńņňʼnŋǹṅṇṉṋиипηπɴⁿ"),
-    ('o', "òóôõöøōŏőơǒǫǭǿȍȏȫȭȯȱọỏốồổỗộớờởỡợоοσᴏᵒº"),
-    ('p', "ṕṗрρᴘᵖ"),
-    ('q', "ԛ"),
-    ('r', "ŕŗřȑȓṙṛṝṟгʀʳ"),
-    ('s', "śŝşšșṡṣṥṧṩѕꜱˢß"),
-    ('t', "ţťŧțṫṭṯṱẗтτᴛᵗ"),
-    ('u', "ùúûüũūŭůűųưǔǖǘǚǜȕȗụủứừửữựυᴜᵘ"),
-    ('v', "νᴠᵛ"),
-    ('w', "ŵẁẃẅẇẉẘԝωᴡʷ"),
-    ('x', "хχˣ"),
-    ('y', "ýÿŷȳẏẙỳỵỷỹуүγʏʸ"),
-    ('z', "źżžƶẑẓẕᴢᶻ"),
-];

crates/horizon-chat-filter/src/tests.rs

@@ -1,329 +0,0 @@
-// The test texts spell the slurs the filter must refuse: that is what they test.
-use super::*;
-
-fn filter() -> Filter {
-    Filter::default_list()
-}
-
-#[test]
-fn the_list_compiles() {
-    let f = filter();
-    assert!(f.len() > 30, "{} entries", f.len());
-    assert_eq!(f.allowed.len(), 2);
-}
-
-#[test]
-fn normalising_catches_the_usual_disguises() {
-    let f = filter();
-    for text in [
-        "nigger",
-        "NIGGER",
-        "shut up nigga",
-        "Niggers",
-        "n1gg3r",
-        "ni99a",
-        "N!GGA",
-        "nigg@",
-        "n.i.g.g.e.r",
-        "n_i_g_g_a",
-        "n i g g e r",
-        "n i gg a",
-        "nig ger",
-        "nig  gaaa",
-        "niiiiggggggerrrrr",
-        "ñíggér",
-        "ｎｉｇｇｅｒ",
-        "Niggeг",         // Cyrillic ghe for r
-        "nіgger",         // Cyrillic i
-        "nigg\u{0435}r",  // Cyrillic e
-        "n\u{200B}igger", // a zero-width space
-        "n\u{0301}igger", // a combining accent
-        "𝐧𝐢𝐠𝐠𝐞𝐫",
-        "ⓝⓘⓖⓖⓐ",
-        "ɴɪɢɢᴀ",
-        "hi nig",
-        "f a g",
-        "fag!",
-        "you $pic",
-        "FAGGOTINO-CHAN",
-        "sandnigger",
-        "lol kike",
-    ] {
-        assert!(f.matches(text), "{text:?} should be refused");
-    }
-}
-
-#[test]
-fn ordinary_words_pass() {
-    let f = filter();
-    for text in [
-        "hello",
-        "Niger",
-        "I live in Niger",
-        "Nigeria and the Niger river",
-        "nigerian food",
-        "proud2benigerian",
-        "don't snigger",
-        "sniggering at that",
-        "a niggardly offer",
-        "knight",
-        "qKnights",
-        "its still night",
-        "anyone able to boot the latest nightly version?",
-        "i hate nighbours",
-        "can someune give mi night vision",
-        "suspicious stew",
-        "spicy food",
-        "a raccoon in a cocoon",
-        "Scunthorpe",
-        "bigger trigger digger",
-        "gg",
-        "gg ez",
-        "mini gg all",
-        "kniga",
-        "shenanigans",
-        "dignity and signing",
-        "Pakistan",
-        "chinking glasses",
-        "the trannys? no: transmission",
-        "1nicerOli",
-        "ask me evernig",
-        "冰淇淋",
-        "привет",
-        "",
-        "!!!",
-    ] {
-        assert!(!f.matches(text), "{text:?} should pass");
-    }
-}
-
-#[test]
-fn a_custom_list_has_the_same_syntax() {
-    let f = Filter::new("# comment\n=bad\n~worse\nmeh\n!mehish*\n");
-    assert!(f.matches("so bad"));
-    assert!(!f.matches("badly"));
-    assert!(f.matches("wor se"));
-    assert!(f.matches("xxmehxx"));
-    assert!(!f.matches("mehishness"));
-    assert!(!f.matches("me h"));
-}
-
-fn guard(config: Config) -> Guard {
-    Guard::new(config, filter(), None)
-}
-
-const NOW: i64 = 1_793_469_939_000;
-const MIN: i64 = 60_000;
-
-#[test]
-fn the_second_hit_mutes_and_the_third_bans() {
-    let mut g = guard(Config::default());
-    let id = 7;
-    assert_eq!(g.strike(id, "Ann", NOW), (1, Action::Refused));
-    assert_eq!(g.muted(id, NOW), None);
-    let until = NOW + 3 * MIN + 10 * MIN;
-    assert_eq!(
-        g.strike(id, "Ann", NOW + 3 * MIN),
-        (2, Action::Muted { until })
-    );
-    assert_eq!(g.muted(id, NOW + 4 * MIN).unwrap().until, Some(until));
-    assert_eq!(g.muted(id, until), None);
-    // The time spent muted doesn't count: 8 minutes after the mute ended is still within the window.
-    assert_eq!(
-        g.strike(id, "Ann", until + 8 * MIN),
-        (
-            3,
-            Action::Banned {
-                until: until + 8 * MIN + 24 * 60 * MIN
-            }
-        )
-    );
-    // Then it starts again.
-    assert_eq!(g.strike(id, "Ann", until + 9 * MIN), (1, Action::Refused));
-}
-
-#[test]
-fn hits_far_apart_dont_add_up() {
-    let mut g = guard(Config::default());
-    assert_eq!(g.strike(1, "Bo", NOW), (1, Action::Refused));
-    assert_eq!(g.strike(1, "Bo", NOW + 11 * MIN), (1, Action::Refused));
-    // Players are counted apart.
-    assert_eq!(g.strike(2, "Cy", NOW + 12 * MIN), (1, Action::Refused));
-}
-
-#[test]
-fn thresholds_are_configurable() {
-    let mut g = guard(Config {
-        mute_after: 0,
-        tempban_after: 2,
-        tempban_hours: 1,
-        ..Config::default()
-    });
-    assert_eq!(g.strike(1, "Bo", NOW), (1, Action::Refused));
-    assert_eq!(
-        g.strike(1, "Bo", NOW + MIN),
-        (
-            2,
-            Action::Banned {
-                until: NOW + MIN + 60 * MIN
-            }
-        )
-    );
-    let mut off = guard(Config {
-        mute_after: 0,
-        tempban_after: 0,
-        ..Config::default()
-    });
-    for k in 1..5 {
-        assert_eq!(off.strike(1, "Bo", NOW + k), (k as u32, Action::Refused));
-    }
-}
-
-#[test]
-fn mutes_survive_a_restart_and_unmute_lifts_them() {
-    let dir = std::env::temp_dir().join(format!("chat-filter-test-{}", std::process::id()));
-    std::fs::create_dir_all(&dir).unwrap();
-    let now = now_millis();
-    let (mut g, problem) = Guard::load(Config::default(), &dir);
-    assert_eq!(problem, None);
-    g.strike(5, "Dee", now);
-    let (_, action) = g.strike(5, "Dee", now);
-    assert!(matches!(action, Action::Muted { .. }));
-    let (mut again, _) = Guard::load(Config::default(), &dir);
-    assert!(again.muted(5, now).is_some());
-    assert_eq!(again.unmute("dee").as_deref(), Some("Dee"));
-    assert_eq!(again.unmute("dee"), None);
-    assert_eq!(again.muted(5, now), None);
-    // An operator's mutes are kept too, with who and why.
-    again.mute(6, "Eve", None, "Op", Some("spam".into()));
-    again.mute(7, "Fay", Some(now + MIN), "Op", None);
-    let (reloaded, _) = Guard::load(Config::default(), &dir);
-    assert_eq!(reloaded.muted(5, now), None);
-    let names: Vec<_> = reloaded
-        .mutes(now)
-        .iter()
-        .map(|m| m.name.as_str())
-        .collect();
-    assert_eq!(names, ["Eve", "Fay"]);
-    let eve = reloaded.muted(6, now).unwrap();
-    assert_eq!(
-        (eve.until, eve.by.as_deref(), eve.reason.as_deref()),
-        (None, Some("Op"), Some("spam"))
-    );
-    assert_eq!(reloaded.mutes(now + MIN).len(), 1);
-    std::fs::remove_dir_all(&dir).unwrap();
-}
-
-#[test]
-fn a_mute_file_from_before_manual_mutes_still_loads() {
-    let saved: MutesFile = serde_json::from_str(
-        r#"{"mutes":[{"uuid":"00000000-0000-0000-0000-000000000005","name":"Dee","until":5}]}"#,
-    )
-    .unwrap();
-    assert_eq!(saved.mutes[0].until, Some(5));
-    assert_eq!(saved.mutes[0].by, None);
-}
-
-#[test]
-fn the_filter_never_shortens_an_operators_mute() {
-    let mut g = guard(Config::default());
-    g.mute(1, "Bo", None, "Op", None);
-    g.strike(1, "Bo", NOW);
-    g.strike(1, "Bo", NOW + MIN);
-    assert_eq!(
-        g.muted(1, NOW + 60 * MIN).unwrap().by.as_deref(),
-        Some("Op")
-    );
-    // A shorter one is replaced by the filter's.
-    g.mute(2, "Cy", Some(NOW + MIN), "Op", None);
-    g.strike(2, "Cy", NOW);
-    g.strike(2, "Cy", NOW);
-    assert_eq!(g.muted(2, NOW).unwrap().until, Some(NOW + 10 * MIN));
-}
-
-#[test]
-fn durations_read_and_print() {
-    assert_eq!(parse_duration("10m"), Some(10 * MIN));
-    assert_eq!(parse_duration("2h"), Some(120 * MIN));
-    assert_eq!(parse_duration("1d"), Some(24 * 60 * MIN));
-    assert_eq!(parse_duration("1w"), Some(7 * 24 * 60 * MIN));
-    assert_eq!(parse_duration("30s"), Some(30_000));
-    for bad in [
-        "",
-        "m",
-        "0m",
-        "-1m",
-        "1.5h",
-        "10",
-        "10x",
-        "99999999999999999w",
-    ] {
-        assert_eq!(parse_duration(bad), None, "{bad}");
-    }
-    assert_eq!(duration_text(61_000), "2 minutes");
-    assert_eq!(duration_text(MIN), "1 minute");
-    assert_eq!(duration_text(2 * 60 * MIN), "2 hours");
-    assert_eq!(duration_text(24 * 60 * MIN), "24 hours");
-    assert_eq!(duration_text(3 * 24 * 60 * MIN), "3 days");
-}
-
-#[test]
-fn a_missing_words_file_falls_back_to_the_built_in_list() {
-    let config = Config {
-        words_file: "nope.txt".into(),
-        ..Config::default()
-    };
-    let (g, problem) = Guard::load(config, Path::new("/nonexistent-horizon"));
-    assert!(problem.unwrap().contains("nope.txt"));
-    assert!(g.filter.matches("nigger"));
-}
-
-#[test]
-fn the_section_reads_from_server_toml() {
-    let c = Config::from_server_toml("[server]\nport = 25565\n").unwrap();
-    assert_eq!(c, Config::default());
-    assert!(c.enabled);
-    let c = Config::from_server_toml(
-        "[chat_filter]\nenabled = true\nmute_after = 3\ntempban_after = 5\nwords_file = \"slurs.txt\"\n",
-    )
-    .unwrap();
-    assert_eq!((c.mute_after, c.tempban_after), (3, 5));
-    assert_eq!(c.words_file, "slurs.txt");
-    assert!(
-        !Config::from_server_toml("[chat_filter]\nenabled = false\n")
-            .unwrap()
-            .enabled
-    );
-    assert!(Config::from_server_toml("[chat_filter]\nmute = 2\n").is_err());
-    assert!(Config::from_server_toml("[chat_filter]\nwindow_minutes = 0\n").is_err());
-}
-
-#[test]
-fn log_lines_have_the_time_the_player_and_the_text() {
-    assert_eq!(utc(0), "1970-01-01T00:00:00Z");
-    assert_eq!(utc(951_782_400_000), "2000-02-29T00:00:00Z");
-    assert_eq!(
-        log_line(NOW, "Ann", 1, "chat", 2, Action::Muted { until: 0 }, "a\nb"),
-        "2026-10-31T18:05:39Z Ann 00000000-0000-0000-0000-000000000001 chat hit 2 muted: a b"
-    );
-}
-
-#[test]
-fn a_message_costs_little() {
-    // A long message through the whole list stays far below a tick (debug builds included).
-    let f = filter();
-    let text = "the quick brown fox jumps over the lazy dog ".repeat(6);
-    let start = std::time::Instant::now();
-    for _ in 0..1000 {
-        assert!(!f.matches(&text));
-    }
-    assert!(start.elapsed().as_millis() < 2000, "{:?}", start.elapsed());
-}
-
-#[test]
-fn an_allow_line_without_letters_allows_nothing() {
-    for line in ["!*", "!-*", "!", "!-"] {
-        let f = Filter::new(&format!("nigger\n{line}\n"));
-        assert!(f.matches("nigger"), "{line}");
-    }
-}

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

@@ -186,117 +186,68 @@ impl Parser<'_> {
         Err("unterminated string".into())
     }
 }
-/// `click_event` / `hover_event`, or the pre-datafixer `clickEvent` /
-/// `hoverEvent` names SNBT and older chat JSON still use.
-fn style_event_object<'a>(
-    o: &'a serde_json::Map<String, Value>,
-    modern: &str,
-    legacy: &str,
-) -> Option<&'a serde_json::Map<String, Value>> {
-    o.get(modern)
-        .or_else(|| o.get(legacy))
-        .and_then(Value::as_object)
-}
-
-/// Style flags from JSON bools, or SNBT `1b`/`0b` which parse as numbers.
-fn style_flag(v: Option<&Value>) -> Option<bool> {
-    match v {
-        Some(Value::Bool(b)) => Some(*b),
-        Some(Value::Number(n)) => n.as_i64().map(|i| i != 0),
-        _ => None,
-    }
-}
-
-fn untrusted_http_url(url: &str) -> bool {
-    // ExtraCodecs.UNTRUSTED_URI / Util.parseAndValidateUntrustedUri: http and
-    // https only, scheme case-insensitive.
-    url.split_once(':').is_some_and(|(scheme, _)| {
-        scheme.eq_ignore_ascii_case("http") || scheme.eq_ignore_ascii_case("https")
-    })
-}
-
-/// `ClickEvent.CODEC` plus the legacy `value` field TextComponentHoverAndClickEventFix
-/// renames (`url` / `command` / `page`).
-fn parse_click_event(e: &serde_json::Map<String, Value>) -> Option<crate::text::ClickEvent> {
-    let text = |k: &str| e.get(k).and_then(Value::as_str).map(str::to_owned);
-    let legacy = || text("value");
-    match e.get("action").and_then(Value::as_str) {
-        Some("open_url") => text("url")
-            .or_else(legacy)
-            .filter(|u| untrusted_http_url(u))
-            .map(crate::text::ClickEvent::OpenUrl),
-        Some("change_page") => e
-            .get("page")
-            .and_then(Value::as_i64)
-            .or_else(|| e.get("value").and_then(Value::as_i64))
-            .or_else(|| {
-                e.get("value")
-                    .and_then(Value::as_str)
-                    .and_then(|s| s.parse().ok())
-            })
-            .and_then(|p| i32::try_from(p).ok())
-            .filter(|p| *p >= 1)
-            .map(crate::text::ClickEvent::ChangePage),
-        Some("suggest_command") => text("command")
-            .or_else(legacy)
-            .map(crate::text::ClickEvent::SuggestCommand),
-        Some("run_command") => text("command")
-            .or_else(legacy)
-            .map(crate::text::ClickEvent::RunCommand),
-        Some("copy_to_clipboard") => text("value").map(crate::text::ClickEvent::CopyToClipboard),
-        // ClickEvent.ShowDialog.CODEC: a `minecraft:dialog` registry id or
-        // the dialog itself; the server may send it (isAllowedFromServer).
-        Some("show_dialog") => e.get("dialog").map(|dialog| {
-            crate::text::ClickEvent::ShowDialog(crate::scoreboard::json_to_tag(dialog))
-        }),
-        Some("custom") => Some(crate::text::ClickEvent::Custom {
-            id: crate::identifier::parse_identifier(&text("id")?)?,
-            payload: e
-                .get("payload")
-                .filter(|value| !value.is_null())
-                .map(crate::scoreboard::json_to_tag),
-        }),
-        _ => None,
-    }
-}
-
 /// The style fields of a component object.
 fn object_style(o: &serde_json::Map<String, Value>) -> Style {
     let mut style = Style::default();
     if let Some(c) = o.get("color").and_then(Value::as_str) {
-        style.color = named_color(c).or_else(|| hex_color(c));
+        style.color = named_color(c).or_else(|| {
+            c.strip_prefix('#')
+                .and_then(|h| u32::from_str_radix(h, 16).ok())
+        });
     }
     style.shadow_color = o.get("shadow_color").and_then(shadow_color);
-    style.bold = style_flag(o.get("bold"));
-    style.italic = style_flag(o.get("italic"));
-    style.underlined = style_flag(o.get("underlined"));
-    style.strikethrough = style_flag(o.get("strikethrough"));
-    style.obfuscated = style_flag(o.get("obfuscated"));
+    let flag = |k: &str| o.get(k).and_then(Value::as_bool);
+    style.bold = flag("bold");
+    style.italic = flag("italic");
+    style.underlined = flag("underlined");
+    style.strikethrough = flag("strikethrough");
+    style.obfuscated = flag("obfuscated");
     style.font = o.get("font").and_then(crate::text::font_id);
     // ClickEvent.CODEC: the actions a chat line acts on here. A component
     // from a server never opens a file.
-    if let Some(e) = style_event_object(o, "click_event", "clickEvent") {
-        style.click = parse_click_event(e);
+    if let Some(e) = o.get("click_event").and_then(Value::as_object) {
+        let text = |k: &str| e.get(k).and_then(Value::as_str).map(str::to_owned);
+        style.click = match e.get("action").and_then(Value::as_str) {
+            // ClickEvent.OpenUrl.CODEC: ExtraCodecs.UNTRUSTED_URI allows http and
+            // https only, the scheme in any case (Util.parseAndValidateUntrustedUri).
+            Some("open_url") => text("url")
+                .filter(|u| {
+                    u.split_once(':').is_some_and(|(scheme, _)| {
+                        scheme.eq_ignore_ascii_case("http") || scheme.eq_ignore_ascii_case("https")
+                    })
+                })
+                .map(crate::text::ClickEvent::OpenUrl),
+            // ClickEvent.ChangePage.CODEC: ExtraCodecs.POSITIVE_INT.
+            Some("change_page") => e
+                .get("page")
+                .and_then(Value::as_i64)
+                .and_then(|p| i32::try_from(p).ok())
+                .filter(|p| *p >= 1)
+                .map(crate::text::ClickEvent::ChangePage),
+            Some("suggest_command") => text("command").map(crate::text::ClickEvent::SuggestCommand),
+            Some("run_command") => text("command").map(crate::text::ClickEvent::RunCommand),
+            Some("copy_to_clipboard") => {
+                text("value").map(crate::text::ClickEvent::CopyToClipboard)
+            }
+            // ClickEvent.ShowDialog.CODEC: a `minecraft:dialog` registry id or
+            // the dialog itself; the server may send it (isAllowedFromServer).
+            Some("show_dialog") => e.get("dialog").map(|dialog| {
+                crate::text::ClickEvent::ShowDialog(crate::scoreboard::json_to_tag(dialog))
+            }),
+            _ => None,
+        };
     }
-    // HoverEvent.ShowText, ShowItem and ShowEntity.
-    if let Some(e) = style_event_object(o, "hover_event", "hoverEvent") {
+    // HoverEvent.ShowText and ShowItem.
+    if let Some(e) = o.get("hover_event").and_then(Value::as_object) {
         match e.get("action").and_then(Value::as_str) {
             Some("show_text") => {
-                // Modern `value`, or the older `contents` / nested `text`.
-                let value = e
-                    .get("value")
-                    .or_else(|| e.get("contents"))
-                    .or_else(|| e.get("text"));
-                if let Some(value) = value {
+                if let Some(value) = e.get("value") {
                     style.hover = Some(Box::new(to_text(value, &mut |s| Text::literal(s))));
                 }
             }
             Some("show_item") if e.get("id").is_some_and(Value::is_string) => {
                 style.hover_item = Some(Box::new(Value::Object(e.clone())));
             }
-            Some("show_entity") if e.get("id").is_some_and(Value::is_string) => {
-                style.hover_entity = Some(Box::new(Value::Object(e.clone())));
-            }
             _ => {}
         }
     }
@@ -307,13 +258,6 @@ fn object_style(o: &serde_json::Map<String, Value>) -> Style {
     style
 }
 
-/// `TextColor.parseColor` for `#...`: `Integer.parseInt(rest, 16)` (so a sign
-/// and any digit count are accepted), kept only within `0..=0xFFFFFF`.
-pub(crate) fn hex_color(c: &str) -> Option<u32> {
-    let value = i64::from_str_radix(c.strip_prefix('#')?, 16).ok()?;
-    (0..=0xFF_FFFF).contains(&value).then_some(value as u32)
-}
-
 /// `Style.shadow_color`: a packed ARGB int or normalized RGBA array.
 pub(crate) fn shadow_color(value: &Value) -> Option<u32> {
     if let Some(packed) = value.as_i64() {
@@ -496,33 +440,6 @@ pub fn name_text(tag: &Tag) -> Text {
 mod tests {
     use super::*;
 
-    #[test]
-    fn hex_color_follows_text_color_parse_color() {
-        for bad in [
-            "#1000000",
-            "#FFFFFFFF",
-            "#-FF",
-            "#",
-            "#zz",
-            "FFFFFF",
-            "#99999999999",
-        ] {
-            assert_eq!(hex_color(bad), None, "{bad}");
-        }
-        for (good, want) in [
-            ("#FFFFFF", 0xFFFFFF),
-            ("#000000", 0),
-            ("#F", 15),
-            ("#+FF", 255),
-            ("#-0", 0),
-        ] {
-            assert_eq!(hex_color(good), Some(want), "{good}");
-        }
-        let out = serde_json::json!({"text": "A", "color": "#1000000"});
-        let text = to_text(&out, &mut |_| Text::empty());
-        assert_eq!(text.spans[0].style.color, None);
-    }
-
     #[test]
     fn shadow_color_accepts_packed_and_rgba_styles() {
         let packed = serde_json::json!({"text": "A", "shadow_color": -16711936});
@@ -586,100 +503,10 @@ mod tests {
         let t = to_text(&v, &mut |_| Text::empty());
         assert_eq!(t.plain(), "Hi there");
         assert_eq!(t.spans[1].style.color, named_color("red"));
-        // SNBT `1b` is a number in JSON; style flags still take it as true.
-        assert_eq!(t.spans[1].style.bold, Some(true));
         let (v, _) = parse_snbt("[\"a\",{\"text\":\"b\"}]").unwrap();
         assert_eq!(to_text(&v, &mut |_| Text::empty()).plain(), "ab");
     }
 
-    #[test]
-    fn legacy_click_event_open_url_uses_value_field() {
-        use crate::text::ClickEvent;
-        let modern = serde_json::json!({
-            "text": "site",
-            "click_event": {"action": "open_url", "url": "https://example.com"},
-            "underlined": true
-        });
-        let legacy = serde_json::json!({
-            "text": "site",
-            "clickEvent": {"action": "open_url", "value": "https://example.com"},
-            "underlined": 1
-        });
-        for component in [modern, legacy] {
-            let text = to_text(&component, &mut |_| Text::empty());
-            assert_eq!(
-                text.spans[0].style.click,
-                Some(ClickEvent::OpenUrl("https://example.com".into()))
-            );
-            assert_eq!(text.spans[0].style.underlined, Some(true));
-        }
-        let snbt = r#"{text:"site",underlined:1b,clickEvent:{action:open_url,value:"https://example.com"}}"#;
-        let (v, _) = parse_snbt(snbt).unwrap();
-        let text = to_text(&v, &mut |_| Text::empty());
-        assert_eq!(
-            text.spans[0].style.click,
-            Some(ClickEvent::OpenUrl("https://example.com".into()))
-        );
-        assert_eq!(text.spans[0].style.underlined, Some(true));
-    }
-
-    #[test]
-    fn custom_click_events_keep_payloads_and_inherit_to_inline_objects() {
-        use crate::text::ClickEvent;
-        use horizon_world::nbt::Tag;
-
-        for (payload, expected) in [
-            (None, None),
-            (Some(serde_json::Value::Null), None),
-            (Some(serde_json::json!(42)), Some(Tag::Int(42))),
-            (
-                Some(serde_json::json!({"shop": "potions", "amount": 3})),
-                Some(Tag::Compound(
-                    [
-                        ("amount".into(), Tag::Int(3)),
-                        ("shop".into(), Tag::String("potions".into())),
-                    ]
-                    .into_iter()
-                    .collect(),
-                )),
-            ),
-        ] {
-            let mut event = serde_json::json!({"action": "custom", "id": "test:shop"});
-            if let Some(payload) = payload {
-                event["payload"] = payload;
-            }
-            let component = serde_json::json!({
-                "text": "", "click_event": event,
-                "extra": [{"object": "atlas", "sprite": "minecraft:item/potion"}, "Shop"]
-            });
-            let text = to_text(&component, &mut |_| Text::empty());
-            for (_, style) in text.chars() {
-                assert_eq!(
-                    style.click,
-                    Some(ClickEvent::Custom {
-                        id: "test:shop".into(),
-                        payload: expected.clone(),
-                    })
-                );
-            }
-            let encoded = text.component();
-            let decoded = to_text(&encoded, &mut |_| Text::empty());
-            assert_eq!(decoded, text);
-            if expected.is_none() {
-                assert!(!encoded.to_string().contains("\"payload\""));
-            }
-        }
-        for id in ["Bad ID", "Uppercase:shop"] {
-            let text = to_text(
-                &serde_json::json!({
-                    "text": "Shop", "click_event": {"action": "custom", "id": id}
-                }),
-                &mut |_| Text::empty(),
-            );
-            assert_eq!(text.spans[0].style.click, None);
-        }
-    }
-
     #[test]
     fn the_font_is_inherited_and_kept() {
         let (v, _) =
@@ -719,15 +546,4 @@ mod tests {
         let (v, _) = parse_snbt("{n:1.5}").unwrap();
         assert_eq!(v["n"], Value::from(1.5));
     }
-
-    #[test]
-    fn name_text_preserves_legacy_and_decodes_components() {
-        let legacy = Tag::String("§6Golden Name".into());
-        let text = name_text(&legacy);
-        assert_eq!(text.plain(), "Golden Name");
-
-        let comp = Tag::compound([("text", Tag::String("Custom Name".into()))]);
-        let text = name_text(&comp);
-        assert_eq!(text.plain(), "Custom Name");
-    }
 }

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

@@ -125,51 +125,19 @@ pub const RULES: &[Rule] = &[
     b("universal_anger", "mobs", false),
     b("water_source_conversion", "updates", true),
 ];
-/// GameRules.MAX_MINECART_SPEED (26.3), available with minecart improvements.
-pub const MAX_MINECART_SPEED: Rule = i("max_minecart_speed", "misc", 8, 1, 1000);
-pub const MINECART_IMPROVEMENTS: &str = "minecraft:minecart_improvements";
-
-pub fn available_rules(minecart_improvements: bool) -> impl Iterator<Item = &'static Rule> {
-    RULES
-        .iter()
-        .chain(minecart_improvements.then_some(&MAX_MINECART_SPEED))
-}
-
 pub fn rule(name: &str) -> Option<&'static Rule> {
     let name = name.strip_prefix("minecraft:").unwrap_or(name);
-    available_rules(true).find(|r| r.name == name)
+    RULES.iter().find(|r| r.name == name)
 }
 
 /// Current values (defaults unless set).
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct GameRules {
     values: BTreeMap<&'static str, Value>,
-    minecart_improvements: bool,
 }
 impl GameRules {
-    pub fn with_features(features: &[String]) -> Self {
-        Self {
-            minecart_improvements: features.iter().any(|f| f == MINECART_IMPROVEMENTS),
-            ..Self::default()
-        }
-    }
-    /// GameRules.copy(enabledFeatures): keep available values, add defaults for
-    /// newly enabled rules and discard rules absent from the target feature set.
-    pub fn copy_with_features(&self, features: &[String]) -> Self {
-        let mut rules = Self::with_features(features);
-        for (&name, &value) in &self.values {
-            rules.set(name, value);
-        }
-        rules
-    }
-    pub fn available_rules(&self) -> impl Iterator<Item = &'static Rule> + use<> {
-        available_rules(self.minecart_improvements)
-    }
     pub fn get(&self, name: &str) -> Option<Value> {
         let r = rule(name)?;
-        if r.name == MAX_MINECART_SPEED.name && !self.minecart_improvements {
-            return None;
-        }
         Some(self.values.get(r.name).copied().unwrap_or(r.default))
     }
     pub fn bool(&self, name: &str) -> bool {
@@ -192,9 +160,7 @@ impl GameRules {
     }
     /// Set a rule; false if the name or value type is wrong.
     pub fn set(&mut self, name: &str, value: Value) -> bool {
-        let Some(r) = rule(name).filter(|r| self.get(r.name).is_some()) else {
-            return false;
-        };
+        let Some(r) = rule(name) else { return false };
         let ok = match (r.default, value) {
             (Value::Bool(_), Value::Bool(_)) => true,
             (Value::Int(_), Value::Int(v)) => (r.min..=r.max).contains(&v),
@@ -210,7 +176,8 @@ impl GameRules {
     /// Every rule's value by name without namespace, as `save::Level` holds
     /// them (booleans as 0 or 1).
     pub fn by_name(&self) -> BTreeMap<String, i32> {
-        self.available_rules()
+        RULES
+            .iter()
             .map(|r| {
                 let v = match self.values.get(r.name).copied().unwrap_or(r.default) {
                     Value::Bool(b) => i32::from(b),
@@ -222,8 +189,8 @@ impl GameRules {
     }
     /// GameRuleMap codec: `{data: {"minecraft:<rule>": value...}, DataVersion}`.
     pub fn to_nbt(&self) -> NamedTag {
-        let data: Vec<(horizon_world::nbt::JavaString, Tag)> = self
-            .available_rules()
+        let data: Vec<(horizon_world::nbt::JavaString, Tag)> = RULES
+            .iter()
             .map(|r| {
                 let v = self.values.get(r.name).copied().unwrap_or(r.default);
                 let tag = match v {
@@ -245,14 +212,11 @@ impl GameRules {
         }
     }
     pub fn from_nbt(root: &Tag) -> Self {
-        Self::from_nbt_with_features(root, &[])
-    }
-    pub fn from_nbt_with_features(root: &Tag, features: &[String]) -> Self {
-        let mut rules = Self::with_features(features);
+        let mut rules = Self::default();
         let Some(data) = root.get("data") else {
             return rules;
         };
-        for r in rules.available_rules() {
+        for r in RULES {
             let key = format!("minecraft:{}", r.name);
             let value = data.get(&key).or_else(|| data.get(r.name));
             match (r.default, value) {
@@ -268,18 +232,15 @@ impl GameRules {
         rules
     }
     pub fn load(world: &Path) -> Self {
-        Self::load_with_features(world, &[])
-    }
-    pub fn load_with_features(world: &Path, features: &[String]) -> Self {
         let Ok(bytes) = fs::read(world.join("data/minecraft/game_rules.dat")) else {
-            return Self::with_features(features);
+            return Self::default();
         };
         let Ok(raw) = Compression::Gzip.decode(&bytes, 16 << 20) else {
-            return Self::with_features(features);
+            return Self::default();
         };
         match nbt::read_named(&raw, Limits::default()) {
-            Ok((root, _)) => Self::from_nbt_with_features(&root.tag, features),
-            Err(_) => Self::with_features(features),
+            Ok((root, _)) => Self::from_nbt(&root.tag),
+            Err(_) => Self::default(),
         }
     }
     pub fn save(&self, world: &Path) -> crate::Result<()> {

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

@@ -1,68 +1,32 @@
 //! Key display names (`InputConstants.Key.getDisplayName`), shared by key
 //! mappings and `keybind` text components.
 use crate::text::Text;
-use std::{collections::BTreeMap, sync::RwLock};
 
-/// The keys that write a symbol, with what they write on a US layout.
-const SYMBOLS: [(&str, &str); 11] = [
-    ("key.keyboard.minus", "-"),
-    ("key.keyboard.equal", "="),
-    ("key.keyboard.left.bracket", "["),
-    ("key.keyboard.right.bracket", "]"),
-    ("key.keyboard.backslash", "\\"),
-    ("key.keyboard.semicolon", ";"),
-    ("key.keyboard.apostrophe", "'"),
-    ("key.keyboard.grave.accent", "`"),
-    ("key.keyboard.comma", ","),
-    ("key.keyboard.period", "."),
-    ("key.keyboard.slash", "/"),
-];
-
-/// What the player's keyboard layout writes on each key that writes
-/// something, by key name, as the window reported it (`learn_layout`).
-static LAYOUT: RwLock<BTreeMap<String, String>> = RwLock::new(BTreeMap::new());
-
-/// The keyboard layout writes `text` on the key `key` (`key.keyboard.q`):
-/// its name from now on, as `SDL_GetKeyFromScancode` names it with SDL's
-/// default keycode options. Only letter and symbol keys take it; a letter
-/// key keeps its Latin letter on a non-Latin layout (`latin_letters`), and
-/// the number row keeps its digits (`french_numbers`).
-pub fn learn_layout(key: &str, text: &str) {
-    let Some(rest) = key.strip_prefix("key.keyboard.") else {
-        return;
-    };
-    let mut chars = text.chars();
-    let (Some(c), None) = (chars.next(), chars.next()) else {
-        return;
-    };
-    let letter_key = rest.len() == 1 && rest.as_bytes()[0].is_ascii_lowercase();
-    let latin = c.is_ascii() || ('\u{C0}'..='\u{24F}').contains(&c);
-    if c.is_control()
-        || c.is_whitespace()
-        || !(letter_key || SYMBOLS.iter().any(|(k, _)| *k == key))
-        || (letter_key && c.is_alphabetic() && !latin)
-    {
-        return;
-    }
-    if let Ok(mut layout) = LAYOUT.write() {
-        layout.insert(key.to_owned(), c.to_uppercase().collect());
-    }
-}
-
-/// InputConstants.Key.getDisplayName: what the layout writes on the key,
-/// upper-case, else the US layout's character, else by translation.
+/// InputConstants.Key.getDisplayName: one-character keys as the upper-case
+/// character, others by translation.
 pub fn display_name(key: &str) -> Text {
-    if let Some(label) = LAYOUT.read().ok().and_then(|l| l.get(key).cloned()) {
-        return Text::literal(label);
-    }
     if let Some(rest) = key.strip_prefix("key.keyboard.")
         && rest.chars().count() == 1
     {
         let c = rest.to_uppercase();
         return Text::literal(c);
     }
-    if let Some((_, s)) = SYMBOLS.iter().find(|(k, _)| *k == key) {
-        return Text::literal(*s);
+    let symbol = match key {
+        "key.keyboard.minus" => Some("-"),
+        "key.keyboard.equal" => Some("="),
+        "key.keyboard.left.bracket" => Some("["),
+        "key.keyboard.right.bracket" => Some("]"),
+        "key.keyboard.backslash" => Some("\\"),
+        "key.keyboard.semicolon" => Some(";"),
+        "key.keyboard.apostrophe" => Some("'"),
+        "key.keyboard.grave.accent" => Some("`"),
+        "key.keyboard.comma" => Some(","),
+        "key.keyboard.period" => Some("."),
+        "key.keyboard.slash" => Some("/"),
+        _ => None,
+    };
+    if let Some(s) = symbol {
+        return Text::literal(s);
     }
     if let Some(n) = key.strip_prefix("key.mouse.")
         && n.parse::<u32>().is_ok()
@@ -72,36 +36,3 @@ pub fn display_name(key: &str) -> Text {
     }
     Text::translate(key, &[])
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn keys_show_what_the_layout_writes() {
-        // The layout table is shared: these keys are this test's alone.
-        assert_eq!(display_name("key.keyboard.q").plain(), "Q");
-        // AZERTY: A on the Q key, M on the semicolon key, a dead ^ on the
-        // left bracket, a comma on the M key.
-        learn_layout("key.keyboard.q", "a");
-        learn_layout("key.keyboard.semicolon", "m");
-        learn_layout("key.keyboard.left.bracket", "^");
-        learn_layout("key.keyboard.m", ",");
-        assert_eq!(display_name("key.keyboard.q").plain(), "A");
-        assert_eq!(display_name("key.keyboard.semicolon").plain(), "M");
-        assert_eq!(display_name("key.keyboard.left.bracket").plain(), "^");
-        assert_eq!(display_name("key.keyboard.m").plain(), ",");
-        // The number row keeps its digits; a Cyrillic letter, nothing
-        // printable and keys that write nothing are left alone.
-        learn_layout("key.keyboard.1", "&");
-        learn_layout("key.keyboard.f", "а");
-        learn_layout("key.keyboard.g", "\u{8}");
-        learn_layout("key.keyboard.tab", "\t");
-        learn_layout("key.keyboard.h", "ab");
-        assert_eq!(display_name("key.keyboard.1").plain(), "1");
-        assert_eq!(display_name("key.keyboard.f").plain(), "F");
-        assert_eq!(display_name("key.keyboard.g").plain(), "G");
-        assert_eq!(display_name("key.keyboard.h").plain(), "H");
-        assert_eq!(display_name("key.keyboard.slash").plain(), "/");
-    }
-}

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

@@ -3,7 +3,6 @@
 //! from `pack.mcmeta` `language` sections, and a process-wide current
 //! language used by every screen.
 use std::{
-    cell::RefCell,
     collections::{BTreeMap, HashMap},
     sync::{
         Arc, RwLock,
@@ -35,15 +34,6 @@ pub struct Language {
 pub const DEFAULT: &str = "en_us";
 
 static CURRENT: RwLock<Option<Arc<Language>>> = RwLock::new(None);
-/// A language that only the calling thread sees, and the keys it was asked for and did not have
-/// (`scoped`).
-struct Scope {
-    language: Arc<Language>,
-    missed: Vec<String>,
-}
-thread_local! {
-    static SCOPE: RefCell<Option<Scope>> = const { RefCell::new(None) };
-}
 /// The current language's `bidirectional`, read for every drawn string.
 static BIDIRECTIONAL: AtomicBool = AtomicBool::new(false);
 
@@ -67,9 +57,6 @@ impl ResourceSource for Bundled {
             "assets/horizon/lang/en_us.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/en_us.json")
             }
-            "assets/horizon/lang/zh_cn.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/zh_cn.json")
-            }
             "assets/horizon/lang/ru_ru.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/ru_ru.json")
             }
@@ -79,265 +66,6 @@ impl ResourceSource for Bundled {
             "assets/horizon/lang/uk_ua.json" => {
                 include_str!("../../horizon-client/assets/horizon/lang/uk_ua.json")
             }
-            "assets/horizon/lang/hi_in.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/hi_in.json")
-            }
-            "assets/horizon/lang/id_id.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/id_id.json")
-            }
-            "assets/horizon/lang/tr_tr.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/tr_tr.json")
-            }
-            "assets/horizon/lang/ko_kr.json" | "assets/horizon/lang/ko.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ko_kr.json")
-            }
-            "assets/horizon/lang/hr_hr.json" | "assets/horizon/lang/hr.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/hr_hr.json")
-            }
-            "assets/horizon/lang/pt_pt.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/pt_pt.json")
-            }
-            "assets/horizon/lang/ur_pk.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ur_pk.json")
-            }
-            "assets/horizon/lang/fa_ir.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/fa_ir.json")
-            }
-            "assets/horizon/lang/he_il.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/he_il.json")
-            }
-            "assets/horizon/lang/hu_hu.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/hu_hu.json")
-            }
-            "assets/horizon/lang/ro_ro.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ro_ro.json")
-            }
-            "assets/horizon/lang/da_dk.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/da_dk.json")
-            }
-            "assets/horizon/lang/fi_fi.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/fi_fi.json")
-            }
-            "assets/horizon/lang/no_no.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/no_no.json")
-            }
-            "assets/horizon/lang/bg_bg.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/bg_bg.json")
-            }
-            "assets/horizon/lang/sk_sk.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/sk_sk.json")
-            }
-            "assets/horizon/lang/lt_lt.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/lt_lt.json")
-            }
-            "assets/horizon/lang/it_it.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/it_it.json")
-            }
-            "assets/horizon/lang/nl_nl.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/nl_nl.json")
-            }
-            "assets/horizon/lang/vi_vn.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/vi_vn.json")
-            }
-            "assets/horizon/lang/th_th.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/th_th.json")
-            }
-            "assets/horizon/lang/ja_jp.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ja_jp.json")
-            }
-            "assets/horizon/lang/ar_sa.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ar_sa.json")
-            }
-            "assets/horizon/lang/pt_br.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/pt_br.json")
-            }
-            "assets/horizon/lang/cs_cz.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/cs_cz.json")
-            }
-            "assets/horizon/lang/sv_se.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/sv_se.json")
-            }
-            "assets/horizon/lang/el_gr.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/el_gr.json")
-            }
-            "assets/horizon/lang/ca_es.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ca_es.json")
-            }
-            "assets/horizon/lang/et_ee.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/et_ee.json")
-            }
-            "assets/horizon/lang/lv_lv.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/lv_lv.json")
-            }
-            "assets/horizon/lang/sl_si.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/sl_si.json")
-            }
-            "assets/horizon/lang/sr_cs.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/sr_cs.json")
-            }
-            "assets/horizon/lang/is_is.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/is_is.json")
-            }
-            "assets/horizon/lang/af_za.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/af_za.json")
-            }
-            "assets/horizon/lang/ms_my.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ms_my.json")
-            }
-            "assets/horizon/lang/be_by.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/be_by.json")
-            }
-            "assets/horizon/lang/sr_sp.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/sr_sp.json")
-            }
-            "assets/horizon/lang/az_az.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/az_az.json")
-            }
-            "assets/horizon/lang/uz_uz.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/uz_uz.json")
-            }
-            "assets/horizon/lang/kk_kz.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/kk_kz.json")
-            }
-            "assets/horizon/lang/ka_ge.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ka_ge.json")
-            }
-            "assets/horizon/lang/hy_am.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/hy_am.json")
-            }
-            "assets/horizon/lang/bs_ba.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/bs_ba.json")
-            }
-            "assets/horizon/lang/mk_mk.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/mk_mk.json")
-            }
-            "assets/horizon/lang/sq_al.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/sq_al.json")
-            }
-            "assets/horizon/lang/cy_gb.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/cy_gb.json")
-            }
-            "assets/horizon/lang/ga_ie.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ga_ie.json")
-            }
-            "assets/horizon/lang/eu_es.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/eu_es.json")
-            }
-            "assets/horizon/lang/gl_es.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/gl_es.json")
-            }
-            "assets/horizon/lang/fil_ph.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/fil_ph.json")
-            }
-            "assets/horizon/lang/ta_in.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ta_in.json")
-            }
-            "assets/horizon/lang/mn_mn.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/mn_mn.json")
-            }
-            "assets/horizon/lang/lo_la.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/lo_la.json")
-            }
-            "assets/horizon/lang/so_so.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/so_so.json")
-            }
-            "assets/horizon/lang/fy_nl.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/fy_nl.json")
-            }
-            "assets/horizon/lang/gd_gb.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/gd_gb.json")
-            }
-            "assets/horizon/lang/lb_lu.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/lb_lu.json")
-            }
-            "assets/horizon/lang/ky_kg.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ky_kg.json")
-            }
-            "assets/horizon/lang/kn_in.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/kn_in.json")
-            }
-            "assets/horizon/lang/mt_mt.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/mt_mt.json")
-            }
-            "assets/horizon/lang/eo_uy.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/eo_uy.json")
-            }
-            "assets/horizon/lang/haw_us.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/haw_us.json")
-            }
-            "assets/horizon/lang/ig_ng.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ig_ng.json")
-            }
-            "assets/horizon/lang/la_la.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/la_la.json")
-            }
-            "assets/horizon/lang/tt_ru.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/tt_ru.json")
-            }
-            "assets/horizon/lang/yi_de.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/yi_de.json")
-            }
-            "assets/horizon/lang/yo_ng.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/yo_ng.json")
-            }
-            "assets/horizon/lang/ba_ru.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/ba_ru.json")
-            }
-            "assets/horizon/lang/br_fr.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/br_fr.json")
-            }
-            "assets/horizon/lang/cv_cu.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/cv_cu.json")
-            }
-            "assets/horizon/lang/fo_fo.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/fo_fo.json")
-            }
-            "assets/horizon/lang/fur_it.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/fur_it.json")
-            }
-            "assets/horizon/lang/li_li.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/li_li.json")
-            }
-            "assets/horizon/lang/lmo.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/lmo.json")
-            }
-            "assets/horizon/lang/oc_fr.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/oc_fr.json")
-            }
-            "assets/horizon/lang/sah_sah.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/sah_sah.json")
-            }
-            "assets/horizon/lang/se_no.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/se_no.json")
-            }
-            "assets/horizon/lang/szl.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/szl.json")
-            }
-            "assets/horizon/lang/vec_it.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/vec_it.json")
-            }
-            "assets/horizon/lang/de_de.json" | "assets/horizon/lang/de_at.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/de_de.json")
-            }
-            // Swiss German writes "ss" for "ß", as vanilla's de_ch does.
-            "assets/horizon/lang/de_ch.json" => {
-                let de = include_str!("../../horizon-client/assets/horizon/lang/de_de.json");
-                return Some(de.replace('ß', "ss").into_bytes());
-            }
-            "assets/horizon/lang/fr_fr.json"
-            | "assets/horizon/lang/fr_ca.json"
-            | "assets/horizon/lang/fr_ch.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/fr_fr.json")
-            }
-            "assets/horizon/lang/es_es.json"
-            | "assets/horizon/lang/es_ar.json"
-            | "assets/horizon/lang/es_cl.json"
-            | "assets/horizon/lang/es_ec.json"
-            | "assets/horizon/lang/es_mx.json"
-            | "assets/horizon/lang/es_uy.json"
-            | "assets/horizon/lang/es_ve.json" => {
-                include_str!("../../horizon-client/assets/horizon/lang/es_es.json")
-            }
             _ => return None,
         };
         Some(body.as_bytes().to_vec())
@@ -498,50 +226,8 @@ pub fn set(language: Language) {
     *CURRENT.write().unwrap_or_else(|e| e.into_inner()) = Some(Arc::new(language));
 }
 pub fn current() -> Option<Arc<Language>> {
-    if let Some(language) = SCOPE.with(|s| s.borrow().as_ref().map(|s| s.language.clone())) {
-        return Some(language);
-    }
     CURRENT.read().unwrap_or_else(|e| e.into_inner()).clone()
 }
-/// Runs `f` with `language` as the current language of this thread only, and returns what it
-/// returned with the keys `get` and `get_or` looked up and `language` did not have, in the order
-/// asked and without repeats. Nothing is set process-wide, so a test can draw a screen in another
-/// language while the tests beside it read theirs. Scopes nest: the inner one wins, and the outer
-/// one's misses do not include the inner one's. For tests: `bidirectional` stays the process-wide
-/// language's.
-pub fn scoped<R>(language: Language, f: impl FnOnce() -> R) -> (R, Vec<String>) {
-    /// Puts the outer scope back, also when `f` panics.
-    struct Restore(Option<Scope>);
-    impl Drop for Restore {
-        fn drop(&mut self) {
-            SCOPE.with(|s| *s.borrow_mut() = self.0.take());
-        }
-    }
-    let outer = SCOPE.with(|s| {
-        s.borrow_mut().replace(Scope {
-            language: Arc::new(language),
-            missed: Vec::new(),
-        })
-    });
-    let _restore = Restore(outer);
-    let result = f();
-    let missed = SCOPE.with(|s| {
-        s.borrow_mut()
-            .as_mut()
-            .map(|s| std::mem::take(&mut s.missed))
-    });
-    (result, missed.unwrap_or_default())
-}
-/// `key` was asked for in a `scoped` language that has no text for it.
-fn missed(key: &str) {
-    SCOPE.with(|s| {
-        if let Some(scope) = s.borrow_mut().as_mut()
-            && !scope.missed.iter().any(|m| m == key)
-        {
-            scope.missed.push(key.to_owned());
-        }
-    });
-}
 /// `ClientLanguage.defaultRightToLeft` of the current language.
 pub fn bidirectional() -> bool {
     BIDIRECTIONAL.load(Ordering::Relaxed)
@@ -553,19 +239,13 @@ pub fn code() -> String {
 pub fn get(key: &str) -> String {
     current()
         .and_then(|l| l.get(key).map(str::to_owned))
-        .unwrap_or_else(|| {
-            missed(key);
-            key.to_owned()
-        })
+        .unwrap_or_else(|| key.to_owned())
 }
 /// The translation, or `fallback` when the key is missing.
 pub fn get_or(key: &str, fallback: &str) -> String {
     current()
         .and_then(|l| l.get(key).map(str::to_owned))
-        .unwrap_or_else(|| {
-            missed(key);
-            fallback.to_owned()
-        })
+        .unwrap_or_else(|| fallback.to_owned())
 }
 pub fn has(key: &str) -> bool {
     current().is_some_and(|l| l.get(key).is_some())
@@ -599,16 +279,6 @@ mod tests {
         }
         assert_eq!(en.get("horizon.pages.mods"), Some("Mods"));
         assert_eq!(ru.get("horizon.pages.mods"), Some("Моды"));
-        let zh = Language::load(&[&empty], "zh_cn");
-        assert_eq!(zh.get("horizon.options.controller"), Some("手柄"));
-        assert_eq!(zh.get("horizon.pages.mods"), Some("模组"));
-        assert_eq!(zh.get("Preset"), Some("预设"));
-        assert_eq!(zh.get("%s chunks"), Some("%s 个区块"));
-        // Not every bundle is complete: the en_us layer is in every map, so a
-        // missing key falls back to English (`horizon.mods.not_built` is not
-        // in ru_ru either).
-        assert_eq!(zh.get("LOD Distance"), Some("LOD 距离"));
-        assert_eq!(ru.get("horizon.mods.not_built"), Some(" (Not built)"));
         let pl = Language::load(&[&empty], "pl_pl");
         assert_eq!(pl.get("horizon.options.controller"), Some("Kontroler"));
         assert_eq!(pl.get("horizon.options.vibration"), Some("Wibracje"));
@@ -617,217 +287,6 @@ mod tests {
             uk.get("horizon.options.on_screen_keyboard"),
             Some("Екранна клавіатура")
         );
-        let tr = Language::load(&[&empty], "tr_tr");
-        assert_eq!(tr.get("horizon.options.controller"), Some("Kontrolcü"));
-        let es = Language::load(&[&empty], "es_es");
-        assert_eq!(es.get("horizon.options.controller"), Some("Mando"));
-        // German and French, and their regional variants on the same file
-        // (Swiss German without "ß").
-        let de = Language::load(&[&empty], "de_de");
-        assert_eq!(de.get("horizon.osk.close"), Some("Schließen"));
-        let fr = Language::load(&[&empty], "fr_fr");
-        assert_eq!(fr.get("horizon.osk.close"), Some("Fermer"));
-        for (code, base) in [("de_at", &de), ("fr_ca", &fr), ("fr_ch", &fr)] {
-            let variant = Language::load(&[&empty], code);
-            assert_eq!(variant.map(), base.map(), "{code}");
-        }
-        let de_ch = Language::load(&[&empty], "de_ch");
-        assert_eq!(de_ch.get("horizon.osk.close"), Some("Schliessen"));
-        assert!(de_ch.map().values().all(|v| !v.contains('ß')));
-        assert_eq!(de_ch.len(), de.len());
-        let es_ve = Language::load(&[&empty], "es_ve");
-        assert_eq!(
-            es_ve.get("horizon.options.on_screen_keyboard"),
-            Some("Teclado en pantalla")
-        );
-    }
-
-    #[test]
-    fn a_scoped_language_is_the_calling_threads_and_reports_what_it_lacks() {
-        let empty = Mem(HashMap::new());
-        let outside = code();
-        let ((german, english_only, fallback, elsewhere), missed) =
-            scoped(Language::load(&[&empty], "de_de"), || {
-                (
-                    get("horizon.osk.close"),
-                    get("horizon.no_such_key"),
-                    get_or("horizon.no_fallback", "English"),
-                    // Another thread keeps the process-wide language.
-                    std::thread::spawn(code).join().unwrap(),
-                )
-            });
-        assert_eq!(german, "Schließen");
-        assert_eq!(english_only, "horizon.no_such_key");
-        assert_eq!(fallback, "English");
-        assert_eq!(elsewhere, outside);
-        assert_eq!(missed, ["horizon.no_such_key", "horizon.no_fallback"]);
-        // The scope ends with its closure.
-        assert_eq!(code(), outside);
-    }
-
-    #[test]
-    fn scopes_nest_and_end_when_their_closure_panics() {
-        let empty = Mem(HashMap::new());
-        let outside = code();
-        let (inner, missed) = scoped(Language::load(&[&empty], "fr_fr"), || {
-            let (inner, inner_missed) = scoped(Language::load(&[&empty], "pl_pl"), || {
-                (code(), get("horizon.inner_miss"))
-            });
-            assert_eq!(inner_missed, ["horizon.inner_miss"]);
-            assert_eq!(code(), "fr_fr");
-            inner.0
-        });
-        assert_eq!(inner, "pl_pl");
-        assert!(missed.is_empty());
-        let panicked = std::panic::catch_unwind(|| {
-            scoped(Language::load(&[&Mem(HashMap::new())], "de_de"), || {
-                panic!("a test failed inside a scope")
-            })
-        });
-        assert!(panicked.is_err());
-        assert_eq!(code(), outside);
-    }
-
-    /// `crates/horizon-client/assets/horizon/lang`, where Horizon's own strings live.
-    fn bundled_dir() -> std::path::PathBuf {
-        std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
-            .join("../horizon-client/assets/horizon/lang")
-    }
-    /// The keys of a flat bundled file in file order, duplicates included (a map
-    /// would keep only the last of two equal keys). One `"key": "value"` per line.
-    fn file_keys(body: &str) -> Vec<String> {
-        body.lines()
-            .filter(|line| line.starts_with("  \""))
-            .map(|line| {
-                serde_json::Deserializer::from_str(line.trim_start())
-                    .into_iter::<String>()
-                    .next()
-                    .and_then(Result::ok)
-                    .unwrap_or_else(|| panic!("no key on line {line}"))
-            })
-            .collect()
-    }
-    /// The fields the code fills in (`%s`, `%d`, `%1$s`, `%.2f`, `%%`), sorted. A
-    /// percent sign that starts none of them ("100% is") is plain text.
-    fn placeholders(text: &str) -> Vec<String> {
-        let mut found = Vec::new();
-        let mut rest = text;
-        while let Some(at) = rest.find('%') {
-            rest = &rest[at + 1..];
-            let spec = rest
-                .find(|c: char| !(c.is_ascii_digit() || c == '$' || c == '.'))
-                .unwrap_or(rest.len());
-            let after = rest[spec..].chars().next();
-            if after.is_some_and(|c| matches!(c, 's' | 'd' | 'f' | '%')) {
-                let end = spec + 1;
-                found.push(format!("%{}", &rest[..end]));
-                rest = &rest[end..];
-            }
-        }
-        found.sort();
-        found
-    }
-
-    #[test]
-    fn bundled_files_are_served_and_have_no_stale_or_repeated_keys() {
-        let dir = bundled_dir();
-        let en_body = std::fs::read_to_string(dir.join("en_us.json")).unwrap();
-        let en: HashMap<String, String> = serde_json::from_str(&en_body).unwrap();
-        let mut seen = 0;
-        for entry in std::fs::read_dir(&dir).unwrap().flatten() {
-            let name = entry.file_name().into_string().unwrap();
-            let Some(code) = name.strip_suffix(".json") else {
-                continue;
-            };
-            seen += 1;
-            // A file that Bundled::read does not name is never loaded.
-            let path = format!("assets/horizon/lang/{name}");
-            assert!(
-                Bundled.read(&path).is_some(),
-                "{name} is not served by Bundled"
-            );
-            let body = std::fs::read_to_string(entry.path()).unwrap();
-            let map: HashMap<String, String> = serde_json::from_str(&body)
-                .unwrap_or_else(|e| panic!("{name} is not a flat string map: {e}"));
-            let keys = file_keys(&body);
-            assert_eq!(
-                keys.len(),
-                map.len(),
-                "{name} repeats a key or has a multi-line entry"
-            );
-            for (key, value) in &map {
-                // Stale: the code no longer asks for it, or it was renamed in en_us only.
-                let english = en
-                    .get(key)
-                    .unwrap_or_else(|| panic!("{code}: {key} is not in en_us.json"));
-                // A translation keeps the fields the code fills in.
-                assert_eq!(
-                    placeholders(value),
-                    placeholders(english),
-                    "{code}: {key} changes the placeholders of the English text"
-                );
-                assert!(!value.trim().is_empty(), "{code}: {key} is empty");
-            }
-        }
-        assert!(
-            seen >= 7,
-            "found {seen} bundled lang files in {}",
-            dir.display()
-        );
-    }
-
-    #[test]
-    fn every_horizon_key_the_code_names_is_in_en_us() {
-        fn rust_files(dir: &std::path::Path, out: &mut Vec<std::path::PathBuf>) {
-            for entry in std::fs::read_dir(dir).into_iter().flatten().flatten() {
-                let path = entry.path();
-                if path.is_dir() {
-                    rust_files(&path, out);
-                } else if path.extension().is_some_and(|e| e == "rs") {
-                    out.push(path);
-                }
-            }
-        }
-        let en: HashMap<String, String> = serde_json::from_str(
-            &std::fs::read_to_string(bundled_dir().join("en_us.json")).unwrap(),
-        )
-        .unwrap();
-        let crates = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("..");
-        let mut files = Vec::new();
-        for krate in [
-            "horizon-client",
-            "horizon-client-render",
-            "horizon-client-core",
-        ] {
-            rust_files(&crates.join(krate).join("src"), &mut files);
-        }
-        assert!(files.len() > 100, "found only {} sources", files.len());
-        let mut found = 0;
-        for file in files {
-            let text = std::fs::read_to_string(&file).unwrap();
-            for (at, _) in text.match_indices("\"horizon.") {
-                let rest = &text[at + 1..];
-                let Some(end) = rest.find('"') else { continue };
-                let key = &rest[..end];
-                // A key is `horizon.<group>.<name>`: lower-case letters, digits and `_`
-                // between the dots. A key built at run time has a brace; a file name
-                // has one dot; the server addresses that look like keys are listed.
-                const NOT_KEYS: &[&str] = &["horizon.bunchy7s.dev"];
-                let key_like = key
-                    .bytes()
-                    .all(|b| b.is_ascii_lowercase() || b.is_ascii_digit() || b"_.".contains(&b));
-                if key.matches('.').count() < 2 || !key_like || NOT_KEYS.contains(&key) {
-                    continue;
-                }
-                found += 1;
-                assert!(
-                    en.contains_key(key),
-                    "{} names {key}, which is not in en_us.json",
-                    file.display()
-                );
-            }
-        }
-        assert!(found > 50, "found only {found} key names");
     }
 
     #[test]

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

@@ -9,8 +9,7 @@ pub enum Category {
     Harmful,
     Neutral,
 }
-/// A `MobEffect`: id (vanilla's without namespace, a mod's `<ns>:<path>`),
-/// colour, category, instantaneous.
+/// A `MobEffect`: id (without namespace), colour, category, instantaneous.
 #[derive(Clone, Copy, Debug)]
 pub struct EffectDef {
     pub id: &'static str,
@@ -85,80 +84,11 @@ pub const EFFECTS: &[EffectDef] = &[
     fx("infested", 9214860, H),
     fx("breath_of_the_nautilus", 65518, B),
 ];
-/// The effects content mods declare, registered after vanilla's.
-static MOD_EFFECTS: OnceLock<Vec<EffectDef>> = OnceLock::new();
-/// Registers the content mods' effects, `<ns>:<path>` ids in registry order.
-/// The list is set once per process: false when it already was, and the
-/// effects stay those of the first call until the game restarts.
-pub fn register_mod_effects(effects: impl IntoIterator<Item = (String, u32, Category)>) -> bool {
-    if MOD_EFFECTS.get().is_some() {
-        return false;
-    }
-    let defs: Vec<EffectDef> = effects
-        .into_iter()
-        .map(|(id, color, category)| {
-            debug_assert!(id.contains(':'), "{id} has no namespace");
-            fx(Box::leak(id.into_boxed_str()), color, category)
-        })
-        .collect();
-    MOD_EFFECTS.set(defs).is_ok()
-}
-/// The content mods' effects, in registry order.
-pub fn mod_effects() -> &'static [EffectDef] {
-    MOD_EFFECTS.get().map_or(&[], Vec::as_slice)
-}
-/// Every registered effect: vanilla's, then the content mods'.
-pub fn all_effects() -> impl Iterator<Item = &'static EffectDef> {
-    EFFECTS.iter().chain(mod_effects())
-}
 pub fn effect(id: &str) -> Option<&'static EffectDef> {
-    let short = id.trim_start_matches("minecraft:");
-    match EFFECTS.iter().find(|e| e.id == short) {
-        Some(e) => Some(e),
-        None => mod_effect(id),
-    }
+    let id = id.trim_start_matches("minecraft:");
+    EFFECTS.iter().find(|e| e.id == id)
 }
-/// A content mod's effect id (`<ns>:<path>`), not vanilla's with or
-/// without `minecraft:`.
-#[inline]
-pub fn is_mod_effect(id: &str) -> bool {
-    !id.starts_with("minecraft:") && id.bytes().any(|b| b == b':')
-}
-/// Out of line, so vanilla's lookups (every frame, every tick) stay as they were.
-#[cold]
-#[inline(never)]
-fn mod_effect(id: &str) -> Option<&'static EffectDef> {
-    mod_effects().iter().find(|e| e.id == id)
-}
-/// `MobEffect.getDescriptionId` (`Util.makeDescriptionId("effect", key)`):
-/// `effect.<namespace>.<path>`, `/` in the path as `.`.
-pub fn description_id(id: &str) -> String {
-    let (namespace, path) = id.split_once(':').unwrap_or(("minecraft", id));
-    format!("effect.{namespace}.{}", path.replace('/', "."))
-}
-/// The effect's sprite in the GUI atlas (`Hud.getMobEffectSprite`: the key
-/// with `mob_effect/` before its path): `mob_effect/<path>` for vanilla's,
-/// `<ns>:mob_effect/<path>` for a mod's.
-pub fn sprite(id: &str) -> String {
-    let mut out = String::new();
-    push_sprite(&mut out, id);
-    out
-}
-/// [`sprite`], appended to `out`.
-pub fn push_sprite(out: &mut String, id: &str) {
-    let path = match id.split_once(':') {
-        None => id,
-        Some(("minecraft", path)) => path,
-        Some((namespace, path)) => {
-            out.push_str(namespace);
-            out.push(':');
-            path
-        }
-    };
-    out.push_str("mob_effect/");
-    out.push_str(path);
-}
-/// Namespaced effect ids for mob effect storage; a mod's id already is.
+/// Namespaced effect ids for mob effect storage.
 pub fn namespaced(id: &'static str) -> &'static str {
     static IDS: OnceLock<HashMap<&'static str, &'static str>> = OnceLock::new();
     let key = id.strip_prefix("minecraft:").unwrap_or(id);
@@ -300,15 +230,10 @@ pub fn potion_color(id: Option<&str>) -> u32 {
     let Some(def) = id.and_then(potion) else {
         return BASE_POTION_COLOR;
     };
-    effects_color(def.effects.iter().map(|(id, _, amp)| (*id, *amp)))
-}
-/// `PotionContents.getColorOptional` of some effects, `(id, amplifier)`, all visible: the mix of
-/// their colours weighted by amplifier + 1, else the base potion colour.
-pub fn effects_color<'a>(effects: impl Iterator<Item = (&'a str, i32)>) -> u32 {
     let (mut r, mut g, mut b, mut total) = (0u32, 0u32, 0u32, 0u32);
-    for (e, amp) in effects {
+    for (e, _, amp) in def.effects {
         let Some(e) = effect(e) else { continue };
-        let w = amp as u32 + 1;
+        let w = *amp as u32 + 1;
         r += w * (e.color >> 16 & 255);
         g += w * (e.color >> 8 & 255);
         b += w * (e.color & 255);
@@ -323,60 +248,3 @@ pub fn effects_color<'a>(effects: impl Iterator<Item = (&'a str, i32)>) -> u32 {
         _ => BASE_POTION_COLOR,
     }
 }
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn description_ids_and_sprites_keep_the_namespace() {
-        assert_eq!(description_id("speed"), "effect.minecraft.speed");
-        assert_eq!(description_id("minecraft:speed"), "effect.minecraft.speed");
-        assert_eq!(description_id("ruby:curse/dark"), "effect.ruby.curse.dark");
-        assert_eq!(sprite("speed"), "mob_effect/speed");
-        assert_eq!(sprite("minecraft:speed"), "mob_effect/speed");
-        assert_eq!(sprite("ruby:curse/dark"), "ruby:mob_effect/curse/dark");
-    }
-
-    /// `PotionContents.getColorOptional`: each visible effect's colour weighted by its
-    /// amplifier + 1, the channels averaged by integer division; none gives the base colour.
-    #[test]
-    fn effects_mix_their_colours_by_amplifier() {
-        let c = |id: &str| effect(id).unwrap().color;
-        assert_eq!(effects_color([("poison", 0)].into_iter()), c("poison"));
-        let (p, s) = (c("poison"), c("speed"));
-        let mix = |shift: u32| (((p >> shift & 255) + 3 * (s >> shift & 255)) / 4) << shift;
-        assert_eq!(
-            effects_color([("poison", 0), ("speed", 2)].into_iter()),
-            mix(16) | mix(8) | mix(0)
-        );
-        assert_eq!(effects_color(std::iter::empty()), BASE_POTION_COLOR);
-    }
-
-    /// The only test that registers: the registry is set once per process.
-    #[test]
-    fn mod_effects_follow_vanilla_once_registered() {
-        assert!(register_mod_effects([(
-            "ruby:glow".to_owned(),
-            0xFF0000,
-            Category::Neutral
-        )]));
-        assert!(!register_mod_effects([(
-            "ruby:late".to_owned(),
-            1,
-            Category::Harmful
-        )]));
-        let glow = effect("ruby:glow").unwrap();
-        assert_eq!(
-            (glow.color, glow.category, glow.instant),
-            (0xFF0000, Category::Neutral, false)
-        );
-        assert!(effect("glow").is_none() && effect("ruby:late").is_none());
-        assert!(is_mod_effect(glow.id) && !is_mod_effect("speed"));
-        assert!(!is_mod_effect(namespaced("speed")));
-        assert_eq!(namespaced(glow.id), "ruby:glow");
-        assert_eq!(effect("minecraft:speed").unwrap().id, "speed");
-        let ids: Vec<_> = all_effects().map(|e| e.id).collect();
-        assert_eq!(ids.len(), EFFECTS.len() + 1);
-        assert_eq!(ids.last(), Some(&"ruby:glow"));
-    }
-}

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

@@ -28,16 +28,6 @@ pub struct Registries {
     /// Game rule name -> integer-valued.
     pub game_rules: Vec<(String, bool)>,
     pub players: Vec<String>,
-    /// A dedicated server's lists, for the completions of `/op`, `/deop`, `/pardon`, `/pardon-ip` and
-    /// `/whitelist`: the operators' names, the banned names and addresses, the whitelisted names.
-    pub ops: Vec<String>,
-    pub banned_players: Vec<String>,
-    pub banned_ips: Vec<String>,
-    pub whitelisted: Vec<String>,
-    /// `ClientSuggestionProvider.customCompletionSuggestions`: the extra chat
-    /// completions the server sent (ClientboundCustomChatCompletionsPacket),
-    /// each once.
-    pub custom_completions: std::collections::BTreeSet<String>,
     /// Scoreboard objective names, team names and tracked score holders.
     pub objectives: Vec<String>,
     pub teams: Vec<String>,
@@ -97,55 +87,7 @@ pub struct RegistryIds {
     pub tags: Vec<String>,
 }
 const EMPTY: &[String] = &[];
-/// ClientboundCustomChatCompletionsPacket.Action.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum CustomCompletionAction {
-    Add,
-    Remove,
-    Set,
-}
-impl CustomCompletionAction {
-    /// `Action.BY_ID`: `ByIdMap.continuous` with `OutOfBoundsStrategy.ZERO`,
-    /// so an unknown id is `ADD`.
-    pub fn from_id(id: i32) -> Self {
-        match id {
-            1 => Self::Remove,
-            2 => Self::Set,
-            _ => Self::Add,
-        }
-    }
-}
-/// `ClientSuggestionProvider.modifyCustomCompletions`: the server adds,
-/// removes or replaces the extra chat completions.
-pub fn modify_custom_completions(
-    set: &mut std::collections::BTreeSet<String>,
-    action: CustomCompletionAction,
-    entries: &[String],
-) {
-    match action {
-        CustomCompletionAction::Add => set.extend(entries.iter().cloned()),
-        CustomCompletionAction::Remove => {
-            for e in entries {
-                set.remove(e);
-            }
-        }
-        CustomCompletionAction::Set => {
-            set.clear();
-            set.extend(entries.iter().cloned());
-        }
-    }
-}
 impl Registries {
-    /// `ClientSuggestionProvider.getCustomTabSuggestions`: what chat (not a
-    /// command) completes, the online players' names with the server's custom
-    /// completions, each once.
-    pub fn custom_tab_suggestions(&self) -> std::collections::BTreeSet<&str> {
-        self.players
-            .iter()
-            .chain(&self.custom_completions)
-            .map(String::as_str)
-            .collect()
-    }
     /// Fill what the game did not build itself from vanilla's exported
     /// registries (`command-registries.json`, written by
     /// `VanillaCommandParseOracle registries`): built-in registries such as
@@ -173,16 +115,6 @@ impl Registries {
         fill(&mut self.templates, "templates");
         fill(&mut self.persistent_components, "persistent_components");
         fill(&mut self.learnable_recipes, "learnable_recipes");
-        if self.summonable.is_empty() {
-            self.summonable = strings(&r["summonable"]);
-            self.summonable.sort();
-            self.summonable.dedup();
-        }
-        if self.entity_types.is_empty() {
-            self.entity_types = strings(&r["entity_types"]);
-            self.entity_types.sort();
-            self.entity_types.dedup();
-        }
         const RELOADED: [&str; 5] = [
             "minecraft:advancement",
             "minecraft:recipe",
@@ -223,58 +155,6 @@ impl Registries {
             }
         }
     }
-    /// Only what [`Self::fill_from_export`] takes from an export, to keep
-    /// in place of the export itself (a third of its memory).
-    pub fn from_export(r: &serde_json::Value) -> Self {
-        let mut out = Self::default();
-        out.fill_from_export(r);
-        out
-    }
-    /// [`Self::fill_from_export`] from an export already read with
-    /// [`Self::from_export`]: each field the game left empty, each registry
-    /// it did not list.
-    pub fn fill_from_exported(&mut self, e: &Self) {
-        let fill = |field: &mut Vec<String>, from: &Vec<String>| {
-            if field.is_empty() {
-                field.clone_from(from);
-            }
-        };
-        fill(&mut self.effects, &e.effects);
-        fill(&mut self.enchantments, &e.enchantments);
-        fill(&mut self.attributes, &e.attributes);
-        fill(&mut self.damage_types, &e.damage_types);
-        fill(&mut self.templates, &e.templates);
-        fill(&mut self.persistent_components, &e.persistent_components);
-        fill(&mut self.learnable_recipes, &e.learnable_recipes);
-        if self.summonable.is_empty() {
-            self.summonable.clone_from(&e.summonable);
-            self.summonable.sort();
-            self.summonable.dedup();
-        }
-        if self.entity_types.is_empty() {
-            self.entity_types.clone_from(&e.entity_types);
-            self.entity_types.sort();
-            self.entity_types.dedup();
-        }
-        for (name, ids) in &e.by_registry {
-            if !self.by_registry.contains_key(name) {
-                self.by_registry.insert(name.clone(), ids.clone());
-            }
-        }
-        if self.block_entities.is_empty() {
-            self.block_entities.clone_from(&e.block_entities);
-        }
-        if self.block_tag_members.is_empty() {
-            self.block_tag_members.clone_from(&e.block_tag_members);
-        }
-        if self.clock_time_markers.is_empty() {
-            self.clock_time_markers.clone_from(&e.clock_time_markers);
-        }
-        if self.advancement_criteria.is_empty() {
-            self.advancement_criteria
-                .clone_from(&e.advancement_criteria);
-        }
-    }
     /// The element ids of a registry (sorted).
     pub fn ids(&self, registry: &str) -> &[String] {
         if let Some(r) = self.by_registry.get(registry) {

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

@@ -107,7 +107,10 @@ pub fn style_from_json(v: &Value) -> Style {
     let mut s = Style::default();
     let Some(o) = v.as_object() else { return s };
     if let Some(c) = o.get("color").and_then(Value::as_str) {
-        s.color = text::named_color(c).or_else(|| component::hex_color(c));
+        s.color = text::named_color(c).or_else(|| {
+            c.strip_prefix('#')
+                .and_then(|h| u32::from_str_radix(h, 16).ok())
+        });
     }
     s.shadow_color = o.get("shadow_color").and_then(component::shadow_color);
     let flag = |k: &str| o.get(k).and_then(Value::as_bool);
@@ -1338,9 +1341,9 @@ fn decompose(c: &Comp) -> (serde_json::Map<String, Value>, Vec<Comp>) {
                     }
                     "color" => {
                         let color = v.as_str().map(|s| match s.strip_prefix('#') {
-                            Some(_) => match component::hex_color(s) {
-                                Some(rgb) => format!("#{rgb:06X}"),
-                                None => s.to_owned(),
+                            Some(hex) => match u32::from_str_radix(hex, 16) {
+                                Ok(rgb) => format!("#{rgb:06X}"),
+                                Err(_) => s.to_owned(),
                             },
                             None => s.to_owned(),
                         });

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

@@ -3,8 +3,179 @@
 //! number formatting.
 use crate::text::{self, Style, Text};
 use horizon_world::nbt::Tag;
-use horizon_world::snbt_text::string_of;
-pub use horizon_world::snbt_text::{java_double, java_float, quote_and_escape, to_snbt};
+
+/// `Double.toString`.
+pub fn java_double(v: f64) -> String {
+    java_float_text(v, &format!("{v}"), &format!("{v:e}"))
+}
+/// `Float.toString`.
+pub fn java_float(v: f32) -> String {
+    java_float_text(f64::from(v), &format!("{v}"), &format!("{v:e}"))
+}
+fn java_float_text(v: f64, plain: &str, sci: &str) -> String {
+    if v.is_nan() {
+        return "NaN".into();
+    }
+    if v.is_infinite() {
+        return if v > 0.0 { "Infinity" } else { "-Infinity" }.into();
+    }
+    if v == 0.0 {
+        return if v.is_sign_negative() { "-0.0" } else { "0.0" }.into();
+    }
+    let a = v.abs();
+    if (1.0e-3..1.0e7).contains(&a) {
+        if plain.contains('.') {
+            plain.to_owned()
+        } else {
+            format!("{plain}.0")
+        }
+    } else {
+        let (mantissa, exponent) = sci.split_once('e').unwrap_or((sci, "0"));
+        let mantissa = if mantissa.contains('.') {
+            mantissa.to_owned()
+        } else {
+            format!("{mantissa}.0")
+        };
+        format!("{mantissa}E{exponent}")
+    }
+}
+
+/// `SnbtGrammar.escapeControlCharacters`.
+fn escape_control(c: char) -> Option<&'static str> {
+    Some(match c {
+        '\u{8}' => "b",
+        '\u{c}' => "f",
+        '\n' => "n",
+        '\r' => "r",
+        '\t' => "t",
+        _ => return None,
+    })
+}
+/// `StringTag.quoteAndEscape`.
+pub fn quote_and_escape(input: &str) -> String {
+    let mut out = String::from(" ");
+    let mut quote = '\0';
+    for c in input.chars() {
+        if c == '\\' {
+            out.push_str("\\\\");
+        } else if c != '"' && c != '\'' {
+            match escape_control(c) {
+                Some(e) => {
+                    out.push('\\');
+                    out.push_str(e);
+                }
+                None => out.push(c),
+            }
+        } else {
+            if quote == '\0' {
+                quote = if c == '"' { '\'' } else { '"' };
+            }
+            if quote == c {
+                out.push('\\');
+            }
+            out.push(c);
+        }
+    }
+    if quote == '\0' {
+        quote = '"';
+    }
+    out.replace_range(0..1, &quote.to_string());
+    out.push(quote);
+    out
+}
+fn unquoted_key(key: &str) -> bool {
+    if key.eq_ignore_ascii_case("true") || key.eq_ignore_ascii_case("false") {
+        return false;
+    }
+    let mut chars = key.chars();
+    let first_ok = chars
+        .next()
+        .is_some_and(|c| c.is_ascii_alphabetic() || c == '.' || c == '_');
+    // `[A-Za-z._]+[A-Za-z0-9._+-]*`
+    first_ok && chars.all(|c| c.is_ascii_alphanumeric() || matches!(c, '.' | '_' | '+' | '-'))
+}
+fn string_of(t: &horizon_world::nbt::JavaString) -> String {
+    t.to_string_lossy()
+}
+
+/// `Tag.toString` (StringTagVisitor).
+pub fn to_snbt(tag: &Tag) -> String {
+    let mut out = String::new();
+    visit(tag, &mut out);
+    out
+}
+fn visit(tag: &Tag, out: &mut String) {
+    match tag {
+        Tag::End => out.push_str("END"),
+        Tag::Byte(v) => out.push_str(&format!("{v}b")),
+        Tag::Short(v) => out.push_str(&format!("{v}s")),
+        Tag::Int(v) => out.push_str(&v.to_string()),
+        Tag::Long(v) => out.push_str(&format!("{v}L")),
+        Tag::Float(v) => {
+            out.push_str(&java_float(f32::from_bits(*v)));
+            out.push('f');
+        }
+        Tag::Double(v) => {
+            out.push_str(&java_double(f64::from_bits(*v)));
+            out.push('d');
+        }
+        Tag::String(s) => out.push_str(&quote_and_escape(&string_of(s))),
+        Tag::ByteArray(a) => {
+            out.push_str("[B;");
+            out.push_str(
+                &a.iter()
+                    .map(|v| format!("{}B", *v as i8))
+                    .collect::<Vec<_>>()
+                    .join(","),
+            );
+            out.push(']');
+        }
+        Tag::IntArray(a) => {
+            out.push_str("[I;");
+            out.push_str(&a.iter().map(i32::to_string).collect::<Vec<_>>().join(","));
+            out.push(']');
+        }
+        Tag::LongArray(a) => {
+            out.push_str("[L;");
+            out.push_str(
+                &a.iter()
+                    .map(|v| format!("{v}L"))
+                    .collect::<Vec<_>>()
+                    .join(","),
+            );
+            out.push(']');
+        }
+        Tag::List(l) => {
+            out.push('[');
+            for (i, t) in l.iter().enumerate() {
+                if i > 0 {
+                    out.push(',');
+                }
+                visit(t, out);
+            }
+            out.push(']');
+        }
+        Tag::Compound(c) => {
+            out.push('{');
+            let mut entries: Vec<(String, &Tag)> =
+                c.iter().map(|(k, v)| (string_of(k), v)).collect();
+            entries.sort_by(|a, b| a.0.cmp(&b.0));
+            for (i, (k, v)) in entries.iter().enumerate() {
+                if i > 0 {
+                    out.push(',');
+                }
+                if unquoted_key(k) {
+                    out.push_str(k);
+                } else {
+                    out.push_str(&quote_and_escape(k));
+                }
+                out.push(':');
+                visit(v, out);
+            }
+            out.push('}');
+        }
+    }
+}
 
 // ---- the coloured form -----------------------------------------------------
 

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

@@ -39,7 +39,7 @@ pub fn named_color(name: &str) -> Option<u32> {
     COLORS.iter().find(|c| c.1 == name).map(|c| c.2)
 }
 
-/// Click actions carried by text components.
+/// Click actions carried by locally constructed text components.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum ClickEvent {
     /// `ClickEvent.OpenUrl`: an http or https link.
@@ -53,11 +53,6 @@ pub enum ClickEvent {
     /// `ClickEvent.ShowDialog`: a `minecraft:dialog` registry id, or the
     /// dialog itself as the component carried it.
     ShowDialog(horizon_world::nbt::Tag),
-    /// `ClickEvent.Custom`: a server-defined action with an optional NBT payload.
-    Custom {
-        id: String,
-        payload: Option<horizon_world::nbt::Tag>,
-    },
     /// A local file to open with the system handler.
     /// Only allow this in locally constructed messages, never server/LAN text.
     OpenFile(String),
@@ -101,8 +96,6 @@ pub struct Style {
     pub hover: Option<Box<Text>>,
     /// `HoverEvent.ShowItem`: the event's `{id, count?, components?}` object.
     pub hover_item: Option<Box<Value>>,
-    /// `HoverEvent.ShowEntity`: the event's `{id, uuid, name?}` object.
-    pub hover_entity: Option<Box<Value>>,
     /// `Style.insertion`: the text a Shift-click puts in the chat box.
     pub insertion: Option<String>,
     /// The font (`FontDescription.Resource`), a full id like
@@ -134,12 +127,11 @@ impl Style {
         if self.click.is_none() {
             self.click.clone_from(&base.click);
         }
-        // One HoverEvent: its three kinds are inherited together, so a style
-        // with its own event never picks up another kind from `base`.
-        if self.hover.is_none() && self.hover_item.is_none() && self.hover_entity.is_none() {
+        if self.hover.is_none() {
             self.hover.clone_from(&base.hover);
+        }
+        if self.hover_item.is_none() {
             self.hover_item.clone_from(&base.hover_item);
-            self.hover_entity.clone_from(&base.hover_entity);
         }
         if self.insertion.is_none() {
             self.insertion.clone_from(&base.insertion);
@@ -246,28 +238,6 @@ impl Text {
         t.source = Some(Value::Object(c).into());
         t
     }
-    /// Component.translatableWithFallback(key, fallback, args): `translate`, with `fallback` as
-    /// the template when the language has no `key`.
-    pub fn translate_with_fallback(key: &str, fallback: &str, args: &[Text]) -> Self {
-        let template = lang::current()
-            .and_then(|l| l.get(key).map(str::to_owned))
-            .unwrap_or_else(|| fallback.to_owned());
-        let mut t = format_translation(&template, args);
-        let mut c = Map::new();
-        c.insert("translate".into(), key.into());
-        c.insert("fallback".into(), fallback.into());
-        if !args.is_empty() {
-            c.insert("with".into(), args.iter().map(Text::argument).collect());
-        }
-        t.source = Some(Value::Object(c).into());
-        t
-    }
-    /// CommonComponents.optionNameValue: "Caption: value" joined as the language joins them
-    /// (`options.generic_value`: "%s : %s" in French, "%s：%s" in Chinese). English's "%s: %s"
-    /// when the language has no such key, as without prepared resources.
-    pub fn option_name_value(caption: Text, value: Text) -> Self {
-        Self::translate_with_fallback("options.generic_value", "%s: %s", &[caption, value])
-    }
     /// A translatable message whose arguments are plain strings.
     pub fn tr(key: &str, args: &[&dyn std::fmt::Display]) -> Self {
         let args: Vec<Text> = args.iter().map(|a| Text::literal(a.to_string())).collect();
@@ -566,7 +536,7 @@ const STYLE_KEYS: [&str; 11] = [
     "insertion",
     "font",
 ];
-/// `Style.Serializer`: the fields a style sets.
+/// Style.Serializer: the fields a style sets.
 fn style_json(style: &Style) -> Vec<(String, Value)> {
     let mut out = Vec::new();
     if let Some(c) = style.color {
@@ -608,13 +578,6 @@ fn style_json(style: &Style) -> Vec<(String, Value)> {
                 "action": "show_dialog",
                 "dialog": crate::scoreboard::tag_to_json(dialog),
             }),
-            ClickEvent::Custom { id, payload } => {
-                let mut event = json!({ "action": "custom", "id": id });
-                if let Some(payload) = payload {
-                    event["payload"] = crate::scoreboard::tag_to_json(payload);
-                }
-                event
-            }
             ClickEvent::OpenFile(path) => json!({ "action": "open_file", "path": path }),
         };
         out.push(("click_event".to_owned(), event));
@@ -628,10 +591,6 @@ fn style_json(style: &Style) -> Vec<(String, Value)> {
         let mut event = item.clone();
         event.insert("action".into(), "show_item".into());
         out.push(("hover_event".to_owned(), Value::Object(event)));
-    } else if let Some(Value::Object(entity)) = style.hover_entity.as_deref() {
-        let mut event = entity.clone();
-        event.insert("action".into(), "show_entity".into());
-        out.push(("hover_event".to_owned(), Value::Object(event)));
     }
     if let Some(insertion) = &style.insertion {
         out.push(("insertion".to_owned(), insertion.clone().into()));

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

@@ -12,48 +12,13 @@ pub fn uuid_text(u: [i32; 4]) -> String {
     )
 }
 pub fn uuid_from_text(s: &str) -> Option<[i32; 4]> {
-    let mut hex = [0u8; 32];
-    let mut len = 0;
-    for b in s.bytes() {
-        if b == b'-' {
-            continue;
-        }
-        if !b.is_ascii_hexdigit() || len >= 32 {
-            return None;
-        }
-        hex[len] = b;
-        len += 1;
-    }
-    if len != 32 {
+    let hex: String = s.chars().filter(|c| *c != '-').collect();
+    if hex.len() != 32 {
         return None;
     }
-    let hex = std::str::from_utf8(&hex).ok()?;
     let mut out = [0i32; 4];
     for (i, v) in out.iter_mut().enumerate() {
         *v = u32::from_str_radix(&hex[i * 8..i * 8 + 8], 16).ok()? as i32;
     }
     Some(out)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn uuid_from_text_rejects_multibyte_and_non_hex() {
-        assert_eq!(uuid_from_text("€€€€€€€€€€aa"), None);
-        assert_eq!(uuid_from_text("€€€€€€€€€€aa----"), None);
-        assert_eq!(uuid_from_text("+0000001-0000-0000-0000-000000000000"), None);
-        assert_eq!(uuid_from_text("00000000-0000-0000-0000-00000000000g"), None);
-        assert_eq!(uuid_from_text(""), None);
-    }
-
-    #[test]
-    fn uuid_from_text_parses_hex_and_dashes() {
-        let u = [0x01234567, -0x76543211, 0x01234567, -0x76543211];
-        let text = uuid_text(u);
-        assert_eq!(uuid_from_text(&text), Some(u));
-        let undashed: String = text.chars().filter(|c| *c != '-').collect();
-        assert_eq!(uuid_from_text(&undashed), Some(u));
-    }
-}

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

@@ -567,34 +567,6 @@ fn length(v: [f32; 2]) -> f32 {
     (v[0] * v[0] + v[1] * v[1]).sqrt()
 }
 
-/// 8BitDo Ultimate 2 Wireless (`2dc8:6012`). gilrs' bundled SDL DB only has a
-/// Windows row for it; on Linux/Bluetooth the right stick is on ABS_Z/ABS_RX
-/// (`LeftZ`/`RightStickX`) until an SDL mapping matches.
-pub const BITDO_ULTIMATE2_VID_PID: (u16, u16) = (0x2dc8, 0x6012);
-
-/// Stick axes after correcting pads whose right stick gilrs still exposes on
-/// `LeftZ`/`RightStickX` (no matching SDL row for this device version).
-/// `sdl_mapped` is true when gilrs already applied an SDL gamecontroller row.
-pub fn stick_axes(
-    left: [f32; 2],
-    right: [f32; 2],
-    left_z: f32,
-    vendor: Option<u16>,
-    product: Option<u16>,
-    sdl_mapped: bool,
-) -> ([f32; 2], [f32; 2]) {
-    if !sdl_mapped
-        && vendor == Some(BITDO_ULTIMATE2_VID_PID.0)
-        && product == Some(BITDO_ULTIMATE2_VID_PID.1)
-    {
-        // Default map: RightStickX is the stick's Y, LeftZ its X; RightStickY
-        // is the right trigger and must not drive look.
-        (left, [left_z, right[0]])
-    } else {
-        (left, right)
-    }
-}
-
 /// A radial deadzone: inside it the stick is centred; beyond it the rest of
 /// the travel is rescaled to 0..1 in the same direction, so diagonals aren't
 /// clipped and the first movement past the deadzone is small.
@@ -1206,38 +1178,6 @@ mod tests {
         assert_eq!(odd, PadSettings::default());
     }
 
-    #[test]
-    fn ultimate2_right_stick_on_z_without_sdl() {
-        let (left, right) = stick_axes(
-            [0.2, 0.3],
-            [0.7, -0.9],
-            -0.5,
-            Some(BITDO_ULTIMATE2_VID_PID.0),
-            Some(BITDO_ULTIMATE2_VID_PID.1),
-            false,
-        );
-        assert_eq!(left, [0.2, 0.3]);
-        assert_eq!(right, [-0.5, 0.7], "X from LeftZ, Y from RightStickX");
-        let kept = stick_axes(
-            [0.2, 0.3],
-            [0.7, -0.9],
-            -0.5,
-            Some(BITDO_ULTIMATE2_VID_PID.0),
-            Some(BITDO_ULTIMATE2_VID_PID.1),
-            true,
-        );
-        assert_eq!(kept, ([0.2, 0.3], [0.7, -0.9]), "SDL row already remapped");
-        let other = stick_axes(
-            [0.0, 0.0],
-            [1.0, 0.0],
-            0.5,
-            Some(0x045e),
-            Some(0x028e),
-            false,
-        );
-        assert_eq!(other, ([0.0, 0.0], [1.0, 0.0]));
-    }
-
     #[test]
     fn radial_deadzone_rescales() {
         assert_eq!(radial([0.1, 0.05], 0.15), [0.0, 0.0]);

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

@@ -2,9 +2,6 @@
 //! Item-use and sneak multipliers come from the player's current state; this
 //! module does not implement sprint eligibility, poses or the input lifecycle.
 
-use std::collections::HashSet;
-use winit::keyboard::{KeyCode, ModifiersState};
-
 fn length(v: [f32; 2]) -> f32 {
     f64::from(v[0] * v[0] + v[1] * v[1]).sqrt() as f32
 }
@@ -68,45 +65,3 @@ fn square_movement(v: [f32; 2]) -> [f32; 2] {
         },
     )
 }
-
-/// `InputQuirks.isQuitShortcutDown`: checks whether the platform's window-closing
-/// keyboard shortcut is held.
-/// - On macOS: Command (`super_key()`) + `Q`.
-/// - On Windows / Linux / other: Alt (`alt_key()`) + `F4`.
-pub fn is_quit_shortcut_down(modifiers: ModifiersState, keys: &HashSet<KeyCode>) -> bool {
-    if cfg!(target_os = "macos") {
-        modifiers.super_key() && keys.contains(&KeyCode::KeyQ)
-    } else {
-        modifiers.alt_key() && keys.contains(&KeyCode::F4)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn quit_shortcut_follows_platform_modifiers_and_keys() {
-        let mut keys = HashSet::new();
-        let alt = ModifiersState::ALT;
-        let super_key = ModifiersState::SUPER;
-
-        assert!(!is_quit_shortcut_down(ModifiersState::empty(), &keys));
-
-        keys.insert(KeyCode::F4);
-        if cfg!(target_os = "macos") {
-            assert!(!is_quit_shortcut_down(alt, &keys));
-            keys.remove(&KeyCode::F4);
-            keys.insert(KeyCode::KeyQ);
-            assert!(is_quit_shortcut_down(super_key, &keys));
-            assert!(!is_quit_shortcut_down(alt, &keys));
-        } else {
-            assert!(is_quit_shortcut_down(alt, &keys));
-            assert!(!is_quit_shortcut_down(super_key, &keys));
-            keys.remove(&KeyCode::F4);
-            keys.insert(KeyCode::KeyQ);
-            assert!(!is_quit_shortcut_down(alt, &keys));
-            assert!(!is_quit_shortcut_down(super_key, &keys));
-        }
-    }
-}

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

@@ -51,10 +51,6 @@ impl InteractionInput {
     pub fn press(&mut self, button: Button) {
         self.clicks[button as usize] += 1;
     }
-    /// Whether a click waits for the next tick.
-    pub fn has_clicks(&self) -> bool {
-        self.clicks.iter().any(|&c| c > 0)
-    }
 
     pub fn tick(&mut self, world: &mut impl InteractionWorld, attack_down: bool, use_down: bool) {
         let [attack, use_item, pick] = std::mem::take(&mut self.clicks);
@@ -85,19 +81,6 @@ impl InteractionInput {
     }
 }
 
-/// The sentence of `Minecraft.handleKeybinds` that follows a key which opened
-/// a screen: `Gui.setScreen` has already run `KeyMapping.releaseAll()`, so
-/// `key.use` reads up and the same call releases an active use
-/// (`player.isUsingItem() && !keyUse.isDown()` → `MultiPlayerGameMode.releaseUsingItem`).
-/// Only the screens opened from the keybinds do this (the inventory, chat and
-/// advancements); the pause menu, server containers, mount inventories and
-/// dialogs release on the first tick after closing instead, as vanilla does.
-pub fn release_on_screen_open(world: &mut impl InteractionWorld) {
-    if world.using_item() {
-        world.release_using();
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

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

@@ -284,26 +284,6 @@ pub fn mouse_button(name: &str) -> Option<MouseButton> {
 }
 pub use horizon_client_core::key_display::display_name;
 
-/// A key event: what the layout writes on its key, without modifiers, names
-/// that key from now on (`key_display::learn_layout`), so an AZERTY player's
-/// Q key shows A.
-pub fn learn_layout(event: &winit::event::KeyEvent) {
-    use winit::keyboard::{Key, PhysicalKey};
-    use winit::platform::modifier_supplement::KeyEventExtModifierSupplement;
-    let PhysicalKey::Code(code) = event.physical_key else {
-        return;
-    };
-    let Some(name) = key_name(code) else {
-        return;
-    };
-    let learn = horizon_client_core::key_display::learn_layout;
-    match event.key_without_modifiers() {
-        Key::Character(text) => learn(name, &text),
-        Key::Dead(Some(c)) => learn(name, c.encode_utf8(&mut [0; 4])),
-        _ => {}
-    }
-}
-
 /// Current bindings by mapping name.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct KeyBinds {
@@ -483,21 +463,6 @@ impl KeyBinds {
             .find(|mapping| self.get(mapping) == name)
             .and_then(|mapping| key_code(Self::default_of(mapping)))
     }
-    /// `AbstractContainerScreen.checkHotbarKeyPressed`: the off hand and the
-    /// hotbar slots, as the controls bind them now. Answers the key the menu
-    /// acts on (`KeyF` for the off hand, `DigitN` for a slot), so a rebound key
-    /// swaps instead of reaching the screen.
-    pub fn container_hotbar_key(&self, key: KeyCode) -> Option<KeyCode> {
-        let name = key_name(key)?;
-        if self.get("key.swapOffhand") == name {
-            return Some(KeyCode::KeyF);
-        }
-        MAPPINGS
-            .iter()
-            .filter(|m| m.0.starts_with("key.hotbar."))
-            .find(|m| self.get(m.0) == name)
-            .and_then(|m| key_code(Self::default_of(m.0)))
-    }
 }
 
 #[cfg(test)]
@@ -534,29 +499,6 @@ mod tests {
         assert_eq!(keys.container_mouse_key(MouseButton::Forward, false), None);
     }
 
-    #[test]
-    fn container_hotkeys_follow_the_bound_keys() {
-        let mut keys = KeyBinds::default();
-        assert_eq!(
-            keys.container_hotbar_key(KeyCode::KeyF),
-            Some(KeyCode::KeyF)
-        );
-        assert_eq!(
-            keys.container_hotbar_key(KeyCode::Digit3),
-            Some(KeyCode::Digit3)
-        );
-        assert_eq!(keys.container_hotbar_key(KeyCode::Tab), None);
-        // The report's key: bound to the off hand, the menu takes it first.
-        keys.set("key.swapOffhand", "key.keyboard.tab");
-        assert_eq!(keys.container_hotbar_key(KeyCode::Tab), Some(KeyCode::KeyF));
-        assert_eq!(keys.container_hotbar_key(KeyCode::KeyF), None);
-        keys.set("key.hotbar.3", "key.keyboard.t");
-        assert_eq!(
-            keys.container_hotbar_key(KeyCode::KeyT),
-            Some(KeyCode::Digit3)
-        );
-    }
-
     #[test]
     fn rebinding_translates_to_defaults() {
         let mut k = KeyBinds::default();

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

@@ -10,10 +10,6 @@ pub struct KeyState {
     released_by_screen_when_down: bool,
     toggle: Option<bool>,
     keyboard: bool,
-    /// Held down by a controller's toggle (Horizon's pad toggle-sneak, which
-    /// vanilla has no option for): until it lets go, the mapping toggles as
-    /// if its vanilla option were on, so a screen releases and restores it.
-    pad_toggled: bool,
 }
 
 impl KeyState {
@@ -24,7 +20,6 @@ impl KeyState {
             released_by_screen_when_down: false,
             toggle: None,
             keyboard: true,
-            pad_toggled: false,
         }
     }
     /// A `ToggleKeyMapping`; `keyboard` is whether the bound key is a keyboard key.
@@ -48,28 +43,16 @@ impl KeyState {
             true
         }
     }
-    /// The mapping toggles: its option is on, or a pad toggled it down.
-    fn needs_toggle(&self, option: bool) -> bool {
-        option || self.pad_toggled
-    }
     /// `setDown`; `needs_toggle` is the mapping's option value.
     pub fn set_down(&mut self, down: bool, needs_toggle: bool) {
-        if self.toggle.is_some() && self.needs_toggle(needs_toggle) {
+        if self.toggle.is_some() && needs_toggle {
             if down {
                 self.is_down = !self.is_down;
-                // Toggled back up: the pad's toggle is over.
-                self.pad_toggled &= self.is_down;
             }
         } else {
             self.is_down = down;
         }
     }
-    /// A controller's toggle button: flips the mapping like `setDown(true)`
-    /// with its option on, whatever the option says.
-    pub fn pad_toggle(&mut self) {
-        self.is_down = !self.is_down;
-        self.pad_toggled = self.is_down;
-    }
     /// `shouldSetOnIngameFocus` for a keyboard-bound, bound key.
     pub fn should_set_on_ingame_focus(&self, needs_toggle: bool) -> bool {
         self.keyboard && (self.toggle.is_none() || !needs_toggle)
@@ -78,8 +61,7 @@ impl KeyState {
     pub fn release(&mut self, needs_toggle: bool) {
         if self.toggle.is_some() {
             // ToggleKeyMapping.release does not clear pending clicks.
-            if self.needs_toggle(needs_toggle) && self.is_down || self.released_by_screen_when_down
-            {
+            if needs_toggle && self.is_down || self.released_by_screen_when_down {
                 self.released_by_screen_when_down = true;
             }
             self.reset();
@@ -88,8 +70,7 @@ impl KeyState {
             self.set_down(false, needs_toggle);
         }
     }
-    /// `ToggleKeyMapping.reset`. A pad toggle stays on record, so the screen
-    /// that released it restores it.
+    /// `ToggleKeyMapping.reset`.
     pub fn reset(&mut self) {
         self.is_down = false;
     }
@@ -102,10 +83,7 @@ impl KeyState {
         let Some(restore) = self.toggle else {
             return false;
         };
-        let result = restore
-            && self.needs_toggle(needs_toggle)
-            && self.keyboard
-            && self.released_by_screen_when_down;
+        let result = restore && needs_toggle && self.keyboard && self.released_by_screen_when_down;
         self.released_by_screen_when_down = false;
         result
     }
@@ -160,15 +138,6 @@ impl ToggleKeys {
             _ => {}
         }
     }
-    /// A controller's toggle button bound to `slot` (the pad's toggle-sneak):
-    /// a press with no screen open flips the mapping and clicks it, as a
-    /// key press does with the mapping's toggle option on.
-    pub fn pad_toggle(&mut self, slot: usize, screen_open: bool) {
-        if !screen_open {
-            self.0[slot].pad_toggle();
-            self.0[slot].click();
-        }
-    }
     /// `MouseHandler.onButton` for a button bound to `slot`: only without a
     /// screen or overlay.
     pub fn button(&mut self, slot: usize, pressed: bool, screen_open: bool, needs_toggle: bool) {
@@ -198,29 +167,12 @@ impl ToggleKeys {
     pub fn respawn(&mut self) {
         for key in &mut self.0 {
             key.reset();
-            // As with the vanilla option, the death screen closing after
-            // this still restores a toggle it released.
-            key.pad_toggled &= key.released_by_screen_when_down;
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
-    /// `KeyMapping.resetToggleKeys` (a new `LocalPlayer`): a sneak and a sprint toggled on in one
-    /// world are off in the next.
-    #[test]
-    fn resetting_the_toggle_keys_puts_every_mapping_up() {
-        let mut keys = ToggleKeys::default();
-        keys.key(0, KeyAction::Press, false, true);
-        keys.key(1, KeyAction::Press, false, true);
-        assert!(keys.is_down(0) && keys.is_down(1));
-        for key in &mut keys.0 {
-            key.reset();
-        }
-        assert!(!keys.is_down(0) && !keys.is_down(1));
-    }
-
     use super::*;
     #[test]
     fn toggle_flips_on_press_and_ignores_release() {
@@ -245,57 +197,6 @@ mod tests {
         keys.respawn();
         assert!(!keys.is_down(SPRINT));
     }
-    /// #3061: the pad's toggle-sneak (vanilla's toggle crouch off) comes
-    /// back after a screen, as the vanilla option's toggle does; a
-    /// keyboard shift-click in the inventory does not drop it.
-    #[test]
-    fn pad_toggle_is_restored_after_a_screen() {
-        let off = [false; 4];
-        let mut keys = ToggleKeys::default();
-        keys.pad_toggle(SNEAK, false);
-        assert!(keys.is_down(SNEAK));
-        keys.screen_opened(off);
-        assert!(!keys.is_down(SNEAK));
-        keys.key(SNEAK, KeyAction::Press, true, false);
-        keys.key(SNEAK, KeyAction::Release, true, false);
-        keys.screen_closed(off);
-        assert!(keys.is_down(SNEAK), "the pad's toggle is restored");
-        // Toggled back up, it stays up through the next screen.
-        keys.pad_toggle(SNEAK, false);
-        assert!(!keys.is_down(SNEAK));
-        keys.screen_opened(off);
-        keys.screen_closed(off);
-        assert!(!keys.is_down(SNEAK));
-        // A held key is not restored, as before.
-        keys.key(SNEAK, KeyAction::Press, false, false);
-        keys.screen_opened(off);
-        keys.key(SNEAK, KeyAction::Release, true, false);
-        keys.screen_closed(off);
-        assert!(!keys.is_down(SNEAK));
-    }
-    /// After the pad's toggle is over (toggled up, or reset by a respawn
-    /// with no screen to restore it), the shift key holds again.
-    #[test]
-    fn pad_toggle_ends_with_its_release() {
-        let off = [false; 4];
-        let mut keys = ToggleKeys::default();
-        keys.pad_toggle(SNEAK, false);
-        keys.respawn();
-        assert!(!keys.is_down(SNEAK));
-        keys.key(SNEAK, KeyAction::Press, false, false);
-        keys.key(SNEAK, KeyAction::Release, false, false);
-        assert!(!keys.is_down(SNEAK), "held, not toggled");
-        // The death screen releases it and closes after the respawn: the
-        // toggle comes back, as with the vanilla option.
-        keys.pad_toggle(SNEAK, false);
-        keys.screen_opened(off);
-        keys.respawn();
-        keys.screen_closed(off);
-        assert!(keys.is_down(SNEAK));
-        // A press with a screen open does nothing.
-        keys.pad_toggle(SNEAK, true);
-        assert!(keys.is_down(SNEAK));
-    }
     #[test]
     fn screen_release_restores_toggled_state() {
         let mut k = KeyState::toggle(true, true);

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

@@ -10,6 +10,5 @@ pub mod interaction_input;
 pub mod key_names;
 pub mod keybinds;
 pub mod keymapping;
-pub mod modifiers;
 pub mod mouse;
 pub mod window;

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

@@ -1,232 +0,0 @@
-//! OS modifier reconciliation and modifiers synthesized by agent control.
-
-use crate::{
-    keybinds::{KeyBinds, key_code},
-    keymapping::{KeyAction, SNEAK, SPRINT, ToggleKeys},
-};
-use std::collections::HashSet;
-use winit::keyboard::{KeyCode, ModifiersState};
-
-const MODIFIERS: [(ModifiersState, [KeyCode; 2]); 4] = [
-    (
-        ModifiersState::SHIFT,
-        [KeyCode::ShiftLeft, KeyCode::ShiftRight],
-    ),
-    (
-        ModifiersState::CONTROL,
-        [KeyCode::ControlLeft, KeyCode::ControlRight],
-    ),
-    (ModifiersState::ALT, [KeyCode::AltLeft, KeyCode::AltRight]),
-    (
-        ModifiersState::SUPER,
-        [KeyCode::SuperLeft, KeyCode::SuperRight],
-    ),
-];
-
-/// A synthesized key updates the same modifier word as window events.
-/// Releasing one side must preserve the other side's hold.
-pub fn set_key(
-    modifiers: &mut ModifiersState,
-    physical: &mut HashSet<KeyCode>,
-    key: KeyCode,
-    down: bool,
-) {
-    let Some((bit, pair)) = MODIFIERS.iter().find(|(_, pair)| pair.contains(&key)) else {
-        return;
-    };
-    if down {
-        physical.insert(key);
-    } else {
-        physical.remove(&key);
-    }
-    modifiers.set(*bit, pair.iter().any(|key| physical.contains(key)));
-}
-
-/// A modifier held for one synthesized click (the pad's Y, an agent's
-/// shift-click): what [`restore`] puts back once the click is done.
-#[derive(Clone, Copy, Debug)]
-pub struct Held {
-    key: KeyCode,
-    was_down: bool,
-    bit: bool,
-}
-
-/// Holds `key` in both the physical keys and the modifier word, which is
-/// what screens read (`InputWithModifiers.hasShiftDown`).
-pub fn hold(modifiers: &mut ModifiersState, physical: &mut HashSet<KeyCode>, key: KeyCode) -> Held {
-    let bit = MODIFIERS
-        .iter()
-        .find(|(_, pair)| pair.contains(&key))
-        .is_some_and(|(bit, _)| modifiers.contains(*bit));
-    let held = Held {
-        key,
-        was_down: physical.contains(&key),
-        bit,
-    };
-    set_key(modifiers, physical, key, true);
-    held
-}
-
-/// Undoes [`hold`]: a key or bit that was already down stays down.
-pub fn restore(modifiers: &mut ModifiersState, physical: &mut HashSet<KeyCode>, held: Held) {
-    if !held.was_down {
-        physical.remove(&held.key);
-    }
-    if let Some((bit, _)) = MODIFIERS.iter().find(|(_, pair)| pair.contains(&held.key)) {
-        modifiers.set(*bit, held.bit);
-    }
-}
-
-/// Recover missing modifier releases without releasing a rebound key or a pad.
-/// ToggleKeyMapping itself preserves keyboard and controller toggles on release.
-pub fn reconcile(
-    modifiers: ModifiersState,
-    physical: &mut HashSet<KeyCode>,
-    bindings: &KeyBinds,
-    toggles: &mut ToggleKeys,
-    options: [bool; 2],
-    pad_held: [bool; 2],
-) {
-    for (bit, pair) in MODIFIERS {
-        if modifiers.contains(bit) {
-            continue;
-        }
-        for key in pair {
-            if !physical.remove(&key) {
-                continue;
-            }
-            for (slot, name) in [(SNEAK, "key.sneak"), (SPRINT, "key.sprint")] {
-                if key_code(bindings.get(name)) == Some(key) && !pad_held[slot] {
-                    toggles.key(slot, KeyAction::Release, false, options[slot]);
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn modifier_taps_release_both_bits() {
-        let mut modifiers = ModifiersState::empty();
-        let mut physical = HashSet::new();
-        for (bit, pair) in MODIFIERS {
-            for key in pair {
-                set_key(&mut modifiers, &mut physical, key, true);
-                assert!(modifiers.contains(bit));
-                set_key(&mut modifiers, &mut physical, key, false);
-                assert!(modifiers.is_empty());
-                assert!(physical.is_empty());
-            }
-        }
-    }
-
-    #[test]
-    fn releasing_one_side_keeps_the_other_modifier_held() {
-        let mut modifiers = ModifiersState::empty();
-        let mut physical = HashSet::new();
-        for (bit, [left, right]) in MODIFIERS {
-            set_key(&mut modifiers, &mut physical, left, true);
-            set_key(&mut modifiers, &mut physical, right, true);
-            set_key(&mut modifiers, &mut physical, left, false);
-            assert!(modifiers.contains(bit));
-            set_key(&mut modifiers, &mut physical, right, false);
-            assert!(modifiers.is_empty());
-        }
-    }
-
-    #[test]
-    fn a_held_click_restores_the_previous_state() {
-        let mut modifiers = ModifiersState::empty();
-        let mut physical = HashSet::new();
-        let held = hold(&mut modifiers, &mut physical, KeyCode::ShiftLeft);
-        assert!(modifiers.shift_key());
-        restore(&mut modifiers, &mut physical, held);
-        assert!(modifiers.is_empty());
-        assert!(physical.is_empty());
-
-        // Right Shift already held, or the OS word set with no physical key.
-        for start in [HashSet::from([KeyCode::ShiftRight]), HashSet::new()] {
-            let mut modifiers = ModifiersState::SHIFT;
-            let mut physical = start.clone();
-            let held = hold(&mut modifiers, &mut physical, KeyCode::ShiftLeft);
-            restore(&mut modifiers, &mut physical, held);
-            assert_eq!(modifiers, ModifiersState::SHIFT);
-            assert_eq!(physical, start);
-        }
-    }
-
-    #[test]
-    fn lost_releases_respect_rebindings_and_pad_holds() {
-        for slot in [SNEAK, SPRINT] {
-            for rebound in [false, true] {
-                for pad in [false, true] {
-                    for toggle in [false, true] {
-                        let mut bindings = KeyBinds::default();
-                        let (name, modifier) = if slot == SNEAK {
-                            ("key.sneak", KeyCode::ShiftLeft)
-                        } else {
-                            ("key.sprint", KeyCode::ControlLeft)
-                        };
-                        if rebound {
-                            bindings.set(name, "key.keyboard.c");
-                        }
-                        let mut physical = HashSet::from([modifier]);
-                        if rebound {
-                            physical.insert(KeyCode::KeyC);
-                        }
-                        let mut toggles = ToggleKeys::default();
-                        toggles.key(slot, KeyAction::Press, false, toggle);
-                        let mut options = [false; 2];
-                        options[slot] = toggle;
-                        let mut pad_held = [false; 2];
-                        pad_held[slot] = pad;
-                        reconcile(
-                            ModifiersState::ALT,
-                            &mut physical,
-                            &bindings,
-                            &mut toggles,
-                            options,
-                            pad_held,
-                        );
-                        assert_eq!(toggles.is_down(slot), rebound || pad || toggle);
-                        assert!(!physical.contains(&modifier));
-                        assert_eq!(physical.contains(&KeyCode::KeyC), rebound);
-                    }
-                }
-            }
-        }
-    }
-
-    #[test]
-    fn unrelated_modifier_change_does_not_release_an_action() {
-        let mut toggles = ToggleKeys::default();
-        toggles.key(SNEAK, KeyAction::Press, false, false);
-        reconcile(
-            ModifiersState::ALT,
-            &mut HashSet::new(),
-            &KeyBinds::default(),
-            &mut toggles,
-            [false; 2],
-            [false; 2],
-        );
-        assert!(toggles.is_down(SNEAK));
-    }
-
-    #[test]
-    fn lost_modifier_release_preserves_a_controller_toggle() {
-        let mut toggles = ToggleKeys::default();
-        toggles.pad_toggle(SNEAK, false);
-        reconcile(
-            ModifiersState::empty(),
-            &mut HashSet::from([KeyCode::ShiftLeft]),
-            &KeyBinds::default(),
-            &mut toggles,
-            [false; 2],
-            [false; 2],
-        );
-        assert!(toggles.is_down(SNEAK));
-    }
-}

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

@@ -342,28 +342,6 @@ pub fn mouse_position_after_grab_change(
     }
 }
 
-/// `MacosUtil.setCtrlClickEmulatesRightClick`: with the option on (and only on
-/// macOS), a left click made with Control held is a right click, and so is
-/// its release, whatever Control does in between.
-#[derive(Clone, Copy, Debug, Default)]
-pub struct RightClickEmulation {
-    emulating: bool,
-}
-impl RightClickEmulation {
-    /// Whether the left button's `pressed` or released event is a right click.
-    /// `enabled` is the option on macOS.
-    pub fn is_right_click(&mut self, pressed: bool, control: bool, enabled: bool) -> bool {
-        if pressed {
-            self.emulating = enabled && control;
-        }
-        let right = self.emulating;
-        if !pressed {
-            self.emulating = false;
-        }
-        right
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -548,21 +526,4 @@ mod tests {
             None
         );
     }
-
-    #[test]
-    fn control_click_is_a_right_click_until_released() {
-        let mut e = RightClickEmulation::default();
-        // The option off, or no Control: a left click stays one.
-        assert!(!e.is_right_click(true, true, false));
-        assert!(!e.is_right_click(false, true, false));
-        assert!(!e.is_right_click(true, false, true));
-        assert!(!e.is_right_click(false, true, true));
-        // Control held at the press: the press and the release are right clicks,
-        // even when Control was let go before the release.
-        assert!(e.is_right_click(true, true, true));
-        assert!(e.is_right_click(false, false, true));
-        // The next left click is its own.
-        assert!(!e.is_right_click(true, false, true));
-        assert!(!e.is_right_click(false, false, true));
-    }
 }

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

@@ -182,38 +182,13 @@ impl LimiterClock for SystemClock {
         i64::try_from(self.origin.elapsed().as_nanos()).unwrap_or(i64::MAX)
     }
     fn park(&mut self, nanos: i64) {
-        let end = self.nanos().saturating_add(nanos);
-        park_in_steps(
-            end,
-            || self.nanos(),
-            |step| {
-                std::thread::sleep(std::time::Duration::from_nanos(step as u64));
-            },
-        );
+        std::thread::sleep(std::time::Duration::from_nanos(nanos.max(0) as u64));
     }
     fn spin(&mut self) {
         std::hint::spin_loop();
     }
 }
 
-/// The longest single sleep of [`SystemClock::park`].
-const PARK_STEP_NS: i64 = 1_000_000;
-
-/// Sleeps until `now()` reaches `end`, at most [`PARK_STEP_NS`] at a time. macOS lets
-/// a sleep run late by a share of its length (timer coalescing: 1.8-3.5 ms on a 14 ms
-/// sleep, 0.25 ms on 1 ms), more than the limiter's overshoot margin can learn (capped
-/// at 2 ms): a 60 FPS cap gave frames of 17-20 ms. Short steps keep the lateness to
-/// the last step's.
-fn park_in_steps(end: i64, mut now: impl FnMut() -> i64, mut sleep: impl FnMut(i64)) {
-    loop {
-        let left = end - now();
-        if left <= 0 {
-            return;
-        }
-        sleep(left.min(PARK_STEP_NS));
-    }
-}
-
 /// The real clock without busy waiting: where vanilla spins on
 /// `Thread.onSpinWait` for the last half millisecond, this sleeps in short
 /// steps, so a capped frame rate leaves the core idle.
@@ -243,18 +218,6 @@ pub fn end_frame(
     }
 }
 
-/// [`end_frame`] on a fixed grid of frame slots ([`FramerateLimiter::limit_on_grid`]):
-/// Horizon's Efficient pacing.
-pub fn end_frame_on_grid(
-    limiter: &mut FramerateLimiter,
-    framerate_limit: i32,
-    clock: &mut impl LimiterClock,
-) {
-    if framerate_limit < 260 {
-        limiter.limit_on_grid(framerate_limit, clock);
-    }
-}
-
 impl FramerateLimiter {
     pub fn new(now_ns: i64) -> Self {
         Self::with_state(now_ns, 0, 0)
@@ -285,37 +248,6 @@ impl FramerateLimiter {
             self.average_overshoot_ns = 0;
             self.last_framerate_limit = framerate_limit;
         }
-        self.wait_until(target_time_ns, clock);
-        self.last_frame_time = clock.nanos();
-    }
-    /// Horizon's Efficient pacing: [`Self::limit_display_fps`]'s wait, but each frame's
-    /// slot starts where the last one's ended (its deadline), not when the thread woke
-    /// up. Vanilla's way adds every late wake-up to the frame (on the Mac, 50 us sleeps
-    /// running 0.2 ms late made a 144 FPS cap 139); on a fixed grid the cap holds on
-    /// average. A frame that ends past its slot, or wakes up more than half a frame
-    /// late, starts the grid again from now: no frame is rushed out to catch up.
-    pub fn limit_on_grid(&mut self, framerate_limit: i32, clock: &mut impl LimiterClock) {
-        let period = 1_000_000_000 / i64::from(framerate_limit);
-        if framerate_limit != self.last_framerate_limit {
-            self.average_overshoot_ns = 0;
-            self.last_framerate_limit = framerate_limit;
-        }
-        let deadline = self.last_frame_time + period;
-        if clock.nanos() >= deadline {
-            self.last_frame_time = clock.nanos();
-            return;
-        }
-        self.wait_until(deadline, clock);
-        let woke = clock.nanos();
-        self.last_frame_time = if woke - deadline > period / 2 {
-            woke
-        } else {
-            deadline
-        };
-    }
-    /// `limitDisplayFPS`'s wait: sleep to within the learned overshoot and half a
-    /// millisecond of `target_time_ns`, then spin.
-    fn wait_until(&mut self, target_time_ns: i64, clock: &mut impl LimiterClock) {
         loop {
             let remaining = target_time_ns - clock.nanos();
             if remaining <= 0 {
@@ -339,6 +271,7 @@ impl FramerateLimiter {
                 clock.spin();
             }
         }
+        self.last_frame_time = clock.nanos();
     }
     pub fn last_frame_time(&self) -> i64 {
         self.last_frame_time
@@ -351,18 +284,12 @@ impl FramerateLimiter {
 /// (`Window.updateFullscreenState` -> `Minecraft.fullscreenStateChanged`), and
 /// the window is only asked to change when the option itself changes
 /// (`Window.updateFullscreenIfChanged`), never re-forced to the option.
-#[derive(Clone, Copy, Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct FullscreenState {
     /// The state the window system last reported (`Window.fullscreen`).
     actual: bool,
     /// The state last asked of the window system, or adopted from it.
     requested: bool,
-    /// `Window.exclusiveFullscreen`.
-    exclusive: bool,
-    /// `Window.preferredFullscreenVideoMode`.
-    mode: Option<VideoMode>,
-    /// `Window.dirty`: the preferred mode changed and the screen has not been left yet.
-    mode_dirty: bool,
 }
 
 impl FullscreenState {
@@ -371,70 +298,9 @@ impl FullscreenState {
         Self {
             actual: false,
             requested,
-            exclusive: false,
-            mode: None,
-            mode_dirty: false,
         }
     }
 
-    /// `Window.updateFullscreenIfChanged` with the exclusive option and preferred mode: asks the
-    /// window to enter, leave or change its fullscreen only when one of them changed.
-    /// `in_video_screen` holds a changed mode back until the Video Settings screen closes
-    /// (`changeFullscreenVideoMode`).
-    pub fn apply(
-        &mut self,
-        window: &winit::window::Window,
-        wanted: bool,
-        exclusive: bool,
-        preferred: Option<VideoMode>,
-        in_video_screen: bool,
-    ) {
-        let request = self.request(wanted);
-        let reapply = self.set_exclusive(exclusive);
-        self.set_preferred_mode(preferred);
-        let mode_change = !in_video_screen && self.take_mode_change();
-        match request {
-            Some(false) => window.set_fullscreen(None),
-            Some(true) => window.set_fullscreen(Some(fullscreen_request(
-                window,
-                exclusive,
-                preferred.as_ref(),
-            ))),
-            None if reapply || mode_change => window.set_fullscreen(Some(fullscreen_request(
-                window,
-                exclusive,
-                preferred.as_ref(),
-            ))),
-            None => {}
-        }
-    }
-
-    /// `Window.setExclusiveFullscreen`: true when the option changed while fullscreen is
-    /// requested, so the window has to enter the other kind of fullscreen at once.
-    pub fn set_exclusive(&mut self, exclusive: bool) -> bool {
-        let changed = self.exclusive != exclusive;
-        self.exclusive = exclusive;
-        changed && self.requested
-    }
-
-    /// `Window.setPreferredFullscreenVideoMode`: a changed mode waits for `take_mode_change`.
-    pub fn set_preferred_mode(&mut self, mode: Option<VideoMode>) {
-        if self.mode != mode {
-            self.mode = mode;
-            self.mode_dirty = true;
-        }
-    }
-
-    /// `Window.changeFullscreenVideoMode` (the Video Settings screen closing): true once when
-    /// a changed mode has to be applied to a fullscreen window.
-    pub fn take_mode_change(&mut self) -> bool {
-        let apply = self.requested && self.mode_dirty;
-        if apply {
-            self.mode_dirty = false;
-        }
-        apply
-    }
-
     /// `Window.updateFullscreenIfChanged`: the state to ask of the window
     /// when the option `wanted` differs from what was last asked or adopted.
     pub fn request(&mut self, wanted: bool) -> Option<bool> {
@@ -455,168 +321,10 @@ impl FullscreenState {
     }
 }
 
-/// `VideoMode`: one display mode of a monitor, as `fullscreenResolution` in options.txt keeps it.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct VideoMode {
-    pub width: i32,
-    pub height: i32,
-    pub red_bits: i32,
-    pub green_bits: i32,
-    pub blue_bits: i32,
-    pub refresh_rate: f32,
-}
-
-impl VideoMode {
-    /// `VideoMode.read`: the JSON object `write` makes; any other string is None.
-    pub fn read(text: &str) -> Option<Self> {
-        let number = |key: &str| -> Option<f64> {
-            let at = text.find(&format!("\"{key}\""))? + key.len() + 2;
-            let rest = text[at..].trim_start().strip_prefix(':')?.trim_start();
-            let end = rest
-                .find(|c: char| !(c.is_ascii_digit() || matches!(c, '-' | '+' | '.' | 'e' | 'E')))
-                .unwrap_or(rest.len());
-            rest[..end].parse().ok()
-        };
-        if !text.trim_start().starts_with('{') {
-            return None;
-        }
-        Some(Self {
-            width: number("width")? as i32,
-            height: number("height")? as i32,
-            red_bits: number("red_bits")? as i32,
-            green_bits: number("green_bits")? as i32,
-            blue_bits: number("blue_bits")? as i32,
-            refresh_rate: number("refresh_rate")? as f32,
-        })
-    }
-
-    /// `VideoMode.write`: the Codec's JSON through Gson (a float prints as `60.0`).
-    pub fn write(&self) -> String {
-        let rate = if self.refresh_rate == self.refresh_rate.trunc() {
-            format!("{:.1}", self.refresh_rate)
-        } else {
-            self.refresh_rate.to_string()
-        };
-        format!(
-            "{{\"width\":{},\"height\":{},\"red_bits\":{},\"green_bits\":{},\"blue_bits\":{},\"refresh_rate\":{rate}}}",
-            self.width, self.height, self.red_bits, self.green_bits, self.blue_bits
-        )
-    }
-
-    /// `VideoMode.refreshRateLabel`: a whole rate without decimals, any other with two.
-    pub fn refresh_rate_label(&self) -> String {
-        if self.refresh_rate == self.refresh_rate.round_ties_even() {
-            (self.refresh_rate as i32).to_string()
-        } else {
-            format!("{:.2}", self.refresh_rate)
-        }
-    }
-
-    /// The colour depth `options.fullscreen.entry` shows.
-    pub fn bits(&self) -> i32 {
-        self.red_bits + self.green_bits + self.blue_bits
-    }
-
-    /// A winit mode: its depth is the total, split evenly over the channels.
-    pub fn from_winit(mode: &winit::monitor::VideoModeHandle) -> Self {
-        let depth = i32::from(mode.bit_depth());
-        let size = mode.size();
-        Self {
-            width: size.width as i32,
-            height: size.height as i32,
-            red_bits: depth / 3,
-            green_bits: depth / 3,
-            blue_bits: depth - 2 * (depth / 3),
-            refresh_rate: mode.refresh_rate_millihertz() as f32 / 1000.0,
-        }
-    }
-}
-
-/// `Monitor.videoModes`: the modes a monitor offers.
-pub fn monitor_video_modes(monitor: &winit::monitor::MonitorHandle) -> Vec<VideoMode> {
-    monitor
-        .video_modes()
-        .map(|m| VideoMode::from_winit(&m))
-        .collect()
-}
-
-/// The video modes of the window's monitor, listed once per monitor. Listing them takes tens of
-/// milliseconds on Windows, and settings apply at every step of a dragged slider: listing them
-/// each time made the slider stutter.
-#[derive(Debug)]
-pub struct VideoModeList<M = winit::monitor::MonitorHandle> {
-    listed: Option<M>,
-}
-
-impl<M> Default for VideoModeList<M> {
-    fn default() -> Self {
-        Self { listed: None }
-    }
-}
-
-impl<M: PartialEq> VideoModeList<M> {
-    /// The modes of `monitor` when it is not the monitor listed last, else `None` (the list
-    /// stands). No monitor lists none.
-    pub fn refresh(
-        &mut self,
-        monitor: Option<M>,
-        list: impl FnOnce(&M) -> Vec<VideoMode>,
-    ) -> Option<Vec<VideoMode>> {
-        if monitor.is_some() && monitor == self.listed {
-            return None;
-        }
-        let modes = monitor.as_ref().map(list).unwrap_or_default();
-        self.listed = monitor;
-        Some(modes)
-    }
-}
-
-/// `Monitor.currentMode`: the monitor's desktop mode; winit has no such query, so the mode of
-/// the monitor's own size with the highest refresh rate and depth.
-fn monitor_current_mode(
-    monitor: &winit::monitor::MonitorHandle,
-) -> Option<winit::monitor::VideoModeHandle> {
-    let size = monitor.size();
-    monitor
-        .video_modes()
-        .filter(|m| m.size() == size)
-        .max_by_key(|m| (m.refresh_rate_millihertz(), m.bit_depth()))
-}
-
-/// `Window.applyFullscreen`: the fullscreen the window asks for. Exclusive fullscreen takes
-/// `Monitor.getPreferredVideoMode` (the preferred mode if the monitor has it, else the desktop
-/// mode); a monitor with no usable mode falls back to borderless, as vanilla does.
-pub fn fullscreen_request(
-    window: &winit::window::Window,
-    exclusive: bool,
-    preferred: Option<&VideoMode>,
-) -> winit::window::Fullscreen {
-    use winit::window::Fullscreen;
-    if !exclusive {
-        return Fullscreen::Borderless(None);
-    }
-    let Some(monitor) = window
-        .current_monitor()
-        .or_else(|| window.primary_monitor())
-    else {
-        return Fullscreen::Borderless(None);
-    };
-    let wanted = preferred.and_then(|p| {
-        monitor
-            .video_modes()
-            .find(|m| VideoMode::from_winit(m) == *p)
-    });
-    match wanted.or_else(|| monitor_current_mode(&monitor)) {
-        Some(mode) => Fullscreen::Exclusive(mode),
-        None => Fullscreen::Borderless(None),
-    }
-}
-
 /// Horizon's icon for the window's title bar and the task bar (X11 and Windows; Wayland takes
 /// it from the `horizon.desktop` entry, macOS from the app bundle). `None` if it can't be read.
 pub fn icon() -> Option<winit::window::Icon> {
     let mut decoder = png::Decoder::new(std::io::Cursor::new(horizon_theme::ICON_PNG));
-    decoder.ignore_checksums(true);
     decoder.set_transformations(png::Transformations::EXPAND | png::Transformations::STRIP_16);
     let mut reader = decoder.read_info().ok()?;
     let mut bytes = vec![0; reader.output_buffer_size()?];
@@ -632,63 +340,11 @@ pub fn icon() -> Option<winit::window::Icon> {
 mod tests {
     use super::*;
 
-    #[test]
-    fn video_mode_round_trips_the_options_json() {
-        let mode = VideoMode {
-            width: 1920,
-            height: 1080,
-            red_bits: 8,
-            green_bits: 8,
-            blue_bits: 8,
-            refresh_rate: 60.0,
-        };
-        let text = mode.write();
-        assert_eq!(
-            text,
-            r#"{"width":1920,"height":1080,"red_bits":8,"green_bits":8,"blue_bits":8,"refresh_rate":60.0}"#
-        );
-        assert_eq!(VideoMode::read(&text), Some(mode));
-        assert_eq!(VideoMode::read("1920x1080"), None);
-        assert_eq!(VideoMode::read(r#"{"width":1}"#), None);
-    }
-    #[test]
-    fn refresh_rate_label_is_whole_or_two_decimals() {
-        let mut mode = VideoMode::read(
-            r#"{"width":1,"height":1,"red_bits":8,"green_bits":8,"blue_bits":8,"refresh_rate":144.0}"#,
-        )
-        .unwrap();
-        assert_eq!(mode.refresh_rate_label(), "144");
-        mode.refresh_rate = 59.94;
-        assert_eq!(mode.refresh_rate_label(), "59.94");
-        assert_eq!(mode.bits(), 24);
-    }
     #[test]
     fn the_window_icon_decodes() {
         assert!(icon().is_some());
     }
 
-    #[test]
-    fn exclusive_fullscreen_reapplies_only_while_fullscreen_is_requested() {
-        let mut f = FullscreenState::new(false);
-        assert!(!f.set_exclusive(true));
-        assert!(!f.set_exclusive(true));
-        assert_eq!(f.request(true), Some(true));
-        assert!(f.set_exclusive(false));
-        assert!(!f.set_exclusive(false));
-    }
-    #[test]
-    fn a_changed_video_mode_applies_once_when_fullscreen() {
-        let mode = VideoMode::read(
-            r#"{"width":1,"height":1,"red_bits":8,"green_bits":8,"blue_bits":8,"refresh_rate":60.0}"#,
-        );
-        let mut f = FullscreenState::new(false);
-        f.set_preferred_mode(mode);
-        assert!(!f.take_mode_change());
-        f.request(true);
-        f.set_preferred_mode(mode);
-        assert!(f.take_mode_change());
-        assert!(!f.take_mode_change());
-    }
     #[test]
     fn fullscreen_follows_the_option_only_when_it_changes() {
         let mut f = FullscreenState::new(false);
@@ -745,140 +401,6 @@ mod tests {
         assert_eq!(calculate_scale([1920, 1080], 3, true), 4);
         assert_eq!(gui_scaled_size([1921, 1081], 4), [481, 271]);
     }
-    /// A clock whose sleeps run late by a quarter of their length, as macOS's do,
-    /// sleeping as [`SystemClock::park`] does.
-    struct Coalescing {
-        now: std::cell::Cell<i64>,
-    }
-    impl LimiterClock for Coalescing {
-        fn nanos(&mut self) -> i64 {
-            self.now.get()
-        }
-        fn park(&mut self, nanos: i64) {
-            let now = &self.now;
-            park_in_steps(
-                now.get() + nanos,
-                || now.get(),
-                |step| {
-                    now.set(now.get() + step + step / 4);
-                },
-            );
-        }
-        fn spin(&mut self) {
-            self.now.set(self.now.get() + 1000);
-        }
-    }
-    #[test]
-    fn a_frame_cap_holds_when_sleeps_run_late() {
-        let mut clock = Coalescing {
-            now: std::cell::Cell::new(0),
-        };
-        let mut limiter = FramerateLimiter::new(0);
-        let mut last = 0;
-        for frame in 0..120 {
-            // The frame's own work.
-            clock.now.set(clock.now.get() + 2_000_000);
-            limiter.limit_display_fps(60, &mut clock);
-            let period = clock.now.get() - last;
-            last = clock.now.get();
-            assert!(
-                (16_666_666..16_666_666 + 100_000).contains(&period),
-                "frame {frame}: {period} ns"
-            );
-        }
-    }
-    /// A clock whose sleeps and spins each run up to `late` ns late (a different
-    /// share each time), as a loaded machine's do.
-    struct Late {
-        now: i64,
-        late: i64,
-        seed: u64,
-    }
-    impl Late {
-        fn new(late: i64) -> Self {
-            Self {
-                now: 0,
-                late,
-                seed: 0x9e37_79b9_7f4a_7c15,
-            }
-        }
-        fn lateness(&mut self) -> i64 {
-            self.seed ^= self.seed << 13;
-            self.seed ^= self.seed >> 7;
-            self.seed ^= self.seed << 17;
-            (self.seed % 1000) as i64 * self.late / 1000
-        }
-    }
-    impl LimiterClock for Late {
-        fn nanos(&mut self) -> i64 {
-            self.now
-        }
-        fn park(&mut self, nanos: i64) {
-            self.now += nanos + self.lateness();
-        }
-        fn spin(&mut self) {
-            self.now += 50_000 + self.lateness();
-        }
-    }
-    /// Frame periods of 144 FPS frames whose work takes `work(frame)` ns.
-    fn grid_periods(late: i64, work: impl Fn(usize) -> i64) -> Vec<i64> {
-        let mut clock = Late::new(late);
-        let mut limiter = FramerateLimiter::new(0);
-        let mut ends = Vec::new();
-        for frame in 0..300 {
-            clock.now += work(frame);
-            limiter.limit_on_grid(144, &mut clock);
-            ends.push(clock.now);
-        }
-        ends.windows(2).map(|w| w[1] - w[0]).collect()
-    }
-    #[test]
-    fn the_grid_holds_the_cap_when_wake_ups_run_late() {
-        let period = 1_000_000_000 / 144;
-        for late in [0, 50_000, 200_000, 1_000_000] {
-            let periods = grid_periods(late, |_| 2_000_000);
-            let mean = periods[10..].iter().sum::<i64>() / (periods.len() - 10) as i64;
-            assert!(
-                (mean - period).abs() < 10_000,
-                "{late} ns late: mean period {mean} ns"
-            );
-            // Each slot waits at least half a frame: the grid never rushes one out.
-            assert!(
-                periods.iter().all(|&p| p > period / 2),
-                "{late} ns late: {periods:?}"
-            );
-        }
-        // Vanilla's way adds the lateness to the frames: the cap isn't held.
-        let mut clock = Late::new(400_000);
-        let mut limiter = FramerateLimiter::new(0);
-        for _ in 0..300 {
-            clock.now += 2_000_000;
-            limiter.limit_display_fps(144, &mut clock);
-        }
-        assert!(
-            clock.now / 300 > period + 50_000,
-            "vanilla: {} ns",
-            clock.now / 300
-        );
-    }
-    #[test]
-    fn a_long_frame_starts_the_grid_again_without_a_burst() {
-        let period = 1_000_000_000 / 144;
-        // Frame 100 works 30 ms: four slots go by.
-        let periods = grid_periods(
-            50_000,
-            |frame| if frame == 100 { 30_000_000 } else { 2_000_000 },
-        );
-        assert!(periods[99] >= 30_000_000);
-        for (i, &p) in periods.iter().enumerate().skip(100) {
-            // On the grid a slot is a late wake-up (50 us at most) short or long.
-            assert!(
-                (period - 100_000..period + 100_000).contains(&p),
-                "frame {}: {p} ns",
-                i + 1
-            );
-        }
-    }
     #[test]
     fn limiter_paces_frames_at_the_target() {
         let mut limiter = FramerateLimiter::new(0);
@@ -906,11 +428,6 @@ mod tests {
             vsync_present_mode(&[PresentMode::Fifo], false),
             Some(PresentMode::Fifo)
         );
-        // Regression guard: GLES capabilities report [Fifo, Immediate] without Mailbox.
-        assert_eq!(
-            vsync_present_mode(&[PresentMode::Fifo, PresentMode::Immediate], false),
-            Some(PresentMode::Immediate)
-        );
     }
     #[test]
     fn vsync_on_waits_for_the_display_whatever_the_present_mode() {
@@ -931,28 +448,4 @@ mod tests {
             Some(Immediate)
         );
     }
-
-    #[test]
-    fn video_modes_are_listed_again_only_for_another_monitor() {
-        let mode = |width| VideoMode {
-            width,
-            height: 1080,
-            red_bits: 8,
-            green_bits: 8,
-            blue_bits: 8,
-            refresh_rate: 60.0,
-        };
-        let mut list = VideoModeList::default();
-        let mut listings = 0;
-        let mut modes = |monitor: &i32| {
-            listings += 1;
-            vec![mode(*monitor)]
-        };
-        assert_eq!(list.refresh(Some(1), &mut modes), Some(vec![mode(1)]));
-        assert_eq!(list.refresh(Some(1), &mut modes), None);
-        assert_eq!(list.refresh(Some(2), &mut modes), Some(vec![mode(2)]));
-        assert_eq!(list.refresh(None, &mut modes), Some(vec![]));
-        assert_eq!(list.refresh(Some(2), &mut modes), Some(vec![mode(2)]));
-        assert_eq!(listings, 3);
-    }
 }

crates/horizon-client-lib/Cargo.toml

@@ -1,235 +0,0 @@
-[package]
-name = "horizon-client-lib"
-autobins = false
-autoexamples = false
-autotests = false
-version = "0.1.0"
-edition.workspace = true
-license.workspace = true
-rust-version = "1.90"
-description = "Reusable client systems, control tool and parity probes"
-
-[lib]
-path = "../horizon-client/src/client_lib.rs"
-
-[dependencies]
-horizon-assets = { path = "../horizon-assets" }
-horizon-client-core = { path = "../horizon-client-core" }
-horizon-client-input = { path = "../horizon-client-input" }
-horizon-client-render = { path = "../horizon-client-render" }
-horizon-command = { path = "../horizon-command" }
-horizon-items = { path = "../horizon-items" }
-horizon-core = { path = "../horizon-core" }
-# `horizon-ctl mcp`: the Model Context Protocol, shared with the launcher and the server.
-horizon-mcp = { path = "../horizon-mcp" }
-# The server thread ahead of the workers (MinecraftServer.spin's Thread.setPriority).
-horizon-optifine = { path = "../horizon-optifine" }
-horizon-threads = { path = "../horizon-threads" }
-horizon-hdr = { path = "../horizon-hdr" }
-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" }
-# The dedicated server's anticheat, off unless server.toml's [anticheat] turns it on (docs/anticheat.md).
-horizon-anticheat = { path = "../horizon-anticheat" }
-# The dedicated server's chat filter: [chat_filter], the slur list, mutes (docs/chat-filter.md).
-horizon-chat-filter = { path = "../horizon-chat-filter" }
-# Shader packs: reading them and turning their GLSL into naga modules.
-horizon-shaders = { path = "../horizon-shaders" }
-# Horizon's own shader packs: the format, the stages and the check (docs/shaders.md).
-horizon-shader-api = { path = "../horizon-shader-api" }
-horizon-friends = { path = "../horizon-friends" }
-# The narrator (GameNarrator): text-to-speech of chat, system messages and screens.
-horizon-narrator = { path = "../horizon-narrator" }
-# 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, features = ["index"] }
-wgpu = { version = "30.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "metal", "wgsl", "naga-ir"] }
-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"] }
-# 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"] }
-miniz_oxide = "0.8"
-ab_glyph = "0.2.32"
-log = "0.4"
-chrono = { version = "0.4.42", default-features = false, features = ["clock", "std"] }
-flate2 = { version = "1.1.10", default-features = false, features = ["zlib-rs", "runtime_detection"] }
-# The network threads of a server's players: epoll, kqueue or Windows' AFD (lan/io_pool.rs).
-mio = { version = "1.2.4", features = ["os-poll", "net"] }
-# Shared chunk frames are found by one keyed 128-bit hash of their body (lan/conn.rs SharedFrames).
-xxhash-rust = { version = "0.8.19", features = ["xxh3"] }
-horizon-theme = { path = "../horizon-theme" }
-# Opt-in data collection: the game keeps, the launcher sends (docs/telemetry.md); `live` is
-# the anonymous "I'm playing" ping the game sends itself (`heartbeat.rs`).
-horizon-telemetry = { path = "../horizon-telemetry", default-features = false, features = ["live"] }
-horizon-bench = { path = "../horizon-bench" }
-zip = { version = "9.1.3", default-features = false, features = ["deflate"] }
-# Controllers (evdev + libudev on Linux, IOKit on macOS, Windows.Gaming.Input); the `controllers` feature.
-gilrs = { version = "0.11", optional = true }
-# The DualSense's rumble, adaptive triggers and lights over HID (gilrs only reads it).
-horizon-dualsense = { path = "../horizon-dualsense", optional = true }
-# HTTPS to the Minecraft services (online-mode session join).
-ureq = { version = "2", default-features = false, features = ["tls"] }
-unicode-bidi = "0.3.18"
-# `LevelStorageAccess.estimateDiskSpace`: usable disk space, without unsafe code on Windows.
-fs4 = { version = "1.1.0", default-features = false, features = ["sync"] }
-
-[target.'cfg(unix)'.dependencies]
-# The server thread's CPU time per tick (`HORIZON_SPIKES`, spans.rs).
-rustix = { version = "1", default-features = false, features = ["std", "time", "process", "fs"] }
-
-[target.'cfg(windows)'.dependencies]
-# Use the registered URI handler without routing links through Explorer/cmd.
-open = { version = "5.4.5", features = ["shellexecute-on-windows"] }
-# DirectX 12, where Vulkan has no adapter or device, or by choice (`graphicsApi`, graphics.rs).
-# Shaders compile with FXC (d3dcompiler_47.dll, part of Windows), or DXC when dxcompiler.dll is
-# on the PATH.
-wgpu = { version = "30.0.1", default-features = false, features = ["dx12"] }
-
-[target.'cfg(target_os = "macos")'.dependencies]
-# Splitscreen: a window filling a monitor goes over its menu bar (game/split/windows.rs
-# `above_menu_bar`); all already in the tree through winit and wgpu.
-objc2 = "0.6"
-objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSResponder", "NSWindow", "NSScreen"] }
-objc2-foundation = { version = "0.3", default-features = false, features = ["std", "NSArray", "NSString"] }
-
-[target.'cfg(not(target_os = "macos"))'.dependencies]
-# OpenGL (WGL on Windows, EGL on Linux), the last fallback, for GPUs with no Vulkan or
-# DirectX 12 driver (`graphicsApi`, graphics.rs).
-wgpu = { version = "30.0.1", default-features = false, features = ["gles"] }
-
-[features]
-default = ["audio", "controllers"]
-# Sound output. Without it (and `controllers`) the program links neither libasound nor libudev on
-# Linux: the server build (`--no-default-features`, released as horizon-engine; docs/server.md).
-audio = ["horizon-client-render/audio"]
-# Controllers: gilrs, and the DualSense's own output. Without it only `horizon-ctl pad`'s virtual pad.
-controllers = ["dep:gilrs", "dep:horizon-dualsense", "horizon-client-input/controllers"]
-# Records the call sites of mob random draws (`mob_ai_probe` traces).
-rng-trace = ["horizon-core/rng-trace"]
-# Compatibility with earlier experiment commands: main already uses mimalloc.
-windows-mimalloc = []
-# Opt-in Windows heap experiment; see docs/windows-allocators.md.
-windows-segment-heap = []
-
-[lints]
-workspace = true
-
-[dev-dependencies]
-horizon-client-render = { path = "../horizon-client-render", features = ["test-support"] }
-horizon-items = { path = "../horizon-items", features = ["test-support"] }
-# Every WGSL shader translated as wgpu's DirectX 12 backend does (gfx.rs tests).
-naga = { version = "30.0.1", features = ["wgsl-in", "hlsl-out", "msl-out", "spv-out"] }
-
-[[bin]]
-name = "horizon-ctl"
-path = "../horizon-client/src/bin/horizon-ctl/main.rs"
-
-[[example]]
-name = "chunk_load_bench"
-path = "../horizon-client/examples/chunk_load_bench.rs"
-
-[[example]]
-name = "gen_light_bench"
-path = "../horizon-client/examples/gen_light_bench.rs"
-
-[[example]]
-name = "gameplay_decode_profile"
-path = "../horizon-client/examples/gameplay_decode_profile.rs"
-
-[[example]]
-name = "json_load_bench"
-path = "../horizon-client/examples/json_load_bench.rs"
-
-[[example]]
-name = "mod_port_probe"
-path = "../horizon-client/examples/mod_port_probe.rs"
-
-[[example]]
-name = "model_library_bench"
-path = "../horizon-client/examples/model_library_bench.rs"
-
-[[example]]
-name = "model_states_bench"
-path = "../horizon-client/examples/model_states_bench.rs"
-
-[[example]]
-name = "old_world_fixture"
-path = "../horizon-client/examples/old_world_fixture.rs"
-
-[[example]]
-name = "portal_scan_bench"
-path = "../horizon-client/examples/portal_scan_bench.rs"
-
-[[example]]
-name = "random_tick_eligibility_bench"
-path = "../horizon-client/examples/random_tick_eligibility_bench.rs"
-
-[[example]]
-name = "resource_memory"
-path = "../horizon-client/examples/resource_memory.rs"
-
-[[example]]
-name = "save_batch_bench"
-path = "../horizon-client/examples/save_batch_bench.rs"
-
-[[example]]
-name = "shared_json_startup_profile"
-path = "../horizon-client/examples/shared_json_startup_profile.rs"
-
-[[example]]
-name = "sprite_cache_parity"
-path = "../horizon-client/examples/sprite_cache_parity.rs"
-
-[[example]]
-name = "client_probe"
-path = "../horizon-client/examples/probe/main.rs"
-
-[[test]]
-name = "custom_component_api"
-path = "../horizon-client/tests/custom_component_api.rs"
-
-[[test]]
-name = "custom_component_unregistered"
-path = "../horizon-client/tests/custom_component_unregistered.rs"
-
-[[test]]
-name = "custom_component_wire"
-path = "../horizon-client/tests/custom_component_wire.rs"
-
-[[test]]
-name = "forced_chunks"
-path = "../horizon-client/tests/forced_chunks.rs"
-
-[[test]]
-name = "generation_saves"
-path = "../horizon-client/tests/generation_saves.rs"
-
-[[test]]
-name = "lan_bot"
-path = "../horizon-client/tests/lan_bot.rs"
-
-[[test]]
-name = "streaming_meshes"
-path = "../horizon-client/tests/streaming_meshes.rs"
-
-[[test]]
-name = "tall_column"
-path = "../horizon-client/tests/tall_column.rs"
-
-[[test]]
-name = "wide_states"
-path = "../horizon-client/tests/wide_states.rs"
-
-[[example]]
-name = "chunk_encoding_bench"
-path = "../horizon-client/examples/chunk_encoding_bench.rs"

crates/horizon-client-render/Cargo.toml

@@ -7,9 +7,6 @@ rust-version = "1.90"
 description = "The client's world data, rendering and screens: chunks, meshing, light, streaming, the renderer, the HUD, menus and settings; no gameplay"
 
 [dependencies]
-horizon-cosmetics = { path = "../horizon-cosmetics" }
-# The GUI atlas's pixels, kept compressed once uploaded (hud.rs `pack_pixels`).
-lz4_flex = { version = "0.14", default-features = false, features = ["std", "safe-encode", "safe-decode", "checked-decode"] }
 horizon-assets = { path = "../horizon-assets" }
 horizon-bench = { path = "../horizon-bench" }
 horizon-client-core = { path = "../horizon-client-core" }
@@ -18,11 +15,6 @@ horizon-command = { path = "../horizon-command" }
 horizon-core = { path = "../horizon-core" }
 horizon-hdr = { path = "../horizon-hdr" }
 horizon-items = { path = "../horizon-items" }
-# The narrator option's status and whether the narrator is there (Options.narrator).
-horizon-narrator = { path = "../horizon-narrator" }
-# OptiFine-format pack files: random entity textures (hud.rs), connected textures
-# (connected.rs) and custom item texture rules (cit.rs).
-horizon-optifine = { path = "../horizon-optifine" }
 horizon-protocol = { path = "../horizon-protocol" }
 horizon-shader-api = { path = "../horizon-shader-api" }
 horizon-shaders = { path = "../horizon-shaders" }
@@ -31,7 +23,6 @@ horizon-theme = { path = "../horizon-theme" }
 horizon-threads = { path = "../horizon-threads" }
 horizon-world = { path = "../horizon-world" }
 ab_glyph = "0.2.32"
-base64 = "0.22"
 bytemuck = { version = "1.24", features = ["derive"] }
 # Sound (ALSA on Linux); the `audio` feature.
 cpal = { version = "0.16", optional = true }
@@ -40,25 +31,18 @@ flate2 = { version = "1.1.10", default-features = false, features = ["zlib-rs",
 glam = "0.30"
 log = "0.4"
 miniz_oxide = "0.8"
-naga = { version = "30.0.1", features = ["wgsl-in", "glsl-in", "hlsl-out"] }
-half = "2"
+naga = { version = "30.0.1", features = ["wgsl-in", "hlsl-out"] }
 png = "0.18"
-# Project icons served by Modrinth are often WebP or JPEG rather than PNG, and
-# the pack browser showed nothing for those. Both are small pure-Rust decoders.
-image-webp = { version = "0.2", default-features = false }
-zune-jpeg = { version = "0.4", default-features = false, features = ["std"] }
 pollster = "0.4"
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1.0.151", features = ["raw_value"] }
-sha1 = "0.10"
 sha2 = "0.10.9"
-smallvec = { version = "1", features = ["const_new"] }
 symphonia = { version = "0.5", default-features = false, features = ["ogg", "vorbis"] }
 unicode-bidi = "0.3.18"
 ureq = { version = "2", default-features = false, features = ["tls"] }
 wgpu = { version = "30.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "metal", "wgsl", "naga-ir"] }
 winit = "0.30.13"
-zip = { version = "9.1.3", default-features = false, features = ["deflate"] }
+zip = { version = "2", default-features = false, features = ["deflate"] }
 
 [target.'cfg(unix)'.dependencies]
 rustix = { version = "1", default-features = false, features = ["std", "time"] }
@@ -75,12 +59,9 @@ audio = ["dep:cpal"]
 # Helpers horizon-client's tests build their fixtures with.
 test-support = []
 
-[build-dependencies]
-horizon-mod-api-gen = { path = "../horizon-mod-api-gen" }
-
 [lints]
 workspace = true
 
 [dev-dependencies]
 horizon-items = { path = "../horizon-items", features = ["test-support"] }
-naga = { version = "30.0.1", features = ["wgsl-in", "hlsl-out", "glsl-out", "msl-out", "spv-out"] }
+naga = { version = "30.0.1", features = ["wgsl-in", "hlsl-out", "msl-out", "spv-out"] }

crates/horizon-client-render/build.rs

@@ -1,7 +0,0 @@
-fn main() {
-    let root =
-        std::path::PathBuf::from(std::env::var_os("CARGO_MANIFEST_DIR").unwrap()).join("../..");
-    let out_dir = std::path::PathBuf::from(std::env::var_os("OUT_DIR").unwrap());
-    horizon_mod_api_gen::generate(&root, &out_dir, horizon_mod_api_gen::Target::Render)
-        .expect("generating native render mod API");
-}

crates/horizon-client-render/examples/entity_shadow_ownership.rs

@@ -1,221 +0,0 @@
-//! Original synthetic capability regression; no game resources or player world.
-//! Run with fresh HORIZON_HOME, HORIZON_LAUNCHER_HOME, XDG_DATA_HOME and XDG_CONFIG_HOME,
-//! HORIZON_NO_AUDIO=1 and HORIZON_LAUNCHER_NO_SELF_UPDATE=1.
-use horizon_client_render::{gfx::Renderer, graphics::GraphicsApi};
-use std::{io::Write, sync::Arc};
-use winit::{
-    application::ApplicationHandler,
-    event::WindowEvent,
-    event_loop::{ActiveEventLoop, EventLoop},
-    window::{Window, WindowId},
-};
-
-const VERTEX: &str = "#version 120\nvoid main() { gl_Position = ftransform(); }\n";
-const COLOUR: &str = "#version 120\nvoid main() { gl_FragColor = vec4(1.0); }\n";
-// Reading the actual shadow sampler activates the shadow pass, rather than just
-// placing a shadow program in the archive and assuming the pass runs.
-const SHADOW_READ: &str = "#version 120\nuniform sampler2D shadowtex0;\n\
-    void main() { gl_FragColor = vec4(vec3(texture2D(shadowtex0, vec2(0.5)).r), 1.0); }\n";
-
-fn pack(properties: &str, shadow: Option<&str>, reads_shadow: bool) -> horizon_shaders::Pack {
-    let mut zip = zip::ZipWriter::new(std::io::Cursor::new(Vec::new()));
-    let mut write = |name: &str, text: &str| {
-        zip.start_file(
-            format!("shaders/{name}"),
-            zip::write::SimpleFileOptions::default(),
-        )
-        .unwrap();
-        zip.write_all(text.as_bytes()).unwrap();
-    };
-    write("shaders.properties", properties);
-    write("final.vsh", VERTEX);
-    write("final.fsh", if reads_shadow { SHADOW_READ } else { COLOUR });
-    write("gbuffers_entities.vsh", VERTEX);
-    write("gbuffers_entities.fsh", COLOUR);
-    if let Some(shadow) = shadow {
-        write("shadow.vsh", VERTEX);
-        write("shadow.fsh", shadow);
-    }
-    horizon_shaders::Pack::from_zip_bytes(
-        "original-shadow-ownership",
-        zip.finish().unwrap().into_inner(),
-    )
-    .unwrap()
-}
-
-fn fixture(window: Arc<Window>) -> Result<(), Box<dyn std::error::Error>> {
-    let white = [255; 4];
-    let panorama = Arc::new(horizon_client_render::gfx::panorama::Faces::colour([0; 4]));
-    let mut renderer = pollster::block_on(Renderer::new(
-        window,
-        true,
-        &white,
-        1,
-        1,
-        1,
-        &[],
-        &[],
-        (&white, 1, 1),
-        (&white, 1, 1),
-        (&white, 1, 1),
-        (&white, 1),
-        panorama,
-        None,
-        None,
-        GraphicsApi::Vulkan,
-        false,
-        false,
-        true,
-    ))?;
-    assert!(!renderer.pack_entity_shadows(), "no selected pack");
-    renderer.set_shader_pack(0, None, &[]);
-    assert!(
-        !renderer.pack_entity_shadows(),
-        "selected pack without a compiled post"
-    );
-
-    let cases = [
-        ("full", "", Some(COLOUR), true, false, true),
-        (
-            "player-only",
-            "shadowEntities=false\nshadowPlayer=true",
-            Some(COLOUR),
-            true,
-            false,
-            false,
-        ),
-        // Block-entity shadows alone must not suppress a mob's blob.
-        (
-            "blocks-only",
-            "shadowEntities=false",
-            Some(COLOUR),
-            true,
-            false,
-            false,
-        ),
-        (
-            "disabled",
-            "shadow.enabled=false",
-            Some(COLOUR),
-            true,
-            false,
-            false,
-        ),
-        ("missing-program", "", None, true, false, false),
-        (
-            "failed-translation",
-            "",
-            Some("#version 120\nvoid main() { gl_FragColor = deliberately_undefined; }"),
-            true,
-            false,
-            false,
-        ),
-        ("failed-pipeline", "", Some(COLOUR), true, true, false),
-        (
-            "unused-shadow-program",
-            "",
-            Some(COLOUR),
-            false,
-            false,
-            false,
-        ),
-        (
-            "forced-shadow-program",
-            "shadow.enabled=true",
-            Some(COLOUR),
-            false,
-            false,
-            true,
-        ),
-    ];
-    for dimension in [0, -1, 1] {
-        for (name, properties, shadow, reads_shadow, break_pipeline, expected) in cases {
-            let pack = pack(properties, shadow, reads_shadow);
-            let mut macros = horizon_shaders::Macros::standard();
-            renderer.define_pack_macros(&mut macros);
-            let (properties, _) = horizon_shaders::read_properties(&pack, &mut macros);
-            let mut post = horizon_shaders::load_post(
-                &pack,
-                "",
-                &properties,
-                &macros,
-                &renderer.pack_inputs(),
-            );
-            if name == "failed-translation" {
-                assert!(post.shadow_entities.is_none());
-                assert!(post.notes.iter().any(|note| note.contains("skipped")));
-            } else if name == "missing-program" {
-                assert!(post.shadow_entities.is_none());
-                assert!(post.notes.iter().any(|note| note.contains("no program")));
-            } else if break_pipeline {
-                // A translated stage can still fail device pipeline creation. Inject a
-                // missing entry point into only the entity caster; terrain/block stages
-                // and the settings stay valid. PackPost must report the compiled result.
-                post.shadow_entities
-                    .as_mut()
-                    .unwrap()
-                    .program
-                    .as_mut()
-                    .unwrap()
-                    .vertex
-                    .entry_points[0]
-                    .name = "deliberately_missing_main".into();
-            } else {
-                assert!(post.notes.is_empty(), "{name}: {:?}", post.notes);
-            }
-            let (_, notes) = renderer
-                .set_shader_pack(dimension, Some(post), &[])
-                .unwrap();
-            if break_pipeline {
-                assert!(
-                    notes.iter().any(|note| note.contains("skipped")),
-                    "{notes:?}"
-                );
-            } else if name != "missing-program" && name != "failed-translation" {
-                assert!(
-                    !notes.iter().any(|note| note.contains("skipped")),
-                    "{name}: {notes:?}"
-                );
-            }
-            assert_eq!(
-                renderer.pack_entity_shadows(),
-                expected,
-                "{name}, dimension {dimension}: {notes:?}"
-            );
-            assert!(!renderer.native_shadow());
-            println!("{name}, dimension {dimension}: replaces_mob_blob={expected}");
-        }
-    }
-    renderer.drop_shader_packs();
-    assert!(
-        !renderer.pack_entity_shadows(),
-        "dropped pack restores fallback"
-    );
-    println!("ENTITY_SHADOW_OWNERSHIP_PASSED: 27 compiled controls and no/pending/dropped pack");
-    Ok(())
-}
-
-struct App;
-impl ApplicationHandler for App {
-    fn resumed(&mut self, event_loop: &ActiveEventLoop) {
-        let window = Arc::new(
-            event_loop
-                .create_window(
-                    Window::default_attributes()
-                        .with_visible(false)
-                        .with_inner_size(winit::dpi::LogicalSize::new(32., 32.)),
-                )
-                .unwrap(),
-        );
-        if let Err(error) = fixture(window) {
-            eprintln!("Shadow ownership fixture failed: {error}");
-            std::process::exit(1);
-        }
-        event_loop.exit();
-    }
-    fn window_event(&mut self, _: &ActiveEventLoop, _: WindowId, _: WindowEvent) {}
-}
-
-fn main() {
-    EventLoop::new().unwrap().run_app(&mut App).unwrap();
-}

crates/horizon-client-render/examples/pack_load_bench.rs

@@ -1,436 +0,0 @@
-//! How long a big resource pack takes to load and reload, on generated files only (no game
-//! resources): a stand-in vanilla root, a server-style zip pack of many namespaces, and a
-//! high-resolution pack over vanilla's own textures. Each stage runs a few times; the median
-//! is printed as a Markdown table.
-//! `cargo run --profile fast -p horizon-client-render --example pack_load_bench [-- --scale 1]`
-//! (`.github/workflows/pack-bench.yml` runs it on a branch and on its base, side by side).
-use horizon_client_render::{
-    hud::HudAtlas,
-    model_library::ParsedModels,
-    packs::{self, Pack},
-    sprites::Sprites,
-};
-use std::{
-    fs,
-    path::{Path, PathBuf},
-    time::Instant,
-};
-
-/// A small deterministic generator: the same files on every run and every branch.
-struct Noise(u64);
-impl Noise {
-    fn next(&mut self) -> u64 {
-        self.0 ^= self.0 << 13;
-        self.0 ^= self.0 >> 7;
-        self.0 ^= self.0 << 17;
-        self.0
-    }
-}
-
-/// A `side`x`side` RGBA PNG (`frames` tall when animated) of blotchy pixels, which compress
-/// about as well as real textures do.
-fn png(noise: &mut Noise, side: u32, frames: u32, alpha: bool) -> Vec<u8> {
-    let mut out = Vec::new();
-    {
-        let mut encoder = png::Encoder::new(&mut out, side, side * frames);
-        encoder.set_color(png::ColorType::Rgba);
-        encoder.set_depth(png::BitDepth::Eight);
-        let mut writer = encoder.write_header().unwrap();
-        let mut pixels = Vec::with_capacity((side * side * frames * 4) as usize);
-        let mut colour = [0u8; 4];
-        for i in 0..side * side * frames {
-            if i % 3 == 0 {
-                let n = noise.next();
-                colour = [n as u8, (n >> 8) as u8, (n >> 16) as u8, 255];
-                if alpha && n >> 40 & 3 == 0 {
-                    colour[3] = 0;
-                }
-            }
-            pixels.extend_from_slice(&colour);
-        }
-        writer.write_image_data(&pixels).unwrap();
-    }
-    out
-}
-
-fn model(noise: &mut Noise, namespace: &str, texture: &str) -> Vec<u8> {
-    let n = noise.next() % 4;
-    format!(
-        r##"{{"parent":"minecraft:block/cube_all","textures":{{"all":"{namespace}:{texture}"}},"elements":[{{"from":[0,0,0],"to":[16,{h},16],"faces":{{"north":{{"texture":"#all","uv":[0,0,16,16]}},"up":{{"texture":"#all"}}}}}}]}}"##,
-        h = 4 + n * 4
-    )
-    .into_bytes()
-}
-
-fn write(root: &Path, name: &str, bytes: &[u8]) {
-    let path = root.join(name);
-    fs::create_dir_all(path.parent().unwrap()).unwrap();
-    fs::write(path, bytes).unwrap();
-}
-
-/// A deflated zip written by hand (the reader skips CRCs, so they stay zero), at most 65535
-/// entries.
-#[derive(Default)]
-struct ZipOut {
-    out: Vec<u8>,
-    central: Vec<u8>,
-    count: u16,
-}
-impl ZipOut {
-    fn put(&mut self, name: &str, body: &[u8]) {
-        let data = miniz_oxide::deflate::compress_to_vec(body, 6);
-        let offset = u32::try_from(self.out.len()).unwrap();
-        let sizes = [data.len() as u32, body.len() as u32];
-        self.out.extend(0x0403_4b50u32.to_le_bytes());
-        self.out.extend([20, 0, 0, 0, 8, 0]);
-        self.out.extend([0; 8]);
-        sizes.iter().for_each(|s| self.out.extend(s.to_le_bytes()));
-        self.out.extend((name.len() as u16).to_le_bytes());
-        self.out.extend([0; 2]);
-        self.out.extend(name.as_bytes());
-        self.out.extend(&data);
-        self.central.extend(0x0201_4b50u32.to_le_bytes());
-        self.central.extend([20, 0, 20, 0, 0, 0, 8, 0]);
-        self.central.extend([0; 8]);
-        sizes
-            .iter()
-            .for_each(|s| self.central.extend(s.to_le_bytes()));
-        self.central.extend((name.len() as u16).to_le_bytes());
-        self.central.extend([0; 12]);
-        self.central.extend(offset.to_le_bytes());
-        self.central.extend(name.as_bytes());
-        self.count = self.count.checked_add(1).expect("too many zip entries");
-    }
-    fn finish(mut self, path: &Path) {
-        let start = self.out.len() as u32;
-        self.out.extend(&self.central);
-        self.out.extend(0x0605_4b50u32.to_le_bytes());
-        self.out.extend([0; 4]);
-        self.out.extend(self.count.to_le_bytes());
-        self.out.extend(self.count.to_le_bytes());
-        self.out.extend((self.central.len() as u32).to_le_bytes());
-        self.out.extend(start.to_le_bytes());
-        self.out.extend([0; 2]);
-        fs::write(path, self.out).unwrap();
-    }
-}
-
-const META: &[u8] = br#"{"pack":{"description":"bench","min_format":[69,0],"max_format":[999,0]}}"#;
-
-/// The stand-in game resources: vanilla-sized texture folders, models and the stacked JSON
-/// files (lang, sounds, fonts, atlases) every reload merges.
-fn vanilla(root: &Path, scale: usize, noise: &mut Noise) -> Vec<String> {
-    let mut blocks = Vec::new();
-    for i in 0..1100 * scale {
-        let name = format!("block/b{i}");
-        let frames = if i % 50 == 0 { 8 } else { 1 };
-        write(
-            root,
-            &format!("assets/minecraft/textures/{name}.png"),
-            &png(noise, 16, frames, i % 7 == 0),
-        );
-        if frames > 1 {
-            write(
-                root,
-                &format!("assets/minecraft/textures/{name}.png.mcmeta"),
-                br#"{"animation":{"frametime":2}}"#,
-            );
-        }
-        write(
-            root,
-            &format!("assets/minecraft/models/block/b{i}.json"),
-            &model(noise, "minecraft", &name),
-        );
-        blocks.push(format!("minecraft:{name}"));
-    }
-    for (folder, count, side) in [("item", 1500, 16), ("entity", 900, 64), ("gui", 800, 16)] {
-        for i in 0..count * scale {
-            let sub = if folder == "gui" { "sprites/" } else { "" };
-            write(
-                root,
-                &format!(
-                    "assets/minecraft/textures/{folder}/{sub}{}/t{i}.png",
-                    i % 20
-                ),
-                &png(noise, side, 1, true),
-            );
-        }
-    }
-    for i in 0..1500 * scale {
-        write(
-            root,
-            &format!("assets/minecraft/models/item/i{i}.json"),
-            &model(noise, "minecraft", &format!("item/{}/t{i}", i % 20)),
-        );
-    }
-    let lang: String = (0..4000)
-        .map(|i| format!("\"key.{i}\":\"Value {i}\""))
-        .collect::<Vec<_>>()
-        .join(",");
-    write(
-        root,
-        "assets/minecraft/lang/en_us.json",
-        format!("{{{lang}}}").as_bytes(),
-    );
-    write(
-        root,
-        "assets/minecraft/sounds.json",
-        br#"{"a":{"sounds":["a"]}}"#,
-    );
-    write(
-        root,
-        "assets/minecraft/atlases/blocks.json",
-        br#"{"sources":[{"type":"directory","source":"block","prefix":"block/"}]}"#,
-    );
-    write(root, "pack.mcmeta", META);
-    blocks
-}
-
-/// A server pack the way ItemsAdder-style plugins make them: one zip of many namespaces, each
-/// with its own items' textures and models, its sounds and its lang files.
-fn server_zip(path: &Path, scale: usize, noise: &mut Noise) {
-    let mut zip = ZipOut::default();
-    zip.put("pack.mcmeta", META);
-    for n in 0..190 {
-        let ns = format!("plugin{n}");
-        for i in 0..50 * scale {
-            let texture = format!("item/{}/t{i}", i % 5);
-            zip.put(
-                &format!("assets/{ns}/textures/{texture}.png"),
-                &png(noise, 32, 1, true),
-            );
-            zip.put(
-                &format!("assets/{ns}/models/item/{}/m{i}.json", i % 5),
-                &model(noise, &ns, &texture),
-            );
-            if i % 10 == 0 {
-                zip.put(&format!("assets/{ns}/sounds/s{i}.ogg"), &[0; 2048]);
-            }
-        }
-        zip.put(
-            &format!("assets/{ns}/lang/en_us.json"),
-            br#"{"item.custom":"Custom"}"#,
-        );
-    }
-    let lang: String = (0..2000)
-        .map(|i| format!("\"server.{i}\":\"Server {i}\""))
-        .collect::<Vec<_>>()
-        .join(",");
-    zip.put(
-        "assets/minecraft/lang/en_us.json",
-        format!("{{{lang}}}").as_bytes(),
-    );
-    zip.finish(path);
-}
-
-/// A 64x pack over vanilla's own block, item and entity textures, with OptiFine CTM-style
-/// tiles beside them: what the big OptiFine packs look like on disk.
-fn hd_zip(path: &Path, scale: usize, noise: &mut Noise) {
-    let mut zip = ZipOut::default();
-    zip.put("pack.mcmeta", META);
-    for i in 0..1100 * scale {
-        zip.put(
-            &format!("assets/minecraft/textures/block/b{i}.png"),
-            &png(noise, 64, 1, i % 7 == 0),
-        );
-        if i % 4 == 0 {
-            for tile in 0..12 {
-                zip.put(
-                    &format!("assets/minecraft/optifine/ctm/b{i}/{tile}.png"),
-                    &png(noise, 64, 1, false),
-                );
-            }
-            zip.put(
-                &format!("assets/minecraft/optifine/ctm/b{i}/b{i}.properties"),
-                format!("matchTiles=b{i}\nmethod=ctm\ntiles=0-11\n").as_bytes(),
-            );
-        }
-    }
-    for i in 0..750 * scale {
-        zip.put(
-            &format!("assets/minecraft/textures/item/{}/t{i}.png", i % 20),
-            &png(noise, 64, 1, true),
-        );
-    }
-    zip.finish(path);
-}
-
-fn median(mut ms: Vec<f64>) -> f64 {
-    ms.sort_by(f64::total_cmp);
-    ms[ms.len() / 2]
-}
-
-/// `f`'s median time over `runs`, with `before` (not timed) ahead of each run.
-fn time(runs: usize, mut before: impl FnMut(), mut f: impl FnMut()) -> f64 {
-    median(
-        (0..runs)
-            .map(|_| {
-                before();
-                let started = Instant::now();
-                f();
-                started.elapsed().as_secs_f64() * 1000.0
-            })
-            .collect(),
-    )
-}
-
-fn zip_pack(id: &str, path: PathBuf) -> Pack {
-    // Read the way `packs::folder` reads a `resourcepacks/` zip.
-    let dir = path.parent().unwrap().join(format!("{id}-dir"));
-    fs::create_dir_all(&dir).unwrap();
-    let at = dir.join(path.file_name().unwrap());
-    fs::rename(&path, &at).unwrap();
-    packs::folder(&dir, packs::RESOURCE_FORMAT)
-        .into_iter()
-        .next()
-        .unwrap_or_else(|| panic!("{id} is not a pack"))
-}
-
-fn main() {
-    let args: Vec<String> = std::env::args().collect();
-    let scale = args
-        .iter()
-        .position(|a| a == "--scale")
-        .and_then(|i| args.get(i + 1))
-        .map_or(1, |s| s.parse().unwrap());
-    let runs = 3;
-    let scratch = std::env::temp_dir().join(format!("horizon-pack-bench-{}", std::process::id()));
-    let _ = fs::remove_dir_all(&scratch);
-    fs::create_dir_all(&scratch).unwrap();
-    let mut noise = Noise(0x9e37_79b9_7f4a_7c15);
-    let vanilla_root = scratch.join("vanilla");
-    let blocks = vanilla(&vanilla_root, scale, &mut noise);
-    server_zip(&scratch.join("server.zip"), scale, &mut noise);
-    hd_zip(&scratch.join("hd.zip"), scale, &mut noise);
-    let server = zip_pack("server", scratch.join("server.zip"));
-    let hd = zip_pack("hd", scratch.join("hd.zip"));
-    let cache = scratch.join("cache");
-    let both = [hd.clone(), server.clone()];
-
-    let mut rows: Vec<(String, f64)> = Vec::new();
-    let mut row = |name: &str, ms: f64| {
-        eprintln!("{name}: {ms:.1} ms");
-        rows.push((name.to_owned(), ms));
-    };
-    let fresh = || {
-        let _ = fs::remove_dir_all(&cache);
-    };
-    row(
-        "overlay: build, both packs (cold)",
-        time(runs, fresh, || {
-            packs::resource_root(&vanilla_root, &both, &cache).unwrap();
-        }),
-    );
-    let root = packs::resource_root(&vanilla_root, &both, &cache).unwrap();
-    row(
-        "overlay: reuse, both packs (cache hit)",
-        time(
-            runs,
-            || {},
-            || {
-                packs::resource_root(&vanilla_root, &both, &cache).unwrap();
-            },
-        ),
-    );
-    // The pack screen: one pack turned off, then on again.
-    row(
-        "overlay: toggle the server pack off (new selection)",
-        time(
-            runs,
-            || {
-                let only =
-                    packs::resource_root(&vanilla_root, std::slice::from_ref(&hd), &cache).unwrap();
-                fs::remove_dir_all(&only).unwrap();
-            },
-            || {
-                packs::resource_root(&vanilla_root, std::slice::from_ref(&hd), &cache).unwrap();
-            },
-        ),
-    );
-    row(
-        "models: parse every model",
-        time(
-            runs,
-            || {},
-            || {
-                std::hint::black_box(ParsedModels::load(&root));
-            },
-        ),
-    );
-    let sprite_cache = root.join("horizon-sprites.cache");
-    // OptiFine connected-texture tiles, inserted by their path as `ConnectedTextures` does.
-    let tiles: Vec<String> = (0..1100 * scale)
-        .step_by(4)
-        .flat_map(|i| (0..12).map(move |t| format!("assets/minecraft/optifine/ctm/b{i}/{t}.png")))
-        .collect();
-    let sprites = |cold: bool, prefetch: bool, names: &[String], files: bool| {
-        time(
-            runs,
-            || {
-                if cold {
-                    let _ = fs::remove_file(&sprite_cache);
-                }
-            },
-            || {
-                let mut sprites = Sprites::with_disk_cache(&root);
-                if prefetch {
-                    sprites.prefetch(&root, names.iter().map(String::as_str));
-                }
-                for name in names {
-                    if files {
-                        sprites.insert_file(&root, name).unwrap();
-                    } else {
-                        sprites.insert(&root, name).unwrap();
-                    }
-                }
-                sprites.save_disk_cache();
-                sprites.finish();
-                std::hint::black_box(&sprites.pixels);
-            },
-        )
-    };
-    row(
-        "block sprites: one by one (no cache)",
-        sprites(true, false, &blocks, false),
-    );
-    row(
-        "block sprites: prefetched (no cache)",
-        sprites(true, true, &blocks, false),
-    );
-    row(
-        "block sprites: from the disk cache",
-        sprites(false, false, &blocks, false),
-    );
-    row("CTM tiles: one by one", sprites(false, false, &tiles, true));
-    row("CTM tiles: prefetched", sprites(false, true, &tiles, true));
-    row(
-        "GUI atlas: decode and stitch, both packs",
-        time(
-            runs,
-            || {},
-            || {
-                if let Err(e) = HudAtlas::build_over(&root, &vanilla_root) {
-                    eprintln!("GUI atlas failed: {e}");
-                }
-            },
-        ),
-    );
-    row(
-        "GUI atlas: vanilla alone",
-        time(
-            runs,
-            || {},
-            || {
-                let _ = HudAtlas::build(&vanilla_root);
-            },
-        ),
-    );
-
-    let cores = std::thread::available_parallelism().map_or(1, |n| n.get());
-    println!("| Stage (scale {scale}, {cores} threads, median of {runs}) | ms |");
-    println!("|---|---:|");
-    for (name, ms) in &rows {
-        println!("| {name} | {ms:.0} |");
-    }
-    let _ = fs::remove_dir_all(&scratch);
-}