From 08b8e71838add651c8bb8cb997c3fc364160bb1b Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Thu, 8 Oct 2026 10:48:58 +0200 Subject: [PATCH] Drop Windows from scope and add a native client packager Horizon now targets Linux and macOS only: remove the Windows CI runners and wgpu's DX12 backend, and update the scope docs. The Ubuntu RTX 4080 desktop becomes the first physical Linux target. tools/package_native_client.py bundles a release build with its prepared resources and a launcher for playing on another machine of the same platform. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 5 +- Cargo.lock | 11 --- README.md | 4 +- crates/horizon-client/Cargo.toml | 2 +- docs/native-client.md | 25 +++++-- docs/playable-validation.md | 2 +- docs/rust-parity.md | 15 ++-- tools/package_native_client.py | 117 +++++++++++++++++++++++++++++++ 8 files changed, 152 insertions(+), 29 deletions(-) create mode 100644 tools/package_native_client.py diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e3327b32..85384a05b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-26, windows-latest] + os: [ubuntu-latest, macos-26] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -375,7 +375,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-26, windows-latest] + os: [ubuntu-latest, macos-26] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -435,7 +435,6 @@ jobs: if: runner.os == 'Linux' run: sudo apt-get update && sudo apt-get install -y xvfb libgl1 libegl1 libvulkan1 mesa-vulkan-drivers libasound2t64 libxkbcommon0 - name: Verify integrated-server graphics report against the actual device - if: runner.os == 'Linux' || runner.os == 'macOS' run: python tools/test_server_graphics.py ${{ runner.os == 'macOS' && '--native-display' || '' }} - name: Exercise the applied dispatcher hooks and upstream rejection path if: runner.os == 'Linux' diff --git a/Cargo.lock b/Cargo.lock index 5fa7f57e3..8eadbf02a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -627,7 +627,6 @@ dependencies = [ "log", "presser", "thiserror 2.0.21", - "windows 0.62.2", ] [[package]] @@ -1591,12 +1590,6 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" -[[package]] -name = "range-alloc" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca45419789ae5a7899559e9512e58ca889e41f04f1f2445e9f4b290ceccd1d08" - [[package]] name = "raw-window-handle" version = "0.6.2" @@ -2412,7 +2405,6 @@ dependencies = [ "android_system_properties", "arrayvec", "ash", - "bit-set", "bitflags 2.13.2", "block2 0.6.2", "bytemuck", @@ -2431,13 +2423,11 @@ dependencies = [ "objc2-foundation 0.3.2", "objc2-metal 0.3.2", "objc2-quartz-core 0.3.2", - "once_cell", "ordered-float", "parking_lot", "portable-atomic", "portable-atomic-util", "profiling", - "range-alloc", "raw-window-handle", "raw-window-metal", "renderdoc-sys", @@ -2447,7 +2437,6 @@ dependencies = [ "wgpu-naga-bridge", "wgpu-types", "windows 0.62.2", - "windows-core 0.62.2", ] [[package]] diff --git a/README.md b/README.md index 1cb204970..bfbeba4e8 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ cargo run --release -p horizon-client **Java performance packs (separate track):** pinned Java performance packs, distant terrain, an original frame/tick recorder, and Mac/client/server starter downloads. The M2 Pro/16 GB Mac is the first testing target. -The Rust rewrite’s final deliverables include **playable native builds for macOS, Linux and Windows**, with launch instructions and platform gameplay validation. Track implementation and acceptance criteria in [Rust rewrite status](docs/rust-parity.md). +The Rust rewrite’s final deliverables include **playable native builds for macOS and Linux**, with launch instructions and platform gameplay validation. Track implementation and acceptance criteria in [Rust rewrite status](docs/rust-parity.md). ## Play on your Mac @@ -289,7 +289,7 @@ python3 tools/check_public_tree.py python3 tools/check_public_tree.py --history ``` -CI checks offline tools/Rust and compiles the original mod/builds packs on Linux, Windows and Apple Silicon macOS. Game dependencies download to ephemeral `.local/`; CI uploads only our original JAR and packs. Compilation is not Mac GPU gameplay testing. Publication checks allow Java only under our original `dev/horizonlab` namespace; review diffs as well. +CI checks offline tools/Rust and compiles the original mod/builds packs on Linux and Apple Silicon macOS. Game dependencies download to ephemeral `.local/`; CI uploads only our original JAR and packs. Compilation is not Mac GPU gameplay testing. Publication checks allow Java only under our original `dev/horizonlab` namespace; review diffs as well. [MIT](LICENSE) covers only our original tracked work. Dependencies retain their licenses. Mojang [removed obfuscation](https://www.minecraft.net/en-us/article/removing-obfuscation-in-java-edition) without changing [Minecraft's EULA](https://www.minecraft.net/en-us/eula). Decompiled game source remains local; published code implements independent tooling and instrumentation. diff --git a/crates/horizon-client/Cargo.toml b/crates/horizon-client/Cargo.toml index f9b002548..08deb0202 100644 --- a/crates/horizon-client/Cargo.toml +++ b/crates/horizon-client/Cargo.toml @@ -10,7 +10,7 @@ description = "Horizon native development client" horizon-assets = { path = "../horizon-assets" } horizon-core = { path = "../horizon-core" } horizon-world = { path = "../horizon-world" } -wgpu = { version = "30.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "metal", "dx12", "wgsl"] } +wgpu = { version = "30.0.1", default-features = false, features = ["std", "parking_lot", "vulkan", "metal", "wgsl"] } winit = "0.30.13" pollster = "0.4" bytemuck = { version = "1.24", features = ["derive"] } diff --git a/docs/native-client.md b/docs/native-client.md index 7cd8bf7c2..fd2bd6595 100644 --- a/docs/native-client.md +++ b/docs/native-client.md @@ -55,6 +55,23 @@ Worlds autosave every 6000 ticks (5 minutes), when chunks unload and on quit. On headless Linux use `vscreen start ./target/release/horizon-client` and `vscreen shot`. +### Play on another of your machines + +Horizon targets Linux and macOS; Windows is out of scope. To play on a machine +without Rust, JDK or prepared resources, package a release build where they exist: + +```sh +cargo build --release -p horizon-client +python3 tools/package_native_client.py --out ~/builds/horizon +``` + +The archive holds the binary, the prepared resources and `horizon.sh`. Copy it +to the target machine (same OS and architecture), unpack it and run +`horizon/horizon.sh`; `horizon.sh --install` adds an application menu entry. +Saves and `options.txt` go to `~/.local/share/horizon` (or `$HORIZON_HOME`), so +unpacking an update keeps them. The archive contains Mojang assets: keep it +private. + ## How it fits together - `streaming.rs`: worker pool that generates or loads, lights and meshes chunk @@ -362,7 +379,7 @@ Vulkan llvmpipe software rendering. Textured geometry and resizing were visually inspected; movement, arrow rotation and Ctrl+Q were exercised using virtual physical key codes. Captured relative mouse movement and Escape release were exercised through a virtual pointer. Native macOS/Metal and -Windows/Direct3D 12 runtime tests remain pending. Software-renderer frame rates +physical-GPU Linux runtime tests remain pending. Software-renderer frame rates are not evidence of a hardware speedup. The model gallery was also inspected at close range on Linux/Vulkan llvmpipe. @@ -536,7 +553,7 @@ The Ctrl run recorded 71 sprint ticks and 1,948 sprint centimeters. The double-t run visibly showed `Sprint true` during the second press and `Sprint false` after releasing W. Both runs ended grounded and alive without an error, and their views were visually inspected. These are development client checks; -macOS/Windows runtime acceptance and complete gameplay remain pending. +macOS runtime acceptance and complete gameplay remain pending. ## Crouching and dry pose transitions @@ -575,7 +592,7 @@ visibly switched from crouching to standing after releasing Shift. It recorded without an error. Both views were inspected. The [renderer startup check](../benchmarks/rust-native-crouch-2026-10-07/startup-smoke.json), seven client tests and all-target client Clippy also passed. These checks do not -establish full vanilla gameplay or final macOS/Linux/Windows release acceptance. +establish full vanilla gameplay or final macOS/Linux release acceptance. ## Pending attribute updates @@ -614,4 +631,4 @@ recorded 36 sprinting ticks and 36 crouching ticks, ending grounded and alive without an error. Its view was inspected. The [startup check](../benchmarks/rust-native-attribute-updates-2026-10-07/startup-smoke.json), seven client tests and all-target client Clippy passed. Full gameplay parity and -playable macOS/Linux/Windows release acceptance remain pending. +playable macOS/Linux release acceptance remain pending. diff --git a/docs/playable-validation.md b/docs/playable-validation.md index 9b881c3ec..22ebd53ab 100644 --- a/docs/playable-validation.md +++ b/docs/playable-validation.md @@ -156,7 +156,7 @@ software-renderer workload establish a real-hardware optimization result. The local Linux host uses **Mesa llvmpipe software rendering**. It is useful for mod/mixin/startup/report validation, not for predicting M2 Pro, Windows GPU or Linux discrete-GPU performance. Warm-up/world loading on this host is slow. Demo credentials produce expected unavailable account-properties/Realms logs, and chat availability can be restricted; the independent F8 measurement shortcut avoids relying on chat. -CI compiles/builds on Linux, Windows and Apple Silicon macOS. Successful compilation is not graphics, authentication, UI or Mac-driver runtime validation. macOS 27 and the user's actual M2 Pro have not been tested here. Optional cinematic shaders and Vulkan are experiments; the OpenGL balanced pack is the first manual test. +CI compiles/builds on Linux and Apple Silicon macOS (Windows was dropped from scope on 2026-10-08; earlier Windows results below are historical). Successful compilation is not graphics, authentication, UI or Mac-driver runtime validation. macOS 27 and the user's actual M2 Pro have not been tested here. Optional cinematic shaders and Vulkan are experiments; the OpenGL balanced pack is the first manual test. The [core comparison](core-performance.md) records numerical observations for matched software-rendered workloads. They do not establish a Mac or hardware-GPU diff --git a/docs/rust-parity.md b/docs/rust-parity.md index 741eb3447..7d005cd3c 100644 --- a/docs/rust-parity.md +++ b/docs/rust-parity.md @@ -59,11 +59,12 @@ The playable Java performance packs remain available during development. ## Completion criteria and playable builds The final deliverable is the complete Horizon Rust game with one-to-one parity -with pinned Java Edition 26.3, plus playable builds for **macOS, Linux and -Windows** that the user can download and test. Each platform must include a -packaged native executable, required runtime resources, launch instructions, -artifact checksums, and the tested OS/CPU/GPU configuration. The existing M2 Pro -Mac is the first physical macOS target. +with pinned Java Edition 26.3, plus playable builds for **macOS and Linux** that the user can download and +test. Windows is out of scope. Each platform must include a packaged native +executable, required runtime resources, launch instructions, artifact checksums, +and the tested OS/CPU/GPU configuration. The existing M2 Pro Mac is the first +physical macOS target; the Ubuntu 26.04 desktop (Intel i7-13700KF, NVIDIA RTX +4080, GNOME on Wayland) is the first physical Linux target. A platform is complete only after its packaged Rust game is launched and tested: create/load a world, render terrain, use keyboard/mouse controls, move and interact, @@ -1219,7 +1220,7 @@ This component assumes immutable registered defaults with no modifiers; the exporter verifies that assumption. Mutable custom suppliers and their internal caches use the separate generic storage interfaces. Combined entity health and dimension consequences, full gameplay, save/network codecs and playable native -macOS, Linux and Windows builds remain unfinished. +macOS and Linux builds remain unfinished. The production health binding now accepts the live component through computed attribute queries. Healing, health and base absorption limits, synchronized @@ -1284,6 +1285,6 @@ The registered factories have no world access; the exporter verifies their inherited implementation and captured arguments. This permits an immutable map traversal during particle creation. Custom impure factories remain outside this binding. Rendering, transport, full entity lifecycle integration and playable -macOS, Linux and Windows gameplay remain unfinished. In this pinned version, +macOS and Linux gameplay remain unfinished. In this pinned version, `LivingEntity.updateDataBeforeSync` invokes dirty effect synchronization; it is a separate phase from `tickEffects`. diff --git a/tools/package_native_client.py b/tools/package_native_client.py new file mode 100644 index 000000000..9acce9f57 --- /dev/null +++ b/tools/package_native_client.py @@ -0,0 +1,117 @@ +#!/usr/bin/env python3 +"""Package a built horizon-client with its prepared resources into a private +tarball for one of your own Linux or macOS machines. The resources are Mojang +assets: keep the archive in ignored .local/ and never publish or commit it. + + cargo build --release -p horizon-client + python3 tools/package_native_client.py +""" +import argparse +import hashlib +import io +import json +import platform +import subprocess +import tarfile +from pathlib import Path + +ROOT = Path(__file__).resolve().parent.parent +LOCAL = ROOT / '.local' +# Inputs of the exporters, not read by the game at runtime. +SKIP = {'classes', 'client-classes', 'export.log', 'model-state-export.log'} + +LAUNCHER = r'''#!/bin/sh +# Starts Horizon. Saves and options.txt live in $HORIZON_HOME +# (default ~/.local/share/horizon), so unpacking an update keeps them. +here=$(cd "$(dirname "$0")" && pwd) +if [ "$1" = "--install" ]; then + apps="${XDG_DATA_HOME:-$HOME/.local/share}/applications" + mkdir -p "$apps" + cat > "$apps/horizon.desktop" <