From a4a101ca9cf450dd715196ca5e5caed72725636f Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Fri, 23 Oct 2026 23:21:28 +0200 Subject: [PATCH] Single player runs on its server thread by default again; --in-frame is the opt-out #1428 made the in-frame world the default while a server's players lagged behind it (signs, books, totems, keep_inventory and the other [server-thread] issues). With the fixes of this stack a scripted single player session (walk, mine, place, inventory, combat, eating, boats, minecarts, chests, furnaces, beds, chat, signs, books, totems, keep_inventory, fishing, maps, saving and reopening) gives the same results on the server thread as in the frame. `--in-frame`, `--no-server-thread` or HORIZON_SERVER_THREAD=0 runs the world in the frame; `--server-thread` still works. LAN guests, dedicated servers and the command harness are unchanged. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game.rs | 14 ++++++-------- crates/horizon-client/src/game/integrated.rs | 10 ++++------ docs/launcher-commands.md | 4 ++-- docs/server-levels.md | 7 +++---- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 0a077aa75..b0fa00584 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -284,11 +284,9 @@ struct Options { benchmark: Option, /// `--dev-mod PATH` (repeatable): mods always on and reloaded when rebuilt. dev_mods: Vec, - /// `--server-thread` or `HORIZON_SERVER_THREAD=1`: single player runs on an - /// integrated server thread (game/integrated.rs), as vanilla's does. Off by - /// default again until a server's players reach parity with the in-frame - /// world (signs, books, totems, keep_inventory...); `--no-server-thread` - /// keeps it off. + /// Single player runs on an integrated server thread (game/integrated.rs), + /// as vanilla's does: the default. `--in-frame` (or `--no-server-thread`, + /// or `HORIZON_SERVER_THREAD=0`) runs the world in the frame instead. server_thread: bool, /// Set on the integrated server's own options: it draws nothing, so it skips meshing. integrated: bool, @@ -346,7 +344,7 @@ impl Options { dev_mods: Vec::new(), // The command harness (HORIZON_COMMAND_SCRIPT) drives the world // itself, without the event loop: it stays in the frame. - server_thread: std::env::var("HORIZON_SERVER_THREAD").is_ok_and(|v| v == "1") + server_thread: std::env::var("HORIZON_SERVER_THREAD").map_or(true, |v| v != "0") && std::env::var_os("HORIZON_COMMAND_SCRIPT").is_none(), integrated: false, }; @@ -356,7 +354,7 @@ impl Options { match arg.as_str() { "--help" | "-h" => { println!( - "Horizon — Minecraft Java Edition {} in Rust\n\n --resources PATH Prepared resources (horizon-prepare)\n --render-distance N Chunks, 2..64 (default 12)\n --world NAME World folder under saves/ (default \"New World\")\n --seed N World seed for new worlds (default 0)\n --width N, --height N Window size (default 1280 x 720)\n --creative Creative mode (default survival)\n --test-terrain Simple test terrain instead of vanilla generation\n --frames N Exit after N frames (testing)\n --world-frames N Exit after N frames drawn in the world (testing)\n --smoke-report PATH Write a JSON report on exit\n --benchmark SCENARIO Run a benchmark (standard, village, forest, ocean, mountain), write its report to benchmarks/ and quit\n --control Accept horizon-ctl commands on a local socket\n --control-socket PATH Control socket path (default $XDG_RUNTIME_DIR/horizon-control.sock)\n --server HOST[:PORT] Join a multiplayer server (offline mode) at start\n --name NAME Player name for multiplayer (default: generated once, kept in horizon-player.txt)\n --session-file PATH Signed-in account from the launcher (read once, then deleted)\n --dev-mod PATH A Horizon mod (.hmod or folder) to develop: always on, reloaded when rebuilt\n --server-thread Run single player's world on its server thread (not at parity yet)\n\nControls: mouse look, WASD move, Space jump, Left Shift sneak, Left Ctrl sprint,\nleft click break, right click place/use, 1-9/scroll hotbar, E inventory,\nQ drop, F3 debug, Esc pause.", + "Horizon — Minecraft Java Edition {} in Rust\n\n --resources PATH Prepared resources (horizon-prepare)\n --render-distance N Chunks, 2..64 (default 12)\n --world NAME World folder under saves/ (default \"New World\")\n --seed N World seed for new worlds (default 0)\n --width N, --height N Window size (default 1280 x 720)\n --creative Creative mode (default survival)\n --test-terrain Simple test terrain instead of vanilla generation\n --frames N Exit after N frames (testing)\n --world-frames N Exit after N frames drawn in the world (testing)\n --smoke-report PATH Write a JSON report on exit\n --benchmark SCENARIO Run a benchmark (standard, village, forest, ocean, mountain), write its report to benchmarks/ and quit\n --control Accept horizon-ctl commands on a local socket\n --control-socket PATH Control socket path (default $XDG_RUNTIME_DIR/horizon-control.sock)\n --server HOST[:PORT] Join a multiplayer server (offline mode) at start\n --name NAME Player name for multiplayer (default: generated once, kept in horizon-player.txt)\n --session-file PATH Signed-in account from the launcher (read once, then deleted)\n --dev-mod PATH A Horizon mod (.hmod or folder) to develop: always on, reloaded when rebuilt\n --in-frame Run single player's world in the frame, not on its server thread\n\nControls: mouse look, WASD move, Space jump, Left Shift sneak, Left Ctrl sprint,\nleft click break, right click place/use, 1-9/scroll hotbar, E inventory,\nQ drop, F3 debug, Esc pause.", horizon_core::VANILLA_VERSION ); return Ok(None); @@ -371,7 +369,7 @@ impl Options { "--offscreen" => o.offscreen = true, "--control" => o.control = Some(horizon_client::control::default_path()), "--server-thread" => o.server_thread = true, - "--no-server-thread" => o.server_thread = false, + "--in-frame" | "--no-server-thread" => o.server_thread = false, _ => { let value = args .next() diff --git a/crates/horizon-client/src/game/integrated.rs b/crates/horizon-client/src/game/integrated.rs index 49266a855..042d8113a 100644 --- a/crates/horizon-client/src/game/integrated.rs +++ b/crates/horizon-client/src/game/integrated.rs @@ -6,12 +6,10 @@ //! the world's options) with [`Integrated::call`], as vanilla's client calls //! into its `IntegratedServer`. //! -//! Opt-in again (`--server-thread` or `HORIZON_SERVER_THREAD=1`) until a -//! server's players reach parity with the in-frame world: on the server -//! thread, signs open no editor, books don't open, a totem doesn't save its -//! holder and death keeps the inventory (#1380, #1366, #1292, #1284 and the -//! other `[server-thread]` issues). LAN guests and dedicated servers use the -//! same code either way. +//! On by default. `--in-frame` (or `--no-server-thread`, or +//! `HORIZON_SERVER_THREAD=0`) runs the world in the frame instead, the +//! escape hatch. LAN guests and dedicated servers use the same code either +//! way. use super::{ Game, Options, PackResources, Resources, UiResources, lan::{LanSettings, Owner}, diff --git a/docs/launcher-commands.md b/docs/launcher-commands.md index 9e09cd00b..dfe768b0e 100644 --- a/docs/launcher-commands.md +++ b/docs/launcher-commands.md @@ -53,7 +53,7 @@ Start the client. - `--world`: Open or create this world (a folder under saves) at once - `--creative`: Creative mode for a new world - `--join`: Join a friend's world with its invite code -- `--arg`: An extra argument for the game, passed through as-is (repeatable), for example --server-thread +- `--arg`: An extra argument for the game, passed through as-is (repeatable), for example --in-frame MCP: `play`, then the `game_*` tools. @@ -143,7 +143,7 @@ MCP: `settings`. ## `horizon-launcher game-args` -Show or set the extra arguments the game starts with (for example --server-thread); quotes group a word with spaces in it. +Show or set the extra arguments the game starts with (for example --in-frame); quotes group a word with spaces in it. horizon-launcher game-args [ARGS] diff --git a/docs/server-levels.md b/docs/server-levels.md index cc21a52ab..df45efc1f 100644 --- a/docs/server-levels.md +++ b/docs/server-levels.md @@ -26,10 +26,9 @@ the other dimensions' levels as `Parked` values and swaps one into place (`enter The packets of a guest are read in its own level's pass (`Hub::tick_level`), so its actions and commands run with its level in place. -The window's own game (single player's default, `--no-server-thread`, `HORIZON_SERVER_THREAD=0`, and the -command harness) keeps one level, which follows its player (`enter_dimension`). LAN guests of a world run -that way stay in the host's dimension. It is the default again only until the server thread reaches parity -(`--server-thread` or `HORIZON_SERVER_THREAD=1` opts in), so it gets no multi-level work. +The window's own game (`--in-frame`, `--no-server-thread`, `HORIZON_SERVER_THREAD=0`, and the command +harness) keeps one level, which follows its player (`enter_dimension`). LAN guests of a world run that way +stay in the host's dimension. That mode is the escape hatch, so it gets no multi-level work. ## One code path for both