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 <noreply@anthropic.com>
This commit is contained in:
@@ -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'
|
||||
|
||||
Generated
-11
@@ -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]]
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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"] }
|
||||
|
||||
+21
-4
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
+8
-7
@@ -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`.
|
||||
|
||||
@@ -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" <<EOF
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Horizon
|
||||
Comment=Minecraft Java Edition 26.3 in Rust
|
||||
Exec="$here/horizon.sh"
|
||||
Icon=$here/resources/assets/minecraft/textures/block/grass_block_side.png
|
||||
Terminal=false
|
||||
Categories=Game;
|
||||
EOF
|
||||
echo "Added Horizon to the application menu ($apps/horizon.desktop)"
|
||||
exit 0
|
||||
fi
|
||||
home="${HORIZON_HOME:-${XDG_DATA_HOME:-$HOME/.local/share}/horizon}"
|
||||
mkdir -p "$home"
|
||||
cd "$home" || exit 1
|
||||
exec "$here/horizon-client" "$@"
|
||||
'''
|
||||
|
||||
README = '''Horizon {version} ({commit}) for {platform}
|
||||
|
||||
Run ./horizon.sh (add --help for options, e.g. --render-distance 24 or --creative).
|
||||
./horizon.sh --install adds Horizon to the application menu.
|
||||
|
||||
Saves and options.txt are kept in ~/.local/share/horizon (override with HORIZON_HOME).
|
||||
Esc pauses and releases the mouse; F3 shows the debug screen.
|
||||
|
||||
The resources folder contains Mojang's game assets for personal use only;
|
||||
do not redistribute this archive.
|
||||
'''
|
||||
|
||||
|
||||
def git(*args):
|
||||
return subprocess.run(['git', *args], cwd=ROOT, check=True, capture_output=True, text=True).stdout.strip()
|
||||
|
||||
|
||||
def add_bytes(tar, name, data, mode=0o644):
|
||||
info = tarfile.TarInfo(name)
|
||||
info.size = len(data)
|
||||
info.mode = mode
|
||||
tar.addfile(info, io.BytesIO(data))
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
|
||||
parser.add_argument('--binary', type=Path, help='built horizon-client (default: cargo release target)')
|
||||
parser.add_argument('--resources', type=Path, default=LOCAL / 'horizon-client/26.3')
|
||||
parser.add_argument('--out', type=Path, default=LOCAL / 'dist')
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.binary is None:
|
||||
metadata = json.loads(subprocess.run(
|
||||
['cargo', 'metadata', '--format-version', '1', '--no-deps'],
|
||||
cwd=ROOT, check=True, capture_output=True, text=True).stdout)
|
||||
args.binary = Path(metadata['target_directory']) / 'release/horizon-client'
|
||||
if not args.binary.is_file():
|
||||
raise SystemExit(f'missing {args.binary}: run cargo build --release -p horizon-client')
|
||||
if not (args.resources / 'horizon-resources.json').is_file():
|
||||
raise SystemExit(f'missing prepared resources in {args.resources}: run tools/prepare_native_client.py --prepare')
|
||||
if not (args.resources / 'assets/minecraft/sounds.json').is_file():
|
||||
print('warning: no sound assets; run tools/fetch_sounds.py for audio')
|
||||
|
||||
system = {'Linux': 'linux', 'Darwin': 'macos'}.get(platform.system())
|
||||
if system is None:
|
||||
raise SystemExit(f'unsupported platform {platform.system()}: Horizon targets Linux and macOS')
|
||||
machine = {'AMD64': 'x86_64', 'arm64': 'aarch64'}.get(platform.machine(), platform.machine())
|
||||
plat = f'{system}-{machine}'
|
||||
commit = git('rev-parse', '--short', 'HEAD') + ('-dirty' if git('status', '--porcelain', '--untracked-files=no') else '')
|
||||
version = '0.1.0'
|
||||
name = f'horizon-{version}-{commit}-{plat}'
|
||||
|
||||
args.out.mkdir(parents=True, exist_ok=True)
|
||||
archive = args.out / f'{name}.tar.gz'
|
||||
with tarfile.open(archive, 'w:gz', compresslevel=1) as tar:
|
||||
tar.add(args.binary, 'horizon/horizon-client')
|
||||
add_bytes(tar, 'horizon/horizon.sh', LAUNCHER.encode(), 0o755)
|
||||
add_bytes(tar, 'horizon/README.txt', README.format(version=version, commit=commit, platform=plat).encode())
|
||||
for path in sorted(args.resources.iterdir()):
|
||||
if path.name not in SKIP:
|
||||
tar.add(path, f'horizon/resources/{path.name}')
|
||||
|
||||
digest = hashlib.sha256(archive.read_bytes()).hexdigest()
|
||||
(args.out / f'{archive.name}.sha256').write_text(f'{digest} {archive.name}\n')
|
||||
print(f'{archive} ({archive.stat().st_size / 1e6:.0f} MB)\nsha256 {digest}')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
Reference in New Issue
Block a user