From 560aa61e91ad10a3f96c4648d120b683772ad7d3 Mon Sep 17 00:00:00 2001 From: iLostName <55976057+iLostName@users.noreply.github.com> Date: Tue, 27 Oct 2026 14:05:45 +0100 Subject: [PATCH 01/39] server packs: the download prompt keeps the pointer and stops the walking behind it --- crates/horizon-client/src/game.rs | 6 ++++-- crates/horizon-client/src/game/server_packs.rs | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 0719878eb..5b87d0ced 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -5152,8 +5152,10 @@ impl Game<'_> { if self.lan_acting.is_some() { return; } - // MouseHandler.grabMouse never captures an inactive window. - if capture && !self.focused { + // MouseHandler.grabMouse never captures an inactive window, and vanilla + // grabs only on `setScreen(null)`: the pack prompt and server dialogs + // are screens over the world that keep the pointer. + if capture && (!self.focused || self.server_packs.prompt.is_some() || self.dialog_open()) { return; } // The container screen's press state belongs to the screen: a screen diff --git a/crates/horizon-client/src/game/server_packs.rs b/crates/horizon-client/src/game/server_packs.rs index 58d25de0e..92bca689b 100644 --- a/crates/horizon-client/src/game/server_packs.rs +++ b/crates/horizon-client/src/game/server_packs.rs @@ -244,6 +244,8 @@ impl Game<'_> { open.requests.push((p.id, p.url, p.hash)); open.required = p.required; open.prompt = text; + // Gui.setScreen: KeyMapping.releaseAll, so no walking behind the prompt. + self.keys.clear(); self.capture(false); } /// `handleResourcePackPop`: one pack, or all of them. From 86474679dbbcae9edae5a4d48d9c8f94cdc7cb15 Mon Sep 17 00:00:00 2001 From: iLostName <55976057+iLostName@users.noreply.github.com> Date: Tue, 27 Oct 2026 14:26:13 +0100 Subject: [PATCH 02/39] server packs: the prompt takes the open screen's place, as PackConfirmScreen does --- crates/horizon-client/src/game.rs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 5b87d0ced..a5bc46929 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -5602,7 +5602,14 @@ impl Game<'_> { // Screen.extractBlurredBackground blurs the world and HUD, while the // screen's background, widgets, toasts and debug overlay stay sharp. batch.blur_at = batch.vertices.len() as u32; - match self.screen { + // PackConfirmScreen takes the open screen's place (it comes back once + // the prompt is answered): the screen under the prompt isn't drawn. + let screen = if self.server_packs.prompt.is_some() { + Screen::Playing + } else { + self.screen + }; + match screen { Screen::Paused if self.pause_menu => self.draw_pause_menu(&mut batch), // PauseScreen(false): only its title, at the top. Screen::Paused => { @@ -5641,9 +5648,11 @@ impl Game<'_> { self.draw_saving_indicator(&mut batch); self.draw_toasts(&mut batch); self.draw_pack_toasts(&mut batch); - self.remote_hud(&mut batch); - self.draw_sign_editor(&mut batch); - self.draw_book(&mut batch); + if self.server_packs.prompt.is_none() { + self.remote_hud(&mut batch); + self.draw_sign_editor(&mut batch); + self.draw_book(&mut batch); + } batch } fn creative_inventory_open(&self) -> bool { From c0bf77f3c3048928685b60ed376fd913f327679e Mon Sep 17 00:00:00 2001 From: sirrayi <191805916+sirrayi@users.noreply.github.com> Date: Tue, 27 Oct 2026 13:44:30 +0000 Subject: [PATCH 03/39] Telemetry server: count IPv6 clients by /64 in the rate limits An IPv6 client rotating addresses inside its /64 got a fresh bucket for every address, so the per-address limits on batches, live pings, hub votes, reports and suggestions didn't hold, and the bucket maps grew until the daily upkeep. Key them by /64, as horizon-relay already does. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- crates/horizon-telemetry-server/src/lib.rs | 46 +++++++++++++++++-- .../horizon-telemetry-server/tests/server.rs | 15 ++++++ 2 files changed, 57 insertions(+), 4 deletions(-) diff --git a/crates/horizon-telemetry-server/src/lib.rs b/crates/horizon-telemetry-server/src/lib.rs index 3ab923969..be0426411 100644 --- a/crates/horizon-telemetry-server/src/lib.rs +++ b/crates/horizon-telemetry-server/src/lib.rs @@ -265,7 +265,7 @@ impl App { /// The address requests are counted under, for the rate limits only: kept in memory, never /// stored or logged. Behind a proxy (Railway) the TCP peer is the proxy, so it is the proxy's /// `X-Real-IP`, else the last `X-Forwarded-For` entry: the one the proxy added, which a client - /// can't choose (the first one it can). + /// can't choose (the first one it can). An IPv6 client counts by its /64. fn client(&self, headers: &HeaderMap, peer: Option) -> IpAddr { let header = |name: &str| headers.get(name)?.to_str().ok(); let forwarded = self @@ -284,9 +284,11 @@ impl App { }) }) .flatten(); - forwarded - .or(peer.map(|p| p.ip())) - .unwrap_or(IpAddr::from([0, 0, 0, 0])) + rate_key( + forwarded + .or(peer.map(|p| p.ip())) + .unwrap_or(IpAddr::from([0, 0, 0, 0])), + ) } /// The day an install's newest row came in, if it has any left. @@ -339,6 +341,22 @@ fn take(buckets: &Mutex>, per_hour: f64 true } +/// The address a client's requests count under: IPv4 (an IPv4-mapped IPv6 address as IPv4 too), +/// or an IPv6 address's /64, which one home or host holds whole, so addresses rotated inside it +/// don't get fresh buckets. +fn rate_key(ip: IpAddr) -> IpAddr { + match ip { + IpAddr::V6(v6) => match v6.to_ipv4_mapped() { + Some(v4) => IpAddr::V4(v4), + None => { + let s = v6.segments(); + IpAddr::V6(std::net::Ipv6Addr::new(s[0], s[1], s[2], s[3], 0, 0, 0, 0)) + } + }, + v4 => v4, + } +} + fn peer(req: &Request) -> Option { req.extensions() .get::>() @@ -580,3 +598,23 @@ pub fn router(app: Arc) -> Router { .route("/healthz", get(|| async { "ok" })) .with_state(app) } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn ipv6_rates_count_by_64() { + let ip = |s: &str| s.parse::().unwrap(); + // Rotated inside a /64: one key. Another /64: another key. + assert_eq!(rate_key(ip("2001:db8::1")), rate_key(ip("2001:db8::99"))); + assert_ne!(rate_key(ip("2001:db8::1")), rate_key(ip("2001:db8:1::1"))); + // IPv4-mapped counts as the IPv4 it is. + assert_eq!( + rate_key(ip("::ffff:203.0.113.7")), + IpAddr::from([203, 0, 113, 7]) + ); + // Plain IPv4 unchanged. + assert_eq!(rate_key(ip("203.0.113.8")), IpAddr::from([203, 0, 113, 8])); + } +} diff --git a/crates/horizon-telemetry-server/tests/server.rs b/crates/horizon-telemetry-server/tests/server.rs index 575e4b1a1..764306d58 100644 --- a/crates/horizon-telemetry-server/tests/server.rs +++ b/crates/horizon-telemetry-server/tests/server.rs @@ -261,6 +261,21 @@ async fn an_address_is_rate_limited() { s.send(from("203.0.113.9, 198.51.100.7", None)).await.0, StatusCode::NO_CONTENT ); + // Two IPv6 addresses of one /64 share a bucket; another /64 doesn't. + for forwarded in ["2001:db8::1", "2001:db8::2", "2001:db8::3"] { + assert_eq!( + s.send(from(forwarded, None)).await.0, + StatusCode::NO_CONTENT + ); + } + assert_eq!( + s.send(from("2001:db8::ffff:ffff", None)).await.0, + StatusCode::TOO_MANY_REQUESTS + ); + assert_eq!( + s.send(from("2001:db8:1::1", None)).await.0, + StatusCode::NO_CONTENT + ); } #[tokio::test] From 5f5a43fd54d993702dc2e5076cd855e0022c22b6 Mon Sep 17 00:00:00 2001 From: iLostName <55976057+iLostName@users.noreply.github.com> Date: Tue, 27 Oct 2026 14:47:50 +0100 Subject: [PATCH 04/39] focus loss doesn't open the pause menu over the pack prompt or a server dialog --- crates/horizon-client/src/game.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index a5bc46929..2f670df64 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -12026,13 +12026,16 @@ impl ApplicationHandler for Game<'_> { self.left = false; self.right = false; self.capture(false); - // Screens (books, signs) stay open instead of pausing. + // Gui.setPauseScreen: an open screen (books, signs, the + // pack prompt, a server dialog) stays instead of pausing. if self.screen == Screen::Playing && self.player.is_some() && !self.options.no_pause && self.settings.file.bool("pauseOnLostFocus") && self.book.is_none() && self.sign_edit.is_none() + && self.server_packs.prompt.is_none() + && !self.dialog_open() { self.screen = Screen::Paused; } From de89e758ccdaa4a6721feb7ffeb103fcc282272c Mon Sep 17 00:00:00 2001 From: iLostName <55976057+iLostName@users.noreply.github.com> Date: Tue, 27 Oct 2026 14:57:27 +0100 Subject: [PATCH 05/39] remote: a server's client doesn't load the loot tables on its first tick --- crates/horizon-client/src/game.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 0719878eb..55ec19de6 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -2700,7 +2700,13 @@ impl Game<'_> { behaviours: self.res.behaviours(), items: self.res.items(), recipes: self.res.recipes(), - loot: horizon_client::structure_blocks::loot_data(&self.options.resources), + // A client rolls no loot (LootTable.getRandomItems needs a + // ServerLevel): it doesn't load the tables on its game thread. + loot: if self.remote.is_some() { + None + } else { + horizon_client::structure_blocks::loot_data(&self.options.resources) + }, registry: self.pack.assets.registry, rules, difficulty: i32::from(self.ui.difficulty), From 3c7942d2bd53e2ae6508b851b18b0025c73d18a7 Mon Sep 17 00:00:00 2001 From: levzzz <86072227+levzzz5154@users.noreply.github.com> Date: Tue, 27 Oct 2026 19:14:31 +0500 Subject: [PATCH 06/39] Test that a hit rolls the armadillo up into a ball An armadillo hit by a living thing curls up: Armadillo.actuallyHurt rolls it up, Armadillo.rollUp plays entity.armadillo.roll and switches the state to ROLLING, and ArmadilloState.shouldHideInShell then shows the shell instead of the armadillo. The roll itself is on main (#2535), but nothing held it in place, so this test pins it: a hit rolls the armadillo up, the roll plays its sound and the model shows the shell (#2759). Co-Authored-By: minimax-m3.1-flash (Claude Code) --- crates/horizon-client/src/mobs/armadillo.rs | 40 +++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/crates/horizon-client/src/mobs/armadillo.rs b/crates/horizon-client/src/mobs/armadillo.rs index 8837d8cf8..1deb7f11b 100644 --- a/crates/horizon-client/src/mobs/armadillo.rs +++ b/crates/horizon-client/src/mobs/armadillo.rs @@ -405,3 +405,43 @@ impl Goal for Rolled { scared(m) } } + +#[cfg(test)] +mod tests { + use super::*; + use crate::mobs::sensor_scan_tests::kind; + use std::sync::Arc; + + /// An armadillo on the ground. + fn armadillo() -> Mob { + let mut kind = kind(); + let k = Arc::make_mut(&mut kind); + k.id = "minecraft:armadillo".into(); + k.species = Species::Armadillo; + let mut m = Mob::new(1, kind, Vec3::ZERO, 0.0); + m.on_ground = true; + m + } + + #[test] + fn a_hit_rolls_it_up_into_a_ball() { + // Armadillo.actuallyHurt: a hit by a living thing curls it up and + // keeps the danger in mind for 80 ticks, so the model shows the + // shell instead of the armadillo (#2759). + let mut m = armadillo(); + after_hurt(&mut m, &Damage::player([0.0, 0.0, 0.0])); + assert_eq!(state(&m), ROLLING); + // Armadillo.rollUp: the roll sound. + assert!( + m.outbox + .iter() + .any(|e| matches!(e, MobEvent::Sound(s, ..) if *s == "entity.armadillo.roll")), + "the roll plays its sound" + ); + // ArmadilloState.shouldHideInShell: the shell shows after five ticks. + for _ in 0..6 { + tick(&mut m); + } + assert!(hiding_in_shell(&m), "the model shows the shell"); + } +} From b98633b677522d467effd4a67192c7b2721cd6fa Mon Sep 17 00:00:00 2001 From: socksprox Date: Tue, 27 Oct 2026 15:14:34 +0100 Subject: [PATCH 07/39] Play the player's own bites while eating on a remote server On a remote (non-Horizon) server the use-item tick spawned the crumb particles but never played the consumable's eat sound, so only the burp at the end was heard. Call emit_consume for the periodic emit, as tick_used_item does on the player's own server, so the bites sound too. Fixes #2747. Co-Authored-By: Devin (SWE-2 High) <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- crates/horizon-client/src/game/remote.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index b35f164a9..d1b457f5b 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -4811,7 +4811,9 @@ impl Game<'_> { // only on the server) until the server's USE_ITEM_COMPLETE. let remaining = consumable.ticks() - ticks as i32; if consumable.particles && consumable.should_emit(remaining) { - self.eat_particles(&stack, 5); + // `emit_consume` spawns the bites and plays the eat sound, as + // `tick_used_item` does on the player's own server. + self.emit_consume(&consumable, &stack, 5); } self.using = Some((slot, ticks + 1)); } From c3fb1656e66f55ebbbf53417577436c2e94b0c2f Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Tue, 27 Oct 2026 17:19:10 +0300 Subject: [PATCH 08/39] =?UTF-8?q?Fonts:=20Pixelify=20Sans=20gets=20the=20C?= =?UTF-8?q?yrillic=20=D0=9E=20and=20=D0=9F=20it=20was=20missing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream maps U+043E (о) and U+043F (п) and not their capitals, so a Russian heading drew О and П from the fallback font: they came out smooth and taller than the pixel letters around them (screenshots in the PR). Both come from the font's own drawing. О is the Latin O's glyph under the Cyrillic codepoint, which is the same round shape this font gives о: its lowercase is the O with the top shifted down. П is that weight's lowercase п with everything above the baseline lifted to the cap height the font uses there (Н's top), 175 units in SemiBold, 177 in Medium and 171 in Bold, since each weight draws its own metrics. Both now sit on the bbox of the O and Н of their own weight. О keeps the O's hinting instructions; П is a new outline with none, which a pixel design does not need at the sizes the launcher draws it. GDEF, GPOS and GSUB are byte-identical to the files they replace. Co-Authored-By: Hermes Agent (Nous Research) --- .../horizon-theme/fonts/PixelifySans-Bold.ttf | Bin 95056 -> 94644 bytes .../fonts/PixelifySans-Medium.ttf | Bin 94248 -> 93816 bytes .../fonts/PixelifySans-SemiBold.ttf | Bin 97492 -> 97072 bytes docs/design-system.md | 4 +++- 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/horizon-theme/fonts/PixelifySans-Bold.ttf b/crates/horizon-theme/fonts/PixelifySans-Bold.ttf index 5f8040b71be14d283010c4a646eac856a03988bf..0b1ee555a71dcb17e5d39bbbcc1a982dd4cefde8 100644 GIT binary patch delta 3315 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 diff --git a/crates/horizon-theme/fonts/PixelifySans-Medium.ttf b/crates/horizon-theme/fonts/PixelifySans-Medium.ttf index 5bf69961d9a3e4f83a3440319ec37cf7c49e30a7..68cec5d965545430c6174ca07d73db1f372cdd0d 100644 GIT binary patch delta 3436 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 KV~`r|Qv5&Mp4;dE diff --git a/crates/horizon-theme/fonts/PixelifySans-SemiBold.ttf b/crates/horizon-theme/fonts/PixelifySans-SemiBold.ttf index 45cd4e2afa3edc6fe1c2500f4e763bdbb0ec65a1..2a4c5c1dc7a1006c3cb043ac6648eadf3f1516ca 100644 GIT binary patch delta 3395 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 delta 3777 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 L((rvc&ItZLYU|EW diff --git a/docs/design-system.md b/docs/design-system.md index aec060457..da6869306 100644 --- a/docs/design-system.md +++ b/docs/design-system.md @@ -158,7 +158,9 @@ of the main action. The game's menus keep `LIGHT` and `DARK`. - **Pixel type for what names and what you act on.** Headings, navigation, buttons and the wordmark use Pixelify Sans (OFL; Medium, SemiBold, Bold); paragraphs and numbers stay in Geist - and Geist Mono so long text reads easily. + and Geist Mono so long text reads easily. The bundled copies add the two uppercase Cyrillic + letters upstream leaves out, О and П: the Latin O's glyph and the lowercase п lifted to that + weight's cap height, so a Russian heading stays in the pixel face. - **Blocks, not rounded cards.** Every surface is square: a 2 px dark outline, a 2 px light bevel along the top and a darker lip along the bottom. The main action is the violet face with its own bevel and a 4 px lip; it sinks a pixel when pressed. Code and fields are sunk wells. From 91d401aa8af18c1e8225e0d5b3c3fa3945cac010 Mon Sep 17 00:00:00 2001 From: masa-masa-0314 <348336850+masa-masa-0314@users.noreply.github.com> Date: Tue, 27 Oct 2026 23:09:16 +0800 Subject: [PATCH 09/39] Subtitles: a server's client ticks the overlay too Single player joins its integrated server as a client, so `Minecraft.tick` takes the `tick_remote` path and never reaches `tick_mobs`, where the subtitle overlay's tick had its only call. The overlay therefore never started listening to the sound engine: no sound notified it, and the closed captions stayed empty with "Show Subtitles" on or off. Call `tick_subtitles` from `tick_remote_level` beside `tick_hud`, as the local path does. Co-Authored-By: ZCode (Z.ai) --- crates/horizon-client/src/game/remote.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 3e79f1437..44fde5dec 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3489,6 +3489,9 @@ impl Game<'_> { self.sleep_timer = super::tick_sleep_timer(self.sleep_timer, self.sleeping.is_some()); // Gui.tick: the titles, the action bar and the held item's name. self.tick_hud(); + // The subtitle overlay's share of the tick: the local path has it in + // `tick_mobs`, which a server's client never reaches. + self.tick_subtitles(); let entity_collisions = self.player_entity_collisions(); let pushed = self.remote_pushes(); let Some(player) = self.player.as_mut() else { From de286f236f9ce7feef916fa54f2abf058f506a7b Mon Sep 17 00:00:00 2001 From: leifiyoo Date: Tue, 27 Oct 2026 15:52:19 +0100 Subject: [PATCH 10/39] Count down Riptide's spin on a server's copy of a player The host runs a guest's trident release on its copy of the guest, which sets the spin for 20 ticks. The copy never ran the client's movement tick, so the count never went down: the copy stayed in the spin pose (eye 0.4), and every arrow or projectile the guest shot was spawned from the leg until something else reset it. LivingEntity.aiStep counts autoSpinAttackTicks down on the server too. Count it down in the guest's server tick, before updatePlayerPose. Co-Authored-By: Claude Haiku 5.5 --- crates/horizon-client/src/game/lan_actions.rs | 3 ++ crates/horizon-client/src/motion.rs | 40 +++++++++++++++++++ crates/horizon-client/src/pose.rs | 12 ++++++ 3 files changed, 55 insertions(+) diff --git a/crates/horizon-client/src/game/lan_actions.rs b/crates/horizon-client/src/game/lan_actions.rs index 738399811..56dbf6bf1 100644 --- a/crates/horizon-client/src/game/lan_actions.rs +++ b/crates/horizon-client/src/game/lan_actions.rs @@ -2330,6 +2330,9 @@ impl Game<'_> { let _ = w.tick_environment_damage(); let _ = w.apply_fire_contact(); let _ = w.server_hazards_tick(in_wall); + // LivingEntity.aiStep: a Riptide spin counts down on the server's + // copy too, or it would stay in the spin pose (eye 0.4) for good. + w.player.count_down_server_spin(); // Player.tick ends with updatePlayerPose: a swimmer, or a player // crawling under a block, takes the short box its moves are checked with. let _ = w.update_player_pose(); diff --git a/crates/horizon-client/src/motion.rs b/crates/horizon-client/src/motion.rs index 06e513c00..8986aa01e 100644 --- a/crates/horizon-client/src/motion.rs +++ b/crates/horizon-client/src/motion.rs @@ -3446,6 +3446,46 @@ mod tests { } } #[test] + fn a_server_copy_of_a_riptide_spin_counts_down_and_stands_again() { + let root = Path::new(env!("CARGO_MANIFEST_DIR")) + .join("../../.local/horizon-client") + .join(horizon_core::VANILLA_VERSION); + if !root.join("movement-properties.nbt").exists() { + return; + } + let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); + let binding = crate::collisions::load(&root, assets.registry).unwrap(); + let resources = MotionResources::load(&root, &assets).unwrap(); + let mut scene = World::test_scene(&assets, &render, 2).unwrap(); + let mut player = PlayerMotion::new(&resources, Vec3::new(20.5, 10.0, 20.5)).unwrap(); + player.auto_spin_attack_ticks = 2; + player.auto_spin_attack_dmg = 8.0; + let mut w = MotionWorld { + entities: &[], + player: &mut player, + scene: &mut scene, + assets: &assets, + collision_binding: &binding, + resources: &resources, + }; + w.update_player_pose().unwrap(); + assert_eq!(w.player.pose, crate::pose::Pose::SpinAttack); + w.player.count_down_server_spin(); + w.update_player_pose().unwrap(); + assert_eq!(w.player.pose, crate::pose::Pose::SpinAttack); + assert_eq!(w.player.auto_spin_attack_dmg, 8.0); + w.player.count_down_server_spin(); + assert_eq!(w.player.auto_spin_attack_ticks, 0); + assert_eq!(w.player.auto_spin_attack_dmg, 0.0); + w.update_player_pose().unwrap(); + assert_eq!(w.player.pose, crate::pose::Pose::Standing); + assert_eq!(w.player.dimensions.eye_height, 1.62); + // Nothing to count once the spin is over. + w.player.count_down_server_spin(); + assert_eq!(w.player.auto_spin_attack_ticks, 0); + } + #[test] fn a_riptide_spin_lies_flat_and_ends_on_the_first_entity_it_touches() { let root = Path::new(env!("CARGO_MANIFEST_DIR")) .join("../../.local/horizon-client") diff --git a/crates/horizon-client/src/pose.rs b/crates/horizon-client/src/pose.rs index 2a01579f3..1bad4898d 100644 --- a/crates/horizon-client/src/pose.rs +++ b/crates/horizon-client/src/pose.rs @@ -78,6 +78,18 @@ impl Dimensions { } } impl PlayerMotion { + /// `LivingEntity.aiStep` counting down `autoSpinAttackTicks` for a + /// server's copy of a player, which runs no client tick: the spin ends + /// after its ticks and its damage goes with it, so the pose (and the eye + /// a bow or a trident is shot from) comes back to standing. + pub fn count_down_server_spin(&mut self) { + if self.auto_spin_attack_ticks > 0 { + self.auto_spin_attack_ticks -= 1; + if self.auto_spin_attack_ticks <= 0 { + self.auto_spin_attack_dmg = 0.0; + } + } + } pub fn dimensions_for_pose(&mut self, pose: Pose) -> Result { Ok(pose.dimensions(self.attribute("minecraft:scale")? as f32)) } From 62bb83857c29df514d17d0506f0eeb45c535091d Mon Sep 17 00:00:00 2001 From: sirrayi <191805916+sirrayi@users.noreply.github.com> Date: Tue, 27 Oct 2026 16:10:51 +0000 Subject: [PATCH 11/39] Update rustls-webpki to 0.103.16 and webpki-roots to 1.0.10 (RUSTSEC-2026-0382, -0381) cargo deny check advisories flags rustls-webpki 0.103.15 (distrusted emSign intermediates may be accepted, RUSTSEC-2026-0382) and webpki-roots 1.0.9 (bundles the distrusted emSign ECC Root CA - G3, RUSTSEC-2026-0381). Both are patch releases; every HTTPS request of the game, the launcher, horizon-server and the telemetry server goes through them (ureq -> rustls). horizon-mod-registry's lock already has the fixed versions. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- Cargo.lock | 10 +++++----- crates/horizon-telemetry-server/Cargo.lock | 10 +++++----- launcher/Cargo.lock | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bbbac4b2c..58bc79755 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3148,9 +3148,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.15" +version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ "ring", "rustls-pki-types", @@ -4322,14 +4322,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.9", + "webpki-roots 1.0.10", ] [[package]] name = "webpki-roots" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a" +checksum = "1c1c8e20c8a38fc7d65abfe74eb7280e4aa667e8eec8bc84996d2874810748d9" dependencies = [ "rustls-pki-types", ] diff --git a/crates/horizon-telemetry-server/Cargo.lock b/crates/horizon-telemetry-server/Cargo.lock index 9b5fc960d..cec980da1 100644 --- a/crates/horizon-telemetry-server/Cargo.lock +++ b/crates/horizon-telemetry-server/Cargo.lock @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.15" +version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ "ring", "rustls-pki-types", @@ -950,14 +950,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.9", + "webpki-roots 1.0.10", ] [[package]] name = "webpki-roots" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a" +checksum = "1c1c8e20c8a38fc7d65abfe74eb7280e4aa667e8eec8bc84996d2874810748d9" dependencies = [ "rustls-pki-types", ] diff --git a/launcher/Cargo.lock b/launcher/Cargo.lock index dd9313df6..0e5c91ed4 100644 --- a/launcher/Cargo.lock +++ b/launcher/Cargo.lock @@ -4958,9 +4958,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.15" +version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ "ring", "rustls-pki-types", @@ -6743,14 +6743,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.9", + "webpki-roots 1.0.10", ] [[package]] name = "webpki-roots" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a" +checksum = "1c1c8e20c8a38fc7d65abfe74eb7280e4aa667e8eec8bc84996d2874810748d9" dependencies = [ "rustls-pki-types", ] From e6c1a91a6549d6fb3128f95ae5b7c88dba4a4e6d Mon Sep 17 00:00:00 2001 From: masa-masa-0314 <348336850+masa-masa-0314@users.noreply.github.com> Date: Wed, 28 Oct 2026 00:53:07 +0800 Subject: [PATCH 12/39] creative: rebuild the search state when the screen opens CreativeModeInventoryScreen is a fresh screen per open (init() makes a new search box and a zeroed scrollbar; only selectedTab is static), but Horizon keeps one Creative for the game's lifetime, so the last search stayed in the box after closing the inventory. Clear the box, refocus it on the search tab and reset the scrollbar at both open paths (local and remote). Fixes #2873. Co-Authored-By: ZCode --- crates/horizon-client/src/creative.rs | 13 +++++++++++++ crates/horizon-client/src/game.rs | 9 +++++---- crates/horizon-client/src/game/remote.rs | 9 +++++---- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/crates/horizon-client/src/creative.rs b/crates/horizon-client/src/creative.rs index 1a227db65..36cc34362 100644 --- a/crates/horizon-client/src/creative.rs +++ b/crates/horizon-client/src/creative.rs @@ -355,6 +355,19 @@ impl Creative { pub fn search_items(&self) -> &[ItemStack] { &self.search_items } + /// Opening the screen: vanilla rebuilds CreativeModeInventoryScreen, whose + /// init() makes a fresh search box and a zeroed scrollbar; only the tab + /// persists (its static selectedTab). selectTab on the reopened screen + /// takes the oldTab != tab branch, so it empties and refocuses the box. + pub fn reopen(&mut self) { + self.search.set_value(""); + self.release(); + self.scroll = 0.0; + self.search.focused = self.tab().search; + if self.search.focused { + self.search.reset_blink(); + } + } /// Indices into `search_items` that CreativeModeInventoryScreen.refreshSearchResults /// shows for `term`: the whole tab when empty, the tag tree after `#`, else /// the name tree, both over vanilla's suffix arrays (substring matches, diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index aa1b03669..7876fb743 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -11784,11 +11784,12 @@ impl Game<'_> { Screen::Playing => { // key.inventory while riding a tamed mount opens its inventory. if !self.open_ridden_mount_menu() { - self.screen = if self.creative { - Screen::Creative + if self.creative { + self.screen = Screen::Creative; + self.creative_screen.reopen(); } else { - Screen::Inventory - }; + self.screen = Screen::Inventory; + } self.capture(false); } } diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 3e79f1437..6c7e8fe08 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -5089,11 +5089,12 @@ impl Game<'_> { KeyCode::KeyE => { // The inventory opens without telling the server. self.recipe_ui.reset_screen(); - self.screen = if self.creative { - Screen::Creative + if self.creative { + self.screen = Screen::Creative; + self.creative_screen.reopen(); } else { - Screen::Inventory - }; + self.screen = Screen::Inventory; + } self.craft_size = 2; self.capture(false); Ok(true) From e36cd17dd1a8040ee8c020aebbbde46e3268997e Mon Sep 17 00:00:00 2001 From: socksprox Date: Tue, 27 Oct 2026 18:06:53 +0100 Subject: [PATCH 13/39] Books: page click events work, run_command ones included Two gaps left every link in a written book dead. view_pages only parsed compound page components, so the list form ComponentSerialization also takes (and servers behind ViaVersion send) fell back to plain text and lost its click events. And run_command was never parsed into a ClickEvent, so even a parsed page's command links did nothing. The book's click handler now follows Screen.defaultHandleClickEvent: open_url through the link flow, run_command sent unsigned (client mods first, as clickCommandAction), suggest_command into the chat box, copy_to_clipboard, with chat's own click match gaining run_command the same way. Co-Authored-By: Devin (SWE-2) <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- crates/horizon-client-core/src/component.rs | 1 + crates/horizon-client-core/src/text.rs | 5 +++++ crates/horizon-client/src/game/books.rs | 20 +++++++++++++++++--- crates/horizon-client/src/game/chat.rs | 15 +++++++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/crates/horizon-client-core/src/component.rs b/crates/horizon-client-core/src/component.rs index afb68fa98..0b2ca918a 100644 --- a/crates/horizon-client-core/src/component.rs +++ b/crates/horizon-client-core/src/component.rs @@ -182,6 +182,7 @@ fn object_style(o: &serde_json::Map) -> Style { }) }) .map(crate::text::ClickEvent::OpenUrl), + Some("run_command") => text("command").map(crate::text::ClickEvent::RunCommand), // ClickEvent.ChangePage.CODEC: ExtraCodecs.POSITIVE_INT. Some("change_page") => e .get("page") diff --git a/crates/horizon-client-core/src/text.rs b/crates/horizon-client-core/src/text.rs index 3a0bf301b..cf99a94be 100644 --- a/crates/horizon-client-core/src/text.rs +++ b/crates/horizon-client-core/src/text.rs @@ -46,6 +46,8 @@ pub enum ClickEvent { OpenUrl(String), /// `ClickEvent.ChangePage`: a book's page, counted from 1. ChangePage(i32), + /// `ClickEvent.RunCommand`: the command the click sends (`/` allowed). + RunCommand(String), SuggestCommand(String), CopyToClipboard(String), /// A local file to open with the system handler. @@ -535,6 +537,9 @@ fn style_json(style: &Style) -> Vec<(String, Value)> { let event = match click { ClickEvent::OpenUrl(url) => json!({ "action": "open_url", "url": url }), ClickEvent::ChangePage(page) => json!({ "action": "change_page", "page": page }), + ClickEvent::RunCommand(command) => { + json!({ "action": "run_command", "command": command }) + } ClickEvent::SuggestCommand(command) => { json!({ "action": "suggest_command", "command": command }) } diff --git a/crates/horizon-client/src/game/books.rs b/crates/horizon-client/src/game/books.rs index 07d65c5a4..4c1a03129 100644 --- a/crates/horizon-client/src/game/books.rs +++ b/crates/horizon-client/src/game/books.rs @@ -76,9 +76,11 @@ fn view_pages(data: Option<&StackData>) -> Vec { .iter() .enumerate() .map(|(i, page)| match tagged.then(|| &w.page_tags[i]) { - Some(tag @ horizon_world::nbt::Tag::Compound(_)) => { - horizon_client::entity_nbt::name_text(tag) - } + // A component object, or a component list (`ComponentSerialization` + // takes both; servers behind ViaVersion send the list form). + Some( + tag @ (horizon_world::nbt::Tag::Compound(_) | horizon_world::nbt::Tag::List(_)), + ) => horizon_client::entity_nbt::name_text(tag), _ => Text::literal(page), }) .collect() @@ -137,6 +139,18 @@ impl Game<'_> { } } ClickEvent::OpenUrl(url) => self.click_url(url), + ClickEvent::RunCommand(command) => self.click_command(&command), + ClickEvent::SuggestCommand(command) => { + // defaultHandleClickEvent: the chat screen takes it over. + if self.player.is_some() { + self.close_book(); + self.open_chat(&command); + } + } + ClickEvent::CopyToClipboard(value) => { + use horizon_client::clipboard::Clipboard; + self.clipboard.set(&value); + } _ => {} } } diff --git a/crates/horizon-client/src/game/chat.rs b/crates/horizon-client/src/game/chat.rs index 9fbc5cd88..f19410545 100644 --- a/crates/horizon-client/src/game/chat.rs +++ b/crates/horizon-client/src/game/chat.rs @@ -764,6 +764,7 @@ impl Game<'_> { super::packs::open_folder(std::path::Path::new(&path)); } Some(ClickEvent::OpenUrl(url)) => self.click_url(url), + Some(ClickEvent::RunCommand(command)) => self.click_command(&command), Some(ClickEvent::SuggestCommand(command)) => { if let Some(screen) = self.ui.chat_screen.as_mut() { screen.suggest_command(&m, &c, &command); @@ -773,6 +774,20 @@ impl Game<'_> { Some(ClickEvent::ChangePage(_)) | None => {} } } + /// `Screen.clickCommandAction`: a client mod's command first, then the + /// server (unsigned) or the local one runs it, without the chat history + /// a typed line would get. + pub(super) fn click_command(&mut self, command: &str) { + let command = command.strip_prefix('/').unwrap_or(command); + if command.is_empty() || self.mod_command(command) { + return; + } + if self.remote.is_some() { + self.send_chat(&format!("/{command}")); + } else if !self.local_server_mod_command(command) { + self.run_command(command); + } + } /// `Screen.clickUrlAction`: nothing with Web Links off, else the link /// opens, after the confirmation unless Prompt on Links is off. pub(super) fn click_url(&mut self, url: String) { From 7b40465f85ba3b91e8de8ef904e1faf617cf723b Mon Sep 17 00:00:00 2001 From: gemakfy Date: Tue, 27 Oct 2026 22:38:19 +0300 Subject: [PATCH 14/39] Fix creative inventory off-hand swap crash on Key F --- crates/horizon-client/src/creative.rs | 15 ++++++++++++--- crates/horizon-client/src/game.rs | 7 +++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/crates/horizon-client/src/creative.rs b/crates/horizon-client/src/creative.rs index 1a227db65..a6e0f0b93 100644 --- a/crates/horizon-client/src/creative.rs +++ b/crates/horizon-client/src/creative.rs @@ -575,6 +575,8 @@ pub enum DisplayClick { Nothing, /// SWAP: the hotbar slot gets a full stack of the item. Hotbar(usize, ItemStack), + /// SWAP with button 40 (Key F): the off-hand gets a full stack of the item. + Offhand(ItemStack), /// THROW: a copy of the item is dropped. Drop(ItemStack), } @@ -596,8 +598,11 @@ pub fn click_display( match input { Input::Swap => { return match shown { - Some(s) => DisplayClick::Hotbar(button as usize, copy(s, max(s))), - None => DisplayClick::Nothing, + Some(s) if button == 40 => DisplayClick::Offhand(copy(s, max(s))), + Some(s) if (0..9).contains(&button) => { + DisplayClick::Hotbar(button as usize, copy(s, max(s))) + } + Some(_) | None => DisplayClick::Nothing, }; } Input::Clone => { @@ -720,11 +725,15 @@ mod tests { display(Some(stack("ender_pearl", 9)), 1, Pickup).0, Some(stack("ender_pearl", 8)) ); - // Number keys fill a hotbar slot, Q drops copies, pick block clones. + // Number keys fill a hotbar slot, F fills off-hand, Q drops copies, pick block clones. assert_eq!( display(None, 3, Swap).1, DisplayClick::Hotbar(3, stack("stone", 64)) ); + assert_eq!( + display(None, 40, Swap).1, + DisplayClick::Offhand(stack("stone", 64)) + ); assert_eq!( display(None, 0, Throw).1, DisplayClick::Drop(stack("stone", 1)) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 05c8765e5..e8c29b61b 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -6552,9 +6552,12 @@ impl Game<'_> { let catalog = self.res.items(); let max = |s: &ItemStack| catalog.get(&s.item).map_or(64, |i| i.max_stack); match click_display(&mut self.carried, shown, max, button, input) { - DisplayClick::Hotbar(i, stack) => self.inventory[i] = Some(stack), + DisplayClick::Hotbar(i, stack) if i < self.inventory.len() => { + self.inventory[i] = Some(stack); + } + DisplayClick::Offhand(stack) => self.offhand = Some(stack), DisplayClick::Drop(stack) => self.player_drop(stack), - DisplayClick::Nothing => {} + _ => {} } } /// Several clicks on one menu instance (a quick craft drag is three). From 127434c46c90c93ce6dba87fda0e9797d2eb5a34 Mon Sep 17 00:00:00 2001 From: ElyTheCat Date: Tue, 27 Oct 2026 23:11:02 +0330 Subject: [PATCH 15/39] Options: add Java 26.3 mouse settings --- crates/horizon-client/src/game.rs | 11 +++-- crates/horizon-client/src/options_ui.rs | 63 ++++++++++++++++++++++--- crates/horizon-client/src/settings.rs | 9 +++- 3 files changed, 73 insertions(+), 10 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 8e591cf3b..cd744fc63 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -5694,17 +5694,22 @@ impl Game<'_> { fn apply_cursor_icon(&mut self) { use horizon_client::widgets::Cursor; let wanted = horizon_client::widgets::take_cursor(); - if wanted == self.cursor_icon { + let effective = if self.settings.allow_cursor_changes { + wanted + } else { + Cursor::Arrow + }; + if effective == self.cursor_icon { return; } if let Some(window) = &self.window { - window.set_cursor(match wanted { + window.set_cursor(match effective { Cursor::Arrow => winit::window::CursorIcon::Default, Cursor::PointingHand => winit::window::CursorIcon::Pointer, Cursor::NotAllowed => winit::window::CursorIcon::NotAllowed, }); } - self.cursor_icon = wanted; + self.cursor_icon = effective; } /// LevelLoadingScreen.onClose -> Gui.setScreen(null) -> grabMouse. fn capture_loaded_world(&mut self) { diff --git a/crates/horizon-client/src/options_ui.rs b/crates/horizon-client/src/options_ui.rs index fbcf8ba98..aebf62d04 100644 --- a/crates/horizon-client/src/options_ui.rs +++ b/crates/horizon-client/src/options_ui.rs @@ -73,6 +73,17 @@ pub(crate) const ACCESSIBILITY_OPTIONS: &[Opt] = &[ Opt::RotateWithMinecarts, Opt::HighContrastBlockOutlines, ]; + +/// `MouseSettingsScreen.options` in Java Edition 26.3, in vanilla order. +pub(crate) const MOUSE_OPTIONS: &[Opt] = &[ + Opt::Sensitivity, + Opt::WheelSensitivity, + Opt::DiscreteScroll, + Opt::InvertX, + Opt::InvertY, + Opt::AllowCursorChanges, +]; + impl Opt { /// Keep controls visible while their underlying systems are still missing. pub(crate) fn available(self) -> bool { @@ -129,8 +140,10 @@ impl Opt { Opt::SimulationDistance => "options.simulationDistance", Opt::Sensitivity => "options.sensitivity", Opt::WheelSensitivity => "options.mouseWheelSensitivity", + Opt::InvertX => "options.invertMouseX", Opt::InvertY => "options.invertMouseY", Opt::DiscreteScroll => "options.discrete_mouse_scroll", + Opt::AllowCursorChanges => "options.allowCursorChanges", Opt::Volume(_) => "soundCategory.master", Opt::GuiScale => "options.guiScale", Opt::ViewBobbing => "options.viewBobbing", @@ -454,8 +467,10 @@ impl Opt { Opt::NarratorHotkey => on_off(s.file.bool("narratorHotkey")), Opt::RotateWithMinecarts => on_off(s.file.bool("rotateWithMinecart")), Opt::HighContrastBlockOutlines => on_off(s.file.bool("highContrastBlockOutline")), + Opt::InvertX => on_off(s.invert_x), Opt::InvertY => on_off(s.invert_y), Opt::DiscreteScroll => on_off(s.discrete_scroll), + Opt::AllowCursorChanges => on_off(s.allow_cursor_changes), Opt::ViewBobbing => on_off(s.view_bobbing), Opt::Vsync => on_off(s.vsync), Opt::Fullscreen => on_off(s.fullscreen), @@ -659,8 +674,10 @@ impl Opt { s.file .set(key, crate::options_file::V::Bool(!s.file.bool(key))); } + Opt::InvertX => s.invert_x = !s.invert_x, Opt::InvertY => s.invert_y = !s.invert_y, Opt::DiscreteScroll => s.discrete_scroll = !s.discrete_scroll, + Opt::AllowCursorChanges => s.allow_cursor_changes = !s.allow_cursor_changes, Opt::ViewBobbing => s.view_bobbing = !s.view_bobbing, Opt::Vsync => s.vsync = !s.vsync, Opt::Fullscreen => s.fullscreen = !s.fullscreen, @@ -1434,12 +1451,7 @@ impl OptionsUi { ])); rows } - Page::Mouse => pairs(&[ - Opt::Sensitivity, - Opt::WheelSensitivity, - Opt::DiscreteScroll, - Opt::InvertY, - ]), + Page::Mouse => pairs(MOUSE_OPTIONS), Page::Chat => pairs(&[ Opt::ChatVisibility, Opt::ChatColors, @@ -2876,6 +2888,45 @@ mod tests { assert_ne!(s.text_background(0.0), chat_only); } + #[test] + fn mouse_settings_match_java_26_3_option_order() { + let mut ui = OptionsUi::default(); + ui.show(Page::Mouse); + let mut options = Vec::new(); + for row in ui.list_rows(&Settings::default()) { + if let Row::Pair(a, b) = row { + options.push(a); + if let Some(b) = b { + options.push(b); + } + } + } + assert_eq!( + options, + vec![ + Opt::Sensitivity, + Opt::WheelSensitivity, + Opt::DiscreteScroll, + Opt::InvertX, + Opt::InvertY, + Opt::AllowCursorChanges, + ] + ); + } + + #[test] + fn mouse_settings_round_trip_with_java_defaults() { + let mut settings = Settings::default(); + assert!(!settings.invert_x); + assert!(settings.allow_cursor_changes); + Opt::InvertX.cycle(&mut settings, false, [854, 480]); + Opt::AllowCursorChanges.cycle(&mut settings, false, [854, 480]); + let loaded = Settings::parse(&settings.serialize()); + assert!(loaded.invert_x); + assert!(!loaded.allow_cursor_changes); + assert!(!loaded.file.bool("allowCursorChanges")); + } + #[test] fn accessibility_has_all_options_and_disabled_placeholders() { let mut s = Settings::default(); diff --git a/crates/horizon-client/src/settings.rs b/crates/horizon-client/src/settings.rs index aeb366947..eea11d562 100644 --- a/crates/horizon-client/src/settings.rs +++ b/crates/horizon-client/src/settings.rs @@ -167,6 +167,8 @@ pub struct Settings { /// Every option in its stored form (the typed fields above mirror it). pub file: OptionsFile, pub invert_x: bool, + /// Allow widgets to replace the default mouse cursor icon. + pub allow_cursor_changes: bool, pub toggle_attack: bool, pub toggle_use: bool, /// Taps of the sprint key counted as double taps (sprintWindow). @@ -222,6 +224,7 @@ impl Default for Settings { invert_y: false, mouse_wheel_sensitivity: 1.0, discrete_scroll: false, + allow_cursor_changes: true, toggle_crouch: false, toggle_sprint: false, auto_jump: false, @@ -408,6 +411,7 @@ impl Settings { invert_y: f.bool("invertYMouse"), mouse_wheel_sensitivity: f.double("mouseWheelSensitivity") as f32, discrete_scroll: f.bool("discrete_mouse_scroll"), + allow_cursor_changes: f.bool("allowCursorChanges"), toggle_crouch: f.bool("toggleCrouch"), toggle_sprint: f.bool("toggleSprint"), toggle_attack: f.bool("toggleAttack"), @@ -497,6 +501,7 @@ impl Settings { self.mouse_wheel_sensitivity, ); put_b(&mut f, "discrete_mouse_scroll", self.discrete_scroll); + put_b(&mut f, "allowCursorChanges", self.allow_cursor_changes); put_b(&mut f, "toggleCrouch", self.toggle_crouch); put_b(&mut f, "toggleSprint", self.toggle_sprint); put_b(&mut f, "toggleAttack", self.toggle_attack); @@ -616,8 +621,10 @@ pub enum Opt { SimulationDistance, Sensitivity, WheelSensitivity, - InvertY, DiscreteScroll, + InvertX, + InvertY, + AllowCursorChanges, Volume(usize), GuiScale, ViewBobbing, From 78c028321c740defe18db6ccd111fc542f4d2c0b Mon Sep 17 00:00:00 2001 From: feeldev Date: Tue, 27 Oct 2026 15:21:32 -0500 Subject: [PATCH 16/39] fix(client): the first-person arm and the player models wear the player's own skin The empty first-person arm drew Steve's skin always; it now uses the local player's skin, as the inventory's model does (PlayerRenderer.renderRightHand reads AbstractClientPlayer.getSkin). Player models without a downloaded skin wear their profile's default skin (DefaultPlayerSkin.get), as the player list does. In single player the integrated server is offline-mode and sends no textures, so the signed-in account's own profile is fetched from the services (Minecraft.profileFuture) and gives the local player its skin. Fixes #2921 --- crates/horizon-client/src/game.rs | 11 +++--- crates/horizon-client/src/game/remote.rs | 46 ++++++++++++++++++------ crates/horizon-client/src/tab_list.rs | 8 +++++ 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 8e591cf3b..1269d8e68 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -10459,11 +10459,14 @@ impl Game<'_> { let Some(arm) = self.res.player_arm().clone() else { continue; }; + // The player's own skin, as the inventory's model shows it. + let sprites = &self.gui.atlas.sprites; let Some(r) = self - .gui - .atlas - .sprites - .get("entity/player/wide/steve") + .player_model + .as_ref() + .and_then(|m| m.skin.as_deref()) + .and_then(|skin| sprites.get(skin)) + .or_else(|| sprites.get("entity/player/wide/steve")) .copied() else { continue; diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 988fb438c..4d5cf3b33 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3086,6 +3086,20 @@ impl Game<'_> { .collect(); Some((players, r.online_mode, upside_down)) } + /// The signed-in account's `textures`, once the services answered. + fn own_textures(&self) -> Option { + use horizon_client::skins::{self, NameOrId, Resolve}; + let auth = horizon_client::auth::current()?; + let state = self + .skin_profiles + .borrow_mut() + .state(&NameOrId::Id(auth.uuid)); + let Resolve::Done(Some(profile)) = state else { + return None; + }; + let (value, signature) = profile.textures()?; + Some(skins::unpack(&value, signature, &skins::TEXTURE_URIS)) + } /// `PlayerInfo.getSkin` for every player entity, including NPCs that are /// never in the tab list: resolve each profile's textures and give the /// level's player models their skin. @@ -3094,11 +3108,20 @@ impl Game<'_> { return; }; let local = r.profile; - let entries: Vec<(u128, horizon_client::skins::Textures)> = r + let mut entries: Vec<(u128, horizon_client::skins::Textures)> = r .skin_textures .iter() .map(|(uuid, textures)| (*uuid, textures.clone())) .collect(); + // Minecraft.profileFuture: the signed-in account's own profile, fetched from the + // services, gives the local player its skin where the server sends none (single + // player's offline-mode server). + if !entries.iter().any(|(u, t)| *u == local && t.skin.is_some()) + && let Some(own) = self.own_textures() + { + entries.retain(|(u, _)| *u != local); + entries.push((local, own)); + } let mut resolved: Vec<(u128, String)> = Vec::new(); for (uuid, textures) in entries { // PlayerInfo.createSkinLookup: only the local player's own skin @@ -3122,27 +3145,30 @@ impl Game<'_> { .map(|(id, uuid)| (*id as u32, *uuid)) .collect::>(), r.skins.clone(), - r.skins.get(&r.profile).cloned(), + // Without a skin, the profile's default one (DefaultPlayerSkin.get). + r.skins + .get(&r.profile) + .cloned() + .unwrap_or_else(|| horizon_client::tab_list::default_model_skin(r.profile)), ) }) else { return; }; for (id, uuid) in level { - let Some(skin) = skins.get(&uuid) else { - continue; - }; + let skin = skins + .get(&uuid) + .cloned() + .unwrap_or_else(|| horizon_client::tab_list::default_model_skin(uuid)); if let Some(mob) = self .mobs .iter_mut() .find(|m| m.id == id && &*m.kind.id == "minecraft:player") { - mob.skin = Some(skin.clone()); + mob.skin = Some(skin); } } - if let Some(skin) = own - && let Some(mob) = self.player_model.as_mut() - { - mob.skin = Some(skin); + if let Some(mob) = self.player_model.as_mut() { + mob.skin = Some(own); } // ClientMannequin.updateSkin (PlayerSkinRenderCache.lookup): a // mannequin's DATA_PROFILE `textures` property resolves like a diff --git a/crates/horizon-client/src/tab_list.rs b/crates/horizon-client/src/tab_list.rs index b6d5f3dbd..a8e60cd76 100644 --- a/crates/horizon-client/src/tab_list.rs +++ b/crates/horizon-client/src/tab_list.rs @@ -80,6 +80,12 @@ pub fn default_skin(uuid: u128) -> &'static str { SKINS[hash.rem_euclid(SKINS.len() as i32) as usize] } +/// The default skin a player model wears: `default_skin`'s character, in its wide variant, since +/// the player model has no slim arms. +pub fn default_model_skin(uuid: u128) -> String { + default_skin(uuid).replace("/slim/", "/wide/") +} + /// `blitSprite(sprite, x, y, w, h)`. fn sprite(name: &'static str, x: i32, y: i32, w: i32, h: i32) -> GuiDraw { GuiDraw::Sprite { @@ -639,6 +645,8 @@ mod tests { assert_eq!(ping_sprite(1000), "icon/ping_1"); // UUID.hashCode of 0 is 0: the first default skin. assert_eq!(default_skin(0), "entity/player/slim/alex"); + // The player model wears the same character with wide arms. + assert_eq!(default_model_skin(0), "entity/player/wide/alex"); assert!(!visible(true, true, 1, false)); assert!(visible(true, true, 1, true)); assert!(visible(true, false, 1, false)); From 47ca0312df721385058e8a7247076bd60f113ebf Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 21:38:40 +0100 Subject: [PATCH 17/39] Skip mod recipe tables until the world resources are loaded On a slow start the title is drawn while the world resources still load. A running mod that reads recipes built its tables every title frame and hit the unloaded resources, which panicked. Fixes #2928. --- crates/horizon-client/src/game/mod_recipes.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/mod_recipes.rs b/crates/horizon-client/src/game/mod_recipes.rs index b97944e39..726f90145 100644 --- a/crates/horizon-client/src/game/mod_recipes.rs +++ b/crates/horizon-client/src/game/mod_recipes.rs @@ -95,7 +95,9 @@ impl Game<'_> { /// Capability `recipes`'s tables and known displays for this tick's /// snapshot; nothing while no running mod reads them. pub(super) fn mod_recipes(&mut self) -> (Option>, Arc<[i32]>) { - if !self.mods.mods.wants_recipes() { + // The tables come from the world resources, which may still be + // loading behind the title on a slow start. + if !self.mods.mods.wants_recipes() || self.res.rest.get().is_none() { return (None, Arc::from([])); } if self.mods.recipes.is_none() { From d485c688d6a1087227141868ef4493a2cd81db34 Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 21:45:44 +0100 Subject: [PATCH 18/39] Let armor stands press pressure plates and tripwires A non-marker armor stand is a LivingEntity, so it counts for the mob and weighted plates and trips wires. ArmorStand.isIgnoringBlockTriggers() is only true for markers. --- crates/horizon-client/src/game.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 8e591cf3b..9d85ddb22 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -670,15 +670,22 @@ impl EntityObstructionWorld for BuildingObstruction { } } impl GameLevel<'_> { - /// The mobs that trigger plates and tripwires: living entities that don't - /// ignore block triggers (`Entity.isIgnoringBlockTriggers`: bats; armor - /// stands are not in `mobs`). + /// The living entities that trigger plates and tripwires and don't ignore + /// block triggers (`Entity.isIgnoringBlockTriggers`: bats and marker armor + /// stands). Armor stands live apart from `mobs`. fn mob_trigger_boxes(&self) -> impl Iterator + '_ { self.blockers .mobs .iter() .filter(|m| !m.removed && m.species() != horizon_client::mobs::Species::Bat) .map(Mob::bounds) + .chain( + self.blockers + .armor_stands + .iter() + .filter(|s| !s.marker) + .map(|s| s.bounds()), + ) } /// The non-living entities that trigger plates and tripwires (boats, /// crystals, primed TNT, falling blocks, item entities, experience orbs and From 7acfc655e80325a71cbf2afcdf8a58f171f15b9a Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 21:45:45 +0100 Subject: [PATCH 19/39] Match vanilla's op warning on item tooltips The warning was missing its bold first line and skipped spawn eggs of op-only entities. Vanilla: ItemStack.OP_NBT_WARNING, BlockItem and SpawnEggItem.shouldPrintOpWarning (non-block items never warn). --- .../horizon-client/src/block_entity_item.rs | 19 ++++++++++++++ crates/horizon-client/src/game/stations.rs | 26 +++++++++++++------ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/crates/horizon-client/src/block_entity_item.rs b/crates/horizon-client/src/block_entity_item.rs index 2361dcbfb..6eb99ae84 100644 --- a/crates/horizon-client/src/block_entity_item.rs +++ b/crates/horizon-client/src/block_entity_item.rs @@ -35,6 +35,25 @@ pub fn op_warning(stack: &crate::items::ItemStack) -> bool { data(stack).is_some_and(|(id, _)| OP_ONLY.contains(&id.as_str())) } +/// `SpawnEggItem.shouldPrintOpWarning` for a player with game master +/// permission: a spawn egg carries data of an op-only entity type +/// (`EntityTypes.OP_ONLY_CUSTOM_DATA`). +pub fn spawn_egg_op_warning(stack: &crate::items::ItemStack) -> bool { + stack.item.ends_with("_spawn_egg") + && matches!( + stack + .data() + .and_then(|d| d.other("minecraft:entity_data")) + .and_then(|data| data.get("id")), + Some(Tag::String(id)) if matches!( + id.to_string_lossy().as_str(), + "minecraft:falling_block" + | "minecraft:command_block_minecart" + | "minecraft:spawner_minecart" + ) + ) +} + /// `Spawner.getSpawnEntityDisplayName` (`SpawnData.entity.id` of the item's /// data, which `ItemStack.addDetailsToTooltip` reads for spawners and trial /// spawners alike): the entity type a spawner item spawns. diff --git a/crates/horizon-client/src/game/stations.rs b/crates/horizon-client/src/game/stations.rs index 1734cb3ee..38064caad 100644 --- a/crates/horizon-client/src/game/stations.rs +++ b/crates/horizon-client/src/game/stations.rs @@ -2059,9 +2059,16 @@ impl Game<'_> { ); } } - // ItemStack.OP_NBT_WARNING, for a player with game master permission. - if !nested && self.ui.registries.permission >= 2 && block_entity_item::op_warning(stack) { - for (key, fallback) in [ + // ItemStack.OP_NBT_WARNING: `BlockItem` and `SpawnEggItem` + // `.shouldPrintOpWarning` for a player with game master permission; + // a nested projectile has no player. The first line is bold. + if !nested + && self.ui.registries.permission >= 2 + && (item_info.is_some_and(|i| i.block.is_some()) + && block_entity_item::op_warning(stack) + || block_entity_item::spawn_egg_op_warning(stack)) + { + for (i, (key, fallback)) in [ ("item.op_warning.line1", "Warning:"), ( "item.op_warning.line2", @@ -2071,12 +2078,15 @@ impl Game<'_> { "item.op_warning.line3", "Do not use unless you know the exact contents!", ), - ] { - push( - &mut lines, - self.translate(key, fallback), + ] + .into_iter() + .enumerate() + { + let text = horizon_client::text::Text::legacy(&self.translate(key, fallback)); + lines.push(( + if i == 0 { text.bold() } else { text }, rgba(255, 85, 85, 255), - ); + )); } } lines From c309d331ad3c78da74d192227cf8e325322e7127 Mon Sep 17 00:00:00 2001 From: asowneryt Date: Wed, 28 Oct 2026 09:47:06 +1300 Subject: [PATCH 20/39] Harnesses run offscreen on a Linux without vscreen Without vscreen, save_roundtrip, world_reopen and spawn_loot stopped on FileNotFoundError, and lan_e2e's games opened windows on the real desktop: unfocused, the host paused before its world loaded and waited at "Connecting to the server..." until wait-ready gave up. They now run offscreen there, as on macOS, and lan_e2e's games also skip the pause (as HORIZON_E2E_HEADLESS does). Co-Authored-By: Claude Opus 5.5 --- tools/lan_e2e.py | 12 +++++++----- tools/test_save_roundtrip_parity.py | 3 ++- tools/test_world_reopen_parity.py | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/lan_e2e.py b/tools/lan_e2e.py index 1a0b25a9d..69a22fe48 100755 --- a/tools/lan_e2e.py +++ b/tools/lan_e2e.py @@ -274,8 +274,8 @@ both sides go to --out (host-*.png, guest-*.png). python3 tools/lan_e2e.py --check chest --check tab python3 tools/lan_e2e.py --server-thread --check portals # the host's world on its server thread -Needs the prepared resources in .local/horizon-client and, on Linux, vscreen (the desktop); on -macOS both games render offscreen. Games started here have no audio (HORIZON_NO_AUDIO=1). +Needs the prepared resources in .local/horizon-client. On Linux the games run on vscreen (the +desktop), or headless (offscreen, no pause) where there is none; on macOS both games render offscreen. Games started here have no audio (HORIZON_NO_AUDIO=1). """ import argparse import json @@ -4989,9 +4989,11 @@ def run(ctl, out, resources, checks): host, guest = Game('host', ctl, resources), Game('guest', ctl, resources) # Either way explicitly: the game's default is the server thread. host.d.env['HORIZON_SERVER_THREAD'] = '1' if SERVER_THREAD else '0' - # A headless run (HORIZON_E2E_HEADLESS) has no focused window to draw in: the games render - # offscreen and never pause on the focus loss, or the world would stand still. - headless = bool(os.environ.get('HORIZON_E2E_HEADLESS')) + # A headless run (HORIZON_E2E_HEADLESS, or a Linux without vscreen) has no focused window to draw + # in: the games render offscreen and never pause on the focus loss, or the world would stand still + # (a host paused before its world loads waits at "Connecting to the server..." for ever). + headless = bool(os.environ.get('HORIZON_E2E_HEADLESS')) or ( + sys.platform.startswith('linux') and not shutil.which('vscreen')) launch = ['launch'] if headless or sys.platform == 'darwin': launch.append('--offscreen') diff --git a/tools/test_save_roundtrip_parity.py b/tools/test_save_roundtrip_parity.py index 7b3c72e92..2390e2bfc 100644 --- a/tools/test_save_roundtrip_parity.py +++ b/tools/test_save_roundtrip_parity.py @@ -347,7 +347,8 @@ def horizon_resave(source, destination, bin_dir): socket = Path(tempfile.mkdtemp(prefix='hzrt')) / 'control.sock' # sockets need short paths ctl = [str(bin_dir / 'horizon-ctl'), '--socket', str(socket)] extra = [] - if sys.platform == 'darwin': + # Offscreen on macOS, and on a Linux without vscreen (never a window on a real monitor). + if sys.platform == 'darwin' or not shutil.which('vscreen'): env = lab.game_env() extra = ['--offscreen'] else: diff --git a/tools/test_world_reopen_parity.py b/tools/test_world_reopen_parity.py index 9487fd1b7..9c06c257c 100644 --- a/tools/test_world_reopen_parity.py +++ b/tools/test_world_reopen_parity.py @@ -34,9 +34,10 @@ CYCLES = 3 def game_env(): - """macOS renders offscreen; Linux uses the virtual screen (as test_save_roundtrip_parity).""" + """macOS renders offscreen; Linux uses the virtual screen (as test_save_roundtrip_parity), or renders + offscreen too where there is no vscreen.""" env = lab.game_env() - if sys.platform == 'darwin': + if sys.platform == 'darwin' or not shutil.which('vscreen'): return env, ['--offscreen'] subprocess.run(['vscreen', 'up'], check=False, capture_output=True) text = subprocess.run(['vscreen', 'env'], capture_output=True, text=True, check=True).stdout From 7f6e8b634e2699e665e88c3f373477af979a7d8d Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 20:28:15 +0100 Subject: [PATCH 21/39] Spin the level view and draw the Nausea swirl for the player Nausea never reached the camera or the HUD: the swirl input was hard-coded to 0 and the level projection had no portal or Nausea spin. Add vanilla's spin (max of portal and Nausea intensity, scaled by Distortion Effects squared) and the Nausea blend fade (150 in, 20 out). Vanilla: GameRenderer.renderLevel, LocalPlayer.tickSpinningEffect, MobEffects NAUSEA blend. --- crates/horizon-client/src/camera.rs | 21 ++++++++++++ crates/horizon-client/src/effects.rs | 4 +++ crates/horizon-client/src/game.rs | 9 +++++- crates/horizon-client/src/game/fov.rs | 26 ++++++++++++++- crates/horizon-client/src/game/render_tick.rs | 10 ++++-- crates/horizon-client/src/gfx.rs | 5 ++- crates/horizon-client/src/gfx/native_post.rs | 5 +-- .../horizon-client/src/gfx/pack_uniforms.rs | 3 +- crates/horizon-client/src/screen_effects.rs | 32 +++++++++++++++++++ 9 files changed, 107 insertions(+), 8 deletions(-) diff --git a/crates/horizon-client/src/camera.rs b/crates/horizon-client/src/camera.rs index 7da08f2c8..75cbc025e 100644 --- a/crates/horizon-client/src/camera.rs +++ b/crates/horizon-client/src/camera.rs @@ -772,6 +772,27 @@ pub fn bob_matrix(state: &BobState, damage_tilt_strength: f64, bob_view_option: pose } +/// The spinning effect `GameRenderer.renderLevel` multiplies into the level's +/// projection after the bob: a skew about a tilted axis, from a portal's or +/// Nausea's intensity (already scaled by Distortion Effects) and the angle in +/// degrees. The first-person hand keeps its own projection without it. +pub fn spinning_effect_matrix(intensity: f32, angle_degrees: f32) -> glam::Mat4 { + if intensity <= 0.0 { + return glam::Mat4::IDENTITY; + } + let mut skew = 5.0 / (intensity * intensity + 5.0) - intensity * 0.04; + skew *= skew; + let axis = glam::Vec3::new( + 0.0, + std::f32::consts::SQRT_2 / 2.0, + std::f32::consts::SQRT_2 / 2.0, + ); + let angle = angle_degrees * DEG_TO_RAD; + glam::Mat4::from_axis_angle(axis, angle) + * glam::Mat4::from_scale(glam::Vec3::new(1.0 / skew, 1.0, 1.0)) + * glam::Mat4::from_axis_angle(axis, -angle) +} + #[cfg(test)] mod tests { #[test] diff --git a/crates/horizon-client/src/effects.rs b/crates/horizon-client/src/effects.rs index 5365a9d5c..7378de7d8 100644 --- a/crates/horizon-client/src/effects.rs +++ b/crates/horizon-client/src/effects.rs @@ -29,6 +29,10 @@ impl EffectInstance { fn infinite(&self) -> bool { self.duration == -1 } + /// `MobEffectInstance.endsWithin`. + pub fn ends_within(&self, ticks: i32) -> bool { + !self.infinite() && self.duration <= ticks + } fn shorter_than(&self, other: &Self) -> bool { !self.infinite() && (self.duration < other.duration || other.infinite()) } diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 8e591cf3b..052fb4fa0 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -11659,6 +11659,11 @@ impl Game<'_> { } else { self.bob_matrix(camera_alpha as f32) }; + let spin = if title { + glam::Mat4::IDENTITY + } else { + self.spinning_matrix(camera_alpha as f32) + }; let terrain_distance = self.terrain_distance(); let distance = (terrain_distance * 16) as f32; let depth_far = @@ -11666,7 +11671,7 @@ impl Game<'_> { self.view_frustum = self .renderer .as_ref() - .map(|r| r.camera_frustum(fov_degrees, yaw, pitch, bob, depth_far)); + .map(|r| r.camera_frustum(fov_degrees, yaw, pitch, bob * spin, depth_far)); // Keep the buffer local while builders need mutable access to the game. let mut entities = std::mem::take(&mut self.entity_vertices); entities.clear(); @@ -11749,6 +11754,7 @@ impl Game<'_> { pitch, fov_degrees, bob, + spin, sky, distance, detail_distance: (self.streaming.radius * 16) as f32, @@ -14648,6 +14654,7 @@ fn loading_frame(hud: &HudBatch) -> Frame<'_> { pitch: 10.0, fov_degrees: 85.0, bob: glam::Mat4::IDENTITY, + spin: glam::Mat4::IDENTITY, sky: horizon_client::environment::Sky::default(), distance: 12.0, detail_distance: 12.0, diff --git a/crates/horizon-client/src/game/fov.rs b/crates/horizon-client/src/game/fov.rs index 364f89189..bda915aac 100644 --- a/crates/horizon-client/src/game/fov.rs +++ b/crates/horizon-client/src/game/fov.rs @@ -1,11 +1,13 @@ //! Field of view (`Camera.tickFov`, `calculateFov`, //! `AbstractClientPlayer.getFieldOfViewModifier`), view and hurt bobbing -//! (`GameRenderer.bobHurt`, `bobView`) and the spyglass (`SpyglassItem`, +//! (`GameRenderer.bobHurt`, `bobView`), the portal and Nausea spin +//! (`GameRenderer.renderLevel`) and the spyglass (`SpyglassItem`, //! `Hud.extractSpyglassOverlay`). The arithmetic is `horizon_client::camera`. use super::Game; use horizon_client::{ camera::{ BobState, CameraFluid, FovPlayer, HurtBob, UseItem, bob_matrix, field_of_view_modifier, + spinning_effect_matrix, }, fog::{FogType, fog_type}, hud::HudBatch, @@ -26,6 +28,28 @@ impl Game<'_> { pub(super) fn fov_effect_scale(&self) -> f32 { self.settings.file.double("fovEffectScale") as f32 } + /// `options.screenEffectScale` (Distortion Effects). + pub(super) fn screen_effect_scale(&self) -> f32 { + self.settings.file.double("screenEffectScale") as f32 + } + /// `LocalPlayer.getEffectBlendFactor(NAUSEA, partial)`: 0 without the effect. + pub(super) fn nausea_blend(&self, partial: f32) -> f32 { + if self.potions.effects.get("nausea").is_none() { + return 0.0; + } + let fx = &self.screen_fx; + fx.o_nausea + partial * (fx.nausea - fx.o_nausea) + } + /// The spin `GameRenderer.renderLevel` multiplies into the level's + /// projection: the larger of the portal and Nausea intensities, scaled by + /// Distortion Effects squared, turning by `LocalPlayer.getSpinningEffectAngle`. + pub(super) fn spinning_matrix(&self, partial: f32) -> glam::Mat4 { + let fx = &self.screen_fx; + let portal = fx.o_portal + partial * (fx.portal - fx.o_portal); + let scale = self.screen_effect_scale(); + let intensity = portal.max(self.nausea_blend(partial)) * (scale * scale); + spinning_effect_matrix(intensity, fx.spinning_time + partial * fx.spinning_speed) + } /// What `AbstractClientPlayer.getFieldOfViewModifier` reads. fn fov_player(&self) -> Option { let p = self.player.as_ref()?; diff --git a/crates/horizon-client/src/game/render_tick.rs b/crates/horizon-client/src/game/render_tick.rs index 26a5a81cd..69104531d 100644 --- a/crates/horizon-client/src/game/render_tick.rs +++ b/crates/horizon-client/src/game/render_tick.rs @@ -209,8 +209,8 @@ impl Game<'_> { percent_frozen: p.percent_frozen(), partial, portal: [fx.o_portal, fx.portal], - nausea: 0.0, - screen_effect_scale: 1.0, + nausea: self.nausea_blend(partial), + screen_effect_scale: self.screen_effect_scale(), }; let mut scope = self.scope_scale; let gui_overlays = @@ -247,6 +247,12 @@ impl Game<'_> { let brightness = self.eye_brightness(e); let inside_portal = self.client_portal_effect(); self.screen_fx.tick(brightness, inside_portal); + let nausea = self + .potions + .effects + .get("nausea") + .map(|e| !e.ends_within(60)); + self.screen_fx.tick_spinning(nausea); // LocalPlayer water vision and AtmosphericFogEnvironment rain fog. let in_water = fog_type(&self.world, self.res.facts(), e, self.forward()) == FogType::Water; diff --git a/crates/horizon-client/src/gfx.rs b/crates/horizon-client/src/gfx.rs index ad1fd0561..580ee9ec5 100644 --- a/crates/horizon-client/src/gfx.rs +++ b/crates/horizon-client/src/gfx.rs @@ -222,6 +222,9 @@ pub struct Frame<'a> { /// The `GameRenderer.bobHurt`/`bobView` pose multiplied into the /// projection (`crate::camera::bob_matrix`). pub bob: Mat4, + /// The spinning effect multiplied into the level's projection only + /// (`crate::camera::spinning_effect_matrix`), not the hand's. + pub spin: Mat4, pub sky: Sky, /// Render distance in blocks (fog end). pub distance: f32, @@ -3418,7 +3421,7 @@ impl Renderer { frame.fov_degrees, frame.yaw, frame.pitch, - frame.bob, + frame.bob * frame.spin, frame.depth_far, ) } diff --git a/crates/horizon-client/src/gfx/native_post.rs b/crates/horizon-client/src/gfx/native_post.rs index 89515f5db..bf4293157 100644 --- a/crates/horizon-client/src/gfx/native_post.rs +++ b/crates/horizon-client/src/gfx/native_post.rs @@ -361,8 +361,9 @@ impl NativePost { pub fn frame_inputs(frame: &Frame, size: [u32; 2], seconds: f32, index: u32) -> FrameInputs { let aspect = size[0] as f32 / size[1].max(1) as f32; let view = crate::camera::view_matrix(frame.yaw, frame.pitch); - let projection = - super::world_projection(frame.fov_degrees, aspect, frame.depth_far) * frame.bob; + let projection = super::world_projection(frame.fov_degrees, aspect, frame.depth_far) + * frame.bob + * frame.spin; // A celestial body's direction at `angle` degrees (SkyRenderer: Y -90°, then X by the // angle, of straight up): overhead at 0, rising in the east (+x). let body = |angle: f32| { diff --git a/crates/horizon-client/src/gfx/pack_uniforms.rs b/crates/horizon-client/src/gfx/pack_uniforms.rs index 8f5f1a2de..4da492b00 100644 --- a/crates/horizon-client/src/gfx/pack_uniforms.rs +++ b/crates/horizon-client/src/gfx/pack_uniforms.rs @@ -287,7 +287,8 @@ impl FrameUniforms { aspect, 0.05, frame.depth_far, - ) * frame.bob; + ) * frame.bob + * frame.spin; let camera = frame.camera.as_vec3(); let (previous_camera, previous_view, previous_projection) = self.previous diff --git a/crates/horizon-client/src/screen_effects.rs b/crates/horizon-client/src/screen_effects.rs index 269a534e7..996f3f9c2 100644 --- a/crates/horizon-client/src/screen_effects.rs +++ b/crates/horizon-client/src/screen_effects.rs @@ -69,6 +69,12 @@ pub struct ScreenEffects { pub vignette_brightness: f32, pub portal: f32, pub o_portal: f32, + /// Nausea's `MobEffectInstance.BlendState` factor and the previous tick's. + pub nausea: f32, + pub o_nausea: f32, + /// `LocalPlayer.spinningEffectTime` and `spinningEffectSpeed` (degrees). + pub spinning_time: f32, + pub spinning_speed: f32, } impl Default for ScreenEffects { fn default() -> Self { @@ -76,6 +82,10 @@ impl Default for ScreenEffects { vignette_brightness: 1.0, portal: 0.0, o_portal: 0.0, + nausea: 0.0, + o_nausea: 0.0, + spinning_time: 0.0, + spinning_speed: 0.0, } } } @@ -105,6 +115,28 @@ impl ScreenEffects { }; self.portal = (self.portal + step).clamp(0.0, 1.0); } + /// `LocalPlayer.tickSpinningEffect` and Nausea's blend. `nausea` is `None` + /// without the effect, else whether it is past its blend-out point + /// (`!endsWithin(60)`, `MobEffects.NAUSEA`). + pub fn tick_spinning(&mut self, nausea: Option) { + self.o_nausea = self.nausea; + match nausea { + // BlendState.tick: fades in over 150 ticks and out over 20. + Some(active) => { + let (target, duration) = if active { (1.0, 150.0) } else { (0.0, 20.0) }; + self.nausea += (target - self.nausea).clamp(-1.0 / duration, 1.0 / duration); + } + // The blend state belongs to the instance, so a new one starts at 0. + None => self.nausea = 0.0, + } + if self.portal > 0.0 || self.nausea > 0.0 { + self.spinning_speed = + (self.portal * 20.0 + self.nausea * 7.0) / (self.portal + self.nausea); + self.spinning_time += self.spinning_speed; + } else { + self.spinning_speed = 0.0; + } + } pub fn build(&self, input: &ScreenInputs) -> Vec { let mut out = Vec::new(); let sprite = |name: &str| input.sprites.get(name).map(|r| [r.u0, r.v0, r.u1, r.v1]); From 7d99d23aefd60d78b9bbdbdf4e80f8557b89b9cb Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 21:57:14 +0100 Subject: [PATCH 22/39] Fix beacon beam distance and cull at render distance The beam width used x and y instead of the horizontal distance, so it was wrong for beacons to the north or south. Beams beyond render distance x 16 are skipped, as BeaconRenderer.shouldRender does. A beacon with Levels 0 still draws no beam. --- crates/horizon-client/src/game/beacon.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/beacon.rs b/crates/horizon-client/src/game/beacon.rs index 6de017c33..710b743ac 100644 --- a/crates/horizon-client/src/game/beacon.rs +++ b/crates/horizon-client/src/game/beacon.rs @@ -563,13 +563,21 @@ impl Game<'_> { }; let time = (self.world.game_time.rem_euclid(40)) as f32 + alpha as f32; let scoping = self.scoping(); + let view = f64::from(self.settings.render_distance * 16); for (k, e) in &self.world.block_entities { let BlockEntity::Beacon(b) = e else { continue }; + // `getBeamSections` is empty while Levels is 0. if b.levels == 0 || b.sections.is_empty() { continue; } let base = glam::DVec3::new(f64::from(k.0) + 0.5, f64::from(k.1), f64::from(k.2) + 0.5); - let distance = (base - camera).truncate().length() as f32; + // `BeaconRenderer.shouldRender`: horizontal distance under render distance × 16. + let offset = base - camera; + let horizontal = glam::DVec2::new(offset.x, offset.z).length(); + if horizontal >= view { + continue; + } + let distance = horizontal as f32; let scale = if scoping { 1.0 } else { From 52f3dcc5ef265269668ad29eaf9566eba4093b94 Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 21:57:14 +0100 Subject: [PATCH 23/39] Use christmas chest textures on 24-26 December Normal and trapped chests use the christmas sprites on 24-26 December, as ChestRenderer does, with the local date read once. minecraft:local_time reads the system time zone instead of UTC, so the Christmas chest item switches on the local date. --- .../horizon-client/src/block_entity_render.rs | 24 +++++++++++++++++++ crates/horizon-client/src/game/item_draw.rs | 8 +++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/crates/horizon-client/src/block_entity_render.rs b/crates/horizon-client/src/block_entity_render.rs index ecad13fb1..280dd9d21 100644 --- a/crates/horizon-client/src/block_entity_render.rs +++ b/crates/horizon-client/src/block_entity_render.rs @@ -97,6 +97,16 @@ pub fn diffuse(normal: Vec3, lights: (Vec3, Vec3)) -> f32 { pub fn vertex_light(packed: u8) -> u32 { (u32::from(packed >> 4) * 16) | ((u32::from(packed & 15) * 16) << 8) } +/// `ChestRenderer.xmasTextures`: `SpecialDates.isExtendedChristmas` (24 to 26 +/// December in the local time zone), read once when the renderer is created. +fn extended_christmas() -> bool { + use chrono::Datelike; + static XMAS: std::sync::OnceLock = std::sync::OnceLock::new(); + *XMAS.get_or_init(|| { + let now = chrono::Local::now(); + now.month() == 12 && (24..=26).contains(&now.day()) + }) +} fn pack_color(rgb: u32, alpha: u32, brightness: f32) -> u32 { let c = |shift: u32| (((rgb >> shift) & 255) as f32 * brightness) as u32; alpha << 24 | c(0) << 16 | c(8) << 8 | c(16) @@ -1173,11 +1183,25 @@ impl BlockEntityRenderer { } } Kind::Chest { + block, texture, part, y_rot, .. } => { + // ChestRenderer.getChestMaterial: normal and trapped chests use the christmas + // sprites on 24-26 December. Copper and ender chests keep theirs. + let texture = if matches!(block.as_str(), "chest" | "trapped_chest") + && extended_christmas() + { + match part { + ChestPart::Single => "entity/chest/christmas", + ChestPart::Left => "entity/chest/christmas_left", + ChestPart::Right => "entity/chest/christmas_right", + } + } else { + *texture + }; let model = match part { ChestPart::Single => "chest", ChestPart::Left => "double_chest_left", diff --git a/crates/horizon-client/src/game/item_draw.rs b/crates/horizon-client/src/game/item_draw.rs index be0ca56fb..354e837b1 100644 --- a/crates/horizon-client/src/game/item_draw.rs +++ b/crates/horizon-client/src/game/item_draw.rs @@ -82,11 +82,11 @@ fn civil(days: i64) -> (i64, u32, u32) { (yoe + era * 400 + i64::from(m <= 2), m, d) } /// `DateTimeFormatter.ofPattern(pattern).format(now)` for the month, day, -/// year and time letters item models use (UTC: no time zone database). +/// year and time letters item models use, in the system time zone +/// (`LocalTime` without a `time_zone`). pub(super) fn local_time(pattern: &str) -> String { - let secs = std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .map_or(0, |d| d.as_secs() as i64); + let now = chrono::Local::now(); + let secs = now.timestamp() + i64::from(now.offset().local_minus_utc()); let (y, mo, d) = civil(secs.div_euclid(86_400)); let s = secs.rem_euclid(86_400); let (h, mi, se) = (s / 3600, s / 60 % 60, s % 60); From 5b41d9ebf339c4b99d7da28b3cfb2a2245b075d3 Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 21:57:14 +0100 Subject: [PATCH 24/39] Light glow frame maps at 15728850 A map in a glow item frame is drawn at light 15728850 (sky 15, block 13), not full bright, as ItemFrameRenderer does. --- crates/horizon-client/src/game/frames.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/frames.rs b/crates/horizon-client/src/game/frames.rs index 4b7465bd0..f347e8151 100644 --- a/crates/horizon-client/src/game/frames.rs +++ b/crates/horizon-client/src/game/frames.rs @@ -429,7 +429,8 @@ impl Game<'_> { if let Some(id) = map { // ItemFrameRenderer: the map fills the face, in 90-degree steps. let depth = if f.invisible { 0.5 } else { 0.4375 }; - let item_light = if f.glow { 240 | 240 << 8 } else { packed }; + // A glow frame's map is 15728850 (sky 15, block 13), not full bright. + let item_light = if f.glow { 240 | 208 << 8 } else { packed }; let m = pose * glam::DMat4::from_translation(glam::DVec3::new(0.0, 0.0, depth)) * glam::DMat4::from_rotation_z( From 2aea6138b7d2b1a0b0237499eb9db67637820f49 Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 18:48:28 +0100 Subject: [PATCH 25/39] Allow extended keyboard keys in bindings --- crates/horizon-client-input/src/keybinds.rs | 58 +++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/crates/horizon-client-input/src/keybinds.rs b/crates/horizon-client-input/src/keybinds.rs index 2047b9117..433b37161 100644 --- a/crates/horizon-client-input/src/keybinds.rs +++ b/crates/horizon-client-input/src/keybinds.rs @@ -145,6 +145,22 @@ const KEYS: &[(&str, KeyCode)] = &[ ("key.keyboard.period", KeyCode::Period), ("key.keyboard.slash", KeyCode::Slash), ("key.keyboard.caps.lock", KeyCode::CapsLock), + ("key.keyboard.world.1", KeyCode::IntlBackslash), + ("key.keyboard.international1", KeyCode::IntlRo), + ("key.keyboard.international3", KeyCode::IntlYen), + ("key.keyboard.lang1", KeyCode::Lang1), + ("key.keyboard.lang2", KeyCode::Lang2), + ("key.keyboard.lang3", KeyCode::Lang3), + ("key.keyboard.lang4", KeyCode::Lang4), + ("key.keyboard.lang5", KeyCode::Lang5), + ("key.keyboard.help", KeyCode::Help), + ("key.keyboard.select", KeyCode::Select), + ("key.keyboard.again", KeyCode::Again), + ("key.keyboard.undo", KeyCode::Undo), + ("key.keyboard.cut", KeyCode::Cut), + ("key.keyboard.copy", KeyCode::Copy), + ("key.keyboard.paste", KeyCode::Paste), + ("key.keyboard.find", KeyCode::Find), ("key.keyboard.f1", KeyCode::F1), ("key.keyboard.f2", KeyCode::F2), ("key.keyboard.f3", KeyCode::F3), @@ -157,6 +173,18 @@ const KEYS: &[(&str, KeyCode)] = &[ ("key.keyboard.f10", KeyCode::F10), ("key.keyboard.f11", KeyCode::F11), ("key.keyboard.f12", KeyCode::F12), + ("key.keyboard.f13", KeyCode::F13), + ("key.keyboard.f14", KeyCode::F14), + ("key.keyboard.f15", KeyCode::F15), + ("key.keyboard.f16", KeyCode::F16), + ("key.keyboard.f17", KeyCode::F17), + ("key.keyboard.f18", KeyCode::F18), + ("key.keyboard.f19", KeyCode::F19), + ("key.keyboard.f20", KeyCode::F20), + ("key.keyboard.f21", KeyCode::F21), + ("key.keyboard.f22", KeyCode::F22), + ("key.keyboard.f23", KeyCode::F23), + ("key.keyboard.f24", KeyCode::F24), ("key.keyboard.print.screen", KeyCode::PrintScreen), ("key.keyboard.scroll.lock", KeyCode::ScrollLock), ("key.keyboard.pause", KeyCode::Pause), @@ -188,6 +216,36 @@ const KEYS: &[(&str, KeyCode)] = &[ ("key.keyboard.keypad.0", KeyCode::Numpad0), ("key.keyboard.keypad.period", KeyCode::NumpadDecimal), ("key.keyboard.keypad.equal", KeyCode::NumpadEqual), + ("key.keyboard.keypad.comma", KeyCode::NumpadComma), + ("key.keyboard.keypad.backspace", KeyCode::NumpadBackspace), + ( + "key.keyboard.keypad.left.parenthesis", + KeyCode::NumpadParenLeft, + ), + ( + "key.keyboard.keypad.right.parenthesis", + KeyCode::NumpadParenRight, + ), + ("key.keyboard.keypad.hash", KeyCode::NumpadHash), + ( + "key.keyboard.keypad.memory.store", + KeyCode::NumpadMemoryStore, + ), + ( + "key.keyboard.keypad.memory.recall", + KeyCode::NumpadMemoryRecall, + ), + ( + "key.keyboard.keypad.memory.clear", + KeyCode::NumpadMemoryClear, + ), + ("key.keyboard.keypad.memory.add", KeyCode::NumpadMemoryAdd), + ( + "key.keyboard.keypad.memory.subtract", + KeyCode::NumpadMemorySubtract, + ), + ("key.keyboard.keypad.clear", KeyCode::NumpadClear), + ("key.keyboard.keypad.clear.entry", KeyCode::NumpadClearEntry), ("key.keyboard.menu", KeyCode::ContextMenu), ("key.keyboard.left.control", KeyCode::ControlLeft), ("key.keyboard.left.shift", KeyCode::ShiftLeft), From 5216403562b65eb43617d6b5d3e9c420291da67d Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 19:34:39 +0100 Subject: [PATCH 26/39] Enable the high contrast block outline option --- crates/horizon-client/src/options_ui.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/horizon-client/src/options_ui.rs b/crates/horizon-client/src/options_ui.rs index fbcf8ba98..7d63c79c4 100644 --- a/crates/horizon-client/src/options_ui.rs +++ b/crates/horizon-client/src/options_ui.rs @@ -89,7 +89,6 @@ impl Opt { | Opt::DistortionEffects | Opt::MonochromeLogo | Opt::RotateWithMinecarts - | Opt::HighContrastBlockOutlines // Saved, but nothing in rendering reads them yet. | Opt::ChunkFade | Opt::ImprovedTransparency @@ -652,6 +651,7 @@ impl Opt { Opt::TextBackground | Opt::HideLightningFlashes | Opt::HideSplashTexts + | Opt::HighContrastBlockOutlines | Opt::HideMatchedNames | Opt::OnlySecureChat | Opt::SaveChatDrafts => { From f35ee164128f73166c7be610e866c0911fcc8d6c Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 19:39:49 +0100 Subject: [PATCH 27/39] Apply blindness fog and hide the blocked sky --- crates/horizon-client/src/game.rs | 12 ++++++++++++ crates/horizon-client/src/game/render_tick.rs | 9 +++++++-- crates/horizon-client/src/gfx.rs | 11 +++++------ 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 8e591cf3b..67ded3da7 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -11755,6 +11755,17 @@ impl Game<'_> { depth_far, underwater, title, + sky_blocked: self.potions.effects.get("blindness").is_some() + || self.potions.effects.get("darkness").is_some() + || matches!( + horizon_client::fog::fog_type( + &self.world, + self.res.facts(), + [camera.x, camera.y, camera.z], + self.forward(), + ), + horizon_client::fog::FogType::Lava | horizon_client::fog::FogType::PowderSnow + ), skybox: self.dim == Dim::Overworld && self.settings.horizon.sky, end_sky: self.dim == Dim::End && self.settings.horizon.sky, end_sky_sprite: self @@ -14655,6 +14666,7 @@ fn loading_frame(hud: &HudBatch) -> Frame<'_> { underwater: false, cave_culling: false, title: true, + sky_blocked: false, skybox: false, end_sky: false, end_sky_sprite: None, diff --git a/crates/horizon-client/src/game/render_tick.rs b/crates/horizon-client/src/game/render_tick.rs index 26a5a81cd..ddfd0a335 100644 --- a/crates/horizon-client/src/game/render_tick.rs +++ b/crates/horizon-client/src/game/render_tick.rs @@ -108,7 +108,11 @@ impl Game<'_> { rain, thunder, skybox: self.dim == Dim::Overworld, - blindness: None, + blindness: self + .potions + .effects + .get("blindness") + .map(|effect| (effect.duration, effect.duration == -1)), darkness: self.darkness_fog(), darken_world: self .boss_overlay @@ -140,7 +144,8 @@ impl Game<'_> { } else { 63.0 }; - camera.y < horizon + self.dim == Dim::Overworld + && camera.y < horizon && fog_type( &self.world, self.res.facts(), diff --git a/crates/horizon-client/src/gfx.rs b/crates/horizon-client/src/gfx.rs index ad1fd0561..e5a168d15 100644 --- a/crates/horizon-client/src/gfx.rs +++ b/crates/horizon-client/src/gfx.rs @@ -105,12 +105,9 @@ const COMPLETE_COLUMN: u32 = (1 << (crate::chunk::HEIGHT / 16)) - 1; /// its fixed-point UVs (`terrain.wgsl`'s `terrain_uv`). /// The world pass again after occlusion culling's test: it loads both /// targets (phase 2 draws over phase 1, reading the test's results). -/// LevelRenderer: no sky inside lava or powder snow (sky fog ends within 2 blocks). +/// `LevelRenderer.addSkyPass`: fluids and camera effects block the sky pass. fn sky_open(frame: &Frame) -> bool { - match frame.fog { - Some(f) => f.sky_end > 2.0, - None => !frame.underwater, - } + !frame.sky_blocked } /// The Overworld-style sky (disc, sunset, stars, void) draws this frame. @@ -235,6 +232,8 @@ pub struct Frame<'a> { pub cave_culling: bool, /// Title screen: only the dedicated panorama cube map and the HUD. pub title: bool, + /// Lava, powder snow, blindness or darkness blocks the sky pass. + pub sky_blocked: bool, /// Dimensions without a skybox (the Nether) clear to the fog colour. pub skybox: bool, /// The End: clear to black and draw the resident sky box behind the world. @@ -4508,7 +4507,7 @@ impl Renderer { cull.bind_depth(&self.device, world_depth); } let cull = self.cull.as_ref().filter(|_| culling && solid_draws > 0); - let clear = if frame.title || (frame.end_sky && !frame.underwater) { + let clear = if frame.title || (frame.end_sky && !frame.underwater && sky_open(frame)) { wgpu::Color::BLACK } else { wgpu::Color { From ad61c30f465d8a57559d53761c2b3ca86a34711e Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Tue, 27 Oct 2026 19:49:57 +0100 Subject: [PATCH 28/39] Award target hit and honey slide advancements --- crates/horizon-client/src/game.rs | 7 +++- .../horizon-client/src/game/advancements.rs | 36 +++++++++++++++++++ crates/horizon-client/src/game/creatures.rs | 19 ++++++++-- crates/horizon-client/src/game/lan_actions.rs | 9 ++++- crates/horizon-client/src/motion.rs | 5 ++- 5 files changed, 71 insertions(+), 5 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 8e591cf3b..fc8eec1ff 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -5259,8 +5259,13 @@ impl Game<'_> { MotionEvent::Snowflake { position, velocity } => self.snowflake(position, velocity), MotionEvent::EnterBlock { state } => self.trigger_enter_block(state), MotionEvent::HoneySlide { - sound, particles, .. + pos, + sound, + particles, } => { + if self.world.game_time % 20 == 0 { + self.trigger_honey_slide([pos.x, pos.y, pos.z]); + } if sound { self.audio .play("minecraft:block.honey_block.slide", Some(feet), 1.0, 1.0); diff --git a/crates/horizon-client/src/game/advancements.rs b/crates/horizon-client/src/game/advancements.rs index 79e836322..bc066c6bc 100644 --- a/crates/horizon-client/src/game/advancements.rs +++ b/crates/horizon-client/src/game/advancements.rs @@ -993,6 +993,42 @@ impl Game<'_> { block_ok && state_ok && adv::conditions(&c["player"], &pctx, w) }); } + /// `SlideDownBlockTrigger`: match the actual block and its state. + pub(super) fn trigger_honey_slide(&mut self, pos: [i32; 3]) { + let me = self.player_entity(); + self.trigger("minecraft:slide_down_block", move |c, w| { + let ctx = adv::Entities { + this: Some(&me), + origin: me.position, + tool: None, + block_pos: None, + }; + adv::conditions(&c["player"], &ctx, w) && adv::block(c, pos, w) + }); + } + + /// `TargetBlockTrigger`: signal and projectile conditions are evaluated in + /// the shooter's context, including distance from the shooter. + pub(super) fn trigger_target_hit(&mut self, projectile: &EntityView, strength: i32) { + let me = self.player_entity(); + let projectile = projectile.clone(); + self.trigger("minecraft:target_hit", move |c, w| { + let player = adv::Entities { + this: Some(&me), + origin: me.position, + tool: None, + block_pos: None, + }; + let target = adv::Entities { + this: Some(&projectile), + ..player + }; + adv::conditions(&c["player"], &player, w) + && adv::range_i(&c["signal_strength"], i64::from(strength)) + && adv::conditions(&c["projectile"], &target, w) + }); + } + /// `ItemUsedOnLocationTrigger` (placed_block, item_used_on_block). pub(super) fn trigger_block(&mut self, name: &str, pos: [i32; 3], stack: &ItemStack) { let me = self.player_entity(); diff --git a/crates/horizon-client/src/game/creatures.rs b/crates/horizon-client/src/game/creatures.rs index 3145c2f75..f7d4828f1 100644 --- a/crates/horizon-client/src/game/creatures.rs +++ b/crates/horizon-client/src/game/creatures.rs @@ -2666,10 +2666,25 @@ impl Game<'_> { let hit = self.with_level(|b, level, ticks| { b.target_projectile_hit(level, ticks, block, location, face, arrow) }); - if hit.is_some() { + if let Some(strength) = hit { let _ = self.process_level_events(); - if p.owner == Some(Who::Player) { + if p.owner == Some(Who::Player) && (p.guest.is_none() || p.guest == self.lan_acting) { self.stats.custom("target_hit", 1); + let kind = if p + .arrow + .as_ref() + .is_some_and(|a| &*a.pickup_item.item == "minecraft:spectral_arrow") + { + "minecraft:spectral_arrow" + } else { + p.kind.id() + }; + let projectile = horizon_client::advancements::EntityView { + kind: kind.to_owned(), + position: [p.position.x, p.position.y, p.position.z], + ..Default::default() + }; + self.trigger_target_hit(&projectile, strength); } } } diff --git a/crates/horizon-client/src/game/lan_actions.rs b/crates/horizon-client/src/game/lan_actions.rs index da4b6a1a8..acff3d91e 100644 --- a/crates/horizon-client/src/game/lan_actions.rs +++ b/crates/horizon-client/src/game/lan_actions.rs @@ -2706,8 +2706,15 @@ impl Game<'_> { // others (Player.playSound excludes the player, whose client // plays it), the entity event 53 everyone around. MotionEvent::HoneySlide { - sound, particles, .. + pos, + sound, + particles, } => { + if self.world.game_time % 20 == 0 { + self.as_guest(host, conn, |game| { + game.trigger_honey_slide([pos.x, pos.y, pos.z]) + }); + } let Some((id, at)) = host.hub.guest(conn).map(|g| (g.entity_id, g.position)) else { continue; diff --git a/crates/horizon-client/src/motion.rs b/crates/horizon-client/src/motion.rs index e9899ad40..7536d0fc6 100644 --- a/crates/horizon-client/src/motion.rs +++ b/crates/horizon-client/src/motion.rs @@ -1551,7 +1551,10 @@ impl MotionWorld<'_, '_, '_> { // Only the server broadcasts event 53 (`!level.isClientSide()`). let particles = !self.player.client_side && random.next_int_bound(5).map_err(|e| format!("{e:?}"))? == 0; - if sound || particles { + // The server also checks the slide criterion every 20 game ticks, + // including ticks without a sound or a particle event. + let criterion = !self.player.client_side && self.scene.game_time % 20 == 0; + if sound || particles || criterion { self.player.events.push(MotionEvent::HoneySlide { pos, sound, From 466fef4486e9fab3fb865f28edda7940dcb5eaa8 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Tue, 27 Oct 2026 22:26:02 +0100 Subject: [PATCH 29/39] Remote eating: the sound plays for items without consume particles too Consumable.emitParticlesAndSounds gates only the particles on hasConsumeParticles; the sound always plays. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/remote.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index d1b457f5b..2a276f527 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -4810,9 +4810,10 @@ impl Game<'_> { // countdown goes on past zero (LivingEntity.updateUsingItem completes // only on the server) until the server's USE_ITEM_COMPLETE. let remaining = consumable.ticks() - ticks as i32; - if consumable.particles && consumable.should_emit(remaining) { - // `emit_consume` spawns the bites and plays the eat sound, as - // `tick_used_item` does on the player's own server. + if consumable.should_emit(remaining) { + // `emit_consume` plays the eat sound and spawns the bites (when the + // item has consume particles), as `tick_used_item` does on the + // player's own server. self.emit_consume(&consumable, &stack, 5); } self.using = Some((slot, ticks + 1)); From 501e543105c09ca441cb4c189f86f94138ab4d43 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Tue, 27 Oct 2026 22:26:47 +0100 Subject: [PATCH 30/39] Creative on a server: the off hand's edits reach the server too CreativeInventoryListener sends every InventoryMenu slot that changes, the off hand (slot 45) included; only the 36 inventory slots were sent, so Key F's off-hand stack stayed on this client (single player runs on its server thread too). Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/remote.rs | 27 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 9d79aa1a6..84346964b 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -213,7 +213,8 @@ pub(super) struct Remote { /// `LocalPlayer.showDeathScreen`: off with `immediate_respawn`. show_death_screen: bool, player_type: Option>, - /// Inventory as last synchronised, for creative-mode slot updates. + /// Inventory (then the off hand) as last synchronised, for creative-mode + /// slot updates. synced: Vec>, decode_errors: u32, clock: Option, @@ -510,7 +511,7 @@ impl Game<'_> { death_message: None, show_death_screen: true, player_type, - synced: vec![None; 36], + synced: vec![None; 37], decode_errors: 0, clock: None, clock_rate: 1.0, @@ -4307,12 +4308,14 @@ impl Game<'_> { { out.push(packet); } - // Creative inventory edits are sent slot by slot (SetCreativeModeSlot). + // Creative inventory edits are sent slot by slot (SetCreativeModeSlot); + // `synced[36]` is the off hand. let mut creative_slots = Vec::new(); if self.creative { - for i in 0..36 { - if self.inventory[i] != r.synced[i] { - r.synced[i] = self.inventory[i].clone(); + for i in 0..37 { + let stack = self.inventory.get(i).unwrap_or(&self.offhand); + if *stack != r.synced[i] { + r.synced[i] = stack.clone(); creative_slots.push(i); } } @@ -4321,8 +4324,13 @@ impl Game<'_> { self.send(packet); } for i in creative_slots { - let slot = if i < 9 { 36 + i } else { i } as i16; - let item = self.to_network(&self.inventory[i]); + // InventoryMenu's slots: the hotbar is 36..=44, the off hand 45. + let slot = match i { + 0..9 => 36 + i, + 36 => 45, + _ => i, + } as i16; + let item = self.to_network(self.inventory.get(i).unwrap_or(&self.offhand)); self.send(S::SetCreativeModeSlot(play::SetCreativeModeSlot { slot, item, @@ -4331,7 +4339,8 @@ impl Game<'_> { } /// Inventory as the server last described it. fn remote_synced(&mut self) { - let inventory = self.inventory.clone(); + let mut inventory = self.inventory.clone(); + inventory.push(self.offhand.clone()); if let Some(r) = self.remote.as_mut() { r.synced = inventory; } From 46c84a8b2413978de2a57301b7126b03b58b5720 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Tue, 27 Oct 2026 22:27:03 +0100 Subject: [PATCH 31/39] Merge main into #2891: main has run_command click events since Keep main's ClickEvent::RunCommand and click_command (now pub(super) for the book screen) instead of the branch's copies. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client-core/src/component.rs | 1 - crates/horizon-client-core/src/text.rs | 5 ----- crates/horizon-client/src/game/chat.rs | 17 +---------------- 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/crates/horizon-client-core/src/component.rs b/crates/horizon-client-core/src/component.rs index dbedc0513..248c78617 100644 --- a/crates/horizon-client-core/src/component.rs +++ b/crates/horizon-client-core/src/component.rs @@ -183,7 +183,6 @@ fn object_style(o: &serde_json::Map) -> Style { }) }) .map(crate::text::ClickEvent::OpenUrl), - Some("run_command") => text("command").map(crate::text::ClickEvent::RunCommand), // ClickEvent.ChangePage.CODEC: ExtraCodecs.POSITIVE_INT. Some("change_page") => e .get("page") diff --git a/crates/horizon-client-core/src/text.rs b/crates/horizon-client-core/src/text.rs index 4fcd0fad5..243a3ae3c 100644 --- a/crates/horizon-client-core/src/text.rs +++ b/crates/horizon-client-core/src/text.rs @@ -46,8 +46,6 @@ pub enum ClickEvent { OpenUrl(String), /// `ClickEvent.ChangePage`: a book's page, counted from 1. ChangePage(i32), - /// `ClickEvent.RunCommand`: the command the click sends (`/` allowed). - RunCommand(String), SuggestCommand(String), /// `ClickEvent.RunCommand`: the command, with or without its `/`. RunCommand(String), @@ -550,9 +548,6 @@ fn style_json(style: &Style) -> Vec<(String, Value)> { let event = match click { ClickEvent::OpenUrl(url) => json!({ "action": "open_url", "url": url }), ClickEvent::ChangePage(page) => json!({ "action": "change_page", "page": page }), - ClickEvent::RunCommand(command) => { - json!({ "action": "run_command", "command": command }) - } ClickEvent::SuggestCommand(command) => { json!({ "action": "suggest_command", "command": command }) } diff --git a/crates/horizon-client/src/game/chat.rs b/crates/horizon-client/src/game/chat.rs index ff25d9a34..4ed7a0571 100644 --- a/crates/horizon-client/src/game/chat.rs +++ b/crates/horizon-client/src/game/chat.rs @@ -780,7 +780,6 @@ impl Game<'_> { super::packs::open_folder(std::path::Path::new(&path)); } Some(ClickEvent::OpenUrl(url)) => self.click_url(url), - Some(ClickEvent::RunCommand(command)) => self.click_command(&command), Some(ClickEvent::SuggestCommand(command)) => { if let Some(screen) = self.ui.chat_screen.as_mut() { screen.suggest_command(&m, &c, &command); @@ -791,20 +790,6 @@ impl Game<'_> { Some(ClickEvent::ChangePage(_)) | None => {} } } - /// `Screen.clickCommandAction`: a client mod's command first, then the - /// server (unsigned) or the local one runs it, without the chat history - /// a typed line would get. - pub(super) fn click_command(&mut self, command: &str) { - let command = command.strip_prefix('/').unwrap_or(command); - if command.is_empty() || self.mod_command(command) { - return; - } - if self.remote.is_some() { - self.send_chat(&format!("/{command}")); - } else if !self.local_server_mod_command(command) { - self.run_command(command); - } - } /// `Screen.clickUrlAction`: nothing with Web Links off, else the link /// opens, after the confirmation unless Prompt on Links is off. pub(super) fn click_url(&mut self, url: String) { @@ -874,7 +859,7 @@ impl Game<'_> { /// first, as `ClientPacketListener.sendUnattendedCommand` lets client /// commands take it. (Vanilla asks first when the command fails to /// parse; here the server answers it.) - fn click_command(&mut self, command: &str) { + pub(super) fn click_command(&mut self, command: &str) { let command = command.strip_prefix('/').unwrap_or(command); if self.mod_command(command) { return; From e0bb0881e845f5df7bf7afd5823acda5b7cce95f Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Tue, 27 Oct 2026 22:36:57 +0100 Subject: [PATCH 32/39] item frames: glow frame map light is block coordinate 210, as vanilla's 15728850 15728850 is 0xF000D2: sky coordinate 240 and block coordinate 210, which the packed light here stores as 240 | 210 << 8 (208 was 13 * 16). Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/frames.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/horizon-client/src/game/frames.rs b/crates/horizon-client/src/game/frames.rs index f347e8151..99e82cf6d 100644 --- a/crates/horizon-client/src/game/frames.rs +++ b/crates/horizon-client/src/game/frames.rs @@ -429,8 +429,9 @@ impl Game<'_> { if let Some(id) = map { // ItemFrameRenderer: the map fills the face, in 90-degree steps. let depth = if f.invisible { 0.5 } else { 0.4375 }; - // A glow frame's map is 15728850 (sky 15, block 13), not full bright. - let item_light = if f.glow { 240 | 208 << 8 } else { packed }; + // A glow frame's map is 15728850 = 0xF000D2 (sky coordinate 240, + // block coordinate 210), not full bright. + let item_light = if f.glow { 240 | 210 << 8 } else { packed }; let m = pose * glam::DMat4::from_translation(glam::DVec3::new(0.0, 0.0, depth)) * glam::DMat4::from_rotation_z( From 7a62c6f4a7edacaee9dac576bb766c8f7bc0feaa Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Tue, 27 Oct 2026 22:46:23 +0100 Subject: [PATCH 33/39] Give the capture test's fixture the pack prompt capture() now asks the server pack prompt and the dialog; the fixture gets both, and the prompt's own case: it keeps the pointer. Co-Authored-By: Claude Opus 5.5 --- tests/test_world_input_capture.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/test_world_input_capture.py b/tests/test_world_input_capture.py index 5607c3684..e9a93ee4e 100644 --- a/tests/test_world_input_capture.py +++ b/tests/test_world_input_capture.py @@ -86,25 +86,39 @@ impl Window { struct Mouse { ignore_first: bool } impl Mouse { fn set_ignore_first_move(&mut self) { self.ignore_first = true; } } struct Remote; +#[derive(Default)] +struct ServerPacks { prompt: Option<()> } struct Game { focused: bool, agent_pointer: bool, window: Option, mouse: Mouse, captured: bool, title: Option<()>, screen: Screen, remote: Option, mining: bool, lan_acting: Option, renderer: Option, cursor: (f32, f32), + server_packs: ServerPacks, } impl Default for Game { fn default() -> Self { Self { focused: true, agent_pointer: false, window: Some(Window::default()), mouse: Mouse::default(), captured: false, title: None, screen: Screen::Playing, remote: None, mining: false, lan_acting: None, - renderer: None, cursor: (0.0, 0.0) } + renderer: None, cursor: (0.0, 0.0), server_packs: ServerPacks::default() } } } impl Game { fn stop_mining(&mut self) { self.mining = false; } fn reset_inventory_clicks(&mut self) {} + fn dialog_open(&self) -> bool { false } METHODS } fn main() { + // The server pack prompt keeps the pointer: nothing grabs it while it is open. + { + let mut game = Game::default(); + game.server_packs.prompt = Some(()); + game.capture(true); + assert!(!game.captured); + game.server_packs.prompt = None; + game.capture(true); + assert!(game.captured); + } // New and existing worlds, returning to title, and reopening a world. for remote in [false, true] { let mut game = Game::default(); From 9fe3ddfec3490907dbe1e7acf5b82f3ac03019f4 Mon Sep 17 00:00:00 2001 From: feeldev Date: Tue, 27 Oct 2026 17:26:01 -0500 Subject: [PATCH 34/39] feat(client): slim skins wear the slim player model A skin whose metadata says model slim (PlayerSkin.Model.SLIM) now draws with PlayerModel's slim layer (3-pixel arms), on other players, the local player's model, mannequins and the first-person arm. Without a skin, the profile's default skin (DefaultPlayerSkin.get) keeps its own model, so Alex and the other slim defaults are slim again. Fixes #2926 --- crates/horizon-client/src/game.rs | 15 ++++++-- crates/horizon-client/src/game/perspective.rs | 5 ++- crates/horizon-client/src/game/remote.rs | 38 ++++++++++++------- crates/horizon-client/src/mobs.rs | 3 ++ crates/horizon-client/src/mobs/render.rs | 6 ++- crates/horizon-client/src/mobs/species.rs | 1 + crates/horizon-client/src/skins.rs | 24 ++++++++++++ crates/horizon-client/src/tab_list.rs | 8 ---- 8 files changed, 73 insertions(+), 27 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 1269d8e68..a262f92fa 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -1177,6 +1177,8 @@ struct WorldRest { end_environment: Environment, behaviours: Behaviours, player_arm: Option, + /// The slim model's right arm (3 pixels wide). + player_arm_slim: Option, player_type: Option>, /// `SpinAttackEffectModel` (Riptide's spinning boxes). spin_attack: Option, @@ -1249,8 +1251,12 @@ impl Resources { fn threads(&self) -> usize { self.core.threads } - fn player_arm(&self) -> &Option { - &self.rest().player_arm + fn player_arm(&self, slim: bool) -> &Option { + if slim { + &self.rest().player_arm_slim + } else { + &self.rest().player_arm + } } fn player_type(&self) -> &Option> { &self.rest().player_type @@ -10456,7 +10462,8 @@ impl Game<'_> { if hand == Hand::Off { continue; } - let Some(arm) = self.res.player_arm().clone() else { + let slim = self.player_model.as_ref().is_some_and(|m| m.slim); + let Some(arm) = self.res.player_arm(slim).clone() else { continue; }; // The player's own skin, as the inventory's model shows it. @@ -14514,6 +14521,8 @@ fn load_world_rest( player_type: perspective::player_type(root), player_arm: horizon_client::mobs::load_model(root, "minecraft:player#main") .and_then(|m| m.children.into_iter().find(|c| c.name == "right_arm")), + player_arm_slim: horizon_client::mobs::load_model(root, "minecraft:player_slim#main") + .and_then(|m| m.children.into_iter().find(|c| c.name == "right_arm")), spin_attack: horizon_client::mobs::load_model(root, "minecraft:spin_attack#main"), }) } diff --git a/crates/horizon-client/src/game/perspective.rs b/crates/horizon-client/src/game/perspective.rs index ceb4507de..9eb56338d 100644 --- a/crates/horizon-client/src/game/perspective.rs +++ b/crates/horizon-client/src/game/perspective.rs @@ -158,7 +158,10 @@ pub(super) fn player_type(root: &Path) -> Option> { ambient_interval: 80, flags: Default::default(), model: Arc::new(model), - layers: Default::default(), + // PlayerModel's slim arms, for slim skins. + layers: horizon_client::mobs::load_model(root, "minecraft:player_slim#main") + .map(|slim| [("player_slim#main".to_owned(), Arc::new(slim))].into()) + .unwrap_or_default(), texture: "entity/player/wide/steve".into(), brain: Brain::Passive, anim: Anim::Humanoid { zombie_arms: false }, diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 4d5cf3b33..180effbb3 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3123,6 +3123,8 @@ impl Game<'_> { entries.push((local, own)); } let mut resolved: Vec<(u128, String)> = Vec::new(); + // PlayerSkin.model of each resolved skin: the textures' `slim`. + let mut slim = std::collections::HashSet::new(); for (uuid, textures) in entries { // PlayerInfo.createSkinLookup: only the local player's own skin // may be unsigned. @@ -3133,10 +3135,22 @@ impl Game<'_> { }) }; if let Some(skin) = skin { + if textures.slim { + slim.insert(uuid); + } resolved.push((uuid, skin)); } } resolved.retain(|(_, skin)| !skin.starts_with("skins/") || self.again_skin(skin)); + // PlayerInfo.getSkin: the downloaded skin and its model, else the + // profile's default skin (DefaultPlayerSkin.get), slim or wide. + let skin_of = |skins: &HashMap, uuid: u128| match skins.get(&uuid) { + Some(skin) => (skin.clone(), slim.contains(&uuid)), + None => { + let skin = horizon_client::tab_list::default_skin(uuid); + (skin.to_owned(), skin.contains("/slim/")) + } + }; let Some((level, skins, own)) = self.remote.as_mut().map(|r| { r.skins = resolved.into_iter().collect(); ( @@ -3145,30 +3159,26 @@ impl Game<'_> { .map(|(id, uuid)| (*id as u32, *uuid)) .collect::>(), r.skins.clone(), - // Without a skin, the profile's default one (DefaultPlayerSkin.get). - r.skins - .get(&r.profile) - .cloned() - .unwrap_or_else(|| horizon_client::tab_list::default_model_skin(r.profile)), + r.profile, ) }) else { return; }; for (id, uuid) in level { - let skin = skins - .get(&uuid) - .cloned() - .unwrap_or_else(|| horizon_client::tab_list::default_model_skin(uuid)); + let (skin, is_slim) = skin_of(&skins, uuid); if let Some(mob) = self .mobs .iter_mut() .find(|m| m.id == id && &*m.kind.id == "minecraft:player") { mob.skin = Some(skin); + mob.slim = is_slim; } } if let Some(mob) = self.player_model.as_mut() { - mob.skin = Some(own); + let (skin, is_slim) = skin_of(&skins, own); + mob.skin = Some(skin); + mob.slim = is_slim; } // ClientMannequin.updateSkin (PlayerSkinRenderCache.lookup): a // mannequin's DATA_PROFILE `textures` property resolves like a @@ -3218,7 +3228,7 @@ impl Game<'_> { (m.id, textures) }) .collect(); - let mut resolved: Vec<(u32, Option)> = Vec::new(); + let mut resolved: Vec<(u32, Option, bool)> = Vec::new(); for (id, textures) in mannequins { let skin = { let mut downloads = self.skin_downloads.borrow_mut(); @@ -3226,15 +3236,17 @@ impl Game<'_> { downloads.state(kind, url) }) }; - resolved.push((id, skin)); + let slim = skin.is_some() && textures.slim; + resolved.push((id, skin, slim)); } - for (id, skin) in resolved { + for (id, skin, slim) in resolved { let skin = skin.filter(|s| !s.starts_with("skins/") || self.again_skin(s)); if let Some(mob) = self .mobs .iter_mut() .find(|m| m.id == id && &*m.kind.id == "minecraft:mannequin") { + mob.slim = slim && skin.is_some(); mob.skin = skin; } } diff --git a/crates/horizon-client/src/mobs.rs b/crates/horizon-client/src/mobs.rs index db617e7c9..5d3b8dfc1 100644 --- a/crates/horizon-client/src/mobs.rs +++ b/crates/horizon-client/src/mobs.rs @@ -937,6 +937,8 @@ pub struct Mob { /// The skin texture of a player mob (`PlayerInfo.getSkin`), which /// replaces the type's default when its download is ready. pub skin: Option, + /// `PlayerSkin.model` is `SLIM`: the player model with 3-pixel arms. + pub slim: bool, /// A mannequin's `DATA_PROFILE` (ResolvableProfile): the profile's /// `textures` property resolves to `skin` like a player's. pub profile: Option, @@ -1908,6 +1910,7 @@ impl Mob { rider: None, outbox: Vec::new(), skin: None, + slim: false, profile: None, attrs: Attrs { speed: kind.speed, diff --git a/crates/horizon-client/src/mobs/render.rs b/crates/horizon-client/src/mobs/render.rs index aa47b2a96..68f6bb4e7 100644 --- a/crates/horizon-client/src/mobs/render.rs +++ b/crates/horizon-client/src/mobs/render.rs @@ -115,8 +115,9 @@ pub fn body(m: &Mob) -> (String, String) { } }; if avatar(m) { + // AvatarRenderer: PlayerModel's slim layer for a slim skin. return ( - "main".into(), + if m.slim { "player_slim#main" } else { "main" }.into(), m.skin.clone().unwrap_or_else(|| m.kind.texture.clone()), ); } @@ -784,7 +785,8 @@ pub fn layers(m: &Mob) -> Vec { /// `HumanoidArmorLayer`: the armour models of the mob's main model with the /// equipment textures (leather tinted, with its overlay). fn humanoid_armor(m: &Mob, v: &mut Vec) { - if super::equine::is_equine(m.species()) { + // A player's or mannequin's armour is drawn by the game's armour layers. + if super::equine::is_equine(m.species()) || avatar(m) { return; } let (model, _) = body(m); diff --git a/crates/horizon-client/src/mobs/species.rs b/crates/horizon-client/src/mobs/species.rs index 201632706..b2e206d77 100644 --- a/crates/horizon-client/src/mobs/species.rs +++ b/crates/horizon-client/src/mobs/species.rs @@ -1331,6 +1331,7 @@ impl Def { let mut v = vec![base]; let extra: &[&str] = match self.species { Species::Pig => &["pig_baby", "cold_pig"], + Species::Mannequin => &["player_slim"], Species::Cow => &[ "cow_baby", "cold_cow", diff --git a/crates/horizon-client/src/skins.rs b/crates/horizon-client/src/skins.rs index 76bb79f6c..0393e75d0 100644 --- a/crates/horizon-client/src/skins.rs +++ b/crates/horizon-client/src/skins.rs @@ -17,6 +17,8 @@ pub enum Signature { #[derive(Clone, Debug, Default, PartialEq, Eq)] pub struct Textures { pub skin: Option, + /// The skin's `metadata.model` is `slim` (`PlayerModelType.SLIM`). + pub slim: bool, pub cape: Option, pub elytra: Option, pub signed: bool, @@ -101,6 +103,13 @@ pub fn unpack(value: &str, signature: Signature, valid_uris: &[&str]) -> Texture if !allowed { return empty; } + if kind == "SKIN" { + out.slim = texture + .get("metadata") + .and_then(|m| m.get("model")) + .and_then(|m| m.as_str()) + == Some("slim"); + } let slot = match kind.as_str() { "SKIN" => &mut out.skin, "CAPE" => &mut out.cape, @@ -809,6 +818,21 @@ pub fn sha1(data: &[u8]) -> [u8; 20] { #[cfg(test)] mod tests { + /// `MinecraftProfileTexture.getMetadata("model")`: `slim` marks a slim + /// skin; no metadata is the wide (classic) model. + #[test] + fn a_skins_model_comes_from_its_metadata() { + use super::{Signature, TEXTURE_URIS, unpack}; + let slim = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FiYyIsIm1ldGFkYXRhIjp7Im1vZGVsIjoic2xpbSJ9fX19"; + let wide = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2FiYyJ9fX0="; + let t = unpack(slim, Signature::Signed, &TEXTURE_URIS); + assert_eq!( + t.skin.as_deref(), + Some("https://textures.minecraft.net/texture/abc") + ); + assert!(t.slim); + assert!(!unpack(wide, Signature::Signed, &TEXTURE_URIS).slim); + } #[test] fn profiles_parse_like_resolvable_profiles() { use super::{NameOrId, Signature, parse_profile}; diff --git a/crates/horizon-client/src/tab_list.rs b/crates/horizon-client/src/tab_list.rs index a8e60cd76..b6d5f3dbd 100644 --- a/crates/horizon-client/src/tab_list.rs +++ b/crates/horizon-client/src/tab_list.rs @@ -80,12 +80,6 @@ pub fn default_skin(uuid: u128) -> &'static str { SKINS[hash.rem_euclid(SKINS.len() as i32) as usize] } -/// The default skin a player model wears: `default_skin`'s character, in its wide variant, since -/// the player model has no slim arms. -pub fn default_model_skin(uuid: u128) -> String { - default_skin(uuid).replace("/slim/", "/wide/") -} - /// `blitSprite(sprite, x, y, w, h)`. fn sprite(name: &'static str, x: i32, y: i32, w: i32, h: i32) -> GuiDraw { GuiDraw::Sprite { @@ -645,8 +639,6 @@ mod tests { assert_eq!(ping_sprite(1000), "icon/ping_1"); // UUID.hashCode of 0 is 0: the first default skin. assert_eq!(default_skin(0), "entity/player/slim/alex"); - // The player model wears the same character with wide arms. - assert_eq!(default_model_skin(0), "entity/player/wide/alex"); assert!(!visible(true, true, 1, false)); assert!(visible(true, true, 1, true)); assert!(visible(true, false, 1, false)); From 9042746704f71fbdcb10ee11c1f3fa98de78226e Mon Sep 17 00:00:00 2001 From: DanielGodriNeto Date: Tue, 27 Oct 2026 20:39:24 -0300 Subject: [PATCH 35/39] perf(assets): drop the spare capacity of the sprite pixel buffer --- crates/horizon-client/src/assets.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/horizon-client/src/assets.rs b/crates/horizon-client/src/assets.rs index 99d169c93..63c237c9e 100644 --- a/crates/horizon-client/src/assets.rs +++ b/crates/horizon-client/src/assets.rs @@ -218,6 +218,8 @@ impl RenderAssets { sprites.insert(root, &format!("minecraft:block/destroy_stage_{stage}"))?; } sprites.finish(); + // `finish` grows the buffer by doubling: keep only the bytes in use. + sprites.pixels.shrink_to_fit(); Ok(Self { sprite_size: sprites.size, sprite_minimum_size: sprites.minimum_size, From 51b374121bbf82dbf8b5f90ae69ec80e5bf624d5 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Wed, 28 Oct 2026 00:46:44 +0100 Subject: [PATCH 36/39] Team merge rule: ordinary pull requests merge on CI, risky ones get needs-proof; levzzz5154 trusted The Horizon Team merges ordinary pull requests once verify and parity pass; saves, network, world generation, launcher updates, the harnesses and big changes wait for a local proof. Also names the licence holder with the contributors. Co-Authored-By: Claude Opus 5.5 --- .github/trusted-reviewers.txt | 1 + CONTRIBUTING.md | 3 +++ LICENSE | 2 +- docs/release-flow.md | 43 +++++++++++++++++++++++++++++------ tests/test_nightly_set.py | 2 +- tests/test_triage_command.py | 2 +- 6 files changed, 43 insertions(+), 10 deletions(-) diff --git a/.github/trusted-reviewers.txt b/.github/trusted-reviewers.txt index 550c528cc..48b98391f 100644 --- a/.github/trusted-reviewers.txt +++ b/.github/trusted-reviewers.txt @@ -6,3 +6,4 @@ 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) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 42959f950..abd343896 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -86,6 +86,9 @@ configuration and toolchain changes select the whole workspace; CI also keeps it 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. +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)). + Every merge to main is released automatically ([release flow](docs/release-flow.md)), so main always stays playable. How agents, checks, releases and signed updates keep this safe: [security](docs/security.md). diff --git a/LICENSE b/LICENSE index df2363379..e959a076e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2026 Ludovic +Copyright (c) 2026 Ludovic Marie and the Horizon 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 diff --git a/docs/release-flow.md b/docs/release-flow.md index 3ea4b3fcb..e5201d089 100644 --- a/docs/release-flow.md +++ b/docs/release-flow.md @@ -119,10 +119,39 @@ ones only there. ## Merging -Pull requests merge with a merge commit. The orchestrator sessions review a pull request, then turn on -auto-merge (`gh pr merge --auto --merge`): GitHub merges it once the required checks pass. Branch -protection on main requires `verify`. Branches don't have to be up to date with main: two sessions merge in -parallel, and main's own `checks` run catches the rare semantic conflict. +Pull requests merge with a merge commit, by hand: never `gh pr merge --auto`. Branch protection on main +requires `verify` for everyone, and Ludovic's review for the files `.github/CODEOWNERS` lists (what builds, signs +and ships releases). Branches don't have to be up to date with main: main's own `checks` run catches the rare +semantic conflict. + +**Who merges.** The Horizon Team (GitHub team `horizon-team`: kacpherek, levzzz5154, rdbtCVS, Online5277) and +Ludovic. The orchestrator's agents prove only the risky pull requests (below), so a contributor's ordinary pull +request doesn't wait for them. + +**An ordinary pull request merges on CI.** A Team member: + +1. reads the whole diff (for a fork, before adding `run-parity`: that runs the fork's code on a maintainer's machine); +2. adds `run-parity` to a fork's pull request; our own branches run `parity` by themselves. Since #2448 it tests + the pull request merged into main; +3. merges once `verify` and `parity` pass, nobody's change request is open, and every comment has been read (a + "don't merge" from anyone holds it). + +Never merge your own pull request: another Team member reviews and merges it. Never force-push or rebase a +contributor's branch; push a fixup commit, or merge main into it. + +**A risky pull request gets the `needs-proof` label** and waits for an agent's local proof (both single-player +paths, `lan_e2e`, a screenshot for anything visible) before it merges. Risky means any of: + +- it changes what is saved or loaded (`save.rs`, `entity_nbt.rs`, `block_entity_nbt.rs`, `region.rs`, `datafix/`): + a bug there damages players' worlds; +- the network or the server thread: `horizon-protocol`, `net.rs`, `remote*.rs`, `lan/`, `lan*.rs`, + `integrated.rs`, `levels.rs`, `dedicated*`; +- world generation (`worldgen/`): seeds must keep generating the same terrain; +- the launcher's installs and updates, or the mod runtime; +- the harnesses themselves (`tools/test_*_parity.py`, the Java oracles): a wrong harness hides regressions; +- over ~500 lines, or `parity` failed, was skipped or ran no harness for gameplay code. + +Unsure? Add `needs-proof`: it costs a few hours, a broken release costs more. `parity` becomes required once it has run green on pull requests for a while (a week without a false failure): @@ -131,7 +160,7 @@ gh api -X POST repos/horizon-rust/horizon/branches/main/protection/required_stat ``` A skipped `parity` (a fork's pull request without the label) counts as passed, so requiring it never blocks a -fork's pull request; the maintainer decides whether to run it. +fork's pull request: the Team member decides whether to run it, and a skipped run makes the pull request risky. ## Parity on main @@ -423,7 +452,7 @@ before the gate. ### Trusted reviewers One list, `.github/trusted-reviewers.txt`, governs two things for the people on it (kacpherek, rdbtCVS and -Online5277 since 2026-10-27) and for Ludovic, with no repository role: `/nightly` (below) and triage by comment. +Online5277 since 2026-10-27, levzzz5154 since 2026-10-28) and for Ludovic, with no repository role: `/nightly` (below) and triage by comment. ```text /close closes an issue as completed; a pull request is closed without merging @@ -449,7 +478,7 @@ Online5277 since 2026-10-27) and for Ludovic, with no repository role: `/nightly ### Trusted reviewers pick the Nightly's pull requests The Nightly is where contributors test pull requests before the gate. The trusted reviewers listed in -`.github/trusted-reviewers.txt` (kacpherek, rdbtCVS and Online5277 since 2026-10-27) and Ludovic pick them with a +`.github/trusted-reviewers.txt` (kacpherek, rdbtCVS and Online5277 since 2026-10-27, levzzz5154 since 2026-10-28) and Ludovic pick them with a comment on any issue or pull request (`.github/workflows/nightly-command.yml`, `tools/ci/nightly_set.py`): ```text diff --git a/tests/test_nightly_set.py b/tests/test_nightly_set.py index 4ba8d43d3..975857668 100644 --- a/tests/test_nightly_set.py +++ b/tests/test_nightly_set.py @@ -73,7 +73,7 @@ class AllowTests(unittest.TestCase): def test_the_repos_list_names_the_three_reviewers(self): reviewers = ns.read_reviewers((ROOT / ns.REVIEWERS).read_text()) - self.assertEqual(reviewers.logins, {"kacpherek", "rdbtcvs", "online5277"}) + self.assertEqual(reviewers.logins, {"kacpherek", "rdbtcvs", "online5277", "levzzz5154"}) self.assertFalse(reviewers.paused) class RefusalTests(unittest.TestCase): diff --git a/tests/test_triage_command.py b/tests/test_triage_command.py index ce73ea4de..331f9b803 100644 --- a/tests/test_triage_command.py +++ b/tests/test_triage_command.py @@ -104,7 +104,7 @@ class AllowTests(unittest.TestCase): def test_the_repos_list_is_the_nightlys(self): self.assertEqual(ns.REVIEWERS, ".github/trusted-reviewers.txt") listed = ns.read_reviewers((ROOT / ns.REVIEWERS).read_text()) - self.assertEqual(listed.logins, {"kacpherek", "rdbtcvs", "online5277"}) + self.assertEqual(listed.logins, {"kacpherek", "rdbtcvs", "online5277", "levzzz5154"}) self.assertFalse(listed.paused) From 5e14e309bc312384761be8e427473639e93db83c Mon Sep 17 00:00:00 2001 From: rdbt <87152661+rdbtCVS@users.noreply.github.com> Date: Wed, 28 Oct 2026 00:37:08 +0000 Subject: [PATCH 37/39] comment not needed --- crates/horizon-client/src/game/remote.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 44fde5dec..1aa494cab 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3489,8 +3489,6 @@ impl Game<'_> { self.sleep_timer = super::tick_sleep_timer(self.sleep_timer, self.sleeping.is_some()); // Gui.tick: the titles, the action bar and the held item's name. self.tick_hud(); - // The subtitle overlay's share of the tick: the local path has it in - // `tick_mobs`, which a server's client never reaches. self.tick_subtitles(); let entity_collisions = self.player_entity_collisions(); let pushed = self.remote_pushes(); From 5b13af2f7592ef9a2dfd0d368064f57789e88fb8 Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Wed, 28 Oct 2026 06:54:33 +0100 Subject: [PATCH 38/39] Count a minecart's comparator signal only when a detector rail reads it Every with_level built every chest and hopper cart's signal through item lookups. tick_scheduled calls it once per scheduled tick, so freshly generated forests (thousands of leaf ticks) next to mineshaft chest carts spent a large share of the server tick there. detector_rail_signal now counts the cart it reads. --- crates/horizon-client/src/game.rs | 25 +++++++++++++++------ crates/horizon-client/src/game/minecarts.rs | 18 +-------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index c97af3a47..7f5f8f62a 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -585,8 +585,8 @@ struct GameLevel<'w> { cart_boxes: Vec<([f64; 3], [f64; 3])>, /// The item frames a comparator reads through a conductor. item_frames: &'w [horizon_client::entities::ItemFrame], - /// Each minecart's kind and comparator signal, in `cart_boxes` order. - cart_signals: Vec<(minecarts::CartKind, i32)>, + /// The minecarts, in `cart_boxes` order, for a detector rail's comparator. + carts: &'w [minecarts::Minecart], /// Arrow and thrown trident boxes (wooden buttons). arrow_boxes: Vec<([f64; 3], [f64; 3])>, /// The other entities that keep blocks from being placed into them. @@ -737,7 +737,7 @@ impl GameLevel<'_> { Vec3::new(x + 0.8, y + 0.8, z + 0.8), ); let mut container = None; - for ((lo, hi), &(kind, signal)) in self.cart_boxes.iter().zip(&self.cart_signals) { + for ((lo, hi), cart) in self.cart_boxes.iter().zip(self.carts) { let cart = Aabb::new( Vec3::new(lo[0], lo[1], lo[2]), Vec3::new(hi[0], hi[1], hi[2]), @@ -745,16 +745,28 @@ impl GameLevel<'_> { if !area.intersects(cart) { continue; } - match kind { + match cart.kind { minecarts::CartKind::CommandBlock => return 0, minecarts::CartKind::Chest | minecarts::CartKind::Hopper => { - container = container.or(Some(signal)); + // Counted here, for the cart a comparator reads, not for + // every cart on every block tick. + container = container.or_else(|| Some(self.cart_signal(cart))); } _ => {} } } container.unwrap_or(0) } + /// A container minecart's comparator signal: its open menu's slots while + /// someone has it open, else its own. + fn cart_signal(&self, cart: &minecarts::Minecart) -> i32 { + let key = (i32::MAX - 15, minecarts::CART_KEY_Y, cart.id as i32); + let slots = match self.world.block_entities.get(&key) { + Some(BlockEntity::Chest(open)) => open, + _ => &cart.items, + }; + minecarts::Minecart::container_signal(slots, self.items) + } /// Every entity box that blocks building: the players who aren't /// spectators, the minecarts and the `Blockers` (a removed mob or a marker /// armor stand, whose box is empty, doesn't). @@ -2854,7 +2866,6 @@ impl Game<'_> { ) }) .collect(); - let cart_signals = self.cart_signals(); let arrow_boxes = self .creatures .projectiles @@ -2898,7 +2909,7 @@ impl Game<'_> { let mut level = GameLevel { cart_boxes, item_frames: &self.item_frames, - cart_signals, + carts: &self.carts, arrow_boxes, blockers, dropped: &self.dropped, diff --git a/crates/horizon-client/src/game/minecarts.rs b/crates/horizon-client/src/game/minecarts.rs index 9dead141c..a56f107a2 100644 --- a/crates/horizon-client/src/game/minecarts.rs +++ b/crates/horizon-client/src/game/minecarts.rs @@ -202,7 +202,7 @@ impl Minecart { self.velocity.x.hypot(self.velocity.z) } /// `AbstractContainerMenu.getRedstoneSignalFromContainer` of `slots`. - fn container_signal(slots: &[Option], items: &Items) -> i32 { + pub(super) fn container_signal(slots: &[Option], items: &Items) -> i32 { let mut total = 0.0f32; for s in slots.iter().flatten() { let max = items.get(&s.item).map_or(64, |i| i.max_stack).min(64); @@ -1029,22 +1029,6 @@ impl Game<'_> { } best } - /// Each cart's kind and comparator signal, for the detector rail - /// (`DetectorRailBlock.getAnalogOutputSignal`). A cart whose menu is open - /// counts the items in that menu. - pub(super) fn cart_signals(&self) -> Vec<(CartKind, i32)> { - self.carts - .iter() - .map(|c| { - let key = (i32::MAX - 15, CART_KEY_Y, c.id as i32); - let slots = match self.world.block_entities.get(&key) { - Some(BlockEntity::Chest(open)) => open, - _ => &c.items, - }; - (c.kind, Minecart::container_signal(slots, self.res.items())) - }) - .collect() - } /// `interact`: ride, open, fuel or ignite the cart under the crosshair. pub(super) fn interact_cart(&mut self) -> bool { let Some((i, d)) = self.cart_hit() else { From 6960b65c62f2b898d3a96bc0445402644a75c03d Mon Sep 17 00:00:00 2001 From: Kacpherek Date: Wed, 28 Oct 2026 07:07:43 +0100 Subject: [PATCH 39/39] Keep the cart and its box apart in detector_rail_signal --- crates/horizon-client/src/game.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 7f5f8f62a..1d7bbbbd6 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -738,11 +738,11 @@ impl GameLevel<'_> { ); let mut container = None; for ((lo, hi), cart) in self.cart_boxes.iter().zip(self.carts) { - let cart = Aabb::new( + let bounds = Aabb::new( Vec3::new(lo[0], lo[1], lo[2]), Vec3::new(hi[0], hi[1], hi[2]), ); - if !area.intersects(cart) { + if !area.intersects(bounds) { continue; } match cart.kind {