From 7efdbdb39a2e3b90ec8188cdaa0e9b4f1c31a9e2 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 15:42:44 +0200 Subject: [PATCH 001/140] docs: remove the surveys of other mods; mod code is never read Removes docs/performance/java-perf-mods.md (a survey of eight Java performance mods' techniques) and docs/research/java-mod-compat.md (notes on how Fabric, NeoForge and Mixin work, with a list of mods to port). Links to them now point at mods.md, which says in two lines why Java jars don't run in Horizon. docs/modpacks.md no longer lists a mod's decompiled code as an input of a port: a mod's code is never decompiled, read, quoted or paraphrased, and ports are written from the mod's observed behaviour (the oracle and the harness), its own data files and its public documentation only. Co-Authored-By: Claude Opus 5.5 --- docs/README.md | 2 +- docs/mod-browser.md | 2 +- docs/modpacks.md | 24 ++-- docs/mods.md | 7 +- docs/performance/java-perf-mods.md | 130 -------------------- docs/research/java-mod-compat.md | 183 ----------------------------- 6 files changed, 18 insertions(+), 330 deletions(-) delete mode 100644 docs/performance/java-perf-mods.md delete mode 100644 docs/research/java-mod-compat.md diff --git a/docs/README.md b/docs/README.md index 2e06b6e89..71e2a9ced 100644 --- a/docs/README.md +++ b/docs/README.md @@ -14,7 +14,7 @@ To play, use [the launcher](../launcher/README.md); the project site is [playhor - [Benchmark](benchmark.md): Horizon against vanilla 26.3 and vanilla with performance mods, on the same machine, world, path and settings: what is measured, how it is kept fair, how to reproduce it. - [Shader packs](shader-packs.md): how the renderer draws a frame, the Horizon WGSL shader pack format (stages, uniforms, `pack.toml`, hot reload), and the plan to translate OptiFine/Iris packs. - [Extras](extras.md): optional zoom, minimap, FPS and keystroke overlays and auto-reconnect, all off by default. -- [Mods](mods.md): Horizon's own mod system (Rust, sandboxed WebAssembly), how to make and install mods, and [what carries over from Java mods](research/java-mod-compat.md). +- [Mods](mods.md): Horizon's own mod system (Rust, sandboxed WebAssembly), how to make and install mods. - [Modpacks](modpacks.md): porting whole packs (ATM10 and smaller): import, inventory, carry-over, an agent per mod with a harness against the Java original, coverage, and how "10x" is measured. - [Launcher](../launcher/README.md): installs, updates and starts builds; its CLI and MCP server; releasing it. - [Versioning](versioning.md): how releases are numbered from 0.2 (`v0.2.x`, `launcher@0.2.x`), how installs from before 0.2 get there, and the steps for the day 0.2 ships. diff --git a/docs/mod-browser.md b/docs/mod-browser.md index 745f51d9b..3146fca67 100644 --- a/docs/mod-browser.md +++ b/docs/mod-browser.md @@ -6,7 +6,7 @@ packs, see how well each one runs before installing it, and install it with its ## What it offers -Horizon doesn't run Java code ([research/java-mod-compat.md](research/java-mod-compat.md)). It ports what a Java mod +Horizon doesn't run Java code ([mods.md](mods.md)). It ports what a Java mod carries as data (blocks, items, recipes, loot tables, tags, worldgen, textures, names) with `horizon-port-pack`, and says before install which of the mod's features that leaves out. Horizon `.hmod` mods aren't on Modrinth or CurseForge yet (Modrinth has no `horizon` loader). diff --git a/docs/modpacks.md b/docs/modpacks.md index c15d0767e..591c5a567 100644 --- a/docs/modpacks.md +++ b/docs/modpacks.md @@ -7,9 +7,8 @@ pipeline, not a list of hand ports. It takes a pack as players download it and p Horizon mods. The pipeline is AI agents in dependency order, each port checked against the original mod running in a dev-only Java instance. -This page is the design. It builds on [mods.md](mods.md) (the mod API, WASM in wasmtime) and -[research/java-mod-compat.md](research/java-mod-compat.md) (why Java jars and Mixins cannot -run in Horizon, so we port instead). The ATM10 inventory behind the numbers below is +This page is the design. It builds on [mods.md](mods.md) (the mod API, WASM in wasmtime, and +why Java jars cannot run in Horizon, so we port instead). The ATM10 inventory behind the numbers below is [modpacks/atm10-mods.csv](modpacks/atm10-mods.csv). ## In one picture @@ -141,12 +140,13 @@ derivative work. These rules are part of the pipeline, not advice to users: has given written permission, recorded in the index entry. The tooling refuses to package anything else. No-derivatives and non-commercial licences (14 in ATM10) are never published. For them, even a local port gets a warning that the licence may not allow it. -4. **Mod code never enters this repository.** Mod jars, decompiled sources, Java oracle builds +4. **Mod code never enters this repository, and nobody reads it.** Mod jars, Java oracle builds with mod code, and ports of mods we have no permission to publish all live outside the repo: in the user's pipeline work directory, or for our own development in - `~/code/horizon-parity/modports/` (dev-only, never pushed). Ports are written from - observed behaviour and the harness, with decompiled code as a local reference only. The - repository holds the pipeline, the API, metadata (ids, names, versions, licences, counts) + `~/code/horizon-parity/modports/` (dev-only, never pushed). A mod's code is never + decompiled, read, quoted or paraphrased, by people or agents. Ports are written only from + the mod's observed behaviour (the oracle and the harness), its own data files and its + public documentation. The repository holds the pipeline, the API, metadata (ids, names, versions, licences, counts) and test fixtures we write ourselves. 5. **Contacting authors or publishing any port is Ludovic's call.** Agents ask first. @@ -177,7 +177,7 @@ frame, chat and command hooks. Server mods do not run yet. What a content pack n | Entities: types, attributes, AI goals and brains, spawning | — | deep (87) | 0.5 | `entity` interface, AI in the mod with vanilla goals reusable | | Custom renderers and animated models (block-entity, entity, item; GeckoLib's format) | — | deep | 0.5 | data models (Bedrock geometry + animations), plus a budgeted draw-list interface for the rest | | Dimensions: dimension types, levels, chunk generators | — | about 10 (Twilight Forest, Aether, Ad Astra, Undergarden, ...) | 0.5 | JSON part with worldgen; custom generators as mod code | -| New hooks into vanilla behaviour (what Mixins do) | — | deep | as asked | each becomes a named hook, added for everyone ([java-mod-compat.md](research/java-mod-compat.md#3-a-porting-guide-outline)) | +| New hooks into vanilla behaviour (what Mixins do) | — | deep | as asked | each becomes a named hook, added for everyone | | Client interfaces: `keys`, `target`, `inventory-read`, `ui`, `render`, `world-read` | planned | client tier (38) | 0.2–0.4 | as in [mods.md](mods.md#planned-interfaces) | Two rules from mods.md stay: **the sandbox** (no files, sockets or processes; memory cap; fuel @@ -711,16 +711,16 @@ For tiers logic, machines and deep, in dependency order, as many agents at once budget allows: - **Input:** the inventory record, the carried-over data, the oracle's exports and traces, the - harness, the Horizon mod API docs, the ports of its dependencies, and the mod's decompiled - code as a local reference (dev-only, in the work directory). + harness, the Horizon mod API docs, the ports of its dependencies, and the mod's public + documentation. Never its code: the agent doesn't decompile, read or quote it. - **Output:** a Rust crate in `mods//port/` built with `cargo horizon-mod build`, and its `.hmod`. - **Loop:** write → build → run the harness → read the differences → fix, until the harness passes or the agent reports what blocks it. Usually that is an API gap, which becomes an issue against the mod API ("needs a scheduled-tick hook"), the way version ports turn differences into work items. -- **Rules:** the agent writes the port from observed behaviour and the harness, not by - transliterating decompiled Java; ports follow the mod's licence ([Licences](#licences)). +- **Rules:** the agent writes the port from observed behaviour, the harness and the mod's + own data files only; ports follow the mod's licence ([Licences](#licences)). Players without an AI agent get the carry-over tiers. A port the licence lets us publish can be downloaded instead of regenerated. diff --git a/docs/mods.md b/docs/mods.md index 4521d312d..bc91c043a 100644 --- a/docs/mods.md +++ b/docs/mods.md @@ -3,8 +3,9 @@ Horizon gets its own mod system, written in Rust and run in a sandbox, plus two ways to bring over what Java players use: native Horizon ports of popular mods and the data-driven parts of packs and mods. Fabric and NeoForge jars do -**not** run as they are: [research/java-mod-compat.md](research/java-mod-compat.md) -explains why and what we do instead. +**not** run as they are: their code calls and patches Minecraft's Java classes, and +Horizon has none. What carries over is the data and assets inside a jar +([modpacks.md](modpacks.md)). Mods are **off and absent by default**. A fresh install has no `horizon-mods` folder, loads no runtime and plays exactly like vanilla 26.3. @@ -102,7 +103,7 @@ name (the mod reads it as `args`; API 0.1 has no way to declare argument types). ### Planned interfaces Each is a new capability, added in a 0.x minor version so older mods keep -loading. Ordered by what the first native ports need ([research](research/java-mod-compat.md#port-first)): +loading. Ordered by what the first native ports need: | Interface | For | Notes | |---|---|---| diff --git a/docs/performance/java-perf-mods.md b/docs/performance/java-perf-mods.md deleted file mode 100644 index 62aab88a1..000000000 --- a/docs/performance/java-perf-mods.md +++ /dev/null @@ -1,130 +0,0 @@ -# Java performance mods: which of their techniques apply to Horizon - -A survey of the techniques used by eight Java Edition performance mods. Asked for in #991, from famescare on Discord. For each technique it gives the vanilla cost it targets, whether Horizon already avoids that cost, and whether it is worth measuring here. - -**Rules.** Techniques only, taken from each mod's public description, documentation and changelogs (linked below). No mod code was read or copied. Several of these mods are LGPL-3.0, and Horizon's code stays its own. Anything Horizon adopts is reimplemented against vanilla 26.3's behaviour. It keeps parity, so the harnesses stay unchanged, and it needs before/after numbers like any other perf PR (`docs/benchmark.md`, `docs/profiling.md`). - -**Why many don't apply.** A large share of these techniques work around costs of the JVM, OpenGL or GLFW rather than costs of the game's rules. Examples are object headers and duplicate objects, boxing, lambdas and Streams, garbage collection, JNI upcalls, immediate-mode GL draws and GL error checks. Horizon is Rust on wgpu and winit, so it never pays those costs. The techniques that do carry over remove work the game's rules don't need: sleeping block entities, skipped searches, and cheaper geometry tests. - -Verdicts: -- **has**: Horizon already avoids the cost, by its design or with a merged change. -- **n/a**: the cost comes from the JVM, OpenGL or GLFW, and Horizon doesn't have it. -- **later**: missing, and worth measuring. These are listed in "Worth measuring" below and in the LATER list. -- **no**: missing, but it would change vanilla's behaviour or look, or the gain here is too small to pay for itself. - -## Lithium (server and shared game logic) - -Source: [Lithium's mixin configuration](https://github.com/CaffeineMC/lithium/blob/develop/lithium-fabric-mixin-config.md). Lithium keeps vanilla's behaviour, which is the same rule Horizon follows. - -| Technique | Vanilla cost | Horizon | Verdict | -| --- | --- | --- | --- | -| Hopper caching, inventory change listeners and hopper sleeping | Every hopper looks up its source and target containers and tries a transfer every tick, even when nothing can move | `game/machines.rs` ticks every hopper on each tick. It checks the block's name and cooldown, then runs the transfer attempt. Nothing is cached or put to sleep | **later** | -| Block entity sleeping (furnaces, brewing stands, campfires, crafters, shulker boxes, sculk) | Idle block entities still tick | `game/block_entity_ticks.rs` ticks every ticker each tick, as vanilla does | **later** | -| Entity collisions: faster block access, chunk caching, the supporting block first | Collision scans read blocks through generic level lookups | Collision scans already run over Horizon's own section arrays (`horizon-world` `block_collision_scan`). A counting cursor that does fewer lookups is open as #659 | **has** (more in #659) | -| Specialised cuboid and empty `VoxelShape`s, precomputed shape arrays | Generic voxel shape intersection and merging | `horizon-core::geometry` has its own immutable shapes and box lists (`docs/collision-geometry.md`) | **has** | -| POI search and portal search | POI lookups go through vanilla's stream-heavy search | Section-indexed POIs (`poi_sections.rs`), searched in vanilla's order | **has** | -| Pathfinding: cached node types per block | Node evaluation reads the same blocks over and over | Not measured. Mob pathfinding costs haven't been profiled against vanilla yet | **later** (profile first) | -| Explosions: one access per block on a ray, skip air, skip exposure work | Each ray step reads the block and the fluid again | `game/explosion.rs` follows vanilla's loop. It hasn't been profiled, and TNT chains are the case to measure | **later** (profile first) | -| Random ticks: roll the chance early, fast block search | Sections with nothing that ticks randomly are still walked | Sections with nothing random-tickable are skipped (`docs/random-tick-eligibility-benchmark.md`) | **has** | -| Tick scheduler: faster collections, packed scheduled ticks | Boxed `ScheduledTick` objects in hash sets | Horizon's own tick heap and index (`horizon-core::ticks`, `docs/scheduled-ticks.md`) | **has** | -| Collections and allocation (fastutil maps, cached `values()`, fewer `BlockPos`, no Streams) | JVM allocation, boxing, GC | Rust value types, no GC | **n/a** | -| Math inlining, a smaller sine table | JIT inlining limits | Compiled and inlined by rustc. Horizon keeps vanilla's `Mth.sin` table where results depend on it | **n/a** | -| Chunk access without debug locks or bounds validation | `PalettedContainer`'s thread-check lock | Horizon doesn't have that lock (`docs/performance/paletted-container-access-results.md`) | **n/a** | -| Palette replacement and compaction | Hash palette resizing on the JVM | Horizon's own paletted containers (`horizon-core::paletted`) | **has** | -| Game event dispatchers made only for sections with a listener | Every section holds a dispatcher | Not checked. This is small next to the items above | **no** (until a profile shows it) | -| Item entity merging grouped by item type (experimental) | Each item entity checks every nearby item to merge with | Not present. It matters only with thousands of dropped items (see #996: fresh worlds drop about twice as many items as vanilla) | **later**, after #996 | -| World border cache, redstone wire double reads, fluid flow reads, framed-map scans | Small repeated reads | Each is minor. Fix them where a profile points at them | **no** | - -## FerriteCore (memory) - -Source: [FerriteCore's summary of its changes](https://github.com/malte0811/FerriteCore/blob/main/summary.md). - -| Technique | Vanilla cost | Horizon | Verdict | -| --- | --- | --- | --- | -| One `FastMap` of neighbour states per block instead of a table per state | About 600 MB of per-state neighbour tables in large packs | Block states are numeric ids with flat tables, with no object per state | **n/a** | -| Compact property storage per state | A per-state `ImmutableMap` | Same as above | **n/a** | -| Cached multipart predicates, shared multipart models | Hundreds of thousands of model and predicate objects | Models are baked once into a shared library (`docs/shared-model-library-benchmark.md`) | **has** | -| Deduplicated baked-quad vertex arrays | Identical `int[]` per quad | Section meshes are built per section from the shared baked models, and no per-quad arrays are kept | **has** | -| Deduplicated shape caches | Duplicate cached `VoxelShape`s per state | One table of distinct shapes, indexed per state (`horizon-world` `CachedCollisionRegistry`) | **has** | -| String deduplication in model locations | Duplicate `String`s from the constructor's round-trips | No `ModelResourceLocation` objects, so the round-trip doesn't exist | **n/a** | -| Partly loaded chunk NBT kept between loading steps | The whole tag is kept | Chunks are decoded into Horizon's own structures | **n/a** | - -Horizon's process memory is tracked against vanilla in `docs/process-memory.md`. - -## ImmediatelyFast (client draw submission) - -Source: [ImmediatelyFast on Modrinth](https://modrinth.com/mod/immediatelyfast). Its gains show only when the CPU is the bottleneck. - -| Technique | Vanilla cost | Horizon | Verdict | -| --- | --- | --- | --- | -| A batching buffer for immediate-mode draws (entities, block entities, particles, text, GUI) | Many small draw calls and uploads | The HUD is one atlas and one batch of quads (`hud.rs`). Entities are grouped by material (`gfx/entity_batch.rs`). Terrain uses indirect multi-draws (`gfx.rs`, `gfx/flat.rs`) | **has** | -| HUD batching, fewer GUI draw calls | One draw per GUI element | Same batch (`hud.rs`) | **has** | -| Fast text lookup, a bigger font atlas | Per-character lookups, atlas thrash with large fonts | Glyphs live in maps in `font.rs`, drawn into the same HUD atlas | **has** | -| One texture for all map item textures | One texture per visible map | Not measured. It matters only with walls of maps in item frames | **later** (with a map-wall scene) | -| Cached closed-chest geometry | Re-tessellating chests each frame | Merged in #728 (Online5277) | **has** | -| Buffered sign text instead of redrawing it each frame | Text redrawn every frame | Sign text is recorded as text calls in the batch. Not measured with sign-heavy scenes | **later** (with a sign-heavy scene) | -| Fewer framebuffer switches | GL state changes between render types | wgpu render passes are fixed by Horizon's pipeline | **n/a** | -| GL error checking off | `glGetError` overhead | No GL. Release builds run without wgpu's backend validation and, outside DirectX 12, without its indirect-draw validation (`gfx.rs` `instance_descriptor`) | **n/a** | - -## Gnetum (HUD rendering) - -Source: [Gnetum on Modrinth](https://modrinth.com/mod/gnetum). - -| Technique | Vanilla cost | Horizon | Verdict | -| --- | --- | --- | --- | -| Draw the HUD into an offscreen buffer in several passes, one pass per frame, and show the last complete buffer | The HUD is redrawn every frame | Horizon redraws its one HUD batch every frame | **no**. The HUD would then update at a lower rate than vanilla's, which changes what players see. Horizon's HUD is already one batch. | -| Adaptive distribution and a separate HUD FPS cap | Same | Same | **no**, for the same reason | - -## ScalableLux (lighting, from Starlight) - -Source: [ScalableLux on Modrinth](https://modrinth.com/mod/scalablelux). - -| Technique | Vanilla cost | Horizon | Verdict | -| --- | --- | --- | --- | -| Starlight's light engine: per-section light arrays and direct propagation queues | Vanilla's light engine is a bottleneck in fast chunk generation | Horizon has its own engine with vanilla's rules (`light.rs`). New chunks are lit on the streaming worker pool, and edits are relit incrementally (`relight_block`). See `docs/performance/lighting-worker-results.md` | **has** | -| Parallel light updates | One light thread | Chunk lighting already runs on several workers during streaming | **has**. Measure the light share of fresh-chunk generation before doing more. | - -## Structure Layout Optimizer (jigsaw structures) - -Source: [Structure Layout Optimizer on Modrinth](https://modrinth.com/mod/structure-layout-optimizer). - -| Technique | Vanilla cost | Horizon | Verdict | -| --- | --- | --- | --- | -| An octree of piece boxes instead of a `VoxelShape` for free space | Voxel shape boolean ops slow down as pieces add up | Free space is a container box minus a list of placed boxes (`worldgen/structure/jigsaw.rs` `Free`). That avoids the voxel shapes, but the scan is linear per test | **has**. An octree pays only for structures with hundreds of pieces. | -| Skip jigsaw blocks that face the structure boundary or another piece | Every parent jigsaw is matched against every child | Not present | **later** (time trial chambers and ancient cities first) | -| Skip pool elements already found not to fit at this spot | Weighted pools repeat an element once per weight point, and it is re-tested each time | Not present. Only the variant that keeps the result identical applies (no deduplication of the list, which changes layouts) | **later** | -| Cull positions outside the chunk before processors run | Whole templates are processed and then mostly discarded | Not checked | **later** (same measurement) | -| Palette-based template storage | Templates keep every block and NBT object | Templates are Horizon's own structures. Memory isn't measured | **no** (until memory shows it) | - -## AsyncParticles (particles) - -Source: [AsyncParticles on Modrinth](https://modrinth.com/mod/asyncparticles). - -| Technique | Vanilla cost | Horizon | Verdict | -| --- | --- | --- | --- | -| Particle culling | Off-screen particles are built anyway | Vanilla already skips quad particles whose position is outside the frustum (`QuadParticleGroup.extractRenderState`, `Frustum.pointInFrustum`). Horizon builds every particle's quad (`particles.rs` `render`). This is a parity gap as well as a cost | **later** (vanilla's frustum point test) | -| Vertex transformation on the GPU | Every particle's quad is built on the CPU and uploaded every frame | Same in Horizon (`particles.rs` `render`). Instancing would upload one record per particle | **later** (measure with 10k+ particles) | -| Particle ticks on another thread | Particle ticks on the client thread | Horizon ticks particles on the game thread | **no**. Vanilla's particle ticks read the level, and racing them against block changes risks parity. Revisit only if a profile shows particle ticks are big. | -| Asynchronous light cache for particles | A light lookup per particle per frame | `particles.rs` looks light up per particle | **later**, with the item above | -| Texture animation one frame late | Animated textures tick on the client tick | Not adopted | **no**, because it changes timing | - -## Ixeris (input and the render thread) - -Source: [Ixeris on Modrinth](https://modrinth.com/project/p8RJPJIC). - -| Technique | Vanilla cost | Horizon | Verdict | -| --- | --- | --- | --- | -| Event polling on the main thread, rendering on its own thread | GLFW event polling and JNI upcalls take time from rendering | winit, without JNI. Input and rendering share the event loop (`game.rs`, `ApplicationHandler`) | **n/a** for the JNI part | -| Buffered raw input (`GetRawInputBuffer`) | One `GetRawInputData` call per event. An 8000 Hz mouse costs a lot on Windows | winit reads `WM_INPUT` one message at a time | **later**. Measure on Windows with a high-polling-rate mouse before changing it. | -| Cached GLFW state | Round trips to the main thread | No GLFW | **n/a** | -| A frame limiter that sleeps, then spins | Imprecise sleeps | Horizon has its own limiter | **no** (no reported problem) | - -## Worth measuring - -Each of these needs a profile or a benchmark first. They are ordered by the expected gain. They are in the LATER list in `~/code/horizon-parity/FEATURES.md`, not filed as issues: - -1. Hopper and block-entity sleeping, with vanilla-identical results (Lithium). Benchmark: a hopper and furnace array. -2. Particles: vanilla's frustum point test (a parity fix too), then GPU-built quads (AsyncParticles). Benchmark: 1,000+ campfires. -3. Jigsaw placement: skip blocked connectors and already-failed elements without changing the layout (Structure Layout Optimizer). Benchmark: trial chambers and ancient cities in fresh worlds, `docs/generation-scan-benchmark.md`. -4. Windows raw input in batches for high-polling-rate mice (Ixeris). Benchmark: an 8000 Hz mouse on Windows. -5. Profile before choosing a technique: mob pathfinding, TNT explosions, item merging after #996, map walls and sign-heavy scenes. diff --git a/docs/research/java-mod-compat.md b/docs/research/java-mod-compat.md deleted file mode 100644 index 8a36b7c48..000000000 --- a/docs/research/java-mod-compat.md +++ /dev/null @@ -1,183 +0,0 @@ -# Java mods and Horizon: what can carry over - -Players ask "will my mods work?". Short answer: **Fabric and NeoForge jars -will not run in Horizon as they are**, and no bridge we could build would -change that for more than a handful of mods. What carries over is the -*content* (data packs, resource packs, the data and assets inside mod jars) -and the *ideas* (native Horizon ports of the mods people use most, written -with [Horizon's own mod system](../mods.md)). This page is the reasoning. - -## How Java mods work - -### Fabric - -- **Fabric Loader** finds jars in `mods/`, reads `fabric.mod.json` - (entrypoints, dependencies, mixin configs, access wideners), and starts the - game through a class loader that can rewrite classes as they load. -- **Mixin** (SpongePowered) is how nearly every mod changes the game: a mixin - class names a Minecraft class (`net.minecraft.client.gui.hud.InGameHud`) and - injects code at points inside its methods (`@Inject(method = "render", at = - @At("TAIL"))`, `@Redirect`, `@ModifyVariable`, `@Overwrite`...). The bytecode - of the vanilla class is rewritten at load time. Access wideners make private - fields and methods public for the same purpose. -- **Fabric API** is a set of modules that give mods events and registries - instead of raw mixins: `fabric-lifecycle-events` (`ClientTickEvents`, - `ServerTickEvents`), `fabric-rendering` (`HudRenderCallback`, - `WorldRenderEvents`), `fabric-command-api`, `fabric-key-binding-api`, - `fabric-networking-api` (custom payloads), `fabric-registry-sync`, - `fabric-resource-loader`, `fabric-screen-api`, `fabric-item-group`, - `fabric-events-interaction` and about forty more. **Fabric API itself is - implemented with mixins** into the same vanilla classes. -- Mods mix the two freely: a mod using Fabric API events still calls - `MinecraftClient.getInstance().player.getBlockPos()`, - `world.getBlockState(pos)`, `DrawContext.drawText(...)`: direct calls into - vanilla's classes, by their mapped names. - -### NeoForge (and Forge) - -- An event bus (`NeoForge.EVENT_BUS`, mod buses) with hundreds of events, - `DeferredRegister` for registries, data attachments and capabilities, - networking payloads, config specs. NeoForge patches vanilla's source - directly (binary patches) to fire its events. -- Mods also use mixins and access transformers, and call vanilla classes - directly, as on Fabric. - -### Data and assets in a jar - -Besides code, a mod jar carries the same folders as packs: -`assets//` (models, blockstates, textures, sounds, language files, -shaders) and `data//` (recipes, loot tables, tags, advancements, -predicates, functions, worldgen: biomes, features, structures). These are -**vanilla formats**, read by vanilla's own code. - -## Why a Java bridge cannot run them - -Horizon is a reimplementation in Rust: there are no `net.minecraft` classes -at runtime, no `InGameHud`, no `ClientPlayerEntity`, no bytecode to rewrite. - -1. **Mixins have nothing to bind to.** A mixin is a patch against a specific - method's bytecode. Without vanilla's classes there is no method, no - injection point and no local variable to modify. This is not a missing - feature we could add: it is the mechanism itself. -2. **Fabric API is mixins too.** A shim Fabric API would have to be - re-implemented from scratch as Java classes calling into Horizon. That part - alone is possible for the event modules. -3. **Mods call vanilla directly.** Even "pure Fabric API" mods use vanilla's - classes for everything else: the player, the world, the block states, the - renderer, the text drawing. Running them means providing Java classes with - vanilla's names and behaviour, backed by Horizon's state: in effect a - second Minecraft, in Java, on top of Horizon. Thousands of classes, in the - mapped names of every mapping set (Yarn, Mojang, intermediary), version by - version. -4. **The JVM itself** would ship with every install (a trimmed JRE is still - 40-60 MB, the full one 150+ MB), start in a second or more, hold a few - hundred MB of heap before any mod loads, and bring garbage-collector pauses - back into the frame: the costs Horizon exists to remove. JNI calls cost - tens to hundreds of nanoseconds each and every one crosses with copies. -5. **No sandbox.** Java mods are fully trusted native-speed code with file - and network access. Horizon's mods are sandboxed and their permissions are - shown; a Java bridge would be the one hole in that. - -**What a bridge could support**, if we ever built one: a stable subset of -Fabric API events (client and server tick, HUD render callback, client -commands, key bindings, custom payloads), with a tiny "vanilla view" API -(player position, held item, chat), for mods written only against that -subset. Surveying the most-downloaded Fabric mods, nearly none qualify: the -popular ones are popular precisely because they reach into rendering, the -world or the UI. The cost (a JVM in the game, a second API surface to keep -stable) is far above the benefit. **We do not build it.** If that changes, -the bridge would sit on top of the WIT API like any other mod runtime, so the -sandbox would still hold. - -## What we do instead - -### 1. Data-driven content (packs and the data in mod jars) - -Horizon already reads vanilla resource packs and data packs (functions, -function tags, predicates today). Extending data-pack coverage to recipes, -loot tables, tags, advancements and worldgen JSON brings most "content" -packs over with no mod code at all, and it is vanilla behaviour, so the parity -harnesses check it. - -For **Fabric/NeoForge jars**, the launcher can offer "import the data": read -`data/` and `assets/` from the jar and load them as a data pack plus a -resource pack. What works: new recipes, loot changes, tags, advancements, -functions, worldgen tweaks that only use vanilla blocks, retextures, language -files. What does not: anything referring to a block, item or entity the jar -registers in Java code (the ids do not exist); the import skips those files and -lists them. With Horizon's planned `registries` interface, a native port can -register those ids and reuse the jar's JSON models, textures, recipes and loot -as they are. - -### 2. Native Horizon ports of popular mods - -Horizon itself covers the performance mods: Sodium, Lithium, FerriteCore, -ModernFix, EntityCulling and ImmediatelyFast exist because vanilla Java is -slow, and Horizon's renderer and simulation are the replacement (see -[benchmark](../benchmark.md)). Zoom (OK Zoomer, Zoomify), FPS and keystroke -overlays, a minimap and auto-reconnect are already built in as -[extras](../extras.md). - -#### Port first - -Ranked by players reached per unit of API work. Each needs the planned -interfaces listed in [mods.md](../mods.md#planned-interfaces). - -| Mod (Java) | What it does | Horizon port | Needs | -|---|---|---|---| -| **Mod Menu** | list mods, open their settings | built in: Options > Mods (done), settings pages next | `ui` | -| **AppleSkin** | food saturation and exhaustion on the HUD and tooltips | SDK mod | `inventory-read`, `ui` | -| **Jade / WTHIT** | what the crosshair points at: block, entity, harvest tool, container contents | SDK mod | `target`, `ui` | -| **JEI / EMI / REI** | browse items, recipes and uses | SDK mod (or built in: Horizon already has the recipe book's data) | `recipes`, `inventory-read`, `ui` | -| **Xaero's Minimap / JourneyMap** | minimap, world map, waypoints | the minimap is an extra; a world map and waypoints as an SDK mod | `world-read`, `render`, `storage` | -| **Litematica** | schematic overlay to build from | SDK mod | `world-read`, `render`, `storage`, `ui` | -| **Mouse Tweaks / Inventory Profiles Next** | drag and sort inventory | built in or SDK mod | `inventory-read` + a sanctioned click API | -| **Continuity / CIT** | connected and custom item textures | built into the renderer (pack formats) | none: resource-pack features | -| **Distant Horizons** | low-detail far terrain | a Horizon renderer feature, not a mod | none | -| **Iris + shader packs** | shaders | a Horizon renderer feature (wgpu shader pipeline), later | none | -| **Simple Voice Chat** | proximity voice | server + client mod | `server`, `net`, audio (later) | - -### 3. A porting guide (outline) - -To be written as `docs/porting-from-fabric.md` once API 0.2 lands: - -1. **Separate logic from glue.** Most of a mod is plain logic (maths, - formatting, data structures): port it to Rust once, unit-test it on the - host. -2. **Map events.** - - | Fabric | Horizon | - |---|---| - | `ClientModInitializer.onInitializeClient` | `Mod::init`, returning a `Registration` | - | `ClientTickEvents.END_CLIENT_TICK` | `Registration::on_tick`, `Mod::tick` | - | `HudRenderCallback` | `hud::set_panel` when the content changes (retained), or `on_frame` | - | `ClientCommandRegistrationCallback` | `Registration::command`, `Mod::command` | - | `ClientReceiveMessageEvents` | `Registration::on_chat`, `Mod::chat` | - | `KeyBindingHelper.registerKeyBinding` | `keys` (planned) | - | `Registry.register(Registries.ITEM, ...)` | `registries` (planned) with JSON in `data/` | - | `ServerPlayNetworking` payloads | `net` (planned) | - | config libraries (Cloth Config, YACL) | `storage` + a `ui` settings page (planned) | - -3. **Replace mixins with hooks.** For each mixin, write down what it observes - or changes. If a WIT hook covers it, use the hook. If not, open an issue - asking for the hook ("I need X before/after Y"): hooks are added to the API - for everyone instead of each mod patching the game. -4. **Declare capabilities** in `horizon-mod.toml`, the least the mod needs. -5. **Reuse assets**: textures, models, language files and recipes move as - they are into the `.hmod`'s `assets/` and `data/` (with `registries`). -6. **Test** with `cargo horizon-mod run` and hot reload; add unit tests for the - logic; publish with a signed `.hmod`. - -## Sources - -- Fabric documentation (`docs.fabricmc.net`): mod structure, Mixin - introduction, Fabric API modules and events. -- SpongePowered Mixin wiki: injection points and how class transformation - works. -- NeoForge documentation (`docs.neoforged.net`): events, registries, - networking. -- Modrinth's most-downloaded Fabric mods, for the porting list. -- Horizon's own Java test mod (`mods/horizon`, built by `tools/build_mod.py` - and the CI `portable-mod` job) is a Fabric mod used by the benchmarks and - parity oracles: it shows the Mixin pattern (`FrameHookMixin`) this page - describes, and stays a developer tool, not a player-facing mod. From 717acb07af64e18299b1c20dfc3e236cba263c04 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 15:55:06 +0200 Subject: [PATCH 002/140] Graphics: remove Cull Leaves, which was adapted from the CullLeaves mod The opt-in Cull Leaves setting (#420, from #387) was adapted from the CullLeaves mod's code (MIT, credited in THIRD_PARTY_NOTICES.md). Horizon doesn't build on another mod's code, so it goes, with its notice. Leaves now follow vanilla only: with opaque leaves (cutoutLeaves off) the faces between two leaf blocks are skipped (LeavesBlock.skipRendering), as before #420 and as the setting's Off did. Mangrove roots keep every face. An old options file's cullLeaves line is ignored. Co-Authored-By: Claude Opus 5.5 --- THIRD_PARTY_NOTICES.md | 30 ----- .../examples/probe/section_mesh_fixture.rs | 1 - crates/horizon-client/src/game.rs | 14 +- .../horizon-client/src/game/world_loading.rs | 1 - crates/horizon-client/src/graphics.rs | 10 +- crates/horizon-client/src/graphics_ui.rs | 51 ------- crates/horizon-client/src/mesher.rs | 15 +-- .../src/mesher/leaf_culling_tests.rs | 126 ------------------ .../src/mesher/visibility_tests.rs | 1 - crates/horizon-client/src/streaming.rs | 5 - .../horizon-client/tests/streaming_meshes.rs | 1 - 11 files changed, 7 insertions(+), 248 deletions(-) delete mode 100644 crates/horizon-client/src/mesher/leaf_culling_tests.rs diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 88d3197af..63a1f7da3 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -1,35 +1,5 @@ # Third-party notices -## CullLeaves - -The optional leaf and mangrove-root face-culling behavior is adapted from -[CullLeaves](https://github.com/TeamMidnightDust/CullLeaves) by MidnightDust. -Its MIT license is reproduced below. - -```text -MIT License - -Copyright (c) 2020 MidnightDust - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` - ## wgpu-hal `third_party/wgpu-hal` is [wgpu-hal](https://github.com/gfx-rs/wgpu) 30.0.1 by the gfx-rs diff --git a/crates/horizon-client/examples/probe/section_mesh_fixture.rs b/crates/horizon-client/examples/probe/section_mesh_fixture.rs index 98a4fdc34..e212a5268 100644 --- a/crates/horizon-client/examples/probe/section_mesh_fixture.rs +++ b/crates/horizon-client/examples/probe/section_mesh_fixture.rs @@ -136,7 +136,6 @@ fn scene( blend_radius, smooth_lighting, cutout_leaves, - cull_leaves: false, }; let section_y = int(&row["section_y"])?; let started = Instant::now(); diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 7ac3d0829..39c921187 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -9100,21 +9100,11 @@ impl Game<'_> { // Options.biomeBlendRadius, ambientOcclusion and cutoutLeaves: // LevelExtractor.allChanged when they change. let (s, st) = (&self.settings, &self.streaming); - let remesh = ( - s.biome_blend, - s.smooth_lighting, - s.cutout_leaves, - s.horizon.cull_leaves, - ) != ( - st.biome_blend, - st.smooth_lighting, - st.cutout_leaves, - st.cull_leaves, - ); + let remesh = (s.biome_blend, s.smooth_lighting, s.cutout_leaves) + != (st.biome_blend, st.smooth_lighting, st.cutout_leaves); self.streaming.biome_blend = self.settings.biome_blend; self.streaming.smooth_lighting = self.settings.smooth_lighting; self.streaming.cutout_leaves = self.settings.cutout_leaves; - self.streaming.cull_leaves = self.settings.horizon.cull_leaves; if remesh { self.all_sections_changed(); } diff --git a/crates/horizon-client/src/game/world_loading.rs b/crates/horizon-client/src/game/world_loading.rs index ecbee08a8..bd9ae7caa 100644 --- a/crates/horizon-client/src/game/world_loading.rs +++ b/crates/horizon-client/src/game/world_loading.rs @@ -245,7 +245,6 @@ pub(super) fn make_streaming( streaming.biome_blend = settings.biome_blend; streaming.smooth_lighting = settings.smooth_lighting; streaming.cutout_leaves = settings.cutout_leaves; - streaming.cull_leaves = settings.horizon.cull_leaves; streaming.biome_zoom = BiomeZoom::new(obfuscate_seed(seed)); streaming.sky_light = dim != Dim::Nether; streaming.nether_shading = dim == Dim::Nether; diff --git a/crates/horizon-client/src/graphics.rs b/crates/horizon-client/src/graphics.rs index ba492ece8..ce143051a 100644 --- a/crates/horizon-client/src/graphics.rs +++ b/crates/horizon-client/src/graphics.rs @@ -227,8 +227,6 @@ pub struct Graphics { pub far_detail: FarDetail, /// Skip sections hidden behind closed ones (vanilla's occlusion graph). pub cave_culling: bool, - /// Hide shared leaf and mangrove-root faces, reducing foliage density. - pub cull_leaves: bool, /// Skip drawing entities hidden behind opaque terrain. pub entity_culling: bool, /// Meshed sections uploaded per frame; 0 uploads all that are ready. @@ -265,7 +263,6 @@ impl Default for Graphics { lod_distance: 0, far_detail: FarDetail::Full, cave_culling: true, - cull_leaves: false, entity_culling: false, chunk_updates: 0, upload_budget_kib: 0, @@ -312,7 +309,6 @@ impl Graphics { "lodDistance" => g.lod_distance = number(g.lod_distance).min(1024), "farDetail" => g.far_detail = FarDetail::parse(value), "caveCulling" => g.cave_culling = flag(g.cave_culling), - "cullLeaves" => g.cull_leaves = flag(g.cull_leaves), "entityCulling" => g.entity_culling = flag(g.entity_culling), "chunkUpdates" => g.chunk_updates = number(g.chunk_updates).min(512), "uploadBudgetKiB" => g.upload_budget_kib = number(g.upload_budget_kib).min(65536), @@ -348,12 +344,11 @@ impl Graphics { } pub fn serialize(&self) -> String { format!( - "preset:{}\nlodDistance:{}\nfarDetail:{}\ncaveCulling:{}\ncullLeaves:{}\nentityCulling:{}\nchunkUpdates:{}\nuploadBudgetKiB:{}\nsky:{}\nfog:{}\nweather:{}\nanimatedTextures:{}\npresentMode:{}\nframePacing:{}\nworkers:{}\noverlay:{}\nresolutionScale:{}\nfxaa:{}\nbatteryMode:{}\nshaderPack:{}\ngraphicsApi:{}\n", + "preset:{}\nlodDistance:{}\nfarDetail:{}\ncaveCulling:{}\nentityCulling:{}\nchunkUpdates:{}\nuploadBudgetKiB:{}\nsky:{}\nfog:{}\nweather:{}\nanimatedTextures:{}\npresentMode:{}\nframePacing:{}\nworkers:{}\noverlay:{}\nresolutionScale:{}\nfxaa:{}\nbatteryMode:{}\nshaderPack:{}\ngraphicsApi:{}\n", self.preset.name(), self.lod_distance, self.far_detail.name(), bool_text(self.cave_culling), - bool_text(self.cull_leaves), bool_text(self.entity_culling), self.chunk_updates, self.upload_budget_kib, @@ -454,7 +449,6 @@ mod tests { lod_distance: 256, far_detail: FarDetail::Reduced, cave_culling: false, - cull_leaves: true, entity_culling: true, chunk_updates: 12, upload_budget_kib: 4096, @@ -477,7 +471,7 @@ mod tests { // The old menus' Simple / Advanced choice is ignored. assert_eq!(Graphics::parse("level:advanced\n"), Graphics::default()); assert_eq!( - Graphics::parse("workers:abc\nsky:maybe\ncullLeaves:maybe\nentityCulling:maybe\n"), + Graphics::parse("workers:abc\nsky:maybe\ncullLeaves:true\nentityCulling:maybe\n"), Graphics::default() ); } diff --git a/crates/horizon-client/src/graphics_ui.rs b/crates/horizon-client/src/graphics_ui.rs index 6617ef009..b5687ae1c 100644 --- a/crates/horizon-client/src/graphics_ui.rs +++ b/crates/horizon-client/src/graphics_ui.rs @@ -24,7 +24,6 @@ pub enum H { LodDistance, FarDetail, CaveCulling, - CullLeaves, EntityCulling, ChunkUpdates, UploadBudget, @@ -144,11 +143,6 @@ pub fn rows(level: Level) -> Vec { Saves, "Skips terrain hidden behind closed sections. Off costs a lot.", ), - h( - H::CullLeaves, - None, - "Hides shared leaf and mangrove root faces; foliage can look less dense.", - ), h( H::EntityCulling, None, @@ -350,7 +344,6 @@ impl H { }, H::FarDetail => labelled("Far Detail", g.far_detail.label()), H::CaveCulling => labelled("Cave Culling", on_off(g.cave_culling)), - H::CullLeaves => labelled("Cull Leaves", on_off(g.cull_leaves)), H::EntityCulling => labelled("Entity Culling", on_off(g.entity_culling)), H::ChunkUpdates => match g.chunk_updates { 0 => labelled("Chunk Updates", "Unlimited"), @@ -429,7 +422,6 @@ impl H { g.far_detail = step(&[FarDetail::Full, FarDetail::Reduced], g.far_detail, back) } H::CaveCulling => g.cave_culling = !g.cave_culling, - H::CullLeaves => g.cull_leaves = !g.cull_leaves, H::EntityCulling => g.entity_culling = !g.entity_culling, H::Sky => g.sky = !g.sky, H::Fog => g.fog = !g.fog, @@ -466,7 +458,6 @@ impl Item { let g = &s.horizon; Some(match self { Item::Horizon(H::CaveCulling) => g.cave_culling, - Item::Horizon(H::CullLeaves) => g.cull_leaves, Item::Horizon(H::EntityCulling) => g.entity_culling, Item::Horizon(H::Sky) => g.sky, Item::Horizon(H::Fog) => g.fog, @@ -1058,48 +1049,6 @@ mod tests { assert_eq!(s.horizon.upload_budget_kib, 0); } - #[test] - fn cull_leaves_is_opt_in_and_toggles_from_advanced_graphics() { - let mut s = Settings::default(); - let item = Item::Horizon(H::CullLeaves); - assert_eq!(item.switch(&s), Some(false)); - assert_eq!(item.label(&s).plain(), "Cull Leaves: Off"); - for enabled in [false, true] { - s.horizon.cull_leaves = enabled; - for preset in Preset::ALL { - crate::graphics::apply_preset(preset, &mut s); - assert_eq!(s.horizon.cull_leaves, enabled); - } - } - - let mut ui = GraphicsUi::default(); - let size = (480.0, 4000.0); - let (widgets, _, _) = ui.layout(Level::Advanced, size.0, size.1); - let switch = widgets - .iter() - .find(|w| matches!(w.target, Target::Item(i) if i == item)) - .unwrap(); - let point = (switch.x + 1.0, switch.y + 1.0); - for enabled in [false, true] { - s.horizon.preset = Preset::Balanced; - assert_eq!( - ui.click( - Level::Advanced, - &mut s, - point, - size, - [854, 480], - false, - false - ), - vec![Action::ButtonClick, Action::Changed] - ); - assert_eq!(item.switch(&s), Some(enabled)); - assert_eq!(s.horizon.preset, Preset::Custom); - } - assert_eq!(item.label(&s).plain(), "Cull Leaves: On"); - } - #[test] fn entity_culling_is_opt_in_and_toggles_from_advanced_graphics() { let mut s = Settings::default(); diff --git a/crates/horizon-client/src/mesher.rs b/crates/horizon-client/src/mesher.rs index a9e9f6823..59140866a 100644 --- a/crates/horizon-client/src/mesher.rs +++ b/crates/horizon-client/src/mesher.rs @@ -230,8 +230,6 @@ fn visibility(pad: &Padded, info: &[Info]) -> u64 { result } #[cfg(test)] -mod leaf_culling_tests; -#[cfg(test)] mod particle_tests; #[cfg(test)] mod visibility_tests; @@ -277,7 +275,6 @@ struct Info { overlay: bool, /// `LeavesBlock`: with opaque leaves the faces between two leaf blocks are skipped. leaves: bool, - mangrove_roots: bool, blocks_flow: bool, ice: bool, sturdy: u8, @@ -440,7 +437,6 @@ impl MeshTables { legacy_solid: s.legacy_solid, overlay: s.has_class("HalfTransparentBlock") || s.has_class("LeavesBlock"), leaves: s.has_class("LeavesBlock"), - mangrove_roots: s.has_class("MangroveRootsBlock"), blocks_flow: assets.blocks_fluid_flow.contains(&*s.name), ice: s.has_class("IceBlock"), sturdy: s.sturdy_full, @@ -692,8 +688,6 @@ pub struct Mesher<'a> { pub smooth_lighting: bool, /// The `cutoutLeaves` option (fancy graphics); off makes leaves opaque. pub cutout_leaves: bool, - /// Cull shared leaf and mangrove-root faces, including transparent leaves. - pub cull_leaves: bool, } impl Mesher<'_> { /// `region[dz][dx]` are the chunks around the meshed column (centre 1,1). @@ -773,12 +767,9 @@ impl Mesher<'_> { let [dx, dy, dz] = d.normal(); let neighbor = pad.blocks[pi(x + dx, y + dy, z + dz)]; let other = &info[neighbor as usize]; - // Adapted from CullLeaves (MIT); see THIRD_PARTY_NOTICES.md. - let shared_foliage = (state.leaves - && other.leaves - && (!self.cutout_leaves || self.cull_leaves)) - || (self.cull_leaves && state.mangrove_roots && other.mangrove_roots); - visible[d as usize] = !shared_foliage + // LeavesBlock.skipRendering with opaque leaves. + let opaque_leaves = !self.cutout_leaves && state.leaves && other.leaves; + visible[d as usize] = !opaque_leaves && self .visibility .should_render_face( diff --git a/crates/horizon-client/src/mesher/leaf_culling_tests.rs b/crates/horizon-client/src/mesher/leaf_culling_tests.rs deleted file mode 100644 index 679b19090..000000000 --- a/crates/horizon-client/src/mesher/leaf_culling_tests.rs +++ /dev/null @@ -1,126 +0,0 @@ -use super::*; -use horizon_assets::model::Direction as ModelDirection; - -#[test] -fn leaf_culling_removes_only_internal_leaf_and_root_faces() { - let root = - std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../.local/horizon-client/26.3"); - if !root.join("horizon-resources.json").exists() { - return; - } - let assets = Assets::load(&root).unwrap(); - let render = assets.reload(&root).unwrap(); - let facts = BlockFacts::load(&root, assets.registry).unwrap(); - let visibility = crate::models::load_visibility(&root, assets.registry).unwrap(); - let tables = MeshTables::new(&assets, &render, &facts, visibility.clone()).unwrap(); - let biomes = Biomes::load(&root).unwrap(); - let state = |name| assets.registry.default_state(name).unwrap().0; - let oak = state("minecraft:oak_leaves"); - let birch = state("minecraft:birch_leaves"); - let roots = state("minecraft:mangrove_roots"); - let stone = state("minecraft:stone"); - let mesh = |blocks: &[([i32; 3], u32)], cull_leaves, cutout_leaves| { - let mut center = Chunk::empty(0, 0); - let mut east = Chunk::empty(1, 0); - for &([x, y, z], state) in blocks { - let chunk = if x < 16 { &mut center } else { &mut east }; - chunk.set(x, y, z, state); - } - let mut region = [[None; 3]; 3]; - region[1][1] = Some(¢er); - region[1][2] = Some(&east); - Mesher { - nether_shading: false, - assets: &assets, - render: &render, - tables: &tables, - biomes: &biomes, - visibility: visibility.clone(), - zoom: BiomeZoom::new(0), - blend_radius: 0, - smooth_lighting: false, - cutout_leaves, - cull_leaves, - } - .tesselate(®ion, (0 - MIN_Y) / 16) - .solid - }; - - // Native leaves can contain unculled interior geometry as well as their - // outer faces. Select the touching cull group from the actual baked model, - // preserving every other quad and its full vertex attributes. - let without_face = |at: [i32; 3], id, direction| { - let vertices = mesh(&[(at, id)], false, true); - let models = render - .model_catalog - .collect(BlockStateId(id), BlockPos::new(at[0], at[1], at[2])) - .unwrap(); - let faces: Vec<_> = models.iter().flat_map(|(_, model)| &model.faces).collect(); - assert_eq!(vertices.len(), faces.len() * 4); - let retained: Vec<_> = vertices - .as_chunks::<4>() - .0 - .iter() - .zip(faces) - .filter(|(_, face)| face.quad.cull != Some(direction)) - .flat_map(|(quad, _)| quad.iter().copied()) - .collect(); - assert!(retained.len() < vertices.len(), "fixture has a cull group"); - retained - }; - - // Same-species leaves, mixed leaves and roots hide only their touching - // model groups. Disabling the option restores the isolated models. - for (a, b) in [(oak, oak), (oak, birch), (roots, roots)] { - let blocks = [([7, 7, 7], a), ([8, 7, 7], b)]; - let off = mesh(&blocks, false, true); - let on = mesh(&blocks, true, true); - assert_eq!( - off.len(), - mesh(&[blocks[0]], false, true).len() + mesh(&[blocks[1]], false, true).len() - ); - let mut retained = without_face(blocks[0].0, a, ModelDirection::East); - retained.extend(without_face(blocks[1].0, b, ModelDirection::West)); - assert_eq!( - bytemuck::cast_slice::<_, u8>(&on), - bytemuck::cast_slice::<_, u8>(&retained) - ); - } - - // Roots do not join leaves into a single culling group. Ordinary opaque - // neighbors also keep their existing occlusion behavior. - for (a, b) in [(oak, roots), (roots, oak), (oak, stone)] { - let blocks = [([7, 7, 7], a), ([8, 7, 7], b)]; - let off = mesh(&blocks, false, true); - let on = mesh(&blocks, true, true); - assert_eq!( - bytemuck::cast_slice::<_, u8>(&on), - bytemuck::cast_slice::<_, u8>(&off) - ); - } - - // Opaque leaves already hide internal leaf faces independently of this - // option, and a leaf beside air retains its complete baked model. - let pair = [([7, 7, 7], oak), ([8, 7, 7], birch)]; - assert_eq!( - mesh(&pair, false, false).len(), - mesh(&pair, true, false).len() - ); - let isolated = [([7, 7, 7], oak)]; - assert_eq!( - bytemuck::cast_slice::<_, u8>(&mesh(&isolated, false, true)), - bytemuck::cast_slice::<_, u8>(&mesh(&isolated, true, true)) - ); - - // The padding read must also remove the center chunk's internal face - // against a different leaf species in the neighboring chunk. - let boundary = [([15, 7, 7], oak), ([16, 7, 7], birch)]; - assert_eq!( - mesh(&boundary, false, true).len(), - mesh(&[boundary[0]], false, true).len() - ); - assert_eq!( - bytemuck::cast_slice::<_, u8>(&mesh(&boundary, true, true)), - bytemuck::cast_slice::<_, u8>(&without_face(boundary[0].0, oak, ModelDirection::East)) - ); -} diff --git a/crates/horizon-client/src/mesher/visibility_tests.rs b/crates/horizon-client/src/mesher/visibility_tests.rs index 32eb4800c..ad76d48f9 100644 --- a/crates/horizon-client/src/mesher/visibility_tests.rs +++ b/crates/horizon-client/src/mesher/visibility_tests.rs @@ -87,7 +87,6 @@ fn info(solid: bool) -> Info { legacy_solid: false, overlay: false, leaves: false, - mangrove_roots: false, blocks_flow: false, ice: false, sturdy: 0, diff --git a/crates/horizon-client/src/streaming.rs b/crates/horizon-client/src/streaming.rs index 15ed1674e..4cad224fd 100644 --- a/crates/horizon-client/src/streaming.rs +++ b/crates/horizon-client/src/streaming.rs @@ -153,7 +153,6 @@ struct MeshSettings { blend_radius: i32, smooth_lighting: bool, cutout_leaves: bool, - cull_leaves: bool, } enum Job { Generate(i32, i32), @@ -258,7 +257,6 @@ pub struct Streaming { /// The `ao` and `cutoutLeaves` options. pub smooth_lighting: bool, pub cutout_leaves: bool, - pub cull_leaves: bool, /// Incremental relighting of block edits on lit chunks (see `light::relight`). light_tables: Arc, /// Applied edits by sequence, replayed onto light jobs snapshotted before them. @@ -500,7 +498,6 @@ impl Streaming { blend_radius: settings.blend_radius, smooth_lighting: settings.smooth_lighting, cutout_leaves: settings.cutout_leaves, - cull_leaves: settings.cull_leaves, assets: &context.assets, render: &context.render, tables: &context.tables, @@ -556,7 +553,6 @@ impl Streaming { biome_blend: 2, smooth_lighting: true, cutout_leaves: true, - cull_leaves: false, light_tables, light_log: Vec::new(), light_edit_sequence: 0, @@ -1177,7 +1173,6 @@ impl Streaming { blend_radius: self.biome_blend, smooth_lighting: self.smooth_lighting, cutout_leaves: self.cutout_leaves, - cull_leaves: self.cull_leaves, }, ), ); diff --git a/crates/horizon-client/tests/streaming_meshes.rs b/crates/horizon-client/tests/streaming_meshes.rs index f0b6fb038..00c233277 100644 --- a/crates/horizon-client/tests/streaming_meshes.rs +++ b/crates/horizon-client/tests/streaming_meshes.rs @@ -215,7 +215,6 @@ fn relit_columns_keep_every_mesh_current() { blend_radius: 2, smooth_lighting: true, cutout_leaves: true, - cull_leaves: false, assets: &context.assets, render: &context.render, tables: &context.tables, From ba9b876e3e53f11e3a6cacd26d17a4f8df3bba77 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 16:12:39 +0200 Subject: [PATCH 003/140] website: the mods page no longer links the removed Java mod notes Co-Authored-By: Claude Opus 5.5 --- website/docs/mods.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/mods.md b/website/docs/mods.md index 4d6a21189..b2dd3eb96 100644 --- a/website/docs/mods.md +++ b/website/docs/mods.md @@ -30,7 +30,7 @@ cd my-mod cargo horizon-mod run ``` -`run` builds the mod and starts the game with it. After an edit, `cargo horizon-mod build` rebuilds it and the running game reloads it. The full guide, with the API, the manifest and the roadmap, is [docs/mods.md](https://github.com/ludovic111/horizon/blob/main/docs/mods.md). What carries over from Java mods, and why jars cannot run, is in [the Java mod notes](https://github.com/ludovic111/horizon/blob/main/docs/research/java-mod-compat.md). +`run` builds the mod and starts the game with it. After an edit, `cargo horizon-mod build` rebuilds it and the running game reloads it. The full guide, with the API, the manifest and the roadmap, is [docs/mods.md](https://github.com/ludovic111/horizon/blob/main/docs/mods.md). Java mod jars don't run in Horizon: their code calls and patches Minecraft's Java classes, and Horizon has none. What carries over is the data and assets inside a jar ([modpacks](https://github.com/ludovic111/horizon/blob/main/docs/modpacks.md)). ## Finding resource packs, shader packs and modpacks From 7a1638a1908f5183102b7f649a79c4d95db8fe7c Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 16:12:55 +0200 Subject: [PATCH 004/140] Renderer: remove the section face groups modelled on another renderer #503 grouped each section's solid quads by the axis side they face and skipped the groups facing away from the eye. Its code and PR named an internal class of another project as the model. Horizon doesn't build on another project's code, so the grouping goes and every section draws its solid quads in one draw, as vanilla does; the GPU's back-face culling discards the back faces, so the picture is unchanged. This costs frame time, measured on the Mac mini in the PR. A clean-room version can come back later, designed from vanilla and from first principles only. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/gfx.rs | 32 +-- crates/horizon-client/src/lod.rs | 4 - crates/horizon-client/src/lod/mesh.rs | 4 +- crates/horizon-client/src/mesher.rs | 11 - crates/horizon-client/src/mesher/facing.rs | 267 ------------------ .../src/mesher/leaf_culling_tests.rs | 2 +- 6 files changed, 15 insertions(+), 305 deletions(-) delete mode 100644 crates/horizon-client/src/mesher/facing.rs diff --git a/crates/horizon-client/src/gfx.rs b/crates/horizon-client/src/gfx.rs index 59a3b5d03..b1143be6c 100644 --- a/crates/horizon-client/src/gfx.rs +++ b/crates/horizon-client/src/gfx.rs @@ -177,8 +177,6 @@ struct SectionGpu { start: u64, solid: u32, translucent: u32, - /// The solid quads by facing: back-facing groups are skipped. - faces: crate::mesher::FaceGroups, sort: translucency::SortState, sorted_indices: Option<(u32, u64)>, /// Its id for flat draws (`flat::Flat::add`), when they are on. @@ -2751,7 +2749,6 @@ impl Renderer { start, solid, translucent, - faces: mesh.faces, sort: translucency::SortState::new( mesh.translucent .as_chunks::<4>() @@ -3621,10 +3618,6 @@ impl Renderer { // as one list of indirect draws over the section arena. self.draws.clear(); self.draw_pages.clear(); - // The eye, camera-relative: view bobbing moves it off the camera. - let eye = (frame.bob * crate::camera::view_matrix(frame.yaw, frame.pitch)) - .inverse() - .transform_point3(Vec3::ZERO); // A Java pack that draws the terrain (`gfx/java_terrain.rs`): the // world pass leaves it out, and occlusion culling tests against the // pack's depth (`Cull::test_gl`). @@ -3655,14 +3648,11 @@ impl Renderer { }; let start = draws.len(); let instances = u32::from(first_phase); - let mut indices = 0; - // Only the solid groups that can face the eye. - s.faces.ranges(eye - Vec3::from(v.origin), |first, quads| { - let first = s.start + u64::from(first) * 4; - draws.push([quads * 6, instances, 0, first as u32, i as u32]); + let indices = s.solid * 6; + if indices > 0 { + draws.push([indices, instances, 0, s.start as u32, i as u32]); pages.push((s.page, None)); - indices += quads * 6; - }); + } let runs = if first_phase { &mut self.solid_runs } else { @@ -3699,12 +3689,16 @@ impl Renderer { for (i, v) in visible_lods.iter().enumerate() { let s = &self.lods[&v.key].mesh; let start = self.draws.len(); - s.faces.ranges(eye - Vec3::from(v.origin), |first, quads| { - let first = s.start + u64::from(first) * 4; - self.draws - .push([quads * 6, 1, 0, first as u32, (visible.len() + i) as u32]); + if s.solid > 0 { + self.draws.push([ + s.solid * 6, + 1, + 0, + s.start as u32, + (visible.len() + i) as u32, + ]); self.draw_pages.push((s.page, None)); - }); + } self.solid_runs .push(v.distance, s.page, start, self.draws.len() - start, [0; 3]); } diff --git a/crates/horizon-client/src/lod.rs b/crates/horizon-client/src/lod.rs index f8adb1f16..ee17acee1 100644 --- a/crates/horizon-client/src/lod.rs +++ b/crates/horizon-client/src/lod.rs @@ -1727,10 +1727,6 @@ mod tests { let expected = (key.size() * key.size() - 16 * 16) as f32; assert_eq!(top_area(&mesh.solid, 70.0), expected); assert_eq!(top_area(&mesh.translucent, 80.0 - 1.0 / 9.0), expected); - assert_eq!( - mesh.faces.quads.iter().sum::() as usize, - mesh.solid.len() / 4 - ); assert!(mesh.translucent.iter().all(|v| v.light == 240)); let side = |axis: usize, plane: f32, low: f32, high: f32| { let other = if axis == 0 { 2 } else { 0 }; diff --git a/crates/horizon-client/src/lod/mesh.rs b/crates/horizon-client/src/lod/mesh.rs index 73287af50..852f45e5b 100644 --- a/crates/horizon-client/src/lod/mesh.rs +++ b/crates/horizon-client/src/lod/mesh.rs @@ -2,7 +2,7 @@ use super::{Column, Span, TileKey}; use crate::{ fast_hash::{FxHashMap, FxHashSet}, - mesher::{FaceGroups, OPAQUE_LAYER, SectionMesh, TerrainVertex}, + mesher::{OPAQUE_LAYER, SectionMesh, TerrainVertex}, streaming::WorkerContext, }; use horizon_assets::model::Direction; @@ -558,7 +558,6 @@ fn mesh_columns_with_edges( emit(&mut mesh, key, rect) } } - mesh.faces = FaceGroups::group(&mut mesh.solid); mesh } @@ -1003,7 +1002,6 @@ mod tests { } let mesh = mesh(&columns); assert_eq!(mesh.solid.len(), 6 * 4); - assert_eq!(mesh.faces.quads.iter().sum::(), 6); assert!(mesh.translucent.is_empty()); for q in mesh.solid.as_chunks::<4>().0.iter() { let center = q diff --git a/crates/horizon-client/src/mesher.rs b/crates/horizon-client/src/mesher.rs index a9e9f6823..ec6f2ae73 100644 --- a/crates/horizon-client/src/mesher.rs +++ b/crates/horizon-client/src/mesher.rs @@ -3,7 +3,6 @@ //! `ModelBlockRenderer`/`BlockModelLighter` (smooth light, ambient occlusion, //! cardinal shading, tint sources, block offsets; see `lighting`). Fluids //! follow `FluidRenderer` (see `fluid`). -mod facing; mod fluid; mod lighting; use crate::{ @@ -13,7 +12,6 @@ use crate::{ chunk::{Chunk, MIN_Y}, models::catalog::BakedFace, }; -pub use facing::{FaceGroups, GROUPS as FACE_GROUPS}; use horizon_core::{ biome::BiomeZoom, geometry::Direction, position::BlockPos, random::position_seed, }; @@ -116,8 +114,6 @@ mod vertex_tests { } pub struct SectionMesh { pub solid: Vec, - /// `solid`'s quads by the side they face (`facing`). - pub faces: FaceGroups, pub translucent: Vec, /// VisGraph: bit `a * 6 + b` is set when faces `a` and `b` (Direction /// order) are connected through non-opaque blocks. @@ -131,7 +127,6 @@ impl Default for SectionMesh { fn default() -> Self { Self { solid: Vec::new(), - faces: FaceGroups::default(), translucent: Vec::new(), visibility: ALL_VISIBLE, block_entities: Vec::new(), @@ -698,12 +693,6 @@ pub struct Mesher<'a> { impl Mesher<'_> { /// `region[dz][dx]` are the chunks around the meshed column (centre 1,1). pub fn mesh(&mut self, region: &[[Option<&Chunk>; 3]; 3], sy: i32) -> SectionMesh { - let mut out = self.tesselate(region, sy); - out.faces = facing::group(&mut out.solid); - out - } - /// The section's quads in model order, before `facing::group`. - pub(crate) fn tesselate(&mut self, region: &[[Option<&Chunk>; 3]; 3], sy: i32) -> SectionMesh { let mut out = SectionMesh::default(); let center = region[1][1].expect("centre chunk"); let section = ¢er.sections[sy as usize]; diff --git a/crates/horizon-client/src/mesher/facing.rs b/crates/horizon-client/src/mesher/facing.rs deleted file mode 100644 index 7bafe9e82..000000000 --- a/crates/horizon-client/src/mesher/facing.rs +++ /dev/null @@ -1,267 +0,0 @@ -//! Solid quads grouped by the side they face, as Sodium's `ModelQuadFacing` -//! does. A quad in the plane `x = p` facing +X is front-facing only while the -//! eye is at `x > p`, and terrain culls back faces, so when the eye is on the -//! back side of every quad of a group the renderer skips the group's draw: -//! the GPU would have discarded all of it after shading its vertices. The -//! picture is unchanged; the vertex work for those quads is gone. -use super::TerrainVertex; -use glam::Vec3; - -/// Groups in buffer order: the negative sides, quads not in an axis plane -/// (rotated model elements, sloped fluid tops), then the positive sides. -/// With the eye outside a section on every axis, one side per axis is -/// visible, so the drawn groups form one to three runs. -pub const GROUPS: usize = 7; -const UNALIGNED: usize = 3; -/// The group of a quad facing `-axis` (0 x, 1 y, 2 z) is `NEGATIVE[axis]`, of -/// one facing `+axis` `GROUPS - 1 - NEGATIVE[axis]`. -const NEGATIVE: [usize; 3] = [0, 2, 1]; -/// How far (blocks) the eye must be behind every plane of a group before -/// the group is skipped: rounding on the GPU never makes such a quad -/// front-facing. -const MARGIN: f32 = 1.0 / 16.0; - -/// The solid quads' groups, filled by `group`. -#[derive(Clone, Copy, Debug, PartialEq)] -pub struct FaceGroups { - /// Quads per group, in buffer order. - pub quads: [u32; GROUPS], - /// Per axis group, the plane nearest the side the group faces: the - /// lowest plane of a positive group and the highest of a negative one. - planes: [f32; GROUPS], -} - -impl Default for FaceGroups { - /// Everything unaligned: always drawn. - fn default() -> Self { - Self { - quads: [0; GROUPS], - planes: [0.0; GROUPS], - } - } -} - -impl FaceGroups { - /// Group arbitrary-sized terrain quads, including distant LOD tiles. - pub fn group(solid: &mut Vec) -> Self { - group(solid) - } - - /// Whether group `g` can hold a front-facing quad for an eye at `eye`, - /// relative to the section's minimum corner. - pub fn visible(&self, g: usize, eye: Vec3) -> bool { - if g == UNALIGNED { - return true; - } - let (axis, positive) = axis(g); - if positive { - eye[axis] > self.planes[g] - MARGIN - } else { - eye[axis] < self.planes[g] + MARGIN - } - } - /// The quad ranges (first quad, quad count) to draw for an eye at `eye` - /// relative to the section's minimum corner, adjacent groups merged. - pub fn ranges(&self, eye: Vec3, mut out: impl FnMut(u32, u32)) { - let mut first = 0; - let mut run: Option<(u32, u32)> = None; - for g in 0..GROUPS { - let quads = self.quads[g]; - if quads > 0 { - if self.visible(g, eye) { - run = Some(match run { - Some((start, len)) => (start, len + quads), - None => (first, quads), - }); - } else if let Some((start, len)) = run.take() { - out(start, len); - } - } - first += quads; - } - if let Some((start, len)) = run { - out(start, len); - } - } -} - -/// The axis and sign of each axis group (`UNALIGNED`'s entry is unused). -const AXES: [(usize, bool); GROUPS] = { - let mut axes = [(0, false); GROUPS]; - let mut axis = 0; - while axis < 3 { - axes[NEGATIVE[axis]] = (axis, false); - axes[GROUPS - 1 - NEGATIVE[axis]] = (axis, true); - axis += 1; - } - axes -}; - -/// The axis and sign of axis group `g`. -fn axis(g: usize) -> (usize, bool) { - debug_assert_ne!(g, UNALIGNED); - AXES[g] -} - -/// The group of one quad, and its plane: an axis group only when all four -/// corners lie exactly in one axis plane. -fn facing(quad: &[TerrainVertex]) -> (usize, f32) { - let p = |i: usize| Vec3::from(quad[i].pos); - let normal = (p(1) - p(0)).cross(p(2) - p(0)); - for axis in 0..3 { - let [a, b] = [(axis + 1) % 3, (axis + 2) % 3]; - let plane = quad[0].pos[axis]; - if normal[axis] != 0.0 - && normal[a] == 0.0 - && normal[b] == 0.0 - && quad.iter().all(|v| v.pos[axis] == plane) - { - let negative = NEGATIVE[axis]; - let g = if normal[axis] > 0.0 { - GROUPS - 1 - negative - } else { - negative - }; - return (g, plane); - } - } - (UNALIGNED, 0.0) -} - -/// Reorder `solid` by group, keeping the order of quads within a group (so -/// coplanar quads such as a grass block's overlay still draw after their -/// base), and return the groups. -pub fn group(solid: &mut Vec) -> FaceGroups { - let mut groups = FaceGroups::default(); - for (g, plane) in groups.planes.iter_mut().enumerate() { - if g != UNALIGNED { - *plane = if axis(g).1 { f32::MAX } else { f32::MIN }; - } - } - let faces: Vec = solid - .as_chunks::<4>() - .0 - .iter() - .map(|quad| { - let (g, plane) = facing(quad); - groups.quads[g] += 1; - if g != UNALIGNED { - let nearest = &mut groups.planes[g]; - *nearest = if axis(g).1 { - nearest.min(plane) - } else { - nearest.max(plane) - }; - } - g as u8 - }) - .collect(); - if faces.windows(2).all(|w| w[0] <= w[1]) { - return groups; - } - let mut next = [0usize; GROUPS]; - let mut start = 0; - for g in 0..GROUPS { - next[g] = start; - start += groups.quads[g] as usize; - } - let mut sorted = vec![solid[0]; solid.len()]; - for (quad, &g) in solid.as_chunks::<4>().0.iter().zip(&faces) { - let at = next[g as usize] * 4; - sorted[at..at + 4].copy_from_slice(quad); - next[g as usize] += 1; - } - *solid = sorted; - groups -} - -#[cfg(test)] -mod tests { - use super::*; - - fn vertex(pos: [f32; 3], layer: u16) -> TerrainVertex { - TerrainVertex::new(pos, [0.0; 2], layer, 0, 0) - } - /// A unit quad in the plane `axis = plane`, wound to face `sign`, tagged - /// with `layer` so tests can follow it. - fn quad(axis: usize, plane: f32, sign: f32, layer: u16) -> Vec { - let corner = |u: f32, v: f32| { - let mut p = [0.0; 3]; - p[axis] = plane; - p[(axis + 1) % 3] = u; - p[(axis + 2) % 3] = v; - vertex(p, layer) - }; - let mut q = vec![ - corner(0.0, 0.0), - corner(1.0, 0.0), - corner(1.0, 1.0), - corner(0.0, 1.0), - ]; - if sign < 0.0 { - q.reverse(); - } - q - } - - #[test] - fn quads_group_by_the_side_their_winding_faces() { - for a in 0..3 { - for sign in [-1.0, 1.0] { - let q = quad(a, 4.0, sign, 0); - let (g, plane) = facing(&q); - assert_eq!(axis(g), (a, sign > 0.0), "axis {a} sign {sign}"); - assert_eq!(plane, 4.0); - let normal = (Vec3::from(q[1].pos) - Vec3::from(q[0].pos)) - .cross(Vec3::from(q[2].pos) - Vec3::from(q[0].pos)); - assert_eq!(normal[a].signum(), sign); - } - } - // A cross plant's diagonal quad faces no axis. - let diagonal = [ - [0.0, 0.0, 0.0], - [1.0, 0.0, 1.0], - [1.0, 1.0, 1.0], - [0.0, 1.0, 0.0], - ] - .map(|p| vertex(p, 0)); - assert_eq!(facing(&diagonal).0, UNALIGNED); - } - - #[test] - fn grouping_is_stable_and_skips_only_back_facing_groups() { - // +X at x = 3 and x = 7 (layers 1, 2), -X at x = 5 (3), an unaligned - // quad (4), a coplanar overlay on the x = 3 quad (5). - let diagonal = [ - [0.0, 0.0, 0.0], - [1.0, 0.0, 1.0], - [1.0, 1.0, 1.0], - [0.0, 1.0, 0.0], - ] - .map(|p| vertex(p, 4)); - let mut solid = [ - quad(0, 3.0, 1.0, 1), - quad(0, 5.0, -1.0, 3), - diagonal.to_vec(), - quad(0, 7.0, 1.0, 2), - quad(0, 3.0, 1.0, 5), - ] - .concat(); - let groups = group(&mut solid); - let layers: Vec = solid.chunks(4).map(|q| q[0].layer).collect(); - assert_eq!(layers, [3, 4, 1, 2, 5]); - let ranges = |eye: Vec3| { - let mut out = Vec::new(); - groups.ranges(eye, |first, count| out.push((first, count))); - out - }; - // Between the planes: every group can face the eye. - assert_eq!(ranges(Vec3::new(4.0, 8.0, 8.0)), [(0, 5)]); - // Beyond x = 7: the -X quad at x = 5 faces away. - assert_eq!(ranges(Vec3::new(20.0, 8.0, 8.0)), [(1, 4)]); - // Before x = 3: every +X quad faces away. - assert_eq!(ranges(Vec3::new(-10.0, 8.0, 8.0)), [(0, 2)]); - // Within the margin of the nearest plane: still drawn. - assert_eq!(ranges(Vec3::new(3.0, 8.0, 8.0)), [(0, 5)]); - } -} diff --git a/crates/horizon-client/src/mesher/leaf_culling_tests.rs b/crates/horizon-client/src/mesher/leaf_culling_tests.rs index 679b19090..1273c806d 100644 --- a/crates/horizon-client/src/mesher/leaf_culling_tests.rs +++ b/crates/horizon-client/src/mesher/leaf_culling_tests.rs @@ -42,7 +42,7 @@ fn leaf_culling_removes_only_internal_leaf_and_root_faces() { cutout_leaves, cull_leaves, } - .tesselate(®ion, (0 - MIN_Y) / 16) + .mesh(®ion, (0 - MIN_Y) / 16) .solid }; From cdfcc3d4d446e59c075e6fd0018a8cc599519cdc Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 17:15:35 +0200 Subject: [PATCH 005/140] Server resource packs: the client's pack manager and downloads Vanilla's ServerPackManager, DownloadedPackSource and DownloadQueue, without the game around them yet: the prompt state, each pack's download and activation, the statuses in vanilla's order (onSuccess repeats SUCCESSFULLY_LOADED, a failed reload recovers with the packs that loaded), pop, and leaving. Downloads follow HttpUtil.downloadFile: downloads//, a cached file whose hash matches is reused, a wrong hash fails, no hash downloads to a temporary file renamed to its SHA-1, 250 MiB at most, vanilla's X-Minecraft-* headers, a log.json entry per download, and 20 files kept. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 1 + crates/horizon-client/Cargo.toml | 2 + crates/horizon-client/src/lib.rs | 1 + crates/horizon-client/src/server_packs.rs | 618 ++++++++++++++++++ .../src/server_packs/download.rs | 482 ++++++++++++++ 5 files changed, 1104 insertions(+) create mode 100644 crates/horizon-client/src/server_packs.rs create mode 100644 crates/horizon-client/src/server_packs/download.rs diff --git a/Cargo.lock b/Cargo.lock index 1a1b288c9..d04c0a647 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1441,6 +1441,7 @@ dependencies = [ "rustix 1.1.5", "serde", "serde_json", + "sha1", "sha2", "symphonia", "toml", diff --git a/crates/horizon-client/Cargo.toml b/crates/horizon-client/Cargo.toml index 300872765..b11989ba8 100644 --- a/crates/horizon-client/Cargo.toml +++ b/crates/horizon-client/Cargo.toml @@ -27,6 +27,8 @@ bytemuck = { version = "1.24", features = ["derive"] } glam = "0.30" png = "0.18" sha2 = "0.10.9" +# Server resource packs are checked and cached by their SHA-1, as vanilla does. +sha1 = "0.10" serde = { version = "1", features = ["derive"] } serde_json = { version = "1.0.151", features = ["raw_value"] } # Shader packs: pack.toml, and WGSL checked before it reaches wgpu. diff --git a/crates/horizon-client/src/lib.rs b/crates/horizon-client/src/lib.rs index dddf87c0d..7ec79af5e 100644 --- a/crates/horizon-client/src/lib.rs +++ b/crates/horizon-client/src/lib.rs @@ -158,6 +158,7 @@ pub mod screen_effects; pub mod screen_layout; pub mod sculk; pub use horizon_server_files as server; +pub mod server_packs; pub mod settings; pub mod shader_pack; pub mod shadows; diff --git a/crates/horizon-client/src/server_packs.rs b/crates/horizon-client/src/server_packs.rs new file mode 100644 index 000000000..8e11217b5 --- /dev/null +++ b/crates/horizon-client/src/server_packs.rs @@ -0,0 +1,618 @@ +//! Server resource packs (`ServerPackManager`, `DownloadedPackSource`): the +//! packs a server pushes, the player's answer to its prompt, their downloads, +//! their activation on top of the player's own packs, and the status each one +//! reports back to the server. The game drives it: it shows the prompt, +//! starts the downloads [`ServerPacks::tick`] asks for and reloads the +//! resources with [`ServerPacks::active`] when it asks for a reload. +pub mod download; + +use std::path::PathBuf; + +/// `ServerboundResourcePackPacket.Action`, by its protocol number. +pub mod action { + pub const SUCCESSFULLY_LOADED: i32 = 0; + pub const DECLINED: i32 = 1; + pub const FAILED_DOWNLOAD: i32 = 2; + pub const ACCEPTED: i32 = 3; + pub const DOWNLOADED: i32 = 4; + pub const INVALID_URL: i32 = 5; + pub const FAILED_RELOAD: i32 = 6; + pub const DISCARDED: i32 = 7; +} + +/// `ServerPackManager.PackPromptStatus`. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Prompt { + Pending, + Allowed, + Declined, +} +impl Prompt { + /// `ConnectScreen.convertPackStatus`: a server list entry's setting + /// (servers.dat `acceptTextures`; none is Prompt). + pub fn for_server(accept_textures: Option) -> Self { + match accept_textures { + Some(true) => Self::Allowed, + Some(false) => Self::Declined, + None => Self::Pending, + } + } +} + +/// `ClientCommonPacketListenerImpl.parseResourcePackUrl`: only http and https. +pub fn valid_url(url: &str) -> bool { + url.split_once(':').is_some_and(|(scheme, _)| { + scheme.eq_ignore_ascii_case("http") || scheme.eq_ignore_ascii_case("https") + }) +} + +/// `DownloadedPackSource.tryParseSha1Hash`: 40 hex digits, else no check. +pub fn parse_sha1(hash: &str) -> Option { + (hash.len() == 40 && hash.bytes().all(|b| b.is_ascii_hexdigit())) + .then(|| hash.to_ascii_lowercase()) +} + +/// One pack to download (`DownloadQueue.DownloadRequest`). +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct Request { + pub id: u128, + pub url: String, + pub sha1: Option, +} + +/// `DownloadQueue.BatchResult`: the file each downloaded pack is in, and the +/// packs that failed. +#[derive(Debug, Default)] +pub struct Batch { + pub downloaded: Vec<(u128, PathBuf)>, + pub failed: Vec, +} + +/// What the game has to do after a [`ServerPacks::tick`]. +#[derive(Debug, Default, PartialEq)] +pub struct Tick { + /// Download these, then hand the result to [`ServerPacks::downloaded`]. + pub download: Vec, + /// Reload the resources with these packs on top, bottom first + /// (`PackReloadConfig.scheduleReload`), then call [`ServerPacks::reloaded`]. + pub reload: Option>, +} + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +enum Download { + Requested, + Pending, + Done, +} +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +enum Activation { + Inactive, + Pending, + Active, +} +/// `ServerPackManager.RemovalReason`, with the status it reports. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +enum Removal { + DownloadFailed, + ActivationFailed, + Declined, + Discarded, + ServerRemoved, + ServerReplaced, +} +impl Removal { + fn reply(self) -> Option { + match self { + Self::DownloadFailed => Some(action::FAILED_DOWNLOAD), + Self::ActivationFailed => Some(action::FAILED_RELOAD), + Self::Declined => Some(action::DECLINED), + Self::Discarded => Some(action::DISCARDED), + Self::ServerRemoved | Self::ServerReplaced => None, + } + } +} + +/// `ServerPackManager.ServerPackData`. +#[derive(Debug)] +struct Pack { + id: u128, + url: String, + sha1: Option, + path: Option, + removal: Option, + download: Download, + activation: Activation, + accepted: bool, +} +impl Pack { + fn remove(&mut self, reason: Removal) { + self.removal.get_or_insert(reason); + } + fn removed(&self) -> bool { + self.removal.is_some() + } +} + +/// The reload in progress: the packs it loads and unloads (the callbacks +/// `triggerReloadIfNeeded` gives `scheduleReload`). +#[derive(Debug)] +struct Reload { + load: Vec, + unload: Vec, + /// It reloads what was active before a failed one (`isRecovery`). + recovery: bool, +} + +/// `ServerPackManager` with the feedback `DownloadedPackSource` gives it. +#[derive(Debug)] +pub struct ServerPacks { + packs: Vec, + prompt: Prompt, + reload: Option, + /// `registerForUpdate`: something changed, [`Self::tick`] again. + update: bool, + /// Report to the server (`configureForServerControl`); otherwise the + /// statuses are only logged, as for a local world. + reporting: bool, + replies: Vec<(u128, i32)>, +} +impl Default for ServerPacks { + fn default() -> Self { + Self { + packs: Vec::new(), + prompt: Prompt::Pending, + reload: None, + update: false, + reporting: false, + replies: Vec::new(), + } + } +} +impl ServerPacks { + fn report(&mut self, id: u128, status: i32) { + log::debug!("Horizon: server pack {id:032x} changed status to {status}"); + if self.reporting { + self.replies.push((id, status)); + } + } + /// The statuses to send the server, oldest first. + pub fn take_replies(&mut self) -> Vec<(u128, i32)> { + std::mem::take(&mut self.replies) + } + /// Whether [`Self::tick`] has something to do. + pub fn wants_tick(&self) -> bool { + self.update + } + + /// `DownloadedPackSource.configureForServerControl`. + pub fn connect(&mut self, prompt: Prompt) { + self.reporting = true; + match prompt { + Prompt::Allowed => self.allow(), + Prompt::Declined => self.reject(), + Prompt::Pending => self.prompt = Prompt::Pending, + } + } + /// `DownloadedPackSource.configureForLocalWorld`: single player's own + /// server; its packs are taken, and nothing is reported. + pub fn local_world(&mut self) { + self.reporting = false; + self.allow(); + } + /// `DownloadedPackSource.cleanupAfterDisconnect`: every pack goes, and + /// the next server starts from its own setting. + pub fn disconnect(&mut self) { + self.pop_all(); + self.reporting = false; + self.replies.clear(); + self.prompt = Prompt::Pending; + } + + pub fn push(&mut self, id: u128, url: &str, sha1: Option) { + if self.prompt == Prompt::Declined { + self.report(id, action::DECLINED); + return; + } + for pack in self.packs.iter_mut().filter(|p| p.id == id) { + pack.remove(Removal::ServerReplaced); + } + self.packs.push(Pack { + id, + url: url.to_owned(), + sha1, + path: None, + removal: None, + download: Download::Requested, + activation: Activation::Inactive, + accepted: false, + }); + if self.prompt == Prompt::Allowed { + self.accept(self.packs.len() - 1); + } + self.update = true; + } + fn accept(&mut self, i: usize) { + self.packs[i].accepted = true; + let id = self.packs[i].id; + self.report(id, action::ACCEPTED); + } + pub fn pop(&mut self, id: u128) { + if let Some(pack) = self.packs.iter_mut().find(|p| !p.removed() && p.id == id) { + pack.remove(Removal::ServerRemoved); + self.update = true; + } + } + pub fn pop_all(&mut self) { + for pack in &mut self.packs { + pack.remove(Removal::ServerRemoved); + } + self.update = true; + } + /// `allowServerPacks`: the prompt said yes (or the server is Enabled). + pub fn allow(&mut self) { + self.prompt = Prompt::Allowed; + for i in 0..self.packs.len() { + if !self.packs[i].accepted && !self.packs[i].removed() { + self.accept(i); + } + } + self.update = true; + } + /// `rejectServerPacks`: the prompt said no (or the server is Disabled). + pub fn reject(&mut self) { + self.prompt = Prompt::Declined; + for pack in self.packs.iter_mut().filter(|p| !p.accepted) { + pack.remove(Removal::Declined); + } + self.update = true; + } + + /// `ServerPackManager.tick`: start the downloads the accepted packs + /// need; once none is left, reload if the active packs should change; + /// then forget the packs that are gone, reporting why. + pub fn tick(&mut self) -> Tick { + self.update = false; + let mut out = Tick::default(); + let mut downloading = false; + for pack in self.packs.iter_mut().filter(|p| !p.removed() && p.accepted) { + downloading |= pack.download != Download::Done; + if pack.download == Download::Requested { + pack.download = Download::Pending; + out.download.push(Request { + id: pack.id, + url: pack.url.clone(), + sha1: pack.sha1.clone(), + }); + } + } + if !downloading { + out.reload = self.reload_if_needed(); + } + let mut gone = Vec::new(); + self.packs.retain(|p| { + let keep = p.activation != Activation::Inactive || p.removal.is_none(); + if !keep && let Some(reply) = p.removal.and_then(Removal::reply) { + gone.push((p.id, reply)); + } + keep + }); + for (id, reply) in gone { + self.report(id, reply); + } + out + } + fn reload_if_needed(&mut self) -> Option> { + if self.reload.is_some() + || self + .packs + .iter() + .any(|p| p.activation == Activation::Pending) + { + return None; + } + let mut changed = false; + let (mut load, mut unload) = (Vec::new(), Vec::new()); + for pack in &self.packs { + let wanted = pack.accepted && pack.download == Download::Done && !pack.removed(); + match pack.activation { + Activation::Inactive if wanted => { + load.push(pack.id); + changed = true; + } + Activation::Active if wanted => load.push(pack.id), + Activation::Active => { + unload.push(pack.id); + changed = true; + } + _ => {} + } + } + if !changed { + return None; + } + for pack in &mut self.packs { + let loading = load.contains(&pack.id) && pack.activation != Activation::Active; + if loading || unload.contains(&pack.id) { + pack.activation = Activation::Pending; + } + } + let paths = self.paths(&load); + self.reload = Some(Reload { + load, + unload, + recovery: false, + }); + Some(paths) + } + /// The packs to load (`PackReloadConfig.Callbacks.packsToLoad`), bottom first. + fn paths(&self, ids: &[u128]) -> Vec<(u128, PathBuf)> { + ids.iter() + .filter_map(|id| { + let pack = self + .packs + .iter() + .find(|p| p.id == *id && p.path.is_some())?; + Some((*id, pack.path.clone()?)) + }) + .collect() + } + + /// `ServerPackManager.onDownload`. + pub fn downloaded(&mut self, batch: Batch) { + if !batch.failed.is_empty() { + for pack in self + .packs + .iter_mut() + .filter(|p| p.activation != Activation::Active) + { + pack.remove(if batch.failed.contains(&pack.id) { + Removal::DownloadFailed + } else { + Removal::Discarded + }); + } + } + let mut done = Vec::new(); + for (id, path) in batch.downloaded { + if let Some(pack) = self + .packs + .iter_mut() + .find(|p| p.id == id && p.download == Download::Pending) + { + pack.download = Download::Done; + pack.path = Some(path); + if !pack.removed() { + done.push(id); + } + } + } + for id in done { + self.report(id, action::DOWNLOADED); + } + self.update = true; + } + + /// The reload [`Tick::reload`] asked for finished (`Callbacks.onSuccess`), + /// or its packs could not be loaded (`onFailure`). After a first failure + /// the packs that were active are loaded again: the packs to reload with + /// are returned, and this is called again with that reload's outcome. + pub fn reloaded(&mut self, ok: bool) -> Option> { + let mut reload = self.reload.take()?; + self.update = true; + if ok { + let mut applied = Vec::new(); + for pack in &mut self.packs { + if reload.load.contains(&pack.id) { + pack.activation = Activation::Active; + if pack.removal.is_none() { + applied.push(pack.id); + } + } else if reload.unload.contains(&pack.id) { + pack.activation = Activation::Inactive; + } + } + for id in applied { + self.report(id, action::SUCCESSFULLY_LOADED); + } + return None; + } + if reload.recovery { + // onFailure(true): nothing of the server's is loaded. + for pack in &mut self.packs { + if pack.activation == Activation::Pending { + pack.activation = Activation::Inactive; + } + } + return None; + } + reload.load.clear(); + for pack in &mut self.packs { + match pack.activation { + Activation::Inactive => pack.remove(Removal::Discarded), + Activation::Pending => { + pack.activation = Activation::Inactive; + pack.remove(Removal::ActivationFailed); + } + Activation::Active => reload.load.push(pack.id), + } + } + reload.recovery = true; + let paths = self.paths(&reload.load); + self.reload = Some(reload); + Some(paths) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use action::*; + + fn ok(id: u128) -> Batch { + Batch { + downloaded: vec![(id, PathBuf::from(format!("/p/{id}")))], + failed: vec![], + } + } + /// Runs the updates as `createUpdateScheduler` does, downloading and + /// reloading with `download` and `reload` as the game would. + fn settle( + sp: &mut ServerPacks, + download: &mut dyn FnMut(&[Request]) -> Batch, + reload: &mut dyn FnMut(&[(u128, PathBuf)]) -> bool, + ) { + let mut rounds = 0; + while sp.wants_tick() { + rounds += 1; + assert!(rounds < 50); + let t = sp.tick(); + if !t.download.is_empty() { + let batch = download(&t.download); + sp.downloaded(batch); + } + if let Some(mut packs) = t.reload { + while let Some(back) = sp.reloaded(reload(&packs)) { + packs = back; + } + } + } + } + + #[test] + fn an_enabled_server_s_pack_is_accepted_downloaded_and_loaded() { + let mut sp = ServerPacks::default(); + sp.connect(Prompt::Allowed); + sp.push(1, "http://a/p.zip", None); + let mut loaded = Vec::new(); + settle(&mut sp, &mut |r| ok(r[0].id), &mut |p| { + loaded = p.to_vec(); + true + }); + assert_eq!( + sp.take_replies(), + [(1, ACCEPTED), (1, DOWNLOADED), (1, SUCCESSFULLY_LOADED)] + ); + assert_eq!(loaded, [(1, PathBuf::from("/p/1"))]); + } + + #[test] + fn the_prompt_holds_packs_until_answered() { + let mut sp = ServerPacks::default(); + sp.connect(Prompt::Pending); + sp.push(1, "http://a/p.zip", None); + settle(&mut sp, &mut |_| unreachable!(), &mut |_| unreachable!()); + assert!(sp.take_replies().is_empty()); + sp.reject(); + settle(&mut sp, &mut |_| unreachable!(), &mut |_| unreachable!()); + assert_eq!(sp.take_replies(), [(1, DECLINED)]); + // Declined: later pushes are declined at once. + sp.push(2, "http://a/q.zip", None); + assert_eq!(sp.take_replies(), [(2, DECLINED)]); + } + + #[test] + fn a_failed_download_discards_the_rest_of_the_batch() { + let mut sp = ServerPacks::default(); + sp.connect(Prompt::Allowed); + sp.push(1, "http://a/p.zip", None); + sp.push(2, "http://a/dead.zip", None); + settle( + &mut sp, + &mut |_| Batch { + downloaded: vec![(1, PathBuf::from("/p/1"))], + failed: vec![2], + }, + &mut |_| unreachable!(), + ); + assert_eq!( + sp.take_replies(), + [ + (1, ACCEPTED), + (2, ACCEPTED), + (1, DISCARDED), + (2, FAILED_DOWNLOAD) + ] + ); + } + + #[test] + fn a_pack_that_does_not_load_fails_its_reload() { + let mut sp = ServerPacks::default(); + sp.connect(Prompt::Allowed); + sp.push(1, "http://a/p.zip", None); + let mut reloads = Vec::new(); + settle(&mut sp, &mut |r| ok(r[0].id), &mut |p| { + reloads.push(p.to_vec()); + reloads.len() > 1 + }); + assert_eq!( + sp.take_replies(), + [(1, ACCEPTED), (1, DOWNLOADED), (1, FAILED_RELOAD)] + ); + // The recovery reload has none of the server's packs. + assert_eq!(reloads[1], []); + } + + #[test] + fn popping_and_disconnecting_unload_the_packs() { + let mut sp = ServerPacks::default(); + sp.connect(Prompt::Allowed); + sp.push(1, "http://a/p.zip", None); + sp.push(2, "http://a/q.zip", None); + let last = std::cell::RefCell::new(Vec::new()); + let mut reload = |p: &[(u128, PathBuf)]| { + *last.borrow_mut() = p.to_vec(); + true + }; + settle( + &mut sp, + &mut |r| Batch { + downloaded: r + .iter() + .map(|q| (q.id, PathBuf::from(format!("/p/{}", q.id)))) + .collect(), + failed: vec![], + }, + &mut reload, + ); + sp.take_replies(); + sp.pop(1); + settle(&mut sp, &mut |_| unreachable!(), &mut reload); + // Callbacks.onSuccess reports every pack the reload loaded, again. + assert_eq!(sp.take_replies(), [(2, SUCCESSFULLY_LOADED)]); + assert_eq!(*last.borrow(), [(2, PathBuf::from("/p/2"))]); + sp.disconnect(); + settle(&mut sp, &mut |_| unreachable!(), &mut reload); + assert!(last.borrow().is_empty()); + assert!(sp.packs.is_empty()); + } + + #[test] + fn a_pushed_id_replaces_its_pack() { + let mut sp = ServerPacks::default(); + sp.connect(Prompt::Allowed); + sp.push(1, "http://a/old.zip", None); + sp.push(1, "http://a/new.zip", None); + let mut urls = Vec::new(); + settle( + &mut sp, + &mut |r| { + urls.extend(r.iter().map(|q| q.url.clone())); + ok(1) + }, + &mut |_| true, + ); + assert_eq!(urls, ["http://a/new.zip"]); + } + + #[test] + fn urls_and_hashes_are_read_as_vanilla_reads_them() { + assert!(valid_url("https://example.com/p.zip")); + assert!(valid_url("HTTP://example.com/p.zip")); + assert!(!valid_url("ftp://example.com/p.zip")); + assert!(!valid_url("example.com/p.zip")); + let sha1 = "0123456789ABCDEF0123456789abcdef01234567"; + assert_eq!(parse_sha1(sha1), Some(sha1.to_ascii_lowercase())); + assert_eq!(parse_sha1("abc"), None); + } +} diff --git a/crates/horizon-client/src/server_packs/download.rs b/crates/horizon-client/src/server_packs/download.rs new file mode 100644 index 000000000..595612df8 --- /dev/null +++ b/crates/horizon-client/src/server_packs/download.rs @@ -0,0 +1,482 @@ +//! Server pack downloads into the game directory's `downloads/` cache, as +//! vanilla keeps it (`DownloadQueue`, `HttpUtil.downloadFile`, +//! `DownloadCacheCleaner`): `downloads//`, one +//! batch at a time on a thread of its own, every download logged in +//! `downloads/log.json`, and the cache cut to its 20 newest files on start. +use super::{Batch, Request}; +use sha1::{Digest, Sha1}; +use std::{ + fs, + io::{self, Read, Write}, + path::{Path, PathBuf}, + sync::mpsc::{Receiver, Sender, channel}, + time::SystemTime, +}; + +/// `DownloadedPackSource`'s MAX_PACK_SIZE_BYTES (250 MiB). +pub const MAX_SIZE: u64 = 262_144_000; +/// `DownloadQueue.MAX_KEPT_PACKS`. +const MAX_KEPT: usize = 20; + +/// `createDownloadHeaders`: who is downloading, with which game. +pub fn headers(name: &str, uuid: u128) -> Vec<(&'static str, String)> { + use horizon_core::version::{RESOURCE_PACK_FORMAT, VANILLA_VERSION, VERSION_ID}; + vec![ + ("X-Minecraft-Username", name.to_owned()), + ("X-Minecraft-UUID", format!("{uuid:032x}")), + ("X-Minecraft-Version", VANILLA_VERSION.to_owned()), + ("X-Minecraft-Version-ID", VERSION_ID.to_owned()), + ( + "X-Minecraft-Pack-Format", + format!("{}.{}", RESOURCE_PACK_FORMAT.0, RESOURCE_PACK_FORMAT.1), + ), + ("User-Agent", format!("Minecraft Java/{VANILLA_VERSION}")), + ] +} + +type Job = (Vec, Vec<(&'static str, String)>); + +/// `DownloadQueue`: batches download in order, on one thread. +pub struct Queue { + jobs: Sender, + done: Receiver, +} +impl Queue { + pub fn open(dir: PathBuf) -> io::Result { + fs::create_dir_all(&dir)?; + vacuum(&dir, MAX_KEPT); + let (jobs, todo) = channel::(); + let (finished, done) = channel(); + std::thread::Builder::new() + .name("download-queue".into()) + .spawn(move || { + for (requests, headers) in todo { + if finished.send(run(&dir, &requests, &headers)).is_err() { + break; + } + } + })?; + Ok(Self { jobs, done }) + } + pub fn download(&self, requests: Vec, headers: Vec<(&'static str, String)>) { + let _ = self.jobs.send((requests, headers)); + } + /// The batches finished since the last call. + pub fn finished(&self) -> Vec { + self.done.try_iter().collect() + } +} + +/// `DownloadQueue.runDownload`: each pack into `//`, logged. +fn run(dir: &Path, requests: &[Request], headers: &[(&'static str, String)]) -> Batch { + let mut batch = Batch::default(); + for request in requests { + let id = horizon_protocol::crypto::uuid_string(request.id); + let result = download_file(&dir.join(&id), request, headers, MAX_SIZE); + // DownloadQueue.LogEntry, its fields in the codec's order. + let mut entry = vec![ + ("id", serde_json::Value::from(id)), + ("url", request.url.as_str().into()), + ( + "time", + chrono::Utc::now() + .to_rfc3339_opts(chrono::SecondsFormat::AutoSi, true) + .into(), + ), + ]; + if let Some(sha1) = &request.sha1 { + entry.push(("hash", sha1.as_str().into())); + } + entry.push(match &result { + Ok(path) => match fs::metadata(path) { + Ok(meta) => { + let name = path.strip_prefix(dir).unwrap_or(path); + let name = name.to_string_lossy().replace('\\', "/"); + ( + "file", + serde_json::json!({"name": name, "size": meta.len()}), + ) + } + Err(_) => ("error", "no_access".into()), + }, + Err(e) => { + log::error!("Horizon: failed to download {}: {e}", request.url); + ("error", "download_failed".into()) + } + }); + if let Err(e) = append_log(&dir.join("log.json"), &entry) { + log::error!("Horizon: failed to log download of {}: {e}", request.url); + } + match result { + Ok(path) => batch.downloaded.push((request.id, path)), + Err(_) => batch.failed.push(request.id), + } + } + batch +} + +/// `JsonEventLog.write`: one JSON object a line, as Gson writes it (with +/// its HTML escaping). +fn append_log(path: &Path, entry: &[(&str, serde_json::Value)]) -> io::Result<()> { + let fields: Vec = entry + .iter() + .map(|(k, v)| format!("{}:{v}", serde_json::Value::from(*k))) + .collect(); + let mut line = String::new(); + for c in format!("{{{}}}", fields.join(",")).chars() { + match c { + '<' | '>' | '&' | '=' | '\'' => line.push_str(&format!("\\u{:04x}", c as u32)), + c => line.push(c), + } + } + line.push('\n'); + fs::OpenOptions::new() + .create(true) + .append(true) + .open(path)? + .write_all(line.as_bytes()) +} + +fn sha1_of(path: &Path) -> io::Result { + let mut hasher = Sha1::new(); + io::copy(&mut fs::File::open(path)?, &mut hasher)?; + Ok(hex(&hasher.finalize())) +} +fn hex(bytes: &[u8]) -> String { + bytes.iter().map(|b| format!("{b:02x}")).collect() +} +/// `checkExistingFile`: the file is there with that hash. +fn matches(path: &Path, sha1: &str) -> bool { + path.exists() && sha1_of(path).is_ok_and(|actual| actual == sha1) +} +/// `updateModificationTime`: used now, so the cleaner keeps it longest. +fn touch(path: &Path) { + let _ = fs::File::options() + .append(true) + .open(path) + .and_then(|f| f.set_modified(SystemTime::now())); +} + +/// `HttpUtil.downloadFile`: into `/`. With a hash the cached file +/// is used when it matches, and a download that does not is an error; +/// without one the file is named after the hash of what came. +pub fn download_file( + dir: &Path, + request: &Request, + headers: &[(&'static str, String)], + max_size: u64, +) -> Result { + let target = request.sha1.as_ref().map(|sha1| dir.join(sha1)); + if let (Some(target), Some(sha1)) = (&target, &request.sha1) { + if matches(target, sha1) { + log::info!("Horizon: returning cached file since actual hash matches requested"); + touch(target); + return Ok(target.clone()); + } + if target.exists() { + log::warn!( + "Horizon: existing file {} not found or had mismatched hash", + target.display() + ); + } + fs::remove_file(target) + .or_else(|e| { + if e.kind() == io::ErrorKind::NotFound { + Ok(()) + } else { + Err(e) + } + }) + .map_err(|e| format!("Failed to remove existing file {}: {e}", target.display()))?; + } + let mut call = ureq::AgentBuilder::new().build().get(&request.url); + for (name, value) in headers { + call = call.set(name, value); + } + let response = call.call().map_err(|e| e.to_string())?; + let size = response + .header("Content-Length") + .and_then(|v| v.trim().parse::().ok()); + fs::create_dir_all(dir).map_err(|e| e.to_string())?; + if let Some(size) = size + && size > max_size + { + return Err(format!( + "Filesize is bigger than maximum allowed (file is {size}, limit is {max_size})" + )); + } + let mut input = response.into_reader(); + match (&target, &request.sha1) { + (Some(target), Some(sha1)) => { + let actual = save_hashed(&mut input, target, max_size).map_err(|e| e.to_string())?; + if &actual != sha1 { + return Err(format!( + "Hash of downloaded file ({actual}) did not match requested ({sha1})" + )); + } + Ok(target.clone()) + } + _ => { + let tmp = dir.join(format!("download{:016x}.tmp", rand_suffix())); + let result = save_hashed(&mut input, &tmp, max_size).and_then(|actual| { + let path = dir.join(&actual); + if matches(&path, &actual) { + touch(&path); + } else { + fs::rename(&tmp, &path)?; + } + Ok(path) + }); + let _ = fs::remove_file(&tmp); + result.map_err(|e| e.to_string()) + } + } +} +fn rand_suffix() -> u64 { + use std::hash::{BuildHasher, RandomState}; + RandomState::new().hash_one(std::time::Instant::now()) +} +/// `downloadAndHash`: write what comes, at most `max_size` bytes. +fn save_hashed(input: &mut dyn Read, path: &Path, max_size: u64) -> io::Result { + let mut out = fs::File::create(path)?; + let mut hasher = Sha1::new(); + let mut buffer = [0u8; 8196]; + let mut read_so_far = 0u64; + loop { + let n = input.read(&mut buffer)?; + if n == 0 { + break; + } + read_so_far += n as u64; + if read_so_far > max_size { + return Err(io::Error::other(format!( + "Filesize was bigger than maximum allowed (got >= {read_so_far}, limit was {max_size})" + ))); + } + out.write_all(&buffer[..n])?; + hasher.update(&buffer[..n]); + } + Ok(hex(&hasher.finalize())) +} + +/// `DownloadCacheCleaner.vacuumCacheDir`: keep the `max_files` files most +/// worth keeping (in the pack folders: the newest, and one per pack before a +/// second of any), then drop the folders left empty. +pub fn vacuum(dir: &Path, max_files: usize) { + let mut files = Vec::new(); + let mut stack = vec![dir.to_path_buf()]; + while let Some(d) = stack.pop() { + let Ok(entries) = fs::read_dir(&d) else { + continue; + }; + for e in entries.flatten() { + let path = e.path(); + let Ok(meta) = e.metadata() else { continue }; + if meta.is_dir() { + stack.push(path); + } else if meta.is_file() && path.parent() != Some(dir) { + let time = meta.modified().unwrap_or(SystemTime::UNIX_EPOCH); + files.push((path, time)); + } + } + } + let Some(remove) = files.len().checked_sub(max_files).filter(|n| *n > 0) else { + return; + }; + // Newest first, then each file's rank in its folder (0 for a folder's + // newest), reversed, and stably sorted by rank, highest first. + files.sort_by_key(|f| std::cmp::Reverse(f.1)); + let mut counts = std::collections::HashMap::::new(); + let mut ranked: Vec<(PathBuf, usize)> = files + .into_iter() + .map(|(path, _)| { + let count = counts + .entry(path.parent().unwrap_or(dir).to_path_buf()) + .or_default(); + let rank = *count; + *count += 1; + (path, rank) + }) + .collect(); + ranked.reverse(); + ranked.sort_by_key(|f| std::cmp::Reverse(f.1)); + let mut emptied = std::collections::HashSet::new(); + for (path, rank) in ranked.into_iter().take(remove) { + match fs::remove_file(&path) { + Ok(()) if rank == 0 => { + emptied.insert(path.parent().unwrap_or(dir).to_path_buf()); + } + Ok(()) => {} + Err(e) => log::warn!( + "Horizon: failed to delete cache file {}: {e}", + path.display() + ), + } + } + emptied.remove(dir); + for d in emptied { + let _ = fs::remove_dir(d); + } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::net::TcpListener; + + /// A one-shot HTTP server answering `status` with `body`; the request it got. + fn serve(status: &str, body: Vec) -> (String, std::thread::JoinHandle) { + let listener = TcpListener::bind("127.0.0.1:0").unwrap(); + let url = format!("http://{}/pack.zip", listener.local_addr().unwrap()); + let status = status.to_owned(); + let handle = std::thread::spawn(move || { + let (mut stream, _) = listener.accept().unwrap(); + let mut request = Vec::new(); + let mut buf = [0u8; 1024]; + while !request.ends_with(b"\r\n\r\n") { + let n = stream.read(&mut buf).unwrap(); + request.extend_from_slice(&buf[..n]); + } + let head = format!( + "HTTP/1.1 {status}\r\nContent-Length: {}\r\nConnection: close\r\n\r\n", + body.len() + ); + stream.write_all(head.as_bytes()).unwrap(); + stream.write_all(&body).unwrap(); + String::from_utf8_lossy(&request).into_owned() + }); + (url, handle) + } + fn sha1(bytes: &[u8]) -> String { + hex(&Sha1::digest(bytes)) + } + fn scratch() -> PathBuf { + let dir = std::env::temp_dir().join(format!("horizon-packs-{:016x}", rand_suffix())); + fs::create_dir_all(&dir).unwrap(); + dir + } + + #[test] + fn a_pack_lands_under_its_hash_and_is_reused_from_the_cache() { + let dir = scratch(); + let body = b"PK pack".to_vec(); + let (url, server) = serve("200 OK", body.clone()); + let request = Request { + id: 7, + url, + sha1: Some(sha1(&body)), + }; + let path = download_file(&dir, &request, &headers("Alex", 0xab), MAX_SIZE).unwrap(); + assert_eq!(path, dir.join(sha1(&body))); + assert_eq!(fs::read(&path).unwrap(), body); + let sent = server.join().unwrap(); + assert!(sent.contains("X-Minecraft-Username: Alex"), "{sent}"); + assert!(sent.contains("X-Minecraft-Pack-Format: 97.1"), "{sent}"); + // Cached: no server this time. + let cached = Request { + url: "http://127.0.0.1:9/gone.zip".into(), + ..request + }; + assert_eq!(download_file(&dir, &cached, &[], MAX_SIZE).unwrap(), path); + fs::remove_dir_all(dir).unwrap(); + } + + #[test] + fn a_wrong_hash_a_dead_url_and_a_large_pack_fail() { + let dir = scratch(); + let (url, server) = serve("200 OK", b"other bytes".to_vec()); + let wrong = Request { + id: 1, + url, + sha1: Some("0".repeat(40)), + }; + let err = download_file(&dir, &wrong, &[], MAX_SIZE).unwrap_err(); + assert!(err.contains("did not match requested"), "{err}"); + server.join().unwrap(); + let dead = Request { + id: 2, + url: "http://127.0.0.1:9/pack.zip".into(), + sha1: None, + }; + assert!(download_file(&dir.join("dead"), &dead, &[], MAX_SIZE).is_err()); + assert!(!dir.join("dead").exists()); + let (url, server) = serve("200 OK", vec![0; 100]); + let large = Request { + id: 3, + url, + sha1: None, + }; + let err = download_file(&dir, &large, &[], 10).unwrap_err(); + assert!(err.contains("bigger than maximum"), "{err}"); + let _ = server.join(); + let (url, server) = serve("404 Not Found", Vec::new()); + let missing = Request { + id: 4, + url, + sha1: None, + }; + assert!(download_file(&dir, &missing, &[], MAX_SIZE).is_err()); + server.join().unwrap(); + fs::remove_dir_all(dir).unwrap(); + } + + #[test] + fn the_queue_logs_each_download() { + let dir = scratch(); + let (url, server) = serve("200 OK", b"zip".to_vec()); + let queue = Queue::open(dir.clone()).unwrap(); + let id = 0x5b2c_7a4e_1f3d_4c8b_9a6e_2d4f_8b1c_3e5a; + queue.download( + vec![Request { + id, + url, + sha1: None, + }], + Vec::new(), + ); + let batch = loop { + if let Some(b) = queue.finished().pop() { + break b; + } + std::thread::sleep(std::time::Duration::from_millis(10)); + }; + server.join().unwrap(); + let file = dir + .join("5b2c7a4e-1f3d-4c8b-9a6e-2d4f8b1c3e5a") + .join(sha1(b"zip")); + assert_eq!(batch.downloaded, [(id, file)]); + let log = fs::read_to_string(dir.join("log.json")).unwrap(); + let entry: serde_json::Value = serde_json::from_str(log.trim()).unwrap(); + assert_eq!(entry["id"], "5b2c7a4e-1f3d-4c8b-9a6e-2d4f8b1c3e5a"); + assert_eq!(entry["file"]["size"], 3); + fs::remove_dir_all(dir).unwrap(); + } + + #[test] + fn the_cleaner_keeps_the_newest_file_of_each_pack_longest() { + let dir = scratch(); + let at = |secs| SystemTime::UNIX_EPOCH + std::time::Duration::from_secs(secs); + for (pack, file, time) in [ + ("a", "1", 10), + ("a", "2", 20), + ("a", "3", 30), + ("b", "1", 5), + ] { + fs::create_dir_all(dir.join(pack)).unwrap(); + let path = dir.join(pack).join(file); + fs::write(&path, b"x").unwrap(); + fs::File::options() + .append(true) + .open(&path) + .unwrap() + .set_modified(at(time)) + .unwrap(); + } + fs::write(dir.join("log.json"), b"").unwrap(); + vacuum(&dir, 2); + assert!(dir.join("a/3").exists() && dir.join("b/1").exists()); + assert!(!dir.join("a/1").exists() && !dir.join("a/2").exists()); + assert!(dir.join("log.json").exists()); + fs::remove_dir_all(dir).unwrap(); + } +} From 186ab70305dd8190745b6513524d241adfb62654 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 17:20:35 +0200 Subject: [PATCH 006/140] Server resource packs: prompt, Server Resource Packs setting, apply and remove Servers that push a resource pack now work (reported by scanfee on Discord: "Servers requiring custom resource packs do not work yet"; net.rs declined every push). - net.rs forwards resource_pack_push and _pop in configuration and play, and answers in the phase the connection is in. - The prompt is vanilla's PackConfirmScreen on a shared ConfirmScreen (confirm_screen.rs, now also used by the game rules screen): the required or optional wording, the server's message, Proceed/Disconnect or Yes/No, Escape for no. Declining a required pack disconnects with vanilla's reason. - The server list's Edit screen has the Server Resource Packs cycle button (Enabled, Disabled, Prompt), saved as acceptTextures; the prompt's answer is saved there too. - Downloaded packs go on top of the player's packs, in push order, through the same reload as the Resource Packs screen; they are removed on pop and when leaving the server. tools/server_pack_e2e.py drives the real client against vanilla's dedicated server or Horizon's, with a test pack (blue dirt, lang strings) from a local HTTP server, and checks the statuses the client sends through net_capture: decline, proceed, the cache, a wrong SHA-1, an optional pack declined and accepted, a dead URL. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/confirm_screen.rs | 75 +++ crates/horizon-client/src/game.rs | 31 +- .../src/game/game_rules_screen.rs | 68 +-- crates/horizon-client/src/game/packs.rs | 31 +- crates/horizon-client/src/game/remote.rs | 13 + .../horizon-client/src/game/server_packs.rs | 316 +++++++++++ .../horizon-client/src/game/startup_menu.rs | 7 +- crates/horizon-client/src/lib.rs | 1 + crates/horizon-client/src/multiplayer.rs | 96 +++- crates/horizon-client/src/net.rs | 73 ++- crates/horizon-client/src/packs.rs | 11 + crates/horizon-protocol/src/packets/play.rs | 5 +- docs/resource-packs.md | 4 +- tools/server_pack_e2e.py | 516 ++++++++++++++++++ 14 files changed, 1158 insertions(+), 89 deletions(-) create mode 100644 crates/horizon-client/src/confirm_screen.rs create mode 100644 crates/horizon-client/src/game/server_packs.rs create mode 100644 tools/server_pack_e2e.py diff --git a/crates/horizon-client/src/confirm_screen.rs b/crates/horizon-client/src/confirm_screen.rs new file mode 100644 index 000000000..3b4f7e7aa --- /dev/null +++ b/crates/horizon-client/src/confirm_screen.rs @@ -0,0 +1,75 @@ +//! `ConfirmScreen`: a title, a message wrapped to `width - 50` (15 lines at +//! most) and two 150-wide buttons 4 apart and 16 below it, the whole column +//! centred; Escape answers no. +use crate::{ + font::Font, + hud::{HudAtlas, HudBatch}, + text::Text, + ui, +}; + +pub struct Confirm { + /// Each line and where it is drawn. + pub lines: Vec<(Text, f32, f32)>, + /// The yes and no buttons' corners. + pub buttons: [(f32, f32); 2], +} +impl Confirm { + pub fn new(font: &Font, (w, h): (f32, f32), title: &Text, message: &Text) -> Self { + let message: Vec = font + .split_lines(message, w - 50.0) + .into_iter() + .map(|(line, _)| line) + .take(15) + .collect(); + let tw = font.width_text(title); + let mw = message + .iter() + .map(|l| font.width_text(l)) + .fold(0.0, f32::max); + let mh = 9.0 * message.len() as f32; + let col = tw.max(mw).max(304.0); + let total = 9.0 + 8.0 + mh + 8.0 + 36.0; + let (lx, ly) = (((w - col) / 2.0).trunc(), ((h - total) / 2.0).trunc()); + let cell = |cw: f32| lx + ((col - cw) / 2.0).trunc(); + let mid = cell(mw) + (mw / 2.0).trunc(); + let mut lines = vec![(title.clone(), cell(tw), ly)]; + for (i, line) in message.into_iter().enumerate() { + let x = mid - (font.width_text(&line) / 2.0).trunc(); + lines.push((line, x, ly + 17.0 + 9.0 * i as f32)); + } + let (bx, by) = (cell(304.0), ly + 9.0 + 8.0 + mh + 8.0 + 16.0); + Self { + lines, + buttons: [(bx, by), (bx + 154.0, by)], + } + } + /// The answer a click at `cursor` gives: true for yes, false for no. + pub fn answer_at(&self, cursor: (f32, f32)) -> Option { + let [yes, no] = self.buttons; + let on = |(x, y): (f32, f32)| ui::hovered(cursor, x, y, 150.0, 20.0); + if on(yes) { + Some(true) + } else if on(no) { + Some(false) + } else { + None + } + } + /// The lines and the buttons (yes first), over whatever is behind. + pub fn draw( + &self, + batch: &mut HudBatch, + atlas: &HudAtlas, + cursor: (f32, f32), + labels: [&Text; 2], + ) { + for (line, x, y) in &self.lines { + batch.text_styled(atlas, line, *x, *y, u32::MAX, true); + } + for ((bx, by), label) in self.buttons.into_iter().zip(labels) { + let hover = ui::hovered(cursor, bx, by, 150.0, 20.0); + ui::button(batch, atlas, bx, by, 150.0, 20.0, label, true, hover); + } + } +} diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 7ac3d0829..0438cafd2 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -137,6 +137,7 @@ mod scoreboard; mod screens; mod sculk; mod sculk_fixture; +mod server_packs; mod server_travel; mod shader_packs; mod shield; @@ -1127,6 +1128,8 @@ struct Game<'a> { pending_entry: Option, world_loader: Option, pending_pack_reload: bool, + /// A server's resource packs (game/server_packs.rs). + server_packs: server_packs::ServerPackState, world_renderer_ready: bool, collision: &'a BlockCollisionRegistry<'a>, motion: &'a MotionResources, @@ -4774,7 +4777,14 @@ impl Game<'_> { hud_layout::paint(batch, &self.gui.atlas, &draws); } fn hud(&mut self, size: [u32; 2]) -> HudBatch { - let mut batch = self.hud_layers(size); + // The pack prompt replaces the connecting screen (setScreen), but + // in game it opens over the world. + let mut batch = if self.server_packs.prompt.is_some() && self.player.is_none() { + HudBatch::new(size) + } else { + self.hud_layers(size) + }; + self.draw_pack_prompt(&mut batch); // Gui.extractRenderState: the debug overlay comes after the screen // and the toasts, so it is over everything, menus included. self.draw_debug_overlay(&mut batch, size); @@ -11032,6 +11042,13 @@ impl ApplicationHandler for Game<'_> { self.advancements_scroll(scaled(raw_x) as f32, d); } } + WindowEvent::MouseInput { state, button, .. } + if self.server_packs.prompt.is_some() => + { + if state == ElementState::Pressed && button == MouseButton::Left { + self.pack_prompt_click()?; + } + } WindowEvent::MouseInput { .. } if self.screen == Screen::Win => {} WindowEvent::MouseInput { state, button, .. } if self.screen == Screen::Options => { if self.options_waiting_for_key() && state == ElementState::Pressed { @@ -11231,6 +11248,14 @@ impl ApplicationHandler for Game<'_> { _ => {} } } + // ConfirmScreen.keyPressed: Escape answers no. + WindowEvent::KeyboardInput { event, .. } if self.server_packs.prompt.is_some() => { + if event.state == ElementState::Pressed + && event.physical_key == PhysicalKey::Code(KeyCode::Escape) + { + self.answer_pack_prompt(false)?; + } + } WindowEvent::KeyboardInput { event, .. } if self.screen == Screen::Chat && self.title.is_none() => { @@ -11609,6 +11634,7 @@ impl ApplicationHandler for Game<'_> { event_loop.exit(); return; } + self.tick_server_packs(); self.poll_control(event_loop); if self.pending_save.is_some() { return; @@ -11703,6 +11729,7 @@ impl<'a> Game<'a> { pending_entry: None, world_loader: None, pending_pack_reload: false, + server_packs: Default::default(), world_renderer_ready: false, collision: res.collision(), motion: res.motion(), @@ -13293,7 +13320,7 @@ pub fn run() -> Result<()> { return run_loading(options, early_settings, vanilla_root, None, started); } let mut pack_error = None; - options.resources = packs::startup_root(&vanilla_root, &early_settings.resource_packs) + options.resources = packs::startup_root(&vanilla_root, &early_settings.resource_packs, &[]) .unwrap_or_else(|e| { log::warn!("Horizon: resource packs not applied: {e}"); pack_error = Some(e.to_string()); diff --git a/crates/horizon-client/src/game/game_rules_screen.rs b/crates/horizon-client/src/game/game_rules_screen.rs index d99a7ab5b..d925c5081 100644 --- a/crates/horizon-client/src/game/game_rules_screen.rs +++ b/crates/horizon-client/src/game/game_rules_screen.rs @@ -3,6 +3,7 @@ //! box each, and Done sending the changed ones (ServerboundSetGameRulePacket). //! Leaving with changes asks first (ConfirmScreen). use horizon_client::{ + confirm_screen::Confirm, font::Font, gamerules::{self, GameRules, RULES, Rule, Value}, hud::{HudAtlas, HudBatch}, @@ -66,9 +67,6 @@ fn parse(r: &Rule, s: &str) -> Option { .flatten() .filter(|v| (r.min..=r.max).contains(v)) } -fn widest(font: &Font, lines: &[Text]) -> f32 { - lines.iter().map(|l| font.width_text(l)).fold(0.0, f32::max) -} fn lines(font: &Font, t: &Text, width: f32) -> Vec { font.split_lines(t, width) .into_iter() @@ -95,38 +93,11 @@ fn yellow() -> u32 { named_color("yellow").unwrap_or(0xFFFF55) } -/// ConfirmScreen: the title, the message (at most `width - 50` wide), and -/// Yes / No 16 below, 4 apart, all centred. -struct Confirm { - lines: Vec<(Text, f32, f32)>, - buttons: [(f32, f32); 2], -} -impl Confirm { - fn new(font: &Font, (w, h): (f32, f32)) -> Self { - let title = Text::translate("editGamerule.inGame.discardChanges.title", &[]); - let message = Text::translate("editGamerule.inGame.discardChanges.message", &[]); - let message: Vec = lines(font, &message, w - 50.0) - .into_iter() - .take(15) - .collect(); - let (tw, mw) = (font.width_text(&title), widest(font, &message)); - let mh = 9.0 * message.len() as f32; - let col = tw.max(mw).max(304.0); - let total = 9.0 + 8.0 + mh + 8.0 + 36.0; - let (lx, ly) = (((w - col) / 2.0).trunc(), ((h - total) / 2.0).trunc()); - let cell = |cw: f32| lx + ((col - cw) / 2.0).trunc(); - let mid = cell(mw) + (mw / 2.0).trunc(); - let mut out = vec![(title, cell(tw), ly)]; - for (i, line) in message.into_iter().enumerate() { - let x = mid - (font.width_text(&line) / 2.0).trunc(); - out.push((line, x, ly + 17.0 + 9.0 * i as f32)); - } - let (bx, by) = (cell(304.0), ly + 9.0 + 8.0 + mh + 8.0 + 16.0); - Self { - lines: out, - buttons: [(bx, by), (bx + 154.0, by)], - } - } +/// ConfirmScreen "Game Rule Changes". +fn confirm(font: &Font, size: (f32, f32)) -> Confirm { + let title = Text::translate("editGamerule.inGame.discardChanges.title", &[]); + let message = Text::translate("editGamerule.inGame.discardChanges.message", &[]); + Confirm::new(font, size, &title, &message) } impl RulesScreen { @@ -301,13 +272,10 @@ impl RulesScreen { let (w, h) = size; let on = |x: f32, y: f32, bw: f32, bh: f32| ui::hovered(cursor, x, y, bw, bh); if self.confirm { - let c = Confirm::new(&atlas.font, size); - let [(yx, yy), (nx, ny)] = c.buttons; - if on(yx, yy, 150.0, 20.0) { - return Some(Exit::Discard); - } - if on(nx, ny, 150.0, 20.0) { - self.confirm = false; + match confirm(&atlas.font, size).answer_at(cursor) { + Some(true) => return Some(Exit::Discard), + Some(false) => self.confirm = false, + None => {} } return None; } @@ -367,7 +335,7 @@ impl RulesScreen { let (w, h) = size; let on = |(x, y): (f32, f32)| ui::hovered(cursor, x, y, 150.0, 20.0); if self.confirm { - return Confirm::new(&atlas.font, size).buttons.into_iter().any(on); + return confirm(&atlas.font, size).answer_at(cursor).is_some(); } let [done, cancel] = footer(w, h); if (on(done) && !self.invalid()) || on(cancel) { @@ -384,15 +352,11 @@ impl RulesScreen { let (w, h) = (batch.width, batch.height); ui::menu_background(batch, atlas, 0.0, 0.0, w, h, true); if self.confirm { - let c = Confirm::new(&atlas.font, (w, h)); - for (line, x, y) in &c.lines { - batch.text_styled(atlas, line, *x, *y, u32::MAX, true); - } - for ((bx, by), key) in c.buttons.into_iter().zip(["gui.yes", "gui.no"]) { - let hover = ui::hovered(cursor, bx, by, 150.0, 20.0); - let label = Text::translate(key, &[]); - ui::button(batch, atlas, bx, by, 150.0, 20.0, &label, true, hover); - } + let labels = [ + Text::translate("gui.yes", &[]), + Text::translate("gui.no", &[]), + ]; + confirm(&atlas.font, (w, h)).draw(batch, atlas, cursor, [&labels[0], &labels[1]]); return; } let rows = self.rows(); diff --git a/crates/horizon-client/src/game/packs.rs b/crates/horizon-client/src/game/packs.rs index ae2de00e6..4704423ba 100644 --- a/crates/horizon-client/src/game/packs.rs +++ b/crates/horizon-client/src/game/packs.rs @@ -34,10 +34,16 @@ pub fn open_folder(dir: &Path) { log::warn!("Horizon: could not open {}: {e}", dir.display()); } } -/// The resource root to load from, given the vanilla root and the selection. -pub fn startup_root(vanilla: &Path, selected: &[String]) -> std::io::Result { +/// The resource root to load from, given the vanilla root, the selection and +/// a server's packs, which go on top (`Pack.Position.TOP`, fixed). +pub fn startup_root( + vanilla: &Path, + selected: &[String], + server: &[Pack], +) -> std::io::Result { let all = packs::discover(vanilla, &packs_dir()); - let enabled = packs::enabled(&all, selected); + let mut enabled = packs::enabled(&all, selected); + enabled.extend_from_slice(server); packs::resource_root(vanilla, &enabled, &cache_dir()) } fn info(p: &Pack) -> PackInfo { @@ -113,14 +119,7 @@ impl Game<'_> { self.pending_pack_reload = true; return; } - let vanilla = self.vanilla_root(); - if self.ui.vanilla_root.as_os_str().is_empty() { - self.ui.vanilla_root = vanilla.clone(); - } - let result = startup_root(&vanilla, &self.settings.resource_packs) - .map_err(Into::into) - .and_then(|root| self.reload_resources(&root)); - if let Err(e) = result { + if let Err(e) = self.reload_selected_packs() { log::warn!("Horizon: resource reload failed: {e}"); if self.screen != super::Screen::Options { self.open_options_at( @@ -131,6 +130,16 @@ impl Game<'_> { self.ui.options.resource_error = Some(e.to_string()); } } + /// Reload from the selected packs and the server's. + pub(super) fn reload_selected_packs(&mut self) -> horizon_client::Result<()> { + let vanilla = self.vanilla_root(); + if self.ui.vanilla_root.as_os_str().is_empty() { + self.ui.vanilla_root = vanilla.clone(); + } + let server = &self.server_packs.active; + let root = startup_root(&vanilla, &self.settings.resource_packs, server)?; + self.reload_resources(&root) + } fn reload_resources(&mut self, root: &Path) -> horizon_client::Result<()> { let render = std::sync::Arc::new(self.pack.assets.reload(root)?); let mut atlas = HudAtlas::build_over(root, &self.vanilla_root())?; diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index da0def0fb..32cffa306 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -305,6 +305,16 @@ impl Game<'_> { // A signed-in account always plays under its own name. let auth = horizon_client::auth::current(); let name = auth.as_ref().map_or(name, |a| a.name.as_str()); + let user = auth.as_ref().map_or_else( + || { + ( + name.to_owned(), + horizon_protocol::crypto::offline_uuid(name), + ) + }, + |a| (a.name.clone(), a.uuid), + ); + self.server_packs_connect(local.is_none().then_some(address), user); let session = match local { Some(pipe) => Session::connect_local(pipe, name, view, lang.clone()), None => { @@ -453,6 +463,7 @@ impl Game<'_> { if let Some(mut r) = self.remote.take() { r.session.disconnect(); } + self.server_packs_disconnect(); // Single player's server thread saves the world before the title shows. let single_player = match self.integrated.take() { Some(server) => { @@ -827,6 +838,8 @@ impl Game<'_> { } } Event::Reconfigured(registries) => self.set_registries(registries), + Event::PackPush(p) => self.handle_pack_push(p), + Event::PackPop(id) => self.handle_pack_pop(id), Event::DecodeError(e) => { if let Some(r) = self.remote.as_mut() { r.decode_errors += 1; diff --git a/crates/horizon-client/src/game/server_packs.rs b/crates/horizon-client/src/game/server_packs.rs new file mode 100644 index 000000000..6c891a831 --- /dev/null +++ b/crates/horizon-client/src/game/server_packs.rs @@ -0,0 +1,316 @@ +//! A server's resource packs bound to the game (`ClientCommonPacketListenerImpl. +//! handleResourcePackPush` and `handleResourcePackPop`, its `PackConfirmScreen`, +//! and `DownloadedPackSource` as `Minecraft` drives it): the prompt, the +//! server list's setting, downloads into `downloads/`, and a resource reload +//! with the server's packs on top of the player's own. +use super::Game; +use horizon_client::{ + Result, + confirm_screen::Confirm, + hud::{HudAtlas, HudBatch}, + multiplayer, packs, + scoreboard::{comp_text, tag_to_json}, + server_packs::{Prompt, ServerPacks, action, download, parse_sha1, valid_url}, + text::{Text, named_color}, + ui, +}; +use horizon_protocol::{packets::configuration::ResourcePackPush, servers}; +use std::path::PathBuf; + +/// `ClientCommonPacketListenerImpl.PackConfirmScreen`: the packs it asks +/// about, whether the last one is required, and the server's message. +pub(super) struct PackPrompt { + requests: Vec<(u128, String, String)>, + required: bool, + prompt: Option, +} +impl PackPrompt { + fn texts(&self) -> (Text, Text, [Text; 2]) { + let t = |key: &str| Text::translate(key, &[]); + let (title, line2) = if self.required { + let yellow = named_color("yellow").unwrap_or(0xFFFF55); + ( + t("multiplayer.requiredTexturePrompt.line1"), + t("multiplayer.requiredTexturePrompt.line2") + .with_color(yellow) + .bold(), + ) + } else { + ( + t("multiplayer.texturePrompt.line1"), + t("multiplayer.texturePrompt.line2"), + ) + }; + // preparePackPrompt. + let message = match &self.prompt { + Some(prompt) => Text::translate( + "multiplayer.texturePrompt.serverPrompt", + &[line2, prompt.clone()], + ), + None => line2, + }; + let buttons = if self.required { + [t("gui.proceed"), t("menu.disconnect")] + } else { + [t("gui.yes"), t("gui.no")] + }; + (title, message, buttons) + } + fn layout(&self, atlas: &HudAtlas, size: (f32, f32)) -> Confirm { + let (title, message, _) = self.texts(); + Confirm::new(&atlas.font, size, &title, &message) + } +} + +/// The game's `DownloadedPackSource`. +#[derive(Default)] +pub(super) struct ServerPackState { + packs: ServerPacks, + /// `downloads/` in the game folder, opened at the first download. + queue: Option, + pub(super) prompt: Option, + /// The server list entry the setting is saved to (none: a direct join). + address: Option, + /// The account the downloads are made for (the download headers). + user: (String, u128), + /// The packs loaded on top of the player's own, bottom first. + pub(super) active: Vec, +} + +fn saves() -> PathBuf { + std::env::current_dir().unwrap_or_default().join("saves") +} + +impl Game<'_> { + /// `ConnectScreen`: the server's setting decides what its packs do + /// (`configureForServerControl`); single player's own server takes them + /// all, quietly (`configureForLocalWorld`). + pub(super) fn server_packs_connect(&mut self, address: Option<&str>, user: (String, u128)) { + let state = &mut self.server_packs; + state.user = user; + state.prompt = None; + let Some(address) = address else { + state.address = None; + state.packs.local_world(); + return; + }; + let file = multiplayer::servers_file(&saves()); + let entry = servers::load(&file).into_iter().find(|s| s.ip == address); + let setting = entry.as_ref().and_then(|e| e.accept_textures); + state.address = entry.map(|e| e.ip); + state.packs.connect(Prompt::for_server(setting)); + } + /// `Minecraft.clearDownloadedResourcePacks`: every server pack goes at once. + pub(super) fn server_packs_disconnect(&mut self) { + self.server_packs.prompt = None; + self.server_packs.packs.disconnect(); + self.tick_server_packs(); + } + + /// `handleResourcePackPush`. + pub(super) fn handle_pack_push(&mut self, p: ResourcePackPush) { + if !valid_url(&p.url) { + self.send_pack_status(p.id, action::INVALID_URL); + return; + } + let setting = self.server_setting(); + let prompt = Prompt::for_server(setting); + if prompt != Prompt::Pending && (!p.required || prompt != Prompt::Declined) { + self.server_packs + .packs + .push(p.id, &p.url, parse_sha1(&p.hash)); + return; + } + // addOrUpdatePackPrompt: one prompt for every pack pushed before it is answered. + let text = p.prompt.as_ref().map(|t| comp_text(&tag_to_json(t))); + let state = &mut self.server_packs; + let open = state.prompt.get_or_insert(PackPrompt { + requests: Vec::new(), + required: p.required, + prompt: None, + }); + open.requests.push((p.id, p.url, p.hash)); + open.required = p.required; + open.prompt = text; + self.capture(false); + } + /// `handleResourcePackPop`: one pack, or all of them. + pub(super) fn handle_pack_pop(&mut self, id: Option) { + match id { + Some(id) => self.server_packs.packs.pop(id), + None => self.server_packs.packs.pop_all(), + } + } + /// The joined server's entry in the server list: its `acceptTextures`. + fn server_setting(&self) -> Option { + let address = self.server_packs.address.as_deref()?; + servers::load(&multiplayer::servers_file(&saves())) + .into_iter() + .find(|s| s.ip == address)? + .accept_textures + } + fn send_pack_status(&self, id: u128, status: i32) { + if let Some(r) = &self.remote { + r.session.send_pack_status(id, status); + } + } + + /// The prompt's answer (`PackConfirmScreen`'s callback): the server's + /// setting follows it, declining a required pack disconnects, and every + /// pack it asked about is pushed. + pub(super) fn answer_pack_prompt(&mut self, yes: bool) -> Result<()> { + let Some(prompt) = self.server_packs.prompt.take() else { + return Ok(()); + }; + if self.player.is_some() && self.screen == super::Screen::Playing { + self.capture(true); + } + let setting = if yes { + self.server_packs.packs.allow(); + Some(true) + } else { + self.server_packs.packs.reject(); + if prompt.required { + let reason = Text::translate("multiplayer.requiredTexturePrompt.disconnect", &[]); + return self.leave_server(Some(reason.plain())); + } + Some(false) + }; + for (id, url, hash) in prompt.requests { + self.server_packs.packs.push(id, &url, parse_sha1(&hash)); + } + // ServerList.saveSingleServer. + if let Some(address) = &self.server_packs.address { + let file = multiplayer::servers_file(&saves()); + let mut list = servers::load(&file); + for entry in list.iter_mut().filter(|s| &s.ip == address) { + entry.accept_textures = setting; + } + if let Err(e) = servers::save(&file, &list) { + log::warn!("Horizon: could not save {}: {e}", file.display()); + } + } + Ok(()) + } + + /// Runs what the packs need (`createUpdateScheduler`): the downloads + /// that finished, the ones to start, a resource reload when the active + /// packs change, and the statuses for the server. + pub(super) fn tick_server_packs(&mut self) { + // A reload waits for the world's resources (`reload_packs`). + if self.rest_loader.is_some() || self.world_loader.is_some() { + return; + } + let finished = self + .server_packs + .queue + .as_ref() + .map(download::Queue::finished) + .unwrap_or_default(); + for batch in finished { + self.server_packs.packs.downloaded(batch); + } + while self.server_packs.packs.wants_tick() { + let tick = self.server_packs.packs.tick(); + if !tick.download.is_empty() { + self.start_pack_downloads(tick.download); + } + if let Some(mut load) = tick.reload { + while let Some(recovery) = { + let ok = self.reload_server_packs(&load); + self.server_packs.packs.reloaded(ok) + } { + load = recovery; + } + } + } + for (id, status) in self.server_packs.packs.take_replies() { + self.send_pack_status(id, status); + } + } + fn start_pack_downloads(&mut self, requests: Vec) { + let state = &mut self.server_packs; + if state.queue.is_none() { + let dir = std::env::current_dir() + .unwrap_or_default() + .join("downloads"); + match download::Queue::open(dir) { + Ok(queue) => state.queue = Some(queue), + Err(e) => { + log::error!("Horizon: failed to open the download queue: {e}"); + let failed = requests.iter().map(|r| r.id).collect(); + state.packs.downloaded(horizon_client::server_packs::Batch { + downloaded: Vec::new(), + failed, + }); + return; + } + } + } + let headers = download::headers(&state.user.0, state.user.1); + if let Some(queue) = &state.queue { + queue.download(requests, headers); + } + } + /// `DownloadedPackSource.startReload`: the packs on top of the player's + /// own, then `Minecraft.reloadResourcePacks`. False when a pack has no + /// readable `pack.mcmeta` or the reload failed. + fn reload_server_packs(&mut self, load: &[(u128, PathBuf)]) -> bool { + let packs: Option> = load + .iter() + .map(|(id, path)| packs::server_pack(*id, path)) + .collect(); + let Some(packs) = packs else { + log::warn!("Horizon: invalid pack metadata in a server pack, ignoring all"); + return false; + }; + self.server_packs.active = packs; + match self.reload_selected_packs() { + Ok(()) => true, + Err(e) => { + log::warn!("Horizon: server resource pack reload failed: {e}"); + false + } + } + } + + pub(super) fn draw_pack_prompt(&self, batch: &mut HudBatch) { + let Some(prompt) = &self.server_packs.prompt else { + return; + }; + let atlas = &self.gui.atlas; + let (w, h) = (batch.width, batch.height); + if self.player.is_none() { + // In place of the connecting screen, on its background. + batch.fill( + atlas, + 0.0, + 0.0, + w, + h, + horizon_client::hud::rgba(20, 20, 20, 255), + ); + } + ui::menu_background(batch, atlas, 0.0, 0.0, w, h, self.player.is_some()); + let (_, _, [yes, no]) = prompt.texts(); + prompt + .layout(atlas, (w, h)) + .draw(batch, atlas, self.cursor, [&yes, &no]); + } + /// A left click on the prompt: its answer when it hit a button. + pub(super) fn pack_prompt_click(&mut self) -> Result<()> { + let Some(prompt) = &self.server_packs.prompt else { + return Ok(()); + }; + let answer = prompt + .layout(&self.gui.atlas, self.gui_size()) + .answer_at(self.cursor); + match answer { + Some(yes) => { + self.audio.play_button_click(); + self.answer_pack_prompt(yes) + } + None => Ok(()), + } + } +} diff --git a/crates/horizon-client/src/game/startup_menu.rs b/crates/horizon-client/src/game/startup_menu.rs index ebf062a83..9958785da 100644 --- a/crates/horizon-client/src/game/startup_menu.rs +++ b/crates/horizon-client/src/game/startup_menu.rs @@ -219,12 +219,11 @@ pub(super) fn spawn_loader( .name("resource-loader".into()) .spawn(move || { let mut pack_error = None; - let root = packs::startup_root(&vanilla_root, &settings.resource_packs).unwrap_or_else( - |error| { + let root = packs::startup_root(&vanilla_root, &settings.resource_packs, &[]) + .unwrap_or_else(|error| { pack_error = Some(error.to_string()); vanilla_root.clone() - }, - ); + }); let root = mods::content_root(&root, &settings.mods.enabled, &dev_mods); let result = load_resources( root, diff --git a/crates/horizon-client/src/lib.rs b/crates/horizon-client/src/lib.rs index 7ec79af5e..23415d6f0 100644 --- a/crates/horizon-client/src/lib.rs +++ b/crates/horizon-client/src/lib.rs @@ -41,6 +41,7 @@ pub mod command; pub mod command_block; pub mod command_storage; pub mod component; +pub mod confirm_screen; pub mod container_screen; pub mod containers; pub mod control; diff --git a/crates/horizon-client/src/multiplayer.rs b/crates/horizon-client/src/multiplayer.rs index 179685dee..07d8552ff 100644 --- a/crates/horizon-client/src/multiplayer.rs +++ b/crates/horizon-client/src/multiplayer.rs @@ -67,6 +67,9 @@ pub enum Screen { name: String, address: String, focus: u8, + /// Server Resource Packs (`acceptTextures`): Enabled, Disabled, or + /// none for Prompt. + packs: Option, }, Direct { address: String, @@ -224,6 +227,19 @@ fn entry_address(servers: &[ServerEntry], lan: &Scanner, index: usize) -> Option } } +/// The Server Resource Packs button's label: `CommonComponents.optionNameValue`. +fn pack_setting_label(packs: Option) -> String { + let (key, fallback) = match packs { + Some(true) => ("manageServer.resourcePack.enabled", "Enabled"), + Some(false) => ("manageServer.resourcePack.disabled", "Disabled"), + None => ("manageServer.resourcePack.prompt", "Prompt"), + }; + let name = crate::lang::get_or("manageServer.resourcePack", "Server Resource Packs"); + crate::lang::get_or("options.generic_value", "%s: %s") + .replacen("%s", &name, 1) + .replacen("%s", &crate::lang::get_or(key, fallback), 1) +} + /// JoinMultiplayerScreen's `HeaderAndFooterLayout(33, 60)`. const HEADER: f32 = 33.0; const FOOTER: f32 = 60.0; @@ -461,7 +477,16 @@ impl Screen { ), ] } - Self::Edit { address, .. } => vec![ + Self::Edit { address, packs, .. } => vec![ + // ManageServerScreen's CycleButton, above Done. + b( + w / 2.0 - 100.0, + h / 4.0 + 72.0, + 200.0, + &pack_setting_label(*packs), + true, + 60, + ), b( w / 2.0 - 100.0, h / 4.0 + 96.0 + 18.0, @@ -847,6 +872,7 @@ impl Screen { name, address, focus, + .. } => { centered( batch, @@ -996,6 +1022,7 @@ impl Screen { name: "Minecraft Server".into(), address: String::new(), focus: 1, + packs: None, } } ( @@ -1011,6 +1038,7 @@ impl Screen { name: s.name, address: s.ip, focus: 0, + packs: s.accept_textures, }; } } @@ -1125,21 +1153,32 @@ impl Screen { *selected = Some(index); } } + // CycleButton: Enabled, Disabled, Prompt, and round again. + (Self::Edit { packs, .. }, Some(60)) => { + *packs = match *packs { + Some(true) => Some(false), + Some(false) => None, + None => Some(true), + } + } ( Self::Edit { index, name, address, + packs, .. }, Some(50), ) => { let mut list = servers::load(&servers_file(saves)); - let entry = ServerEntry::new(name.trim(), address.trim()); + let mut entry = ServerEntry::new(name.trim(), address.trim()); + entry.accept_textures = *packs; match index.and_then(|i| list.get_mut(i)) { Some(e) => { e.name = entry.name; e.ip = entry.ip; + e.accept_textures = entry.accept_textures; } None => list.push(entry), } @@ -1637,4 +1676,57 @@ mod tests { assert_eq!(names(), ["Keep"]); let _ = std::fs::remove_dir_all(&dir); } + + #[test] + fn edit_cycles_and_saves_the_server_resource_pack_setting() { + let dir = std::env::temp_dir().join(format!("horizon-mp-packs-{}", std::process::id())); + let saves = dir.join("saves"); + std::fs::create_dir_all(&saves).unwrap(); + let file = servers_file(&saves); + let mut entry = ServerEntry::new("Packs", "127.0.0.1:4"); + entry.accept_textures = Some(false); + servers::save(&file, &[entry]).unwrap(); + let size = (427.0, 240.0); + let mut screen = Screen::list(&saves); + if let Screen::List { selected, .. } = &mut screen { + *selected = Some(0); + } + screen.click(Some(43), 0.0, 0.0, size, &saves); + let cycle = |screen: &Screen| { + screen + .buttons(size.0, size.1) + .into_iter() + .find(|b| b.5 == 60) + .map(|b| (b.0, b.1, b.2, b.3)) + }; + // ManageServerScreen: 200 wide at height / 4 + 72, the saved value first. + assert_eq!( + cycle(&screen), + Some(( + 113.5, + 132.0, + 200.0, + "Server Resource Packs: Disabled".into() + )) + ); + // Disabled, Prompt, Enabled: Cancel keeps what was saved. + screen.click(Some(60), 0.0, 0.0, size, &saves); + assert_eq!(cycle(&screen).unwrap().3, "Server Resource Packs: Prompt"); + screen.click(Some(51), 0.0, 0.0, size, &saves); + assert_eq!(servers::load(&file)[0].accept_textures, Some(false)); + // Done saves it. + if let Screen::List { selected, .. } = &mut screen { + *selected = Some(0); + } + screen.click(Some(43), 0.0, 0.0, size, &saves); + screen.click(Some(60), 0.0, 0.0, size, &saves); + screen.click(Some(60), 0.0, 0.0, size, &saves); + assert_eq!(cycle(&screen).unwrap().3, "Server Resource Packs: Enabled"); + screen.click(Some(50), 0.0, 0.0, size, &saves); + assert_eq!(servers::load(&file)[0].accept_textures, Some(true)); + // A new server asks. + screen.click(Some(42), 0.0, 0.0, size, &saves); + assert_eq!(cycle(&screen).unwrap().3, "Server Resource Packs: Prompt"); + let _ = std::fs::remove_dir_all(&dir); + } } diff --git a/crates/horizon-client/src/net.rs b/crates/horizon-client/src/net.rs index 74f1b0b6d..3c009a1b5 100644 --- a/crates/horizon-client/src/net.rs +++ b/crates/horizon-client/src/net.rs @@ -20,6 +20,7 @@ use horizon_protocol::{ use std::{ sync::{ Arc, Mutex, + atomic::{AtomicBool, Ordering}, mpsc::{Receiver, Sender, channel}, }, thread::JoinHandle, @@ -43,6 +44,10 @@ pub enum Event { DecodeError(String), /// The server sent us back to configuration and finished it again. Reconfigured(Arc), + /// ClientboundResourcePackPushPacket, in configuration or in play. + PackPush(cfg::ResourcePackPush), + /// ClientboundResourcePackPopPacket: one pack, or every pack. + PackPop(Option), /// The connection ended. `from_server`: the server gave the reason (or /// the connection was refused for good), rather than the connection /// failing (auto-reconnect retries only failures and shutdowns). @@ -55,6 +60,9 @@ pub enum Event { pub struct Session { events: Receiver, writer: Arc>>, + /// The connection is in configuration (else in play). Changed only + /// with `writer` locked, as the packet that switches is sent. + configuring: Arc, thread: Option>, pub address: String, pub name: String, @@ -92,8 +100,10 @@ impl Session { ) -> Self { let (send, events) = channel(); let writer = Arc::new(Mutex::new(None)); + let configuring = Arc::new(AtomicBool::new(true)); let counters = Arc::new(Mutex::new(None)); let (thread_writer, thread_counters) = (writer.clone(), counters.clone()); + let thread_configuring = configuring.clone(); let (address_owned, name_owned) = (address.to_owned(), name.to_owned()); let thread = std::thread::Builder::new() .name("horizon-net".into()) @@ -107,6 +117,7 @@ impl Session { &lang, &send, &thread_writer, + &thread_configuring, &thread_counters, ); let from_server = result.is_ok(); @@ -124,6 +135,7 @@ impl Session { Self { events, writer, + configuring, thread, address: address.to_owned(), name: name.to_owned(), @@ -153,6 +165,21 @@ impl Session { w.shutdown(); } } + /// ServerboundResourcePackPacket, in whichever phase the connection is. + pub fn send_pack_status(&self, id: u128, action: i32) { + let status = cfg::ResourcePackResponse { id, action }; + let mut writer = self.writer.lock().unwrap(); + let body = if self.configuring.load(Ordering::Relaxed) { + cfg::Serverbound::ResourcePack(status).encode() + } else { + play::Serverbound::ResourcePack(status).encode() + }; + if let Some(w) = writer.as_mut() + && w.send(&body).is_err() + { + w.shutdown(); + } + } pub fn disconnect(&mut self) { if let Some(w) = self.writer.lock().unwrap().take() { w.shutdown(); @@ -253,6 +280,7 @@ fn run( lang: &Language, send: &Sender, shared_writer: &Mutex>, + configuring: &AtomicBool, shared_counters: &Mutex>>, ) -> Result { let (host, port, mut c) = if let Some(pipe) = local { @@ -377,18 +405,19 @@ fn run( .map_err(e)?; let (mut reader, writer) = c.split(); *shared_writer.lock().unwrap() = Some(writer); - let registries = configure(&mut reader, shared_writer, lang, send)?; + let registries = configure(&mut reader, shared_writer, configuring, lang, send)?; let _ = send.send(Event::Joined { registries: Arc::new(registries), uuid: profile.uuid, name: profile.name, }); - receive_play(&mut reader, shared_writer, lang, send) + receive_play(&mut reader, shared_writer, configuring, lang, send) } fn receive_play( reader: &mut ConnReader, shared_writer: &Mutex>, + configuring: &AtomicBool, lang: &Language, send: &Sender, ) -> Result { @@ -416,15 +445,17 @@ fn receive_play( play::Clientbound::KeepAlive(k) => reply(play::Serverbound::KeepAlive(k)), play::Clientbound::BundleDelimiter(_) => {} play::Clientbound::ResourcePackPush(p) => { - // Declined: Horizon has no server resource packs. - reply(play::Serverbound::ResourcePack(cfg::ResourcePackResponse { - id: p.id, - action: 1, - })); + let _ = send.send(Event::PackPush(p)); + } + play::Clientbound::ResourcePackPop(p) => { + let _ = send.send(Event::PackPop(p.id)); } play::Clientbound::StartConfiguration(_) => { - reply(play::Serverbound::ConfigurationAcknowledged(Empty)); - let registries = configure(reader, shared_writer, lang, send)?; + if let Some(w) = shared_writer.lock().unwrap().as_mut() { + let _ = w.send(&play::Serverbound::ConfigurationAcknowledged(Empty).encode()); + configuring.store(true, Ordering::Relaxed); + } + let registries = configure(reader, shared_writer, configuring, lang, send)?; let _ = send.send(Event::Reconfigured(Arc::new(registries))); } play::Clientbound::Disconnect(d) => return Ok(plain(&d.reason, lang)), @@ -445,6 +476,7 @@ fn receive_play( fn configure( reader: &mut ConnReader, writer: &Mutex>, + configuring: &AtomicBool, lang: &Language, send: &Sender, ) -> Result { @@ -471,11 +503,12 @@ fn configure( cfg::Clientbound::CodeOfConduct(_) => { reply(cfg::Serverbound::AcceptCodeOfConduct(Empty))? } + // The game answers: it may prompt the player first. cfg::Clientbound::ResourcePackPush(p) => { - reply(cfg::Serverbound::ResourcePack(cfg::ResourcePackResponse { - id: p.id, - action: 1, - }))? + let _ = send.send(Event::PackPush(p)); + } + cfg::Clientbound::ResourcePackPop(p) => { + let _ = send.send(Event::PackPop(p.id)); } cfg::Clientbound::CookieRequest(q) => { reply(cfg::Serverbound::CookieResponse(cfg::CookieResponse { @@ -485,7 +518,11 @@ fn configure( } cfg::Clientbound::Disconnect(d) => return Err(plain(&d.reason, lang)), cfg::Clientbound::FinishConfiguration(_) => { - reply(cfg::Serverbound::FinishConfiguration(Empty))?; + let mut w = writer.lock().unwrap(); + let w = w.as_mut().ok_or("Disconnected")?; + w.send(&cfg::Serverbound::FinishConfiguration(Empty).encode()) + .map_err(|e| e.to_string())?; + configuring.store(false, Ordering::Relaxed); return Ok(registries); } _ => {} @@ -602,7 +639,13 @@ mod tests { let (send, events) = channel(); let thread_writer = writer.clone(); let thread = std::thread::spawn(move || { - receive_play(&mut reader, &thread_writer, &Language::new(), &send) + receive_play( + &mut reader, + &thread_writer, + &AtomicBool::new(false), + &Language::new(), + &send, + ) }); let mut server = Connection::local(server); let teleport = play::Clientbound::PlayerPosition(play::PlayerPosition { diff --git a/crates/horizon-client/src/packs.rs b/crates/horizon-client/src/packs.rs index 5daaaacad..7ab436f72 100644 --- a/crates/horizon-client/src/packs.rs +++ b/crates/horizon-client/src/packs.rs @@ -629,6 +629,17 @@ fn merge(kind: Merge, layers: &[Vec]) -> Option> { }; serde_json::to_vec(&out).ok() } +/// `DownloadedPackSource.loadRequestedPacks`: a server's downloaded pack, +/// "World Specific Resources"; None when its `pack.mcmeta` can't be read. Its +/// id names the file, which is named after its hash. +pub fn server_pack(id: u128, path: &Path) -> Option { + let file = path.file_name()?.to_string_lossy(); + pack( + format!("server/{id:032x}/{file}"), + Text::translate("resourcePack.server.name", &[]), + Source::Zip(path.to_path_buf()), + ) +} /// The packs to apply for an options.txt `resourcePacks` list (bottom first). pub fn enabled(all: &[Pack], ids: &[String]) -> Vec { ids.iter() diff --git a/crates/horizon-protocol/src/packets/play.rs b/crates/horizon-protocol/src/packets/play.rs index 206ed9aff..42e3ba686 100644 --- a/crates/horizon-protocol/src/packets/play.rs +++ b/crates/horizon-protocol/src/packets/play.rs @@ -13,8 +13,8 @@ use crate::{ packets::{ Empty, configuration::{ - ClientInformation, CustomPayload, Disconnect, KeepAlive, Ping, ResourcePackPush, - ResourcePackResponse, UpdateTags, + ClientInformation, CustomPayload, Disconnect, KeepAlive, Ping, ResourcePackPop, + ResourcePackPush, ResourcePackResponse, UpdateTags, }, login::Property, }, @@ -1640,6 +1640,7 @@ packet_enum!(Clientbound, crate::ids::play::clientbound { RemoveEntities(RemoveEntities) = REMOVE_ENTITIES, RemoveMobEffect(RemoveMobEffect) = REMOVE_MOB_EFFECT, ResetScore(ResetScore) = RESET_SCORE, + ResourcePackPop(ResourcePackPop) = RESOURCE_PACK_POP, ResourcePackPush(ResourcePackPush) = RESOURCE_PACK_PUSH, Respawn(Respawn) = RESPAWN, RotateHead(RotateHead) = ROTATE_HEAD, diff --git a/docs/resource-packs.md b/docs/resource-packs.md index 227c9c5a4..06e3e7247 100644 --- a/docs/resource-packs.md +++ b/docs/resource-packs.md @@ -33,6 +33,7 @@ harness named checks that loader against vanilla). | Overlays per format | `pack.mcmeta` `overlays` | works | `test_resource_pack_parity` (an overlay for 26.3 applied, an older one not) | | Filters | `pack.mcmeta` `filter` | works | `test_resource_pack_parity` (`packs/pattern.rs` regex subset) | | Folder and zip packs, order, built-in packs | `resourcepacks/` | works | `test_resource_pack_parity`, `test_pack_selection_parity` | +| Server resource packs: the prompt, the server list's Server Resource Packs setting, download (250 MiB, SHA-1, `downloads/` keeps 20), applied on top of the player's packs, removed on leaving | the server's `resource_pack_push`/`_pop` | works, no download toasts | `tools/server_pack_e2e.py` (against vanilla's server and Horizon's), unit tests in `server_packs.rs`; `test_server_resource_pack_parity` for Horizon's server | | Other namespaces | `assets//` | works | `test_resource_pack_parity` | | Block states: variants, multipart, weights, rotations, uvlock | `blockstates/` | works | `test_blockstate_model_parity`, `test_model_choice_parity`, `test_blockstate_transform_parity` | | Block models: parents, elements, rotations, faces, cullface, tint, shade, light emission, ambient occlusion | `models/block/` | works | `test_model_resolution_parity`, `test_model_baking_parity`, `test_section_mesh_parity` | @@ -74,7 +75,7 @@ harness named checks that loader against vanilla). | Core shaders | `shaders/core/`, `shaders/include/` | **no** | Horizon draws with WGSL; packs that replace core shaders need the GLSL translation of [shader-packs.md](shader-packs.md) | | GPU warn list, regional compliance | `gpu_warnlist.json`, `regional_compliancies.json` | n/a | OpenGL driver warnings and play-time notices for some regions; not used | -Summary: 44 rows; 31 work, 3 partly, 8 don't (interpolated animation, TrueType fonts, credits and end poem, +Summary: 45 rows; 32 work, 3 partly, 8 don't (interpolated animation, TrueType fonts, credits and end poem, villager hats, trims on worn armour, locator bar styles, post effects, core shaders), 2 don't apply. Except the shaders, the missing pieces are missing vanilla features too, and each vanilla parity fix covers the pack case as well. @@ -83,6 +84,7 @@ shaders, the missing pieces are missing vanilla features too, and each vanilla p | Gap | Size | Where | | --- | --- | --- | | Animation `interpolate` | small | fix PR (`gfx.rs` `animate_sprites`) | +| Server pack download toasts (`download.pack.*`) | small | `game/server_packs.rs` | | GUI scaling `width`/`height`, `stretch_inner`, `tile`, `stretch` | small | next fix PR (`ui.rs`) | | Villager hats | small | [#334](https://github.com/ludovic111/horizon/issues/334) | | `blur`/`clamp` from packs | small | [#335](https://github.com/ludovic111/horizon/issues/335) | diff --git a/tools/server_pack_e2e.py b/tools/server_pack_e2e.py new file mode 100644 index 000000000..83e434435 --- /dev/null +++ b/tools/server_pack_e2e.py @@ -0,0 +1,516 @@ +#!/usr/bin/env python3 +"""Server resource packs end to end: a real Horizon client joins a real dedicated server (vanilla 26.3's, or +Horizon's with --horizon-server BIN) that offers a test pack from a local HTTP server, through tools/net_capture.py, +which records the statuses the client sends back. + +The pack is built here: dirt recoloured blue, and three lang strings (dirt's name, the pause menu's "Back to Game", +the server list's "Join Server"). Each scenario sets the server list entry's Server Resource Packs setting in +servers.dat, joins, answers the prompt the way a player would (horizon-ctl clicks its buttons), and checks the +statuses against what vanilla's client sends (ServerPackManager): + +- required, Prompt, Disconnect: no status, the disconnected screen says "This server requires a custom resource + pack", the setting stays Prompt; +- required, Prompt, Proceed: ACCEPTED, DOWNLOADED, SUCCESSFULLY_LOADED; the setting becomes Enabled, the file is in + downloads/ under its SHA-1 with a log.json entry, the HTTP request carries vanilla's X-Minecraft-* headers, the + blue dirt is on screen (screenshot) and the pause menu says the pack's "Back to Game"; after leaving, the server + list says "Join Server" again (the pack is gone); +- required, Enabled: no prompt, the same three statuses, and no second download (the cache); +- required with a wrong SHA-1: ACCEPTED, FAILED_DOWNLOAD, and the player still joins; +- optional, Prompt, No: DECLINED, joins, the setting becomes Disabled; then joining again sends DECLINED without + asking; then Prompt and Yes: the pack (no hash given) is downloaded and loaded; +- optional on a dead URL: ACCEPTED, FAILED_DOWNLOAD, joins. + + python3 tools/server_pack_e2e.py # vanilla's server + python3 tools/server_pack_e2e.py --horizon-server target/release/horizon-client + +Every game and server here runs in fresh temporary folders (HORIZON_HOME, HORIZON_LAUNCHER_HOME, XDG_*), with no +audio and no self-update. Needs .local (the vanilla jars and prepared resources) and a built horizon-client and +horizon-ctl (--bin DIR, default target/fast). +""" +import argparse +import hashlib +import http.server +import json +import os +from pathlib import Path +import shutil +import socket +import struct +import subprocess +import sys +import tempfile +import threading +import time +import zipfile +import zlib + +sys.path.insert(0, str(Path(__file__).resolve().parent)) +import lab # noqa: E402 +import net_capture # noqa: E402 +import test_rust_parity as base # noqa: E402 +from test_dedicated_server_parity import Server, free_port # noqa: E402 + +# ServerboundResourcePackPacket.Action, by ordinal. +ACTIONS = ['successfully_loaded', 'declined', 'failed_download', 'accepted', 'downloaded', 'invalid_url', + 'failed_reload', 'discarded'] +LOADED = ['accepted', 'downloaded', 'successfully_loaded'] +FAILED = ['accepted', 'failed_download'] +REQUIRED_REASON = 'This server requires a custom resource pack' +PLAYER = 'Steve' +PROPERTIES = { + 'online-mode': 'false', 'white-list': 'false', 'level-seed': '12345', 'level-type': 'minecraft\\:flat', + 'generate-structures': 'false', 'view-distance': '3', 'simulation-distance': '3', 'spawn-protection': '0', + 'pause-when-empty-seconds': '-1', 'gamemode': 'creative', +} + + +class Failed(Exception): + pass + + +def check(condition, what): + if not condition: + raise Failed(what) + print(f' ok: {what}') + + +# The pack. + +def png(width, height, pixel): + rows = b''.join(b'\0' + b''.join(bytes(pixel(x, y)) for x in range(width)) for y in range(height)) + + def chunk(kind, data): + return struct.pack('>I', len(data)) + kind + data + struct.pack('>I', zlib.crc32(kind + data)) + header = struct.pack('>IIBBBBB', width, height, 8, 6, 0, 0, 0) + return b'\x89PNG\r\n\x1a\n' + chunk(b'IHDR', header) + chunk(b'IDAT', zlib.compress(rows)) + chunk(b'IEND', b'') + + +def build_pack(path): + """The test pack, byte for byte the same every time (fixed dates), and its SHA-1.""" + def blue(x, y): + return (40, 90, 230, 255) if (x // 4 + y // 4) % 2 else (20, 50, 170, 255) + files = { + 'pack.mcmeta': json.dumps({'pack': {'description': 'Horizon server pack test', + 'min_format': 97, 'max_format': 97}}).encode(), + 'assets/minecraft/textures/block/dirt.png': png(16, 16, blue), + 'assets/minecraft/lang/en_us.json': json.dumps({ + 'block.minecraft.dirt': 'Blue Test Dirt', + 'menu.returnToGame': 'Back to Game (server pack)', + 'selectServer.select': 'Join Server (server pack)', + }).encode(), + } + with zipfile.ZipFile(path, 'w', zipfile.ZIP_DEFLATED) as z: + for name, data in files.items(): + z.writestr(zipfile.ZipInfo(name, (2026, 1, 1, 0, 0, 0)), data) + return hashlib.sha1(path.read_bytes()).hexdigest() + + +def decode_png(data): + """RGB(A) pixels of an 8-bit PNG: (width, height, rows of (r, g, b)).""" + pos, idat, width = 8, b'', 0 + while pos < len(data): + length, kind = struct.unpack('>I4s', data[pos:pos + 8]) + body = data[pos + 8:pos + 8 + length] + if kind == b'IHDR': + width, height, depth, colour = struct.unpack('>IIBB', body[:10]) + assert depth == 8 and colour in (2, 6), (depth, colour) + channels = 4 if colour == 6 else 3 + elif kind == b'IDAT': + idat += body + pos += 12 + length + raw, stride, rows, previous = zlib.decompress(idat), width * channels, [], bytearray(width * channels) + for y in range(height): + kind, line = raw[y * (stride + 1)], bytearray(raw[y * (stride + 1) + 1:(y + 1) * (stride + 1)]) + for i in range(stride): + left = line[i - channels] if i >= channels else 0 + up, corner = previous[i], previous[i - channels] if i >= channels else 0 + if kind == 1: + line[i] = (line[i] + left) & 255 + elif kind == 2: + line[i] = (line[i] + up) & 255 + elif kind == 3: + line[i] = (line[i] + (left + up) // 2) & 255 + elif kind == 4: + p = left + up - corner + pa, pb, pc = abs(p - left), abs(p - up), abs(p - corner) + line[i] = (line[i] + (left if pa <= pb and pa <= pc else up if pb <= pc else corner)) & 255 + rows.append([tuple(line[x * channels:x * channels + 3]) for x in range(width)]) + previous = line + return width, height, rows + + +def blue_share(path): + """How much of the picture's lower middle (the ground under a player looking down) is blue.""" + width, height, rows = decode_png(path.read_bytes()) + samples = [rows[y][x] for y in range(height // 2 + height // 8, height - height // 8, 4) + for x in range(width // 4, 3 * width // 4, 4)] + return sum(b > r + 60 and b > g + 30 for r, g, b in samples) / len(samples) + + +# The HTTP server the pack comes from. + +class Files(http.server.ThreadingHTTPServer): + def __init__(self, files): + self.files, self.requests = files, [] + + class Handler(http.server.BaseHTTPRequestHandler): + def do_GET(handler): + headers = {k: v for k, v in handler.headers.items() if k.lower().startswith(('x-minecraft', 'user-agent'))} + self.requests.append((handler.path, headers)) + data = self.files.get(handler.path) + if data is None: + handler.send_error(404) + return + handler.send_response(200) + handler.send_header('Content-Type', 'application/zip') + handler.send_header('Content-Length', str(len(data))) + handler.end_headers() + handler.wfile.write(data) + + def log_message(handler, *args): + pass + super().__init__(('127.0.0.1', 0), Handler) + threading.Thread(target=self.serve_forever, daemon=True).start() + + def url(self, path): + return f'http://127.0.0.1:{self.server_address[1]}{path}' + + +# servers.dat (NbtIo.write: uncompressed, a named root compound). + +def nbt_string(s): + data = s.encode() + return struct.pack('>H', len(data)) + data + + +def write_servers(path, ip, setting): + """One entry for ip; setting True (Enabled), False (Disabled) or None (Prompt: no acceptTextures).""" + entry = b'\x08' + nbt_string('name') + nbt_string('Pack test') + b'\x08' + nbt_string('ip') + nbt_string(ip) + if setting is not None: + entry += b'\x01' + nbt_string('acceptTextures') + bytes([int(setting)]) + root = b'\x09' + nbt_string('servers') + b'\x0a' + struct.pack('>i', 1) + entry + b'\x00' + path.write_bytes(b'\x0a' + nbt_string('') + root + b'\x00') + + +def read_setting(path): + data = path.read_bytes() + key = b'\x01' + nbt_string('acceptTextures') + at = data.find(key) + return None if at < 0 else bool(data[at + len(key)]) + + +# The game. + +class Game: + def __init__(self, bins, resources, work): + self.home = work / 'home' + for d in ('home', 'launcher', 'data', 'config'): + (work / d).mkdir(parents=True) + self.env = dict(os.environ, HORIZON_HOME=str(self.home), HORIZON_LAUNCHER_HOME=str(work / 'launcher'), + XDG_DATA_HOME=str(work / 'data'), XDG_CONFIG_HOME=str(work / 'config'), + HORIZON_LAUNCHER_NO_SELF_UPDATE='1', HORIZON_NO_AUDIO='1', HORIZON_TELEMETRY_URL='off') + self.base = [str(bins / 'horizon-ctl'), '--socket', str(work / 'c.sock')] + self.log = work / 'c.log' + reply = self('launch', '--game', bins / 'horizon-client', '--offscreen', '--resources', resources) + self.pid = reply.get('pid') + + def __call__(self, *words, ok=True, timeout=300): + result = subprocess.run(self.base + [str(w) for w in words], cwd=self.home, env=self.env, + capture_output=True, text=True, timeout=timeout) + lines = result.stdout.strip().splitlines() + reply = json.loads(lines[-1]) if lines else {'error': result.stderr.strip()} + print(f' {" ".join(map(str, words))[:80]} -> {json.dumps(reply)[:200]}') + if ok and (result.returncode or 'error' in reply): + raise Failed(f'{" ".join(map(str, words))}: {reply}') + return reply + + def labels(self): + return [w.get('label') for w in self('ui').get('widgets', [])] + + def wait_widget(self, widget, timeout=60): + return self('wait-for', 'widget', widget, '--timeout', timeout, ok=False) + + def quit(self): + try: + self('quit', ok=False, timeout=60) + except subprocess.TimeoutExpired: + pass + if self.pid: + for _ in range(40): + try: + os.kill(self.pid, 0) + except OSError: + return + time.sleep(0.5) + os.kill(self.pid, 9) + + +def statuses(capture, conn): + """The resource pack statuses the client sent on one connection: (id, action), in order.""" + out = [] + for e in net_capture.load(capture): + if e.get('conn') == conn and e.get('dir') == 'c2s' and e.get('name') == 'resource_pack': + data = bytes.fromhex(e['data']) + out.append((data[:16].hex(), ACTIONS[data[16]])) + return out + + +def connections(capture): + return max([e['conn'] for e in net_capture.load(capture) if 'conn' in e], default=0) + + +class Run: + def __init__(self, args, out): + self.args, self.out = args, out + lock, jars, libraries = base.verify_artifacts() + deps = os.pathsep.join(map(str, [jars['server'], *libraries])) + self.vanilla = ['java', '-Xmx2g', '-cp', deps, 'net.minecraft.server.Main', 'nogui'] + self.resources = lab.LOCAL / 'horizon-client' / lab.VERSION + self.files = {} + self.http = Files(self.files) + self.sha1 = build_pack(out / 'test-pack.zip') + self.files['/test-pack.zip'] = (out / 'test-pack.zip').read_bytes() + self.files['/optional-pack.zip'] = self.files['/test-pack.zip'] + dead = free_port() # nothing listens there + self.packs = { + 'required': {'resource-pack': self.http.url('/test-pack.zip'), 'resource-pack-sha1': self.sha1, + 'require-resource-pack': 'true', 'resource-pack-id': '5b2c7a4e-1f3d-4c8b-9a6e-2d4f8b1c3e5a', + 'resource-pack-prompt': '["Blue dirt for ",{"text":"this test","color":"aqua"}]'}, + 'bad-sha1': {'resource-pack': self.http.url('/test-pack.zip'), 'resource-pack-sha1': '0' * 40, + 'require-resource-pack': 'true'}, + 'optional': {'resource-pack': self.http.url('/optional-pack.zip'), 'require-resource-pack': 'false'}, + 'dead-url': {'resource-pack': f'http://127.0.0.1:{dead}/gone.zip', 'require-resource-pack': 'false'}, + } + self.results = [] + + def start_server(self, kind, work): + directory = work / f'server-{kind}' + directory.mkdir() + port = free_port() + props = dict(PROPERTIES, **self.packs[kind], **{'server-port': str(port)}) + (directory / 'server.properties').write_text(''.join(f'{k}={v}\n' for k, v in props.items()), + encoding='iso-8859-1') + (directory / 'eula.txt').write_text('eula=true\n') + if self.args.horizon_server: + command = [self.args.horizon_server, '--resources', self.resources, '--dedicated', '--nogui'] + else: + command = self.vanilla + server = Server(command, directory, f'server-{kind}') + server.wait_for(r'Done \(', timeout=300) + return server, port + + def join(self, game, address, scenario): + """Connects; returns the capture's connection number.""" + game('connect', address, PLAYER) + deadline = time.time() + 30 + while connections(self.capture) <= self.conn and time.time() < deadline: + time.sleep(0.2) + self.conn = connections(self.capture) + print(f' [{scenario}] connection {self.conn}') + return self.conn + + def scenario(self, name, fn): + print(f'- {name}') + try: + fn() + self.results.append((name, 'pass', '')) + except Exception as e: # noqa: BLE001: report every scenario + print(f' FAILED: {e}') + self.results.append((name, 'FAIL', str(e)[:300])) + if self.game('state', ok=False).get('screen') not in (None, 'title'): + self.leave(self.game) + + def wait_statuses(self, conn, want, timeout=60): + deadline = time.time() + timeout + while time.time() < deadline: + got = [a for _, a in statuses(self.capture, conn)] + if len(got) >= len(want) and got[:len(want)] == want or got[:1] and got != want[:len(got)]: + break + time.sleep(0.3) + time.sleep(1.5) # nothing more comes after the last one + got = [a for _, a in statuses(self.capture, conn)] + check(got == want, f'statuses {got} == {want}') + + def leave(self, game): + game('disconnect', ok=False) + time.sleep(1) + + def run(self): + work = Path(tempfile.mkdtemp(prefix='hz-server-packs-')) + print(f'scratch: {work}') + # The servers too get scratch homes (the game sets its own below). + for var, sub in (('HORIZON_HOME', 'home'), ('HORIZON_LAUNCHER_HOME', 'launcher'), ('XDG_DATA_HOME', 'data'), + ('XDG_CONFIG_HOME', 'config')): + (work / 'servers' / sub).mkdir(parents=True) + os.environ[var] = str(work / 'servers' / sub) + os.environ.update(HORIZON_LAUNCHER_NO_SELF_UPDATE='1', HORIZON_NO_AUDIO='1', HORIZON_TELEMETRY_URL='off') + game = self.game = Game(Path(self.args.bin), self.resources, work / 'game') + servers_dat = game.home / 'servers.dat' + downloads = game.home / 'downloads' + try: + for kind, scenarios in self.plan(game, servers_dat, downloads): + server, port = self.start_server(kind, work) + # One capture per server: its connections are numbered from 1. + self.capture, self.conn = self.out / f'capture-{kind}.jsonl', 0 + self.capture.touch() + listen = free_port() + stop = net_capture.start_background(listen, f'127.0.0.1:{port}', self.capture) + self.address = f'127.0.0.1:{listen}' + try: + self.server = server + for name, fn in scenarios: + self.scenario(f'{kind}: {name}', fn) + finally: + stop.set() + server.stop() + shutil.copy(server.log_path, self.out / server.log_path.name) + finally: + game.quit() + if game.log.exists(): + shutil.copy(game.log, self.out / 'client.log') + if downloads.exists(): + shutil.copytree(downloads, self.out / 'downloads') + return work + + def plan(self, game, servers_dat, downloads): + sha1 = self.sha1 + + def required_disconnect(): + write_servers(servers_dat, self.address, None) + conn = self.join(game, self.address, 'decline') + check(game.wait_widget('disconnect').get('ok'), 'the required prompt opened') + labels = game.labels() + check('Proceed' in labels and 'Disconnect' in labels, f'Proceed and Disconnect buttons: {labels}') + game('screenshot', self.out / 'prompt-required.png') + game('click', 'disconnect') + self.wait_statuses(conn, []) + screen = json.dumps(game('screen')) + check(REQUIRED_REASON in screen, 'the disconnected screen says "This server requires a custom resource pack"') + check(read_setting(servers_dat) is None, 'the setting stays Prompt') + check(not any(p == '/test-pack.zip' for p, _ in self.http.requests), 'nothing was downloaded') + + def required_proceed(): + conn = self.join(game, self.address, 'proceed') + check(game.wait_widget('proceed').get('ok'), 'the required prompt opened') + game('click', 'proceed') + game('wait-for', 'loaded', '--timeout', 180) + self.wait_statuses(conn, LOADED) + check(read_setting(servers_dat) is True, 'the setting became Enabled (acceptTextures 1)') + pack_id = self.packs['required']['resource-pack-id'] + check((downloads / pack_id / sha1).exists(), f'downloads/{pack_id}/{sha1} is cached') + log = json.loads((downloads / 'log.json').read_text().splitlines()[-1]) + check(log.get('id') == pack_id and log.get('hash') == sha1 + and log.get('file', {}).get('name') == f'{pack_id}/{sha1}', f'log.json entry {log}') + path, headers = [r for r in self.http.requests if r[0] == '/test-pack.zip'][-1] + want = {'X-Minecraft-Username': PLAYER, 'X-Minecraft-Version': lab.VERSION, + 'X-Minecraft-Version-ID': lab.VERSION, 'X-Minecraft-Pack-Format': '97.1', + 'User-Agent': f'Minecraft Java/{lab.VERSION}'} + check(all(headers.get(k) == v for k, v in want.items()) and len(headers.get('X-Minecraft-UUID', '')) == 32, + f'download headers {headers}') + self.server.console(f'execute at {PLAYER} run fill ~-6 ~-1 ~-6 ~6 ~-1 ~6 minecraft:dirt') + game('look', 0, 90) + game('wait', 40) + shot = self.out / 'applied-blue-dirt.png' + game('screenshot', shot) + share = blue_share(shot) + check(share > 0.5, f'the ground is the pack\'s blue dirt ({share:.0%} of the samples)') + game('key', 'esc', 'tap') + game('wait', 5) + labels = game.labels() + check('Back to Game (server pack)' in labels, f'the pause menu uses the pack\'s lang: {labels}') + game('key', 'esc', 'tap') + self.leave(game) + labels = game.labels() + check('Join Server' in labels and 'Join Server (server pack)' not in labels, + f'after leaving, the pack is gone: {labels}') + + def required_enabled(): + before = len(self.http.requests) + conn = self.join(game, self.address, 'enabled') + game('wait-for', 'loaded', '--timeout', 180) + self.wait_statuses(conn, LOADED) + check(len(self.http.requests) == before, 'no second download: the cached file is used') + game('key', 'esc', 'tap') + game('wait', 5) + check('Back to Game (server pack)' in game.labels(), 'the pack is applied without a prompt') + game('key', 'esc', 'tap') + self.leave(game) + + def bad_sha1(): + write_servers(servers_dat, self.address, True) + conn = self.join(game, self.address, 'bad-sha1') + game('wait-for', 'loaded', '--timeout', 180) + self.wait_statuses(conn, FAILED) + entries = [json.loads(line) for line in (downloads / 'log.json').read_text().splitlines()] + failed = [e for e in entries if e.get('hash') == '0' * 40] + check(failed and failed[-1].get('error') == 'download_failed' and 'file' not in failed[-1], + f'log.json records the failure: {failed[-1:]}') + self.leave(game) + + def optional_no(): + write_servers(servers_dat, self.address, None) + conn = self.join(game, self.address, 'optional-no') + check(game.wait_widget('no').get('ok'), 'the optional prompt opened') + labels = game.labels() + check('Yes' in labels and 'No' in labels, f'Yes and No buttons: {labels}') + game('screenshot', self.out / 'prompt-optional.png') + game('click', 'no') + game('wait-for', 'loaded', '--timeout', 180) + self.wait_statuses(conn, ['declined']) + check(read_setting(servers_dat) is False, 'the setting became Disabled (acceptTextures 0)') + self.leave(game) + + def optional_disabled(): + conn = self.join(game, self.address, 'optional-disabled') + game('wait-for', 'loaded', '--timeout', 180) + self.wait_statuses(conn, ['declined']) + self.leave(game) + + def optional_yes(): + write_servers(servers_dat, self.address, None) + conn = self.join(game, self.address, 'optional-yes') + check(game.wait_widget('yes').get('ok'), 'the optional prompt opened') + game('click', 'yes') + game('wait-for', 'loaded', '--timeout', 180) + self.wait_statuses(conn, LOADED) + check(any(r[0] == '/optional-pack.zip' for r in self.http.requests), 'downloaded without a hash') + self.leave(game) + + def dead_url(): + write_servers(servers_dat, self.address, True) + conn = self.join(game, self.address, 'dead-url') + game('wait-for', 'loaded', '--timeout', 180) + self.wait_statuses(conn, FAILED) + self.leave(game) + + return [ + ('required', [('Disconnect at the prompt', required_disconnect), ('Proceed', required_proceed), + ('Enabled, cached', required_enabled)]), + ('bad-sha1', [('wrong SHA-1', bad_sha1)]), + ('optional', [('No at the prompt', optional_no), ('Disabled', optional_disabled), + ('Yes at the prompt, no hash', optional_yes)]), + ('dead-url', [('dead URL', dead_url)]), + ] + + +def main(): + parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter) + parser.add_argument('--bin', default=str(lab.cargo_target() / 'fast'), help='horizon-client and horizon-ctl') + parser.add_argument('--horizon-server', help='a horizon-client binary to run as the dedicated server') + parser.add_argument('--out', default=str(lab.LOCAL / 'server-pack-e2e')) + args = parser.parse_args() + out = Path(args.out) / ('horizon' if args.horizon_server else 'vanilla') + shutil.rmtree(out, ignore_errors=True) + out.mkdir(parents=True) + run = Run(args, out) + work = run.run() + print(f'\nserver: {"horizon" if args.horizon_server else "vanilla 26.3"}; evidence in {out}') + for name, result, detail in run.results: + print(f' {result:4} {name}' + (f': {detail}' if detail else '')) + shutil.rmtree(work, ignore_errors=True) + if any(r != 'pass' for _, r, _ in run.results): + sys.exit(1) + + +if __name__ == '__main__': + main() From d271176f2342e1c2033f4ca38005892c60801f3e Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 18:31:02 +0200 Subject: [PATCH 007/140] Tools and harnesses start the game in scratch folders, not a player's The game logs into HORIZON_HOME and falls back to the player's own game folder when it is unset. Harnesses that set only HORIZON_NO_AUDIO (and test_native_client, which set nothing) wrote logs, and on a world run advancements, into ~/Library/Application Support/horizon. lab.game_env gives every game a fresh HORIZON_HOME, HORIZON_LAUNCHER_HOME, XDG_DATA_HOME and XDG_CONFIG_HOME, no audio and no launcher self-update; a folder the caller passes is kept. Every launcher of the game uses it, parity.py gives each harness its own HORIZON_HOME, and tests/test_game_home.py fails for a script in tools/ that starts the game without it. Co-Authored-By: Claude Sonnet 5.5 --- docs/parity-workflow.md | 4 + tests/test_game_home.py | 102 ++++++++++++++++++++++++++ tools/agent_control_e2e.py | 15 ++-- tools/graphics_bench.py | 7 +- tools/lab.py | 33 +++++++++ tools/lan_e2e.py | 3 +- tools/launcher_mcp_e2e.py | 3 +- tools/mod_browser_harness.py | 8 +- tools/parity.py | 7 ++ tools/perf_bench.py | 2 +- tools/server_bench.py | 2 +- tools/test_block_removal_parity.py | 2 +- tools/test_command_exec_parity.py | 2 +- tools/test_composter_parity.py | 2 +- tools/test_crafter_parity.py | 2 +- tools/test_dedicated_server_parity.py | 4 +- tools/test_dispenser_parity.py | 2 +- tools/test_friends.py | 2 +- tools/test_mace_parity.py | 2 +- tools/test_native_client.py | 2 +- tools/test_online_mode_parity.py | 4 +- tools/test_save_roundtrip_parity.py | 4 +- tools/test_sculk_parity.py | 2 +- tools/test_secure_chat_parity.py | 2 +- tools/test_use_item_on_parity.py | 2 +- tools/test_world_reopen_parity.py | 5 +- tools/test_world_spawn_parity.py | 2 +- 27 files changed, 190 insertions(+), 37 deletions(-) create mode 100644 tests/test_game_home.py diff --git a/docs/parity-workflow.md b/docs/parity-workflow.md index 1b00080e7..f9f222071 100644 --- a/docs/parity-workflow.md +++ b/docs/parity-workflow.md @@ -32,6 +32,10 @@ Passes are shared between worktrees. A harness's key depends only on the content Every runner on the machine shares `PARITY_MACHINE_JOBS` slots (default: half the CPU threads), so several agents' runs together can't overload it. Parallel harnesses are also admitted by memory: each harness's recorded peak is reserved, within three quarters of the memory available at the start, and a harness starts only if the memory free at that moment still leaves 2 GB. `-j` caps the count here (default: `PARITY_LOCAL_JOBS`, else 3 while other machines help or a third of the CPU threads alone, within `$FLEET_LOAD_JOBS`). +### Harnesses that start the game + +The game logs into `HORIZON_HOME` and falls back to the player's own game folder when it is unset, so a harness that starts the game, `horizon-ctl`, the launcher or the dedicated server builds the environment with `lab.game_env(**extra)`: no audio, and fresh scratch folders for `HORIZON_HOME`, `HORIZON_LAUNCHER_HOME`, `XDG_DATA_HOME` and `XDG_CONFIG_HOME`, removed when the harness exits (a folder you pass, or that the environment already has, is kept). The runner also gives each harness its own `HORIZON_HOME` under `.local/parity-runner/game-home/`. `tests/test_game_home.py` fails for a script in `tools/` that starts the game without it. + ### Other machines Harnesses can also run on the Mac mini and the ThinkPad (`tools/parity_hosts.json` describes them; its `default` list is empty, so pass `--hosts macmini,thinkpad` or set `PARITY_HOSTS`, after copying `shared-local/` to `~/code/horizon-parity/shared-local` on each host). The runner mirrors the worktree there with rsync (not `.git`, `.local`, `target` or ignored files) into `~/code/horizon-parity/remote/`, whose `.local` links to the vanilla data in `~/code/horizon-parity/shared-local`, and starts `tools/parity.py --worker` over ssh. The worker builds the probes (about 80 s the first time) and runs what it is sent under the same tracer, admitting harnesses against its own free memory. One queue, longest first, feeds every machine, remote ones first: the Mac takes up to 14 harnesses, the desktop 3 and only those under 800 MB. Each pass comes back with the content hash of every file it depended on, so it is keyed on exactly what ran, and logs come back to `.local/parity-runner/logs/`; state, sharing and `gate.py` work as before. If a host can't be reached, or drops out, its harnesses run here. diff --git a/tests/test_game_home.py b/tests/test_game_home.py new file mode 100644 index 000000000..b4d9e017f --- /dev/null +++ b/tests/test_game_home.py @@ -0,0 +1,102 @@ +"""A tool or harness that starts the game must not write into a real player's folders. + +The game logs into HORIZON_HOME and falls back to the player's own game folder when it is unset, so every +spawn goes through lab.game_env, which sets fresh scratch folders. This test fails for a script in tools/ +that starts the game (or horizon-ctl, the launcher or the dedicated server) without it.""" + +import ast +import os +from pathlib import Path +import tempfile +import unittest +from unittest import mock + +from tools import lab + +TOOLS = Path(lab.ROOT) / "tools" + +# Strings that mean "this script starts the game": a binary a harness runs, or the audio switch every game run sets. +SPAWN_MARKERS = { + "HORIZON_NO_AUDIO", "horizon-ctl", "horizon-ctl.exe", "horizon-server", "horizon-server.exe", + "horizon-client.exe", "release/horizon-client", "fast/horizon-client", "debug/horizon-client", +} + +# Scripts that mention those strings without starting a game themselves, and why. +EXEMPT = { + "lab.py": "defines game_env", + "parity.py": "runs the harnesses and gives each its own HORIZON_HOME", + "package_native_client.py": "packs the binaries into an archive", + "build_release.py": "builds and packs the release", + "release_train.py": "release bookkeeping", + "pr_ready.py": "runs cargo checks and parity.py", + "port_harness.py": "ports Java code, starts no game", +} + + +def constants(tree): + """Every string in a script that is a whole literal or a keyword name (docstrings are longer text).""" + for node in ast.walk(tree): + if isinstance(node, ast.Constant) and isinstance(node.value, str): + yield node.value + elif isinstance(node, ast.keyword) and node.arg: + yield node.arg + + +def uses_game_env(tree): + """The script calls lab.game_env, or starts its servers through test_dedicated_server_parity.Server, which does.""" + return any(isinstance(node, ast.Attribute) and node.attr == "game_env" + or isinstance(node, ast.Name) and node.id == "game_env" + or isinstance(node, ast.ImportFrom) and (node.module or "").endswith("test_dedicated_server_parity") + for node in ast.walk(tree)) + + +def sets_audio_by_hand(tree): + return "HORIZON_NO_AUDIO" in set(constants(tree)) + + +class GameEnvTests(unittest.TestCase): + def test_gives_every_game_scratch_folders(self): + with mock.patch.dict(os.environ, {}, clear=False): + for key in ("HORIZON_HOME", "HORIZON_LAUNCHER_HOME", "XDG_DATA_HOME", "XDG_CONFIG_HOME"): + os.environ.pop(key, None) + first, second = lab.game_env(), lab.game_env() + self.assertEqual(first["HORIZON_NO_AUDIO"], "1") + self.assertEqual(first["HORIZON_LAUNCHER_NO_SELF_UPDATE"], "1") + for key in ("HORIZON_HOME", "HORIZON_LAUNCHER_HOME", "XDG_DATA_HOME", "XDG_CONFIG_HOME"): + self.assertTrue(Path(first[key]).is_dir(), key) + self.assertNotEqual(first[key], second[key], key) + + def test_keeps_the_callers_folders(self): + with tempfile.TemporaryDirectory() as temp: + env = lab.game_env({"PATH": "x", "HORIZON_HOME": "/from/base"}, HORIZON_LAUNCHER_HOME=Path(temp), A=1) + self.assertEqual(env["HORIZON_HOME"], "/from/base") + self.assertEqual(env["HORIZON_LAUNCHER_HOME"], temp) + self.assertEqual((env["PATH"], env["A"]), ("x", "1")) + + def test_does_not_touch_the_process_environment(self): + before = dict(os.environ) + lab.game_env() + self.assertEqual(dict(os.environ), before) + + +class SpawnerTests(unittest.TestCase): + def test_every_script_that_starts_the_game_uses_game_env(self): + offenders = [] + for path in sorted(TOOLS.rglob("*.py")): + if path.name in EXEMPT: + continue + tree = ast.parse(path.read_text(encoding="utf-8"), filename=str(path)) + if SPAWN_MARKERS & set(constants(tree)) and not uses_game_env(tree): + offenders.append(str(path.relative_to(lab.ROOT))) + self.assertEqual(offenders, [], "these start the game without lab.game_env (HORIZON_HOME falls back to a " + "real player's folder); use it, or list the script in EXEMPT") + + def test_nobody_sets_the_audio_switch_by_hand(self): + offenders = [str(path.relative_to(lab.ROOT)) for path in sorted(TOOLS.rglob("*.py")) + if path.name not in EXEMPT + and sets_audio_by_hand(ast.parse(path.read_text(encoding="utf-8"), filename=str(path)))] + self.assertEqual(offenders, [], "set it through lab.game_env, which also gives the game scratch folders") + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/agent_control_e2e.py b/tools/agent_control_e2e.py index 3fcf39553..7f0c52bce 100644 --- a/tools/agent_control_e2e.py +++ b/tools/agent_control_e2e.py @@ -67,17 +67,20 @@ class Failed(Exception): pass -def game_env(screen): +def game_env(screen, home=None): + """The environment of a game: lab.game_env with HORIZON_HOME `home` (a scratch folder when None), no live-count + ping, and on Linux the virtual screen `screen`.""" + extra = {'HORIZON_TELEMETRY_URL': 'off'} # no live-count ping from test games + if home is not None: + extra['HORIZON_HOME'] = home if sys.platform == 'darwin': - return dict(os.environ, HORIZON_NO_AUDIO='1', HORIZON_TELEMETRY_URL='off') - env = dict(os.environ, VSCREEN=screen) + return lab.game_env(**extra) + env = lab.game_env(VSCREEN=screen, **extra) subprocess.run(['vscreen', 'up'], env=env, check=False, capture_output=True) text = subprocess.run(['vscreen', 'env'], env=env, capture_output=True, text=True, check=True).stdout env.pop('DISPLAY', None) for match in re.finditer(r'(\w+)=(\S+)', text.split('unset')[0]): env[match.group(1)] = match.group(2) - env['HORIZON_NO_AUDIO'] = '1' - env['HORIZON_TELEMETRY_URL'] = 'off' # no live-count ping from test games if LAVAPIPE.exists(): env['VK_ICD_FILENAMES'] = str(LAVAPIPE) return env @@ -632,7 +635,7 @@ def scratch(mode, resources): (work / '.local/horizon-client').mkdir() os.symlink(resources, work / '.local/horizon-client' / lab.VERSION) # horizon-ctl reads No AI in the game home: this one, not the player's. - env = dict(game_env(os.environ.get('VSCREEN', 'agent-control')), HORIZON_HOME=str(work)) + env = game_env(os.environ.get('VSCREEN', 'agent-control'), home=work) return work, env diff --git a/tools/graphics_bench.py b/tools/graphics_bench.py index 0e42e94d5..f19165f62 100644 --- a/tools/graphics_bench.py +++ b/tools/graphics_bench.py @@ -53,15 +53,14 @@ guiScale:0 def vscreen_env(): out = subprocess.run(["vscreen", "env"], cwd=ROOT, capture_output=True, text=True, check=True) - env = dict(os.environ) + env = lab.game_env() for part in out.stdout.replace(";", " ").split(): if "=" in part and not part.startswith("export"): k, v = part.split("=", 1) env[k] = v env.pop("DISPLAY", None) - # Benchmark games never play sound on the machine's speakers. - env["HORIZON_NO_AUDIO"] = "1" - # Nor reach the telemetry server (docs/telemetry.md). + # lab.game_env: no sound on the machine's speakers, and scratch folders instead of the player's. + # Benchmark games do not reach the telemetry server (docs/telemetry.md). env["HORIZON_TELEMETRY_URL"] = "off" return env diff --git a/tools/lab.py b/tools/lab.py index a62a38f59..b7cc2f795 100644 --- a/tools/lab.py +++ b/tools/lab.py @@ -5,6 +5,7 @@ generated files stay in .local/. Also the small helpers the harnesses share (free ports, offline UUIDs, VarInts, float bits).""" import argparse +import atexit from collections import Counter import hashlib import json @@ -54,6 +55,38 @@ def cargo_target(): return ROOT / os.environ.get("CARGO_TARGET_DIR", "target") +_SCRATCH_DIRS = [] + + +def _scratch_dir(prefix): + path = tempfile.mkdtemp(prefix=prefix) + _SCRATCH_DIRS.append(path) + return path + + +@atexit.register +def _remove_scratch_dirs(): + for path in _SCRATCH_DIRS: + shutil.rmtree(path, ignore_errors=True) + + +def game_env(base=None, **extra): + """The environment for every run of the game, the launcher or horizon-ctl from a tool or a harness: no audio, + and fresh scratch folders for the game's home (logs, saves, options), the launcher's home and the XDG folders, + so a run never writes into a real player's folders (the game falls back to them when HORIZON_HOME is unset). + A folder the caller already has in `base` (default os.environ) or passes in `extra` is kept. The scratch folders + are removed when this process exits.""" + env = dict(os.environ if base is None else base) + env.update({key: str(value) for key, value in extra.items()}) + env["HORIZON_NO_AUDIO"] = "1" + env["HORIZON_LAUNCHER_NO_SELF_UPDATE"] = "1" + for key, prefix in (("HORIZON_HOME", "horizon-home-"), ("HORIZON_LAUNCHER_HOME", "horizon-launcher-home-"), + ("XDG_DATA_HOME", "horizon-xdg-data-"), ("XDG_CONFIG_HOME", "horizon-xdg-config-")): + if not env.get(key): + env[key] = _scratch_dir(prefix) + return env + + def write_json(path, data): path.parent.mkdir(parents=True, exist_ok=True) path.write_text(json.dumps(data, indent=2) + "\n", encoding="utf-8") diff --git a/tools/lan_e2e.py b/tools/lan_e2e.py index 3ece4b448..9d0586a2c 100755 --- a/tools/lan_e2e.py +++ b/tools/lan_e2e.py @@ -275,8 +275,7 @@ class Game: (self.work / '.local/horizon-client').mkdir(parents=True) os.symlink(resources, self.work / '.local/horizon-client' / lab.VERSION) self.socket = self.work / 'c.sock' - env = game_env(os.environ.get('VSCREEN', 'lan-e2e')) - env['HORIZON_HOME'] = str(self.work / 'home') + env = game_env(os.environ.get('VSCREEN', 'lan-e2e'), home=self.work / 'home') self.d = Cli(ctl, self.socket, self.work, env) self.d.name = name diff --git a/tools/launcher_mcp_e2e.py b/tools/launcher_mcp_e2e.py index 0b827d288..748acafc2 100644 --- a/tools/launcher_mcp_e2e.py +++ b/tools/launcher_mcp_e2e.py @@ -167,8 +167,7 @@ def main(): os.symlink(bins / name, version / name) os.symlink(resources, version / '.local/horizon-client' / lab.VERSION) (version / '.installed').write_text('') - env = dict(os.environ, HORIZON_LAUNCHER_HOME=str(work / 'launcher'), HORIZON_HOME=str(work / 'home'), - HORIZON_NO_AUDIO='1', HORIZON_TELEMETRY_URL='off') + env = lab.game_env(HORIZON_LAUNCHER_HOME=work / 'launcher', HORIZON_HOME=work / 'home', HORIZON_TELEMETRY_URL='off') m = Mcp(Path(args.launcher).resolve(), env) try: summary = scenario(m, out) diff --git a/tools/mod_browser_harness.py b/tools/mod_browser_harness.py index 4531570bc..cf33d85de 100755 --- a/tools/mod_browser_harness.py +++ b/tools/mod_browser_harness.py @@ -33,6 +33,11 @@ import tempfile import time from pathlib import Path +try: + from . import lab +except ImportError: + import lab + ROOT = Path(__file__).resolve().parents[1] @@ -154,8 +159,7 @@ def main(): args = ap.parse_args() home = Path(tempfile.mkdtemp(prefix="horizon-mod-browser-")) - env = dict(os.environ, HORIZON_HOME=str(home), HORIZON_NO_AUDIO="1", HORIZON_NO_HEARTBEAT="1", - HORIZON_CONTROL=str(home / "ctl.sock")) + env = lab.game_env(HORIZON_HOME=home, HORIZON_NO_HEARTBEAT="1", HORIZON_CONTROL=home / "ctl.sock") launcher = [args.launcher] game = Game(str(Path(args.bin) / "horizon-ctl"), str(Path(args.bin) / "horizon-client"), args.resources, home, env) diff --git a/tools/parity.py b/tools/parity.py index 4ed75f5ef..38a2fcde6 100644 --- a/tools/parity.py +++ b/tools/parity.py @@ -39,6 +39,7 @@ import json import os from pathlib import Path, PurePosixPath import re +import shutil import socket import subprocess import sys @@ -809,6 +810,12 @@ class LocalExecutor: trace.unlink(missing_ok=True) log = (STATE_DIR / "logs" / f"{name}.log").open("w") environment = run_environment(reuse) + # A game the harness starts logs into HORIZON_HOME, which is a real player's folder when it is unset + # (lab.game_env keeps this one). + game_home = STATE_DIR / "game-home" / name + shutil.rmtree(game_home, ignore_errors=True) + game_home.mkdir(parents=True) + environment.setdefault("HORIZON_HOME", str(game_home)) environment["PARITY_SHIM_OUTPUTS"] = str(outputs_listing(name, fresh=True)) environment.pop("PARITY_SHARD", None) if shard: diff --git a/tools/perf_bench.py b/tools/perf_bench.py index 31024737c..5f5f57305 100644 --- a/tools/perf_bench.py +++ b/tools/perf_bench.py @@ -400,7 +400,7 @@ def run_horizon(args, distance): for carry in dev_mods(args): command += ["--dev-mod", str(carry)] # Benchmark runs stay out of the live count and send nothing (docs/telemetry.md). - env = dict(os.environ, HORIZON_NO_AUDIO="1", HORIZON_TELEMETRY_URL="off") + env = lab.game_env(HORIZON_TELEMETRY_URL="off") if args.warm: # A first start to the title screen builds what later starts reuse (the content-mod # root, the block behaviour snapshot). It is not measured: players see it once. diff --git a/tools/server_bench.py b/tools/server_bench.py index a9a494efd..bf1cdabeb 100755 --- a/tools/server_bench.py +++ b/tools/server_bench.py @@ -120,7 +120,7 @@ class Server: self.process = subprocess.Popen([str(c) for c in command], cwd=directory, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, encoding='utf-8', errors='replace', - env=dict(os.environ, HORIZON_NO_AUDIO='1')) + env=lab.game_env()) threading.Thread(target=self._read, daemon=True).start() def _read(self): diff --git a/tools/test_block_removal_parity.py b/tools/test_block_removal_parity.py index 6ebbbf1d3..3185bd4bb 100755 --- a/tools/test_block_removal_parity.py +++ b/tools/test_block_removal_parity.py @@ -183,7 +183,7 @@ def main(): d.run(['cargo', 'build', '-q', '--release', '-p', 'horizon-client', '--bin', 'horizon-client'], cwd=lab.ROOT, env={**os.environ, 'CARGO_BUILD_JOBS': os.environ.get('CARGO_BUILD_JOBS', '3')}) d.run([str(lab.cargo_target() / 'release/horizon-client'), '--resources', str(resources)], cwd=work, - env={**os.environ, 'HORIZON_DISPENSE_FIXTURE': f'{work / "cases.jsonl"},{work / "rust.txt"}', 'HORIZON_NO_AUDIO': '1'}) + env=lab.game_env(HORIZON_DISPENSE_FIXTURE=f'{work / "cases.jsonl"},{work / "rust.txt"}')) # Loot table names (D) are vanilla's bookkeeping; the drops themselves are compared. ignore = tuple(prefix + ' ' for prefix in args.ignore.split(',') if prefix) + ('D ',) native = h.split_cases((work / 'native.txt').read_text(), ignore) diff --git a/tools/test_command_exec_parity.py b/tools/test_command_exec_parity.py index 9d57d3f69..877bd0b38 100644 --- a/tools/test_command_exec_parity.py +++ b/tools/test_command_exec_parity.py @@ -82,7 +82,7 @@ def main(): rust_dir = build / 'rust' shutil.rmtree(rust_dir, ignore_errors=True) rust_dir.mkdir() - env = dict(os.environ, HORIZON_NO_AUDIO='1', HORIZON_COMMAND_SCRIPT=str(script_path), HORIZON_COMMAND_OUTPUT=str(build / 'rust.jsonl')) + env = lab.game_env(HORIZON_COMMAND_SCRIPT=script_path, HORIZON_COMMAND_OUTPUT=build / 'rust.jsonl') run([binary, '--resources', lab.RESOURCES, '--world', 'harness', '--seed', SEED, '--radius', 4], 'rust', cwd=rust_dir, env=env) vanilla = [json.loads(l) for l in (build / 'vanilla.jsonl').open(encoding='utf-8')] diff --git a/tools/test_composter_parity.py b/tools/test_composter_parity.py index e632527ce..074b227a8 100644 --- a/tools/test_composter_parity.py +++ b/tools/test_composter_parity.py @@ -125,7 +125,7 @@ def main(): d.run(['cargo', 'build', '-q', '--release', '-p', 'horizon-client', '--bin', 'horizon-client'], cwd=lab.ROOT, env={**os.environ, 'CARGO_BUILD_JOBS': os.environ.get('CARGO_BUILD_JOBS', '3')}) d.run([str(lab.cargo_target() / 'release/horizon-client'), '--resources', str(resources)], cwd=work, - env={**os.environ, 'HORIZON_DISPENSE_FIXTURE': f'{work / "cases.jsonl"},{work / "rust.txt"}', 'HORIZON_NO_AUDIO': '1'}) + env=lab.game_env(HORIZON_DISPENSE_FIXTURE=f'{work / "cases.jsonl"},{work / "rust.txt"}')) ignore = tuple(prefix + ' ' for prefix in args.ignore.split(',') if prefix) + ('D ',) native = h.split_cases((work / 'native.txt').read_text(), ignore) rust = h.split_cases((work / 'rust.txt').read_text(), ignore) diff --git a/tools/test_crafter_parity.py b/tools/test_crafter_parity.py index 1b9564f41..b9c343d4d 100644 --- a/tools/test_crafter_parity.py +++ b/tools/test_crafter_parity.py @@ -245,7 +245,7 @@ def main(): d.run(['cargo', 'build', '-q', '--release', '-p', 'horizon-client', '--bin', 'horizon-client'], cwd=lab.ROOT, env={**os.environ, 'CARGO_BUILD_JOBS': os.environ.get('CARGO_BUILD_JOBS', '3')}) d.run([str(lab.cargo_target() / 'release/horizon-client'), '--resources', str(resources)], cwd=work, - env={**os.environ, 'HORIZON_DISPENSE_FIXTURE': f'{work / "cases.jsonl"},{work / "rust.txt"}', 'HORIZON_NO_AUDIO': '1'}) + env=lab.game_env(HORIZON_DISPENSE_FIXTURE=f'{work / "cases.jsonl"},{work / "rust.txt"}')) ignore = tuple(prefix + ' ' for prefix in args.ignore.split(',') if prefix) + ('D ',) native = h.split_cases((work / 'native.txt').read_text(), ignore) rust = h.split_cases((work / 'rust.txt').read_text(), ignore) diff --git a/tools/test_dedicated_server_parity.py b/tools/test_dedicated_server_parity.py index f45df9822..6a6d258d4 100644 --- a/tools/test_dedicated_server_parity.py +++ b/tools/test_dedicated_server_parity.py @@ -126,7 +126,7 @@ class Server: self.lines = [] self.process = subprocess.Popen(list(map(str, command)), cwd=directory, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, - encoding='utf-8', errors='replace') + encoding='utf-8', errors='replace', env=lab.game_env()) self.reader = threading.Thread(target=self._read, daemon=True) self.reader.start() @@ -352,7 +352,7 @@ def horizon_client_joins(vanilla_server, binary, world, build, reference): server = Server(vanilla_server, directory, label) try: server.wait_for(r'Done \(') - env = dict(os.environ, HORIZON_NO_AUDIO='1', HORIZON_NET_REPORT=str(report)) + env = lab.game_env(HORIZON_NET_REPORT=report) with (build / 'horizon-client-run.log').open('w') as log: subprocess.run([str(c) for c in [binary, '--resources', lab.RESOURCES, '--render-distance', 2, '--server', f'127.0.0.1:{port}', '--name', PLAYER]], diff --git a/tools/test_dispenser_parity.py b/tools/test_dispenser_parity.py index 844322aeb..a6d1f429a 100644 --- a/tools/test_dispenser_parity.py +++ b/tools/test_dispenser_parity.py @@ -417,7 +417,7 @@ def main(): run(['cargo', 'build', '-q', '--release', '-p', 'horizon-client', '--bin', 'horizon-client'], cwd=lab.ROOT, env={**os.environ, 'CARGO_BUILD_JOBS': os.environ.get('CARGO_BUILD_JOBS', '3')}) run([str(lab.cargo_target() / 'release/horizon-client'), '--resources', str(resources)], cwd=work, - env={**os.environ, 'HORIZON_DISPENSE_FIXTURE': f'{work / "cases.jsonl"},{work / "rust.txt"}', 'HORIZON_NO_AUDIO': '1'}) + env=lab.game_env(HORIZON_DISPENSE_FIXTURE=f'{work / "cases.jsonl"},{work / "rust.txt"}')) # Loot table names (D) are vanilla's bookkeeping; the drops themselves are compared. ignore = tuple(prefix + ' ' for prefix in args.ignore.split(',') if prefix) + ('D ',) native = h.split_cases((work / 'native.txt').read_text(), ignore) diff --git a/tools/test_friends.py b/tools/test_friends.py index 8fa1a4fee..cc5d15b92 100644 --- a/tools/test_friends.py +++ b/tools/test_friends.py @@ -96,7 +96,7 @@ class Game: self.process = subprocess.Popen(Game.prefix + [ str(client), '--resources', str(resources), '--render-distance', '2', '--test-terrain', '--control-socket', str(self.endpoint), '--timeout-seconds', '600', - ] + Game.extra, cwd=self.home, env=dict(os.environ, HORIZON_HOME=str(self.home), HORIZON_NO_AUDIO='1', **env), + ] + Game.extra, cwd=self.home, env=lab.game_env(HORIZON_HOME=self.home, **env), stdout=self.log, stderr=subprocess.STDOUT) wait_for(self.endpoint, 'screen', lambda v: v['screen'] == 'title', 120, f'{name} title') diff --git a/tools/test_mace_parity.py b/tools/test_mace_parity.py index 123f19693..578e9e6ee 100644 --- a/tools/test_mace_parity.py +++ b/tools/test_mace_parity.py @@ -170,7 +170,7 @@ def main(): d.run(['cargo', 'build', '-q', '--release', '-p', 'horizon-client', '--bin', 'horizon-client'], cwd=lab.ROOT, env={**os.environ, 'CARGO_BUILD_JOBS': os.environ.get('CARGO_BUILD_JOBS', '3')}) d.run([str(lab.cargo_target() / 'release/horizon-client'), '--resources', str(resources)], cwd=work, - env={**os.environ, 'HORIZON_DISPENSE_FIXTURE': f'{work / "cases.jsonl"},{work / "rust.txt"}', 'HORIZON_NO_AUDIO': '1'}) + env=lab.game_env(HORIZON_DISPENSE_FIXTURE=f'{work / "cases.jsonl"},{work / "rust.txt"}')) ignore = tuple(prefix + ' ' for prefix in args.ignore.split(',') if prefix) + ('D ',) native = h.split_cases((work / 'native.txt').read_text(), ignore) rust = h.split_cases((work / 'rust.txt').read_text(), ignore) diff --git a/tools/test_native_client.py b/tools/test_native_client.py index 73e6f3223..552ea8c42 100644 --- a/tools/test_native_client.py +++ b/tools/test_native_client.py @@ -71,7 +71,7 @@ def main(): str(executable), '--radius', '1', '--frames', '30', '--smoke-report', str(report), '--timeout-seconds', '60'] with (root / 'startup-smoke.log').open('w') as log: - subprocess.run(command, cwd=lab.ROOT, env=environment, check=True, + subprocess.run(command, cwd=lab.ROOT, env=lab.game_env(environment), check=True, stdout=log, stderr=subprocess.STDOUT, timeout=120) result = json.loads(report.read_text()) if (result.get('error') is not None or result.get('presented_frames') != 30 diff --git a/tools/test_online_mode_parity.py b/tools/test_online_mode_parity.py index d430c2a68..d03838bf3 100644 --- a/tools/test_online_mode_parity.py +++ b/tools/test_online_mode_parity.py @@ -179,7 +179,7 @@ def run_client(binary, build, port, label, token, discovery): shutil.rmtree(directory, ignore_errors=True) directory.mkdir() report = directory / 'report.json' - env = dict(os.environ, HORIZON_NO_AUDIO='1', HORIZON_NET_REPORT=str(report), HORIZON_API_DISCOVERY=discovery) + env = lab.game_env(HORIZON_NET_REPORT=report, HORIZON_API_DISCOVERY=discovery) command = [binary, '--resources', lab.RESOURCES, '--render-distance', 2, '--server', f'127.0.0.1:{port}', '--name', PLAYER] if token: @@ -246,7 +246,7 @@ def run_side(label, command, binary, build, services, discovery): props = dict(PROPERTIES, **{'server-port': str(port)}) (directory / 'server.properties').write_text(''.join(f'{k}={v}\n' for k, v in props.items())) (directory / 'eula.txt').write_text('eula=true\n') - os.environ.update(HORIZON_NO_AUDIO='1', HORIZON_API_DISCOVERY=discovery) + os.environ.update(lab.game_env(HORIZON_API_DISCOVERY=discovery)) server = Server(command, directory, f'{label}-online') checks = [] starts = [] diff --git a/tools/test_save_roundtrip_parity.py b/tools/test_save_roundtrip_parity.py index bd8b07a29..732429881 100644 --- a/tools/test_save_roundtrip_parity.py +++ b/tools/test_save_roundtrip_parity.py @@ -330,7 +330,7 @@ def entity_uuid_text(i): def vscreen_env(): text = subprocess.run(['vscreen', 'env'], capture_output=True, text=True, check=True).stdout - env = dict(os.environ) + env = lab.game_env() env.pop('DISPLAY', None) for match in re.finditer(r'(\w+)=(\S+)', text.split('unset')[0]): env[match.group(1)] = match.group(2) @@ -346,7 +346,7 @@ def horizon_resave(source, destination, bin_dir): ctl = [str(bin_dir / 'horizon-ctl'), '--socket', str(socket)] extra = [] if sys.platform == 'darwin': - env = dict(os.environ, HORIZON_NO_AUDIO='1') + env = lab.game_env() extra = ['--offscreen'] else: alsa = destination / 'null-asound.conf' diff --git a/tools/test_sculk_parity.py b/tools/test_sculk_parity.py index b9c7417a5..ae2c1c6aa 100644 --- a/tools/test_sculk_parity.py +++ b/tools/test_sculk_parity.py @@ -339,7 +339,7 @@ def main(): oracle_harness.run_logged(['cargo', 'build', '--locked', '--release', '-p', 'horizon-client', '--bin', 'horizon-client'], build, 'compile-rust') oracle_harness.run_logged([lab.cargo_target() / 'release/horizon-client', '--resources', resources], build, 'horizon', - env={**os.environ, 'HORIZON_SCULK_FIXTURE': f'{inputs},{build / "horizon.txt"}', 'HORIZON_NO_AUDIO': '1'}) + env=lab.game_env(HORIZON_SCULK_FIXTURE=f'{inputs},{build / "horizon.txt"}')) if args.java_only: return names = {s[0] for _, s in chosen} diff --git a/tools/test_secure_chat_parity.py b/tools/test_secure_chat_parity.py index c6c76a892..b9062568a 100644 --- a/tools/test_secure_chat_parity.py +++ b/tools/test_secure_chat_parity.py @@ -264,7 +264,7 @@ def main(): oh.run_logged([*java, 'keys', build], build, 'keys') services = Services(json.loads((build / 'publickeys.json').read_text())) discovery = services.url + '/minecraft/client' - os.environ.update(HORIZON_NO_AUDIO='1', HORIZON_API_DISCOVERY=discovery) + os.environ.update(lab.game_env(HORIZON_API_DISCOVERY=discovery)) servers = { 'vanilla': ['java', '-Xmx2g', '-Duser.timezone=UTC', f'-Dminecraft.api.discovery.host={discovery}', '-cp', dependencies, 'net.minecraft.server.Main', 'nogui'], diff --git a/tools/test_use_item_on_parity.py b/tools/test_use_item_on_parity.py index d6e5f899f..89b463116 100644 --- a/tools/test_use_item_on_parity.py +++ b/tools/test_use_item_on_parity.py @@ -375,7 +375,7 @@ def main(): d.run(['cargo', 'build', '-q', '--release', '-p', 'horizon-client', '--bin', 'horizon-client'], cwd=lab.ROOT, env={**os.environ, 'CARGO_BUILD_JOBS': os.environ.get('CARGO_BUILD_JOBS', '3')}) d.run([str(lab.cargo_target() / 'release/horizon-client'), '--resources', str(resources)], cwd=work, - env={**os.environ, 'HORIZON_DISPENSE_FIXTURE': f'{work / "cases.jsonl"},{work / "rust.txt"}', 'HORIZON_NO_AUDIO': '1'}) + env=lab.game_env(HORIZON_DISPENSE_FIXTURE=f'{work / "cases.jsonl"},{work / "rust.txt"}')) ignore = tuple(prefix + ' ' for prefix in args.ignore.split(',') if prefix) + ('D ',) native = h.split_cases((work / 'native.txt').read_text(), ignore) rust = h.split_cases((work / 'rust.txt').read_text(), ignore) diff --git a/tools/test_world_reopen_parity.py b/tools/test_world_reopen_parity.py index 381927013..4ef9a5e87 100644 --- a/tools/test_world_reopen_parity.py +++ b/tools/test_world_reopen_parity.py @@ -24,6 +24,9 @@ import sys import tempfile from pathlib import Path +sys.path.insert(0, str(Path(__file__).resolve().parent)) +import lab # noqa: E402 + ROOT = Path(__file__).resolve().parent.parent RESOURCES = ROOT / '.local' / 'horizon-client' / '26.3' RUN = ROOT / '.local' / 'world-reopen' @@ -32,7 +35,7 @@ CYCLES = 3 def game_env(): """macOS renders offscreen; Linux uses the virtual screen (as test_save_roundtrip_parity).""" - env = dict(os.environ, HORIZON_NO_AUDIO='1') + env = lab.game_env() if sys.platform == 'darwin': return env, ['--offscreen'] subprocess.run(['vscreen', 'up'], check=False, capture_output=True) diff --git a/tools/test_world_spawn_parity.py b/tools/test_world_spawn_parity.py index 5daa38a45..00c390005 100644 --- a/tools/test_world_spawn_parity.py +++ b/tools/test_world_spawn_parity.py @@ -140,7 +140,7 @@ def main(): # One worker thread: the chunks decorated in a fixed order (see above). vanilla_server = ['java', '-Xmx2g', '-Dmax.bg.threads=1', '-cp', dependencies, 'net.minecraft.server.Main', 'nogui'] horizon_server = [binary, '--resources', RESOURCES, '--dedicated', '--nogui'] - os.environ['HORIZON_NO_AUDIO'] = '1' + os.environ.update(lab.game_env()) def one(seed): t0 = time.time() From 4ebba25280031b1d4d9902a4d7a9814aa67c4ee7 Mon Sep 17 00:00:00 2001 From: RobertTGreat Date: Sat, 24 Oct 2026 18:30:36 +0100 Subject: [PATCH 008/140] fix(launcher): fill window width and add Windows title bar Keep page content and pixel art responsive, align navigation left, and use native Windows control hit regions in themed chrome. Co-Authored-By: OpenAI Codex (GPT-6.1 Sol) --- launcher/README.md | 4 + launcher/docs/launcher-window-after.png | Bin 0 -> 97826 bytes launcher/docs/launcher-window-before.png | Bin 0 -> 168449 bytes launcher/src/art.rs | 69 ++++++++-- launcher/src/main.rs | 63 +++++----- launcher/src/scrollbar.rs | 5 +- launcher/src/theme.rs | 1 + launcher/src/titlebar.rs | 153 +++++++++++++++++++++++ 8 files changed, 250 insertions(+), 45 deletions(-) create mode 100644 launcher/docs/launcher-window-after.png create mode 100644 launcher/docs/launcher-window-before.png create mode 100644 launcher/src/titlebar.rs diff --git a/launcher/README.md b/launcher/README.md index cf968f93c..5e38e9fd9 100644 --- a/launcher/README.md +++ b/launcher/README.md @@ -97,6 +97,10 @@ page `servers.json` (the list), `servers//` (the servers created there) an Long pages, dialogs, the server console and data previews have a visible scrollbar when their content overflows. Drag the thumb or click the track to navigate without a mouse wheel. +Pages and Home's landscape fill the window as it resizes. Windows uses a matching title +bar with native dragging, resizing, Snap, +minimize, maximize/restore and close; macOS and Linux keep their system title bars. + ## Updates The launcher looks for a newer Horizon release when it starts and every 30 minutes while it diff --git a/launcher/docs/launcher-window-after.png b/launcher/docs/launcher-window-after.png new file mode 100644 index 0000000000000000000000000000000000000000..59633eedb890ff45fcdaf4ce142511d524434f99 GIT binary patch literal 97826 zcmbrm1yodR+crD~qM#_!QVP;3-AIXacQ=wUbeBkjbayul-ALzv(k(gk&>jCCy}h63 zegFSo>s#xawYEC5_f_Y0=5buxKv`+gXDF{wKp@aFv5&&?Akf2j5a|BN<43?R!F$?h zz+d-l#@!^1cB~y#DoPD zowRr69lbC`W*+UEL?pkZ74Y#+7k)x*%!&0qU>f6OR6$k%y^A@;q%C=GRTxwDA@gIB zkJ0I=YI08^pJtPaVGA%p7KwT1M{kss{QD}eu1~eC^R`Mx=9xPrEoEc`^z@oDQ@9;` z0{;0>7K7LNm(zXG1PgrRDf1O8Tp}c2ll=2RSs4*}zH}c0{htq6sb)Qdk_+56w;BHNM3|K1Qs`L704|0fN^1#*JMgAMgaZfn6vpkLp< zBKuQQ{L@`O>nPuK8ST$4w@V#EIpr8S4K#mZn};5^n-n|KmE3k(g{wPwk~j{#Uj-g~ z_|;xIpA1>xg?FdlBjs@p966B^{`2`VwH%?dnn{{S=xuVx3=(DG7F52N$PtIqGv-!)Sc`KLj&qsQd|#dWha@$sH5enYZztirCS?YMiC znuAGBp#e+;Tbg&*&h75T5#*H>#`TKW^Y~4!2ct-CuA)4u5?n`D22|@V5tt+kJ-77PoxN-G4L?31>}j6* zE3|rs!DYGlWQ&I5vbZd@%5{(zv8U#jAMlW9Dyq0K(bY>n^^QOp9EYAf)JE5S$u+sb z)T3vJK|e8fbDO-IuCcy*@Bo>A?MszjhkD-L=y0AnKla(lpiD~gO!b!j@B*)Dvy0!) zG}mNc^!>5=o(rP`K^ek7+AAl<0?6qriui-G0^uiV%9v7sJQB+FR=7e4`R^O_gtvte zF8HNT?)YVwnRrkac}?|fBK8d4a`xzw|1O~T9}UiYyy{mWB~UO9Z1?A}AEGNg#5hZc zD?cmzR5OZ73+&iQzOFH3VU%4i6Dp z|Bqq)w|z&}5=Z=_k0hCMZT~mc{y*FUl99LyZKU7d*$eAoDHf{oE+OS|`Gp#x8}&AX zN*Mn2PIAioq~O0#Mq|=5{(D2duI=yd!eamJ&-_p&|K9kY4N$0+inZUOb`&a1sbb50 zEuO6t#{Nf*o>Z6&Td4_i<^x*>=_Q>EHyF8|cY5?!V(4UkCX8!Tso(!}tO%YqX&Eb= zmQ|KRn=1cA_G0;Ix+ZU!9t_^i{2#yhKinX&3g@7|;-s#ZBrch`?0Gc2D_NjkA4_|9 z($Nm*sYSkqi9B`x6t7SVUZYMPUAr$M&G+OAoq5z|u%`UTaRu-1!lLCgYOcd#XjJsp z`ju2$t(uE-c{=~ypZ)+Mc1?d`Y!81CRL@RME&4XZ)r$_#9JXZF>m9){W3#6k(nA zY(h7|_t>oFD2pDjT104<*3v%TNts($y2pJBP1h<%_cx==QwiP?ClU65dU*>usmuyMVRsO4l;Nwz@$ zghUNjIiFjO`xCVyX(4*pv5t?h7w_{J7rC==yYX_OUWYMv(4FA{H*Y z#}~;rnGZE>$EET$>w{=dPkM-Ff#osu>-RIWpEYS9PrB6Y8H-|zNvo%BY^W}OEOb8s)YSL{YEA&RiLGPy_2bH;Yl0ENc z+o6keFzk4GZWGWe)~dZZ2^9}Nxv0xtO!1@pqeHy#4@KCP_drKD(50l*r%oHUw~*dR zz*(47}c(4#jR17(sczTX9d@e_> zVFfnJ?uQ{sFRm}U=(JEJ1GL;41v)OJZ&K%789yx}*X=Kt;&K_{cDJxEe4?0MnVQrE zGrU(SkVhJbrSD)>Iq7Xg%H`gxe*oGqqqxJWrwsx0d7uC(*VV;iTTKyylaxx}79vS^ zAm7|(sIJHqqhLlbxr8}ZqCvbnYxhm5#ds(su-aT@Wji6QpSoWF5&NMj4f-=72e|kL zA#H{;@~6|o8G6{^K$QCqQv-GcWvGe~-N+k=ys1bap7V{}jQ*Q!SMN=P_HL;FVy`gh z&O#VOo2Pc?NZi+Y^`0BR2!=UMNg}0G;uugReRc32f;Og`RaPO42vJjD$4e3iGslR& zvpwxmtu}i`&jlCH+nL!@$y9+8ov&}hKTDKx^Ilw#V4+Ixg|~}fon+ZIyDo&r(#=p? zM-n#xBA+b8-x^ZE&9wn5MYE?_1va5qpM`3S*-*XfqkSo2$!*&9xOlOA!ZtQ(zQ@PU zmXWdDom>gR>%q23w2~V>P;K@D8=tMXtKpeBDQ}Hsfk#N*VOsXQ~HIlz{ zfXiACZi2qKQiiNMmd$56w(n$;5h$PM(d_%9P(%avGzaGq|5{VQ6YB5=#%jPDA@&Eg(V+uK9?K1Sh*ewM-XRht z)W#3+MklKG_q=?j;01=nzR1Lz+ns}Oz8>Jgk=f5|NIB4-M*Idl=jcFw%~YsTv_t?) z&(|(_1O%CoiWO1aO-Pzit+N53p-%e|El$;6bc(OnQymQulQ}BVdHRa6-6=N;jd%r! zDTZVa+e_#m?NmaXJ#jyscw^x#L%--8f6RB>+oHs z#fZBbd5Cbhx2r3+<5mzxI6u}v?9Fo1!Q^fc6GNn78s~J93xZ_}yya%&uVjw5<{!YN_URwqv=|lTwMfk>LwDQTU&RBW zr8rw#dhq$c2#4}U+ie=j$=PY2&E#j@0cjPnpYJv)Sgy2wHP0xxrXSU@)_)Hk4tOUQ zzAc1SBed*!*TQFZuAR@CQ`PvVd-E%O5yZ9It^+q4pO3}Fb+&DHR!9#GhL4nZ9?uSQKGVrq#9Z5 zpjCsWI)W>Ua<~qdxIRt8QlrMgA#CxK(37&KZOD%J^J1C>P(6qYU|XgTID7t#xM_gl zpL!&2?N-2KYb4dktZ%+nPqi2{=E;zdWNMzwB>4imBo13NDEPP;=Fa0*ya&0V@@s%$V2&UdU-DBeU502|IhWBJE-xmU`*NcUnM>6TwZe+dPsr)XXn+m49~>&T*x_fV^r`4SxX9 znRoBdo~y83wXF%;Q4xj8ohJ33PT7Tri(}Db0Cgp$LQQdz5s%}{)9s>2z)lXo*F7Qq zJX)gSq(Ap%ELrn?f&EFfiotQ6TxwnGqB|3vIoQm*Pg_>K;gE(_>mnwP7OzOTM8Mx6 zkL#W3FWH1hJB#Y#r?Mk!K>&lr;GaRqAi{}Kz7@8^b?tfhT7!lxI;U~n6 zsO11{U*0(FaXs8|H*Adn-X_a{V4! zQ*QlNp5WUAK^hjCL+Nb|7cfvjm^BP?+YIg9+{AbO42Rc}CBF%hu#wJgVI zzEk{rjvIV0BP}cnzQhSI++DjRw}kcap{Wh;gQ%5gMy%7@i$xQ|E3 zQ-M1EL_4hrPIpFg!-LtV9o)3{;WP)Xu?oyH7-H1#a_a3KihgBae99+w(y|5kr~J~3 zqFZ853)@ojWuoDhTrtd3d||x6W2NNyQ+Micdy?>XSH+~xJ1S+jX>eO#=~80XE7Bgo z6Ft`CKu%}I5D6;FaAk>l^-*$8Z2y&l;_0$+S5OSE zfl9F|9sppBYMXLn&1N-v%pj1A8y95J+d823ldG9?ThVelsIQF)@0mVWwzWQz%;j;k zJZoKQ@i=o{4xvvmRPX=n-Pd(XnMByva67|?%WRhX6CN+O^7*EE0#ALq3W#-sIvhRD zLI$2JEB7aLw716!w=a6XrnCZgC@8e%h`ICWN-Oj)o!U=#J)IU5d&7sO-W@d#$81{} z&YD}dY`95oRbzUlTmiXs*A^=c&sAHCanQ{>=Brm^1v4sp;q*5(MwO7yx}Ia=L|NnJ z%9N;q0z2FLy&tp7mUVyq%3}n|cmOtdz<&pkojxnznK(Qb*_5aWJ$!~$$My4+)Pf73g?mI(qt1hCq?wq8csAM;xmNr?0(y3zOW#{%`<_ z=k?)Pcu$mXxK01w<^^4B>2?2wlV*H!q}hD;n8(+jx0e>33v*43=TvJJIg~mHQcH+r zoDDRb&=ap0yjo$saEK3NQTm%m*C1tYHHh5WGHXWn18q*iGTix0VvGnUW`u8 zTHhG>!fK$w!_A>csIXstZ)66j!;`F=P=T=2B~`2arU+AsW-?Ob15l6=A`>~i=8I>0 zQfWNgsip-LYOE1mnXEQvysm!p-r``xlP1<+tkIflH`Q&2GsNYLZZMH|v@fAmmp)fA z<=5(J(6c1v`xX4F7w-srUi<1)w5*kxoSm;Jwa5CQJKS2SY3M@cM~^hrRtK7=6eDw7 zy!%3}9hio-KRymdMZ4H;FP%6EY>#I%XgVe3i(Xt^ZkD3wK>!RF@8~2~FYhZ{IS_tc zx`@-;D971v#Tuwu%S)NT6D3$^FKC3N)hGE+F>-moj#}?Bc_^UrhsYKyzw0KrLI5a+_Vx^mneZK5t}% zepZevg(k>2E_e{LSY9!Ev&M)@~8_d_>1j5Ve%8jak&17Ai#{{kHS zmbrd`j6jw1!ohoU#@tF+Z%BOxiTun*4g%C&HK)7w+mlP}M+_Y|H^r4MI}JM6cVBE) zM7fO$fCfN4R7tl3fIAV^Kw*LS^at$D4lUNG=St$KMa$cpO$sD18SSqc40Fm=8q+D3 zm3ka8iS+y(9C*A-!s7#wIehN@?(f_`Tf6NA#3Q|>%!|}RMfF+_Ld0IU-Z~di?4SlK zfd7M1;k`3Il`Ph3e5B%Vg+EhU*&=lX7~Ikz6!t4G4JY?n{i78^Z=or(Hse^6_dr~! zU@oG~GX^`JHM<1yC%^thVT=Y*ebc(i%qM>#7Kt!ngD}2(fI(qgNMNrY`oApltSi@98CZ?jaoZ z58?_&8vZ|ED#Qg6eqv#?{0G}Z|L<0BPw2qH(cD1o`V5pWo6%4#UU6UTn~S&5L-On| zcTon$>%YQn%MBgTCT`v~+LnJti=9jHy|Wdk-t0Mh91+I~3`v2E5|L=g#|LB}B$1kr3pWE&s z_b$J`I^F#bl7~))81Bt3K&O-l{LzBwvVYnsT424yefr23{mn}i1ah|O@|yb1PGyMM zxCLcVB;+3uYRypT?ddhOVm^J5eDQniZ0%n!yq{1l-L1waaGtLa&`ziL+Vl7A5zr?4 zk~zYD-6cngUmoxZX1`@1^C)4hmC;HHb7eH9Z{R2|xt40LVPNM)8OfB|j=F#%t46;$ga-yAo z)0M6E=E);3Jv<00U9*gS-SD6yG6x0pP~+chSrHAfQ!HjVO_C2b$&b z*f2nEc*OIg>I`3x^>Lm=(}TPc7Tx!bKZP^9LfPXF4h(6vPMKZKn(z^YRTMk09}=fZ__Gu zkGfQd0p#S#)C&#WR{%FAne>imap)2yfNsNL@fJB(k}#M`p-2BT*_sgm%rvLQxrCln zRE8n;0ho_N{~WM={ei#vqTTt*o`g68e7>WXqDSR<)>V8xjA@?nU=`ws*1D^^5 zR-36cYw)99K?PB4dD}g79;*YvT^HS;PG9|DX z@DRCWmsNga0rEirP@4wuAgG={n+>+}Of|2vGKCS)^NdKT;$V`v*Zu9S`wmmBlt#kQ zkN(wLMM#dNcY#F$BwtCjr+$8;yu$_{CgZu`u7ByTg=SY-fTWV)<{yY^aEDj&hf+&qq`aKDLUcoZFw2A+A)& zl8{c!&_B*L$nOhwJdiO2*`{RWN~t@Q`aT3b=lh9MG+Df#Y&4d8B8T8d>Ff9JMgYoe z17JkQg6ck20uURNBz$w_Gmzs80el+o;$xG_o?YO!V&STmSD|77B(KFbuN0w}R0-_A zBL`ser9h^ODIOElqNoTw(up09R;WP?*bkCEu||;&TsOf7ZtT9sIbgci1b+uelfc0g z10d3{5hgaxWE2ygozsq}@&TTfyLLC&VRoekxC`I_-9Qd+e>hpDvt5wJ3&VF~-!2M) zCIwL5^@ax-{dODyl(Pup2&w`TeglwX_#oLLV{gs|OJ$&lqWeoWHrU-z5dKYz$Dh?@{jp=|u zQR|@xb7(T`#<{H1q>w>rK7p2U}wW5+jfsM1GUml+!}k=k@|U#&E(`kJ{t>T3lGTUia?y zW~$Y*l@{$EVolMa&nRh(?g^F+6`%{f|NI&qHRhMG5iA5@jr#)p{L}YOG>Zm<#YE|^ zzg$G{ezpOAr*u5fSPc+_wC2!h$pf(#$lb$nUbO^vV>66T_8^Uu3QJ!Xx%e;*`KXi2 zmSIvM3Ci+D6IA=DFJmc&zu?TZmWEtRs{5eDw+QN(y^Jm?IK%9+Hf1sxWQ|?jLIriy zs??KdJhu$1?X;JWV#Pwy17AZ1Sr4ew2-<2F3f}=ktWoL^lH;Bg2e+`$>o=40Zpal| zWshaI30S<)f=Uonx?c@faUHS#JUCw8m{fdld#Bqeu4vPE5@RUVG?;?-Bl%H zaa$dmPN33!I+=d@I6+8QxS&Sw=pm>r?dpunNUuet6okD06mU7>(L6=(AFUBPKQ)rI zis+$;NdK&VHE>JbOoDS+BucUvMxFU*JQd zu(`9qht9ozDbZi==;K7mBVGept0N-9QAez5;A&+(Y-6-%(qcjf|aJ(?bFK zzM&~Tg|GuD>D6k84+(KEC&f#^>%T3oqT{%k!O z%MCfXi70;Q1VszUMx}u&7ptI_ll50rl*}_n5qwHIuW%}~qlk_vC)ngM)29XO4KrjG zmFwX|0rO9{gy`f4?6Ww3UebZz^=k>FrHs|~Iwuw;h=*PVcT9 zP8Zo#ih8Vr$9JR}TzZ$Lne;$Aw`gi5lpJxg8pUW;8o*YQUoUc!y~IqNa}0dwM{%Y_ zk`b$#v-wsOHE52)gn*zljf7^*TuDR|_b|ALl-&zZ0NncD8Xy<=I*r9p)~xS_#+Op1 z@2W5)Qf$v}On6^rPu2uZd_gv7W5X2P^+sWJcki(n(NR8-8+D;04)%~lFhu^dNEDep zZY^0S@S;elMbyzj@En;*;fJ>H#rALX;KXDLF5iHFk84+S;351p>fiv%4s5y$RqRg} zp25l5=hn7Q3Pl45){0ynF80T#6Wm>T!CwYFiNffd^`FU7U#9$gi}9M0!qoi6oUVev zpsE5A<)G>MD+%xklGoB~(HuerMCk&5D4U}GFAWgL0u1~iFR>r`m_VnC zl*>q#>g-23FJt=$Eh5m-P%DOQm|1FCZutG2&MsLi0M_GJbnfoA%P9?g{KLNpCr7=q z1oFqp+EKmh=0kb9<|WVP+9hs~+toVpGCIqu_3S_PZZ-N4^d9}zuKygU8OUO*!=9+txiPf~4pOpFG|p=F zjUXAbA&}S_MZxhT?NRUt0P8MC5Yi+i=XjDQ%YJ&d1Sr|*L~p=8w^juVCn)^~Ws|pr z8Vaink`Ju^+Rl>~(OL8AICtt2v=ows5Fv#6F*c2-LGLK_k;p|Dbqr=_7e%{w+Hk*v~F&AEspHWA0@EV=bnceGzx!S-*YW= z&9NAi`!EPLr!wh`|Bh0BR9LjJ8okSf z(ILAmAZ}~B*$2#WlA6hwm0(UQaB^ELggqt-IT=}ZlF+OjQ&h-!5sje;@A&j;%)kC` zh{9Pw4{@Ck(Rro)`RbRbjV!O=YW~TBP|ie=57=jm?pEzbSVF%haoIbVD$q5FR5OVw zi~A?jj4-tk-T{QBt`tt@nxXnJasn>O4Bs>9Dd^nxPCGATQkNuC|6^&{KsragwV`bC z96J-G^d3GQS>T)l9wxq&)pYD6C$}hS-V1)+i6>d_VJzD+ z7}fiHSU0G>_4)3iMGQ&K`^Sa;ky$me5(G$4&-)Ky=O*X>Zyzp#FU63bZNvIwI(sHJ`~AocusK(Hp-qS?j=) z)O#43%Mgm1|J;5svIKA_D$Tc(FEWiV(B;gE=Na#TWM!#u^Sl{N7-JYzA`mdf8pVa9 z9v+$BoR!u$kv$x(XiRXU5n}NTlvJw@e`EpZj1A%pO+Wf!S024MO8tDp>&R7i;SXXY zwOYSbCF^a(EInzpAw1!!Clfaigfk-p5Lr%i$7&Mx9|`^*;6xKaU}#T`vRWsCaxtI=hO;>1=?B^kqF{IbC*iKHq zcQ;m`E1ajBN&IE~?w>z`Q0uk+TBcE7$8$cvU}&Q}Hpbe!i+0&RGQ#3N#2rA4u$@`= zZIH5ao?mun_AW)zfyJDDp&w=t^$?a` zZ|IPksK08exrz~Q212el;YC?Q$g-eS-0u}IA?ERW*ZvtK``c^@Dv$`3qH+8J5dcsJ zgaZIiKCzfPa3r#F6MztuZF+h6R|OM><>GMn&Y>{vX4hZMPpti*5p&L`qA-s|$oK`X zc$ywKfKu*Iq=p_b0uwkmSu2->qE8G+gSuwq?Y%AgNt9P9(a+Xg0mm#p4K`_s@+;%o7wYd6tUExY$=wc$C`!3Cs>!}vGDnaq;9U&9iPaO=CZ1(`4>d1I#-YwK zMIDoOyB+(M_q%>dF;AZ0d?M;!d0iK(^VN`0TLHD2=jU8k*;gOjBcicDnc1;^>#~HI zHty$SQdFS(CPW^F3^WQuDiX`WDX`obD2t$G+g!~3q)*`+5_)D!m={ArqX5?T(`>KX z@gAtrp+|?m^?#K*PLHCX>^h$QfXwaN`GP6ca8ew}N?U8fX&t75B>+yd10aHuyT~$^ zMQ(Fg(r(SDVM#K!!${yXtS%4vItn8bs!bLxyDPy~8M_EAFdH9p)ObNyuOYISeXJh1 zCD~Pel_liO@G2_a8%iN0VLOO_c?8XB69O%Zxcx|g6Aun(t{cmkFGywn77!3gakunw zh@Zp-;(3%Qc0f_fkyfJ(Wj})vrDZJ2&|3qXGFRo5R@erP3)28UcWp1HXj-EM9%ccl ztMtv|&6SkOy@P%reG3^B$voYijhjcx^?1$`gt%zR>Sh!?*05Bv79WIX%D`Jv4>cLD zV`@i$vFpwusQUm#n2gKv*;Jlbz}32416rLrcQZ37Ek0Q%teD*ENhE(DBk}^yk<0#2 zEF$H?uR^Y&?|_Nbin^B*2Ax|A8Dnh58baQh$Trx6oTWb&tqEEXI_z{a zgNYr?0hT`4zw2wJ1M=cdLwj$kv~hrrfAnmNGol#yGXtRWq43-m1zvhNm)^MG1kX)M z(UahPItlFh6Fm~{Rob5?Uqw#0_cTm~n*ZP}s}@~_NONy3nWmQaS?=>z-encDnFF(o#f2XS#uwE; zwDnoLHCM){sFVd#3Mbm@@)T{0lW$(5*snD(xd#p@tw>HL-E70TwQ85`&C<*QlWHbr zOx0c)Q2Wc9H09XoVNrJRt={g-Z~KS_OctnRcG@Zoonn{~&1hkbbjN2M)Xt7w&Ax%;zL_DOH6Rp~1FZkBQ;L=qYk$;8JVK697P zcQ$oYdXI1LHJ3#>yC6``JabS;N)AP{xMAJC$i>Q)7@Yg#=Jwf(wZxwCnnj;;IwRUM z>xD;eJdWg<^zYcM$FcLe2gWeGz5r=@_@@EAsc^O;=^?@g5t=)d zBwaFzks**DXTm+*kwN>g+h%DsfS9^Z@C~0h!d$lXO`&3iHZ5!Z;)`cnNeizrh3qk40XwT-?yOJ_%Zuu=>2C5_g^SlRGqU1#y#r)R_0Rb;x>*ODb zm~Wl$h}IWL>6z-f_$Cmz%YZ}DdkHwf4#s-quxRt6BT`t>W&MD*FNvGE*o3PP{oaL$ zS>OUI4zE0YX!NBRZZDn8qV~s-y638M#MP4iW?1ov~#TdhnOJY=}#stNvrk^ibq##Vzkn|CdU}y8cQ~*%D zImG&?7gnPjz%mO36tI|J+mQZ7LU7Tc`*vpJEZteybzey{Fk389*;7nRAV1P9ntKh~ zPN}7p8dmOG7)LiONsO=pAD2gx_+n!QQtTh1oAr~>Tsh&PrjybUGaQCDQF zNcnr9Z=urrW-}};y_m@|<$EVZN|;NI?(aGEjca&#ILkDXvXT`_hn^=ougzRrfIUhd zUs5J0uA)N%9WTL1Tn{Pxb+OJ8Oncs;58qEV#JQ3?%+Q!=F zeG%7!bb*uEUv}8Qy^f~K^XebPYww|_%1Edgp~$7X&VJJdv)mBehrNlC${>qkNy8Gi z$L(dg_zJy=;vQ4GvN9BgsI-nmsePx5B=arL8pv*S}f&4BxX-S zOt>H#L=Qkdd(0SWDTW(+441MJ#fY>v3{_IF6`81O-tl%+VPf+bx-r^V24t8j+BU4E zP0MC#$tst}d%@CqjoyjDX2%iG-H?7Ig+)u)`WkE3vx#!%xh1Ea)eJ^X z7rb#D_T!B2ZDO=!l7iBl97XXWi=0mYq=1W>mM(;0>t2Bc`Pkb+mvdre(e&x_?X6Q++-Qg91)pjt_WVW7!(Y{XJZlz8$yKEoe#?> z+AdA``S2`OLrze-w4Q<5Ly&5{@f%ROUNbg?I`1vhFe2h2qRgWc{N(}@q6hjWjMb(K zKh^dd_I-kXWIEFT=aL=)XmUqUS?hAu-R$_h%|?d59(c>+2 zid?mslEp&P6OCG{t_64317O`*Qb`UQPKP?OSs$c!=ISx{?+&v@p$M^aK0DNATm-o$&@}=)}``5uSnw>Q^7l%gPM^9g60SN&x z@;yLg&)i+kx@PRnZKg6pWitek25$qU-t#+XI-V`~?YlnN(-^)ci z-+iu;iv1K8LqA!k0kXE*QGsJm86DiY4A>i0+!c{sRV|{r=Gm$|xc~SD(gN9LM#Mp^jIe2$bfA*dA3AS2R^V%9$qk?ESL;bt=z%EzthS>8<|}=SZ#=$jV*;p`neY zL#Ms7Z^g!G)EFw-E6uZnS*+2DeM8jp92JMIEyJH^{n&Z%N00vYL|KK zr*Z}BBK2zOiPFl;^NTp*9|zH+$qkn$_`2)0I$b#5p{>B_5Np9!e|X1PWs69Ug7nd` zT7x8B6Vo-B+u^3D>5nEXX|4mq*KET^192P%$xiK5-S4u2d|-Ju!dkc6U*X4kuY>7m zF5!!9+wrX!Xw78V;(NB7kZ&}j1!_6uo?sbd5e|q_)xSj-t@zNjp^OK*WXKqh zI%5&RjDpb@(R|^r{xV$iH7t7S+E4=F^bOe}zax?R%J5w=B(ia8s%>x{k9<(Aaidy? zri20~y?@1Z@n=czHh{bUqtjowu2-!GBO&f76{%zj+K|GFrH@Sj&rQ?%otyRgW zNy5*Zltuo#WoCpZpq8~I8nyak8vtKhvC^#zgQh_5Pt;gyq%cR%RDJRX@FAD(*&0il zFu)Qv&9|!h5F_vbt&6prQTz$?>73m8w>4mcSE!xJ>+XG3sm`;KZ51IJ83Nq9W&zeJhfFSY_VRvp*7BL^QXRTYwVc>Fg+6$7XKzKv zmxRG%pepV!y}3Fw00vSe2pXH+=YTQlIbjQ?D|U%aV6U= zQ{}6VyHuzEj>3+sIapy5$folFeKfr#%)OY~^P~>T+QOVZtxR${W?z0P$`&-4cuPP(?r4FK4ML2`C z6Oz*iM!9QfrCf{;pT4zWi_N9%T8+)m>V3sZdVgB%rQVcLVy~Zx2&Y5M`jRL#7y*HA zhIiU{_x02+x&x zK@PpeD7V)}ff;#PLH0aqdP(CYx}4S0{ix?x23Dc?tTz3?VdWs;RKgA|=wxF7quFZb z8A!F-g)EHoQWbDEjIY>uaBCMGaOfMW@DaATERKWS5_&~vFu2&w|YTz%MR z;doIpxBz%z2x^}}-}FmgF<(~Tiq6Uw20hgj+RDa|>E^#XNI$Y+1#SGiut0Q;@Iqr{ zi=ex!MJB}p&FKQ`seRq!jfK$*UOXMQ3o76Zkf(qSusG0BdkE7vuLd)>d>oCsqPX^m zq`UTU>rF92Nqdx_JrcQcF0$T-XXwa=N6OC1$b$M*x>u7^mAcQn=|TU`)jU$y!&7o| zdHz`TWq!zqXMU0+Uz?o__r!Ew#SnDxXuI@PWDN_{9Ha6kV6g=R8)AhGLv)rQdNgZPmym>WepI6U4BE-NuW5WWcJ2=z{OKB-Y z;5m!Idx;e%N8eZ@Og2B!;tXj9n=rBdIN&jqSy(U(O+@$G>0%(-Ry7ytpeA`vA0s$rdXD@`^FXz7KjeVg9BFEZ#E690CNu55enn z3WpWdz*@K5iWx8vDWOyn`%+1*P7gxcfn|OL4kY%T`7B}9TCKcP%SOC81bRP2ool^W z*#cI*^K13Ux#Y5RzE{3Aa$DEiSin>$EtQPBSEPBt-Zo^&(`GzFdMO{T&LMK|2uOZI5}PM3f0pr| z^~gMR{$Iznf_m;NOtJsU-R(oZXlfh#C-ag+ytzAF>uS5yJr%6MOR+dRTqb>Ig_N%%kk)FPN8SoD{k69^ZdgrE{N5ME$e`8v zs!X-Isc5R2KY4MvcFe>mn0``YW7K*BiCikd>O<)+;aYgpdI#PRvmG|mycuMma2wz@6ElJ7pXOwO6IIfSNu{9eA{>VEhAk*>W~|K0n+iJXM=t^V4+D|?s{Pj5Gf%C1 z%qng)@{w|#ys0K@+y|tkq`aNIscLlJifTi&0Bq)NlClQ$wnz5x-fJXONr(DKVgqem zFpQ$5EqlNp;)UfXympv+V4VEMN_m!`jN>oX z{56{vu{(OADmhDGsAu-xLFuj9-^jIMDO!poLycg{`DB+9)UDVMXcDP}J+JT|4=NZ+ zhR^XPEH76yCoqo<06SJ!EWNoM}8^Hc9z>ph4oKVxV~THL1zh~|VpMzcu2(}GuH z5Nia-bX2XVS|Oo~a$u$X#bCkVet?HNGB0z0m*+}L{g#LoP!-Miz$D*JgKdopfgH| zD14dIOdwW_g_s)hE9>NH8|Bhd$Sp9h&#i4{pVHUL;1uYcu>Oye?h)jNVcyX7vd6N+QdQwnl+ru!qvawiHm=;VdMwh47&Uzt!~NM>L-86Y9;tc+vs5I#h&?T?=!5EbfzqLd2%>4mcYmX zUS0oSdw^PweTr)GXLOMkhotBtOAP>KzRe8b&Ur!{?7^pHp()=d0jI5@-yl38Sp-V0 z4#W%eL4=cOA#3)`tE?6UwRTa!KS-E;HR5}Td|ac{ zZl?td8P*pJzj898SX(#Pddl;DEmcv=8WxY<`7v8bD>YxoHqGq&y;qtN>8Xrq&>1yTXm;?zv%lEtGtUfnw*OJqj+y}!Siey zgLLWm#QUEN=qFXqE$fRkZ$zrz#q@}e2|izJAqm;VVwD&QSX7d9FR-NDV!JZjGDrPo z%W|@YCS|XS4;(fR3w72GN|TA*i4$?Q99u>QA&$dlMvC9AkzsjyQ>Atifu%nw6x}Cf znie<@GYmE@QIM2Qf4sHnoqO}@eXhSbd1Xg+q~Z3jR72&@sQeJ*yWe7>osPP-$W{!` z*jAdz#|w<)Eo>h6ITrftz2=Ho>Ol@(?04N&Nz)+QQdyKk-bh(mfYhgk0_;jQ@l~lS zyh}%#7t3+pgL{2A2{y-f6~fH;s|)8x_9q3I+jQ>-_dv}qXWjT^&0o>2Tb_V$_m_h= zY)7Ry;MYe#iX5$Fl4SU9ab@^#Ii&Zd(BrO8%1nP&QL$M~d1VNF{Z%Q$_q{%I$mind z0G^lH-cW6x0udX{TiIr4?IeB9w?P#J<;-GEbv-~bT5w27vr^Ft1YSD8_p3JRT0eWq zceRQEYSTKqeIV+%;RU=exrAt!_53tyC`RkL7egj}UQYBL2pgIf?#X{sWs=nXgP5Iv zGFb`vrj#4=W>L-W9=!AsD8v(j)v&-!e78A@3ro}7=!3IcaB3$(&;~vbZ&Rh!8gfHh zP54T~PLM&ZRx`e0I#%r~Wo01HaeX%5?Mwk1TA>;?;s(W{s`nEei^F5m+6>RMZjQUv zM39#y_ibm~QElcVb8BZeXJ=nhy(#{liyoD7@odT1y|$|~OToo^68pDNbUzv@PUCRNkXdBf zu6l}z_u)rdnf5E<6*uKCFDcGlVc6`x>&}j;l)qWi`&{NPAZyc)DvuLih60n!GM5SR5 zG{BXke%!zlvi{l1zK7d5zy|y0PcjHdpT5k1bW^14UtQpRil!3z2C+YoHN^JwzF7Yv znBjeX&~pP%&%}*zZ7?&+ZRo|VH(>;A+>i@fRGD$r&AK_ybgikK@1_6Pt}1opj!*z^ z8dAe+Ef<~t;x_dA3vN?p`(dk!hVpf`ChPa1%KHPP>dP5|;ugQZCjVUNrozLMa%>`w zP8Vw9mh$}toX7(rqTl{2(J=hj{>mnjMz6hYc&5b4+|cB7vWY)jML8WLy3-aRPs)os1sa(zj1>FE*Yih>0h{BO<(@qXdbQ>UGXi zqhJqBvtf^-c{3xzfVUnc*~_meTP+9rlD%;7pZ{@B)YSQF5gp!dHyg-+aXn!)?vtZ>Kasx^Tfwkd141=HvH&`Q_FSECxXrq-? zB79p;%7_Ji`1Q4$G7Lv$%VbO4hwk{>=_RfBD`WLqL21QW#79 zjZsU>xFie#OZ3fk8C#ck@Y30YSbdvu!IVIHkyuxdnimA%rLw2-VW1z1KFa(ZgsP}SoA!#IXflj(-2Wv)ZGx-~1&O;QL2kzHa{1+E{nc|lk$EA2#{-*}m z<1uw_%ihNZPg{$$g6xLA2SrItwhu{N9BfOJ?hgi*X9=d@Es0Dme{q=kZQ(Lqu!v_q zUTSeUgRchRDTy76t%y0=ON}kai|qn^9CjHZXuxa+9sI%=;oe(8+l2ZlBXZC8b1y>b zB3Z`SrRQ}9ozc&#?i$C&faHY$7<0EDjJUFgtZ%N4s6y)zX_jM%9!ptQguHIoDiPOB z0P1dDw`Ft!L3C-1$E$u;*B{&4XO&ax$gZQ-#H{!r$CqTs@E_9Riz36wX3SXs$X7?2GVbEAlj1kOh=YRt+c^Qvs4CK({1_xn`msZdG>JzAY>>ta%7f#&ojNNB|sI zgs@rbNzCHP_R&y$m*G9#(omB|PoKWfM-+hNS$67k*qN>Cc{?SUCgczqYcdg<4#v{7x z)=rzTcL2p&ZbyN zwFd;ECrifC7#C4fPH@H&8ZBQxM#VVkJhc;%y9gSr;x1kK8PvB@^i%>5PtT(yXh!Dx zGe!m#{vk{|VdG_)>iZf2we;u8x_j*tR$arP-!*CoJh#us;*b7pah^me(-#jv)`YjiU5lpJA}J1XYYf8(9%R^rV~&l=v7tiu^EDVPcI!G*=gsbcc&B9{c4F zO#%*rN}BY1gxjzTsE}>W!LZIIDETfSu*t}7v|@dZ_jtxl-x$z=?mnh5P zWbY{G-g}&+Vt>iw;U#kDybgKz)Oql!-f~h_^UrUuf?8vHXR>^jA7r55g0+tGkrLO$ z{_i=S-fe26jNa7w+69>1*IZPPGEzs+nNa||vm!g&kT84T=zVTwztBLwo~cbbcJ0RW zs6tDvkbOu7&XN?f`-zxHxMx(jF~g3f#?knJvb(cMu?H=6BUh}{+$tX#{ zYq*U&mp4Th35bmcnOBUx=7W~9xrnD*o)%}7jn2y3c@Vt)C66#O07dU@5j2(T0$oX>Gtyw!-msE3JHXgsiEK*^=vm=*O z=tp2|tce@Lx%+@-^wj0*)*_^urEE!aUlp?Z#1Y}Cjt@OsO%6VMBxpW?=qS^Pm zzFvyEcOgcOUZ{T`bj082VK;@lVzEYbsP&GAYfns;kN?qx-fUOByHUf3BDZFy^rpM< z=@*nLyLQy@6Tp93dPJ3pS8UQU`H|WM={|Il8s3d%MeWD9GLi4l1h55$|E`PFk z2w|a?@334LnU1r4KZjaoHgJVECmaPXW(A{op9YOEx#nk@c#+N*pO~%vHdIv7&(iJ5 zBCo{c=K~5=6lC`;L5DMi-*L(wGV56k4 zseN>9*WxFp76*};bcB^b-Up_>O~q>&KAo_c;=ZKaL=sg3kh-Tha)8VweIZSwaXuN@*pnP>?*~g6!6!E zdwl4J!Xx{#hHqi6#!^ciRwJL*7gW|P=@dDdj640rOBZ#}tsU8^Csk`bk@6LsR0AUF9Uxu)`4v$=_*;w_Wbo^X~}e75NpctCK0{u`QVFk7^j6;Bb*C zpN`nnDU-{P#d*1t*R}U>ZbEnRP-pqI!Lr|vVTZ1U`RRH~-k2Bq*TmwPsrYrjIvL9^ zes@mSt<8{g$Y46tULX>6l4a1%2DFd>SmLZ95PQ4=_y25W!+%~8@|Ewsm&N@WS)nfq zr%+=jB(z##(7vhJ(vu!3%D4&Xpb69|yRwcaWhz?AjNy9E_iW~VP4KTrHB5_)F1Th0 zxqD`#qTKORz(cG*kNnfM_PDVggWed!#U{9Y8(*ZZN9N^@uc?|Q(gplI^B>+? z+>OlfNEb;Ff;60H{J6TztPY+_;x&mpT8wx-a}+DHy#HZP@~q@% zEkpunMS9S&;7t=>sP1+XFY9{P&Dwjv4fqtwEIP^iRHF8+@1{-?b{jBsY85*tzdAI4 z)Q3uj2q9^a>Ki~L`1j%Kl47qMcYLE+Npc!#q1f;_;fh#Scz=(~Odq?`d_750v@{tb zt?lR3s9G_r2lJRw0pqzUvZNSkGQdnnpDEW_ytZ#+HUL(JSVFLuL56|+m>97Zrqekf zhsx+lm8x`8FJsp_K-EHC{G(}O447~(iuoHvre60AMJs}t^CZmX;<+uwX#*f3>uGAY z-d4T>1mhpD`@Q2Al{|>F%3T0qu6|Q*b${mdqUL0ppenf3x_nG^h@)x-IeB0TRy4nS zGxo;W30J)qzTJi8)m{dxZ!#z!TD+uqGgS(Bb5IX|7X1l6IcZ;l^W5lQWbn-pe~vb-f$a+$HB^V%Hj) ztb%z8sWduAmO3^GBW=_rG{QJo<7$ME(K>PmXvx@E(h{DiAW^r(hSo)w%yAm0FI7z# zxn!BjK|KWP3m{_&53&&|t7H)PVYEqA`nkO-BCmBn;~TfTw{0d>p~k?f|F~gQ(Ktw! zswV8knCNs@>N&^$oCl?*!nMd{Z z=aVo~v%~P@dsdx}@P`TF+)hDDTw0Zd-L^S841KDD7C#*P`nbBFWTjSmmjzmUQjk+ zmD;O2Vpx=(q7yjP%`ZF>LvPywEnmq=k_FIb6?m{V@w#gqn{YIqJXhl9qK<_2g!HgsYK>`= zt$XBaHGRJpjGWgYCsS$OBr#34sQ#}SfP+$^4m6{WnZuomBpgoM95>oKY6PT7^oLMDZeHZ@jr);D=gKGD@pG?2Z2^N#v`V<4YeC zuBq-*#_uYAXq+m5>v4Zdb=c+q5X48i%I6b19PQhZp;$lD3xq)*zGfIF^geLaq-SB( zvY-c%_q;)vJ>m}~^00>gff`@`JWjaccgL4Ro;dYyKeH`nE}=>e&y9j1*;?3|4IJ{FQ1WW@bLSd2hr+^2DsR5r6(WbgH7PmyOoV2% zD>jh7^j1pT98=zoB;PEAtTh(Rbs#}s#tE+Zn*bLctyxloZX)=f8^05Pj2gVBajqpf5>^OVqdFo?7uK-EDX=AqOR zUeF&;o)P~H{Mk2%^tqJ{;2G@WrI{uKjHuk>wzrOKa=I<+O5%R$+Y|m$jhpPC!!Tb~ zpvMr3dc2qaz3f5d@BS(!I5Ucc&o- z@)723Yl13wvg8rf#&admizu19NdKsuLnB>Zd2?8`<{nLf9)RIqru1F@si{&LC-m&= z;J7CH8Fn5F^v7dYOkNq$+6N5}Ift#%8ibn`&S6_zMfER~Y~!&BN7i>oyiZ)+XB(B`dnG$hYE(C4scYVfR2D4->?j^pjw6pl0gy0 zDgO+c*=pxytyg|J1>N_)@W$}>o%?{#N? zX|l(94`$uTx9n`Xz!TpKF{XSY!Otifc45xE(6ZpTpe63#p`%f~E$yvUz9_Qic|wPB z#AEw%vZwp$rv0?mY&B>bYq)x9d)?RczD}4<%yH*%;c6#mYKLQ`FY;Qq$Pdd)e=vHp z45c%x=vh~yH8gALB=(QUWXm9B9p1gf#T6bG>m!X%LFPwQPN>OnKRmXVH#T+tIZyVr z9;|@nc51c+PG?tH)Y*n{F6zvGYd0;}yNSo?m88>m>ymV|Bid3m=bb-f>Ue zDgAAtr`^XJN%p)&2{(XL-sDm7;KF8CK>fLwu*RWDso~3k>$i3Y!!(9{Bj$EMAv9(s3KG7yJyp-yKT#1p9iiYN9mpgbLuGa?Z z_QG~7j*>q(MFjMhqBJJF*xX*-*l+&5SW$gwQD;K5ycaNr3HTwgc!Kh3(Rp|J2#;E; zqc2%_(Qy(Jpc1_UyT6ZYIR(l0Gq|Q+|6v85&SYy~Wd2Q9LOIVcgIN#prW<*$#Djsp zB8||J0Er1+lRI%z-fy@gy622ujKIcZcR!V>vsK)$+Jdv0lM?c;KW4xCE4Fx`%CYfU zywZY0z2G0C$F1|xoK2`_4rSIe8}F%&9AoTq(-@MSYu=Y6!-y~CcYd~_RGY4Q=gAG? zlctsrhGrqk1-uj07e}Xin{UX{!c@aAuJ*FzAA5+yI_IOfhy(+Z#XJ5KYovUj#{^2n z3?%Phy-~jdj#XASii{n<{CdEUD+|zO6bFa51b?||AL;i$OR<;ndF^N&Oc;~0%UI7U z*1SZfDT%6VHni#^V688p9w`dRdG=E%HbmVC0oK#dKZD(KQ}-+x7`H-!KRDxC!=#)< z5*)$rCFh*jJ@V4}n#cXiua6M;90EbISx z1jHyxhn4)AtVM^H^S&%N`6@Enp>zy-hA-9x}5dfXOPwa>O)2s}O_1-)GC}>i+F4nEX>DF5!+H%r^-11H@(38-8$i^-?IH`D&zcfPMdx)ni-P1YNQ6=P78R2lS_?L z563CR%EJGoPg^&gwFxG^k$*Zjq@6xp{A;~*SX23U&L@jMNc`QDI>ClOM*bq=~ZIf1HcN3sD4cNx6*;H_T za_PYn03E4@&K8DVe7klq*y3Oh9~@I?ChD_?)9ixA=Y9%SJ4W0VraOJh=5c^Jhb!!! ze_MAg>bwY0%Pitum-*=W1oFN2@C&D}Gx42nA6v@4+;1qdDPze8X^`c)cfL^OH580x zpejg*vh?dopF4&9HfSbCJR8Wr+Y_qQgh?6l5!uK4c+(M02E8L2alK{kaS{-YiOsxe_=H+bRkn zYl(U`r4CxI2z?|0Ut-}cF3QkeMiwP#OErVlejD`5YTbqswhMnr%FFM~!Q8Oo4=}V2H`SzMb+{>QHo|>@;PUMlv?zHh$l&KuT6=aNn_fY#U`~2#5#UCJ% zXuEL1*GnvER$kJ73j;cgU&-RyOb_Eqk_nM5vT;&OQ|Z~qC))|GTrPLbZJrO?g^zOJ_@xgV$%Iozs^0kv~F4bx#XR2&>i0++#o4%8mQgfoB=a zjZXB#oM^a>24lx3F<16w|IBhQUty0d9c+7)ipy=rEWKybVj8oyIqKz%VQ1&Hux=Uj zWmw$I*B+oA7wyIbRQ=0#8QW%Y1QzVtur~{c4O?3vx1G!FBWhqwW0T6K`KQ(uip}6| zjzI5U)Q=-#Zmn{gElY*OWi3q5Fx0Vd%;aUW!NqqeSQpa`n)Jr>uPj3QVb9zwLs%kT zFJ_k$oRN$I<0(|OQ)X6lAA;^*Z_~ zqgzL)VS6vQm>B@fK#UXs#*;hll9h_)JPfZKx|M&Z$fuyx4b8NEjVMA|rlu9mscwLy zfB9P!MvW^JPB}ZQP#m&8T&w~Yc&BVprTR3Ey6srdv$8kXn$LZ1YX^DfiCh6HVh=@umclTg;u9I>!-j*;`baRO zKH|s#p;2~FcjT-HAPwWS8b_pw+b=X`x7;jC;H=k%l}if)xwRfGs*jG=7P$>QkNrfi zYZnaRatLsbB9G?nxU++I%HYcLQRntp%M;_ZKjgXwY3^@wDmdn4kSfBOne{gxZ_ikh9oe$f7rq*KUuKQ)O&qi1xz&y>L66~1T% zOIof%?hh}zsaA_pV(GD;)m-i&RsnYoMUsqGP=Ar; z$aHY_Q`eUq*=Vc}=!-9i)>3cn^c7_{l%}Ems9U9$6ntb2w!6*>6x3wJ>g&E0zzpwO z$n~r0j#o9oVKo8j2#Va%dgsT`J^e?ex>vz=PZJ8r3mk|EE?zz;z`NfpOg3Z49ih3! zn~JqY$DQo4A2*plIF#n-P_M571V{ZH>cyVEE7(chR?!@d0D1tzi~q2hGzbBO{M=D* za6>#oauIk5%q8AFDJd#3yA<+|>>~*jcD}+yorX2KHH?bX&w*Mlo&aoqfT>G&RmSVV z#+$5jgn<-2qv6o>vSJGZpTixu`biC#6dabrvi*jn&`B9*PWWTK>40l=AfihW(V960wCRH~ODoX?eqw`_6AR%IX4y7A=KdMi)Zgd+y$c_)Y=yXTtepz=Z6tCz}!2j{;5dDPDVnYFq` zDbsVqmDM2ju|;R{F3#~MZYEgi?<=#D)4aP`e(AQ|w*FnF8qk!mENxp(j#0+%J`fcRe++nl$19Dg6H277M=UXA)byy}m0H9~*s}mNo5{Wg>`4?KHu@^6yC@v32nJ?oQ8j zPeVW3n<(eSa(9dRH%Wj((wGIR;&*ZUMHH)>_y}VNe_HxcU-=9;Ns?iX{JdA)l{1jR zxF7n~F@WPVWSiA60H*UUKWSTPMguHU@>>v+JHV&JGY78<;VfufNxjYym11SI_W&AVpoJ#H}M2-arIv*IV- z4l5&!JdS6)`-Mj{&@;PMgA08r7H-e2JSSDc44`N@=0@%9-eg<&nJf4BHu^&fLrA-a z!$e=U@v_XdJ=FJwmsJ{BmZ;Ar=+g@Eu$E_{OC3_l!u-MWx)$&bKD_G?-gjA+I8Cb| zui$vyCk@@%XEegTehBe1z5fvCy?;BY{|lksdq0;7MCFMv1T!^$wP2=9%R1sf zpMoXO*udA^2ShcUGUFrwbL8LVo?LStI4k~{d%UqzMBhSh$!ZG?0Gi1`=Rk8_8pvic zqLU)W4vgO_Y%GKSB{8B)s zu^zuET3YXHVCtWGes)&#bK-ockNt2^;3wGj+-)p*c6?U$!)k$z-ecaWaY_oK+xFEm zE!^75T-~WD@LGdmqxIwm#g`>#wu*d^^kO3;ylk+JdWN zkH5xj--uZIASlkb@>6E09saDxUw zl`A|%m|6zAQs*SDoIV32V@w!-nEdP0IJ?V&>;rxt$J+ADRCzLb-?8YU-EG77!OBi4S(!~1zm-q0*=O2UHG$haILU`_Ku*whFRK)~i*#WOZ<1tnF$HZ|9SCiZ!A^BSQ`Ch3LVtO7VyQg5C5AkbY`9>a)H zB?`O*ZU>03^5^2|>PnTexr-W})xPbMxx1e@KOVQ%)OEIus8Rw^hxdA7&d|bg%ZAYah$Qj*8rN2Kou;y2YH(l9zT|oCmfHY5shzsmu!C=a zE*sUg?wxu>wAFgnpSscdo|>ciH&5`UiMK$z!;!1wet3U2Fo$WH>F26a{>$tKiwoHz z?HD8U&>r=5;eA10-i>-Cxj<<;gs}f5+^5u!1hT%{GyZyBL90+tQhAW5ZqRg1)@Si( zMYQyVM>?VClXF8zz~uFY(Vwv&E|KjHImwGE#|2m8A_wa%HEQyMn#yGisy=uv+C zd)*5&DO6lVue+vw6HnLS`zm&K!H&?*@XYZJ9!I9>;JMTs%hJJ(rvSN>H8}-9AoxD| zXY@$GDL*^=8Qba<rx4trlLmI+6|tHgJp z!jWxE`Y|w(rW4@q_~`oScTlqcnveiH+&}wF1RdRbS%Pi?OomI{OW{ zM4&7s?V?tof;}9%gdn;%pWWuShA+Uoc!c>I!<4C4%XZ)1Y`+cO z5ot@hZQgKuX3&f7fZXHF!Wgr(yt0X~j5v6UGnj5y16(2&cph&s(rfWcrp28zu;B_# zV6Pu5FsSYr*Q~S4KNo!h@eZ)!8>M0SZ;!&?{scQ9z9H49Yy+dHoC#UHZZAC zTK32<^~ee)z9-r_zfZo7B4^WzB%f}Px<1r;aT=VLaVT4Ec*e;ienh!m>nHh}!29e0 zweM?RgA9S58fmJZJ9k_4BX8Sbx0ZqaD{m#CGFPo~`QR(8viq`uEyBN@d!S#MY~0htD|f2i4_q}y${J8Q@Hw6n5}iIXtv*|V0r3>w2ilY~g#rw2gJOjeAECV>7qhctR|6nfd1w#_(m^=*R{ z^w%)SyX+CA`HxP3av^=vn)BIp1HPwm=PMhE{^vt9yG#W#mt;@q7hX-%dH6p2vY(UG znOm$t2Q22mRLDSoJQfV_+5zC9bWn+6xnWkzsn6Bs#`kw_$L;|&3Eb|BYWMKw0bS^E z!-_BZOJ>`#Z7YR}6@19-Jbjo#rMl(nA!dHO-|cP0QTm5B_;_Eg{cE|@{w{9Hua2e* zxww|fqBv_X^&uT;WB)sRqaNs$25O1k=_=@PLj_k3od#T^r^Sp=_b$(AX zlfq^-H)>wa#lRurc>eny-b>!h+mb1s_;mU(czZUbEH^UetYFXs3n2lWE1psbJ6^?KlJ1ApLbgsS9^H#Hu$S37@7^Y3bXzsQ*=>8@ZK zMoYtkUy#aN1NZxGl?2L~}pW5sDS=o2^qF;2_$3^s9QqR)7lNDU4iH!Tt z13I-ah+z8Smrn~2r>}A`I-GhdO@ci4IuCwCXVab+%lug^AqSbN-7+i{0+ zd1CALt^9;`1l4B%COH19X7((Bx+<+jA;q9mK9W#CJr;8w_^6zyhLr- zT`HY;TnRY{p~{c~KL=#TK;E|L#nqbC<0PdDTC^{#Ym%Ngxc!;zPJO1V+U2qk{P!I6 z#hXm0svMGcn;Ay_s(zf8n<_OLN+v2G=6k_5stM$djzdnFd03Y%R(!zC+g;pB2m!*h zo76b+spaWWqy=~X5v#at$Y~iY`?j@-)E!>Tn{Lmh?^jx(F*7z3_(l+ly>XtV{fYm)3|P_ z78c5g0$R0PN7)?<6Y{8FP<41&f*8sMQ4RWIl<(dAkjpFlw8w{3sQRz~(7K-qqPYEy zN=X-E{T;BIShitG{`1k7<}vHQ8Wwc^^)dUoegfM2iqfaEN?AmnK>9h$8FJ{eCb`l~PB?1DBD2R_sxxd|ejxk>3S6lzFb!0JDOx} zq{h=HDs8?9v!CsP#KeizfL`GE5Q*lL&;u{u0kL%7Pg?q&21&X_MLN@Z#S6?4Yjf&7 z&Ol9{Y>Ajp^a*F_xA^C&D09N)%M^|fis)!i#B)(`L5Y_!Po8Wr^^ArsqOh{PxXa&r z@~XPm+<%UJLg16owwKh5+dC%p(-iwX+_z)w<2^JTHbcAq4PKuZe$Vo@@5rM2G~^KT zMUKkdMc&9MgCa^VJHXU4FL4vT8NA`!gV5B6l{b+pn^b}Ad{Ti*Ppj6(f=U7(6H=$8 zM0zK)xfI2$EZ31n#_nH%JbE9Ob9}R*HVFcU{t4TR@~5N-bs%g@WwrXctpb(-ZW$-~ zR2IcE)7SiI!4`f7`Y_*ttnRYXl3Zn zw6fWsV`#jxXD;qGC?`-$%=mPo02tstGUlx|v}Cx7;O*|eskec|ALPMsc==(0kK>R4 zC7kN$89E!g({DWNnUM%4jBmudYa%Z z;;zQk{{g)?d=8YF@L(ya#-vnrp`DxBea_O_U>e+HQHmx|YD zEDp$7LkWGf3JXK#EK6n}C0p!v85{ixLXmW=>CB^@!rTON4<+7tVd^Ac>CmAb<@e_#wQkT!=-vH^`nGF$Vr#V zanr7@0kzgAxD13Hp9TcsCvC21R3+m)3U_m;VVC2~l6-%zAY`q-sAXqV<0{KU zE2dkH-!ncGz`Oa(2*?XyNwBAlihoqnYv?X#eElTDHCKz(9K^w+ZKlTM}ywHC*)5-N5t380_)hSo;5{sXA~5mO%$!1$t4FZ)m63 ze>2`}%4C6Y?q2>3GCSZXx%I@lhBLp+O$k@+~Z(zxioQ$|6}^ftHyIn#-7lB zmims1Ftp$XYvd`|6k4D2QL|9^h3C4L`#99>Ttv47@#tMCfzj)PsfzWRq^ohhP<^vy zd2~2i0f|hrW>$vHLxK2<$P4ZjwBvBpo9C=)N2GU!s!u}C<1=?Ot&%c*^3&#$?Cq1O zMW4FupXN1U{>T9Y)mk#IJ$oJaos!Ee`6A!o{NLT~zYy8A|JgD1e;h{+#W{5vxPo*u zKq>A+r#5^k29dIgoh!6=$flMsI@*T{K6scoz-Lt$i+ie&!(d%Om{`6gi;T(jU^7DA zG2ByUDG{{bJLCs&ZAPzulh8lEs7oFiD5fWf73M7ZtUk?{uPA37vYFB?WZoVmzneQq z+~bqG?y(koKg}xbh0lF#Zhhmo{=^pzT_st6*82CrhOcp0v4vsAZlv0a!Vs)Cb>uv4 ztW)%&dRpDIn|zYfZ&E*tY%MezCafXm`C*M-9*W`dk%>~Hp(jNZKv666JQM(XprWTN z4kjml%6Lc*Wbj>?KI1a@Dh$I9*gr}umi|17SO2;!WhGwFczuiv^Zk^y=4=;)rbSLJ z#93HbJo?p3k;Zt`fAgd3_Wse=8UOcaCS;d1&v`)%wZzm~4r}%JzL7a22Q6AEy{&ik z-vnanqGxj32R-{)le_7j$+hNsk|G~-Rk)Nag2GQ4l`JlYMyH>fUk(ZAZgT{AC?#~A zn^+$7Aa0?LpBy5~w7YI5eAoVTi^JgB>6%uz?Z*BfuMWkF)`*+b?`ATnCX%EIfc+l0 z97}M*D$I))h)kwRr4nmK*MjXD(bI6DFu&}u?T&|Me;!1lk+fQ|(bSc#aaxoHToH|rOeatc#Hq@6!B@wr zeHDW8yBXShOmsuehugsf(Uo5>o_AaXX)4ja;yji~mFeCbAOY+UJzIOt0Fzj)4=qfD z4W>NALRAg5aHA!7t4L52+}3OS*Bj`H@rzXG(vs7r?@81W%BPBilsL&k?kW(AL3s`{ z=dzZ6I3VME8N*JM#$#ETRXtNihu%O}K6pPGa!w1GmX#KGOXhSy1 z-8m|)E~cm=scFwMjfTMP-?`IzMFSh({I0#d;s8TkN^BQ>zo~Ay5qYru=lbc=@XkSz z2y1ie`5$AfXH%ZcHJfJl?N5oQek6m3>!*@;zXlKO@)n7%jA!U6yS1=T!1sSWG#|et z&hyYMIt)tYh~JDA81%@oYw`lo`5X9q6dFQGlH$MDMl{Id|AmTFRzK)Q{oeWUZ_uIO z&H``@!naELFebL+`%g7ns_Bu(vf9!Bv;J83ASk^?)<#P34*07_k78kL! z*JuFxv6V+;oPtT(i)kc=t!3WziUr_moUZz<4m=c38wVIX#9=`X(gQB`0iK%Xi!w|y z-aarSv{7K$vEk(5ItGYH0D=iN3C$YQECsp^gG$!iPGn2I<(39V&rr7{x_&0*mJp5) z3806}JoC}dJG%tC>bm|I_yUZ=Nv#4l&^D?li|H{A+-ED#ZQAB?y^8;%JSjUnO+r)c z9q;rURuzVx&IpsneSqCjFO!|hWvqDh@t|4^G>h1B*f!<#B}+-Q5||cd`K}lo8sPb{ z*X6|RtMDu0%x!x3LU^RanelgD-ILG_`8EFRvxct*5i5YIjEq17)4O}zU46@B%lBWf zof3;I)Fh4w1Ew?`!3${v_jI7&hr2AG$n{af*(yi49$u z>i&Mzj|YBjRvYHIt3-Yf$SooIn}mTA)Bxj(d?{gb{gGd1!~O-HwR!t7ISXskxML84_k^c#SlJkQ8IqEY5cUzdLMfVQ!uC z#ORKa3vIDRP9aw=ll?-;_5EkWmWzcBM>p`~!UOVS=zvU9#;Pg5dT_($E?t7n;eGIL z>)ssL6`|Km!FJ4(Fqu?`NMn}u?@_=HTikE9kpyuaYf8X~jMe+NA`!tuk0N#fmUc5@ z&1&V{0S0RXJx6<;T)~&^7u-SbW|0zeQG_GUW%e;)*F64BP$4#^!%Tz^5FRQXNYQo<5d0@ zL3uH_{9CsOAQZNVxS1vw0ra>1R-$TO8$HXLEMXS^1#2>Qiya^5H7M7@A+xjC{Sf{& z@uIhi8V_GTOlj1$Z|OI0HTtgp^Bw5~Nq+^T5loC{Hig)cE^h~R0+cKA!I)PsWW#8K zOq@UXH{`5tzcLy>ogAndPzSH+uBFv~%Fy?CnWX$@z^r5&pBN#>W1sc8$Oj5}@T-oV z00OctF$BN@Q0TJRTId3$o2h%rHfP;Lu|5pp;du1OpOad{rOL90;eQ4tscg97DhdTu zE4~(esA&SnU2uzHvNJND7G^_V&QqP^#uaQaBqQNzxxfI1iYOd`vp53)0=WZ|5jtag ziHYT&gWer=2@@AU{Y?4g6zS_wPv9y;6Hjo{7_^?;b4`!*eN2qY$G?X1G6n|1RA|2f zX5%Y7t(QZL;;0i`E?rvx)yO6iHz$EzK;cp5$k$jmVl{Kc+-)XR+%jqbThH zrHU9kef>$7&%ZIlsMj~@>QQ>I_9?k5)oc7Q@Gkxml4#i{2>bTu(r+SNrgu} zmu%nop%4*Duf9q9Lr8MpRT(0IHV7Y@(04_EdReSNUx!;lwUz+&h~gJ0*oyrB&Ov&G z2GMC<>nQ-C^4HWkJ^wh5tOqs~#H6c~8aW~gA_|tWj7CL_kwkFI!hhEj7^ATf-gyr? zOi}oChvDtQS5nbCt0ZS_o%Yv{iJ1cdM@E+R@Q$~1^Rwim!6LX;1|S&EmG1bo2>iRi zxPc`m!OW=CKwx@S0e}*+>2OpPn)(7`og}^Q3Rw#x)lUex*JqVX+)&EL0UQnMM`2skPZb2>F(|hDd~2Ap*sfV?(zTL z?|$!Em$hawan3$xKk<9w?EO4Lxfim#Oa`%!TxOM@hecnhQ%pa!ijGq2#YgjZT?#-8 zan>i_a<#cd;U0VT-C0F)uL5OsHw-~cbkiOUblVVR;<$HK07NpJ(0O4InWkLjK|Fm> ze^Jf7XLX4p*6%RkCzAqwEw<8smjGQpv_;f~F@F%=CrwhRpo<37nI>e+*!XY7!X?n* zj^@bPNqvlS&2Bb;*~u9kcNiygnMH5u%-H6u=~+BJ$*EFTd~d3={M8Kk*CAtgq0v!m zTgb1m;%b<#>~Y~X^ch=h5xedCHhbwm72jo0x=(c7OU92WF4NvDAz67{*<6)@7UC&D zaZYymac4!}8B$(09cP(5T6n!a7O(nESy^52xb1IHw6D>Vnh>4X?6)6YD@AJ-t4Whz zT-w7eb!23IR$6qcqSyawRWt{ncRn=5K%Loepnfs4I&;<4HD9{>Nn#Z(Z(oPfq9?am_DbbN$bwC0tl)dDs+!#iO#(-RL@*24L?p ziN3DU^U7+Mr9OGg<07^7kyn}i!}kY_edrZ}>IbYw7G%#GRX&mMs**5&o;$x^OTw$T zyA|=tm)82WtV=d&Qdv8}^J!LC*uT@0fPfsLyI8$EYK!7JJYH*hh4TNJc}LdaOSwWP zzJ*lw_qhkKaB%FxbuKDerx%l1VfU5BJz3^G>F3X7V*UT6pT#a1VO*zgTo#=eqLmj| z|1o!z)TGzF?t4eiwe{x`b1}3K1-1W6Ew2DVf%+L8P34^cpuzHdwtX9mqFczkRkAKp z+4BM6=Gt!1pfCv6F>bMSgdFQGk4NFXLR?UxiN-IuY25rw65&rbxhv(-mr+rMxWnHRb1^RA{%K*-hZNUa!qPv>8kb&nu zPgye3T1nF;9w?MUiOwmg1#H%y=+${XvGf-p$&`yYjrDnw(_7QQc5^bPp}&@JQL{6or&j!2V$KaA1z}cPWJ#z^)yVw$81rH0p3tu(9}wU>T}f0g zm2`!ePJdmm$=Snz1c1^)V)I||mjzqz@-m{NFH2K>*T zU!YLXtIvbADe6a{Q8zY;RIKJJTt06Id^zSLh~`Jq$7E}okX6f*Vnyd_r(-vTJFkH+%g1es~9F}xHn$Dk}! zf(Ej`Af^FQ;LT@p+tZEM!zdr&UB6tRD*O2;I7(u!7mA$r*XNXqwJ> zhag_$q{>3^?aD&4)cRbJK@N-e@mBDpeex~HWPxGGC=<&vV%SPVq&sz--YRX3Sf1Z; zd(HP?)5CKw^+_%`{Kk9T%kyShE7g~g@iXTrUjpG{&0w^adKVa0QgabeZ*_DL&^TY9 z45EB?o5fn2yS8+-n_-Fk)K;lJ+47MBdUKl&>d+C6@65O}b2ZrH=i0 zIg_#AMJK;v2bC*Jj^w3F!+CK(4x_UB@$O>Ssl$?(h$(x}ffcb7H;ei^b04^VkI)dJ zyS-3J6T_m#)^>iz^1c0l&S~WdYtQjde7a-YCY0a}#gOoYCG#9jd?1koC99jb zI=O}dDd=h9^5^pEtx_sKNL1Zax{CLStn=+pz!!UhV?&Yz96!g&3!cULp>}BT>5$&r zalZOnjDJ3_vsn;-dweKq_IVAThWB=Pb2?XecqJZ}7@pLC&L>$saxn|HEppRkUqtb2 zh=4;V8A>mb)5@cx=gg=j5OyZpsX(SL0h!2S2nAANy0xa7k|20NGMxBI%fN?tYoa(X z-pH3`uaOUPj0O6+`--5Wu9C+2w~;6WGPLPU?Y=t~>5tlg*~Cb7R`jN?Tv!=(CQTql z>LT4H$DmS3Tzi=9Cc6UYvTBLm3EnAFrzfQnSY1x?OzfDUFl_AYE$HVmdO%XVs=I7i<)O2FE%2|*D8LF%0Xd# zhwLd+N5*3}etbeA1%V(7yC;MX)=1RKOIY0BEq>5h96a<*+5PPhzZAhIR=Z^-cH*~J zr>Ub)Eox0EnQ(qDG#cd%mckw$t`UK1)a^v&3bFeT zZjV!Yk3ZDNN$h5+T^;9z7p8bWeo}IR7cxsrd z{*~Vi5gzyU`c$byVI{0f#UFchF*#JlK&3s&2r8SN?C5$~I#H;H-RQUz2^RE&rA3AM zK{%_dCT*SwrC)V!h^5Ok38%H_LQnvlIqRmO2)-1-nF>l{$87J?vKwwk zku^tAP~(G)^&xE{NpCJt*(_{9=!OpBG{!NNc|B@xdUh}fSWXLA{ur`U;3~Fy%qMEP z+NHeVG&g#_9m6$>+Weqm1Q|IiTF5m*JplPvoI>5|XFzyMty@(+5r9s@i=u{rw^ZwW z-=s}Ul=*F49vjjhKh0K3i2`80JVSFsRA}05c9JJ>zTIqOIv!eDdNAB_(s&bmV3xDg z5d)JQY@^n0v?X9sO^A9zk|X9SjF{tdI`y*ZfVDQrQr;XU4}m%~9YQ=N+oUNAwM>&m z1~4(lMuuVWv%Ay+lH;2g5KhT6l+$Fb)pz;feCLB&6n4ih-;^OV%Py+fv`@y)_i7qm zCFb)3%vcR@>fKBYRe3Y&R$w{<7KHL}3+lAGIBpj8ryD+ZRELkSt5bJsj}MPVHwT)(TbdBqH@-vl4=eJRFWISF+k2eKG-6>d7tPY&fslTO zR4+I)Z3zh9^;n!Ff^d7cIVn*Jk>#X2^G+7cFU6)ixnS$NcVgx)E%uVC%|HeCL zO0E{C)zbIFNvgEQg`7Jtb9r8!@Mu@Gc(-#!rg7u*W&3~p3mOGoV_|omE{fw*o$In^ zLReFL@rRnv+4*gK?=D4Lh)x#IZXCN#N%>@2AS`pWf87?e2R(vSuJ7zcr9dDxCs8!O zAREm2&9;}q+g{Ag4vVtD&aPlN46_HU41su@k|ZIWT}YGD7j^?DZ+8z^>CoTdg$PJe zqV=Ma@}SEH=mmwU6lDJm>Z;U!mcjG*!;Om0QJnI@2#JTu`0U>5d^CwO@|C>L<(0|M ziw0y{^3Yt`Hk6_1+L92=?IY7{RZG;4*uezF;&Rr9gYumPD%Aa80;&(cVkG6##k{o{ z!Vol9p>uSlu%1qbS&N-0Te?N7G0FCX=fnU+3iemG-F~JO_9k0-EeTJ*707H+m_GV zd(5bJb{xneok~It)@uq4R_MyHNj|W@SPjQ_<(egk%@z_P^ltp=RK(Y<6R|pm9)lu4 zMU4l%_zb*#Tjh|NRR*C9OA|Nb>Yl3T#i4*~Gpj>)+Pu%cr_|Mjs-LXc2MGrSixdU84^7Gdn8VbdyjVZwnpzDT}2ZVO{g58#r# zz7OpDXY_y8G~e4dldIH_XQ`rl{A>J>e70;PPV{sqCt}nd6K7C`u>2of!9-*B_j2coHAkiVo~*iXS&m&^TxuF zF5uqWui~li^bQ;I?X#-=mI()~@}3s^`P$76804siJIaLBMXDxtE}mvcZXbFe)d4fW zFC3;5!hi%5_>;9`=}qOA^uHU_qyIpZ;~!xXxFeL&0$Qnr9C1kw$H3i>b|gkK++3At zg)rN(nxiZf<5tVqxa8tphaeE8^uve#2@(u;Z?CC=oONhl$e)`;Y3|;H&b`W^h0%B$ zgfNH4FK0b(-@ox8QExW!JAQv!pS4M>yg!LxI@rzS0rk80^c=fd322rgrxx43Qv@5Y z=S|dHI%@sUM8rV?ninT12x!K;eayN{M)0IdJP%$U*Imfv&_nX*JRkIZV+(oCh2OgN zN`u=3`RLtT32{!kf1cf=rTuoA)hkCUjMC055>-h;Bi~a2G?F%*Z`-AK9y*@`=B6Mq z@^!A8#5XjRQpMXRH1soBLVkdXsAwbx49^GN9ocbRRy}Kub4+`QIp6^}bl}pR5b}L^ z(Ffe#UrH%=Ui7GOoH|kc#dUYAQtjx7X4ShZT91h&yZQqS+q(#ooz^GfGi2Ei5dq*v z$fwTguoUBwL|jDv1gqUD&jAMgu-Ze2`|*op5HI+f@pm=Zafr@&A+FDnF~ueCdtLN> zcTpmE3a`_f&t$H#PPqNIN%14+t-OyLs5x|X!qcbT?*+$*(!+>y{63-``1o|cKox_V zkBaEJdlBJ^RoU|VU9*l2;m&)yXTL~Pb_3`oP(=N4NFr(M<_|b#QqRzE+qE#+ZL3=$ zdK=of#mH{ZF!#%Gd`(T?r}5-=pF^{Ad$#uV8&JS6Ol)^&hia<-y1L<8f*SCEsu^1?4#Glcoq|9Z39rSlDdPxb|v-*25^d=C%n-4ae*d=(A+x- z*4r(9M2k^zg`l}i%`Zy9a}H$9l9j&uI;QYZ%9ws;2POxnj+tSkyMvi*^$l50B=VdEHvyI?4ibg zz7SKMoO+T1cjZK=n;`_^w0mJ?+2gIZW#Ph{7W&oyIde}cYCFhXzOt+1 zEC*bG7;SQDwm%nv-VnN!v6pkBbgXGE_~0BL;NIRxW91yDkf^e?}sveA1aFtk2h@!`6IzJYJd)P(y z;VL$y18`R_^3@SP?%1Ie*~N^YJ-fZTGd1fPr*2Y6{io4~3w)ws>S_!iUd75-B=K{e zd$p6A0)RG$ozuW=N4B&)cT(8G?rouLOnYIFB8VMQUS}zwvxvNQvy+8Gdpj_P5GoC+ zj(lmO&R86c{jHIy{cDeMr*WQ1yuNVG`nzOonxOKqcrfsKTVlf)mPWDZrGYnOAmN?r zd58mCreU6qi-!rk2N(^a$8G>*rQiJ0?d(lFXvJ5(Mtb3m{I2|B?Akmo+1S6CAa;d) z4E2TpSLw4lQ@3$n2hm9Od^Cvu1kun7j5;NN&(Kk(?xnymjf0+R*mCt^RgVK*2(9fk z^YuhLI`Yj~nU6N(-km=r{vOmc)I@s+gJvV-hREqO)s3$s`b5D1jE%fTQw4PkK8{xZZfOdd2Se3g2 zppBsnmc!jRIkeai;5M+no2?@N<#eO`WQIgZ`t;~gq53&PIc7rz4Ex(-7~EcMZz8C9 zuwqz!1FCjlpb}waYAJl+@)ii{I&;!}|Hjs87V45Uvm1USc5Dm;?(lN7KWuq6aWPXa zatoAgW!9~F_u8DMh zo;pGZNinaFZtNfg!s5&Ji&&Ok>{tua;PKs{IlrkF5#CCuDiSgh;6A_jk-+Qxlzhl& z?RdQk#6$S!XW`%*YQVeT=fgy@0Og!?s?QH*D(xt+B&0|+SX8>}+-OEJH2L@)z3wb{ z`;p2;QicQnHWM|*WxTuXCEV*)MF~+#aMo@_q z+!ibEBdA5lV^~!@=7~65tp>Ye!^RG>mbV2{$qS>N9g&Ba?YC%gd#?%GMGZHEW&uOj zfH(AlIABX4&jih@EjA`F2!6w5-(4k2Fg9UIYm zW<4!hqqzqUg_q3{1YX*%R$MLEF_Ine>4SG5DehfQwCmk5=>3+A&W(SEczUdPMtIMP zUKIm*6h4|8y9GI0ycU*BIDUwJ?KWQ>{4tx-<^G*`GEd}r{mo;)^(TxQxY-F}KDSi1 ztWzVk8|5_F6V8~xh>JrB>Ci)hnF>3c?{^3F1Z9)mId~2u&-QnFaKOdnJ$H?`mS>Bt zR=>0t_^rDyw)@>8T|V%?HnTG5&3ygIR)DbMqnFh3D0W&WxZ$>XCf21R)uz_yofTLX zz?y>{q4EQ8`G2pik!Vn;5z}_6^yb;}Dfkxchw8gr)B^XHT)FgpFDl@Vdw$*A|{OOEd|hn`RCC`ve6#mE_&DR;eeH6MM~$?PwGp z=y?TxZKm8W)&l6Ko8mnAgqI95vYY$%d^fokoScmQ8U25#d*q${Y;^}kx<6vAfoI#m zSNs~ULM)H$o|qjXlw5iLFx=5(KrDvG?GSo^Yz{G*{z@hcN2)*qo@zcte^9w@re}zl zUL2OM+`{(mx*gz6umzHEWJ5b3bCIbJG9oq3<*r?0NfUOJR#GCSL>(Y@G(8yZ=ke`% z9O3W7h>nQo&lb1mIBdz^%7?#IF11Iv1D_bTJtX4AbQ##nz&%m)Lq9)XC%kLp%+n~v z^~NSa$clJ@RSF(oee_5I+TRrSN1z>%!?+3dL zk%M_sn8`(Uf@MU{7wa85GgYM`x>jiR-h+;m9|d=!Iuc&(84t*S%}o_UOV&^&u{RPU zGex6JjaDPTH5~wzi>8`U?t&n96&RB4eXn}K3$HF^7IP6QMiZD0#gT=8YMl`PQq7J# zh*jS2d2v9#U-KLYNdRzjj)XLb9ZH}>OpuYlggE`JH9+T2&|gAia}67*(Ui-@arC+k z*%HcyAD3I5ISl%B`lgpICaAh`yu8&?RXFRk|Byi3!bJ0zE+&Yv!kl9kTWfmvjJMZ3 zocy@#ni<@b#8~%WQa4VOudlg5NmZ#EZSl*F_6_HDH{q<+SDu%>(B&~z$!?Pn9fno! zOCwd|!|?+Zew*Kvm8Mp+(;$L|*Iq9qI9vZI`QTcmdK5QU0>b$rzbZgU07A48sr+qW zF=A;;)5D?j#n%PbZgi8Kl8l%Tkk|{I$e;Y~-|jth@Talgr-3kxj_6E&9%77`v{y;B z?~~cf;^lEyr*jG zg+K>W*Y(|*svV-?%)YHFE!Am?^uZ2;>XUW=*XTRQ)zQYtWW_(b1A#NSiAr%C`WI|> z2Q>>{82O)ar1@`qrFae5phIcr#dfF%c{*h2i*#Z4F2E0$KFCsHH&&gbrB&_T@~pFY zeH=)xi0>pSRuxNLkq?Utatr=FsR2Jpm@%FbSGf-FMTnui%FCUO=b8uKUd49ggb9nt+g?94X805_eA=<(yD_XyIG;>#K49G<{idFQnM=1K> zVoB7(Sn;cGdEbDu>kfHlV&eAhTH@Rp1(M(^fC9^rCT84jhpd!GL!{y-`*>g`ghh3` zjI55mT>WS~GSl6rRz`VkSwLDY;xYMx>KPA4VNjJ64IjrQYI0PN)+& zDW1v5Y@(~H;4b++EN)7O%6_}^;@#Xm=qk^3AXS=UaygR$=Z-th%{7t_q^)=$0i9A@ zU3uT~Es`eZrlpKGzMD{r{-G&1WeE9f3(|`6QMN#Ep7J zZ8?1TTWkBb5~ydU!(pMWVycizUYqX6#IuQ0yO8)w}*js2`3%M)A z%eCN+c3^&gH}SL?;cnQ*y)v^l!S~xFn{(@yD)FE9rXAgOnsY%6QtrQiju+BENq9Gc z9x5bAx>zMkIo<+I_JWSM#IZyD#2tpV8N@}#q|WbxsJ}=?GEvNj-jE*o6ugp1K-?3& zM{p*6T^fHD=6OBRTFl0CYJgac0a7Ud^171j=O)Cq6Pz7E@hRc)hS#dw?;cKD3AKITEp)}n)JhaE2>OW%E?ST-$ktJGN>6!kuL(WZl+k7iY&;R#zXq5l{OIuaVo z_GQHe zJqeDdzQM0c@uBXEV+%P!2$}w%JVKk-FBFC#EmH41P->6P6fF-ylca*rSKEx7%xB4g z$9pd)#akSmn*p*#7|J0`Kz+(TBo43mBk0hU5wumA^7_{>orKerU*qVS6C%@R(Vq`n z&;QCG8^=YJEbPz;#3H{s&d;)MKW?LGU+9!RyP=_(a(oe!9kOznT+~4_d?W2+shuKl z1M=@3(e}x!9U4(x==a1N)Ty6cJe1<7UZf@gV;QV zK>A(1$yX$2dm+U8-wE}O{w?iir&^M{RZ=OS>ObVEeJ8dJ~DI5}^Z1jFkIEMN+ycro8_!kmSI5=co6nNh@H@}6gtlU4| zfxpZD>2Nua)!fjb##tV6(DgiyYX9qOt1P~dy*!D z>0lnp6cOh*l4Iofs7jT8d{trLw5R9S6-)7xv0BFNoVM%}w>zDe9AVDeug+|7of=*&JT-S8 z9#79cvYZ;4-x%d1Dd%#%VZJF8+A?C-(^d=p)Zyv7e-q+e5os6hkT|(O^!t~q{QLKb zQIk+(qxYLhpI2*7_UNKrqJ(p*dd@gHySq2L6_}2WHxk1>-i8x=KblkhZPd_sd5y~W zS#!tl>O?U1AY`(;%HE9N#G_wHI-YZg^_@fGs--^f)$NA!ImG#FD$&vmDj7DG!^Z6r zdvML)^t*_yuu$Og^!SciI9t&T^KJv29Eli2Eq(BbH@q=|)u3ShI*plO5^=`gQ zI-RlFt)K9CbBbiALBHPbl4|j4tQyKiD|IRXS(>x4T0P#xo%6kZAzrhAQ=RkGC5jdU zQhmlTe^8B?;FEduN^pFBgv)1(S-jL!L?vC)-ZTB{``rp0H~WPT*c1|B7OJ+3PdE6z z=bXg%H&TUbP~36iNTRvRD<6SpjK1WjI;GYqg4ewJyhUxrr; zxYU*`u^w+)`8FGZc@9y0glRs0U+h;9Jcv&$hh@Nz-+dM1nS z{%p1M@Pb6N1Uufkg~jHc8!$kvhVhY5maPr+FGH@I-T@Zm&39H1Gi z{lh{uQLlDK%_znE`LXb~h~%>{K(nfXwA1UbJs#VEml0HOU#{0+Y^Po>t`~BaSPK_$ z+!RsGVApJw7dEe+G$D~}jkJ&mNmtU}ymc#o)X#F7a1Zggtv4VMbW$_5M7+PbuiI=W zCAaV!&h|8cjNc33j-chEbv|&`uAV&a2+BDj`Ifal%b#W+sG6qk(zC-=4YU} z_?KiKS{lhbDAAj#3QkJsr1m4`N_mA4^9UL#YIrJ?(*;J~9yh25I(iYM@QCA~eCJPI z{o+;m;3THYvSy2ro} zLNqn5YSt&E6VNJ+y)uAfwl&ntug~pDEf+x@OosAjz&@qRvx7bsb=wW7si}Io7Z+@F zZ7C?~z7??EZzy-ud;5(@9`|}f@5XF#^%12xQR^`koRN|DHk+1kI{kTPN_eSTzdP+8 ztCXfBw=U!N{R1tn7$MO{XFJBAOWCv2k{=);?g8%iUSJ4eM~}MI176rTy-#w5U~GYqR;Fd1|6I{+7rFN5Hw9l7jCcq-8s zpJQS4X(jvI4g1>&VYfV5X6CE}5rp{obBdCg}bW! z&%&n0QL~VV$}@>5I*AWJ6`$E`4xb+$6?zxKmFOI`JvJ>UjAy6BoQ+Y$5!5k}Yq6)= z<$V`kSscZMdQHb=cxna)1oaYF5H?uVBD4hNm@pY1lge6L@zD_)Im^L^J9?@AtsY4V8h@Ld2^CZfE|RdP^o3m_MvnV@M|5U*aAOMR-L7C#8rW-n`FGv-WPI2WPpi zBgAe#{7*%3tzn4oQ`)-$T;9hb+6lQrojwwMuk@l=GSL$m4c|I-y*?2_lx?2> zMHmRzEM5>6ILy}rHvAZJEpf%hAEXcH_je^$P*hni#ZFaamzS3}>ASG{;Tj+H@*M^2 z;qsI0)B1pw}||d0{omHjddYP8GT>(`%uOb0rh{=^w_ zRG5X{8x{vszMQTl+QLpC{9ae3aNJ`vJ84hJZT(E7O2#FdLc&)B`K6Iu9dk}rq8faf&Rg*)4hDCe4kcw zHRF?C5@jI-tu;7iUsAq)8Z`2a%t?1@((8B^u-PiV_kp7?m`idtV$@9jdtDx`tgLK; z@2(D|fTeI0JgwyjKfOD(8piF=``NU6 zu^=Wu=5PNp5M3?^Gb{BNzD2r5lg{s4mAL!cl37x_mJk@(FVhlqsEadOEkvb#isw*b54GUkZ)Ai8{!oeE z^=`73XYUL2>PIaCe)+4tD5^g$qxy4tQY~D9;%;ka;&wpZ9jIL~MIs`<-6bNLieL0M zW45)k<9TEU>55{AI(9H{J|9uvUi7(}*-a?DaK`F9vR;GH5})oUZ5tm&Danh+Bxm&y z-{eo71vX&D2zEl#LIcK5%zYkyp9km>ey+LysWl^_hpveR8T1`3GyFcy4IOu$KOe?m3@|m=V*_ z1r;}6l3S_LV*rbUnDYNz&I)^;EI8`jxPX-aR*u>I^gw+6VTIq4aL^8DNYEYS2SbN8 zIa}FfbaUx}Gc&rtFcYn^Ms)-{Z*)Fa<1{q95p*FGLw)D5xV!_*XJ~;5#$1M34rzhW z)e~S$+EUmoSBxARU}l^cmNGJH_0O;p+DvzL#3iN`WjK^9vW|!kYqTBr)SW1Z>6iZp z&AWtl*YWMxO$Z*}&5S7Y$L+8qdpO z^RM;X*U&8r4DuA+6l8vXL#)^5;p3+t)#5*tN;+1e?AGx-cN4WrEx%nosE(=reY4*z z>HN7j=)qk}zcj>Q!z9H`{Clpgsy5!jU?U>|(4jBw15Hs}y3`GBgX6;7aY+7`nJlK8 zh9${F85tSLr%ybFmU4@JrBi|R2?$P+t-)j|d6Wp_T$cyfArOtwlQ&O@zVLk_tt?HS z{w(SnyCZqi*LCrrVsnx52aHCIhsfDnVS^8Lj{7F}>cZSM5MX;7jh%1uo~Pf*M;!`cVu3r7tzeRX!{2<91~twV;`s24dR@}mw8~O+z^5Zp zFqZ+aW?q*OnDPJlQ-3B5Hap1p=NA+m-y_Q{D0&tYVr@N2?9N53!4N&fotY&sKhr3e zT=xLIy#*IjFquFwS-I%+6$n!QI@Ep*)lJ*l0!xQt2a(y+`@4bM@YgjiDLMyDcVN9H zX!N-(rZ1{p4~g~@_W1<*IAp9m)+N{8_!(ra)YZY z>y~n&IW;-V;Xy`adBQO9;FOD9*iA>YNfOV}Ky4DPbdrX>&k;^_l=1h;BxX71xpq1u zj8W%MqJB?=`Rwbi-R)IHKf^=MSGXyA-|}7aTyrVy_Om2o#98vgLUS+j@}9WgK;5qQ zddG4MR=#E~OPJRj#@OSC4xiLT_A;U}2JE4P+3 zAO1+!6rDA|SkYUk8B&a@3~rQ{8TWP$2m_1d|NY%=yM=C4{_pQ&`*J}0@`b?tr?mfe z24z_G_%X)8_rI~jpZGHOC!%Fab(u|Ph#h?L!Uc@71e=~X)U^v5>7+WtUOWSONmDm7 z6J!1rFTUFT^5SMawB+R~F6^7O&-D97?&^5CtF}gtGl37k@`pog?U&OG2@Q-!%*dLG z-|R!1*=kd{hO$0CT@`AtT|f9?yLhKCLv-l!X@0-?ZM8G|_mg)@p@mz_iwh!pM?aJq z%ErrMby}>;)QEHB#|^Cmc%tw&UVw$+j)_i zS^Dh_X^*CV7)&KDUzc<@q-*r|nXBR+)K2TQ|2>GBfd-0n>^F09{aUV&;|=XKJk*IM z9nb=o?vSgc=|({N?@3n5(^OD4@x%WTPavQ)XaN-v_Bz_>SFRaA*wv~rpP>)>X7r7- z*WVMDG2>a!Fljj;rWJY97mEQP;`*+k#?dEL6?e&XxY{XO84>mc=(m|X8QIxb0s;bu z#*c$SLR`_zqW*j(rJWWSs!MS}WsFwvfi{Y=2=qPhg-^;l_$mJXkL1jF53n-B^3e#4 zpD`m&>E`qQxp<0>nskg$!$Y84Jq&1mhx=ZfXx!w@{D#_pn>8l?q3mG4;m9LEbXf3D zCoPxpbh_AcMZU;qJ!ItXEj<2Tsu|5ZQ903-dqAt1t!{CD=s0djeRZGuTX1e{=Qr93 zLg73%8=k^9*}Z+IBQPF7x3=(m#Crp3MS#S(51$-S{6+pkX5it@Ti}geT!#C^qSQqOSG( zQJ2c`O`Oy6Il=SY_2AIBR}Mir{}>_T|0O4SSbY}BsBPZJ!SPXcvY%V7q{o|v4gJjagg{zW1HF$D=e{j^mp&hfl!ZFZ8I`5oAGMd zQB7n2j816@LZWWRBvmo^v4_U1DFHKx-Ya78-`u{BFu_XyaUFCxWwd>1QhMr+q=pr6C1TFRN=)@tUrYv*fG`jfYwH}DA>YN(}UWGeL6)&2I6n^p!? zin6JR9Au>lv%Ogna0ZUUoS#9Bc0Jz*c0Qc(M&-HGD!?0mp1ra2&Fv3iKZyW`x{+wx zc-&0Djh-kQXU$(28716E1q(bU9k>*qTK6jCLUL_F)tm9WjSD&59NeOUU+d~T))M$! z^Oyk&wR<#26q%W|2aj8T9&W#}AcVB2uQxQ`3CL13^ypQ0TtJFk4ihg6qD{iMcyDt< zGA3sHT(fe0u?11Vol2R*$4Qt1T8A$$=$nw;nW{1}gEW9Up}Ck&&2$=zw!IBaadygU z{x(0ZoJRDu^_KP1GKL@Y%Ce{J zi|Drz#&XKa1h%%eYbsi}L_}~139mtamD>e`Kq~di3hl!#9h~q#Qvgy zp$eq_IyZ|(!5VRF06w-@n`!j>?`iJXF=h;29CYaD7C3fKZS#z|IYm;|!2l7l-Gg057%|{{| z$xcqIJmHCFFN7aj$=p-f=Pi-rZHU;>+bTGk3;yi&M>478fwe_sGXD8^+g} zpQuGv5%?c8N>-|_iGx@9U4_rV1vfyQ_JeV@u|&wb9?yv)+)|M? zIVOp^3_kBDYWp5Y)+Os>LP~<>ps%ty}vTD2o1Qhi*FQe{Rk?k9)BODfhoS)5* z<7#UpSZ~{C5~rqI(s~ZlJ_13?)cFEk^XCs=is9gwxks$7@io0KlI~`eL`mjh#)V|- z8XIc%J=bOv3%A<|X5q}`XT~-rjNCtpB4a-<@2KjW-_ek^&U43DMh5I7@5BgAR%xCP zvRK(qZoR>?^!r@5^_8p^d2fK)FTcN9za;j5=H;6|Sgqd#4rndt7c*0woR!e2z=LrA zTzr!#^U&ccO&}nMH6fU&uCGLLJY6YT_mbopM2G?W@|Xv*y|-?9Tq~hk%8+Jcq?U(msku`@ABXi4^`xWj9upT0hNn4ri97Ffh3wqgg@oMMMN>3`jyuAFM zuVkxz*tPKA4`>Yr;}m`n-;6N$9w*Qj7|nH|ii1Us(D z3uW!*9T*v1IspjaK0l-|D7U^_78&eN%>4DLQ$cO@%hkNXmq%x6CGC8P{p`9VwL57U z0@1UE3|%PmJW;>_w-sP9dZL^E9%wZ^lle4zuSizgpr(jV<`L~gPNPh%-n~l8svbc@ zMy%+#jHZ;ik4bD^KiA5ip@Hu&nEkkZQ0L6-!Q#`5dulp5w;l{i0 z>wsA=X_Pw~aTgYwzxCOR6Ok*)p>@&XYCuqoGec0*8^E@&ffk9S)9JGr-(ee=!k2vg zb3<5{4-VHaw^xMn(h`~*S@zA8h@*V>#xF)$7;Cl4|Ai5X_=9)ql@}2j@Hg$jCCrKqYoQivcmho5U-swlKdhwouR=E{}`A2DY^AcF7oLniFB zsQYe#^&d@Xpu&)jzoXaSrHsl&P%Q-F^Da+`Hx#yu1$p^yw!5TB*&IV$c_t#Y=xGc9 zzLHb4yXdN+U4{oyQ%~iJq1Mz{2TM0H`@BHE0mb-+UErZNT(};m+eeQAt;!XMfs)yW z?x(WbkdunLEb8J&_1eB*&b`%>TClLp8~@F^aV?D-&sJoulrKDPGY-?^dqDv{jbKrG za3lgO{4`fecKIL)`B})t#@5b(x4W-vd6t&?r`AqPLE$r4Y{OFQWiXqA^+Hs=R8o>xp-1wSbsl% zs;C28u*7FrMM7E6=&iqk4hww4gp~Ym`?8a9d)Ep5k-{Q8b?E^p)>jc4dKYL(&xC@e zrshBCe;p&_{q|!LwwJ#C$B?{eFJUZ)y+>uIhKxpxHRd}&xcCR$RVk%#s5TQzx;v;R z&o<{7&bV|x+GudLY*n&FyB?Q3G?;0yAQAOY=)4Y(Te^`|ggn#fQZg|aQ!#kRXgh?C z_|}3lv)d%{*u;IMQ}{w(E?6hY>savgJq_2-_|xsgVfK*ruXCUJ9lf9P%;LVYDR&oZ z9qZxNL*_<Y?4+5x+`F-}+$ z`2pjkU%ev!93K89It^#MQOL#^^^lV}mG?JabZqSH8YM zuy>O=`}>D)U=RCsLa|tB06tZF?|sHB85bAa%QKpdN+od9JWeh5I=Wd+J4!|&0U_jzc=hu|@Ci@{U}9H7EIK*aOj}-t z^eHVNHZ5U@ejzD6eN>6IPkr!()`w7PO%U(dJ(``F?SDkUX~Z=5a?zBQ{5bfdLAr-P zZghT9V%I#wNmAbYGk)Xr#cT(?R=H>OR=Rv$2xpI%Q zeeK53W{%I(*N!it_9It-`~2s+!jb`Rg0A})vY=%9KNTmvJj8Ro1v&jQ#M}Eoa^~W_ zj_Isq@X09gkBgHd%cpt$Yfl3=DG242lw$P@*&aV`MNRs#Y0>m~^^p`@7i>YLao(bm zliPk9fWp;zF}%OjQ}dh*yC(!r0+s%6^=10cD1zvS?;=*NU9xm}Ay|jss;oFILnOve zAp9TuLz9@i(t^E#&JjT~fA#o(Qs9r@IbuM&rJ*Uu< zg*U}^-uEvFwm;W+vKh^dlw1-ibQc&!b%NK)fy5rh>if3`8K!+Ikt?q4=;D=ANV(Os4pwe=Z3(J~v_1W!QOtRk9^@xyocR zy+=l0xR>6u|Ckh|{X_ow^Dug5=996C^``e6j(9M4J0=h<<#96|{rZ^1g}%iUHB_gX zL;C;g>1DL^*!5|kX=OQ@(%Y1TNnCk{PK?>~d;>fS%(QqNGh5>yPmj_&E2Qss!83oG z!P1R(e+B7%)^r9M|9S+wf#9aC%i>mNG0}5{A1g{m@DUj?X>^p zffcQoZs;xP-ykoFVZlp$5el6CwGYV7=w_MMkH5gnzFFI^o$BG((yux5{NJ26G~X-0 z5@4VhL}GF#UEtNuL>6BZ#8}B6i7Wb_H-X3EGcZaYQq$F$p0zI-5+Kn|%Nm1kYMOD} zaE;~ut#|zU+R5)f%jro;)SrOKy)eQc7NGg|jSLb{^T#~;{$IDz2rt1SQdN*dUVEwm zlQ?7tr4w-=8&i%CCZQErf!J0|%wWUNO?zdqZxQ+%Hm%0hG8TN8MA?AF^pobLN4q{t z#pgQ{M@NUmD-)cORr^Bx%ea+Rm;-qc{9S3d0vr*dyE9=?$RH)&n*fl~I0spg* z#VskRn;t2A8-%28;Mv>j*^(hwdaGHFn+wCAk33rT^iRhkHYv;wJAMWGP8l4D9q(zO z;%ku~V`|_{V#gLnM|ZkrM8?G*UlzPPH44;xm$)Z!AYtVs;9q~5D^uH-pO<$@QRY2) zK6?)-cwNk;gks1?J|%rHY!AX0Je1<4(fHm+dP>C8$CreVFJEIVwN)ecxIE^tA?LG= z(70DvO@B3dxdt#Hf6T-%Ag1;>j3FBD%~>JOUh6{>$8%X!X+GARQ~FjTC{MS=gAM(} zm;|c`MBQvcK93RlBA2VnUIrqBMlM#I2kTMD7pU5dx|_x5o50_r(10WAaC{i=TCymU z9tx|j?c?ir`pt@}^+4W^(-jr_)OB>SxawW#0)C&u)(Yvgber;$6i7*9m!ODCM=O1mX{_EJJwDoM7+Hg=|klzrD=Oq(S_h>0*o*|+RtnIfK{R=aK=aPm8o4g|h8AH7eF={Q z1(XinzCEf^-|5k&;pixN@KAs4y|AkW>o#BN>-oWI<)C8uoGlIc0@Xw3t*=)ineL$+HiB8GWOYHfu*+M<#IE`o_j-8g6c!7o3JdYS7H5E|g03 z6+gdX)+@$!_~^TwX|Cqxo1?)osI~F_d_6;p@C5S-mEDhycgWQ4@1gHduUCDyJYk@` z`F4le+36ShKi4KTq%~59fYj`I({k^0YW-KZ>Ss`?vXG6m-W#0S{!%p8;Ue=2-;)*# zm3#-k$HAq+pksm`7dj}fUB`vK^xgePt6Nmf zFSzAMpxa%MQ{v*R!R&mWk}x$#tqdwh8gQ%>rH?D7-xM|v{&c(mE@>!0Gxm<_>fY5~ zHjA1jFlYai9rpX>*E(KDP`Q)^w+Ov&!Tq_;DJbN-U^B_iuCsjOj@=j%qYMIyHH!oH zK%m2zia32axqrFpg6R`0zXEc$iLw43SV)NRX5i)$VVqdW@ z+?YL(FXQv))uR`)JTHG#GqsHK?*#W#QkgcRFKH?dkO(y`b3q3;&*BBVRDs-3zM)x)wo4PN=>!?kLJ!_?*}-XPbT zfL!hCDZa|{n2mPl$iP8fHrS0DH=ebOZ)AsLOCd3j)mI0%eh9-DEPso0nV@1X9UCii z0TcA0O^F%ykP<#oKysKsq9Vq)KP#^e<~3xyD2ZyFaH7)K)B<9G845Yr@4D7_Wx!+j zD(sQ6NcYTSn%}HN$d_l{H*_5BObH~ij9VL;jnXKi@H{02w+~gNspA;@vjQDf5s;|h zwoj~y=T_uLGC3?X%(V^e^XH?-D*M>c#A{}#_~hUdVO94)YxICD z$DuZrqh-T1llYbv-JanmZ}JH0dF+kKt5RR)81oj&1_l>>{c+K85fuQV3HlqPRQnR? zYTz;vPm26q;Sdnqz=t|=E)6MJbdXc-fa0FJM{I;vBh3z=00>uAKwh2&?YpXm8=}8_ z^X4fofTn-Xff9Y`%kAa0p+Bz@LJ)J#^+8@=9|Vq>8Mr4h3|x=*`6XoFS%(OM{!Q}w zA>XYRoysiyCUfv3Rc~t76YcMw1c1l$U@d)aOXTb6k;?Hym5{Y-HfdNE{mG17Q}#a@ zGx85HU6p&(j)^3rrLTu`XHRqia|0yk%Wt^y9@uL)hAJ?K)-np9M5&Cmj z8ID=+x8kTB&A`YsukauR74b|J@6$$;36-jDo)a^(Pp^Tr6?-t#>IRx$1fCfBBek`& z2S47_rutkoIp7!=gI|k<&cDM5R*J}0M&#MS6d z2Nri{P{YA>0ynq&(J4abrPoh9tj*K!n?wzqPq0nrO2}#p?{Lnk$3D6AN@lmu;(%Y9 z1O4bUZ6I)R^R8(}~g<*S#V}&XtVCqu^)*tuDr!ped4tFyo zJp6ik=QSfEg?Yjzvz=>`zU@Z)F&D^_4v?0i1~k~xEItsmYpm3tV{PCbD6044ht!pN z@YT@W#YJb+MivhAg}W=!F1?%GQw>nd&SO}A4UOY=CS15aj*z8pEco+TKgf!5mMHDr z`eaExH_tW8+<<3W7GEFfP z(MQ-dgwqL}csi+7%aor;vw$1Eq|33%Mz1$WKGE!UIwCbJ*JB-sM4n~w^Tq%*un4US zX8+w|@~swpE?neW;z%`oeV*!Aoor(5%hRMevoH|W)|jJGIo_B3GFI6r@9XbKDX*}B zfxC?@as(7dsf$m*Q}82b!V<4EeB#nZM>+&njxrm@cRXy*d&lNo)!`-d(w z-A_ZW^hxDE-=C4$w}03Av=-${jAQTGmlz!<$sMI+6Sra3-RDf^GyB5}yD*wh?I>P< zRK>Cp_s$^99x$XdcGs^zy8iIVgRVZ1;m!D>e(oNV7n6Ew!;5RqvuAa1vWEBMDWo3U zuQyKpXIB$WE_)rdQewhXuga8@BS2}n&lKTZmkC*g0XrNUdqbN%MQM6(;cWHDtVrhT zblAkMC+Wn)*xvt5@QOZOOcDNH5blAT2Y*%LQ~pHc5Yho$C+!cPvPEPlHNJl88Bmi0oR z%9QJZo2<9wLPC@l7}ODZ%(b)x^>c!iJ%98ac!OTlijY^i_FpOe@qLCWA}Gjn$=jt? zs!aM!4uRCY`{zeLHd)#BsHmuj;^MrujdK$%KG&~b1lZ8p(%j)wQn?b~+x@mJFOFYg z9d_)Gz*;|47uf-ej*cOTf3PLucEYOGUFMh!j~|~bANf4F<~oB>yW`rFP_d+AZCA@0 z20+#7Juhsg2a*ph*9yaC>4xfTF{^0K3wgt~ClH9P!aZ_AD3wfs5Gaz-qSLW?N1N-! zSW8OmsYR?3R%y4~K0JNtHk)5cRDCP7rbEp_fQfN|+sh z6-Pas+Dlok=%1@P{Nclg@+EHy_N87O?c+SOb9)s1OE&(Rwa%NU@G#6-)}xzuxW2+q zoQlaj4C1E%Tp)L7@p`wG9$C0;chMdZvofC7x+;&}vjt$luBXJ)P+fMV91la*bo(zJ0q(SlBk?`A2?5d~QQQ z?`M6zk#ByB!2-RgGT-Bm1J_T?jXnq`KtzT70!Dymw!oN4V$f5E=2TdLy5F62?uQZD z8Dw%eyLVO&{<>%>`YE82E3%7_EB5K)Ac$ZCNM`IkN!z?b<0fJrS29}k0w-un`IJDv zruNXQ_^ij}Wiy)oCzr5DT;nkFu2GAzVi)(y*)sWG@ffAam2l_m?!3$9<|dA`4Q=|# zks~hi}<^Es2B`EG$ue7Oh{ZtI&Ik4zsim zU7(v8IE61+)b-U|6~71s zgoH(*lVqQ5T)0@|YwbIFSc&n|KrIKkdKNaa&=6OF*0#EHXJ<{{M#*g+PJQj8oVH8M5fq5r z{nG{eOP{mGpTY7o*<%0W9y=ow+z0!v_%20D>g)b=M-|(}8*w=~(nlQ>%Y_a!T==?-ygCJy+MSFZ4v2F&;i5G|DP z_=W<|T+j_|?Yc(&x`qDiJPokcDZ2n29k*n#`BUpnf-2Omn4$KBwf4?10@# zX~8{nXc4GOC1u^qJw@Oep1C+GcOy6Fmk{hNbGmJ`@Zqk<=#zJx!i(sAeJ9X^%MY;S zV;N=kEd&Zq@Ux(zdcsl3yUp^fHM;))~_D+nH@SG$O zTl`06jyvqBQc10#Juz@X3t!2UzERS-q=zGl$D5lkq?&dV|5DP4>R^8TL{2@zocCrF zTSVLi^@t~_AK+18d&=BGxj6$5D%O6oKfoz>fvRXDyunWf$-R%SdNH!Ne5uBRHQ4vp zML6`OrjQ42js>{SCzM{BmAOt1xy7@Y24%{@!Fq*4aID;%V35nr9%i*EgC@>&r(6G) z3NhbQqU7;>=g*li~l1Z4kx+O^tKZ4$?8#_ygnH$0Cef5!Yh1$uTP1may*mR8=% z-t9m$bfeR!wogboa#`iGi!hXSjD;`_P(RGiZCT?$A=GcXe|!T4tWEbq4f<^1NOT|n z#gR;}T#N7A^?8gHM@7mWODOe{SMh2{*WrIJ?Cioe;}J&o4kNoJeVy|ekz%%fYViHd z9^b(5x1<&7MEhOXqgU_GN8NlUO*nHD_WeR$Hpr!gHN#-YVTI)D20+8i6FzQb41*CAJT;cnS$?e8QrXO&t%mH!U= zIq|ht^z{k&@6}85N0{=jWO63VTmA3Z<7I(83zm0M%~GrPRqQP38iDy&k= z6%tqRkwNJv7}T~G=dO$1K(iaj)ja6@I&dF;MxRU~gDvkEKy2R1QnK0u+ryU6C%#D9 zn|9%c_cq!w+JE`8)&c#Fn4S-@r&yU$)=j4bJQjT)OwaQHuo){S1%5`jJjbbzaEta7 zeg=R4tvy-pA=Cc1!Yhggq}=@8xZ!jw?>^p~c`$`V(?)nuY*4qN_{OY)z(b@239I_#LLYnmD__Z~yO{O^B-W$WhyJG50Rp9j_und(@(9A5 zh1}3oiM{o=+ZhXuXqUhL2dkjmZ^##mi6OkT04ii(GiFx`4Vb+@*t4?-tK}JQ1BmqR z#}IPN_d+8&@i_MWR~r)x|MJ{|1K0LnNw(Y4&5K(j%c;+Hibd!jgQ_nWBOhS=B!jmlN@^r&2~< z_Qb`WGITdNdu$(bDoF#jHO|+r2w}9rKyz^~_7y^6!GLU(ewc{MK5+ltH?2*KpF#%Z z{MHbdA3%9H3x}Lm7%Qfglo)S#vQ4BO9eUX7?N#>FzBM)U{5X#y1Fw z9|lb`1zTd*!m>S+8BvW_WF>waY;xNAT#9Y`A6c?f7~8)&HxNi@g`7hU-A5%$R3h)j-?MhyyURHK$A{;2i~qyl~4 zz7Sj*1npS&%LfD zhQPgV&c8@t67G+oM-j7@tfDDITQkDI@WFhHU@u?nWpd196{8y0CTnFtGD#YK96i&- zXteF3N;lC+g*nJsm*+i%sOd&>AyyLjo$#q8F(%S|gbn6bhsf9zIIWme0+ zkcV%qXw>)6vK*#X1tFN~_K|XZ3&XMf2kV}{gA7gSDSsA#_WnLp+j-$aZGm-bQ>=%x zZ3Wl;fTk(#2Z(^fy+|_xqOd9l8BHav7@727Ed@ZGyt5Q;6tT$_g{`-cCUy+BWF8vF&1epqO?ELE&Ku`T& zKeJ8b^K&^^k4L$!qp>7XqE&pJz!DJ*eLPY<7TNkZFT-_K{+#>G!hwMJyeUGLC$$x( z*{X@9G%=cKh_RK-DJ+=YSY$LkmL4@3or4_55(@(~yD(-r9W2o}bE+&MPk@+Ric}xR zf|-{kgo>-?V;ma5=wt=NOJfmK;a+4fUp$y++W@>I8EZrbZF}M!W3vLXC&de^?AH-C z0lj>9$))U!#U)yq_Xg?z|4sW(K+e znzL}cj-sW`YH|J|%cj{utC<2lBO2f7o@O8`#(X%%h zNKF<^2yqeE1-vpa2|fQePxW=cGpOuao-(8n_MZQo^)18xcVs?;DiUBAd307@E5zHp zO)zxyiYQE6%5KgVfOHa3ks|{(?uDxEX5(0!ip1YDXyJrZkHb>5vpmg^1wizH3Hv4kS+?$Z+G-6t z%d?jc5s*CtBnv20tTdVJf*D~t63C5kd@FhQ1h9Z*@L1{f)Ml3w^kFmWZkfz>TQrD) zZR?m&#~UKWg~Frr7dE`TBwTyE<#lfx|J~0ZVD9$8bpU9^>1(g6pK7+^!$U&ONNR(b z_B~%%mH1ntpEGqY49EjyzbSom>{<)ocip4lF=h@2IZS&nQV3*%U$$wk`B z9<{gY+T$i&b|nOM4Z0=j;c1yAAOyCkY&zSk99$1!m8@y-A-h#I`@gwzOJ@H+oE6^X zbEf2ZDTGV?d$8{NZ}t1CAB*8tf4@54u0%)031hhllh(&^9uI-Nji&2IQFFUx${?*Z zBj}WAb=3g-pG5$Qtf7uj`R<9&xk#`H0P7cD7H#Yjt5Hwn`>9AExxl#?mXGX`?Uzs6S=fLUhY?60BdIy)^@T z(E|kcn}lijTN{imUDnDOdQ|X|t63y4+Z*m?h33eDrR;VRm4Au2Vzh1oranEz9^Reb z$E&%b5sOs!s#ye5O|Y#P-~}e1v|>6)khKDfX`xL?&8-QO55y(4aj;0PNy>5VHB^+2jeUV0!QhUfrXBfg!ujH}0rfZVr=elF6@O zu(I;j)w&J#5naYwsRS}1=*=TQYwdC6Go%j>5 zg3a$LIh(^5@d?|eSXBX6bmY_!?- z$)`is*a1j*bnen?$N*pw;t~=haV9gQjg63V#U1b-%@a>7_-@F(udPeG+f-8XRD&G` z<3;`9ltfQGK-0DJt3urDBIt7e zyWkaOCNv3$#6FXz*@9;IY9->^IFflSTD&K17Ci3^u^!R|JM z*E7`CUFlV1n}d2~xRz%7_1+xGEo)jL3D%Jmk(gt{yR9y9)K7*UtfDe>WqVzoGIM;c zI+@oa_|Yom+fLZpWIAqsQWQ6}(5M#KC|O}u={@?RK60{SR>gAt9XR2&PaQ?!;TY^| zk|KMg(()c&EAXmL)s6Y5-)6ChY?V)H97@kz2!nfJYb*Up5C1$4p8w9oF&Y)jTPw(+ z{Dib=Djl{12Hqu+Ie{8`r=e4(Mgs-;b;WgH4&%&p@Nr#z!jN%H`3{x0*`Hy{vkumn zlYE)I0~RT%^qgH&*^SJUd4&fIhDUm0nCieHi!w7icL?vGZ-s8IeNP?_=-AE34{+sN zjz>9+TP6H1`ub<%l&kl_Wzfvf&m}UmPn8+1v%_>{SyowGqDoa|IvYyKHHju){Q+0q z0SgVF?S-o>a3%Zy5`&}|`tdJZFf`i-15^%C$##>5@bzLIfFd?~=Tdp3#$77AM0-mO z-vt8A;uit(2JL);UQWus2NJ8++1YvQYMRFN>r?uAp2zT_HMRNoRKh0@fiRTLC9=2W zh2LUh$!pBiK$gL&82)w9I+Hv~U|?XA&0Fcn3#a8~ssL|ppZSEtl)Z!fh^xY~Z!zV- z`asDn$kiK}n2`0^+VZQk;qV49`TK5*h=^Q|bX{P;I$Nl-UD-#SHwMGY7kuQW=yDJG z3V7r~sbdEwo~D(Sb~~ILx^GJf=%&_5VLsIgvMkfjdJmYYDV|&0_}J?Rde0tQcOY-V z#m45nMSx~@MIUH=vKMpylQH zSmPBMs%LV>o_Rm-Gi|#bzBfQ@-C21c4b^A+0^a$=%Gp=eSQ4&#CMWU$9N(z#*_BbE zgT=_{eK0{FMorG)uIs#c_@&VrX;rHyJ;n+w$Cc=@b;w1FF>7CvI!No^8F~9y zA;E*|P^%If$R|RUWZ#MN2M84#CVzfrroM|vy5w_bW~#)LUTe>-;(rY}H)%Trsj@V^ z{=*G8yoaDa1G;&;mhWg|4)fxhDd{A%n1Mm`j?0*xTG?v-N5Wf37GlYM3yLpzE?q~i zeDQj_-?~)IL5){+roUf_Iu-+8z)1JMLrdWDhXsNwuxO%75b@h|n(CFbnMg6i^jn`k z?Qlj3qg1YIoMfSJ|FTdL!qW>?;-wK{H6*nzJ_J2F3)3=6TNQcTLl6ayymGHOJ}-_Lg8y6af(=;S4`-8XE2ey7jAoiVHD~!W|K1OB<}CR8d*&_1LNd&Jo$4vj_%3%! z){PjbRsQPP3W$zFtFCtyd}s$phruiK;Qe;?j0W99@mu-bgQBJ-03?U9$ZdRv%)j3$u^r`DP_ zvQ`kFq4&))9f*lkNtp$jd^ANHv<~zD63RgDM1G!R)S0h$XOT?TJ}_t76NQZ zq=_#2Q4QL>ZLABPSVwsDWFdMx?n7MCj2#w7ptGuHpQ*!O0nD1$t{BZ2ejw6iBEc?Y z0oq+an{seT7A?o13v3LCRSc%oEO-gnOXD|53sKM@46T-d)smtqYlXlevS^4&_xK*n zEh9>1DcDS}5|mU5t3dQ{oe^jBzq^%<8x{aOO4~m608-II+U8F1V zKG=`9J~wGGi}QF!O07u6_t=m1$axh5{uZYB08d zrDVq0ZrW5pVMgKjJbQQ=k&N96da{Cm8RR%eQ<`iw!8S*UQK-^YI1Sclinc64r~?6v zEsDMf)Sj+CN^y|_21Of+L1a!DMl~S2)6L`PF_R#U0EH^Dl;frIk&ry7isw>j`FWYD zE}-*&x6A_eT>oQ4WbeYvelm&sHi#9(dgOsky+>SXYU+Msp-OK}RzO#x3!)-43k`(L zcr{pPU9`VUt28}JMnK?mfn&+0xcmATw;Nt^D|7^Q*ky%Q?-I`;Y%3K(f7qZhHTyQE}M4HP61a z6vS*6fge`@qLqZ`u8nA*i!I~l9c%(LSKx&gMJ*7xEU@wUEz!o&ivfDfd+5+zQ}z|A zKocGKR-QmmYR+A8j)ZowA6S3}OszFYX9FofN`q`S6p)A+qr9_+|EK0! z!A6L#uiuq_u?C0%kvIba704!gXrhT(WPLE*n?fjbMxS9<`cxzWa`n_!Kx8^?iN@g! zq7jtrhz>a*%_Z5i9s%l#EWvv)d;wkABX^e6x9{Ts_JiSGYa$g#L z<}h~SzUg1d8P1rUfY5<|k3h+-1s2qx_I(vO)=lJmK>ZSxxFo6ZAJ!kLQWOe zR&8#b@3!bII)Vya*dvg%05wZLegxT~HbpXLSB)n7=(kKC()Bq1Lm*!i!_2(A3(wwb^~|#60;0cd;M3N_><;=r={#ih?u=cE6^hUEwTtl=jggdrGDP6m z`0c8&kAJx7eZ?kdO!ir5PFs$3EZ9)|!(`mr&N^)k>yG~%nB%`*W2hNq}5oz%ugO7^*NytHlcK2;ZggwjY>?J!Mddx}M;~K(pS1KO4qU77Q-$>7hG&w#Qe` z$jt1)9?cpxO?5BAI2e^thw9|5!svI(wL%(I2tM{?6&uUUW^G&2hsy`9&&x%sFaV?4 zzaMrI?Y}0sMY8EblPCWrozUbcV_O2G&>)y@X!u|&T;_xO*x{`S{v)}&^Duy zcA{T9U%CMxVFCg6G-!=vTQuLEP22&4@R|^+$IW~ICkKBI$!AsqsuxNAt$M9`Qto;Io z7rO7<=>yoxY+lgtrx8ZozK#yqpUJ*QMDYLR+IOTjmB?CpFhmZhhm9*cs|&hdVi^!_ z>2wAlSI+=a;W9C&!r>OLliLDHfs{nf0h%fBog-~Pv5X2pP|cE;2XBRu9}y!4Ee6s` zKr4oA^56tORT%+fU<3kCjXBs8<5Wo>k?)GPd&p(Jt-Rb;*<;+6v6uUox|(7{2Zt^_ zs}Q>-icxs*`g)oD3~S=X=zEpJx_+urFL;$@_s@wYsMw0|VjMFqY5>qKi(~3OjWXxZ z*pZJxs#VCavatd>)_uypHoh|^XUd|sOhJMS3S&!Q=%{zQ95Mb&TVoz{$z?OU-!B+8 z5=zXkedAK)^!i9#T=!uhr=@@I7uu{9IVT!TwT#zQmynX8DCD-h@fk*ObfkZ~rf&P8 zCqVAYg@e$HqZYsRx812rTU~x=(==>zL?9Ak1hXe;3D~1RG!X{d%3z$*s3!d>7PtBU z?Cze=J)T>aM$HxHyS0Dz+}Jzcb#_H0iSrMnXk+xm zD%F^rp?qpq#n*S6RiGj(=zPmR3c9x*HYDWH{x?Hvnr>p!Z@hAOmHqDBsS{Dz54Yd4 z!~kXxv}YyJYRfX%4_c;wclx=^D^2)i5U(CTu_z(!MHHk)YX~k;JFGo~hQqf^2WnHa z4&+s@4)G-ff(Et=tG8N^b9yPFN;n`IF)_K&PYwu|9||}E0}QP(3t&JhNb#s9)I;}P zdJxUBV`+(P|ARd64V!TiBR#{+YLiyz>an!76Ztlg6>tX!(-k_`U_f2^_C--2f7 z4zSDlD$4Vqv8f*_nMvQC9NuJnIukzoWkHGS2xAZI{%{SCL8Yhc7{Rf-)|uXWPd>B3Qn-%&doh5W;^$`v zBz%(}JsNm*jw!3%J68@GEq9xB3i1*Y)AZ$mow>cd&+-D*@_ z39-lk`A9o!H{v?Gq;5Dv}TLTuir~3O5Gfnk&xL9 zdoT3ic=z@Q)NK_!F3+kMh{#=nL?I~rSeAd8p?1OCckJZ@vzX%FcF+=8w!PNfHZ8rF zq7(^&QoUjy*aiu0^L-k2C#b0gIcD=EW z&7e@Jw@4b>>k01Zx};n73-Aj-XOxdt>~6f#*4beP>hv&X4{;2$OW<8wYN+^$F3i6toD)6pqQc zCniq}ZdL`}OsZI;#{=i}J+*Fw@a)U7g6ywLz;}EGc52xk-lV(H#_82f4Wdt}>}k-1 z452Hdx=T(nO8>N79*kjOV%hh@r2v|hr_AhuE%(%{hxS&j?L zh(Y63Z0tM3bR$sX#C@@tuT5oDNN@EOV2!&Bs;)q7Wba6c&K_$QL{8tSl-`~+ep<-v5ZQm=lGyXr1m7zzb05!)cF|pk+J=52b zU>d`qVQjVPr+7>+>7HD^vd5)C|M%oZXR@j9=m*;%9REr-8K00Ow=)oiWy)qmG~m;B%=<=`BiMY>>w$c#@IzszZO0d)d4zc`VA%q$S1srTJrwGwa{x zJ##Gc>#NtjPp+hUgRGHZPuuPpO(7?~6z5Ii(lFw>uSkGb@8;;IS~_prIe;uMmzw0! zc_;L9?w0)_9tTsIxiTSY-ysx6bohr*2Z?^it7K_VJ3@SdF6{5m5+fy>03oq10$|l1 zMHZ9R1>hwj#x5m1k&>C))l7t=5}Rd#nfTLh2OFZdSv>UZz3ZyL4LAV89#y>Q1=8gB zv%J;wln6in6`41QiFfV`DoZgDaTr!e*MLTVTDt^>$;Ok<{@;=*63QyYSpqrU8HVkjf45;VVAq%Th@rps| zM}ZSO3MfGanKSg{kEPVVQ(KS1`s~!>=72#Lbz?U8ldV^dMMoRx;GUcz`T%ovyR6|C zq`;6;g6io%hS+;;w8N~dOK$z2scZJc38)$nVgmt^0py!9<7uSGvQw@uIJ`E(rEF^b z79isAO}O6A0tjqee)55wrq2*vV|uXcBsgV<(zFRG@4mmHs+>EaZ{{QIZOfmi-+Gpo z&-#zFHUz=DZ-d7R64Og=uH-#hjlZv|I&>_~N;SL`LwMXsytE_u zScp$-;;ScEYt)hKo|@q4oKYI%>?Ib&db1bi;g;|~*!GrSK$9V>9=(At1wO}cmTw(A=QsL&l>QSGqq;}%eqHCQ3OmnXX#H(^sK`*J z5>VK9&c4b@N8^01Vy147g?v0M`K<@1hXQJOLrd$&x}kx=GZQ2RBt*OW^HZuexS-V| zFpz2r7!K&qAN`6J_&MWEbOHnhXB;O=XDpU4R%wFkhO1Koua~Y)k=s(UvJChN#KgoF zX+lg>%r((5hV!$Sp`HE;y!eKQKM%mKQy03|dX9&i)fDFq7C5aR8RJ%dk=uVkaP=oA zWUjos_W;tBDfyp(cjp@5izy6ZS8L;~2Ez5Z0BOa-VYzu{3Eb!|Acvt9hIS8S=d0%P znc$Hm{4WkXa&@*p7nhw!A1-iH1~rC#AKrr76vQO~+Vlkl; zaQWOJBcsHXwIZ&QC&O+g84NPp7oT*Y7C$Xb1Zz-*-O87lGREQ60eV4yrIjVhLCrbc zencZxxp(A5!q1exiholMfzQmuhiiq zl77n2g@+a1!aKcIy`u$Wvedoe4!wO@pWQ`Qko z%zLkypg(^u&?>;%TIVV1B7Z%(yqiQT0yGI?W8)Xo2g-w1UOh`J%aLkJ_ELU4ml0&d{_fZromRqn|tZjM;c zI<%w*(U*YtvryN>r)O+DUOH#}@IidTOeeD)Fm4NmKO)!GnS4e+m?W!%C9Dj~Z9$q* zpk)JUD`>ef76ptP(+{Vgv$#$SVnD!54f14EY>6dRga+GszfG{kU@a`V4%SPc@rX*CPGrX-T@Qi+_?N&U#ZXm`HJbtb;YRyX)Nt1HWzpiC zMQ`?IbZnB`=ijf8rW@bp>w!a;p=x_N{X3q$I3XUm4w1trCdhVxtWz$WN#nw~6K6Ac z0hH?M3;T%N#2AUDMc~zLy-(_gUa^>dweQN09-fO;e8B$jUvk(59@LG2I?69EuL1W_ z;0_7X{*L_smh~yy_0^LhbGpvbgn^CYK=dt#Ry`CUnNe0&Q33DePE;nlfBEv|4zwE6 zp@qOqEjWJYHOfH{FtN~CS>41FP2 zZuA&5pOE4vrUttK(Lh&^xhf1WJ1a%4Ba$T;3Z4&DeOFv(O<<6BTux21*a3sw!{G+c zP8%ePujS(6&0Fog6DOFFRb41>JutSRFP3$H)2E41tPUOUSxo$<9QU*}$p8do0)f#Z zQ>|EPHa_}n@&ZZRopjNwwso)u9_2}z;eNGlzuf5N%=F-d1nxLY&)7QX^|3ZX-E-~d zet>r(=TKc^Z=W)a@mLNSJvSdjKJvEU%<%lP4h~Vw<<;5h<-5^f?0|kk!TGYisiH^BGNHv-?fM%Y(i4D4k=dt0NLH zO8}EWd7x$B=JwIL^zEr(a&c^asei<1-B*Z+?0b=hOkJfjpj-QncQ!W~R$*E$hO5wz z!CdJBZy*7He4&u%nV2g@5-v_aHL@F9l%Ir2Cx$!ZRqPP0$;YvK0>?nNtnCdL@sG2q zUA}&k503wwZ@L)Yq6;XvIQeiPU?p|#_+-=|sK-@uYQwbN~ceP{mxE{_qw>eSHM8l4ADN+aL`tcKLS0MHut&+W)X5cfHxeh zBRlWSoeLm2d_U5CFqUAe1u?#9czC$}2rNqKzg09jR}GP`MU#h0yue2vJ$k&$YM)(> zBtqVSdps|TdJ^Ow0|z?~=XdVo}hY2-DKxwfZ z#IJs>C1gczb#(N$?DG?Py5Sx-guk!z&8+p_{k4xwqQ`ZupTjJf^mGz%UX#&1R_>i| zNhZC3Ys(XOH%@RUgMU`1`R!_Bg>>S63>P^XU{6ES;s8!4LQ3 za-7TA9$SGnd;3JSb51FD_mc$$1@{xP*3W8=uOhs3>FD2}>g;6u`F}+Bx4H#>vF?MS z9-J+pTx9#BLa2O1zX&{Z92R@>GZdz4#d|4m18~#!pmv@aqht4>R7K}DZ9vSMewdfH z6-wO%0>aW)QrAU}fBAB(gLFvOxQWw)`fiLEoRGbp9)d^DXoD<`d#p*;3djx4glz-N zrN}Whn<|PNGQK^r(2+(G#xqK0-ojXar(@Em|Cd1a^5R6QHT$J-tStw z$zqhQriwt8?-wIb7}8*mAql37gM2ApHU(sWyJn)+Eoxp_)f8LJV$4AC2q=|+a@4b` zU4jFJRYGl|cmSQvQaKFp{}_Y~MyMB~Ig7#P2#~R)+*v-nst_KN;|$>8U5w@>UG;9! z^}8i1X4Zuj%I=t@EqG22GOnxwGsbv1#`stPQ0vC)5^eH_&2ZonnhmOHYNe6hLI$|( z!-WB6LsNi^Sq%_uOsx{wvn91q?_ulmJ;GTSYsQ)=5MZC?8s}MIkEQCv-?<*2Ed9ue41iI`-Ct zcF_S-zKcPm0eB0P{$jeLF5s{MMO%(u;Eu9IHrlMF|bhNng&l#dENW?;@ID*i+9fkI4CfhU@nGBDf zCcK~Fzzjjz4nXv4$^1G%1tDp&t@=?MQ06nvq8%2qny{_HKvcN4lc&z`Gy5my5h8z2 zW$9nd*#TuPvFh@# zcR1|b(#*a?I__UA7MJ;dX+_*8iY9PJ(4rjS&CS|dEU?>dF`&d^l)4bFdEF5MVphZC)+H~;Fs{jo)c4g~0U=HC##54=kRl!JIE za5wj)y#CM0%)fHN1=-=h$Cj9I{TfR&&jyrm5B30=VBY>pZXb#uGS>j|R{KFB>-HW5 z%BdRhzv+Y_yOZ+iUuGW+=s(}nuw^;Tk1L9rwBiv_b2i&XDrKYqgmeph2}dA%ia-_l z$eJMx4gXme^`GkmQtmnRE~XdUT|HvyF@p%AfRx)OkX?F3zWTV-$~?!s^6EW^UM3Kv zmu`U*ZK6%g6?U!+zP+R6&LffHDE#Rj=`J3*1xD;NtQ2A!!Ht5%K`mNBg(2sVjK0%_+dF2}? zAbuF*jyrf~^0L@D%4uowm32))6X@yYoRjS`{AjP@*9KdblvISbiwJEXPmxP@?7WmB zMVk$7!wc^y&(T46?1wX5sp+&GA8U#MK3&k~Cp$mcz6EcJi#$H*Q=I@MEgOBha~IMH zeaqLSidD4SG1SVrEgi_1gyzm1yejH?0=vO$F&R~-*9@=4;FzE*FCab*h;$=HRe{B+ z_|FePL%uKNe|{Y|1zA@B^xTI6zY0K7&eC&XAGn{!O+^p1z>SlS0F3P1*z>TkI`){_ zi~#!j9l(v_YvD7*FoBYqb2Ur6|BJNu3~OrZ!bM{*h^QzaQp5rx(o{MmZbeZ6Q9+R| zMG%qROF%_Iq=_gUB1)02(rZLY6og2P^lpR@ItdUG?pW$R-*?Wr=iDDR&%@rBgtg|H zbBr;^e8)TAc~ws4YW#&;(9`d9ckcCk)4}{*YK2l-?Y?M}4NF}n?XPUwguAa^xZ=8S zXMoXz{%wmg5`X6QFhE?6fK|O3m`Lagc)!|3mWKM`XlJG1U57Q(81E+blksYsHf;(R zH$e(`LY3zNcY?Ogy<2inQP$D9IYEhh5g7sHy)7I9vhA+_7EGN!8hDasPJf33cr#Y-ge$n>EnI&`e#fMxT z9=J%6Zl!>@`P1UIym7Ljc?xq@1Ai(l^S`;}(mtLa>yA^Obm1%RN3kRhk?7)}EB(*I zp}sTv3%??)J>#Ne`y_>=tFP*wHCw-#E*M~9EUWIv{Q_e+Kq`P?){wWU7;jfJdACBL z24#+pTAYi8Z!|uiYOMO5#Jq`m2-XQi3G++9mB>Ws8wn#evLeL_m2X9Nb?bF z-=IQ0(^NzaIEj?5Z%5OumOuV6V0}(c{87k6_rLH_i_A6&z(XwF#bsl!E5->&4`gI# zqhJY-`FfY5yF3{qoz}j998@&7INcDF<0`q~4Qs z^G_*&@}hkCWc(qK^n$OV_CSqV*6&BeARdQnkN%a`|MLv1rvRKsaKE-+!Xda21Fqh6 z?d;q8@OQVt;&O*J)o>nJoWVl6>$x#tln77?wU14xZvfW-LU?MlWf+bgL_M&{tJ)3E z$=iBg_5f1ufQyZ`n%_J2pUf;33KSHY#WjEyot(pewf$1=0u-=DM@h@Dtr(kM_nZq* zwxuQ28pZZko)oI?IuvM~!5S9V1X|o%0Wp6F=ommW5~=T!|1$}_L{^hMF2%M3_p9@X zD%Q8S?<24~qInGm_6Z${Z%RwAtFIq^5*;-Jz15dCd94PBX4jswad5~Xy$&J+5ZWQ1 z=RFI10{@VxHuZo4I0BA)A<({5=uX#Z!`4<4FqgjtzKyVcyZtUpAuA(8`fMrNOqYmo-#aPquf?m+XBJcKEHi7>@o$m++Zf#O%}X!rkR4R;2s4*EJT};}`P+BssfFZOVJptG4Xqc_Rrcj8*2t@`W)d z9;#jNlEdmX0^bR0Vq1|_siF5`=*25nqzm4Tb;0TxfbVc*U{EuY&RWCWS@x=D&mKZd z(iq>hP+9-Fa@3%ocqx;ia0$2t4HN2BfAr!1T6YM7l#Y$1@6c}D$=^Q>RXYN|9BOK=&)ir&Rincaf9Y2TD_(zyZY|ZC?kg@P}pe(?^fUQ?6WepnWa$ z{kww6S>BcgdgG>0Q_x)D4h#SSoL^lWhps6oHJ;4qDy2;vxTa&6vUYf&JeAx6qp&qCLv(Y@x6OONbv6Q&JM)8+gQt_xxcDRh z{)K?v%singM1tP~kawp-T?Cy%%>b<3cm$~=788OGyrA)%Mgi8`V`~6L{5V^vrk6%X z>U~g6WT#w}Q>zl%vZ-ms|H2Pm5lUk|Mb>XwvC$DpL0$R2Pr$69f@xYKLRlz?Jta{$_)pjS z9x75|a`C|XvhJi<4Ff>*7Al-jM1%aK#bifT<+;Ppoflz5AHQudeOF^(f*rHweM)hQ zdi81usFkFw3`NIv;(cKUgb$a5;m}G1Q*o_hnBG;-3pb3R{BFR+j5n{ z@k;>5CiwNAe-Ab0v#Hb#9jsCS=)~7@2aofRRL!M&FuZ=gYeM%zfurn+NiQ>rq9m%orPf62s+4vzP}g6lbZ_o>$ftGoo>_1TYa< zEZ3-Qrd4e1Q&b-Q48Cdu0H*dng?A#ec>yv12kI08J&P6-FXyiryKU!CUX`ms&lLHg z4yved8fmx96ymgm{PLML_}svH%ObzitX0;zcHUR7qEP}MZ9Hrh(G41N`#d%th=`x?$#dD)fA0p7hu zV_)m+JCiVrBs+>AcJNhqmfyTu@nVK6W2|M1aZ7QHt6)ke6-Q1o)?>i+3f%`-kE{Bl zSt(vWxN{fdUP+6QbDEH58@Z4^b|YUyo~s>AUuftS;l}I5Pt?rLb>h?nJyP9Puxdip84W3kMTWeA-#Zj8AV==dbkv@QVjbpPU zs8Wc(`wx1|{H|4tQR4z}eNIScQaakRj5f-0pyIP@43t+si3QA)r+RQRWqIFLoLTKA zBxwF+te-VOrqFIc8Gb((KiA!1wlI?sz%2fidnbU1hiA)(Hdsop`_m&F(0BW4(9)DF zn-i;TW;L|TmE(EtT0O6+HEKp^XZxxl0cK2jXHKejd6i*J1IsZqx=v;VY3G{3yAEWe zR`C2pWmZ^!@q9X~`}t4ao6Wd#d%w?A`4Rz1d&VG)QW^F_S^cuMUydKwJyJxcJ;?{@ zi=?R)=X-rsE|tDhRm^Qnc^iVE`T-T6OqP8R#q%JBRQP>m%69GUVgoU_y^NW?IP~+t zR0h^*HolOkQh6OCoNN1arSK&D-bzilkw~<}5i^PB^3BI>*J4t?Qcb0J7ERp%W+YhD z)*sP(HcB&M7oxOv+aBmK=I|7^8H!6cI!o5yDJ9J#w8v8LV&=NTf6agEPgGlztK3Yt ztV_vjsiQ6SEf8cB;NRJLTS?AU0nv;Y|te zbSK5%(aUplo<+uzgDb7G&*7f6zDhT%rL(faCp6WT?p9g;(-RzWhi&TdmBZl=(9VKj}D%BBKt+MH9eDk!>6$z|6fRq1)$(^k^Od9EgQTM76P9GuBHm<+Qs z9j*iA{R;z#%e;PC;n?0#>U+V491``@OSynnK+$AmUv}O9qiyA$?93rX@e)WZ1AdM=B)Onz^9ZUt(hGnP;VebDF~e>2Z02>u$W z@S~7wai6!_A*iS$qzqWgv^1`?3fd$2JFJK-Qmh(|Xj@zV@2riSfqvkWeZDq!=AVDi zz&p7Bi>pcLW@eV6asNub`+yyCIjGeiplQJ){8$)E_ws{WKHP49-yKKDaSd|kzCNCf zl)5{36`^ZEqi=auTy@`hm-)3(DGZJ_SUl~w?A`oX-A~c=@_DtcO*<~ zcSO4fRjjPcugKLRISWvFyt-l8bnW`}6s_1+IHk$JH#(@8VnlSFd^)5ep2-5bff`i7 zAC!%k96fp-UHKGmaKW7qYS&O6zR=uK^8=RTiloK#l9H`RX?WmvB$QHN4H!V&{|Y%8 z0*EI8uHB?l__gYCq*94+3t$zrWiJy+JzR*BPe3wYua>0u4kdS60_1e-P}J^1*rW=? zEm`bxM%5&;UY@Os#=QYIu!DzHwAYj+Bt$>Yk#V1a5G8$YRK5~}tY3gOw&MA^3y3!j z4GjzKoR%q8yl9a;prXQB9CAhlHFG$@HO z2idu~u=2i*Q7`wFG7q%_MF`fG2udOaY{%QhJ?!|4N|_TT79x!e(Y;^q=yr$R1`~N2 zX6FwO#Y3Ro@<5UOg`OtAg45QwYGF0N<_$D4qWL`ya>Sdq+8K^DJ=pIZ!ap_~T@U0b zCN~LIS@1xeZQyqq10hSTg0CtnMtBs=vJGt;Eb~pfU+zZ^4S<#0HiYdkaH7;n#coAW zFf1CwbmTvAtYAhRe;G;7<(*FgzeyiM*CDVy81nead`*=T|F&7xXpRdW8q0CukvdT;h>k!fz5-Jc14nP8DT5wabl@36B&Gwi!L3~;el?WcPy3iJWrti!d<9^3He;cuW1~&|W z`Io^H*qNF_48%j#yd>L#-@IY8zFPEsvY_FGi)MeG2ESZe&t@L?UdzF|^{Woal_ zDTe+08ME`ArB&!BgaifT0b~)vywiI#S27E+e{{y|NOL{#2YFjBgz;o?)RXyC?%&lO zAujuuRsa0UAF2RXUU39ThF|TX9n`YP0sDgpdk#3o2Ua5E5Lui-nkeI3Z?BMq-m+Y!vVukTrX6kwcY0mG69%GTLdsFOA?TB`GRemv;aq`j?6W zCUCO%eP&qnGm3Ay?GT(L@XSZS3d{f9<;K;RX*aC(z@t%3JTRYvSF~2SNZ_OFbh<({m7m2l6~UQRJhhU$db78u~Y8 z^0Oq-0HHO40~e?JoIbbNN(k^a;7I5RE@%Lca*K`}JUen{1oJ}Jt@3=Y?EGKwDs1KC z)?FJroV&L99-(=0-t=dPI+iz^4vRtsSFQegT3ND3AQ<9tL`YK(9STC&J!YP90%Swn zGlb8H*b;&zuBzq^r5zQ|iDw0mECYA}ELJalAD=g@CFZ1FwD)ST9n29DIOlyZ&(?|H ze6zJk$ARMrZ$dPhc6_}-z|O(eHJtQzs{SyH_)KtKeZy%5+nKXHJ9CVwm!3W<8`tgD z*<{Iow08zC~bF`NNmlc`*O?xSFQlMxy1es)?5`T=n#05mLQ8xiva zcy)*-^D}d#W0wv&o3dBM#O};#Kzg1>b!y@x6oKn}n?5930&a^CO$W9hq(&8Y%p~bx z^eEL!4pM1|C6u;UAMDAAi_JpV2FZ!4OeWByP_A;NkQxA*g^V-MyBjI&6&B$iyc4Eg zB)ohhSOX+r$jYKwwXcd<$RRi2(_Y;O#SH14+RKp800mnJG9zX;!)e|Mxk>;Qonx12 z1XC0;H^KB5zyd_WlII{orOjIt%ZtgkUkjmsVR?7n9G! zH4!#GWL(4F9IX%m0Lu@_D#vp3&d|eS5gL_jye82bSX9Xn2Ms7`&qR)}2#FzERl^3{VPT4m#==Q(>0rh&^r=5Tl>|O651ZoWcy5j7al$&aI#d z>RPsqK5FV&o}4D<7teQXH(6sBeiJ4BTQkD&lB#&Pte@M6xrl{Esfv6ac~d~)YXlV!dL152?C#xc=1B< zwKqK}AdmYB98%OS%6)q-#Tq%UNUjHe;jGX4%{zIXS!-Lp)^s_*hlvPIKG*EPP#l<^ z4;z7j8`05=W$pU`z>*r?*MGscv@=-hwf!^;Ip5~j^VV$x_Xi$@%dK+1V|0)BVz&(U zI;WZcdVcCTu;nH3MSQ3V8X2b4;plune`xGF2?p@*O0h>Bk+XUdde@b^O-p6d7i1P8 z`T5nCB`BFMryzA)o%wXa${ zdDXp!(b$E5*e4JS`8InGCTB{l7P`jrA}Q?aH#V!o3Zium6$@DMn8(+um6aP){b3}C z6_rW(fU@eH3o!3)-;WTTVV{X_Z^a@RkhqJNrXI8$Cf2@mPJ3HXv17V&%^tfFrp(H1 z9NN8m1&zRBecn}dW#KnBxVE9n@3;iQ&EesMY<@{GZ5k`T@+y8?@FIojBG)urps2M7 zqV68x4y^Y7_`!b7Jz#zn>SMR-m!o-BvTVsfO?+!bMDv`wS3zK&a{K0i2!wb{GmE8X zvz?KUHYaa`95IB2$G z2|(oq%#^!ZRqd@V5xr7K9`}e_-1m%#16+2$S^F2qFJBcNiyPo;W6g;d0(U0vAmvMv zNE0&C%awiw&g#Z(6tq(ssa?l>=JkE1p&x}xLUuQR5x%wUk>4S3dT$%Cd@KKTMc`ak zdRWzA5^YyJSqKivT-jOsWw*JsQ|+yn(b3~15+r0uJ>-{EEfYU(c=iR zCpM%~=nYo}vKjunaQ71F*s_^@so`N`K9T5DkOipu_|4>|@%BHZT8<*5W_7;qyq%W+ zySskY3#S(?ks>Xe3R|2Z(o_eN!=on4`5*M3$Xc35`o4?*l)4xpOM2y8Q+P2Y@##D1 zJ|M!waI_ga1t)+#iEIE$@|k%5=CkL(-3wwSM%tJ}um6QdsSQF& zcf4q&BH|npg)Sgb=o4Iet^d6vHlO#KwH;FkRHes0hzJZ0?%DlB`M21Deh=uY|KR~V z`pwJZ1i^!?q~*f78UlCbiiP4If(^n+yfnvB4?tE+z!QAD7sMW)o|&Wed+n)cKbB8FC|9P$7^SdIi zyXP-2^6r87gHY-AjvRGzaVaqE0`g4MQ3VX0tX=0ysrf5_@bpW5954BMh>CFYd*gn4 zSUmDXWx+DC5mAe{gRnbmKDzncGSc=FEcx&AC=c}_68wK($D}}f;F#*^;(y=z!uwwW zojF{;Xdu)fzkGiHJQQy z#SfvoCH9(RQVY95oyB;qf@SoTnSKbwt$-OB$xtt>yxF7MK}6VpVx?<9^#e&9yt|WM zMiD6+o24c7LD20&i!dLWz@}3;~2du{IC0wW4&J{*jB{ zkR5@r8k-fO7D2PyH_L+Y;=UG5O(JU|ax}rEqZoDhqY5bCm4QmGBJRiyZxF1xVf=#Z zuk4%2%$WdfQmev>$-EOl{qqL>CPm|qXuTv*g``Fzdchsb?+*27FM>Gjm$}UOOCVAP zO44JXg7#%3y?Y>&1v)Y}8yi^-b543iBA}QxauoQCpo%wuF3rx=x}F$*{QvLG+g1=o z)>SSAq_mE_w(|f3>|eY1dkh8g{+kEC<)uM>HWIP5{`*&QKwJwEa9Q)o{PF&;4_5_! ztmBD-V3FcQfNe}|N5%i6W%~D`ylnsSanppDX}o_nIs^CmUpC?2K`XTUZIdyew*mX- zzuwsFw9zokqjBzJC8ELd=XlsZaU*Gr`{#Orq}$tHP5@&E1bYmx4OQf2pD+BsvjhM9 zvFdMr-;T))xO?DCN#5z)MNH$6L6^~wBFvZ1;}X=?W7@y|}!z0c>07Rrlu@*Z{d~Tcw$z0JBN4od$SX_w;g#Py>7?lM;2#&SQnd3o8@A= zoKM!Mf2QYm>IGwc8Po)Y1F_UD@4xMjyZh*m+$;S1&6{n1$(g%%2R##xQSIK}CZL|C z66>KUDHuXpc=me;E>dQaihZP5RhBEhgn=!3Hh7Y!vVf-4zk%qY%jxPP$dDtiYb_fi z|1}5I^PC!os5|mn##CO&+v)q;G!Sik{&4O_=LV;(LPmUM=yK?@)JmH@TQ~maA}v{Y zdF6H-EeA9XIfWX~SC6meScH!_P?7`F2knn~zn@yZ!B=)Do8})LD3J8IE2PM7pf{6Z zpOc0CL)J~9mQ=%fRROm*q9{FgYCY;x&xgnnWxVXy#zFa}66N$#AL_E!Iuy%Jg`aF- zGpogAHlw?_Ydob^b+u^b=*tS-NBAmQz+wAi%WE$J0|jCqRoYM2JQ6%HJadQsy+-@_ zT9Y!NR1+`xd7fA~C~x)Aw`Ts=)N~j_Eqvtromu#Xlrznxf<=-;1W=uBsjB93-bim; ze)-feU1P1jxPSB#)t4=>JEuW=4TU;#q{QSV*SD4OC_FKChW=q?#Y-)2Bw^kIYqML zA6yxh3zMFwsuE7sIAG)8%jl>_eiVEQr zO>@)VbMKKgh1Mj0!*zS4h)Vm3yeA^B^)s_lZKUgV59{}h?%N$f30zDS5zW{Ts5+|X zIP}>Hnp$5h9OKi!cW0r2Oku|Z;h0^5G9^Tm?Q^zd3;OXK;pR~x;ks>oi}N160lmwgqy^M9Stw}iFI+d z^!#I69qk-2*r;&MQ1i0*QuQHd6Q3+|;Ly%4MYqY@TE?)aX?U4z{0Y8w_fkCKWET&- zeExh;zIS-qIc?hS!*vsrJaFiUqU?&*5*5!yFuv|aYNrbRS^ghSHk6IKy(hv(pFY(` zWd?)WgxGV3xYte#s_Ybt&T|{>fpd z8Q+JSn;UtT?Sl7vF>W0E+tnW^C`Qa?Dygul5JYwEE8`JDA}9NN1feS*j@5r6OT&|_14lzDPNi8H1Tct>VfM_ zYjK)ht`WC{&t}yb`_+{dMbrag{AVHEfVI5xmgJgLyfesjp7PPT7Ub`Tnf$_iIq%yJ zz}h8eAZ%Xbph&Q zkJcnOWU-y945HjYw41#Y`UGjFPImhrTqaJFIu+5(1C7}xf`#tENdd{@1;gfBivcJvOJf5b!k{KBDU+m0ISoTdJ7u5>a(o9)YdG1(Ke3f z+)HKzCAtvbYDFf#O-rjsJFN^ngO2;!W$Wtd8n)V3=4$IWd`Uk~^NJL|%E~$}i6sAF z6~BKnG3@9(Vwkw0@|H&54?iMIM!j0Ue;AcyX(@gEx|LRKo=Mv_njG z_(PXgGCc6w>}My`C$aLP9!^n^$lr>S>yj9mJ#uK*T^~*}LZbmFV@y+T$(!)b?9;h< zhUWH$KXim2uad5a;oNm2Wgj5KfF z;Uj~O44Ggme0VwB_cm$2rk`pUpTfkg3s%>Su$>WW`9xmb2Zod-#(uxG;lsPO%J1YX zUOoquf17wtjVR6YPkwyJ-}=^RUh1uNoRZdP`61UMKL~rqVlCK!E;-97&Al^Budt#&H z7PefFYH*({#-8-D9QxAoMOJQSdLf+sQen{abnH?cjnpJ8N#c;WwKv+M~~b6&)Eb4 z)!8Hx-)w&ubEY+o9q|=oZ{|LW#R>kFpM$Os75P+X56!RJK-jErD%50_^14-2Y)YzC z?NwMXPN9GKl$94d@LkH9%KR`~ZO?^e7z`AOB&~m_=v~T(T4Ks2=Z-6J5R^4JwVuAg z9CEU~N8;2F6_u0qE-Wlt38`G?;p8NelG6JW?6~@Ko%4H#Sw23Mm4EW@xFZjvC%`Dl zxI%d^{022RWl9$k%P&66`apY%h?PZ9Vv5HHe!aROD5R7nxkB#!8RNm@(L+5JBee;_ z(`Gk^r`M01Fg2Rs zK-re|B$zx{`GR?IF}+LeazkiB(@aG?kn`|G-RCl+F_yp*2b*C{uz=##N6+{ z{xmalyRs}pRKt5o8hr9oWX#>QhFJ>}b2gnz_OoRgtDqAmZCa}&MEJK(1hd6wp}R>2b1WtB zb%)hjX~OdPd0h3xz5~+7-A}BtP7~%%s-KwVKxMBr=`U4$y;W&;xGGAC%bSk3mc-`M zEWPg2w2#Hi9!} zx0x<(*I&%r^6W14H7xmFvL$wWU}Xw~)#|yH6mLBy(yFI+VZYRw8dj?CHEnRH> z+2AgM`J8^}q~*dbP~+%~@b#JUQA^4i8$T+xr1MP~?T$_|{&;8<%a|HfJ6o^cXq#v^ zZ=xAaOq})zGoxNcr+;{-wB+kBfGl)VY=gS?lnxdaMBJs0zIa-2qV=d#h)LZ5S2^-%w)Eux0n%!+6xJo3dlzaPvX$lKH+A89Eo1Zy48?e&9R zT1R&WB~nZu1;G)kd8c3xm$0$`2TWQaWZ&fzyG~0FFM7>>73uJxF82K>WZXeIr_6PJ z1L_Jc_cJkRS=#H4h3V&|E#GtE1q%xce=JU1ne3*nE(S@zC79LD7%ElT(669AJzy0l z7Zq^<2m7-KPG=-ssmN@)$_#}R_-9hrZHQkK=P72={iorq8eX}te9}HgF7(FtO!A_B zkl0bv0zbm5{p|pXeAJkTHhRKsvcewr>ec4L?qlthY+S3B?bYXwE_JN9dcZg`;&2{L zH}fw&3|w>F{4t+#aM#wsz6}g2#S=dCx#hSA0^#7I*9Z3jgD{&)?;j2>QwfjS(z6_B z_hr^EKD6XyPezlbulR244?}xY8oN+_s-3U9bYiV8b&YEiJ)>gvSQ29_pGW!bG2sxu zPgVAvRuz_gPJCiwbx(&5M=(01Z_Tuu3-uJ1WKd>H=N%_p_IdRuY|A4B!)W=lA231b zdk8$j)ul&gL+#&wNPPqEns@m;u?IGtc8eWmYZHjIr3-4(cRd(U*p^iBk>vyJg2xz) z)XJQV|7_NlJL~an77a(Sir{!$bi3Hi}8!HX`^bqwR*r@K-$#8=?vF z)W2Ru>}x-cYzpC1)_LR~czLEaGJkSgo?YK6US8c%!(LkS<{hcNbAnCj}3hi48x_-8{P3gy+`%eHTyNGNr^!wqhf z%Xos>K;Sy2eg5JY5fF+A_W0;sXSeAqMzO@P<};%p0!AUz<}?1tXJaA zy^YdzxO4ue#-z6u2e>a10N_!dCCSl0j%?w0H3*jNM)lpFuBAJa)*dhA@%^fYvH$_Q zH7R5p*Oaq3#<#snWQ-8rO{&2j_gq7H-8o&wbe+)I*BXb8p6XjYCW*PH_1MKe?xKIP zk$Q@&&^PQL`62GSSdr-n8!ewJs8cyz1fy)KWvtIgnmwR>LPzQ7wBY*zKGn93hF=+5 zCS8sVt#F^vG4WL182(#=IH>ZSNQ^A^zKN!z5wh9I$<>avb#+fv;6eEVky-vj5yUp- z+0hfo&+6T;bm|>hXuatVe)?db7He-Le*XOk+hmXTfNFEjhM5`>zh`Rc&F87h-LH8i zOGOujk>|TG+*h{TQkYfVv>HpIKrO$x%QcKADY!W?F>l+zOD|6Ja>}f$eq*qt?Wf#6 z$r|$f(22TiUEQ2i`=~)lCK|_KZLPvb+JI6h-uZt1lf(3zp+zrgOP8cRH++@Cuhyfh zlos*6EmdynDL5OcJQAfut&`G+y6U^iQzobR$rYlXigz&8y9ENcJr{nn>JPgV*C$S; zNp%jNRnp-dOFDj*J)2WU(aD>>58$kwhXcZEODgP#R+o9bgN)_>bXrX)(q$1v&+xcS z>(>#gml*wZ!QA{?NLKtgEoIja9n$TRV~GmFy5F~8l(E$EV*2gs(zVytu|EhMRx^>Q zY#&${+&SuU-19~=bmr<-2o|)BQLZ!n7`u+nPOz2YxQ+vpZyUnnuzE;9fXzNZ0MNT6 z$H;i<8W>Pwc5P?fsDyW3M$1WD+m6nblRuF>WmIs_#%6X{9q(9R+ufFy%J@Xu8I7}f z55x|F%JzPYMGsBal=6M-G_3 zlXWj}!JHC-wLjNYp2zd>%qP&Qf;Q5wp905YPlbWnQD(apndxUzA6bA1V5*OzO zgFhz`K2jCG!kwL3HRrKaK&`X(CrqCZ{Ij|Ye31-rIO%uibweOYNlhJr%uEXMB6*K@ z8@sx&&z&i#ib}d>FM3o$xzb`&70f67-SfKTy%DW7Fe$7$fyHcY$d9WAWaI$)MUn*ueht^MZ-Fa} zg#=mBX2=0TSN)P6Xs2iLd0$Lio!O}9ex-WLn*2u8yX<=j9`9)no!W9UBqA^3>Kx3L z6ZAPxx10#izeT!cV#4j@$w%*N$KMuTlrtxWLPE1;Dys25!39d}?CfEO zB_x_19eQ)_HvYk}FE$R3jQok--xjcW2skgL-OK)8l`ftC6si7SDqV&~Mu{VXGDSWy zoik2s6KHgQM3u+vo5M}n)4|*a*3(J>L)$!7 zVgaZK4X1R((;T2%ukal^zU=3rNok(>ALYKDJ^9@RbfdNw+G1@!<{@;gyW4TGkr2hL=4U6&TxZPY#AP~tb^izre;DdKHTbwPDD1}zQXJ3Zp1F^N4)=iqhp63L`cPCh8u`Kvo9KFr(uBqOtG-E| zXUCmx(Sqxs&h(}5kc5Op=3!~+7RUEz4i3ui*|Uc)@Hc$>wBQOL_alST2CK}RQdZjdJORx?&?F^UTg!)iZt5DY6QLqOn<(tU z_Jn%5t>>gGt7{`w(^ef%oBQVe%swpsrvoC!TbD1Wb)Oa;r7_|z*$mu%7Cx`Kwz;iv zqWV&sG_1|v<)Zx?GPeWt@)}@nWT;|pWoD>Y5wfy~p9Yx1y$UY!-%sxzoj=+$JLogn zTdGB!uXdF!>M604Pb19!k1A3^?7pHn;-S74i~@qTp3a8 zT18tC`$80ZKk#f14DT4bu(mI!1aa|{b^;|>CKt!3v2G^HC%t?*deJ0j&A&yzSAayY zZl30v-d#@*?r{!oboNtdT2^QpX?olk-)){IPba(_uw@7vCQ+=?`=Nf(*-yS{c|Sph)z`Ab;fMV{Uu0E(|C;V1 zd)k4xomT=C1;r_vDf~*oQpe>aM0T|TrIX|yzI~;h}J0at#_<437Idi8zI!5 zPST+JGqPp{(U@>|bT3-aM>UwyxTToD9FvbG`^OH4%+C)MVSHj7n7|0Y^N{Vu!$kr( zH824EBR?G-R#%O%_0W@ksgpnSEVKrp%tTyF8-$`$H6TT_7L3(FE*YxGz6?N?hQOq$ zE_ZG`F&apFb2eK~?^oHC-;ow#s?GUt!ZEoi-@f(JUX%|y$HrDt3kpSA0enL0Ft-YB z?>~9UTMo(wr}B&W1p$d>D8~s0ECJ$58Wzx~encsVYSFVt-vES?tnOx%{>ST|eksh< z)ReOQgImpbM$S4e?q{&Swm!vnRoi)|j0|~_`P{eCROT6dwa)kusf15_KQ#RV{r<;^ zkHbjdA~YZJUP~EFb?kIp__YNIH0}8p#5-aqw4B>Z!QI>26M{?r^Atwy@jl^=VrL*Y zqdo;i-ucy9n#C+??(sH(vi+SIsn_EMml&kc`iAGySWa;abF<@uwh3)% zie8TWRwn|I|{{i}${1PK)iY#8V*``1NQ%rVaugE}iYI_^v$Gv!v z5K~)FuP7?|HA2>iBif3OOk4Jqs=`;K;TW9aQ<5a2W0e5(cpiZYt}wEiU};AQcJQ(<^yrb0dFQy&9LdgQ zO-Em}Jf_&H44*KdgA2+~$sKS}31OHw*qeD7OOlp2+U0!lwXb^p{|9R**Z#lLl>doN zqyiM8pw6l4S_sG1k!59y=&?_WvvHR7HevfA$O?oLBHYRYQPE_XmNb?#6QT({l0sgQ z7ZBHGeh4eCTb$)xW#g8}kx^r#N7j{L(pKa#BXbG3k%XVC39>Cq?!$AuYac@4i(qg> zqBUozpNIq)R!@n6A+FwU>EAEex~`V@`HP~P-^%?byHfnWHhY^5N1BBRH^I}`e9Dbo zn&8=#D>~)YA%Cd6V#< zo;g0P%a@%}H0d?%0)+hof|e8E8NQYixO#j&{y;C<*&8q4OfnxXQYL7QgvNG{$d53< zm83g}8qBsO(vrJ>kCojtH;j`;Zxp%2x>&^az#C+iztkm|p6~=iY;qnzX%i8sRhl?KvRt8k1JThEe%j{0jK$XDIZ4FcBEo4_4gCM7m0?m_8Zmr6 zzFQ8i4c9Lj_Z*$m7#RqnSlRWMM}(~r9mk!&0~hG;%jx|8WMltLS)<+FV=eOA7nKy6 z=Xs5d=Nlc3BO7gAmnx6Qv?q5i=$BxPwZHA*j9Rv1AX7RfnA1654O?U&l|I5v`{`bP;jq#yk$d4dR7;Gzo;;-W`hiy?z zGilU8$c>>)J2Tmx8m0`{!tMHY&tJGxyD$btyI^&vFc;R)RMS^8bq)&ZGKJ*#=439I zME739RzuRh9u?Bilut~AGGHj4aTE%}+Z(zJ-ENv_B%Nl5(h?+ugM}oM4-~eeP>!r8 z`)$#Stz7rXQS!5=L#xXU0hcY`b%d8zRQ2B+bqdvh4o=s#NYq%2A5Q2Ln`@Eouqs1q zCro4f{-4sWKB}qnjALDg7TZ*3MFh;*PSv{dr4b1Vxz^DZCpazmL5l?C8)^~^69Obz z)e@19j7k?GNTy;Ctsqo{6i9|ZvKk<^5#vWB$Q7=DfFT6(&7RA&?e^EsS^l~A8<5Pm%} z;^y&24FK4qlh$>VB5NN1qm+?DczeuqYtw*xob>ysPp5%Hz&o+T^3!iDaQYg|C6e2> z2^%PLTcd9X;rWdxo%wNPKx<&vX3SoDyrqOmYK5kvKme?skcr)S<9KIdo&fq zanmSfMM@@Tf+)bC=+JMW5vcCqPa{F;*^kU>j<8nC3dc~Z3UYszuVhx}?Ez2pHE@~W z#M|_~N2_|$3eMjs|8YRDBQOKQiitv$CXt2 zfg+%DTYDS#CD!!=t?8)t1VXwyYVQK4l^m63cPr+5xh9b3TXl)KkB7w^p!v2bRqt=p zQ3A>74TawZLMt6kmSn!=SzKD`UO#tk@YLFWydvnedCJZ0@oj&e{zy;r2)<{#R>g?n zG6h!yjzJ7`0;rf-y2Gnalqgc(emONad@ z#r{p=sY1^FRW4M7xK?ZvkHv{CWw5bwo2^|#fxRksg|LPq zSGn?a$x4!xsHJjZOqQSLTC36PR$Y7loiD!Wrrfs+kOybTxSnEqEHPal{M9EB>gV5! zdDY!F1(mPA?;TtSUY!LW$ZUy6ii3Y2K!B>JZ$}&x@2Nj6dETB;HT^b_+qW0pJp{-- zh@7$|HMQ4GFfzn3ax}8nGNm0Tfec`;OBK&0(Jw5yOnZ@FPHOX*~ ze+N}HR~o-uYC3)nGwI`+&BHNS7qbH1^0?0%;Rh8%p)aZIcX8*=?);dY{4j1k1Xnfn zL7Qh(6#H!dsZ|AY{WCc^^oxwF{OFxB`OKlN{6uX;8P(Ft^7X`A_#o%^W&OBL#L=%a}J znG2lmTrw0D8@$`@ttzBme5%{9>f@pt30#Z;oKQkg>I1EjNRJI_(yj~nvi6h>sKR4 zC@2DE5P3pd5=MP-7{uAdv$()7p1IBPC3Zq_4JCrB9aITKgb65^sOQ$r6Fo`!M#C)# zYEE%EgXM7kEtP;_GhzB<*v{BexE@Q&X$rF^&H|-lX^wBNwhd=04uAL^dC;>fHh}2^JKk*6ZO@56@S5$Y2O(w$-cEYN% zqs?;e=Rn!6=%&p_Ir1U1}#eDMMirg8PA@vS&e;>G~xw8mwx7LH_xkGCYG@+C(^29ghbl%S&~ey0PT zm|h`rEhgbmpnHw5#$GunXBZfsO&Z>r30f&e3L(wFp@zKc0W?p3+` zV%p!%Y;@31wQSm31x)5uzMj7GUyn4rEZEE50UZA0t^+yqLG#xWDL89*(+`~j(L|8h zk|<2Kw~B@8`V~atWGJ;Y>xYtIYsx60u0+Z>uV>yYyUo;QaLKekD$b4=h8iKC3h^*}!{1qr#~hDvt z9Ejr5*r|AeSmjQ;GwU+FT>|1~U%R%jGyRe`-}xk9iAe?LsF4i7VjgH%8o;&1Lv zYhV=xV0c=l!06-U_sW>scR@xi8J>a|auZ+}9;zmXu*^dL6a~gWzh%_h2bxE+!_1($ z6(Nu>wIX#P2zZ$OmXWCqL3KM&-D9lh=Rs(zxR4<8mkVfApELE8`Vx_jJMFY%0- z7$1!&!lwyg>+B2F|JRT{^i+|;1-L&>UW>Syq5#qmL?o~(JCssLb_Rt~b|Z!{W?JlG$W90;Sq8~6)*{9} z5ymbIQ^r09!z|x3>VALj?)T^M{eA!WoyVgz(>bqmUa#wVJ+J5WysjhkmYz2EK7oDP zwr%6SeogE4wr#s%+qV5_x@Q;g&Ccc%4}c$kc;435*oN&C`T>0S)8Vr2sptMe5_|j;E%1Z)IeB-n2!1TU;TJa?G!zj z9Chp2=_#@9vrutpv3ubwxv()O`k8%u5XHmcSC1^(eu|e4yRCKc)wS;#hxc6DE?N^4 z6;+mEk4C>F$NCc5lak)ff(i4Rr6}9Zb_cLLS&eLdhmb}-vO45e=PfGs&m&V$(S7mO z0At#+dxvVsZ%2-&^T>PiARfV1E}YhHN2x7ge&oIXkcoBksecY8mV3&@rQmimSR77B z^L{vF7**rP6iFG%(!MO<7j|(GcAod2hryML7cahsljaA$%2W-0-W0=Li>=BlwOXBR z6!~pfF{#Ehb-!*dT-DllP7{1kut75H4&PrYHO?UO{R3Qw(^WDIXZuwBCQ<6vl{`n*yS1P%6% z%b($cN&lde(-V|Er|-!BHpkvjjf@kj-m_7CeI|C!BbB{~a#sh7D%VuCjb`z|#^H6b z`7Df@ZH;C55ic*%gx{u}Q}V5G*wN~9+^jsTjsdz+B-^Zru7)Ut9)Vc+vKaLD2-?hR zmyMMl?|rHFeOYw!6)n<-uX-_}nn58U&8u@mQ<19k2YI6(eti=f(!9Pjd2gyU4!Fp1 z0L^CJn;*u(fQ7lXFj^CnEU4%ji}NJ6zP=tq%E^k<8MHwzHQJ|nb}DPfpEVcT4MG-$ zgjBB%IxVkHVkCd}EF&xV`|VLfu2s4gmX^iRa&}G6lUc7v*SBLsjHbk}_Oc|`u>tI( zmtKA5Vq!3&72LOUZT?ChvxqX&+k|7*H4Rr>22-I%3G zyre8(j+hr*ICJt#&&Xj9yzm9bp3}Z~)lpIQIv(%cS_x|-y)5bb*tZi>}gZSA;l&Bw!{ICpRE%7ADJLnyfHpSlD*u^byGW^&%oiY%b zu|%4Oo*BKALI#%ehKPWgbAJ)3bEMy?utwt9ZXUfdzO!a0#KiJU3*+a8%G&_fdIA2Y z?`I-j)a**&Gg2PF7%HgCm)}+)X}IP9r`pAIeR%lQz9ackYoKL}u&Vc+!@qfp!9k>i z3|PMWg$h$+{*7*mJuv;2Rn8^Ag6KrH0E_V&hg0@t6@)Zz&?xuX6Xja1$|muc1R8}X zIrPu@YW4UI4h?1FaQrEU&z(EhJ&FY%D?9e>%CK3f%(O*%w4l@iKaNT!n9e7sg8eI< zN2`@_d;A6;zC8tcTkSE~MB=Xi?s@nOYWTfBK_Wvhwn_%q!ufcW=|`v3g#8exu^Rt;@kY z@Xw3m7rbVSa1?!XJ@&;(J{Y_-Y<9pB*cl?~T8K+YJQsgkAl|_1U<;gseyO;Yoxb(w ze*sx6u*{k~(bI39uI%w~bj3_020fPhZBevhW$6#@{nJ)rV!7Pa3Gu&gyrxABncwbf z5HTJI{q3?$frfu0?4=++SmFP$Nvj{f%2hK68U_tVP+mS!p&?pa?Yy z|_9nw(P7l!&sNOJ$GinqcTO?))^x2YT972HsUoKxEp3ZuN7 zh<6ox&-}|=xte@zJe~v$-+F_~CSG12V%n+3gwpGj>k`bufvKX z3{79uc+B--CUGc^wLWp)dQVeX6&q1?dpFgJ8YTEIPx0CTXVbiuS1TU2;Lpq2)M^AB z5YAP%BTmiNjmj`LXofRF7wLcDrc4zjnQ@74t0sT<&rB8XFQgq?Cv(Q3e|x@WS1!Ri zKFxVz1?T?9BYKlf5pmPg)ApOwDJZEOyAMQVGz3Zc4)|K5e%v#!MFw{3(|vxANI8+* zLP~!%MF>iBt{oQ-YMWhPUITk9y**!$X<>ml<#~W##ppmPGWMnK1}-ta;(L9#=jL_O z?_d3HsVW>Y@aLC%v|S-?j%0VgrAYMf6)k&aQzMLRS0WdvWj_~WTKvwoQ{6AU)wH6 z@PW$+fC>#k&kYC5t4pm1yp`|Igf6d&M;Z^NA*Ky{omtOxQf{zo8;V-KPq5b$+c#z< zr@FL7%B?H>0rR{^()TG-S3I{?jx$S5Nl@HM%Al6kwED8*K&6+{dv(|0e)}}%jzp(4 zSpHZAR7)#4xx4DIu5+QC1Jw$W+aEZb-Ij0)JqCw98vlb%I%rVg2yIqpw+~!EL05QE zi184q@=lJNpI^a1czwgPFy?N< zRa;Li0P)Slbp)|S@O~9qbh_JIzUXhXsr+MT=f^KxIC9!0O+D4Av)L~5{_vJLI1Vin zZCt>G6BFaOAHS;W&F-2p zdaxJdCC23H3hVYw*j}x!Yn^* z@Qg#-@aB9hWY_4pb*I@3a%t^WdiV#$_OynDl3y@25;eE|PIKUJo(vnr%Zr;xCis?; z->n7?+hJ1TS2+8LcBb~^Mun@HXG0f5F}fz-tBsOjGEG5|HFsBq%*#;`Frqhf zvN4d*O8bL+GyBmhBei8kq};!KSu}=+LkXG(X--c^hl+LT@Y3{3Yo<~nvZ zYByOuM@wXk0sK4-e7;qtivz6RJL59=Vei*N8FZ~|0R{Wa=OB3gFkQi;iqqloJac0{8RER>#mL>q?r{d^JiJ$Fj27!&i&1#g^YC($)6E66H)Hbu!{qD zTY$P*ST0%YI;Ub@?kfBSt}JbuA4^X6w+@YyHnFt`{(gZE=72)HIcrsWGhW6m$q~b_VtGeFzDKgbnkNZ{KT#JCB_A(_0q8-*D(CDhsXzjLk29-zJGo z(%ka>_8YaQ$*Jm^u8Hc}Wp3yj)@c9Y;q!ixFX7%kbJ*+?J9*C>VOw8ca&m9%O*kdT zZV4s@4S3qWnVSDA_a!mDS`1z78M*Rf#B>+8(97yh?D324MVyZ;AF`0ION+EwnQME^ zf*x*Srj10d+u-%~l1{HAg~J+Vm0Q+`)fK?=P*STTkeFZO)xdNS4;engiLd*A#)p*8 z><)SjlGbK=7m+~Sv~-KfE3Cd6IyQz7eB%`&v((kf0gQ8&WzDf?47I}GUm}H7O#lLJ z&v-C3t9<}JQM;QP6gQh9yLi)T2+W!x)-_2e+qa4iA~Yc?Dk)^(qlKywUCmh`5GuwGngc6 zLey|%tUo5WdQ5srL{S+2)oF@a=`gM~VW3!b>z}36Qy!y5tQn=Y6;H^?x+2Elm^~!$_3XM9Q#LCXu|n z^tqRoF=cEpy zPmhu#A8n?3J_lu-O~RNQ@Re{)dnO6OG9Rl^a)E_>n+hvi=FOn=6-IMRfR(cD7pPu-0}(Yuy*#VP24-})K|S0rgk9JFwk2{*zNrSN@njo7{!v(@auz-y**ia zQEgzRar8uEgy4NbG}wPbO4)y7B~EbrLN2R0Fg-S}7Ln>a$_Tpc)c)N+*1sCq2Fd{5 z%#~J&dcMslFcB)10>3SZUK`Dc)v4_(v!K96?c~GZZzd>SA78f&?lebY;BmxS`OjoN zk*wLZzW(VBx08iqWpi#13opmd2{otb7XuTM*{u&&YxzWN`IB;=NbyTEL7*otUA(05 z(3dksm!a}Amwtu)+_`w0krUFU=k!@as*!-7?zZ}z9l187TrS1uaYai)FZsk_$vBj_ z)u~vd=-PXyUD9%HQquosH%-|p}$-C~2;i&<-JUXTib6jg52Ypk?}m5NhP_4@}I`#}n~L#dr< zqWGJsGPX)4OT~@eywOA(n|z@)K5HL|^@%HEwagEy1K5g<3lCkKdIuFhQIPEFy4K2e zc~jj|EiFLIc%75>w&Xp-D`_cv#PD7tLhUDGPQ@l zJX%71`}nEltt0yJXnoTbxxQFM2CA$`)`u@M-r$9f1RyDd;?Q>VHwl_`=( zB!Vf!C0Q7&&Z}nx1XE(|&I5Lyq>LKeBpV`mOGQXEkO`ZcgJpB)<`RDe6t8%F{|T<9 zSA!*pUMXMJ0C|e;ke-mL3UBR9RlV03b~N#gS@m~g^XeRiw#>%NAwF21%crM1m%ml- zjtOr_QE+(y=z(??<`Y$3Wc8I3-f?qOoAsx&fST8T)BX|)`snhHzAA^70yyFJ;EXx) z59L}PRd&*5DaQHDOep$W8uwT2Q13E;0bj($%x7{nq%4o7;FJhHE*F@QI?Vu z5&t*=0rt8$#9FTg=B*YgzIo%wFGeQJ4KYzZkgLANqJeQ6txlvFY0ic(YbkRXA~`6s zg}xpct68mTmG{gmu(WPwCdhY2*)TVVIwX1BzX64-!9HJ0qW?(J87)LH zo#?=607)xd8-RmcSS;qIorTy%8!Zw*S!FqXCGygg&efpRyF6MV6D5ePGv|PHT*dfC zN?WC;_heASd)JX&1@o0&g7(0N#L+}Z#-!->`nplT^6hG`unX?!fa;>pqF|)da@u?4|a_=qI z*E_^;?OxJGq^00u9(*o}Zq@d0qDz|^vvETMm^`5agpVKm^QX#O+|EF%@fgbpI{^0{ z0@iUZXUu4~;3=cG8O`5xIK0mu7>{G4ha4L*_P6K==gn%5x(+geyr0OhLadPyCRmF% zRz>j8^q4S?mA-8V)}8WPs50DjK|lVRL0Zk2JY9pp&MbJ@ZxD$}S!3FPELUc^D$jmsMJD z33o^D=Pv2to#6T)JIzoNozLrQ9L89$>;?A9LTl;RdM$EJntcjX^Zl?68|Q#N@q-YF zTNNBjAfROsGP7g|9QV>=!~8m^@B4gHq@Z-LFe>Lz*3|?wx43?W{=((CezP#@sGs%n z8iX~D(XnZll>A&B3}Ervh^ffSwO8JMD9l>|%pF$jIsMk5m0b6#?)rIsE&CtK-?z8G zYnd)M)^4KYT$%4AGJsH5Iu&XsyoWN_7dI#0`*uUo_WPgC%igS{l6#B_yQx7zjNV`^ zkOVIeE^EhNj8|KJVEbHiW*x@SfT$q>53ea&H0Q+7?)ln?p?9#Yq&PxIJQ%c<6mJ4a zam{~{;!VVoow8E_XNbNI+5`+uZmm`|0>piT#*Mx%5ya>7_dNZIthVLTxNzDca>kviWF(IM780A? z7Jqzb%y;?Wa@h_ENq?J-RtFL_y$Tw%KXkgk!lMRBMq>?RNKNob)@*#r)_<84nxC3n zOFvoTw-*04-B%2EqIvB_I0V9cS@XuSZgRR0m2^+6C8X5Iz z;h!8~iOJVmyE!X4Mo)Jtx>3t$%p)Z^q{jklpRnXQZp{O^Op00!?XQ9esh(juu)}ln`z@N#uvPn7U}hmg%^2+4D8E`OsoHGNLqs+Tbtui_AvpxOz~#cp`#lsB0Z52 zT1GZk_oqJA?YZ3N>T~pO$&=$Hogd2P5AjCd)oeO5XE|z7=nRi#`3K)MEHC3o?7R;h z9h+nV=e%Z}Ybn~*;{U2LHUav4rp#kF$y?-~g18aek*22?wm#Zrkyn_tu)(|V@4B(v zf0qu{yIQrZwm~d#)Wxj0ztzc*kQp0BbhXhC6r>BK6lOUwLx9@Af7E-t>4O?xV2{KhEE-vDlE0@9YO$WSee#TLn*#q z3}3KzzP<82WAtmlkPLPsr<+y`qS!&|kstilT<=xAdv|@H31zAtKxtU2h!7AEh@G>l z%1jR*{D#bNAf&Y_Oiv=**;ejqu9L{-Ud$pbS3yk#J2}wbpW|F!T6$(^s-AvO1U>BS z(W@PY#W2l4o4nKFNcAOT{eMQS+}wn)zaRX~bOyoyDm{q(uca|U^Ql}rmazT zG2Ne95K+1@iO9=C^|d*WOazIRR&)w&lQm+nOw8STv#?sv=C4=t<)e|Rb!|3I_}p?D z;4xn6SO?OC{GO$xp!J(t0falB9eiy4=lFvnS+~r1##wi3olxy~7gBC8)2F%^R4!Ks z#S#yb;d6C)W5%){K;x9T?(XhP=Sf!8G=A<2aW{Tap|63+mHs4*a-|=G=OSw=p}#M| zXun^I=C|QKZo|sIfX#9hSwVCqLqd zKe+bvF#Co)$Z)#ToEfdmT1+exi>Ez@@)70t@PZo-mTOWjDJVz{t+!t_nn&)TWPI63 z1X+Nn9z$^ph^skVwIY72vj$}zr~u~rbNyMKK#KHQQgMYyK87qlEuN1V+GA5VJ$?V4 zAQ_Lq(kcQX@pKQ>4`~#iEErkSj3=-U&j3cm3}KOK=|y8ZZ7>#ScJQ3=Z+^gQEDV&e zrU1HO-1{4zUwHVy(HVD0F!c1(@*YzQ&1Z-<{~RCxh=_B*_HZO+O>b?F9WxIL>S-oc z>ILO#eNs@jUXPmI!xeoWS6V46JO7;EY=jWUE1H|$&ilGYMOF`nYFuW*rH2m`5WjqR zKo+=bzGqy#du)KnRP?DVbv<%riZ#22qXD( z;*=_I*f9#OZ}O0e2pRAR1a>l_HI?VC`VnCLG%0}ntCpA6@74ips04BqpDkS7Ob2|q zwacQ~$-6(wqu)55CYTT&a?LPia6P)#)MCy3zC0M?UBb6XzX839^t2WdT9L_l5tt39$6g~a31mj^#EMIgmuuE zQ0T+E1mJg2i^28CBPt^09{$+L@rhg;nfwI{(6sn09Cjdh^{NGY{{J>c7NhGY)js;w+TrrA+_cB{mm}x6jtAl`c>Z?$<;Guu zcwhCpS=--dYgrvlkG>K6jL=Lo7ANed{_lIX@5tH@m$A(?*q5JBR5=PawTiV?F}eC(3ZWhMb)GPzhpCcs{-2lRB-e*7l z(NN3q*C}8sRa<|92Py*g;-B63VkWsW8t2quHtR8J;cKZ@Wc{%Gkt-rrUXX2T>u!-8BPKM z=yAZ}0GVX`%3R%;mhw!qo%}#FAn-*)zx#WPm$a;}Z~w7`PdnQXjEVK45JQg0eh~3k zznI;}`Le*JpnI?{7aAKO41A{y2#Uq#_pO(&D9^=~#Q54k*Yg3ItHmiDh1ySduHrqb z`Z!GtR@|ePEhzu-R4pqjO+&l3xc&$4ZKrMnOWd%WCO;~xZ$JOspTNJ6aH>!?e!Sso z>&juhxJyo^tpQ7JF{U<~Z$mIXLqoy_zfb6l{nij5&#%)g^V{c_%;-NHMG{`^1))A$-k!1#Ydf zD1W;P@VZ*2ClT-hMv5HJ&GAvDaZDkPE4%(OB6fhq|DNWfS_ej z-m~6j;eA^X=?~fmlW{~IHm%Q6->E>G=8eRS&g_Lc-9b!wZEW8TfS94aQ=AI)=hhtl zBBhR4xn{dIKhixqDssecZQfXHhy%(!c-5jJlZ;zm2H$t}^qd6t=*`T6f({k9U)3g` zx8KTl(LfE+&{>N~+I`Bng4B^7bls;7C6OIeT~GUQALj;U^n^eOjVhKR2m%SE8$V{k zX?Fgm-5D@lDpfvZIJ@~cR0mA`M zEt}3FTvbp6gO$K}w;UGG3#u@x^B61sLs_Y9iStmcZXcjYX$ygMfxYX@aUP(p%0C99 zm$L_X|PoBlh^_BJ6Tir&!S&%b)Yid8zLu1ZPr?>T*TE~2ziOai3 zYwgt;BDk`Y4~YLA1UNro%e7H{?L9v(P+!ObHG|ioF;mqg4yTzwA43wSl>_IrT6D%O zfg?7LqDSjmI7Li(S$gJvuIl5J{+mD<*k}lU+6IuDSAKjoT^*A}=((DxEpSfr-^k%Z zY_9ysTS@nB9f0*j<4x>G{xNrc7Z(?ui;9ZUPl`b4n9xQ3hyk+Y1XX#`L23FEt#Vph z2^2Y2<5zwt5hP$XmOab}3fgt5sIIu!U@s?7?Af%!@7Qq{vTMH339QBjni!vLC-4MN z#no!DNYgs5Nc_jO!?kt1tCLGtlt3crS@_?B;)#4z%^j4g*c8md?pZvQ2e(lyQja1o zef+B*^JJ5ftgp&;*GS>G&8HY1KA@LwDY0wwPM8{fC9Bn{gmBJBXBsg4EC>61md9a> zq=xKw#n(4aPwM!rcWvHlp@hfGQQR2uTXOR#2j&awYR!P^#`}}#k;+RtY_&BX)OOg#*#|jFnw6yFwd?lOyy%EHF21R<`wh_^G1rXt` zvt2R{E^Sy??7C~ZJ1;u;4?o!k)#6-6ExoVFf(axc6kVp!*s6+!QveV%u%-WGFnPn< zN9kqqnRQ1plUG|2n8Dj0cin1Ui1h1a8*ZMBZEfoL(A6JNFeuQTB^IA=-=L=8%KZ9t z=#^wF4mI~TsR#H@&X7A_AJ(di&|>S8AhMbTv<^!R`4Eq~t}Rwb%St~|Tb=Y7_AUV7 zW=sY8@Wi(T1-b)GM8yvfqwh=ZQ$R#o0IrAyLik2OK|yO7U^MEEaYhE7kKBNeQ4+bU z4h7ZLE%^ZH(&RJhc$rhp>3kKqYJcazFf7+8dXzWG-T9{@K z0^Ws&Wma${QKGPZbDYh*@QaGMiB>#qLP129DD12R>XTQ8U*Z{+`<{!@SoqkmA)^H8 z42D0doUw!SX(x_xi18#{7{R)9>C%~@3XzwfO{+y8oHZzbitBqumKOm9OcsM-Q^6u= zAq6Iz{TX?5YFzk9uBP=6;l zGij(Nr7%8=;!J_R_h#>>U*ymT&X6tpJLB(_1dAt})@JMZr6|wBw4~DI-0JAFMDcQbmXQ`6zgTBr~Ho*0?%NaqKH zU~DW|ehYa&J3W%n>$h^u&`_%UZ~*Bl->FwFCafT-QUy!w~MK#?bkrQ5eLg3 z*<4Br+_R~fo)k*0>cdcR%e;}=ScH-Yb!i=UM}4@-!AJ}#;fSMLUf($JlIJc2EPiBD zb9@Ol=k}d}-B@ooMyel-1kejct6JSn2GC~Hih36^#-Mh2jOk?2@Rh}BdHt(d+V6heOjS~@{!AXYZ{OJvWSrsAWgOc(HPo$A^@`Pxs$iv z^YbySJ%nhTU0yuvm8McT8~gdRRL?SO9M$Bd`2W5vWy{Ep$5}Z8N43m-P^6vFd($L+ zFQ;CuQW6j_D^l~h58QNgT)Oqn`Q!U{iK_wrQV9agoDP^D z*f_x@!SRH+Wp&?|d!xoX^^H%PQudh}pbB$UaJ_z4UHAA|)o8oPUCM^3UiQI`?a_|! zo@+L)@cg4SVqZ>ah`~Krj0j*<6`8fDuB^6ZsVlForO3vcyBwO$RNvRK!9ss4@^(P5n7Lgx`1g~l<%H@jM zFH05Hz(!O8)gy_NK$^Q6VCl`^AuQtb*_4oLpBDwAeJ_vfsGaw{9Iz|3@g|M*FDUu@`R5moA20`=TD)CwBE{r|xYv*bX5z$48apiQ+Do*21q{ zhm&&8VW}O|qtX%&OFfO)kx*(*$SLW8^O(}-I?7FNGg)sFWQ+%)S+`k9_ok*@;|(~L zcnb7Ck47g1;&)KSk%^#vWMETZcb8kyqA18mpXgA^ClsI1f=YUn6F46Oo#aj9S>M1# zmOH8MA@Zq+5W^=u1j(9-3y7K`kx23;1kH9IGUf@qcbL~e@hLoqw6j+hd5-$DayN2> z`gDe`Ha;%QBETvC(IeT4wbd_{?SCf=3LJGW(s(s;_@Joxjb@t2M9TLRK5850Jp(2# zoZ{q4GrGoFJd(BrR>tk{1D+Cp1*t-eGoS_1_E+dN+0?=|Rai;AClf#?p%L%-Cl7;E z6^|xTQn8XV=j8k_=GSUPiC>Nsdmj%V1r-r>5i4~*?&NrHZP!S>I`Q)UJXZRkgF%5R z%v0cbEGL@wm1f3{dH5j)E@YoW-;77!H^<>p?)3oSBl8YLk-0YohMWIbubQ)X;7s+i z)}0*HfN={;vjtScfJr&fW;EqM&6_t8&aHsEq0~kbK`Nkm*?PL%m={YlKiHk^4i>^N z_fVsq)ansR;FSZWLZDVJ#*$CGDrA}y95SGkMpOWO58e*EDvo4ld|4CkYXI1|9qK!> zqHYfvk0jEAi$q!%I8P+-1b*IFDyQrl#qiy$!Ka1#*_qbgD*ZE^>TCA%tUF>fsx_od zlD?a`llk}WdiLp#k>VDNaH=WYi#9$#P2+o6OPFUY*!ObWW9?GAdUkkaSrk>HrBCL= z#-BH@9rJl5b@cDxyd_Os+KaxG$Y)fySlZ5&dv1LLF!lkYixj_+{$g(%4?%Wvq{u?f z?~!uFv$E6oZa(zwL1SYyeLkz-AmKr zQXq*(e;kJrXS~1Nh$NqP*lu4zy%A&hKX^u4dk%dz{CZgLAjdIlVed%4-Q4Ydi&TS{J61%;*T!&#HUoh#TVU14MvXaM!JlYGXr%2o1;YQvrHdC&4*{<*-71sj z#wdzFpac$2i?dS_!9_}n@DP`{0ym$L1y{w}wJX?WJZqqG4}h&H0N@1()L!LlXja#W zOqC~a;q?*!#{-uRH>Q}aM5^o)zuEc^gDgMQ_|}z&3_y;Xpz{*Fl^bCJWq`x5qwp*e^1M;4_N__N`pNE6lSg@ESV8tB?J z_|?xpq0St3u7jnqFA-o8zZr?~nB!E?9-O$TevhT?sz^x`QWKkTUF+$*@`qz`xi_&j_+Y;kQdg2H z?C`Y5!#tdgmfC!CuV2qGB7GXs7*;dGe&>Hor%(5ulH@XEboGp#vrkb_o7~QWv zm34Y%4!l(oF~9*ahwq-?!Zy#5Pl5D33nv;7KEZrjMsooW&<3<=0Iw1!?A$U0&qA~D zILl6b7(LtsSa1l*CKK_fo{>>DUHe%`h|uC_O!Wydd1N8r^v96?%TIH8FuvKD^|@x1 zp5K=C?L{kHke$&iz#hZg&wdK*HQ+cc1PDU8KpBJh;od}N$oh06W7)IhdFn4F_K)?u z*m<|}&t`Y>TdCMQufY7%b*9Ft!>V-eAJ4@O2L323_lUiwT3SR4}+@3c^4KN5fu@O z$VS@Tx;&B9$&EGu6u|*ZAbSAMLqtIN!SswGa6N5_nO+B6Y&`lvEK_Fh!mDPkTp6`d z?5mmj$y7cg%SBoXS1wp>+V`@nPrF6~w>IgD%ctHzt!Emgfkwin%?9JxIHr*1&vUohyuB5n2gU}23dfJPlFCc1x)v65nw$={e z*ozBO&`&Wz0qW$|pVQ|uN?W`^IIdHP9vvZLANLR=|Xb>P1TBWFICIeM;rUF z?Q^PuKwYIl{3&9;v-5}3ke@7O@yLsxT=I7wW4sZz9B8ym0EU2h1wl1|{GepNfmPj1 zK$W#qNZ22|AZpmCpep!x)a*vT>q z!@E~I5km#45s^R|xOtQ^Nq@441cn8Pfc_p6$xeW??t=RoT-vo0)6o}!OpH9sZZ<2<$!3o<)lBq-Ll9Q0EFaJa>)M7an|{cV@3jMk-nFW78YN6?+k3P z`}=a8XLvbTl>?nnr*R%_6RDrqg*fisdWFeLfHCf2eM?C#=-;<|^mB|~0B!{WN(4sF zDi`Eo#`Dqh&qLg-+hrlG?@0nF5fR6x$jO%KTaHKGh*)gXIZ91!*vb%Ob@i-%vZ-9D zDH9+{i_Ut{L~0s)Vq53_{26}5L~*VUOQS0PE9tX!E8Ek8y~(j^qbAK$^C~VTbuYgt z?ogsz%OwRt!E-Cnnp5`|&X|kR8w{Hdzh-hge&lQxrvSZksOX1?^S-Bqlg_TLCS^-W z348EPg!7NocJQWW{75G3q)aj@B7o{@Rg-u-yq9YZ{%NV%m_XaOEU4f?64>#2(>`%#3f+%kB=}Zz) z$I`l!$8|mOrs{OgYl-Rm^v=yLjLnIJ&T6wCc%fWK2BCQ_n9!_Cf`sR-rY#xg=do-K z{3GyhNeEF;dC#4md2gZ^<7d=}ZUHtXxd72^|LYv@?II1Fg=urxvY)Xi?vLEn=fka} z8FfVXyEAbdm=ouaIkC77UHM_$yN|)R8|1RNgRkkWd9UEv9j0~m^a*;o`qAn3ba~CWvD+3C? z2wamml&4Q~9Wf8Q`8;qH3)C-%2He#%C|*-`XdEXP4q=I)O%F9!aW$Jo=3`2M0#vpW zG>E~!?E`p1Z)Nlj9<{#?s4Z^e<@Ft-lUspK{Fqvx$#HuU=LIJ0dRMatRE26wZ?O8Y z)7bPt>vSUs$C#cz*D|K*xBk$JG+PUv*tPA+ zg!lV+Rs7fwe(n-?)Gd(N4dy{sI>r@x{+UCkMS!+co{aC7g#E+m%l(l;4xLbv9bBG4cN4y4kZdaKkfipGg6C zm%v5Trc0+>`Sf+|e*B={?I59o>rU6!^To2K&9u!_Z4ER~$@+z-Bp)iQ`OR~ZeqSFL zO$dM~xDsyui^hMPN^s#|gK9NEizXE&gnd)}w9~k-yD6ebbzf~)7Q%|&57du?0bP_r z!=nHRVh@223HgS|<0ghvg8|+9UFjMcRq9Ft%5JfoPIE1!sWWcWuW#q_0w^`GBNX^8 z2K~iZQ)QNJ`Z5!Tct^eNhGF-ueLZ6I&?mquqg;#E|E`nTo2Nw;=VnCaZy}$T*d#`S zXn&Zx?Blvg`F>jP*u^WR0hYD;H< za8n7gZl1GWx-twrOuNJ2Ap^x=_LKWzgHNRMYL52pP(!@=p6d>gtK2m#UHzvUYsOLg z@`tQDk)6TP`}V4~|GHWC-R!6w@XM|vR=o3eN6Hr5wvx{C^;y~&5!`t9;9%~bgH>=h z*Kf%Fg+s|0Dv%J<`!U5pv&|`}_uOE%79jf^G6NBxL76fYtS^X)QI2T+WHX$K`?hph z$>uZ^G7nj;x(JA`PoSHiN=QURgwBa!kZHvtvoMH4(^^M;qzY0d5m9+#JBc6*9%49I zc3!rV{1m@?94Rxeo?9ec=N$p1mpYN2^7xxQtox=3isyXQp6r{{ZOw&Rjj?I#5!Z`f zOGRTD<5(L>j|Q4z0`TgW2?ZVXpgm0`(u9|CHQ+*dt3T>Y1OvA6IgE5YVvi=jsi+Yh8OJ0u4Pg!#n>>0A-_;i^2e}LvoJZ z$OCmzmV_W4kdz%hQZEw<{2gyygE)mQ@5QcEYo+p_Ki>-*e4MwBTljwBQ=LHV3nyoG zU{%5**?(NMX{deG_}j^!&(d{t9GsjP^sPJp3FrpY@j=R`u44Dq z+gT!4oCxghwGX3f$v>$^WspYt=(AY1g0S2p4R85kWUmG$H0Q?S)abxETj$3aFYi>j|$lMBHCy3XX zYQ6pzZI@?wUXgrjcVcjgrSVP-E_LrI@{#tA16_|9cd?_kXxC)iS8_914s*Ud7uk6p z9`wRam#B)gcz^Z4gHICCB>(#&DMU$}x*WB3s@IA+9oZhAY$tNp^-@d6qq-&N(J&4u z)SPkoQn`KoWp)`qG7_b;u=bGm)BPKIk8_^tr`qaC7=yCQzjq7ym1S!u4ZWDWEd0Yz zdj#$uFq$b1!Bbo$Z3_&SQFyfc0XYRJhPAX`WDWkagKS5ERC8C*1MXzls-;t}z^&vv z`lV~H_vd*loR)s!KkB;C%Ni5*+lgT^)NzGFj zMt@#IyVS8&X&UoUpET_kzlpwoup})e2DDNc0bQP%y>dK?<+&=$8dz);BjbaTmNGpF zJIY{%DC0RcSitHFryEzv#|k-Bj%JjT1eISYDugOot9#~+d34V>qAy{%>!K(PcCRNR z63Xw#rA>adbqpJ*npKxeFX=Inoc&H=g3pPq-mhZ(Vc>?+dz~0_y;u9kxyp<9G?yPO zsY9Ou3jwITQJa@9%x@5>|3-JEjQZ|Qr^nnHscT1^%c+L*`zJ^L@Y8QywE8k~OUy-3Btp@7(UX&Dnu-E<1y%}!@gY5`e0HftO)iXic3V! z@K!;+=|0Hu9!9URjWP4VcLO(f=GKO$Hav>l)WX*f=yn;8qmna4#=)_NezE_%DsvjH zH*VZmwmiZ4?Ihi{>mfQ~naNKeA@VzWd608A#~=S_JvbXu@70x|GAsX$kzt_fe(z0= zVg<_Zk#R-(n;e;!=Po`<1Om;0wesUZyW1TxS%Ep=29>zQj(3U`Jk##z@eqWPRK;yW zvpWJ?H2C=p5Frf|dmeIruY}4zmLK}sBbSQuH#yoBJa2OT%;&!{%2WLAh|dw-yN}NZ z3-59aqi|8H_6<()Pl#vho{Mhb-Vn5ZMQwmP{A^HFt^JQ}&2w z)@CF6JSW?a6X<;=F9%dYo_#vaX%ec;((}JM{~tg~1RBVsaz`9U8|NL~VcIT|bAIxQ zR@@}6I|F=W<>k}9eDe3qmyDaHZYZ=!x_Du0%k@ea><~Dwlkf#m8k9IX{`JMB%)0TI zlP|t@sPzq+I=8BBA2gdQoG#8A8%`UzK+a)!!sKhxqA8k$m4{u~%B#+P`ey->61V0r znaQ`vK^qLQHBS+u9sLi7mz(tidq(0e>3alhp!pHuoj+*|$v}I?3us&n(^w83Bn|Ep zl6=9QYXtl~>u-OTUVRRQN9qgnreFN&=0%Qh&3cEU3e&vPCdRQb=|8?YwOmg=$K?3A zoPHthXbNmxe&143aK&7!n~RGvpj5utLm8Ksu!0gEeFjA33P?ZDy9Ts%%9{h799hnQ z&eg=^@|QS^<)KsoeOzpJbu21?@`<{0Q<|Gn6}cPBV4SUw;CBy=wf z@rHm+U!XDP|8Vx+K~1jfyZ>IY6qP25bcld7=^(viDIn5B zM0yix(wlS$OOYZ7k=|hmf+!GrlM(?Tbd=tU5ITeoA?-YI?|tTbe)F62$8m-kDHF*1 zzR&aA<+?uiA0m=Le_;eJ)d@&AKZ||GImyPo1Cgpw@1ouovAuNC6%p_)C7rxR((~sR z&vo_To)DeiOR3nf;Zg94g7(^?-&8(g#TKng6Om zQc$4j`t%L-ouv9&Tgq9~e7;7?(#xAyI_Oe$={SU6$rwIMrWMM_zn*Uv2+iD4YDm0$ zr^TC} z#^#Y?hW&b*9wnJdi5X1y`nE->2s4GOcT8FsI}9}IJPMp}B15_6_o7f!5NTU&5qxyx zq48su05#ozUyk3amAns(QdmeuhWVksnI0Pd&2r+}Qh2h&nUR0)+4Ww$L)ZZPVtxOy zYDYcZAfTF7b8#uTJ_!d6poQN--C1fXBX0#{>Aa#f7AV#r&Y&8u^(>Tng19qXt9_*( z_17el9O`+hY@;SCZKFV>cM4_5r6UJ%iy;j#P@&mpzC00yqO?(-I2VU9AV9zGRP2PO zG-}zag;_2a6DDneo0wZ5(dfpB7(3iJKjF-t({Y{pYNe)j>4+`T@*Z*j+X5Owhqq)D z4tV5bU9l*SMNx#Mq1K>9HBoo$b1-rnIUq}Xx&Am1i%tXb4gA>^Krh&sAb1i>}Vph2D^1>0J0TNEQgbKsaNZ`r7!S&!c-zGHbqI$cZzl`m+)4dMLFd?cR12lG5!f8{dCaeJ)U@Zryk`eNQYj|=}07!n+V8qzG z+sn{{C3qhUw<89Esj9s~rWJVo0^mgPvxnvDD4&~bEFh6UfcRjl%09Mc$34lKw94c? zX`|7t$=|AaiH?(-%%L-8Y{`BXn{$8|S@|It)wet6ra9jM?@x;2ggqv&JxRZQITodW z=R9tX*MzE7YM|KnBh6$5wW{ zO3%3TN9N4GY79zbJd9_uZ9{_&eYjQRFHKj}+}qNc41OM1uHPHNU921VCnX4(xnB>c zXec0MufI>yJZ34>)|f(>2PHR($X_KNb#R6Ikn;NV-l4axZs@fYubs|&1(bJYv?6WX zNg^py26>Y$g)Jh-U!7tVXw6ozH?!3Cs7HF8XjqXxqy4pF3jaRt-rK&Y+Ba42brh>* z8o#C0ttV6kW>}7M@b5p;F?#D!Zze~bv>|e zDigs`jV@KF41!}15d`)sa=O0C1IoV~SFNEywDTqx+FeTu_yB^zU&O_IuK~C?h^;5^ z;MfcSZH;J5*v-|ZO&e%CIfp0Lj^X|SA%ts#YuAH_wk18 zH+dVT;NuVoJ3q`hNXjFan3-O?a zK`&1$qPx>2Z0(6R;6+SXLxFj&A+`k;*yBF*=TCX>lZucApQoxT^r|pZk7jC;uUonSa&us>oggV@Cz2n}C}AvoZYRJlK|MxxU#`&cSPpL9v{_ zV~N7HJO3^oXaQk-{w^@gNpS}3K_s1i{V{!UjBvsx1|TiExxu?EfHRXJY=(~k1j#3A zYF+Ux{J`h+2r$R^0Ce(QsY#;+`D;-ees7Mpr=%Jwj$4rfDYY&Wx24&nkP>@8I_P@A zg~@ew1UMOWcfuSyc(|5#>U#h{C6TJryxv`Nw?TQkf`=To_lA%^R~a-_TPgP;3HPOm z{a)op2n#OUE}NwZY;%J@QPF9l+?pRO+@ADpcD`6fWa4PZa$KCG>w3k?1+V5^98t!2 z9AQqy^Y*I{e(0LPjA4sty@g`-(rhS|!(`Q`cO173x@ePCVC>g;qi+4kds`U@MNSk%PWj-ai9%n)V5hf#JNuDj*bV9p8c)!k9%7hm;)` z508y2*n)Q(9qoX{QIhc8Utp)j+|2Ia9%WyOb<+a`ep=eQeSf4dj6?)V>)~PUPt99L zA3cV@Q+xzp0#{cYu*71YIBGitw^0pgYHP=aph->lMG4<^Sj3g4X83L>c_a$Sf$@VmZd@aLdoEwMju zbnZo&?e1as#S9^wKEHD&rbCt@h292LD;S^OWwXzv6KRMW@?DAm(ft}rbpVMpDQ8qxXKnq>lQcVIP8GA>n=Pl51#Fn zy^i=~N>02+)rt4qX?-Ji=h{{6{lG?^Nci8v-1*LJq#qrgYva4{uU@>h%~lo>|Km-9 z<$8}CJKv#m6j#5w^mN+ruLkaP*&17;>{r##&m7bKjID`XN}qz~)v9ICtEiT>9cScM zRRldeYtt|KkFDt{AV1zB2CQ6J=I3)OM-nrEfcMSH{jE+2QjL5A>FG@?y&Ks>NAI%8 zx!_?RuE;kD86h4{>ywCt zq_vY=|6Sb2!b0B0$C<~oK0^XSXUa=wH_$?)g_}Jn_Soob*mRTqY(wbEn`OOZu;=vx zT*yc3g;q^c0{{qszvVVISe_GRm&-1`@fW!)#*lZjA8v#Y#dFbL@}*YVE!vCXQGKm& zrS)3tlKw5sb2mrwVs>jc%zT}__x>WK6|>aEc)&Z4b~1 z>Ga3-Hx~Inw=ZKVP%;@{sJ%4d7~^Teb@#x=Pw+o|qo;xYj(pk9Ph_CwPJQFYAejAU zL45m*U}5PY2Y-t}s)+TSa*;qoH8mNJ`P&9?l?MPU*|U5INdlCrJIh@=Jg7&CkLHgD z4eU|zI|rYj3xei#&4O979*KmLDZTl?13^jjdsX|nueAqT@;@yrB3^fYe@ofD@hOKZ z6n8@2H+$z>g6-R0uYCk+Z@zbV0*?5;V7p&$G!KT1tx}OBf|b4HGD`0~5Wi~z5H9*% zSRkBw9r~CvWF1oFij`!6!d_Fe$yk6e+awX`Ga(AVWnA7}$YzZPajZOIB%crcEvI7K zouTAC^I$MZFTrd1Bqc(u<(3bI5G!onszd&zC{CYj9r=~VQx!HX3~DR?Q1JJi(`?ns z7wIY+jeD4gk*@((@r1+k+pB{jg)QmRNbv8T$o~h<%
7_CFxkE^*7Cjy*7wAfJKx;_|KqcB_>#3&RSc;& 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 literal 0 HcmV?d00001 diff --git a/launcher/src/art.rs b/launcher/src/art.rs index ecae80714..3cc85ac96 100644 --- a/launcher/src/art.rs +++ b/launcher/src/art.rs @@ -2,7 +2,7 @@ //! and the landscape behind Home (the vanilla grass block is `browser::images::grass_block`). //! GPUI samples images smoothly, so every image is baked at the window's scale with each texel a //! whole block of device pixels, and drawn at exactly its size: the edges stay sharp. Each image -//! is made once per appearance and scale, then reused. +//! is reused until its appearance, scale or landscape width changes. use gpui::RenderImage; use horizon_theme as tokens; use std::collections::HashMap; @@ -11,8 +11,15 @@ use std::sync::Arc; /// What an image is, to find it again. #[derive(Clone, PartialEq, Eq, Hash)] enum Key { - Stone { dark: bool, scale: u32 }, - Scene { dark: bool, scale: u32 }, + Stone { + dark: bool, + scale: u32, + }, + Scene { + dark: bool, + scale: u32, + width: usize, + }, } #[derive(Default)] @@ -24,7 +31,8 @@ pub struct Art { pub const STONE: f32 = tokens::TILE_TEXEL * (tokens::TILE_TEXELS * 4) as f32; /// Home's landscape: texels of this many logical pixels, and its size in texels. pub const SCENE_TEXEL: f32 = 6.; -pub const SCENE_SIZE: (usize, usize) = (220, 56); +pub const SCENE_HEIGHT: usize = 56; +const MIN_SCENE_WIDTH: f32 = 10.; impl Art { /// The page's stone texture, for a window at `scale`. @@ -42,20 +50,33 @@ impl Art { .clone() } - /// Home's landscape: a sunset in the dark appearance, a dawn in the light one. - pub fn scene(&mut self, dark: bool, scale: f32) -> Arc { + /// Home's landscape at the banner's width, without stretching its square texels. + /// Only the current size is retained, so resizing cannot accumulate large images. + pub fn scene(&mut self, dark: bool, scale: f32, width: f32) -> (Arc, f32) { + let width = (width / SCENE_TEXEL).ceil().max(MIN_SCENE_WIDTH) as usize; let key = Key::Scene { dark, scale: scale_key(scale), + width, }; - self.made + if !self.made.contains_key(&key) { + self.made.retain(|key, _| matches!(key, Key::Stone { .. })); + } + let image = self + .made .entry(key) .or_insert_with(|| { - let (w, h) = SCENE_SIZE; let palette = if dark { &SUNSET } else { &DAWN }; - bake(&opaque(&scene(palette, 3, w, h)), w, h, SCENE_TEXEL, scale) + bake( + &opaque(&scene(palette, 3, width, SCENE_HEIGHT)), + width, + SCENE_HEIGHT, + SCENE_TEXEL, + scale, + ) }) - .clone() + .clone(); + (image, width as f32 * SCENE_TEXEL) } } @@ -320,4 +341,32 @@ mod tests { let size = image.size(0); assert_eq!((size.width.0, size.height.0), (16, 16)); } + + #[test] + fn landscape_fills_the_banner_at_narrow_and_wide_window_sizes() { + let mut art = Art::default(); + for banner_width in [696., 916., 1633.] { + let (image, drawn_width) = art.scene(true, 2., banner_width); + assert!(drawn_width >= banner_width); + assert!(drawn_width - banner_width < SCENE_TEXEL); + assert_eq!(image.size(0).width.0, (drawn_width * 2.) as i32); + assert_eq!( + image.size(0).height.0, + (SCENE_HEIGHT as f32 * SCENE_TEXEL * 2.) as i32 + ); + } + } + + #[test] + fn resizing_replaces_the_landscape_and_preserves_the_stone_cache() { + let mut art = Art::default(); + let stone = art.stone(0x0f0d17, true, 1.); + let (first, _) = art.scene(true, 1., 900.); + let (reused, _) = art.scene(true, 1., 900.); + assert!(Arc::ptr_eq(&first, &reused)); + let (resized, _) = art.scene(true, 1., 1500.); + assert!(!Arc::ptr_eq(&first, &resized)); + assert_eq!(art.made.len(), 2); + assert!(Arc::ptr_eq(&stone, &art.stone(0x0f0d17, true, 1.))); + } } diff --git a/launcher/src/main.rs b/launcher/src/main.rs index db2309dd6..842d21b3b 100644 --- a/launcher/src/main.rs +++ b/launcher/src/main.rs @@ -19,12 +19,13 @@ mod perf; mod scrollbar; mod servers_page; mod theme; +mod titlebar; use gpui::{ actions, div, ease_out_quint, prelude::*, px, relative, size, Animation, AnimationExt, AnyElement, App, Application, Bounds, ClickEvent, Context, Div, ElementId, FocusHandle, FontWeight, Hsla, KeyBinding, KeyDownEvent, Menu, MenuItem, PathPromptOptions, SharedString, - Stateful, Subscription, TitlebarOptions, Window, WindowBounds, WindowOptions, + Stateful, Subscription, Window, WindowBounds, WindowOptions, }; use horizon_launcher::account::{self, Accounts, SignIn, SignInState}; use horizon_launcher::backend::{self, Job, Msg, Release, Running, Settings, Updates}; @@ -1313,11 +1314,10 @@ fn megabytes(bytes: u64) -> String { // ----- Pages ------------------------------------------------------------------------------------- impl Launcher { - /// The top bar: the mark and the name over the sidebar, the pages with their icons, then - /// the account playing and the Settings button. + /// The top bar: the pages with their icons, then the account and Settings. fn topbar(&mut self, cx: &mut Context) -> Div { let t = self.theme; - let mut nav = div().flex().h_full().gap(px(2.)); + let mut nav = div().flex().flex_none().h_full().gap(px(2.)); for (page, label, icon) in Page::ALL { if page == Page::Settings { continue; @@ -1372,6 +1372,8 @@ impl Launcher { let account = keyboard(div().id("account"), &t) .relative() .flex() + .min_w_0() + .max_w(px(180.)) .items_center() .gap(px(10.)) .h(px(40.)) @@ -1395,8 +1397,10 @@ impl Launcher { div() .flex() .flex_col() + .min_w_0() .child( blocks::pixel(14., FontWeight::MEDIUM) + .truncate() .text_color(t.ink) .child(name), ) @@ -1448,25 +1452,12 @@ impl Launcher { .bg(t.side) .border_b_2() .border_color(t.outline) - .child( - div() - .flex() - .flex_none() - .items_center() - .gap(px(10.)) - .w(px(theme::SIDEBAR - 18.)) - .child(mark(24., &t)) - .child( - blocks::pixel(20., FontWeight::SEMIBOLD) - .text_color(t.ink) - .child("HORIZON"), - ), - ) .child(nav) .child( div() .ml_auto() .flex() + .flex_none() .items_center() .gap(px(8.)) .child(account) @@ -1835,7 +1826,7 @@ impl Launcher { wrap } - fn play_page(&mut self, cx: &mut Context) -> Div { + fn play_page(&mut self, banner_width: f32, cx: &mut Context) -> Div { let t = self.theme; let Some(tag) = self.selected().cloned() else { // No hero without a version: the page starts below the top bar like the others. @@ -1994,7 +1985,7 @@ impl Launcher { // The banner: Horizon's landscape (`art.rs`) under a veil of the page colour, the hero and // the Play row over it. It reaches the content's edges and the top bar. - let scene = self.art.scene(t.dark, self.scale); + let (scene, scene_width) = self.art.scene(t.dark, self.scale, banner_width); let veil = |angle: f32, from: f32, to: f32, at: f32| { div() .absolute() @@ -2007,15 +1998,14 @@ impl Launcher { gpui::linear_color_stop(t.page.opacity(to), at), )) }; - let (w, h) = art::SCENE_SIZE; let banner = div() .relative() .flex() .flex_col() .justify_end() .min_h(px(340.)) - .mx(px(-32.)) - .px(px(32.)) + .mx(px(-theme::PAGE_GUTTER)) + .px(px(theme::PAGE_GUTTER)) .pb(px(28.)) .gap(px(24.)) .overflow_hidden() @@ -2027,8 +2017,8 @@ impl Launcher { .absolute() .bottom_0() .left_0() - .w(px(w as f32 * art::SCENE_TEXEL)) - .h(px(h as f32 * art::SCENE_TEXEL)), + .w(px(scene_width)) + .h(px(art::SCENE_HEIGHT as f32 * art::SCENE_TEXEL)), ) .child(veil(90., 0.82, 0., 0.62)) .child(veil(180., 0., 0.75, 1.)) @@ -3251,8 +3241,10 @@ impl Render for Launcher { self.friend_focused = self.friend_focus.is_focused(window); self.mods.note_focus(window); self.args_focused = self.args_focus.is_focused(window); + let size = window.viewport_size(); + let banner_width = f32::from(size.width) - theme::SIDEBAR - scrollbar::GUTTER; let content = match self.page { - Page::Play => self.play_page(cx), + Page::Play => self.play_page(banner_width, cx), Page::Versions => self.versions_page(cx), Page::Mods => self.mods_page(cx), Page::Servers => self.servers_page(cx), @@ -3265,7 +3257,6 @@ impl Render for Launcher { .w_full() // Let the page shrink inside the padded flex row so long notices can wrap. .min_w_0() - .max_w(px(1152.)) .child(content) .with_animation( ElementId::named_usize("page", self.switches), @@ -3277,7 +3268,6 @@ impl Render for Launcher { if self.opening.is_none() && window.focused(cx).is_none() { window.focus(&self.root_focus); } - let size = window.viewport_size(); let stone = self.art.stone(t.page_rgb, t.dark, window.scale_factor()); let topbar = self.topbar(cx); let sidebar = self.sidebar(cx); @@ -3333,7 +3323,9 @@ impl Render for Launcher { .child( div() .flex() - .px(px(32.)) + .w_full() + .min_w_0() + .px(px(theme::PAGE_GUTTER)) .pt(px(if self.page == Page::Play { 0. } else { @@ -3411,7 +3403,13 @@ impl Render for Launcher { }), ); } - root + div() + .flex() + .flex_col() + .size_full() + .bg(t.side) + .children(titlebar::render(&t, window)) + .child(root.flex_1().min_h_0()) } } @@ -3533,10 +3531,7 @@ fn main() { WindowOptions { window_bounds: Some(WindowBounds::Windowed(bounds)), window_min_size: Some(size(px(960.), px(600.))), - titlebar: Some(TitlebarOptions { - title: Some("Horizon".into()), - ..Default::default() - }), + titlebar: Some(titlebar::options()), app_id: Some("horizon-launcher".into()), ..Default::default() }, diff --git a/launcher/src/scrollbar.rs b/launcher/src/scrollbar.rs index 757d3525e..723c98cca 100644 --- a/launcher/src/scrollbar.rs +++ b/launcher/src/scrollbar.rs @@ -6,6 +6,9 @@ use gpui::{ }; use std::{cell::Cell, rc::Rc}; +/// Space reserved beside scroll content for the track and its padding. +pub const GUTTER: f32 = 16.; + #[derive(Clone, Default)] pub(crate) struct Scrollbar { pub handle: ScrollHandle, @@ -60,7 +63,7 @@ impl Scrollbar { .child( content .track_scroll(&self.handle) - .mr(px(16.)) + .mr(px(GUTTER)) // Nested scroll areas must not also move the page behind them. .on_scroll_wheel(|_, _, cx| cx.stop_propagation()), ) diff --git a/launcher/src/theme.rs b/launcher/src/theme.rs index 6425232c5..60b796709 100644 --- a/launcher/src/theme.rs +++ b/launcher/src/theme.rs @@ -24,6 +24,7 @@ pub const CONTROL: f32 = 34.; /// The top bar, and the sidebar of instances and servers. pub const TOPBAR: f32 = 56.; pub const SIDEBAR: f32 = 248.; +pub const PAGE_GUTTER: f32 = 32.; /// Motion: short and eased out, never bouncy. pub const QUICK: Duration = tokens::QUICK.duration(); diff --git a/launcher/src/titlebar.rs b/launcher/src/titlebar.rs new file mode 100644 index 000000000..3ff88a3ef --- /dev/null +++ b/launcher/src/titlebar.rs @@ -0,0 +1,153 @@ +//! Custom Windows chrome. Other platforms keep their native window decorations. +use crate::theme::Theme; +use gpui::{Div, TitlebarOptions, Window}; + +pub fn options() -> TitlebarOptions { + TitlebarOptions { + title: Some("Horizon".into()), + appears_transparent: cfg!(target_os = "windows"), + ..Default::default() + } +} + +#[cfg(not(target_os = "windows"))] +pub fn render(_theme: &Theme, _window: &Window) -> Option

{ + None +} + +#[cfg(target_os = "windows")] +mod windows { + use super::*; + use crate::{blocks, mark}; + use gpui::{div, prelude::*, px, FontWeight, Stateful, WindowControlArea}; + + const HEIGHT: f32 = 32.; + const BUTTON_WIDTH: f32 = 46.; + const RESIZE_INSET: f32 = 5.; + + #[derive(Clone, Copy)] + enum Control { + Minimize, + Maximize, + Close, + } + + impl Control { + fn area(self) -> WindowControlArea { + match self { + Self::Minimize => WindowControlArea::Min, + Self::Maximize => WindowControlArea::Max, + Self::Close => WindowControlArea::Close, + } + } + + fn name(self) -> &'static str { + match self { + Self::Minimize => "window-minimize", + Self::Maximize => "window-maximize", + Self::Close => "window-close", + } + } + } + + fn control_icon(control: Control, maximized: bool, theme: &Theme) -> Div { + let square = || { + div() + .absolute() + .size(px(10.)) + .border_1() + .border_color(theme.ink_soft) + }; + let icon = div().relative().size(px(14.)); + match control { + Control::Minimize => icon.child( + div() + .absolute() + .left(px(2.)) + .top(px(7.)) + .w(px(10.)) + .h(px(1.)) + .bg(theme.ink_soft), + ), + Control::Maximize if maximized => icon + .child( + div() + .absolute() + .left(px(4.)) + .top_0() + .size(px(10.)) + .border_t_1() + .border_r_1() + .border_color(theme.ink_soft), + ) + .child(square().left(px(1.)).top(px(3.))), + Control::Maximize => icon.child(square().left(px(2.)).top(px(2.))), + Control::Close => { + let hover_color = theme.page; + icon.child( + blocks::icon("close", 14., theme.ink_soft) + .group_hover("window-close", move |style| style.text_color(hover_color)), + ) + } + } + } + + fn control_button(control: Control, theme: &Theme, maximized: bool) -> Stateful
{ + let theme = *theme; + div() + .id(control.name()) + .group(control.name()) + .flex() + .flex_none() + .items_center() + .justify_center() + .w(px(BUTTON_WIDTH)) + .h_full() + .text_color(theme.ink_soft) + // GPUI maps these to native non-client hit tests, retaining Snap Layouts, + // Alt+Space and close handling. Click callbacks would run the action twice. + .window_control_area(control.area()) + .hover(move |style| match control { + Control::Close => style.bg(theme.danger).text_color(theme.page), + _ => style.bg(theme.raised), + }) + .child(control_icon(control, maximized, &theme)) + } + + pub fn render(theme: &Theme, window: &Window) -> Option
{ + let drag = div() + .id("window-drag") + .flex() + .flex_1() + .h_full() + .items_center() + .gap(px(8.)) + .px(px(12.)) + .window_control_area(WindowControlArea::Drag) + .child(mark(16., theme)) + .child(blocks::pixel(13., FontWeight::MEDIUM).child("Horizon")); + Some( + div() + .flex() + .flex_none() + .items_center() + .h(px(HEIGHT)) + // Control hit tests run before native edge resizing in GPUI 0.2.2. + .when(!window.is_maximized(), |bar| { + bar.pt(px(RESIZE_INSET)).px(px(RESIZE_INSET)) + }) + .bg(theme.side) + .text_color(theme.muted) + .border_b_1() + .border_color(theme.outline) + .child(drag) + .children( + [Control::Minimize, Control::Maximize, Control::Close] + .map(|control| control_button(control, theme, window.is_maximized())), + ), + ) + } +} + +#[cfg(target_os = "windows")] +pub use windows::render; From 1be8a4caeaed1bd48a8feb8f249bbe6c90042583 Mon Sep 17 00:00:00 2001 From: RobertTGreat Date: Sat, 24 Oct 2026 18:34:08 +0100 Subject: [PATCH 009/140] fix(launcher): defer hardware probes and hide Windows consoles Collect performance-report hardware after the first frame and preserve logs, input and CLI pipes while suppressing background terminal windows. Co-Authored-By: OpenAI Codex (GPT-6.1 Sol) --- crates/horizon-bench/src/hardware.rs | 10 +- crates/horizon-bench/src/lib.rs | 8 +- crates/horizon-prepare/src/java.rs | 22 ++++- crates/horizon-server/src/engine.rs | 6 +- crates/horizon-server/src/main.rs | 1 + crates/horizon-server/src/process.rs | 18 ++++ crates/horizon-server/src/service.rs | 4 +- crates/horizon-server/src/update.rs | 7 +- crates/horizon-telemetry/src/system.rs | 13 ++- launcher/README.md | 6 ++ launcher/src/agents.rs | 4 +- launcher/src/agents_page.rs | 2 +- launcher/src/backend.rs | 15 +-- launcher/src/cli_tools.rs | 2 +- launcher/src/console.rs | 48 ++++++++++ launcher/src/game_tools.rs | 4 +- launcher/src/lib.rs | 1 + launcher/src/main.rs | 7 ++ launcher/src/perf.rs | 97 +++++++++++++++++++- launcher/src/process.rs | 22 +++++ launcher/src/servers.rs | 8 +- launcher/src/sources.rs | 2 +- launcher/src/tailscale.rs | 7 +- launcher/tests/hidden_processes.rs | 116 ++++++++++++++++++++++++ launcher/tests/startup.rs | 88 ++++++++++++++++++ launcher/tests/support/console_probe.rs | 73 +++++++++++++++ launcher/tests/support/mod.rs | 29 ++++++ 27 files changed, 570 insertions(+), 50 deletions(-) create mode 100644 crates/horizon-server/src/process.rs create mode 100644 launcher/src/console.rs create mode 100644 launcher/src/process.rs create mode 100644 launcher/tests/hidden_processes.rs create mode 100644 launcher/tests/startup.rs create mode 100644 launcher/tests/support/console_probe.rs create mode 100644 launcher/tests/support/mod.rs diff --git a/crates/horizon-bench/src/hardware.rs b/crates/horizon-bench/src/hardware.rs index 17e460bed..6b91202ad 100644 --- a/crates/horizon-bench/src/hardware.rs +++ b/crates/horizon-bench/src/hardware.rs @@ -174,7 +174,15 @@ pub fn cpu_seconds(pid: u32) -> Option { } fn output(program: &str, args: &[&str]) -> Option { - let out = Command::new(program).args(args).output().ok()?; + let mut command = Command::new(program); + command.args(args); + #[cfg(windows)] + { + use std::os::windows::process::CommandExt; + const CREATE_NO_WINDOW: u32 = 0x0800_0000; + command.creation_flags(CREATE_NO_WINDOW); + } + let out = command.output().ok()?; let text = String::from_utf8(out.stdout).ok()?.trim().to_owned(); (out.status.success() && !text.is_empty()).then_some(text) } diff --git a/crates/horizon-bench/src/lib.rs b/crates/horizon-bench/src/lib.rs index bdc885af1..ae70977bd 100644 --- a/crates/horizon-bench/src/lib.rs +++ b/crates/horizon-bench/src/lib.rs @@ -245,13 +245,19 @@ pub struct Report { impl Report { /// An empty report for this machine, created now. pub fn new(kind: Kind, app: App) -> Report { + Self::with_hardware(kind, app, Hardware::detect()) + } + + /// Starts a report using supplied hardware, without running system probes. + /// Interactive apps can collect the remaining machine details after their first frame. + pub fn with_hardware(kind: Kind, app: App, hardware: Hardware) -> Report { Report { format: FORMAT.to_owned(), version: VERSION, kind, created: utc_now(), app, - hardware: Hardware::detect(), + hardware, conditions: Conditions::default(), metrics: BTreeMap::new(), frames: Vec::new(), diff --git a/crates/horizon-prepare/src/java.rs b/crates/horizon-prepare/src/java.rs index a159fb055..78530486c 100644 --- a/crates/horizon-prepare/src/java.rs +++ b/crates/horizon-prepare/src/java.rs @@ -1,6 +1,7 @@ //! The JDK that compiles and runs the vanilla exporters. They call Mojang's own code, so they //! stay Java; everything around them is here. +use std::ffi::OsStr; use std::fs; use std::path::{Path, PathBuf}; use std::process::{Command, Stdio}; @@ -13,6 +14,19 @@ pub struct Jdk { const TIMEOUT: Duration = Duration::from_secs(3600); +/// Exporters and JDK probes write to pipes or log files, never to a new terminal. +fn command(program: impl AsRef) -> Command { + let mut command = Command::new(program); + command.stdin(Stdio::null()); + #[cfg(windows)] + { + use std::os::windows::process::CommandExt; + const CREATE_NO_WINDOW: u32 = 0x0800_0000; + command.creation_flags(CREATE_NO_WINDOW); + } + command +} + fn executable(dir: &Path, name: &str) -> PathBuf { dir.join(if cfg!(windows) { format!("{name}.exe") @@ -29,7 +43,7 @@ fn on_path(name: &str) -> Option { /// The major version `javac -version` reports ("javac 25.0.1" → 25; "javac 1.8.0" → 8). fn javac_major(javac: &Path) -> Result { - let output = Command::new(javac) + let output = command(javac) .arg("-version") .stdin(Stdio::null()) .output() @@ -183,7 +197,7 @@ pub fn find(major: i64, more: &[PathBuf]) -> Result { candidates.push((javac, java, "PATH")); } if cfg!(target_os = "macos") { - if let Ok(out) = Command::new("/usr/libexec/java_home") + if let Ok(out) = command("/usr/libexec/java_home") .args(["-v", &major.to_string()]) .stderr(Stdio::null()) .output() @@ -260,7 +274,7 @@ impl Jdk { /// `javac --release -proc:none` with Python's `subprocess.run(..., check=True, /// stdout=log, stderr=STDOUT, timeout=3600)`. pub fn javac(&self, major: i64, args: &[String], log: &fs::File) -> Result<(), String> { - let mut command = Command::new(&self.javac); + let mut command = command(&self.javac); command .args(["--release", &major.to_string(), "-proc:none"]) .args(args); @@ -268,7 +282,7 @@ impl Jdk { } pub fn java(&self, args: &[String], cwd: Option<&Path>, log: &fs::File) -> Result<(), String> { - let mut command = Command::new(&self.java); + let mut command = command(&self.java); command.args(args); if let Some(dir) = cwd { command.current_dir(dir); diff --git a/crates/horizon-server/src/engine.rs b/crates/horizon-server/src/engine.rs index 051ae77f0..fd7c86321 100644 --- a/crates/horizon-server/src/engine.rs +++ b/crates/horizon-server/src/engine.rs @@ -68,7 +68,8 @@ pub fn program_in( /// system can't load the program, as on a Linux without the ALSA and udev libraries the full game links /// (the server build doesn't). The reason, with what to install. pub fn check_starts(program: &Path) -> Result<(), String> { - let output = Command::new(program) + let mut command = crate::process::command(program); + let output = command .arg("--help") .stdin(Stdio::null()) .stdout(Stdio::null()) @@ -176,7 +177,8 @@ pub fn spawn(program: &Path, resources: &Path, dir: &Path) -> std::io::Result) -> Command { + let mut command = Command::new(program); + configure(&mut command); + command +} + +fn configure(command: &mut Command) { + #[cfg(windows)] + { + use std::os::windows::process::CommandExt; + command.creation_flags(windows_sys::Win32::System::Threading::CREATE_NO_WINDOW); + } + #[cfg(not(windows))] + let _ = command; +} diff --git a/crates/horizon-server/src/service.rs b/crates/horizon-server/src/service.rs index 6e6d59f23..96b9f218f 100644 --- a/crates/horizon-server/src/service.rs +++ b/crates/horizon-server/src/service.rs @@ -178,7 +178,7 @@ fn systemd_path(service: &str, system: bool) -> Result { } fn run(program: &str, args: &[&str]) -> Result<(), String> { - let status = Command::new(program) + let status = crate::process::command(program) .args(args) .status() .map_err(|e| format!("{program}: {e}"))?; @@ -191,7 +191,7 @@ fn run(program: &str, args: &[&str]) -> Result<(), String> { /// A step that may fail harmlessly (stopping what isn't running): its output would only alarm. fn quiet(program: &str, args: &[&str]) { - let _ = Command::new(program) + let _ = crate::process::command(program) .args(args) .stdout(std::process::Stdio::null()) .stderr(std::process::Stdio::null()) diff --git a/crates/horizon-server/src/update.rs b/crates/horizon-server/src/update.rs index cbcfe637e..8c87c66bc 100644 --- a/crates/horizon-server/src/update.rs +++ b/crates/horizon-server/src/update.rs @@ -10,7 +10,6 @@ use serde_json::{Value, json}; use std::{ io::Read, path::{Path, PathBuf}, - process::Command, time::{Duration, Instant}, }; @@ -206,7 +205,7 @@ fn point(link: &Path, target: &Path) -> std::io::Result<()> { if link.exists() || link.symlink_metadata().is_ok() { std::fs::remove_dir(link)?; } - let status = Command::new("cmd") + let status = crate::process::command("cmd") .arg("/C") .arg("mklink") .arg("/J") @@ -474,7 +473,7 @@ pub fn unpack(install: &Install, archive: &Path, tag: &str) -> Result Option { - let out = std::process::Command::new(program) - .args(args) - .output() - .ok()?; + let mut command = std::process::Command::new(program); + command.args(args); + #[cfg(windows)] + { + use std::os::windows::process::CommandExt; + const CREATE_NO_WINDOW: u32 = 0x0800_0000; + command.creation_flags(CREATE_NO_WINDOW); + } + let out = command.output().ok()?; let text = String::from_utf8_lossy(&out.stdout).trim().to_owned(); (out.status.success() && !text.is_empty()).then_some(text) } diff --git a/launcher/README.md b/launcher/README.md index cf968f93c..d2b78daea 100644 --- a/launcher/README.md +++ b/launcher/README.md @@ -97,6 +97,12 @@ page `servers.json` (the list), `servers//` (the servers created there) an Long pages, dialogs, the server console and data previews have a visible scrollbar when their content overflows. Drag the thumb or click the track to navigate without a mouse wheel. +On Windows, desktop launches and background tools run without terminal windows. Preparation +and server logs still reach the launcher, and CLI commands keep their terminal or redirected +input and output, including MCP. +Hardware details for performance reports are collected in the background after the first +frame, so Windows hardware queries do not delay the window opening. + ## Updates The launcher looks for a newer Horizon release when it starts and every 30 minutes while it diff --git a/launcher/src/agents.rs b/launcher/src/agents.rs index 0cc012b43..2baf198c6 100644 --- a/launcher/src/agents.rs +++ b/launcher/src/agents.rs @@ -122,8 +122,8 @@ pub fn locate(program: &str) -> std::path::PathBuf { /// Settings page's "Test the connection". pub fn self_test(exe: &Path) -> Result { use std::io::Write; - use std::process::{Command, Stdio}; - let mut child = Command::new(exe) + use std::process::Stdio; + let mut child = crate::process::command(exe) .arg("mcp") .stdin(Stdio::piped()) .stdout(Stdio::piped()) diff --git a/launcher/src/agents_page.rs b/launcher/src/agents_page.rs index ecb393bf0..e53d6550a 100644 --- a/launcher/src/agents_page.rs +++ b/launcher/src/agents_page.rs @@ -207,7 +207,7 @@ impl Launcher { /// Runs a client's add command; (went well, what it said). fn run_add(program: &str, args: &[String]) -> (bool, String) { - match std::process::Command::new(agents::locate(program)) + match horizon_launcher::process::command(agents::locate(program)) .args(args) .output() { diff --git a/launcher/src/backend.rs b/launcher/src/backend.rs index 9612bda2b..104a086a5 100644 --- a/launcher/src/backend.rs +++ b/launcher/src/backend.rs @@ -943,7 +943,7 @@ pub fn default_minecraft_dir() -> Option { } fn found(program: &str, arg: &str) -> bool { - Command::new(program) + crate::process::command(program) .arg(arg) .stdout(Stdio::null()) .stderr(Stdio::null()) @@ -1239,14 +1239,14 @@ pub fn sounds(tag: &str, minecraft: &Path, log: &dyn Fn(String)) { let own = horizon_prepare::sources_sha256(&dir.join(PREPARER_CRATE)).as_deref() == Some(horizon_prepare::SOURCES_SHA256); let binary = preparer_binary(&dir).filter(|binary| { - !own && Command::new(binary) + !own && crate::process::command(binary) .arg("--help") .output() .is_ok_and(|o| String::from_utf8_lossy(&o.stdout).contains("horizon-prepare sounds")) }); log("Copying the sounds from your Minecraft install".into()); let result = match binary { - Some(binary) => Command::new(binary) + Some(binary) => crate::process::command(binary) .current_dir(&dir) .arg("sounds") .arg("--root") @@ -1877,16 +1877,10 @@ fn parse_version_output(out: &str) -> Option<&str> { /// The version of the launcher binary now at `path`, which is not this process's once another /// update (the command line, another window) has replaced the file. fn installed_launcher_version(path: &Path) -> Option { - let mut cmd = Command::new(path); + let mut cmd = crate::process::command(path); cmd.arg("--version") .stdin(Stdio::null()) .stderr(Stdio::null()); - #[cfg(windows)] - { - use std::os::windows::process::CommandExt; - const CREATE_NO_WINDOW: u32 = 0x0800_0000; - cmd.creation_flags(CREATE_NO_WINDOW); - } let out = cmd.output().ok()?; parse_version_output(&String::from_utf8_lossy(&out.stdout)).map(String::from) } @@ -2220,6 +2214,7 @@ impl Running { } pub fn spawn(job: Job, mut cmd: Command, tx: Sender) -> Result { + crate::process::hide_console(&mut cmd); let mut child = cmd .stdin(Stdio::piped()) .stdout(Stdio::piped()) diff --git a/launcher/src/cli_tools.rs b/launcher/src/cli_tools.rs index ff351f4b3..e420576b5 100644 --- a/launcher/src/cli_tools.rs +++ b/launcher/src/cli_tools.rs @@ -210,7 +210,7 @@ impl Tool { pub fn call(&self, args: &Value) -> Result { let words = self.argv(args)?; let exe = std::env::current_exe().map_err(|e| e.to_string())?; - let out = std::process::Command::new(exe) + let out = horizon_launcher::process::command(exe) .arg("--json") .args(&words) .stdin(std::process::Stdio::null()) diff --git a/launcher/src/console.rs b/launcher/src/console.rs new file mode 100644 index 000000000..b12067139 --- /dev/null +++ b/launcher/src/console.rs @@ -0,0 +1,48 @@ +//! A desktop launch has no console; CLI commands can use the invoking terminal or pipes. +#[cfg(windows)] +pub fn attach_for_cli() -> std::io::Result<()> { + use std::ffi::c_void; + + const ATTACH_PARENT_PROCESS: u32 = u32::MAX; + const STD_INPUT_HANDLE: u32 = -10_i32 as u32; + const STD_OUTPUT_HANDLE: u32 = -11_i32 as u32; + const STD_ERROR_HANDLE: u32 = -12_i32 as u32; + const INVALID_HANDLE_VALUE: isize = -1; + + #[link(name = "kernel32")] + extern "system" { + fn AttachConsole(process_id: u32) -> i32; + fn GetStdHandle(kind: u32) -> *mut c_void; + fn SetStdHandle(kind: u32, handle: *mut c_void) -> i32; + } + + if std::env::args_os().nth(1).is_none() { + return Ok(()); + } + // Attaching can replace the standard handles. Keep inherited pipes/files intact for + // JSON output, MCP and redirected logs, while filling missing handles from the terminal. + // SAFETY: These APIs take numeric constants and opaque handles returned by Windows. + // No handles are closed or dereferenced, and this runs before any worker starts. + unsafe { + let handles = [STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE] + .map(|kind| (kind, GetStdHandle(kind))); + if AttachConsole(ATTACH_PARENT_PROCESS) == 0 { + // No parent console (for example, an MCP client), or already attached. + return Ok(()); + } + for (kind, handle) in handles { + if handle.is_null() || handle as isize == INVALID_HANDLE_VALUE { + continue; + } + if SetStdHandle(kind, handle) == 0 { + return Err(std::io::Error::last_os_error()); + } + } + } + Ok(()) +} + +#[cfg(not(windows))] +pub fn attach_for_cli() -> std::io::Result<()> { + Ok(()) +} diff --git a/launcher/src/game_tools.rs b/launcher/src/game_tools.rs index 3504a531f..efa219396 100644 --- a/launcher/src/game_tools.rs +++ b/launcher/src/game_tools.rs @@ -6,7 +6,7 @@ use horizon_launcher::backend; use serde_json::{json, Value}; use std::io::{BufRead, BufReader, Write}; use std::path::PathBuf; -use std::process::{Child, ChildStdin, ChildStdout, Command, Stdio}; +use std::process::{Child, ChildStdin, ChildStdout, Stdio}; pub const PREFIX: &str = "game_"; @@ -61,7 +61,7 @@ impl GameTools { if !ctl.exists() { return Err(format!("{tag} has no {CTL}")); } - let mut child = Command::new(&ctl) + let mut child = horizon_launcher::process::command(&ctl) .arg("--socket") .arg(socket_path()) .arg("mcp") diff --git a/launcher/src/lib.rs b/launcher/src/lib.rs index aa8aec7f2..4b5c164fd 100644 --- a/launcher/src/lib.rs +++ b/launcher/src/lib.rs @@ -9,6 +9,7 @@ pub mod game_app; pub mod heads; pub mod modpacks; pub mod mojang; +pub mod process; pub mod servers; pub mod signed; pub mod sources; diff --git a/launcher/src/main.rs b/launcher/src/main.rs index db2309dd6..9d5d36b60 100644 --- a/launcher/src/main.rs +++ b/launcher/src/main.rs @@ -1,12 +1,15 @@ //! Horizon launcher: installs Horizon builds, prepares them from the player's own Minecraft, //! and starts the client or a dedicated server. +#![cfg_attr(target_os = "windows", windows_subsystem = "windows")] + mod agents_page; mod art; mod blocks; mod cli; mod cli_tools; mod collection; +mod console; mod cull; mod game_tools; mod internet; @@ -3497,6 +3500,10 @@ fn menus() -> Vec { } fn main() { + if let Err(error) = console::attach_for_cli() { + eprintln!("Could not restore the launcher's terminal streams: {error}"); + std::process::exit(1); + } perf::process_started(); backend::exe_path(); if let Some(code) = cli::run() { diff --git a/launcher/src/perf.rs b/launcher/src/perf.rs index f46393542..7ecd0136c 100644 --- a/launcher/src/perf.rs +++ b/launcher/src/perf.rs @@ -9,10 +9,11 @@ use std::collections::BTreeMap; use std::path::PathBuf; +use std::sync::mpsc::{self, Receiver, TryRecvError}; use std::sync::OnceLock; use std::time::{Duration, Instant}; -use horizon_bench::{App, Frames, Kind, Report}; +use horizon_bench::{App, Frames, Hardware, Kind, Report}; /// The first thing `main` does; every start time counts from here. pub fn process_started() -> Instant { @@ -35,14 +36,36 @@ pub struct Perf { dirty: bool, /// Off for the windows `horizon-launcher benchmark` starts: they report to it instead. log: bool, + /// Machine probes run after the first frame, never while opening the window. + hardware: Option>, +} + +#[derive(Debug)] +struct Machine { + hardware: Hardware, + power: Option, + load_average: Option, +} + +impl Machine { + fn detect() -> Self { + Self { + hardware: Hardware::detect(), + power: horizon_bench::power_source().map(str::to_owned), + load_average: horizon_bench::load_average(), + } + } } impl Perf { pub fn new(scenario: &str) -> Perf { - let mut report = Report::new(Kind::Launcher, app()); + let hardware = Hardware { + os: std::env::consts::OS.to_owned(), + arch: std::env::consts::ARCH.to_owned(), + ..Hardware::default() + }; + let mut report = Report::with_hardware(Kind::Launcher, app(), hardware); report.conditions.scenario = Some(scenario.to_owned()); - report.conditions.power = horizon_bench::power_source().map(str::to_owned); - report.conditions.load_avg_1m = horizon_bench::load_average(); let path = crate::backend::data_dir().join("benchmarks").join(format!( "launcher-{}-{scenario}.json", report @@ -61,6 +84,7 @@ impl Perf { saved: Instant::now(), dirty: false, log: true, + hardware: None, }; if let Some(bytes) = binary_bytes() { perf.record("launcher.binary_bytes", bytes); @@ -89,6 +113,12 @@ impl Perf { if first { self.first_frame = Some(now); self.record_since("launcher.start_ms", process_started()); + let (sender, receiver) = mpsc::channel(); + self.hardware = Some(receiver); + std::thread::spawn(move || { + // The window may close before the optional report details finish. + let _ = sender.send(Machine::detect()); + }); } else if let Some(gap) = self.last_frame.map(|t| now - t).filter(|g| *g < IDLE_GAP) { self.ui_frames.push(gap.as_secs_f32() * 1000.0); } @@ -102,6 +132,7 @@ impl Perf { /// Samples memory and writes the report when something changed, at most every few seconds. pub fn tick(&mut self) { + self.poll_hardware(); if self.saved.elapsed() < Duration::from_secs(5) { return; } @@ -118,6 +149,7 @@ impl Perf { } pub fn report(&mut self) -> &Report { + self.poll_hardware(); for (name, values) in &self.values { self.report.metric(name, values); } @@ -128,6 +160,28 @@ impl Perf { &self.report } + fn poll_hardware(&mut self) { + let Some(receiver) = &self.hardware else { + return; + }; + match receiver.try_recv() { + Ok(machine) => { + self.report.hardware = machine.hardware; + self.report.conditions.power = machine.power; + self.report.conditions.load_avg_1m = machine.load_average; + self.hardware = None; + self.dirty = true; + } + Err(TryRecvError::Empty) => {} + Err(TryRecvError::Disconnected) => { + self.hardware = None; + eprintln!( + "The launcher could not collect its performance report's machine details." + ); + } + } + } + pub fn save(&mut self) { self.dirty = false; if !self.log { @@ -381,6 +435,41 @@ fn binary_bytes() -> Option { mod tests { use super::*; + #[test] + fn performance_tracking_starts_without_hardware_probes() { + let mut perf = Perf::new("test"); + perf.keep_local_log(false); + assert!(perf.hardware.is_none()); + assert_eq!(perf.report.hardware.os, std::env::consts::OS); + assert!(perf.report.hardware.cpu.is_none()); + assert!(perf.report.conditions.power.is_none()); + } + + #[test] + fn background_hardware_details_preserve_recorded_metrics() { + let mut perf = Perf::new("test"); + perf.keep_local_log(false); + perf.record("launcher.start_ms", 125.); + let (sender, receiver) = mpsc::channel(); + perf.hardware = Some(receiver); + assert_eq!(perf.report().metrics["launcher.start_ms"].mean, 125.); + sender + .send(Machine { + hardware: Hardware { + cpu: Some("Detected CPU".into()), + ..Hardware::default() + }, + power: Some("ac".into()), + load_average: Some(0.5), + }) + .unwrap(); + let report = perf.report(); + assert_eq!(report.hardware.cpu.as_deref(), Some("Detected CPU")); + assert_eq!(report.conditions.power.as_deref(), Some("ac")); + assert_eq!(report.metrics["launcher.start_ms"].mean, 125.); + assert!(perf.hardware.is_none()); + } + #[test] fn the_first_frame_is_the_start_and_close_frames_are_ui_frames() { let mut perf = Perf::new("test"); diff --git a/launcher/src/process.rs b/launcher/src/process.rs new file mode 100644 index 000000000..cd224b686 --- /dev/null +++ b/launcher/src/process.rs @@ -0,0 +1,22 @@ +//! Background commands keep their configured streams without opening Windows consoles. +use std::ffi::OsStr; +use std::process::Command; + +/// Builds a background command. Callers still choose how to capture its input and output. +pub fn command(program: impl AsRef) -> Command { + let mut command = Command::new(program); + hide_console(&mut command); + command +} + +/// Hides a background command's console on Windows, preserving its configured standard streams. +pub fn hide_console(command: &mut Command) { + #[cfg(windows)] + { + use std::os::windows::process::CommandExt; + const CREATE_NO_WINDOW: u32 = 0x0800_0000; + command.creation_flags(CREATE_NO_WINDOW); + } + #[cfg(not(windows))] + let _ = command; +} diff --git a/launcher/src/servers.rs b/launcher/src/servers.rs index 49ef05d66..264ccb149 100644 --- a/launcher/src/servers.rs +++ b/launcher/src/servers.rs @@ -245,7 +245,7 @@ fn point(link: &Path, target: &Path) -> std::io::Result<()> { #[cfg(windows)] { let _ = fs::remove_dir(link); - let status = Command::new("cmd") + let status = crate::process::command("cmd") .args(["/C", "mklink", "/J"]) .arg(link) .arg(target) @@ -266,10 +266,8 @@ pub fn command(dir: &Path, args: &[&str]) -> Result { let program = program().ok_or( "The server programs aren't set up yet: create a server, or press Prepare on its page.", )?; - let mut cmd = Command::new(program); + let mut cmd = crate::process::command(program); cmd.arg("--dir").arg(dir).args(args); - #[cfg(windows)] - std::os::windows::process::CommandExt::creation_flags(&mut cmd, 0x0800_0000); // CREATE_NO_WINDOW Ok(cmd) } @@ -752,7 +750,7 @@ pub fn lan_address() -> Option { pub fn service_installed(dir: &Path) -> bool { if cfg!(windows) { let name = format!("horizon-server-{}", service_suffix(dir)); - return Command::new("schtasks") + return crate::process::command("schtasks") .args(["/Query", "/TN", &name]) .stdout(Stdio::null()) .stderr(Stdio::null()) diff --git a/launcher/src/sources.rs b/launcher/src/sources.rs index 864e6bc73..b27b8417b 100644 --- a/launcher/src/sources.rs +++ b/launcher/src/sources.rs @@ -488,7 +488,7 @@ fn make_link(target: &Path, link: &Path) -> std::io::Result<()> { arg.push("\""); arg }; - let status = std::process::Command::new("cmd") + let status = crate::process::command("cmd") .args(["/C", "mklink", "/J"]) .raw_arg(quoted(link)) .raw_arg(quoted(target)) diff --git a/launcher/src/tailscale.rs b/launcher/src/tailscale.rs index 683ff0aab..b0c20d3bc 100644 --- a/launcher/src/tailscale.rs +++ b/launcher/src/tailscale.rs @@ -126,13 +126,8 @@ pub fn status_of(cli: Option) -> State { let Some(cli) = cli else { return State::Missing; }; - let mut command = Command::new(&cli); + let mut command = crate::process::command(&cli); command.args(["status", "--json"]); - #[cfg(windows)] - { - use std::os::windows::process::CommandExt; - command.creation_flags(0x0800_0000); // CREATE_NO_WINDOW - } let out = match command.output() { Ok(out) => out, Err(e) => return State::Off(e.to_string()), diff --git a/launcher/tests/hidden_processes.rs b/launcher/tests/hidden_processes.rs new file mode 100644 index 000000000..c7da90ea9 --- /dev/null +++ b/launcher/tests/hidden_processes.rs @@ -0,0 +1,116 @@ +//! Windows background processes must keep logs, input and exit status without a console. +#![cfg(windows)] + +mod support; +use horizon_launcher::{ + backend::{self, Job, Msg}, + process, +}; +use std::{fs, path::Path, sync::mpsc, time::Duration}; +use support::console_probe as probe; + +fn logged_child(fail: bool) -> (Vec, Result<(), String>) { + let (sender, receiver) = mpsc::channel(); + let mut command = std::process::Command::new(probe()); + if fail { + command.arg("--fail"); + } + let mut child = backend::spawn(Job::Prepare, command, sender).unwrap(); + child.send("input reaches the child"); + let mut lines = Vec::new(); + loop { + match receiver.recv_timeout(Duration::from_secs(10)).unwrap() { + Msg::Line(Job::Prepare, line) => lines.push(line), + Msg::Exit(Job::Prepare, result) => return (lines, result), + _ => panic!("unexpected job message"), + } + } +} + +#[test] +fn hidden_children_keep_stdout_stderr_stdin_and_success() { + let (lines, result) = logged_child(false); + assert!(result.is_ok(), "{result:?}"); + for expected in [ + "console_window_visible=false", + "stdout is captured", + "stderr is captured", + "stdin=input reaches the child", + ] { + assert!( + lines.iter().any(|line| line == expected), + "missing {expected}: {lines:?}" + ); + } +} + +#[test] +fn hidden_children_report_failure_and_keep_their_logs() { + let (lines, result) = logged_child(true); + assert!(result.unwrap_err().contains('7')); + assert!(lines.iter().any(|line| line == "stderr is captured")); +} + +#[test] +fn exporters_write_to_their_log_file_without_a_console() { + let root = probe().parent().unwrap(); + let path = root.join("exporter.log"); + let log = fs::File::create(&path).unwrap(); + let jdk = horizon_prepare::java::Jdk { + java: probe().into(), + javac: probe().into(), + }; + jdk.java(&[], Some(root), &log).unwrap(); + let output = fs::read_to_string(path).unwrap(); + for expected in [ + "console_window_visible=false", + "stdout is captured", + "stderr is captured", + ] { + assert!(output.contains(expected), "missing {expected}: {output}"); + } +} + +#[test] +fn cli_keeps_redirected_stdout_and_stderr() { + let executable = env!("CARGO_BIN_EXE_horizon-launcher"); + let version = process::command(executable) + .arg("--version") + .output() + .unwrap(); + assert!(version.status.success()); + assert!(String::from_utf8_lossy(&version.stdout).starts_with("horizon-launcher ")); + let invalid = process::command(executable) + .arg("--unknown-option") + .output() + .unwrap(); + assert!(!invalid.status.success()); + assert!(String::from_utf8_lossy(&invalid.stderr).contains("--unknown-option")); +} + +#[test] +fn mcp_keeps_its_stdio_transport() { + let executable = Path::new(env!("CARGO_BIN_EXE_horizon-launcher")); + assert!(horizon_launcher::agents::self_test(executable).unwrap() > 0); +} + +#[test] +fn desktop_executable_uses_the_windows_gui_subsystem() { + const PE_HEADER_POINTER: usize = 0x3c; + const PE_OPTIONAL_HEADER_OFFSET: usize = 24; + const SUBSYSTEM_OFFSET: usize = 68; + const WINDOWS_GUI_SUBSYSTEM: u16 = 2; + + let executable = fs::read(env!("CARGO_BIN_EXE_horizon-launcher")).unwrap(); + let header = u32::from_le_bytes( + executable[PE_HEADER_POINTER..PE_HEADER_POINTER + 4] + .try_into() + .unwrap(), + ) as usize; + assert_eq!(&executable[header..header + 4], b"PE\0\0"); + let subsystem = header + PE_OPTIONAL_HEADER_OFFSET + SUBSYSTEM_OFFSET; + assert_eq!( + u16::from_le_bytes(executable[subsystem..subsystem + 2].try_into().unwrap()), + WINDOWS_GUI_SUBSYSTEM + ); +} diff --git a/launcher/tests/startup.rs b/launcher/tests/startup.rs new file mode 100644 index 000000000..776d8ef15 --- /dev/null +++ b/launcher/tests/startup.rs @@ -0,0 +1,88 @@ +//! Full launcher startup against instrumented Windows hardware probes. +#![cfg(windows)] + +mod support; +use std::{ + fs, + path::{Path, PathBuf}, + process::{Child, Output, Stdio}, + time::{Duration, Instant}, +}; + +fn fixture() -> PathBuf { + let root = std::env::temp_dir().join(format!("horizon-startup-{}", std::process::id())); + for folder in ["game/telemetry", "launcher", "data", "config", "probes"] { + fs::create_dir_all(root.join(folder)).unwrap(); + } + fs::write(root.join("launcher/settings.json"), r#"{"skip_opening":true,"install_new_versions":false,"desktop_entry":false,"ping_notice_seen":true}"#).unwrap(); + let consent = serde_json::json!({"version":horizon_telemetry::CONSENT_VERSION,"choices":{}}); + fs::write( + root.join("game/telemetry/consent.json"), + consent.to_string(), + ) + .unwrap(); + fs::copy(support::console_probe(), root.join("probes/powershell.exe")).unwrap(); + root +} + +fn launch(root: &Path) -> Child { + let inherited_path = std::env::var_os("PATH").unwrap(); + let paths = std::iter::once(root.join("probes")).chain(std::env::split_paths(&inherited_path)); + horizon_launcher::process::command(env!("CARGO_BIN_EXE_horizon-launcher")) + .current_dir(root) + .env("PATH", std::env::join_paths(paths).unwrap()) + .env("HORIZON_HOME", root.join("game")) + .env("HORIZON_LAUNCHER_HOME", root.join("launcher")) + .env("XDG_DATA_HOME", root.join("data")) + .env("XDG_CONFIG_HOME", root.join("config")) + .env("HORIZON_LAUNCHER_NO_SELF_UPDATE", "1") + .env("HORIZON_NO_AUDIO", "1") + .env("HORIZON_TELEMETRY_URL", "off") + .env("HORIZON_STARTUP_PROBE_LOG", root.join("probes.log")) + .env("HORIZON_LAUNCHER_BENCH", root.join("timing.json")) + .stdout(Stdio::piped()) + .stderr(Stdio::piped()) + .spawn() + .unwrap() +} + +fn wait_for_exit(mut child: Child, root: &Path) -> Output { + let deadline = Instant::now() + Duration::from_secs(30); + while child.try_wait().unwrap().is_none() { + if Instant::now() >= deadline { + child.kill().unwrap(); + child.wait().unwrap(); + panic!("launcher startup timed out: {}", root.display()); + } + std::thread::sleep(Duration::from_millis(20)); + } + child.wait_with_output().unwrap() +} + +#[test] +#[ignore = "requires an interactive Windows desktop and graphics adapter"] +fn hardware_probes_run_hidden_after_the_first_frame() { + let root = fixture(); + let output = wait_for_exit(launch(&root), &root); + assert!( + output.status.success(), + "{}", + String::from_utf8_lossy(&output.stderr) + ); + let timing: serde_json::Value = + serde_json::from_slice(&fs::read(root.join("timing.json")).unwrap()).unwrap(); + let first_frame = timing["first_frame_epoch_ms"].as_f64().unwrap().floor(); + let probes = fs::read_to_string(root.join("probes.log")).unwrap(); + // Rust resolves cmd.exe to the system directory, so instrument the seven PowerShell + // probes, which exercise both shared helpers (the cmd probes use those same helpers). + const POWERSHELL_PROBES: usize = 7; + assert_eq!(probes.lines().count(), POWERSHELL_PROBES, "{probes}"); + for probe in probes.lines() { + let fields: Vec<_> = probe.split('|').collect(); + assert!( + fields[0].parse::().unwrap() >= first_frame, + "probe blocked startup: {probe}" + ); + assert_eq!(fields[1], "false", "probe opened a terminal: {probe}"); + } +} diff --git a/launcher/tests/support/console_probe.rs b/launcher/tests/support/console_probe.rs new file mode 100644 index 000000000..1ff16a10b --- /dev/null +++ b/launcher/tests/support/console_probe.rs @@ -0,0 +1,73 @@ +//! A real Windows console program used to check hidden children and their streams. +use std::ffi::c_void; +use std::io; + +fn hardware_probe(visible: bool) -> bool { + let Some(path) = std::env::var_os("HORIZON_STARTUP_PROBE_LOG") else { + return false; + }; + use std::io::Write; + let arguments = std::env::args().skip(1).collect::>().join(" "); + let program = std::env::current_exe().unwrap(); + let timestamp = std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .unwrap() + .as_millis(); + let mut log = std::fs::OpenOptions::new() + .create(true) + .append(true) + .open(path) + .unwrap(); + writeln!( + log, + "{timestamp}|{visible}|{}", + program.file_name().unwrap().to_string_lossy() + ) + .unwrap(); + // Slow probes make a synchronous startup regression visible without relying on WMI speed. + std::thread::sleep(std::time::Duration::from_millis(100)); + let responses = [ + ("TotalPhysicalMemory", "17179869184"), + ("NumberOfCores", "8"), + ("MaxClockSpeed", "3600"), + ("BatteryStatus", "2"), + ("Win32_Battery", "0"), + ]; + let response = responses + .iter() + .find_map(|&(query, response)| arguments.contains(query).then_some(response)) + .unwrap_or("Microsoft Windows [Version 10.0.26100]"); + println!("{response}"); + true +} + +#[link(name = "kernel32")] +extern "system" { + fn GetConsoleWindow() -> *mut c_void; +} + +#[link(name = "user32")] +extern "system" { + fn IsWindowVisible(window: *mut c_void) -> i32; +} + +fn main() { + // A console connection can exist without a terminal window, including in ConPTY. + // SAFETY: The opaque window handle comes from Windows and is only queried, never changed. + let visible = unsafe { + let window = GetConsoleWindow(); + !window.is_null() && IsWindowVisible(window) != 0 + }; + if hardware_probe(visible) { + return; + } + println!("console_window_visible={visible}"); + println!("stdout is captured"); + eprintln!("stderr is captured"); + let mut input = String::new(); + io::stdin().read_line(&mut input).unwrap(); + println!("stdin={}", input.trim()); + if std::env::args().any(|argument| argument == "--fail") { + std::process::exit(7); + } +} diff --git a/launcher/tests/support/mod.rs b/launcher/tests/support/mod.rs new file mode 100644 index 000000000..b5a72d115 --- /dev/null +++ b/launcher/tests/support/mod.rs @@ -0,0 +1,29 @@ +use horizon_launcher::process; +use std::{ + fs, + path::{Path, PathBuf}, + sync::OnceLock, +}; + +pub fn console_probe() -> &'static Path { + static PROBE: OnceLock = OnceLock::new(); + PROBE.get_or_init(|| { + let root = + std::env::temp_dir().join(format!("horizon-console-probe-{}", std::process::id())); + fs::create_dir_all(&root).unwrap(); + let executable = root.join("console-probe.exe"); + let source = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/support/console_probe.rs"); + let output = process::command("rustc") + .arg(source) + .arg("-o") + .arg(&executable) + .output() + .unwrap(); + assert!( + output.status.success(), + "{}", + String::from_utf8_lossy(&output.stderr) + ); + executable + }) +} From 98639d1471759f8d315bde469a9f7f5d33c0fc47 Mon Sep 17 00:00:00 2001 From: RobertTGreat Date: Sat, 24 Oct 2026 18:49:37 +0100 Subject: [PATCH 010/140] fix(launcher): virtualize long mod lists from the first frame Render nearby rows in the existing page scrollbar, defer hidden icons and cached verdict reads, and preserve bottom anchoring as row heights are measured. Co-Authored-By: OpenAI Codex (GPT-6.1 Sol) --- launcher/README.md | 6 + launcher/src/cull.rs | 397 +++++++++++++++++++++++++++------- launcher/src/main.rs | 7 +- launcher/src/modpacks_page.rs | 22 +- launcher/src/mods_page.rs | 70 ++++-- launcher/src/mods_project.rs | 96 ++++++-- 6 files changed, 479 insertions(+), 119 deletions(-) diff --git a/launcher/README.md b/launcher/README.md index cf968f93c..5923491e0 100644 --- a/launcher/README.md +++ b/launcher/README.md @@ -258,6 +258,12 @@ measure idle CPU, fetches the release list 3 times, and writes one report there your machine; a `benchmark` report is uploaded, dated to the day, only if you allowed benchmark uploads ([data collection](../docs/telemetry.md)). +Long lists on Mods (results, installed entries, coverage reports and project versions), Versions +and Patch notes build only nearby rows, including on their first frame. Variable row heights +are measured as they enter view; hidden ranges share spacers in the existing page scrollbar. +On Windows, `cargo test --bin horizon-launcher desktop_list_renders_the_viewport_after_scrollbar_jumps +-- --ignored` checks 10,000 rows of different heights in a real GPUI window (requires an awake desktop/GPU). + ## Building cargo build --release diff --git a/launcher/src/cull.rs b/launcher/src/cull.rs index 41df05610..38bd3dd6d 100644 --- a/launcher/src/cull.rs +++ b/launcher/src/cull.rs @@ -1,25 +1,39 @@ -//! Long lists in the page's scroll area (the hundred releases on Versions and Patch notes) draw -//! only the rows near what is on screen. A row far off screen becomes an empty block as tall as -//! it was the last time it was drawn, so the page keeps its length and the scrollbar its place. -use gpui::{div, px, Bounds, Div, IntoElement, ParentElement, Pixels, ScrollHandle, Styled}; -use std::{cell::RefCell, rc::Rc}; +//! Variable-height lists in the page's scroll area. Only nearby rows build elements; +//! unseen rows use estimated heights and consecutive hidden rows share one spacer. +use gpui::{ + div, point, px, size, Bounds, Div, IntoElement, ParentElement, Pixels, ScrollHandle, Styled, +}; +use std::{cell::RefCell, ops::Range, rc::Rc}; + +const ESTIMATED_HEIGHT: f32 = 96.; +/// Until the enclosing scroll area completes its first layout. +const INITIAL_VIEW_HEIGHT: f32 = 800.; #[derive(Clone, Default)] pub struct Cull(Rc>); -/// Where each row was in the last frame, and the scroll offset and the viewport's width then -/// (a narrower window wraps text, and the heights no longer hold). #[derive(Default)] struct Drawn { - rows: Vec>, + heights: Vec, + top: Pixels, offset: Pixels, width: Pixels, } +#[derive(Debug)] +enum Span { + Row(usize), + Space { rows: Range, height: Pixels }, +} + impl Cull { - /// A column for `rows` rows that remembers where they were drawn. Rows come from `row(i)`, or - /// an empty block when row `i` was more than a screen away from the viewport last frame and - /// `keep(i)` is false (a row being installed or showing an error is always drawn). + /// Invalidate measurements when filtering, ordering or collection identity changes. + pub fn reset(&self) { + *self.0.borrow_mut() = Drawn::default(); + } + + /// Render nearby rows plus those retained by `keep` (such as active confirmations). + /// `gap` is the bottom margin already supplied by each row. pub fn column( &self, handle: &ScrollHandle, @@ -28,92 +42,329 @@ impl Cull { keep: impl Fn(usize) -> bool, mut row: impl FnMut(usize) -> E, ) -> Div { - let far = self.far(handle, rows); - let skipped: Vec> = (0..rows).map(|i| far(i).filter(|_| !keep(i))).collect(); - let gaps = skipped.iter().any(Option::is_some); + let max = handle.max_offset().height; + if max > px(0.) + && handle.offset().y <= -max + px(0.5) + && self.0.borrow().heights.len() == rows + { + // Measuring taller rows at the end must keep the final row in view. Appending + // results deliberately leaves the current viewport in place instead. + handle.scroll_to_bottom(); + } + let spans = self + .0 + .borrow_mut() + .plan(handle.bounds(), handle.offset().y, rows, gap, keep); + let children = spans + .iter() + .map(|span| match span { + // The wrapper includes the row's margin in its measured height. + Span::Row(index) => div().flex().flex_col().flex_none().child(row(*index)), + Span::Space { height, .. } => div().flex_none().h(*height), + }) + .collect::>(); let state = self.0.clone(); let scroll = handle.clone(); div() .flex() .flex_col() - .children(skipped.iter().enumerate().map(|(i, skip)| match skip { - Some(height) => div().flex_none().h(*height).mb(px(gap)).into_any_element(), - None => row(i).into_any_element(), - })) + .children(children) .on_children_prepainted(move |bounds, window, _| { - let view = scroll.bounds(); - // A jump of more than a screen (the scrollbar dragged) can bring an empty block - // into view: draw again, with the rows where they are now. - if gaps - && bounds - .iter() - .zip(&skipped) - .any(|(b, skip)| skip.is_some() && !away(*b, px(0.), view)) + if state + .borrow_mut() + .record(&spans, &bounds, scroll.bounds(), scroll.offset().y) { window.refresh(); } - let mut drawn = state.borrow_mut(); - drawn.rows = bounds; - drawn.offset = scroll.offset().y; - drawn.width = view.size.width; }) } - - /// For row `i`: its height when it was more than a screen away from the viewport. - fn far(&self, handle: &ScrollHandle, rows: usize) -> impl Fn(usize) -> Option { - let drawn = self.0.borrow(); - let view = handle.bounds(); - // The rows moved by however far the page scrolled since they were drawn. - let moved = handle.offset().y - drawn.offset; - let known = - drawn.rows.len() == rows && view.size.height > px(0.) && drawn.width == view.size.width; - let rows = if known { - drawn.rows.clone() - } else { - Vec::new() - }; - move |i| { - let b = *rows.get(i)?; - away(b, moved, view).then_some(b.size.height) - } - } } -/// Whether a row drawn at `row`, since moved down by `moved`, is more than a screen above or -/// below `view`. -fn away(row: Bounds, moved: Pixels, view: Bounds) -> bool { - row.bottom() + moved < view.top() - view.size.height - || row.top() + moved > view.bottom() + view.size.height +impl Drawn { + fn plan( + &mut self, + mut view: Bounds, + offset: Pixels, + rows: usize, + gap: f32, + keep: impl Fn(usize) -> bool, + ) -> Vec { + let estimate = px(ESTIMATED_HEIGHT + gap); + if self.width != view.size.width { + // A resize changes wrapping, including in rows currently off screen. + self.heights.fill(estimate); + } + self.heights.resize(rows, estimate); + if view.size.height <= px(0.) { + view.size.height = px(INITIAL_VIEW_HEIGHT); + } + let mut top = self.top + offset - self.offset; + let mut spans = Vec::new(); + for (index, height) in self.heights.iter().copied().enumerate() { + let bounds = Bounds::new(point(view.left(), top), size(view.size.width, height)); + if !away(bounds, view) || keep(index) { + spans.push(Span::Row(index)); + } else if let Some(Span::Space { + rows, + height: total, + }) = spans.last_mut() + { + rows.end = index + 1; + *total += height; + } else { + spans.push(Span::Space { + rows: index..index + 1, + height, + }); + } + top += height; + } + spans + } + + /// A moved header or scrollbar jump can expose a spacer: request another frame when + /// measurements or the estimated visible range need correcting. + fn record( + &mut self, + spans: &[Span], + bounds: &[Bounds], + view: Bounds, + offset: Pixels, + ) -> bool { + let mut changed = false; + for (span, bounds) in spans.iter().zip(bounds) { + match span { + Span::Row(index) => { + let height = &mut self.heights[*index]; + changed |= (*height - bounds.size.height).abs() > px(0.5); + *height = bounds.size.height; + } + Span::Space { .. } => changed |= !away(*bounds, view), + } + } + self.top = bounds.first().map_or(view.top(), Bounds::top); + self.offset = offset; + self.width = view.size.width; + changed + } +} + +/// One viewport of overdraw above and below the visible area. +fn away(row: Bounds, view: Bounds) -> bool { + row.bottom() < view.top() - view.size.height || row.top() > view.bottom() + view.size.height } #[cfg(test)] mod tests { use super::*; - use gpui::{point, size}; - fn at(y: f32, h: f32) -> Bounds { - Bounds::new(point(px(0.), px(y)), size(px(10.), px(h))) + fn at(top: f32, height: f32, width: f32) -> Bounds { + Bounds::new(point(px(0.), px(top)), size(px(width), px(height))) + } + + fn rendered(spans: &[Span]) -> Vec { + spans + .iter() + .filter_map(|span| match span { + Span::Row(index) => Some(*index), + Span::Space { .. } => None, + }) + .collect() } #[test] - fn only_rows_more_than_a_screen_away_are_skipped() { - let view = at(100., 500.); - assert!(!away(at(100., 100.), px(0.), view)); - assert!(!away(at(1000., 100.), px(0.), view)); - assert!(away(at(1200., 100.), px(0.), view)); - assert!(away(at(-600., 100.), px(0.), view)); - // Scrolled 700 px down since: the row that was far below is now on screen. - assert!(!away(at(1200., 100.), px(-700.), view)); + fn ten_thousand_rows_build_only_nearby_elements_on_the_first_frame() { + let list = Cull::default(); + let mut count = 0; + list.column( + &ScrollHandle::new(), + 10_000, + 8., + |_| false, + |_| { + count += 1; + div().h(px(96.)).mb(px(8.)) + }, + ); + assert!(count <= 17, "built {count} rows before the first layout"); + let spans = list + .0 + .borrow_mut() + .plan(at(0., 800., 600.), px(0.), 10_000, 8., |_| false); + assert!(spans.len() <= count + 1, "hidden rows share one spacer"); } #[test] - fn nothing_is_skipped_before_the_rows_are_known() { - let cull = Cull::default(); - cull.0.borrow_mut().rows = (0..10).map(|i| at(i as f32 * 2000., 100.)).collect(); - // No viewport yet (the first frame), or another number of rows: every row is drawn. - let far = cull.far(&ScrollHandle::new(), 10); - assert!((0..10).all(|i| far(i).is_none())); - let far = cull.far(&ScrollHandle::new(), 11); - assert!((0..11).all(|i| far(i).is_none())); + fn large_scroll_jumps_reach_the_last_rows_and_return_to_the_first() { + let mut state = Drawn::default(); + let view = at(0., 500., 600.); + state.plan(view, px(0.), 10_000, 8., |_| false); + state.width = view.size.width; + let end = state.plan(view, px(-1_039_500.), 10_000, 8., |_| false); + assert!(rendered(&end).contains(&9_999)); + assert!(rendered(&end).len() < 20); + assert_eq!( + rendered(&state.plan(view, px(0.), 10_000, 8., |_| false))[0], + 0 + ); + } + + #[test] + fn resizing_and_appending_keep_render_work_bounded_and_retained_rows_available() { + let mut state = Drawn::default(); + let view = at(0., 500., 600.); + state.plan(view, px(0.), 5_000, 8., |_| false); + state.width = view.size.width; + state.heights[100] = px(900.); + let spans = state.plan(at(0., 500., 300.), px(0.), 10_000, 8., |index| { + index == 9_000 + }); + assert_eq!(state.heights[100], px(104.)); + assert!(rendered(&spans).contains(&9_000)); + assert!(spans.len() < 20); + assert_eq!(state.heights.len(), 10_000); + } + + #[test] + fn measurements_include_wrapping_and_reveal_spacers_after_headers_move() { + let mut state = Drawn::default(); + let view = at(0., 500., 600.); + state.plan(view, px(0.), 100, 8., |_| false); + let spans = vec![ + Span::Row(0), + Span::Space { + rows: 1..100, + height: px(10_296.), + }, + ]; + assert!(state.record( + &spans, + &[at(0., 240., 600.), at(240., 10_296., 600.)], + view, + px(0.) + )); + assert_eq!(state.heights[0], px(240.)); + assert!(rendered(&state.plan(view, px(0.), 100, 8., |_| false)).contains(&1)); + let list = Cull::default(); + list.0.borrow_mut().heights = vec![px(400.); 100]; + list.reset(); + assert!(list.0.borrow().heights.is_empty()); + } +} + +#[cfg(all(test, target_os = "windows"))] +mod desktop_tests { + use super::*; + use gpui::{ + prelude::*, AppContext, Application, Context, Render, Window, WindowBounds, WindowOptions, + }; + use std::time::Duration; + + struct ListWindow { + list: Cull, + scroll: ScrollHandle, + rendered: Vec, + } + + impl Render for ListWindow { + fn render(&mut self, _: &mut Window, _: &mut Context) -> impl IntoElement { + self.rendered.clear(); + let rows = self.list.column( + &self.scroll, + 10_000, + 8., + |_| false, + |index| { + self.rendered.push(index); + div() + .h(px(if index % 2 == 0 { 72. } else { 180. })) + .mb(px(8.)) + .child(format!("Row {index}")) + }, + ); + div() + .id("viewport") + .size_full() + .overflow_y_scroll() + .track_scroll(&self.scroll) + .child(div().pt(px(320.)).child(rows)) + } + } + + #[test] + #[ignore = "requires an interactive desktop and graphics adapter"] + fn desktop_list_renders_the_viewport_after_scrollbar_jumps() { + Application::new().run(|cx| { + let window = cx + .open_window( + WindowOptions { + window_bounds: Some(WindowBounds::Windowed(Bounds::new( + point(px(0.), px(0.)), + size(px(600.), px(500.)), + ))), + ..WindowOptions::default() + }, + |_, cx| { + cx.new(|_| ListWindow { + list: Cull::default(), + scroll: ScrollHandle::new(), + rendered: Vec::new(), + }) + }, + ) + .unwrap(); + cx.spawn(async move |cx| { + for step in 0..3 { + cx.background_executor() + .timer(Duration::from_millis(300)) + .await; + window + .update(cx, |view, _, cx| { + assert!( + view.rendered.len() < 40, + "rendered {} rows", + view.rendered.len() + ); + let wanted = if step == 1 { 9_999 } else { 0 }; + assert!( + view.rendered.contains(&wanted), + "row {wanted} missing: {:?}", + view.rendered + ); + let measured = view.list.0.borrow(); + let mut top = measured.top; + for (index, height) in measured.heights.iter().enumerate() { + if top < view.scroll.bounds().bottom() + && top + *height > view.scroll.bounds().top() + { + assert!( + view.rendered.contains(&index), + "visible row {index} was a spacer" + ); + } + top += *height; + } + if step == 1 { + assert!( + top <= view.scroll.bounds().bottom() + px(1.), + "the last row stayed below the viewport by {:?}", + top - view.scroll.bounds().bottom() + ); + } + drop(measured); + let offset = if step == 0 { + -view.scroll.max_offset().height + } else { + px(0.) + }; + view.scroll.set_offset(point(px(0.), offset)); + cx.notify(); + }) + .unwrap(); + } + cx.update(|cx| cx.quit()).unwrap(); + }) + .detach(); + }); } } diff --git a/launcher/src/main.rs b/launcher/src/main.rs index db2309dd6..0c824bb44 100644 --- a/launcher/src/main.rs +++ b/launcher/src/main.rs @@ -366,6 +366,9 @@ impl Launcher { self.switches += 1; self.content_scroll = Scrollbar::default(); self.long_list = cull::Cull::default(); + if page == Page::Mods { + self.mods.reset_lists(); + } } self.picker_open = false; } @@ -2901,7 +2904,7 @@ impl Launcher { )) } Load::Ready(r) if r.is_empty() => return page.child(centered("No releases yet.", &t)), - Load::Ready(r) => r.clone(), + Load::Ready(r) => r, }; // A hundred releases: only the rows near the screen are drawn. let keep = |i: usize| { @@ -3138,7 +3141,7 @@ impl Launcher { ), ) } - Load::Ready(r) => r.clone(), + Load::Ready(r) => r, }; let list = self.long_list.clone().column( &self.content_scroll.handle, diff --git a/launcher/src/modpacks_page.rs b/launcher/src/modpacks_page.rs index ccd0b3a4e..6346f8a0b 100644 --- a/launcher/src/modpacks_page.rs +++ b/launcher/src/modpacks_page.rs @@ -50,6 +50,7 @@ impl Launcher { self.pack_busy = false; match result { Ok(pack) => { + self.mods.report_list.reset(); self.pack_open = Some(pack.slug.clone()); self.packs.retain(|p| p.slug != pack.slug); self.packs.push(*pack); @@ -127,6 +128,7 @@ impl Launcher { /// Reads the imported packs, once (the sidebar and the Modpacks tab both show them). pub(super) fn load_packs(&mut self) { if self.packs_loaded.is_none() { + self.mods.report_list.reset(); self.packs = modpacks::list(); if self.pack_open.is_none() { self.pack_open = self.packs.first().map(|p| p.slug.clone()); @@ -193,6 +195,7 @@ impl Launcher { button(format!("open-{slug}"), "Open", Kind::Ghost, &t) .on_click(cx.listener(move |this, _: &ClickEvent, _, cx| { this.pack_open = Some(slug.clone()); + this.mods.report_list.reset(); cx.notify(); })) .into_any_element() @@ -317,6 +320,7 @@ impl Launcher { Ok(()) => { this.packs.retain(|p| p.slug != slug); this.pack_open = this.packs.first().map(|p| p.slug.clone()); + this.mods.report_list.reset(); } Err(e) => this.pack_error = Some(e), } @@ -354,12 +358,13 @@ impl Launcher { move |value, _, cx| { let _ = this.update(cx, |this, cx| { this.pack_filter = value; + this.mods.report_list.reset(); cx.notify(); }); } }); - let mut list = div().flex().flex_col(); - for (i, r) in rows.iter().enumerate() { + let row = |i: usize| { + let r = rows[i]; let color = match r.status { Status::Ported => t.success, Status::Partial => t.accent, @@ -372,7 +377,7 @@ impl Launcher { format!("{} ({})", r.name, r.key) }; let detail = format!("{} · {} · {}: {}", r.class, r.tier, r.license, r.reason); - list = list.child(index_row( + index_row( i + 1, name, Some(detail.into_any_element()), @@ -383,8 +388,15 @@ impl Launcher { .into_any_element(), ), &t, - )); - } + ) + }; + let list = self.mods.report_list.column( + &self.content_scroll.handle, + rows.len(), + 8., + |_| false, + row, + ); Some( div() .flex() diff --git a/launcher/src/mods_page.rs b/launcher/src/mods_page.rs index 00162f930..5c3e1b0c6 100644 --- a/launcher/src/mods_page.rs +++ b/launcher/src/mods_page.rs @@ -54,6 +54,9 @@ pub(super) struct Mods { searching: bool, searched: bool, results: Vec, + results_list: cull::Cull, + installed_list: cull::Cull, + pub(super) report_list: cull::Cull, more: bool, error: Option, installed: Vec, @@ -72,6 +75,12 @@ pub(super) struct Mods { } impl Mods { + pub(super) fn reset_lists(&self) { + self.results_list.reset(); + self.installed_list.reset(); + self.report_list.reset(); + } + /// Whether the Modpacks tab is open (the sidebar marks the pack shown there). pub(super) fn on_modpacks(&self) -> bool { self.kind == PackKind::Modpack @@ -94,6 +103,9 @@ impl Mods { searching: false, searched: false, results: Vec::new(), + results_list: cull::Cull::default(), + installed_list: cull::Cull::default(), + report_list: cull::Cull::default(), more: false, error: None, installed: Vec::new(), @@ -158,6 +170,7 @@ impl Launcher { self.go(Page::Mods); if slug.is_some() { self.pack_open = slug; + self.mods.report_list.reset(); } if self.mods.kind != PackKind::Modpack { self.mods.kind = PackKind::Modpack; @@ -203,6 +216,7 @@ impl Launcher { m.busy = None; m.message = Some(result); m.installed = installed::Installed::load(&backend::game_home()).entries; + m.installed_list.reset(); if modpack { // The Modpacks page reads its list again. self.packs_loaded = None; @@ -249,6 +263,8 @@ impl Launcher { if offset == 0 { m.results.clear(); m.more = false; + m.results_list.reset(); + m.installed_list.reset(); } let query = Query { everything: m.everything, @@ -296,7 +312,16 @@ impl Launcher { .and_then(|source| { java::check_project(&home, &*source, &p, everything, &|_| {}) }) - .map(|(_, c)| Box::new(c)); + .map(|(version, check)| { + let _ = tx.send(Event::Loaded( + super::mods_project::Loaded::Checked( + (p.source, p.id.clone()), + version.id, + check.verdict, + ), + )); + Box::new(check) + }); let _ = tx.send(Event::Checked((p.source, p.id), result)); } }); @@ -608,8 +633,8 @@ impl Launcher { return None; } let busy = self.mods.busy.is_some(); - let mut list = div().flex().flex_col(); - for (i, e) in entries.into_iter().enumerate() { + let row = |i: usize| { + let e = entries[i]; let key = (e.source, e.project.clone()); let mut right = div().flex().items_center().gap(px(8.)); if let Some(number) = self.mods.updates.get(&key) { @@ -654,6 +679,7 @@ impl Launcher { installed::remove(&home, &id).map(|e| format!("Removed {}.", e.title)), ); this.mods.installed = installed::Installed::load(&home).entries; + this.mods.installed_list.reset(); this.mods.confirm_remove = None; } else { this.mods.confirm_remove = Some(id.clone()); @@ -689,14 +715,21 @@ impl Launcher { .font_family(theme::MONO) .child(format!("checked: {}", short_sum(&e.checksum))), ); - list = list.child(index_row( + index_row( i + 1, e.title.clone(), Some(detail.into_any_element()), Some(right.into_any_element()), &t, - )); - } + ) + }; + let list = self.mods.installed_list.column( + &self.content_scroll.handle, + entries.len(), + 8., + |index| self.mods.confirm_remove.as_ref() == Some(&entries[index].project), + row, + ); Some( div() .flex() @@ -709,8 +742,6 @@ impl Launcher { fn mods_results(&mut self, cx: &mut Context) -> Div { let t = self.theme; - let found = self.mods.results.clone(); - let icons: Vec = found.iter().map(|p| self.mods_icon(p, 56.)).collect(); let m = &self.mods; if let Some(e) = &m.error { return div().child(notice(e.clone(), &t)); @@ -725,10 +756,15 @@ impl Launcher { }; return centered(line, &t); } - let busy = m.busy.as_ref().map(|b| b.0.as_str()); - let mut icons = icons.into_iter(); - let mut list = div().flex().flex_col(); - for (i, p) in m.results.iter().enumerate() { + let result_count = m.results.len(); + let rows = m.results_list.clone(); + let scroll = self.content_scroll.handle.clone(); + let row = |i: usize| { + let project = self.mods.results[i].clone(); + let icon = self.mods_icon(&project, 56.); + let p = &project; + let m = &self.mods; + let busy = m.busy.as_ref().map(|b| b.0.as_str()); let support = m.support(p); let checking = p.kind == PackKind::Mod && matches!( @@ -813,21 +849,23 @@ impl Launcher { .items_center() .gap(px(12.)) .cursor_pointer() - .child(icons.next().expect("one icon per result")) + .child(icon) .child(div().hover(|s| s.underline()).child(p.title.clone())) .on_click(cx.listener(move |this, _: &ClickEvent, _, cx| { this.mods_open(open.clone()); cx.notify(); })); - list = list.child(index_row( + index_row( i + 1, name, Some(detail.into_any_element()), Some(right.into_any_element()), &t, - )); - } + ) + }; + let list = rows.column(&scroll, result_count, 8., |_| false, row); let mut out = div().flex().flex_col().child(list); + let m = &self.mods; if m.more { let mut more = button("mods-more", "More", Kind::Ghost, &t); if m.searching { diff --git a/launcher/src/mods_project.rs b/launcher/src/mods_project.rs index c66cf174a..ad75f58cd 100644 --- a/launcher/src/mods_project.rs +++ b/launcher/src/mods_project.rs @@ -19,6 +19,7 @@ use horizon_launcher::browser::{ }; use std::collections::{HashMap, HashSet}; use std::path::PathBuf; +use std::sync::Arc; /// A project page's tabs. #[derive(Clone, Copy, PartialEq, Eq)] @@ -38,8 +39,17 @@ const TABS: [(Tab, &str); 3] = [ pub(super) struct Opened { pub(super) project: Project, tab: Tab, - details: Option>, - versions: Option, String>>, + details: Option, String>>, + versions: Option, String>>, + version_list: cull::Cull, + checked_versions: HashMap, +} + +/// Cached verdicts are read with the version request, never while drawing a frame. +#[derive(Clone)] +pub(super) struct ProjectVersion { + version: Version, + verdict: Option, } /// The project page, filters and images' share of the Mods page's state. @@ -58,7 +68,12 @@ pub(super) struct Browse { /// What the background sends this module. pub(super) enum Loaded { Details((SourceId, String), Result), - Versions((SourceId, String), Result, String>), + Versions((SourceId, String), Result, String>), + Checked( + (SourceId, String), + String, + horizon_port_pack::check::Verdict, + ), Image((String, u32), Option), Tags((SourceId, PackKind), Result), } @@ -77,12 +92,20 @@ impl Launcher { match loaded { Loaded::Details(key, d) => { if let Some(o) = open(b, &key) { - o.details = Some(d); + o.details = Some(d.map(Arc::new)); } } Loaded::Versions(key, v) => { if let Some(o) = open(b, &key) { - o.versions = Some(v); + o.versions = Some(v.map(Arc::from)); + o.apply_checks(); + o.version_list.reset(); + } + } + Loaded::Checked(key, version, verdict) => { + if let Some(o) = open(b, &key) { + o.checked_versions.insert(version, verdict); + o.apply_checks(); } } Loaded::Image(key, path) => { @@ -106,7 +129,21 @@ impl Launcher { }; let d = source.details(&p); let _ = tx.send(Event::Loaded(Loaded::Details(key.clone(), d))); - let v = source.versions(&p); + let v = source.versions(&p).map(|versions| { + let home = backend::game_home(); + versions + .into_iter() + .map(|version| { + let verdict = version.file().and_then(|file| { + (p.kind == PackKind::Mod) + .then(|| java::cached(&home, file)) + .flatten() + .map(|check| check.verdict) + }); + ProjectVersion { version, verdict } + }) + .collect() + }); let _ = tx.send(Event::Loaded(Loaded::Versions(key, v))); }); self.mods.browse.open = Some(Opened { @@ -114,6 +151,8 @@ impl Launcher { tab: Tab::Description, details: None, versions: None, + version_list: cull::Cull::default(), + checked_versions: HashMap::new(), }); } @@ -361,6 +400,7 @@ impl Launcher { )); let details = o.details.clone(); let versions = o.versions.clone(); + let version_list = o.version_list.clone(); let mut meta = vec![format!("{} downloads", thousands(p.downloads))]; if let Some(Ok(d)) = &details { meta.push(format!("{} followers", thousands(d.followers))); @@ -551,9 +591,13 @@ impl Launcher { Tab::Versions => match &versions { None => centered("Loading…", &t), Some(Err(e)) => notice(e.clone(), &t), - Some(Ok(list)) => { - let mut rows = div().flex().flex_col(); - for (i, v) in list.iter().take(50).enumerate() { + Some(Ok(list)) => version_list.column( + &self.content_scroll.handle, + list.len().min(50), + 8., + |_| false, + |i| { + let v = &list[i].version; let file = v.file(); let mut detail = vec![ v.published.get(..10).unwrap_or_default().to_string(), @@ -570,27 +614,33 @@ impl Launcher { if let Some(f) = file { detail.push(format!("{} · {:.1} MB", f.name, f.size as f64 / 1e6)); } - let checked = file.and_then(|f| { - (p.kind == PackKind::Mod) - .then(|| java::cached(&backend::game_home(), f)) - .flatten() - }); - rows = rows.child(index_row( + index_row( i + 1, v.number.clone(), Some(detail.join(" · ").into_any_element()), - checked.map(|c| { - caps(c.verdict.label()) - .text_color(t.muted) - .into_any_element() + list[i].verdict.as_ref().map(|verdict| { + caps(verdict.label()).text_color(t.muted).into_any_element() }), &t, - )); - } - rows - } + ) + }, + ), }, }; Some(page.child(body)) } } + +impl Opened { + /// A check can finish before or after the version request; retain either event order. + fn apply_checks(&mut self) { + let Some(Ok(versions)) = &mut self.versions else { + return; + }; + for row in Arc::make_mut(versions) { + if let Some(verdict) = self.checked_versions.get(&row.version.id) { + row.verdict = Some(*verdict); + } + } + } +} From 094d5c8e16c3b3deef2f1b7bb71c7d4b4d213bf2 Mon Sep 17 00:00:00 2001 From: Ryan B Date: Sat, 24 Oct 2026 14:03:32 -0400 Subject: [PATCH 011/140] fix: let server text fields receive debug-bound characters Co-Authored-By: OpenAI Codex gpt-6.1-sol --- crates/horizon-client/src/game/debug_keys.rs | 64 ++++++++++++++++++-- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/crates/horizon-client/src/game/debug_keys.rs b/crates/horizon-client/src/game/debug_keys.rs index a94f3f01b..5a3dcbd01 100644 --- a/crates/horizon-client/src/game/debug_keys.rs +++ b/crates/horizon-client/src/game/debug_keys.rs @@ -20,6 +20,15 @@ use winit::keyboard::KeyCode; const YELLOW: u32 = 0xFF_FF55; const RED: u32 = 0xFF_5555; +/// Title text fields receive presses before debug shortcuts, but releases must +/// still clear a debug modifier held before the field gained focus. +fn title_takes_text_key( + title: Option<&mut horizon_client::title::Title>, + action: KeyAction, +) -> bool { + action != KeyAction::Release && title.is_some_and(|title| title.focused_field().is_some()) +} + /// The game as `KeyboardHandler` sees it while it runs one key event. struct Host<'g, 'a> { game: &'g mut Game<'a>, @@ -84,10 +93,12 @@ impl Game<'_> { } // Screens with a text box take every key press first // (EditBox.keyPressed); releases still reach KeyboardHandler. - let typing = matches!( - self.screen, - Screen::Chat | Screen::Options | Screen::WorldOptions | Screen::CommandBlock - ) || self.sign_edit.is_some() + let typing = title_takes_text_key(self.title.as_mut(), action) + || matches!( + self.screen, + Screen::Chat | Screen::Options | Screen::WorldOptions | Screen::CommandBlock + ) + || self.sign_edit.is_some() || self.book.is_some() || (self.screen == Screen::Creative && self.creative_screen.tab().search) || self.recipe_search_focused() @@ -813,3 +824,48 @@ impl Game<'_> { g } } + +#[cfg(test)] +mod tests { + use super::*; + use horizon_client::{ + multiplayer::Screen as ServerScreen, + title::{Mode, Title}, + }; + + #[test] + fn server_fields_take_debug_bound_text_keys_but_not_releases() { + let root = std::env::temp_dir().join(format!("horizon-debug-title-{}", std::process::id())); + let mut title = Title::new(root.join("saves"), &root); + for screen in [ + ServerScreen::Direct { + address: String::new(), + }, + ServerScreen::Edit { + index: None, + name: String::new(), + address: String::new(), + focus: 0, + }, + ServerScreen::Edit { + index: Some(0), + name: String::new(), + address: String::new(), + focus: 1, + }, + ServerScreen::friend(), + ] { + title.mode = Mode::Multiplayer(screen); + for action in [KeyAction::Press, KeyAction::Repeat] { + assert!(title_takes_text_key(Some(&mut title), action)); + } + assert!(!title_takes_text_key(Some(&mut title), KeyAction::Release)); + // A period bound to the debug modifier must reach the field. + title.type_text("mc.example.org"); + assert_eq!(title.focused_field().unwrap().1, "mc.example.org"); + } + title.mode = Mode::Main; + assert!(!title_takes_text_key(Some(&mut title), KeyAction::Press)); + assert!(!title_takes_text_key(None, KeyAction::Press)); + } +} From 83657f3bbf60fdbe2a059b16139ab798ea442e78 Mon Sep 17 00:00:00 2001 From: Ryan B Date: Sat, 24 Oct 2026 14:04:46 -0400 Subject: [PATCH 012/140] fix: resolve Minecraft DNS SRV redirects for ping and login Co-Authored-By: OpenAI Codex gpt-6.1-sol --- Cargo.lock | 281 +++++++++++++++++++++- crates/horizon-client/src/net.rs | 11 +- crates/horizon-protocol/Cargo.toml | 3 + crates/horizon-protocol/src/connection.rs | 13 + crates/horizon-protocol/src/lib.rs | 1 + crates/horizon-protocol/src/resolver.rs | 166 +++++++++++++ 6 files changed, 467 insertions(+), 8 deletions(-) create mode 100644 crates/horizon-protocol/src/resolver.rs diff --git a/Cargo.lock b/Cargo.lock index 46b99b819..1f0958f95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,7 +155,7 @@ dependencies = [ "objc2-foundation 0.3.2", "parking_lot", "percent-encoding", - "windows-sys 0.59.0", + "windows-sys 0.60.2", "wl-clipboard-rs", "x11rb", ] @@ -187,6 +187,17 @@ dependencies = [ "libloading", ] +[[package]] +name = "async-trait" +version = "0.1.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.6", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -699,6 +710,30 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + +[[package]] +name = "crossbeam-channel" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.23" @@ -718,7 +753,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", - "rand_core", + "rand_core 0.6.4", "typenum", ] @@ -738,7 +773,7 @@ dependencies = [ "cpufeatures", "curve25519-dalek-derive", "fiat-crypto", - "rand_core", + "rand_core 0.6.4", "rustc_version", "subtle", ] @@ -760,6 +795,12 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" +[[package]] +name = "data-encoding" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06" + [[package]] name = "derive_arbitrary" version = "1.5.0" @@ -871,6 +912,18 @@ dependencies = [ "simdutf8", ] +[[package]] +name = "enum-as-inner" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.119", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -991,12 +1044,27 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures-channel" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" +dependencies = [ + "futures-core", +] + [[package]] name = "futures-core" version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" +[[package]] +name = "futures-io" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" + [[package]] name = "futures-task" version = "0.3.34" @@ -1188,6 +1256,52 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e17592d60ebacc7d5e169f4663c5f84f9161cc90328abcfe8456f41e4dfcb284" +[[package]] +name = "hickory-proto" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna", + "ipnet", + "once_cell", + "rand", + "ring", + "thiserror 2.0.21", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "hickory-resolver" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto", + "ipconfig", + "moka", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "smallvec", + "thiserror 2.0.21", + "tokio", + "tracing", +] + [[package]] name = "hidapi" version = "2.6.7" @@ -1314,7 +1428,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "socket2", + "socket2 0.5.10", "spake2", ] @@ -1375,11 +1489,13 @@ version = "0.1.0" dependencies = [ "flate2", "getrandom 0.3.4", + "hickory-resolver", "horizon-core", "horizon-world", "serde_json", "sha1", "sha2", + "tokio", ] [[package]] @@ -1653,6 +1769,25 @@ dependencies = [ "generic-array", ] +[[package]] +name = "ipconfig" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222" +dependencies = [ + "socket2 0.6.5", + "widestring", + "windows-registry", + "windows-result 0.4.1", + "windows-sys 0.61.2", +] + +[[package]] +name = "ipnet" +version = "2.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" + [[package]] name = "itertools" version = "0.14.0" @@ -1917,6 +2052,34 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "mio" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.61.2", +] + +[[package]] +name = "moka" +version = "0.12.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4293f18e7567a1caf3c584855554377025c65e0aa445344d04171f5ad63d19b9" +dependencies = [ + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "equivalent", + "parking_lot", + "portable-atomic", + "smallvec", + "tagptr", + "uuid", +] + [[package]] name = "multiversion_no_op" version = "1.0.0" @@ -2416,6 +2579,10 @@ name = "once_cell" version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" +dependencies = [ + "critical-section", + "portable-atomic", +] [[package]] name = "opaque-debug" @@ -2619,6 +2786,15 @@ dependencies = [ "zerovec", ] +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "presser" version = "0.3.1" @@ -2712,6 +2888,26 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" +[[package]] +name = "rand" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" +dependencies = [ + "rand_chacha", + "rand_core 0.9.5", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.5", +] + [[package]] name = "rand_core" version = "0.6.4" @@ -2721,6 +2917,15 @@ dependencies = [ "getrandom 0.2.17", ] +[[package]] +name = "rand_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +dependencies = [ + "getrandom 0.3.4", +] + [[package]] name = "range-alloc" version = "0.1.5" @@ -2821,6 +3026,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" +[[package]] +name = "resolv-conf" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" + [[package]] name = "ring" version = "0.17.14" @@ -3137,6 +3348,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "socket2" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + [[package]] name = "spake2" version = "0.4.0" @@ -3145,7 +3366,7 @@ checksum = "c5482afe85a0b6ce956c945401598dbc527593c77ba51d0a87a586938b1b893a" dependencies = [ "curve25519-dalek", "hkdf", - "rand_core", + "rand_core 0.6.4", "sha2", ] @@ -3286,6 +3507,12 @@ dependencies = [ "syn 3.0.6", ] +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + [[package]] name = "target-lexicon" version = "0.13.5" @@ -3376,13 +3603,36 @@ dependencies = [ "zerovec", ] +[[package]] +name = "tinyvec" +version = "1.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" + [[package]] name = "tokio" version = "1.53.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044" dependencies = [ + "bytes", + "libc", + "mio", "pin-project-lite", + "socket2 0.6.5", + "tokio-macros", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-macros" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.6", ] [[package]] @@ -3452,6 +3702,9 @@ name = "tracing-core" version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +dependencies = [ + "once_cell", +] [[package]] name = "tree_magic_mini" @@ -3561,6 +3814,7 @@ version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cc1186384beb7dd8eedea376413fd654937285ea6c9cfbb928dc3043ea4b606" dependencies = [ + "getrandom 0.4.3", "js-sys", "wasm-bindgen", ] @@ -4297,6 +4551,12 @@ dependencies = [ "web-sys", ] +[[package]] +name = "widestring" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471" + [[package]] name = "winapi-util" version = "0.1.11" @@ -4429,6 +4689,17 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link", + "windows-result 0.4.1", + "windows-strings", +] + [[package]] name = "windows-result" version = "0.1.2" diff --git a/crates/horizon-client/src/net.rs b/crates/horizon-client/src/net.rs index 74f1b0b6d..ebe9f226f 100644 --- a/crates/horizon-client/src/net.rs +++ b/crates/horizon-client/src/net.rs @@ -268,8 +268,13 @@ fn run( target } }; - let c = - Connection::connect(&host, port, Duration::from_secs(10)).map_err(|e| e.to_string())?; + let c = if address.starts_with(FRIEND) { + // The friends relay supplies a concrete endpoint, not a Minecraft hostname. + Connection::connect(&host, port, Duration::from_secs(10)) + } else { + Connection::connect_server(&host, port, Duration::from_secs(10)) + } + .map_err(|e| e.to_string())?; (host, port, c) }; *shared_counters.lock().unwrap() = Some(c.reader.counters.clone()); @@ -559,7 +564,7 @@ pub fn load_language(resources: &std::path::Path) -> Language { pub fn ping(address: &str, timeout: Duration) -> Result<(serde_json::Value, u128), String> { use horizon_protocol::packets::status; let (host, port) = parse_address(address).ok_or("Invalid address")?; - let mut c = Connection::connect(&host, port, timeout).map_err(|e| e.to_string())?; + let mut c = Connection::connect_server(&host, port, timeout).map_err(|e| e.to_string())?; c.reader .set_read_timeout(Some(timeout)) .map_err(|e| e.to_string())?; diff --git a/crates/horizon-protocol/Cargo.toml b/crates/horizon-protocol/Cargo.toml index 71b93a1fe..ae9049e2c 100644 --- a/crates/horizon-protocol/Cargo.toml +++ b/crates/horizon-protocol/Cargo.toml @@ -16,6 +16,9 @@ getrandom = "0.3" sha1 = "0.10" # Secure chat: SHA256withRSA message signatures. sha2 = "0.10" +# Minecraft SRV redirects, using the system DNS configuration. +hickory-resolver = "0.25.2" +tokio = { version = "1", features = ["rt", "time"] } # Its own name, not `probe`: Cargo copies every crate's examples into one target//examples. [[example]] diff --git a/crates/horizon-protocol/src/connection.rs b/crates/horizon-protocol/src/connection.rs index 8f7ae28cc..7cd7083dd 100644 --- a/crates/horizon-protocol/src/connection.rs +++ b/crates/horizon-protocol/src/connection.rs @@ -191,6 +191,19 @@ impl Connection { .to_socket_addrs() .map_err(|e| Error::new(format!("Unknown host {host}: {e}")))? .collect(); + Self::connect_addresses(host, addrs, timeout) + } + /// Minecraft's SRV redirect applies to the socket destination only. Callers + /// keep the player's original host and port in the protocol handshake. + pub fn connect_server(host: &str, port: u16, timeout: Duration) -> Result { + let addrs = crate::resolver::resolve(host, port, timeout)?; + Self::connect_addresses(host, addrs, timeout) + } + fn connect_addresses( + host: &str, + addrs: Vec, + timeout: Duration, + ) -> Result { let mut last = Error::new(format!("Unknown host {host}")); for addr in addrs { match TcpStream::connect_timeout(&addr, timeout) { diff --git a/crates/horizon-protocol/src/lib.rs b/crates/horizon-protocol/src/lib.rs index 855df6a5a..f0bea2ca2 100644 --- a/crates/horizon-protocol/src/lib.rs +++ b/crates/horizon-protocol/src/lib.rs @@ -12,6 +12,7 @@ pub mod ids; pub mod item; pub mod packets; pub mod registry; +mod resolver; pub mod rsa; pub mod secure_chat; pub mod servers; diff --git a/crates/horizon-protocol/src/resolver.rs b/crates/horizon-protocol/src/resolver.rs new file mode 100644 index 000000000..3a76578ec --- /dev/null +++ b/crates/horizon-protocol/src/resolver.rs @@ -0,0 +1,166 @@ +//! Minecraft server DNS redirects (`ServerRedirectHandler` / `ServerNameResolver`). +//! Only the default port uses SRV; no record or a failed query leaves the +//! original address in use. The protocol handshake still uses that address. +use crate::{Error, Result}; +use std::{ + net::{IpAddr, SocketAddr, ToSocketAddrs}, + time::Duration, +}; + +pub(crate) fn resolve(host: &str, port: u16, timeout: Duration) -> Result> { + resolve_with( + host, + port, + |name| srv_redirect(name, timeout), + |host, port| { + (host, port) + .to_socket_addrs() + .map(|addrs| addrs.collect()) + .map_err(|e| Error::new(format!("Unknown host {host}: {e}"))) + }, + ) +} + +fn resolve_with( + host: &str, + port: u16, + mut srv: impl FnMut(&str) -> Option<(String, u16)>, + mut addresses: impl FnMut(&str, u16) -> Result>, +) -> Result> { + if port == 25565 + && host.parse::().is_err() + && host != "localhost" + && let Some((target, target_port)) = + srv(&format!("_minecraft._tcp.{}.", host.trim_end_matches('.'))) + { + // Do not follow another SRV record at the target. Vanilla resolves its + // addresses directly, and does not fall back if the target is unknown. + return addresses(&target, target_port); + } + addresses(host, port) +} + +fn srv_redirect(name: &str, timeout: Duration) -> Option<(String, u16)> { + // Runs only on the blocking ping/login worker, never the render thread. + // Use the system's configured resolvers, not a public fallback. + let runtime = tokio::runtime::Builder::new_current_thread() + .enable_all() + .build() + .ok()?; + runtime.block_on(async { + let mut builder = hickory_resolver::TokioResolver::builder_tokio().ok()?; + builder.options_mut().attempts = 1; + builder.options_mut().timeout = timeout; + let resolver = builder.build(); + let records = tokio::time::timeout(timeout, resolver.srv_lookup(name)) + .await + .ok()? + .ok()?; + // ServerRedirectHandler uses the first record, not weighted balancing. + let record = records.iter().next()?; + Some((record.target().to_utf8(), record.port())) + }) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn redirects_default_port_even_when_the_original_host_has_no_addresses() { + let result = resolve_with( + "play.example.org", + 25565, + |name| { + assert_eq!(name, "_minecraft._tcp.play.example.org."); + Some(("backend.example.org.".into(), 25570)) + }, + |host, port| { + assert_eq!((host, port), ("backend.example.org.", 25570)); + Ok(vec!["127.0.0.1:25570".parse().unwrap()]) + }, + ) + .unwrap(); + assert_eq!( + result, + vec!["127.0.0.1:25570".parse::().unwrap()] + ); + } + + #[test] + fn no_record_or_lookup_failure_keeps_the_original_address() { + resolve_with( + "play.example.org", + 25565, + |_| None, + |host, port| { + assert_eq!((host, port), ("play.example.org", 25565)); + Ok(vec![]) + }, + ) + .unwrap(); + } + + #[test] + fn explicit_nondefault_ports_and_ip_literals_do_not_query_srv() { + for (host, port) in [ + ("play.example.org", 25570), + ("127.0.0.1", 25565), + ("::1", 25565), + ("localhost", 25565), + ] { + resolve_with( + host, + port, + |_| panic!("unexpected SRV query"), + |actual, actual_port| { + assert_eq!((actual, actual_port), (host, port)); + Ok(vec![]) + }, + ) + .unwrap(); + } + } + + #[test] + fn fully_qualified_host_does_not_get_a_second_trailing_dot() { + resolve_with( + "play.example.org.", + 25565, + |name| { + assert_eq!(name, "_minecraft._tcp.play.example.org."); + None + }, + |_, _| Ok(vec![]), + ) + .unwrap(); + } + + #[test] + fn unknown_redirect_target_does_not_fall_back_to_the_original() { + let result = resolve_with( + "play.example.org", + 25565, + |_| Some(("missing.example.org.".into(), 25570)), + |host, _| { + assert_eq!(host, "missing.example.org."); + Err(Error::new("unknown redirected host")) + }, + ); + assert_eq!(result.unwrap_err().to_string(), "unknown redirected host"); + } + + #[test] + fn literal_address_can_connect_without_dns() { + let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap(); + let address = listener.local_addr().unwrap(); + let connection = crate::connection::Connection::connect_server( + "127.0.0.1", + address.port(), + Duration::from_secs(1), + ) + .unwrap(); + let (accepted, _) = listener.accept().unwrap(); + drop((connection, accepted)); + } +} From 1dffadeea30a4d60e035bac16d0fd510c59f70f2 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 19:19:34 +0200 Subject: [PATCH 013/140] Pack screen: draw each pack's own pack.png instead of unknown_pack PackSelectionScreen.loadPackIcon registers every pack's pack.png as a texture; Horizon never loaded them, so every pack (Default, Programmer Art, High Contrast and the player's own) fell back to unknown_pack, the cobblestone. The icons now load from each pack when the screen opens and are written into 64 new 128x128 HUD atlas slots, one per icon on screen. The vanilla pack's icon is the client JAR's pack.png, which horizon-prepare now copies into the prepared resources. Co-Authored-By: Claude Opus 5.5 --- .../examples/probe/pack_screen_fixture.rs | 8 +- crates/horizon-client/src/game/packs.rs | 16 +- crates/horizon-client/src/hud.rs | 17 +- crates/horizon-client/src/options_ui.rs | 4 +- crates/horizon-client/src/pack_screen.rs | 166 +++++++++++++++++- crates/horizon-client/src/packs.rs | 55 +++++- crates/horizon-prepare/src/lib.rs | 6 +- 7 files changed, 249 insertions(+), 23 deletions(-) diff --git a/crates/horizon-client/examples/probe/pack_screen_fixture.rs b/crates/horizon-client/examples/probe/pack_screen_fixture.rs index 881570990..5d84ce0a6 100644 --- a/crates/horizon-client/examples/probe/pack_screen_fixture.rs +++ b/crates/horizon-client/examples/probe/pack_screen_fixture.rs @@ -5,7 +5,7 @@ //! //! usage: pack_screen_fixture RESOURCES CASES OUTPUT use horizon_client::{ - hud::HudAtlas, + hud::{HudAtlas, PACK_ICON_SIZE}, lang, pack_screen::{Compat, PackInfo, PackScreen, Source}, packs::{self, Position}, @@ -13,7 +13,7 @@ use horizon_client::{ text::Text, }; use serde_json::{Value, json}; -use std::{fmt::Write as _, fs, path::PathBuf}; +use std::{fmt::Write as _, fs, path::PathBuf, sync::Arc}; /// Styled runs: [text, rgb or null, bold, italic, underlined, strikethrough, obfuscated]. pub fn runs(t: &Text) -> Value { @@ -105,7 +105,9 @@ pub fn main() -> horizon_client::Result<()> { Some("unknown") => Compat::Unknown, _ => Compat::Compatible, }, - icon: p["icon"].as_bool().unwrap_or(false), + icon: p["icon"].as_bool().unwrap_or(false).then(|| { + Arc::from(vec![0; (PACK_ICON_SIZE * PACK_ICON_SIZE * 4) as usize]) + }), required: p["required"].as_bool().unwrap_or(false), position: if p["position"] == "top" { Position::Top diff --git a/crates/horizon-client/src/game/packs.rs b/crates/horizon-client/src/game/packs.rs index ae2de00e6..82ba69e9d 100644 --- a/crates/horizon-client/src/game/packs.rs +++ b/crates/horizon-client/src/game/packs.rs @@ -4,7 +4,7 @@ use super::Game; use horizon_client::{ hud::HudAtlas, lang, - pack_screen::{Compat, PackInfo, Source as PackSource}, + pack_screen::{self, Compat, PackInfo, Source as PackSource}, packs::{self, Pack, Position}, text::{Style, Text}, }; @@ -53,14 +53,15 @@ fn info(p: &Pack) -> PackInfo { PackSource::Default }, compat: p.compatibility, - icon: p.icon, + icon: p.icon_png().as_deref().and_then(pack_screen::load_icon), required: false, position: Position::Top, fixed: false, } } -/// The vanilla pack: required, at the bottom (`BuiltInPackSource`). -fn vanilla_info() -> PackInfo { +/// The vanilla pack: required, at the bottom (`BuiltInPackSource`), with the +/// client JAR's `pack.png` that the prepared resources hold. +fn vanilla_info(vanilla: &Path) -> PackInfo { PackInfo { id: "vanilla".into(), title: Text::translate("resourcePack.vanilla.name", &[]), @@ -68,7 +69,10 @@ fn vanilla_info() -> PackInfo { description_style: Style::default(), source: PackSource::BuiltIn, compat: Compat::Compatible, - icon: true, + icon: std::fs::read(vanilla.join("pack.png")) + .ok() + .as_deref() + .and_then(pack_screen::load_icon), required: true, position: Position::Bottom, fixed: false, @@ -80,7 +84,7 @@ pub(super) fn pack_infos(vanilla: &Path) -> Vec { .iter() .map(info) .collect(); - infos.push(vanilla_info()); + infos.push(vanilla_info(vanilla)); infos } impl Game<'_> { diff --git a/crates/horizon-client/src/hud.rs b/crates/horizon-client/src/hud.rs index cc922752e..89d1b1c3c 100644 --- a/crates/horizon-client/src/hud.rs +++ b/crates/horizon-client/src/hud.rs @@ -81,6 +81,12 @@ pub const MINIMAP_SPRITE: &str = "horizon/minimap"; pub const SKIN_SLOTS: usize = 32; /// Reused by the visible rows of the classic world selector. pub const WORLD_ICON_SLOTS: usize = 32; +/// Atlas slots for the pack icons on the pack screen, one per icon drawn +/// (`PackSelectionScreen.loadPackIcon` registers a texture per pack): two lists +/// of 36-pixel rows at GUI scale 2 on a 4K screen still fit. +pub const PACK_ICON_SLOTS: usize = 64; +/// A pack icon slot's side: vanilla's own icons are 128x128. +pub const PACK_ICON_SIZE: u32 = 128; /// Atlas slots for armour trim textures made at run time (`trims`), each the /// size of the largest trim texture. pub const TRIM_SLOTS: usize = 32; @@ -252,7 +258,7 @@ impl HudAtlas { ) } /// Empty slots written at run time: map textures (game/maps.rs), the - /// minimap, downloaded skins, world icons and the on-screen keyboard's text. + /// minimap, downloaded skins, world and pack icons and the on-screen keyboard's text. fn slots(images: &mut Vec, trim: (u32, u32)) { for i in 0..MAP_SLOTS { images.push((format!("horizon/map{i}"), 128, 128, vec![0; 128 * 128 * 4])); @@ -284,6 +290,15 @@ impl HudAtlas { vec![0; 64 * 64 * 4], )); } + let side = PACK_ICON_SIZE as usize; + for i in 0..PACK_ICON_SLOTS { + images.push(( + format!("horizon/pack-icon{i}"), + PACK_ICON_SIZE, + PACK_ICON_SIZE, + vec![0; side * side * 4], + )); + } // The on-screen keyboard's text and corner masks (ui_theme), rasterized at run time. images.push(( "horizon/ui-text".into(), diff --git a/crates/horizon-client/src/options_ui.rs b/crates/horizon-client/src/options_ui.rs index 352ebf26e..99a83072f 100644 --- a/crates/horizon-client/src/options_ui.rs +++ b/crates/horizon-client/src/options_ui.rs @@ -2079,7 +2079,9 @@ impl OptionsUi { let blink = self.pack_focus.elapsed().as_millis() as u64; let m = crate::screen_draw::Measure(&atlas.font); let mouse = (cursor.0.floor() as i32, cursor.1.floor() as i32); - let draws = self.packs(atlas, (w, h)).draw(&m, mouse, blink); + let packs = self.packs(atlas, (w, h)); + let mut draws = packs.draw(&m, mouse, blink); + packs.bind_icons(&mut draws, atlas, &mut batch.patches); crate::screen_draw::paint(batch, atlas, &draws); return; } diff --git a/crates/horizon-client/src/pack_screen.rs b/crates/horizon-client/src/pack_screen.rs index 934ecaf95..2929fd663 100644 --- a/crates/horizon-client/src/pack_screen.rs +++ b/crates/horizon-client/src/pack_screen.rs @@ -6,10 +6,13 @@ //! [`PackScreen::draw`] gives the screen's GUI calls. The game shows it; //! tools/test_pack_screen_parity.py compares it with vanilla. use crate::{ + font::Patch, + hud::{HudAtlas, PACK_ICON_SIZE, PACK_ICON_SLOTS}, packs::{Position, Selectable, SelectionModel}, screen_draw::{self as d, Draw, Measure, TextField}, text::{Style, Text}, }; +use std::{collections::HashMap, sync::Arc}; /// `PackCompatibility`. #[derive(Clone, Copy, Debug, PartialEq, Eq)] @@ -50,8 +53,8 @@ pub struct PackInfo { pub description_style: Style, pub source: Source, pub compat: Compat, - /// Whether the pack has a `pack.png`. - pub icon: bool, + /// The pack's `pack.png` ([`load_icon`]); none draws `unknown_pack`. + pub icon: Option>, pub required: bool, pub position: Position, pub fixed: bool, @@ -90,6 +93,27 @@ impl PackInfo { (t, Style::color(d::GRAY)) } } +/// A `pack.png` as the pack screen draws it: RGBA, stretched to a +/// `PACK_ICON_SIZE` square by nearest texels, as vanilla's icon texture is +/// sampled into its 32x32 square. None when it does not decode, where +/// `loadPackIcon` falls back to `unknown_pack`. +pub fn load_icon(png: &[u8]) -> Option> { + let (w, h, rgba) = crate::hud::decode_bytes(png).ok()?; + if w == 0 || h == 0 { + return None; + } + let size = u64::from(PACK_ICON_SIZE); + let mut out = Vec::with_capacity((size * size * 4) as usize); + for y in 0..size { + let sy = ((2 * y + 1) * u64::from(h) / (2 * size)) as usize; + for x in 0..size { + let sx = ((2 * x + 1) * u64::from(w) / (2 * size)) as usize; + let at = (sy * w as usize + sx) * 4; + out.extend_from_slice(&rgba[at..at + 4]); + } + } + Some(out.into()) +} /// `PackSelectionScreen.loadPackIcon`'s texture for a pack with an icon. pub fn icon_texture(id: &str) -> String { let sanitized: String = id @@ -306,6 +330,8 @@ pub struct PackScreen { confirm: Option, /// The selection changed since the screen opened. pub changed: bool, + /// The packs' icons by their [`icon_texture`]. + icons: HashMap>, } fn tr(key: &str) -> Text { @@ -329,11 +355,16 @@ impl PackScreen { italic: Some(true), ..Style::default() })); + let icons = packs + .iter() + .filter_map(|p| Some((icon_texture(&p.id), p.icon.clone()?))) + .collect(); let mut s = Self { width, height, in_world, packs, + icons, model, search, focus: Focus::None, @@ -760,6 +791,35 @@ impl PackScreen { pub fn commit(&self) -> Vec { self.model.commit() } + /// Points the icon blits of `draws` at the atlas's pack icon slots and + /// writes the icons into them, one slot per icon drawn (vanilla registers a + /// texture per pack). Icons past the last slot keep `unknown_pack`. + pub fn bind_icons(&self, draws: &mut [Draw], atlas: &HudAtlas, patches: &mut Vec) { + let mut slots = 0..PACK_ICON_SLOTS; + for draw in draws { + let Draw::Blit { texture, .. } = draw else { + continue; + }; + let Some(icon) = self.icons.get(texture.as_str()) else { + continue; + }; + let Some(slot) = slots.next() else { + return; + }; + let sprite = format!("horizon/pack-icon{slot}"); + let Some(rect) = atlas.sprites.get(&sprite) else { + return; + }; + patches.push(Patch { + x: (rect.u0 * atlas.width as f32).round() as u32, + y: (rect.v0 * atlas.height as f32).round() as u32, + width: PACK_ICON_SIZE, + height: PACK_ICON_SIZE, + rgba: icon.to_vec(), + }); + *texture = sprite; + } + } /// The shown screen's calls (`Screen.extractRenderState`); `blink_ms` /// is the time since the search box took the focus. @@ -891,7 +951,7 @@ impl PackScreen { -8978432, ); } - let icon = if p.icon { + let icon = if p.icon.is_some() { icon_texture(id) } else { "textures/misc/unknown_pack.png".into() @@ -979,6 +1039,106 @@ impl PackScreen { } } +#[cfg(test)] +mod icon_tests { + use super::*; + + fn png(w: u32, h: u32, rgba: &[u8]) -> Vec { + let mut out = Vec::new(); + let mut encoder = png::Encoder::new(&mut out, w, h); + encoder.set_color(png::ColorType::Rgba); + encoder.set_depth(png::BitDepth::Eight); + encoder + .write_header() + .unwrap() + .write_image_data(rgba) + .unwrap(); + out + } + fn pack(id: &str, icon: Option>) -> PackInfo { + PackInfo { + id: id.into(), + title: Text::literal(id), + description: Text::literal(""), + description_style: Style::default(), + source: Source::BuiltIn, + compat: Compat::Compatible, + icon, + required: false, + position: Position::Top, + fixed: false, + } + } + + /// Any size stretches over the whole square, nearest texels, as the + /// icon texture is sampled into its 32x32 blit. + #[test] + fn icons_stretch_to_the_slot_by_nearest_texels() { + let (red, blue) = ([255, 0, 0, 255], [0, 0, 255, 128]); + let icon = load_icon(&png(2, 1, &[red, blue].concat())).unwrap(); + let side = PACK_ICON_SIZE as usize; + assert_eq!(icon.len(), side * side * 4); + let at = |x: usize, y: usize| &icon[(y * side + x) * 4..][..4]; + assert_eq!((at(0, 0), at(side / 2 - 1, side - 1)), (&red[..], &red[..])); + assert_eq!( + (at(side / 2, 0), at(side - 1, side - 1)), + (&blue[..], &blue[..]) + ); + assert!(load_icon(b"not a png").is_none()); + } + + /// Programmer Art and High Contrast draw their own `pack.png`; a pack + /// without one keeps `unknown_pack`. + #[test] + fn drawn_icons_take_atlas_slots() { + let atlas = + crate::hud::HudAtlas::build(std::path::Path::new("/nonexistent/horizon-test-assets")) + .unwrap(); + let m = Measure(&atlas.font); + let dirt = load_icon(&png(1, 1, &[134, 96, 67, 255])).unwrap(); + let contrast = load_icon(&png(1, 1, &[0, 0, 0, 255])).unwrap(); + let packs = vec![ + pack("programmer_art", Some(dirt.clone())), + pack("high_contrast", Some(contrast.clone())), + pack("file/Iconless", None), + ]; + let screen = PackScreen::new(&m, 480, 320, false, packs, &[]); + let mut draws = screen.draw(&m, (0, 0), 0); + let mut patches = Vec::new(); + screen.bind_icons(&mut draws, &atlas, &mut patches); + let icons: Vec<&str> = draws + .iter() + .filter_map(|d| match d { + Draw::Blit { texture, .. } if texture.contains("pack") => Some(texture.as_str()), + _ => None, + }) + .collect(); + // The list shows them sorted by id. + assert_eq!( + icons, + [ + "textures/misc/unknown_pack.png", + "horizon/pack-icon0", + "horizon/pack-icon1" + ] + ); + assert_eq!(patches.len(), 2); + for (i, (patch, icon)) in patches.iter().zip([&contrast, &dirt]).enumerate() { + let rect = atlas.sprites[&format!("horizon/pack-icon{i}")]; + assert_eq!( + (patch.x, patch.y, patch.width, patch.height), + ( + (rect.u0 * atlas.width as f32).round() as u32, + (rect.v0 * atlas.height as f32).round() as u32, + PACK_ICON_SIZE, + PACK_ICON_SIZE + ) + ); + assert_eq!(&patch.rgba[..], &icon[..]); + } + } +} + #[cfg(test)] mod click_sound_tests { use super::*; diff --git a/crates/horizon-client/src/packs.rs b/crates/horizon-client/src/packs.rs index 5daaaacad..0ba1dc1f5 100644 --- a/crates/horizon-client/src/packs.rs +++ b/crates/horizon-client/src/packs.rs @@ -34,8 +34,6 @@ pub struct Pack { pub description_style: Style, pub compatible: bool, pub compatibility: crate::pack_screen::Compat, - /// The pack has a `pack.png`. - pub icon: bool, /// Overlay directories active for this game version, in `pack.mcmeta` order. pub overlays: Vec, /// `filter.block` entries (namespace and path patterns) hiding resources @@ -260,6 +258,15 @@ fn filter_of(meta: &serde_json::Value) -> Vec { }) .collect() } +impl Pack { + /// The pack's `pack.png` (`PackResources.getRootResource`), for its icon. + pub fn icon_png(&self) -> Option> { + match &self.source { + Source::Dir(d) => fs::read(d.join("pack.png")).ok(), + Source::Zip(z) => Zip::open(z).ok()?.read("pack.png").ok(), + } + } +} fn read_meta(source: &Source) -> Option { let bytes = match source { Source::Dir(d) => fs::read(d.join("pack.mcmeta")).ok()?, @@ -270,10 +277,6 @@ fn read_meta(source: &Source) -> Option { fn pack(id: String, title: Text, source: Source) -> Option { let meta = read_meta(&source)?; let (raw_description, description_style) = component_root(&meta["pack"]["description"]); - let icon = match &source { - Source::Dir(d) => d.join("pack.png").is_file(), - Source::Zip(z) => Zip::open(z).is_ok_and(|z| z.read("pack.png").is_ok()), - }; Some(Pack { id, title, @@ -282,7 +285,6 @@ fn pack(id: String, title: Text, source: Source) -> Option { description_style, compatible: compatible(&meta), compatibility: compatibility(&meta), - icon, overlays: overlays_of(&meta), filter: filter_of(&meta), source, @@ -983,6 +985,45 @@ mod tests { let _ = fs::remove_dir_all(base); } #[test] + fn built_in_and_folder_packs_give_their_pack_png() { + use std::io::Write as _; + let base = std::env::temp_dir().join(format!("horizon-pack-icons-{}", std::process::id())); + let _ = fs::remove_dir_all(&base); + let meta = br#"{"pack":{"description":"d","pack_format":97}}"#; + let built_in = base.join("vanilla/assets/minecraft/resourcepacks"); + fs::create_dir_all(&built_in).unwrap(); + let mut zip = + zip::ZipWriter::new(fs::File::create(built_in.join("programmer_art.zip")).unwrap()); + for (name, data) in [("pack.mcmeta", &meta[..]), ("pack.png", b"dirt")] { + zip.start_file(name, zip::write::SimpleFileOptions::default()) + .unwrap(); + zip.write_all(data).unwrap(); + } + zip.finish().unwrap(); + for (name, icon) in [("Iconless", None), ("Mine", Some(&b"mine"[..]))] { + let dir = base.join("packs").join(name); + fs::create_dir_all(&dir).unwrap(); + fs::write(dir.join("pack.mcmeta"), meta).unwrap(); + if let Some(icon) = icon { + fs::write(dir.join("pack.png"), icon).unwrap(); + } + } + let packs = discover(&base.join("vanilla"), &base.join("packs")); + let icons: Vec<_> = packs + .iter() + .map(|p| (p.id.as_str(), p.icon_png())) + .collect(); + assert_eq!( + icons, + [ + ("programmer_art", Some(b"dirt".to_vec())), + ("file/Iconless", None), + ("file/Mine", Some(b"mine".to_vec())), + ] + ); + let _ = fs::remove_dir_all(base); + } + #[test] fn overlays_and_filters() { let v = |s: &str| serde_json::from_str::(s).unwrap(); let meta = v(r#"{"overlays":{"entries":[ diff --git a/crates/horizon-prepare/src/lib.rs b/crates/horizon-prepare/src/lib.rs index 24f163a9b..30b2f1cff 100644 --- a/crates/horizon-prepare/src/lib.rs +++ b/crates/horizon-prepare/src/lib.rs @@ -676,13 +676,15 @@ fn steps( } // The playable client needs every client asset (textures, models, fonts, GUI) - // and every data-pack resource (worldgen, recipes, loot tables, tags). + // and every data-pack resource (worldgen, recipes, loot tables, tags), and + // the vanilla pack's icon (`pack.png`) for the pack screen. (run.log)("Copying the client's assets and data"); let mut count = 0usize; let mut client = open_zip(&run.client)?; let version = pyjson::loads(&zip_text(&mut client, "version.json")?)?; for name in zip_names(&client) { - if !(name.starts_with("assets/") || name.starts_with("data/")) || name.ends_with('/') { + let wanted = name.starts_with("assets/") || name.starts_with("data/") || name == "pack.png"; + if !wanted || name.ends_with('/') { continue; } let relative = member_path(&name, "Invalid resource path")?; From 9223b401e7bb8864711e1f05c891b9d3187bbadb Mon Sep 17 00:00:00 2001 From: some-du6e <103129948+some-du6e@users.noreply.github.com> Date: Sat, 24 Oct 2026 12:20:45 -0600 Subject: [PATCH 014/140] Decode every item data component a server sends Horizon decoded 25 of 26.3's 122 data component types. Item data has no length prefix, so a stack with any other component (an armour trim, banner patterns, pot sherds, a stew's effects, a plugin's item) made the whole packet undecodable and it was dropped: on a Paper server the inventory arrived empty until each slot was clicked, the advancements screen said "There doesn't seem to be anything here..." and the recipe book was empty. Every other component is now read to its end with its vanilla StreamCodec (item/skip.rs) and kept as its bytes, written back as they came; components without a network codec go as their NBT. The client leaves them out of the item's components, so the item keeps its prototype's values for them. tools/test_item_wire_parity.py checks it against vanilla: the oracle encodes 374 stacks with ItemStack.OPTIONAL_STREAM_CODEC (every default component value of every item, SNBT fixtures for the rest, direct holders and removals built in Java), covering all 122 component types, and the Rust probe must consume every byte, find the same component ids and encode the read-past ones back to the same bytes. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/remote.rs | 2 + crates/horizon-protocol/Cargo.toml | 4 + .../examples/item_wire_probe.rs | 64 +++ crates/horizon-protocol/src/item.rs | 45 +- crates/horizon-protocol/src/item/skip.rs | 427 ++++++++++++++++++ .../parity/VanillaItemWireOracle.java | 155 +++++++ tools/test_item_wire_parity.py | 177 ++++++++ 7 files changed, 871 insertions(+), 3 deletions(-) create mode 100644 crates/horizon-protocol/examples/item_wire_probe.rs create mode 100644 crates/horizon-protocol/src/item/skip.rs create mode 100644 mods/horizon/src/test/java/dev/horizonlab/parity/VanillaItemWireOracle.java create mode 100755 tools/test_item_wire_parity.py diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index da0def0fb..0e6127178 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -596,6 +596,8 @@ impl Game<'_> { continue; }; let value = match c { + // Read past, not decoded: the item keeps its prototype's value. + Component::Raw(_) => continue, Component::Int(v) if *kind == component::RARITY => { let rarity = ["common", "uncommon", "rare", "epic"]; Tag::String(rarity.get(*v as usize).copied().unwrap_or("common").into()) diff --git a/crates/horizon-protocol/Cargo.toml b/crates/horizon-protocol/Cargo.toml index 71b93a1fe..6467ed849 100644 --- a/crates/horizon-protocol/Cargo.toml +++ b/crates/horizon-protocol/Cargo.toml @@ -22,5 +22,9 @@ sha2 = "0.10" name = "protocol_probe" path = "examples/probe.rs" +[[example]] +name = "item_wire_probe" +path = "examples/item_wire_probe.rs" + [lints] workspace = true diff --git a/crates/horizon-protocol/examples/item_wire_probe.rs b/crates/horizon-protocol/examples/item_wire_probe.rs new file mode 100644 index 000000000..19760ca1a --- /dev/null +++ b/crates/horizon-protocol/examples/item_wire_probe.rs @@ -0,0 +1,64 @@ +//! The item wire harness's Rust side (tools/test_item_wire_parity.py): reads +//! the oracle's stacks (JSON lines with `label` and `hex`), decodes each with +//! `item::Slot` and prints, per stack, whether every byte was consumed, the +//! patch's component ids (added, then removed), which of them Horizon +//! decoded into its own types (the rest it reads past, keeping their bytes) +//! and whether encoding the decoded stack gives the same bytes back. +//! +//! cargo run -p horizon-protocol --example item_wire_probe -- vanilla.jsonl rust.jsonl +use horizon_protocol::{ + buf::{Codec, Reader, Writer}, + item::{Component, Slot}, +}; +use serde_json::{Value, json}; +use std::io::Write; + +fn hex(s: &str) -> Option> { + (0..s.len()) + .step_by(2) + .map(|i| u8::from_str_radix(s.get(i..i + 2)?, 16).ok()) + .collect() +} + +fn main() -> Result<(), Box> { + let args: Vec = std::env::args().collect(); + let input = std::fs::read_to_string(args.get(1).ok_or("usage: item_wire_probe IN OUT")?)?; + let mut out = std::io::BufWriter::new(std::fs::File::create( + args.get(2).ok_or("usage: item_wire_probe IN OUT")?, + )?); + for line in input.lines().filter(|l| !l.trim().is_empty()) { + let v: Value = serde_json::from_str(line)?; + let label = v["label"].clone(); + let Some(bytes) = v["hex"].as_str().and_then(hex) else { + continue; + }; + let mut r = Reader::new(&bytes); + let result = match Slot::read(&mut r) { + Err(e) => json!({"label": label, "error": e.to_string()}), + Ok(stack) => { + let mut w = Writer::new(); + Slot::write(&stack, &mut w); + let (added, removed): (Vec, Vec) = + stack.as_ref().map_or_else(Default::default, |s| { + (s.added.iter().map(|(k, _)| *k).collect(), s.removed.clone()) + }); + let typed: Vec = stack + .iter() + .flat_map(|s| &s.added) + .filter(|(_, c)| !matches!(c, Component::Raw(_))) + .map(|(k, _)| *k) + .collect(); + json!({ + "label": label, + "left": r.remaining(), + "added": added, + "removed": removed, + "typed": typed, + "same_bytes": w.data == bytes, + }) + } + }; + writeln!(out, "{result}")?; + } + Ok(()) +} diff --git a/crates/horizon-protocol/src/item.rs b/crates/horizon-protocol/src/item.rs index 650fa4baa..0aa940a38 100644 --- a/crates/horizon-protocol/src/item.rs +++ b/crates/horizon-protocol/src/item.rs @@ -2,11 +2,13 @@ //! item's registry id and a data component patch, plus the hashed form the //! client sends back in container clicks (HashedStack). use crate::{ - Error, Result, + Result, buf::{Codec, Reader, Writer}, }; use horizon_world::nbt::Tag; +mod skip; + /// minecraft:data_component_type registry ids (26.3). pub mod component { pub const CUSTOM_DATA: i32 = 0; @@ -78,6 +80,9 @@ pub enum Component { WrittenBook(WrittenBook), /// `ChargedProjectiles`: a loaded crossbow's ammunition, as templates. Stacks(Vec), + /// A component Horizon reads past without interpreting it: its encoded + /// bytes, written back as they came. + Raw(Vec), } /// `Filterable.streamCodec`: the raw value, then an optional filtered one @@ -224,11 +229,16 @@ impl Component { hidden: (0..n).map(|_| r.varint()).collect::>()?, } } - other => return Err(Error::new(format!("unsupported item component {other}"))), + other => { + let start = r.position(); + skip::component(other, r)?; + Self::Raw(r.since(start).to_vec()) + } }) } fn write(&self, kind: i32, w: &mut Writer) { match self { + Self::Raw(bytes) => w.bytes(bytes), Self::Int(v) if kind == component::DYED_COLOR => w.i32(*v), Self::Int(v) => w.varint(*v), Self::Unit => {} @@ -582,7 +592,8 @@ mod tests { #[test] fn unknown_components_are_errors() { - let bytes = [1, 5, 1, 0, 99]; + // 122 is past DataComponents' last id (cushion_color, 121). + let bytes = [1, 5, 1, 0, 122]; assert!(Slot::read(&mut Reader::new(&bytes)).is_err()); } @@ -631,4 +642,32 @@ mod tests { [("textures".to_owned(), "x".to_owned(), None)] ); } + + #[test] + fn components_read_past_keep_their_bytes() { + // Vanilla 26.3's encoding (tools/test_item_wire_parity.py) of a chestplate's + // armour trim, a banner's patterns (one direct), a pot's sherds and a stew's + // effects: one server's inventory, recipe book and advancements had them. + for (hex, kind) in [ + ("01bd0801003a0502", 58), + ("01890b01004a02200e000b6d696e6563726166743a7801790b", 74), + ("01880301004c01f60801000001be0c0100000001d30c010000", 76), + ("01a408010037020f6412a001", 55), + ] { + let bytes: Vec = (0..hex.len()) + .step_by(2) + .map(|i| u8::from_str_radix(&hex[i..i + 2], 16).unwrap()) + .collect(); + let mut r = Reader::new(&bytes); + let stack = Slot::read(&mut r).unwrap(); + assert_eq!(r.remaining(), 0, "component {kind}"); + assert!(matches!( + stack.as_ref().and_then(|s| s.component(kind)), + Some(Component::Raw(_)) + )); + let mut w = Writer::new(); + Slot::write(&stack, &mut w); + assert_eq!(w.data, bytes, "component {kind}"); + } + } } diff --git a/crates/horizon-protocol/src/item/skip.rs b/crates/horizon-protocol/src/item/skip.rs new file mode 100644 index 000000000..152d0f0f1 --- /dev/null +++ b/crates/horizon-protocol/src/item/skip.rs @@ -0,0 +1,427 @@ +//! Reading past the data components Horizon doesn't interpret: each +//! function consumes exactly what its vanilla StreamCodec writes +//! (DataComponents' `networkSynchronized` codecs; a component without one +//! goes as its persistent Codec's NBT, `ByteBufCodecs.fromCodecWithRegistries`). +//! Item data has no length prefix, so a component read short or long makes +//! everything after it unreadable. +use super::{Component, Template}; +use crate::{ + Error, Result, + buf::{Codec, Reader}, +}; + +type Read = fn(&mut Reader) -> Result<()>; + +/// DataComponents' registry order (26.3) for the ids `Component::read` +/// doesn't decode itself. +pub(super) fn component(kind: i32, r: &mut Reader) -> Result<()> { + match kind { + // Unit.STREAM_CODEC: glider, waxed. + 34 | 120 => Ok(()), + // Components without a network codec go as their NBT: intangible_projectile, + // map_decorations, debug_stick_state, recipes, lock, container_loot. + 22 | 49 | 59 | 68 | 81 | 82 => nbt(r), + // A VarInt (VAR_INT, an idMapper, a registry or holderRegistry id): damage_type, + // enchantable, additional_trade_cost, block_transformer, villager_food, dye, + // ominous_bottle_amplifier, base_color, the mob variants and colours, the pottery + // pattern and cushion_color. + 8 | 31 | 42 | 43 | 44 | 46 | 65 | 75 | 88..=108 | 110..=117 | 121 => varint(r), + // FLOAT: minimum_attack_charge, potion_duration_scale. + 7 | 54 => f32(r), + // Identifier.STREAM_CODEC: tooltip_style, note_block_sound. + 35 | 73 => ident(r), + // UseEffects: canSprint, interactVibrations, speedMultiplier. + 5 => { + r.bool()?; + r.bool()?; + f32(r) + } + // AdventureModePredicate: can_place_on, can_break. + 14 | 15 => list(r, block_predicate), + 16 => list(r, attribute_modifier), + // FoodProperties.DIRECT_STREAM_CODEC: nutrition, saturation, canAlwaysEat. + 23 => { + varint(r)?; + f32(r)?; + boolean(r) + } + // Consumable: consumeSeconds, animation, sound, hasConsumeParticles, onConsumeEffects. + 24 => { + f32(r)?; + varint(r)?; + sound(r)?; + boolean(r)?; + list(r, consume_effect) + } + // UseRemainder, SulfurCubeContent: one template. + 25 | 80 => template(r), + // UseCooldown: seconds, cooldownGroup. + 26 => { + f32(r)?; + optional(r, ident) + } + // DamageResistant, Repairable, provides_banner_patterns: a holder set. + 27 | 33 | 67 => holder_set(r), + 28 => tool(r), + // Weapon: itemDamagePerAttack, disableBlockingForSeconds. + 29 => { + varint(r)?; + f32(r) + } + 32 => equippable(r), + // DeathProtection: deathEffects. + 36 => list(r, consume_effect), + 37 => blocks_attacks(r), + // PiercingWeapon: dealsKnockback, dismounts, sound, hitSound. + 38 => { + boolean(r)?; + boolean(r)?; + optional(r, sound)?; + optional(r, sound) + } + 39 => kinetic_weapon(r), + // SwingAnimation: type, duration. + 40 | 41 => { + varint(r)?; + varint(r) + } + // BundleContents: templates. + 52 => list(r, template), + 53 => potion_contents(r), + // SuspiciousStewEffects: effect, duration. + 55 => list(r, |r| { + varint(r)?; + varint(r) + }), + // ArmorTrim: material, then Holder (assetId, description, decal). + 58 => { + trim_material(r)?; + holder(r, |r| { + ident(r)?; + nbt(r)?; + boolean(r) + }) + } + // TypedEntityData (entity_data, block_entity_data): the type id, then a compound. + 60 | 62 => { + varint(r)?; + nbt(r) + } + // CustomData: bucket_entity_data. + 61 => nbt(r), + // InstrumentComponent: Holder (soundEvent, useDuration, range, + // durabilityDamage, description). + 63 => holder(r, |r| { + sound(r)?; + f32(r)?; + f32(r)?; + varint(r)?; + nbt(r) + }), + 64 => trim_material(r), + // JukeboxPlayable: Holder (soundEvent, description, lengthInSeconds, + // comparatorOutput). + 66 => holder(r, |r| { + sound(r)?; + nbt(r)?; + f32(r)?; + varint(r) + }), + // LodestoneTracker: target (GlobalPos: dimension, BlockPos), tracked. + 69 => { + optional(r, |r| { + ident(r)?; + r.i64().map(drop) + })?; + boolean(r) + } + 70 => firework_explosion(r), + // Fireworks: flightDuration, explosions. + 71 => { + varint(r)?; + list(r, firework_explosion) + } + // BannerPatternLayers: Holder (assetId, translationKey), colour. + 74 => list(r, |r| { + holder(r, |r| { + ident(r)?; + string(r) + })?; + varint(r) + }), + // PotDecorations: back, left, right, front. + 76 => (0..4).try_for_each(|_| optional(r, template)), + // ItemContainerContents: optional templates. + 77 => list(r, |r| optional(r, template)), + // BlockItemStateProperties: a string to string map. + 78 => list(r, |r| { + string(r)?; + string(r) + }), + // Bees: Occupant (entity type and data, ticksInHive, minTicksInHive). + 79 => list(r, |r| { + varint(r)?; + nbt(r)?; + varint(r)?; + varint(r) + }), + 83 => sound(r), + // Compostable: layers. + 84 => resolvable(r, i32), + // CookingFuel (burnTime, speedMultiplier), BrewingFuel (uses, speedMultiplier). + 85 | 86 => { + resolvable(r, i32)?; + resolvable(r, f32) + } + // MobVisibility: targetingEntityTypes, visibility. + 87 => { + holder_set(r)?; + f32(r) + } + // Holder: width, height, assetId, title, author. + 109 => holder(r, |r| { + varint(r)?; + varint(r)?; + ident(r)?; + optional(r, nbt)?; + optional(r, nbt) + }), + // SignText: four messages, four optional filtered ones, colour, hasGlowingText. + 118 | 119 => { + (0..4).try_for_each(|_| nbt(r))?; + optional(r, |r| (0..4).try_for_each(|_| nbt(r)))?; + varint(r)?; + boolean(r) + } + other => Err(Error::new(format!("unsupported item component {other}"))), + } +} + +fn boolean(r: &mut Reader) -> Result<()> { + r.bool().map(drop) +} +fn varint(r: &mut Reader) -> Result<()> { + r.varint().map(drop) +} +fn f32(r: &mut Reader) -> Result<()> { + r.f32().map(drop) +} +fn i32(r: &mut Reader) -> Result<()> { + r.i32().map(drop) +} +/// ByteBufCodecs.STRING_UTF8. +fn string(r: &mut Reader) -> Result<()> { + r.string(32767).map(drop) +} +/// Identifier.STREAM_CODEC, ResourceKey.streamCodec. +fn ident(r: &mut Reader) -> Result<()> { + string(r) +} +/// A text component or compound (fromCodecWithRegistries, COMPOUND_TAG). +fn nbt(r: &mut Reader) -> Result<()> { + r.nbt().map(drop) +} +fn template(r: &mut Reader) -> Result<()> { + Template::read(r).map(drop) +} +/// ByteBufCodecs.optional: a flag, then the value. +fn optional(r: &mut Reader, value: Read) -> Result<()> { + if r.bool()? { value(r) } else { Ok(()) } +} +/// ByteBufCodecs.list and map: a VarInt count, then the elements (a map's +/// key and value each). Every element is at least a byte, so the count +/// can't pass what is left. +fn list(r: &mut Reader, element: Read) -> Result<()> { + let n = r.count(r.remaining())?; + (0..n).try_for_each(|_| element(r)) +} +/// ByteBufCodecs.holder: 0 and the value itself, or the registry id plus one. +fn holder(r: &mut Reader, direct: Read) -> Result<()> { + if r.varint()? == 0 { direct(r) } else { Ok(()) } +} +/// ByteBufCodecs.holderSet: 0 and a tag id, or the size plus one and the ids. +fn holder_set(r: &mut Reader) -> Result<()> { + match r.varint()? { + 0 => ident(r), + n => { + let n = usize::try_from(n - 1).map_err(|_| Error::new("negative holder set size"))?; + if n > r.remaining() { + return Err(Error::new("holder set past the end")); + } + (0..n).try_for_each(|_| varint(r)) + } + } +} +/// SoundEvent.STREAM_CODEC: a holder of a location and an optional fixed range. +fn sound(r: &mut Reader) -> Result<()> { + holder(r, |r| { + ident(r)?; + optional(r, f32) + }) +} +/// ResolvableInt, ResolvableFloat: Either a constant (true) or a context provider's key. +fn resolvable(r: &mut Reader, constant: Read) -> Result<()> { + if r.bool()? { constant(r) } else { ident(r) } +} +/// TrimMaterial.STREAM_CODEC: a holder of a palette id and a description. +fn trim_material(r: &mut Reader) -> Result<()> { + holder(r, |r| { + ident(r)?; + nbt(r) + }) +} +/// MobEffectInstance: the effect id, then its Details. +fn mob_effect(r: &mut Reader) -> Result<()> { + varint(r)?; + effect_details(r) +} +/// MobEffectInstance.Details: amplifier, duration, ambient, showParticles, showIcon, then the +/// hidden effect's Details, recursively. +fn effect_details(r: &mut Reader) -> Result<()> { + varint(r)?; + varint(r)?; + boolean(r)?; + boolean(r)?; + boolean(r)?; + optional(r, effect_details) +} +/// ConsumeEffect.STREAM_CODEC: the consume_effect_type id, then that type's fields. +fn consume_effect(r: &mut Reader) -> Result<()> { + match r.varint()? { + // apply_effects: effects, probability. + 0 => { + list(r, mob_effect)?; + f32(r) + } + // remove_effects: a mob effect holder set. + 1 => holder_set(r), + // clear_all_effects. + 2 => Ok(()), + // teleport_randomly: diameter, directionalParticles. + 3 => { + f32(r)?; + boolean(r) + } + // play_sound. + 4 => sound(r), + other => Err(Error::new(format!("unknown consume effect type {other}"))), + } +} +/// BlockPredicate: blocks, properties, nbt, then DataComponentMatchers (exact, partial). +fn block_predicate(r: &mut Reader) -> Result<()> { + optional(r, holder_set)?; + // StatePropertiesPredicate: PropertyMatchers, each a name and an + // Either. + optional(r, |r| { + list(r, |r| { + string(r)?; + if r.bool()? { + string(r) + } else { + optional(r, string)?; + optional(r, string) + } + }) + })?; + optional(r, nbt)?; + // DataComponentExactPredicate: TypedDataComponents, a component type id and its value. + list(r, |r| { + let kind = r.varint()?; + Component::read(kind, r).map(drop) + })?; + // DataComponentPredicate.STREAM_CODEC: an Either of a predicate type id or a component + // type id, then the predicate as NBT (fromCodecWithRegistries). + list(r, |r| { + boolean(r)?; + varint(r)?; + nbt(r) + }) +} +/// ItemAttributeModifiers.Entry: attribute, modifier (id, amount, operation), slot, display. +fn attribute_modifier(r: &mut Reader) -> Result<()> { + varint(r)?; + ident(r)?; + r.f64()?; + varint(r)?; + varint(r)?; + // Display.Type: default, hidden, or override and its text. + match r.varint()? { + 0 | 1 => Ok(()), + 2 => nbt(r), + other => Err(Error::new(format!( + "unknown attribute modifier display {other}" + ))), + } +} +/// Tool: rules (blocks, speed, correctForDrops), defaultMiningSpeed, damagePerBlock, +/// canDestroyBlocksInCreative. +fn tool(r: &mut Reader) -> Result<()> { + list(r, |r| { + holder_set(r)?; + optional(r, f32)?; + optional(r, boolean) + })?; + f32(r)?; + varint(r)?; + boolean(r) +} +/// Equippable: slot, equipSound, assetId, cameraOverlay, allowedEntities, dispensable, +/// swappable, damageOnHurt, equipOnInteract, canBeSheared, shearingSound. +fn equippable(r: &mut Reader) -> Result<()> { + varint(r)?; + sound(r)?; + optional(r, ident)?; + optional(r, ident)?; + optional(r, holder_set)?; + (0..5).try_for_each(|_| boolean(r))?; + sound(r) +} +/// BlocksAttacks: blockDelaySeconds, disableCooldownScale, damageReductions (angle, type, +/// base, factor), itemDamage (threshold, base, factor), bypassedBy, blockSound, disableSound. +fn blocks_attacks(r: &mut Reader) -> Result<()> { + f32(r)?; + f32(r)?; + list(r, |r| { + f32(r)?; + optional(r, holder_set)?; + f32(r)?; + f32(r) + })?; + (0..3).try_for_each(|_| f32(r))?; + optional(r, holder_set)?; + optional(r, sound)?; + optional(r, sound) +} +/// KineticWeapon: contactCooldownTicks, delayTicks, the dismount, knockback and damage +/// conditions (maxDurationTicks, minSpeed, minRelativeSpeed), forwardMovement, +/// damageMultiplier, sound, hitSound. +fn kinetic_weapon(r: &mut Reader) -> Result<()> { + varint(r)?; + varint(r)?; + (0..3).try_for_each(|_| { + optional(r, |r| { + varint(r)?; + f32(r)?; + f32(r) + }) + })?; + f32(r)?; + f32(r)?; + optional(r, sound)?; + optional(r, sound) +} +/// PotionContents: potion, customColor, customEffects, customName. +fn potion_contents(r: &mut Reader) -> Result<()> { + optional(r, varint)?; + optional(r, i32)?; + list(r, mob_effect)?; + optional(r, string) +} +/// FireworkExplosion: shape, colors, fadeColors, hasTrail, hasTwinkle. +fn firework_explosion(r: &mut Reader) -> Result<()> { + varint(r)?; + list(r, i32)?; + list(r, i32)?; + boolean(r)?; + boolean(r) +} diff --git a/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaItemWireOracle.java b/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaItemWireOracle.java new file mode 100644 index 000000000..cc95bb311 --- /dev/null +++ b/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaItemWireOracle.java @@ -0,0 +1,155 @@ +package dev.horizonlab.parity; + +import io.netty.buffer.Unpooled; +import it.unimi.dsi.fastutil.objects.Reference2ObjectMap; +import it.unimi.dsi.fastutil.objects.Reference2ObjectMaps; +import java.io.PrintWriter; +import java.lang.reflect.Field; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.HexFormat; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.Optional; +import net.minecraft.core.Holder; +import net.minecraft.core.component.DataComponentPatch; +import net.minecraft.core.component.DataComponentType; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.component.TypedDataComponent; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.Identifier; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.entity.decoration.painting.PaintingVariant; +import net.minecraft.world.item.JukeboxPlayable; +import net.minecraft.world.item.JukeboxSong; +import net.minecraft.world.item.component.MapPostProcessing; +import net.minecraft.util.Unit; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; + +/** + * Item stacks as a server sends them (ItemStack.OPTIONAL_STREAM_CODEC), for + * every data component: each default component value of every vanilla item + * set on a stick (so it is in the patch), the SNBT fixtures given in a file + * (one `labelstack SNBT` per line), and a few patches built directly. + * Prints one JSON line per stack: its label, the encoded bytes in hex and the + * patch's component type ids in encoding order (added, then removed), or + * the error. + */ +public final class VanillaItemWireOracle { + private static final int PER_TYPE = 12; + + public static void main(String[] args) throws Exception { + ParityData.init(); + List fixtures = new ArrayList<>(); + for (String line : Files.readAllLines(Path.of(args[0]))) { + if (line.isBlank() || line.startsWith("#")) continue; + fixtures.add(line.split("\t", 2)); + } + try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Path.of(args[1])))) { + // Each distinct default value, once per component type and + // encoding, and at most PER_TYPE of them for one type. + Set seen = new HashSet<>(); + Map, Integer> perType = new HashMap<>(); + for (var item : BuiltInRegistries.ITEM) { + for (TypedDataComponent c : item.components()) { + ItemStack stack = new ItemStack(Items.STICK); + if (!set(stack, c)) continue; + String hex = encode(stack); + if (hex == null || perType.getOrDefault(c.type(), 0) >= PER_TYPE) continue; + if (!seen.add(BuiltInRegistries.DATA_COMPONENT_TYPE.getKey(c.type()) + hex)) continue; + perType.merge(c.type(), 1, Integer::sum); + print(out, "default " + BuiltInRegistries.ITEM.getKey(item) + " " + BuiltInRegistries.DATA_COMPONENT_TYPE.getKey(c.type()), stack); + } + } + for (String[] f : fixtures) { + try { + print(out, f[0], ParityData.stack(f[1])); + } catch (Exception e) { + out.println("{\"label\":" + json(f[0]) + ",\"error\":" + json(String.valueOf(e)) + "}"); + } + } + // Components without a persistent codec, direct holders item SNBT + // can't name, and removals. + ItemStack direct = new ItemStack(Items.STICK); + direct.set(DataComponents.ADDITIONAL_TRADE_COST, 4); + direct.set(DataComponents.MAP_POST_PROCESSING, MapPostProcessing.SCALE); + direct.set(DataComponents.JUKEBOX_PLAYABLE, new JukeboxPlayable(Holder.direct( + new JukeboxSong(SoundEvents.ARMOR_EQUIP_CHAIN, Component.literal("S"), 10f, 3)))); + direct.set(DataComponents.PAINTING_VARIANT, Holder.direct(new PaintingVariant( + 2, 1, Identifier.withDefaultNamespace("kebab"), Optional.of(Component.literal("T")), Optional.empty()))); + print(out, "non-persistent and direct", direct); + ItemStack locked = new ItemStack(Items.STONE); + locked.set(DataComponents.CREATIVE_SLOT_LOCK, Unit.INSTANCE); + print(out, "creative_slot_lock", locked); + ItemStack removed = new ItemStack(Items.APPLE, 3); + removed.remove(DataComponents.FOOD); + removed.remove(DataComponents.CONSUMABLE); + removed.set(DataComponents.DAMAGE, 4); + print(out, "removed food and consumable", removed); + print(out, "empty", ItemStack.EMPTY); + } + } + + @SuppressWarnings("unchecked") + private static boolean set(ItemStack stack, TypedDataComponent c) { + if (stack.getPrototype().has(c.type()) && java.util.Objects.equals(stack.getPrototype().get(c.type()), c.value())) return false; + stack.set((DataComponentType) c.type(), c.value()); + return true; + } + + private static String encode(ItemStack stack) { + var buf = new RegistryFriendlyByteBuf(Unpooled.buffer(), ParityData.access); + try { + ItemStack.OPTIONAL_STREAM_CODEC.encode(buf, stack); + } catch (RuntimeException e) { + return null; + } + byte[] bytes = new byte[buf.readableBytes()]; + buf.readBytes(bytes); + return HexFormat.of().formatHex(bytes); + } + + private static void print(PrintWriter out, String label, ItemStack stack) { + String hex = encode(stack); + if (hex == null) { + out.println("{\"label\":" + json(label) + ",\"error\":\"encode failed\"}"); + return; + } + // DataComponentPatch's encoding order: its map's fast iteration, added + // components, then removals. + StringBuilder kinds = new StringBuilder(); + StringBuilder removed = new StringBuilder(); + for (var e : Reference2ObjectMaps.fastIterable(patchMap(stack.getComponentsPatch()))) { + // Removed (package-private) marks a removal. + StringBuilder to = e.getValue().getClass().getName().equals("net.minecraft.core.component.Removed") ? removed : kinds; + to.append(to.isEmpty() ? "" : ",").append(id(e.getKey())); + } + out.println("{\"label\":" + json(label) + ",\"hex\":\"" + hex + "\",\"added\":[" + kinds + "],\"removed\":[" + removed + "]}"); + } + + @SuppressWarnings("unchecked") + private static Reference2ObjectMap, Object> patchMap(DataComponentPatch patch) { + try { + Field map = DataComponentPatch.class.getDeclaredField("map"); + map.setAccessible(true); + return (Reference2ObjectMap, Object>) map.get(patch); + } catch (ReflectiveOperationException e) { + throw new IllegalStateException(e); + } + } + + private static int id(DataComponentType type) { + return BuiltInRegistries.DATA_COMPONENT_TYPE.getId(type); + } + + private static String json(String s) { + return "\"" + s.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n") + "\""; + } +} diff --git a/tools/test_item_wire_parity.py b/tools/test_item_wire_parity.py new file mode 100755 index 000000000..1be6042ec --- /dev/null +++ b/tools/test_item_wire_parity.py @@ -0,0 +1,177 @@ +#!/usr/bin/env python3 +"""Item stacks on the wire: every data component, as vanilla 26.3 encodes it. + +VanillaItemWireOracle encodes stacks with ItemStack.OPTIONAL_STREAM_CODEC +(what a server sends in inventories, recipe books and advancements): each +default component value of every vanilla item, the SNBT fixtures below +(direct holders, tags and lists, optional fields, every consume effect, +block predicates with component matchers, the mob variants) and patches +built in Java (components without a persistent codec, removals). The Rust +probe decodes each with horizon_protocol::item::Slot and must consume every +byte and find the same component ids in the same order; a stack whose +components Horizon only reads past must also encode back to the same bytes. +Every id in DataComponents must be covered.""" +import argparse +import json +import os +import platform +import subprocess +from pathlib import Path +try: + from . import lab, test_rust_parity as base +except ImportError: + import lab + import test_rust_parity as base + +COMPONENT_TYPES = 122 + +FIXTURES = [ + ('custom_data', '{custom_data:{a:1,b:"x",c:[1,2]}}'), + ('unbreakable', '{unbreakable:{}}'), + ('custom_name', '{custom_name:{text:"Hi",color:"red",bold:1b}}'), + ('lore', '{lore:["a",{text:"b",italic:0b}]}'), + ('enchantments', '{enchantments:{"minecraft:sharpness":5,"minecraft:unbreaking":3}}'), + ('can_break tag', '{can_break:{blocks:"#minecraft:logs"}}'), + ('can_break list state nbt', '{can_break:[{blocks:["minecraft:stone","minecraft:dirt"],state:{snowy:"true",age:{min:"1",max:"3"},level:{min:"2"}},nbt:"{a:1b}"}]}'), + ('can_place_on components', '{can_place_on:{blocks:"minecraft:chest",components:{"minecraft:custom_name":"x","minecraft:damage":3},predicates:{"minecraft:custom_data":{a:1},"minecraft:damage":{durability:{min:1}}}}}'), + ('can_place_on empty', '{can_place_on:[{}]}'), + ('custom_model_data', '{custom_model_data:{floats:[1.0f,2.5f],flags:[1b,0b],strings:["a"],colors:[16711680]}}'), + ('tooltip_display', '{tooltip_display:{hide_tooltip:1b,hidden_components:["minecraft:enchantments","minecraft:damage"]}}'), + ('repair_cost', '{repair_cost:7}'), + ('intangible_projectile', '{intangible_projectile:{}}'), + ('tooltip_style', '{tooltip_style:"minecraft:fancy"}'), + ('interact_animation', '{interact_animation:{type:"stab",duration:9}}'), + ('dyed_color', '{dyed_color:16711935}'), + ('map_id', '{map_id:42}'), + ('written_book_content', '{written_book_content:{title:{raw:"T",filtered:"F"},author:"me",generation:1,pages:[{raw:"p1",filtered:"q1"},"p2"],resolved:1b}}'), + ('trim registry', '{trim:{material:"minecraft:gold",pattern:"minecraft:coast"}}'), + ('trim direct', '{trim:{material:{palette_id:"minecraft:x",description:"X"},pattern:{asset_id:"minecraft:y",description:"Y",decal:1b}}}'), + ('block_entity_data', '{block_entity_data:{id:"minecraft:chest",Items:[]}}'), + ('lodestone_tracker target', '{lodestone_tracker:{target:{dimension:"minecraft:the_nether",pos:[1,-64,3]},tracked:0b}}'), + ('lodestone_tracker empty', '{lodestone_tracker:{}}'), + ('firework_explosion', '{firework_explosion:{shape:"star",colors:[1,2],fade_colors:[3],has_trail:1b,has_twinkle:0b}}'), + ('profile name', '{profile:{name:"Notch"}}'), + ('profile full', '{profile:{name:"jeb_",id:[I;1,2,3,4],properties:[{name:"textures",value:"abc",signature:"sig"}]}}'), + ('note_block_sound', '{note_block_sound:"minecraft:block.note_block.bell"}'), + ('base_color', '{base_color:"lime"}'), + ('sulfur_cube_content', '{sulfur_cube_content:{id:"minecraft:stone",count:1}}'), + ('lock', '{lock:{items:"minecraft:diamond"}}'), + ('container_loot', '{container_loot:{loot_table:"minecraft:chests/simple_dungeon",seed:5L}}'), + ('waxed', '{waxed:{}}'), + ('banner_patterns', '{banner_patterns:[{pattern:"minecraft:stripe_bottom",color:"red"},{pattern:{asset_id:"minecraft:x",translation_key:"y"},color:"blue"}]}'), + ('pot_decorations', '{pot_decorations:{back:{id:"minecraft:brick"},left:{id:"minecraft:angler_pottery_sherd"},front:{id:"minecraft:skull_pottery_sherd",count:1}}}'), + ('suspicious_stew_effects', '{suspicious_stew_effects:[{id:"minecraft:night_vision",duration:100},{id:"minecraft:poison"}]}'), + ('potion_contents full', '{potion_contents:{potion:"minecraft:swiftness",custom_color:123,custom_effects:[{id:"minecraft:speed",amplifier:1b,duration:200,ambient:1b,show_particles:0b,show_icon:1b,hidden_effect:{id:"minecraft:speed",duration:100,hidden_effect:{id:"minecraft:speed",duration:50}}}],custom_name:"x"}}'), + ('potion_contents bare', '{potion_contents:{}}'), + ('container', '{container:[{slot:0,item:{id:"minecraft:stone",count:3}},{slot:5,item:{id:"minecraft:diamond_sword",components:{"minecraft:damage":5,"minecraft:trim":{material:"minecraft:gold",pattern:"minecraft:coast"}}}}]}'), + ('bundle_contents', '{bundle_contents:[{id:"minecraft:stone",count:2},{id:"minecraft:potion",components:{"minecraft:potion_contents":{potion:"minecraft:water"}}}]}'), + ('charged_projectiles', '{charged_projectiles:[{id:"minecraft:arrow"},{id:"minecraft:firework_rocket",components:{"minecraft:fireworks":{flight_duration:2b,explosions:[{shape:"burst",colors:[5]}]}}}]}'), + ('block_state', '{block_state:{facing:"north",half:"top"}}'), + ('bees', '{bees:[{entity_data:{id:"minecraft:bee",Health:5f},ticks_in_hive:5,min_ticks_in_hive:10}]}'), + ('entity_data', '{entity_data:{id:"minecraft:pig",NoAI:1b}}'), + ('bucket_entity_data', '{bucket_entity_data:{Health:5f}}'), + ('instrument direct', '{instrument:{sound_event:{sound_id:"minecraft:x",range:8f},use_duration:3f,range:64f,description:"Horn"}}'), + ('painting variant', '{"minecraft:painting/variant":"minecraft:kebab"}'), + ('sign_text_front', '{sign_text_front:{messages:["a","b","c","d"],filtered_messages:["e","f","g","h"],color:"red",has_glowing_text:1b}}'), + ('sign_text_back', '{sign_text_back:{messages:["a","","",""]}}'), + ('map_decorations', '{map_decorations:{a:{type:"minecraft:player",x:1.0d,z:2.0d,rotation:0f}}}'), + ('debug_stick_state', '{debug_stick_state:{"minecraft:oak_stairs":"facing"}}'), + ('recipes', '{recipes:["minecraft:stone_bricks"]}'), + ('attribute_modifiers', '{attribute_modifiers:[{type:"minecraft:attack_damage",id:"minecraft:x",amount:1.5d,operation:"add_value",slot:"mainhand",display:{type:"override",value:"hi"}},{type:"minecraft:armor",id:"minecraft:y",amount:2d,operation:"add_multiplied_total",display:{type:"hidden"}}]}'), + ('consumable all effects', '{consumable:{consume_seconds:2f,animation:"drink",sound:{sound_id:"minecraft:x",range:4f},has_consume_particles:0b,on_consume_effects:[{type:"apply_effects",effects:[{id:"minecraft:speed",duration:20}],probability:0.5f},{type:"remove_effects",effects:"minecraft:poison"},{type:"remove_effects",effects:["minecraft:poison","minecraft:wither"]},{type:"clear_all_effects"},{type:"teleport_randomly",diameter:8f},{type:"play_sound",sound:"minecraft:entity.generic.eat"}]}}'), + ('death_protection', '{death_protection:{death_effects:[{type:"clear_all_effects"}]}}'), + ('equippable full', '{equippable:{slot:"head",equip_sound:"minecraft:item.armor.equip_gold",asset_id:"minecraft:gold",camera_overlay:"minecraft:misc/pumpkinblur",allowed_entities:"#minecraft:skeletons",dispensable:0b,swappable:0b,damage_on_hurt:0b,equip_on_interact:1b,can_be_sheared:1b,shearing_sound:{sound_id:"minecraft:y"}}}'), + ('equippable bare', '{equippable:{slot:"chest"}}'), + ('tool rules', '{tool:{rules:[{blocks:"#minecraft:mineable/pickaxe",speed:4f,correct_for_drops:1b},{blocks:["minecraft:stone"]}],default_mining_speed:2f,damage_per_block:2,can_destroy_blocks_in_creative:0b}}'), + ('blocks_attacks full', '{blocks_attacks:{block_delay_seconds:0.5f,disable_cooldown_scale:2f,damage_reductions:[{horizontal_blocking_angle:45f,type:"#minecraft:is_fire",base:1f,factor:0.5f},{base:0f,factor:1f}],item_damage:{threshold:3f,base:1f,factor:2f},bypassed_by:"#minecraft:bypasses_shield",block_sound:"minecraft:item.shield.block",disable_sound:{sound_id:"minecraft:z"}}}'), + ('damage_resistant', '{damage_resistant:{types:"#minecraft:is_fire"}}'), + ('repairable list', '{repairable:{items:["minecraft:diamond","minecraft:emerald"]}}'), + ('use_cooldown group', '{use_cooldown:{seconds:1.5f,cooldown_group:"minecraft:x"}}'), + ('use_remainder', '{use_remainder:{id:"minecraft:bowl",count:2}}'), + ('fireworks', '{fireworks:{flight_duration:3b,explosions:[{shape:"creeper",colors:[1],fade_colors:[2,3],has_trail:1b},{shape:"small_ball"}]}}'), + ('provides_banner_patterns', '{provides_banner_patterns:"#minecraft:pattern_item/globe"}'), + ('wolf variant', '{"minecraft:wolf/variant":"minecraft:ashen","minecraft:wolf/sound_variant":"minecraft:angry","minecraft:wolf/collar":"red"}'), + ('fox salmon parrot', '{"minecraft:fox/variant":"snow","minecraft:salmon/size":"large","minecraft:parrot/variant":"blue"}'), + ('tropical fish', '{"minecraft:tropical_fish/pattern":"flopper","minecraft:tropical_fish/base_color":"white","minecraft:tropical_fish/pattern_color":"black"}'), + ('mooshroom rabbit', '{"minecraft:mooshroom/variant":"brown","minecraft:rabbit/variant":"gold"}'), + ('pig cow chicken', '{"minecraft:pig/variant":"minecraft:cold","minecraft:pig/sound_variant":"minecraft:big","minecraft:cow/variant":"minecraft:warm","minecraft:cow/sound_variant":"minecraft:classic","minecraft:chicken/variant":"minecraft:cold","minecraft:chicken/sound_variant":"minecraft:classic"}'), + ('nautilus frog horse', '{"minecraft:zombie_nautilus/variant":"minecraft:warm","minecraft:frog/variant":"minecraft:cold","minecraft:horse/variant":"chestnut"}'), + ('llama axolotl cat', '{"minecraft:llama/variant":"brown","minecraft:axolotl/variant":"blue","minecraft:cat/variant":"minecraft:tabby","minecraft:cat/sound_variant":"minecraft:classic","minecraft:cat/collar":"blue"}'), + ('sheep shulker villager', '{"minecraft:sheep/color":"pink","minecraft:shulker/color":"purple","minecraft:villager/variant":"minecraft:taiga"}'), + ('trim material direct provider', '{provides_trim_material:{palette_id:"minecraft:x",description:"X"}}'), + ('everything at once', '{damage:3,unbreakable:{},custom_name:"n",enchantments:{"minecraft:mending":1},trim:{material:"minecraft:gold",pattern:"minecraft:coast"},banner_patterns:[{pattern:"minecraft:globe",color:"red"}],pot_decorations:{right:{id:"minecraft:brick"}},lore:["x"],rarity:"epic"}'), +] +# Fixtures on another item than a stick (the components need it, or read better there). +ITEMS = {'profile name': 'player_head', 'profile full': 'player_head', 'trim registry': 'diamond_chestplate', + 'trim direct': 'diamond_chestplate', 'banner_patterns': 'white_banner', 'pot_decorations': 'decorated_pot', + 'everything at once': 'diamond_chestplate'} + + +def compare(vanilla, rust): + """Failures, stacks checked, and the component ids covered.""" + results = {r['label']: r for r in rust} + failures, covered = [], set() + for v in vanilla: + if 'error' in v: + failures.append(f"oracle {v['label']}: {v['error']}") + continue + covered.update(v['added'] + v['removed']) + r = results.get(v['label']) + if r is None or 'error' in r: + failures.append(f"{v['label']}: {r and r['error']}") + elif r['left'] or r['added'] != v['added'] or r['removed'] != v['removed']: + failures.append(f"{v['label']}: {r['left']} bytes left, ids {r['added']}/{r['removed']}, vanilla {v['added']}/{v['removed']}") + elif not r['same_bytes'] and not r['typed']: + failures.append(f"{v['label']}: read past, but encoded back differently") + missing = sorted(set(range(COMPONENT_TYPES)) - covered) + if missing: + failures.append(f'component ids no stack covers: {missing}') + return failures, len(vanilla), covered + + +def main(): + parser = argparse.ArgumentParser(description=__doc__) + parser.add_argument('--prepare', action='store_true') + args = parser.parse_args() + build = lab.LOCAL / 'item-wire-parity' + build.mkdir(parents=True, exist_ok=True) + report_path = build / 'report.json' + report_path.unlink(missing_ok=True) + if args.prepare: + lab.prepare() + lock, jars, libraries = base.verify_artifacts() + oracle = lab.ROOT / 'mods/horizon/src/test/java/dev/horizonlab/parity/VanillaItemWireOracle.java' + classes = build / 'classes' + classes.mkdir(exist_ok=True) + + def run(command, name): + with (build / (name + '.log')).open('w', encoding='utf-8') as log: + base.run(list(map(str, command)), stdout=log, stderr=subprocess.STDOUT) + dependency_path = os.pathsep.join(map(str, libraries)) + run(['javac', '--release', lock['minecraft']['java_major'], '-proc:none', '-sourcepath', + lab.ROOT / 'mods/horizon/src/test/java', '-cp', str(jars['server']) + os.pathsep + dependency_path, + '-d', classes, oracle], 'compile-java') + fixtures = build / 'fixtures.tsv' + fixtures.write_text(''.join(f'{label}\t{{id:"minecraft:{ITEMS.get(label, "stick")}",count:1,components:{snbt}}}\n' + for label, snbt in FIXTURES), encoding='utf-8') + vanilla_path, rust_path = build / 'vanilla.jsonl', build / 'rust.jsonl' + run(['java', '-Xmx1G', '-cp', os.pathsep.join([str(classes), str(jars['server']), dependency_path]), + 'dev.horizonlab.parity.VanillaItemWireOracle', fixtures, vanilla_path], 'oracle') + run(['cargo', 'build', '--release', '-p', 'horizon-protocol', '--example', 'item_wire_probe'], 'compile-rust') + binary = lab.cargo_target() / 'release/examples' / ('item_wire_probe.exe' if os.name == 'nt' else 'item_wire_probe') + run([binary, vanilla_path, rust_path], 'rust') + read = lambda path: [json.loads(line) for line in path.read_text(encoding='utf-8').splitlines() if line.strip()] + failures, stacks, covered = compare(read(vanilla_path), read(rust_path)) + for failure in failures[:40]: + print(failure) + if failures: + raise SystemExit(f'{len(failures)} item wire mismatches (of {stacks} stacks)') + lab.write_json(report_path, { + 'schema': 1, 'minecraft': lock['minecraft']['version'], 'platform': platform.platform(), + 'stacks': stacks, 'component_types_covered': len(covered), + 'oracle_sha256': lab.digest(vanilla_path, 'sha256'), 'rust_sha256': lab.digest(rust_path, 'sha256')}) + print(f'Item wire parity passed: {stacks} stacks, all {len(covered)} component types: {report_path}') + + +if __name__ == '__main__': + main() From 6d81b98f183e62529c246bf72da23a69972f09f3 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 20:22:10 +0200 Subject: [PATCH 015/140] launcher: keep one landscape per width step, free replaced ones, keep the top bar's wordmark off Windows - A resize re-baked Home's landscape every 6 px and never removed the old images from the window's sprite atlas (GPUI keeps an image there until `drop_image`): dragging a window wider piled up textures of up to ~14 MB each. The landscape now grows in steps of 64 texels, is kept when the window narrows, and the one it replaces leaves the atlas on the next frame. - The landscape was laid out from the width (sun at 0.68 w, one random stream for every part), so it reshuffled hills, trees and the sun at each step of a resize. Each part now has its own stream drawn left to right: a wider landscape only adds columns. - macOS and Linux keep their system title bar, so the top bar keeps the mark and "HORIZON" there (docs/design-system.md, Navigation); only the Windows title bar carries them. - The before/after screenshots were for the pull request, not the launcher's docs. Co-Authored-By: Claude Opus 5.5 --- launcher/docs/launcher-window-after.png | Bin 97826 -> 0 bytes launcher/docs/launcher-window-before.png | Bin 168449 -> 0 bytes launcher/src/art.rs | 181 ++++++++++++----------- launcher/src/main.rs | 21 ++- launcher/src/titlebar.rs | 5 +- 5 files changed, 117 insertions(+), 90 deletions(-) delete mode 100644 launcher/docs/launcher-window-after.png delete mode 100644 launcher/docs/launcher-window-before.png diff --git a/launcher/docs/launcher-window-after.png b/launcher/docs/launcher-window-after.png deleted file mode 100644 index 59633eedb890ff45fcdaf4ce142511d524434f99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97826 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
7_CFxkE^*7Cjy*7wAfJKx;_|KqcB_>#3&RSc;& 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 diff --git a/launcher/src/art.rs b/launcher/src/art.rs index 3cc85ac96..d61214c11 100644 --- a/launcher/src/art.rs +++ b/launcher/src/art.rs @@ -2,47 +2,36 @@ //! and the landscape behind Home (the vanilla grass block is `browser::images::grass_block`). //! GPUI samples images smoothly, so every image is baked at the window's scale with each texel a //! whole block of device pixels, and drawn at exactly its size: the edges stay sharp. Each image -//! is reused until its appearance, scale or landscape width changes. -use gpui::RenderImage; +//! is made once per appearance and scale, then reused; Home's landscape is made again only when +//! the window grows wider than it. +use gpui::{RenderImage, Window}; use horizon_theme as tokens; use std::collections::HashMap; use std::sync::Arc; -/// What an image is, to find it again. -#[derive(Clone, PartialEq, Eq, Hash)] -enum Key { - Stone { - dark: bool, - scale: u32, - }, - Scene { - dark: bool, - scale: u32, - width: usize, - }, -} - #[derive(Default)] pub struct Art { - made: HashMap>, + /// The stone texture for each appearance and scale. + stones: HashMap<(bool, u32), Arc>, + /// Home's landscape: its appearance and scale, and its width in texels. + scene: Option<((bool, u32), usize, Arc)>, + /// Landscapes replaced since the last frame, still in the window's sprite atlas. + replaced: Vec>, } /// The stone texture comes in squares of this many logical pixels (4 by 4 tiles). pub const STONE: f32 = tokens::TILE_TEXEL * (tokens::TILE_TEXELS * 4) as f32; -/// Home's landscape: texels of this many logical pixels, and its size in texels. +/// Home's landscape: texels of this many logical pixels, and its height in texels. Its width +/// grows in steps of `SCENE_STEP` texels, so resizing a window rarely makes another. pub const SCENE_TEXEL: f32 = 6.; pub const SCENE_HEIGHT: usize = 56; -const MIN_SCENE_WIDTH: f32 = 10.; +const SCENE_STEP: usize = 64; impl Art { /// The page's stone texture, for a window at `scale`. pub fn stone(&mut self, page: u32, dark: bool, scale: f32) -> Arc { - let key = Key::Stone { - dark, - scale: scale_key(scale), - }; - self.made - .entry(key) + self.stones + .entry((dark, scale_key(scale))) .or_insert_with(|| { let n = tokens::TILE_TEXELS * 4; bake(&opaque(&stone(page, n)), n, n, tokens::TILE_TEXEL, scale) @@ -50,33 +39,30 @@ impl Art { .clone() } - /// Home's landscape at the banner's width, without stretching its square texels. - /// Only the current size is retained, so resizing cannot accumulate large images. + /// Home's landscape, at least `width` logical pixels wide (the banner clips the rest), and + /// its width: a sunset in the dark appearance, a dawn in the light one. pub fn scene(&mut self, dark: bool, scale: f32, width: f32) -> (Arc, f32) { - let width = (width / SCENE_TEXEL).ceil().max(MIN_SCENE_WIDTH) as usize; - let key = Key::Scene { - dark, - scale: scale_key(scale), - width, - }; - if !self.made.contains_key(&key) { - self.made.retain(|key, _| matches!(key, Key::Stone { .. })); + let key = (dark, scale_key(scale)); + let texels = (width / SCENE_TEXEL).ceil().max(1.) as usize; + if !matches!(&self.scene, Some((k, w, _)) if *k == key && *w >= texels) { + let w = texels.next_multiple_of(SCENE_STEP); + let palette = if dark { &SUNSET } else { &DAWN }; + let texels = opaque(&scene(palette, 3, w, SCENE_HEIGHT)); + let image = bake(&texels, w, SCENE_HEIGHT, SCENE_TEXEL, scale); + if let Some((_, _, old)) = self.scene.replace((key, w, image)) { + self.replaced.push(old); + } + } + let (_, w, image) = self.scene.as_ref().expect("made above"); + (image.clone(), *w as f32 * SCENE_TEXEL) + } + + /// Frees the landscapes replaced since the last frame: GPUI keeps an image in the window's + /// sprite atlas until it is dropped there. + pub fn free_replaced(&mut self, window: &mut Window) { + for image in self.replaced.drain(..) { + let _ = window.drop_image(image); } - let image = self - .made - .entry(key) - .or_insert_with(|| { - let palette = if dark { &SUNSET } else { &DAWN }; - bake( - &opaque(&scene(palette, 3, width, SCENE_HEIGHT)), - width, - SCENE_HEIGHT, - SCENE_TEXEL, - scale, - ) - }) - .clone(); - (image, width as f32 * SCENE_TEXEL) } } @@ -220,8 +206,14 @@ pub const DAWN: Palette = Palette { /// A blocky landscape, `w` by `h` texels: banded sky, a sun half set behind the far hills and cut /// into slices like Horizon's mark, flat clouds, three ridges of hills and a few square trees. +/// Each part draws from its own generator from left to right, so a wider landscape only adds +/// columns: the first `w` are the same at every width, and a resized window keeps its view. pub fn scene(p: &Palette, seed: u32, w: usize, h: usize) -> Vec { - let mut rng = Rng(seed.wrapping_mul(0x2545_f491) | 1); + let mut seeds = Rng(seed.wrapping_mul(0x2545_f491) | 1); + let mut rng = || { + seeds.next(); + Rng(seeds.0) + }; let mut out = vec![0; w * h]; let horizon = h * 62 / 100; let band = horizon as f32 / p.sky.len() as f32; @@ -244,20 +236,23 @@ pub fn scene(p: &Palette, seed: u32, w: usize, h: usize) -> Vec { } } }; - for _ in 0..4 { - let cx = (rng.next() * w as f32) as isize; - let cy = (horizon as f32 * (0.12 + rng.next() * 0.4)) as isize; - let cw = 10 + (rng.next() * 14.) as usize; - let under = p.sky[((cy as f32 / band) as usize + 1).min(p.sky.len() - 1)]; - let c = mix(under, 0xffffff, 0.12); - rect(&mut out, cx, cy, cw, 2, c); - rect(&mut out, cx + 3, cy - 2, cw.saturating_sub(6), 2, c); + // Four clouds in every stretch of `CLOUDS` texels. + const CLOUDS: usize = 220; + let mut clouds = rng(); + for stretch in 0..w.div_ceil(CLOUDS) { + for _ in 0..4 { + let cx = (stretch * CLOUDS) as isize + (clouds.next() * CLOUDS as f32) as isize; + let cy = (horizon as f32 * (0.12 + clouds.next() * 0.4)) as isize; + let cw = 10 + (clouds.next() * 14.) as usize; + let under = p.sky[((cy as f32 / band) as usize + 1).min(p.sky.len() - 1)]; + let c = mix(under, 0xffffff, 0.12); + rect(&mut out, cx, cy, cw, 2, c); + rect(&mut out, cx + 3, cy - 2, cw.saturating_sub(6), 2, c); + } } + // The sun, where it was when the landscape had one width (two thirds of 220 texels). let r = (h as f32 * 0.2) as isize; - let (cx, cy) = ( - (w as f32 * 0.68) as isize, - horizon as isize - (h as f32 * 0.11) as isize, - ); + let (cx, cy) = (149, horizon as isize - (h as f32 * 0.11) as isize); for dy in -r..=0 { let half = ((r * r - dy * dy) as f32).sqrt().round() as isize; let t = (dy + r) as f32 / r as f32; @@ -272,7 +267,7 @@ pub fn scene(p: &Palette, seed: u32, w: usize, h: usize) -> Vec { rect(&mut out, cx - half, cy + dy, (half * 2) as usize, 1, c); } } - let ridge = |rng: &mut Rng, base: f32, amp: f32, rough: f32| -> Vec { + let ridge = |mut rng: Rng, base: f32, amp: f32, rough: f32| -> Vec { let (mut y, mut v) = (base, 0.); (0..w) .map(|x| { @@ -298,7 +293,7 @@ pub fn scene(p: &Palette, seed: u32, w: usize, h: usize) -> Vec { ]; let mut near = Vec::new(); for (c, base, amp, rough, top) in layers { - let hs = ridge(&mut rng, base, amp, rough); + let hs = ridge(rng(), base, amp, rough); for (x, &y) in hs.iter().enumerate() { for yy in y.min(h)..h { out[yy * w + x] = c; @@ -309,9 +304,12 @@ pub fn scene(p: &Palette, seed: u32, w: usize, h: usize) -> Vec { } near = hs; } - for _ in 0..w / 26 { - let tx = 4 + (rng.next() * (w - 10) as f32) as isize; - let ty = near[tx as usize] as isize; + // A tree somewhere in every 26 texels of the near hills. + let mut trees = rng(); + for cell in 0..w.div_ceil(26) { + let tx = cell * 26 + 2 + (trees.next() * 22.) as usize; + let Some(&ty) = near.get(tx) else { break }; + let (tx, ty) = (tx as isize, ty as isize); rect(&mut out, tx - 2, ty - 8, 5, 5, p.trees); rect(&mut out, tx - 1, ty - 10, 3, 2, p.trees); rect(&mut out, tx, ty - 3, 1, 3, p.trees); @@ -343,30 +341,37 @@ mod tests { } #[test] - fn landscape_fills_the_banner_at_narrow_and_wide_window_sizes() { + fn the_landscape_covers_the_banner_and_is_made_again_only_when_it_grows() { let mut art = Art::default(); - for banner_width in [696., 916., 1633.] { - let (image, drawn_width) = art.scene(true, 2., banner_width); - assert!(drawn_width >= banner_width); - assert!(drawn_width - banner_width < SCENE_TEXEL); - assert_eq!(image.size(0).width.0, (drawn_width * 2.) as i32); - assert_eq!( - image.size(0).height.0, - (SCENE_HEIGHT as f32 * SCENE_TEXEL * 2.) as i32 - ); + let stone = art.stone(0x0f0d17, true, 2.); + let (first, drawn) = art.scene(true, 2., 700.); + assert!(drawn >= 700.); + assert_eq!(first.size(0).width.0, (drawn * 2.) as i32); + assert_eq!( + first.size(0).height.0, + (SCENE_HEIGHT as f32 * SCENE_TEXEL * 2.) as i32 + ); + // A step wide: a few pixels more or a narrower window keep it. + for width in [drawn, 400.] { + assert!(Arc::ptr_eq(&first, &art.scene(true, 2., width).0)); } + let (wider, wider_drawn) = art.scene(true, 2., 1900.); + assert!(!Arc::ptr_eq(&first, &wider) && wider_drawn >= 1900.); + assert!(Arc::ptr_eq(&art.replaced[0], &first)); + assert!(Arc::ptr_eq(&stone, &art.stone(0x0f0d17, true, 2.))); } #[test] - fn resizing_replaces_the_landscape_and_preserves_the_stone_cache() { - let mut art = Art::default(); - let stone = art.stone(0x0f0d17, true, 1.); - let (first, _) = art.scene(true, 1., 900.); - let (reused, _) = art.scene(true, 1., 900.); - assert!(Arc::ptr_eq(&first, &reused)); - let (resized, _) = art.scene(true, 1., 1500.); - assert!(!Arc::ptr_eq(&first, &resized)); - assert_eq!(art.made.len(), 2); - assert!(Arc::ptr_eq(&stone, &art.stone(0x0f0d17, true, 1.))); + fn a_wider_landscape_only_adds_columns() { + let (h, narrow, wide) = (SCENE_HEIGHT, 150, 400); + let a = scene(&SUNSET, 3, narrow, h); + let b = scene(&SUNSET, 3, wide, h); + for y in 0..h { + assert_eq!( + a[y * narrow..(y + 1) * narrow], + b[y * wide..y * wide + narrow], + "row {y}" + ); + } } } diff --git a/launcher/src/main.rs b/launcher/src/main.rs index 842d21b3b..9a97b8e8f 100644 --- a/launcher/src/main.rs +++ b/launcher/src/main.rs @@ -1314,7 +1314,8 @@ fn megabytes(bytes: u64) -> String { // ----- Pages ------------------------------------------------------------------------------------- impl Launcher { - /// The top bar: the pages with their icons, then the account and Settings. + /// The top bar: the mark and the name over the sidebar (in the title bar on Windows), the + /// pages with their icons, then the account playing and the Settings button. fn topbar(&mut self, cx: &mut Context) -> Div { let t = self.theme; let mut nav = div().flex().flex_none().h_full().gap(px(2.)); @@ -1452,6 +1453,23 @@ impl Launcher { .bg(t.side) .border_b_2() .border_color(t.outline) + // Where the title bar is drawn here (Windows), it carries the mark and the name. + .when(!titlebar::DRAWN, |bar| { + bar.child( + div() + .flex() + .flex_none() + .items_center() + .gap(px(10.)) + .w(px(theme::SIDEBAR - 18.)) + .child(mark(24., &t)) + .child( + blocks::pixel(20., FontWeight::SEMIBOLD) + .text_color(t.ink) + .child("HORIZON"), + ), + ) + }) .child(nav) .child( div() @@ -3251,6 +3269,7 @@ impl Render for Launcher { Page::Notes => self.notes_page(cx), Page::Settings => self.settings_page(cx), }; + self.art.free_replaced(window); // The new page fades in and rises a few pixels. let content = div() .relative() diff --git a/launcher/src/titlebar.rs b/launcher/src/titlebar.rs index 3ff88a3ef..3c2a78ea4 100644 --- a/launcher/src/titlebar.rs +++ b/launcher/src/titlebar.rs @@ -2,10 +2,13 @@ use crate::theme::Theme; use gpui::{Div, TitlebarOptions, Window}; +/// Whether the launcher draws its own title bar (`render`) rather than the system. +pub const DRAWN: bool = cfg!(target_os = "windows"); + pub fn options() -> TitlebarOptions { TitlebarOptions { title: Some("Horizon".into()), - appears_transparent: cfg!(target_os = "windows"), + appears_transparent: DRAWN, ..Default::default() } } From ac43cdea703eefac7a64e1452a6475ea47b47cf0 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 20:25:40 +0200 Subject: [PATCH 016/140] launcher, server: one hidden-command helper per crate, server children keep its terminal - horizon-bench reads the machine with horizon-telemetry's `command_output` (now public) instead of a second copy of it; the console flag lives in one place. - horizon-server's `process::command` hides the console only when the server has none (started by the launcher). Run from a terminal, `schtasks`, `tar` and `mklink` share it as before, so their output still reaches it: a CREATE_NO_WINDOW child can't write to its parent's console. - horizon-prepare's java/javac keep the stdin they had; only the console flag is new. - launcher `process::hide_console` returns the command (no `let _ =` on other systems); the machine-details thread failing just leaves the report without them, as a slow one does. - README: the Windows subsystem's effect on the command line (interactive cmd/PowerShell don't wait or set the exit code) under "Command line", the deferred probe under "Performance log". Co-Authored-By: Claude Opus 5.5 --- crates/horizon-bench/src/hardware.rs | 17 +--------------- crates/horizon-prepare/src/java.rs | 11 +++++----- crates/horizon-server/src/process.rs | 28 ++++++++++++++------------ crates/horizon-telemetry/src/system.rs | 5 ++++- launcher/README.md | 17 ++++++++-------- launcher/src/perf.rs | 8 ++------ launcher/src/process.rs | 11 +++++----- 7 files changed, 41 insertions(+), 56 deletions(-) diff --git a/crates/horizon-bench/src/hardware.rs b/crates/horizon-bench/src/hardware.rs index 6b91202ad..440c834d8 100644 --- a/crates/horizon-bench/src/hardware.rs +++ b/crates/horizon-bench/src/hardware.rs @@ -1,8 +1,7 @@ //! The machine a report was measured on. CPU, RAM and OS are detected here; the GPU and the display //! come from the program that rendered (the game knows its adapter, the launcher its window). -use std::process::Command; - +use horizon_telemetry::system::command_output as output; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] @@ -173,20 +172,6 @@ pub fn cpu_seconds(pid: u32) -> Option { Some(ticks / 100.0) } -fn output(program: &str, args: &[&str]) -> Option { - let mut command = Command::new(program); - command.args(args); - #[cfg(windows)] - { - use std::os::windows::process::CommandExt; - const CREATE_NO_WINDOW: u32 = 0x0800_0000; - command.creation_flags(CREATE_NO_WINDOW); - } - let out = command.output().ok()?; - let text = String::from_utf8(out.stdout).ok()?.trim().to_owned(); - (out.status.success() && !text.is_empty()).then_some(text) -} - #[cfg(target_os = "macos")] fn os_version() -> Option { output("sw_vers", &["-productVersion"]) diff --git a/crates/horizon-prepare/src/java.rs b/crates/horizon-prepare/src/java.rs index 78530486c..b4023b7d1 100644 --- a/crates/horizon-prepare/src/java.rs +++ b/crates/horizon-prepare/src/java.rs @@ -14,16 +14,17 @@ pub struct Jdk { const TIMEOUT: Duration = Duration::from_secs(3600); -/// Exporters and JDK probes write to pipes or log files, never to a new terminal. +/// Exporters and JDK probes write to pipes or log files: on Windows they open no terminal. fn command(program: impl AsRef) -> Command { - let mut command = Command::new(program); - command.stdin(Stdio::null()); + let command = Command::new(program); #[cfg(windows)] - { + let command = { use std::os::windows::process::CommandExt; const CREATE_NO_WINDOW: u32 = 0x0800_0000; + let mut command = command; command.creation_flags(CREATE_NO_WINDOW); - } + command + }; command } diff --git a/crates/horizon-server/src/process.rs b/crates/horizon-server/src/process.rs index 8a79f1161..8e8d24c70 100644 --- a/crates/horizon-server/src/process.rs +++ b/crates/horizon-server/src/process.rs @@ -1,18 +1,20 @@ -//! Background helpers inherit their log streams without opening a Windows terminal. +//! The programs the server runs. Started by the launcher, the server has no console, and each +//! console program it started would open a terminal window on Windows: those open none. Run from +//! a terminal, they share it, so what they print still reaches it. use std::{ffi::OsStr, process::Command}; pub fn command(program: impl AsRef) -> Command { - let mut command = Command::new(program); - configure(&mut command); + let command = Command::new(program); + #[cfg(windows)] + let command = { + use std::os::windows::process::CommandExt; + use windows_sys::Win32::System::{Console::GetConsoleWindow, Threading::CREATE_NO_WINDOW}; + let mut command = command; + // SAFETY: no arguments; it returns this process's console window or null. + if unsafe { GetConsoleWindow() }.is_null() { + command.creation_flags(CREATE_NO_WINDOW); + } + command + }; command } - -fn configure(command: &mut Command) { - #[cfg(windows)] - { - use std::os::windows::process::CommandExt; - command.creation_flags(windows_sys::Win32::System::Threading::CREATE_NO_WINDOW); - } - #[cfg(not(windows))] - let _ = command; -} diff --git a/crates/horizon-telemetry/src/system.rs b/crates/horizon-telemetry/src/system.rs index 33a5b744d..8ed6f2e3a 100644 --- a/crates/horizon-telemetry/src/system.rs +++ b/crates/horizon-telemetry/src/system.rs @@ -9,7 +9,10 @@ use std::sync::OnceLock; use crate::payload::System; -fn command_output(program: &str, args: &[&str]) -> Option { +/// What `program args` prints, trimmed, when it succeeds and prints something. On Windows the +/// program opens no console window: a GUI launcher or a game started without one would flash a +/// terminal for every probe. +pub fn command_output(program: &str, args: &[&str]) -> Option { let mut command = std::process::Command::new(program); command.args(args); #[cfg(windows)] diff --git a/launcher/README.md b/launcher/README.md index d2b78daea..d9738d0c2 100644 --- a/launcher/README.md +++ b/launcher/README.md @@ -97,12 +97,6 @@ page `servers.json` (the list), `servers//` (the servers created there) an Long pages, dialogs, the server console and data previews have a visible scrollbar when their content overflows. Drag the thumb or click the track to navigate without a mouse wheel. -On Windows, desktop launches and background tools run without terminal windows. Preparation -and server logs still reach the launcher, and CLI commands keep their terminal or redirected -input and output, including MCP. -Hardware details for performance reports are collected in the background after the first -frame, so Windows hardware queries do not delay the window opening. - ## Updates The launcher looks for a newer Horizon release when it starts and every 30 minutes while it @@ -133,7 +127,12 @@ and `horizon-launcher-windows-x64.zip`, never marked latest. The version is buil ## Command line -The same binary is a command-line tool; without a subcommand it opens the window. +The same binary is a command-line tool; without a subcommand it opens the window. On Windows it +is a windowed program, so a desktop start opens no terminal; a subcommand writes to the terminal +it was typed in, or to the pipes and files it was given (MCP keeps its stdio). Interactive `cmd` +and PowerShell don't wait for a windowed program: they show the prompt again before its output +and don't set `%ERRORLEVEL%` / `$LASTEXITCODE`. Scripts that need the exit code use +`start /wait horizon-launcher …` or `Start-Process -Wait`, or read its output through a pipe. horizon-launcher versions [--installed] releases on GitHub, or what is installed (* = selected) horizon-launcher install @@ -256,8 +255,8 @@ Each session writes its own measurements to `benchmarks/launcher-

//`, logged. -fn run(dir: &Path, requests: &[Request], headers: &[(&'static str, String)]) -> Batch { +fn run( + dir: &Path, + requests: &[Request], + headers: &[(&'static str, String)], + progress: &Sender, +) -> Batch { let mut batch = Batch::default(); for request in requests { let id = horizon_protocol::crypto::uuid_string(request.id); - let result = download_file(&dir.join(&id), request, headers, MAX_SIZE); + let result = download_file(&dir.join(&id), request, headers, MAX_SIZE, progress); // DownloadQueue.LogEntry, its fields in the codec's order. let mut entry = vec![ ("id", serde_json::Value::from(id)), @@ -112,6 +137,7 @@ fn run(dir: &Path, requests: &[Request], headers: &[(&'static str, String)]) -> Err(_) => batch.failed.push(request.id), } } + let _ = progress.send(Progress::Finished); batch } @@ -165,6 +191,7 @@ pub fn download_file( request: &Request, headers: &[(&'static str, String)], max_size: u64, + progress: &Sender, ) -> Result { let target = request.sha1.as_ref().map(|sha1| dir.join(sha1)); if let (Some(target), Some(sha1)) = (&target, &request.sha1) { @@ -205,10 +232,15 @@ pub fn download_file( "Filesize is bigger than maximum allowed (file is {size}, limit is {max_size})" )); } + let _ = progress.send(Progress::RequestStart(size)); let mut input = response.into_reader(); + let mut report = |written: u64| { + let _ = progress.send(Progress::Bytes(written)); + }; match (&target, &request.sha1) { (Some(target), Some(sha1)) => { - let actual = save_hashed(&mut input, target, max_size).map_err(|e| e.to_string())?; + let actual = save_hashed(&mut input, target, max_size, &mut report) + .map_err(|e| e.to_string())?; if &actual != sha1 { return Err(format!( "Hash of downloaded file ({actual}) did not match requested ({sha1})" @@ -218,7 +250,7 @@ pub fn download_file( } _ => { let tmp = dir.join(format!("download{:016x}.tmp", rand_suffix())); - let result = save_hashed(&mut input, &tmp, max_size).and_then(|actual| { + let result = save_hashed(&mut input, &tmp, max_size, &mut report).and_then(|actual| { let path = dir.join(&actual); if matches(&path, &actual) { touch(&path); @@ -237,7 +269,12 @@ fn rand_suffix() -> u64 { RandomState::new().hash_one(std::time::Instant::now()) } /// `downloadAndHash`: write what comes, at most `max_size` bytes. -fn save_hashed(input: &mut dyn Read, path: &Path, max_size: u64) -> io::Result { +fn save_hashed( + input: &mut dyn Read, + path: &Path, + max_size: u64, + progress: &mut dyn FnMut(u64), +) -> io::Result { let mut out = fs::File::create(path)?; let mut hasher = Sha1::new(); let mut buffer = [0u8; 8196]; @@ -248,6 +285,7 @@ fn save_hashed(input: &mut dyn Read, path: &Path, max_size: u64) -> io::Result max_size { return Err(io::Error::other(format!( "Filesize was bigger than maximum allowed (got >= {read_so_far}, limit was {max_size})" @@ -366,7 +404,14 @@ mod tests { url, sha1: Some(sha1(&body)), }; - let path = download_file(&dir, &request, &headers("Alex", 0xab), MAX_SIZE).unwrap(); + let path = download_file( + &dir, + &request, + &headers("Alex", 0xab), + MAX_SIZE, + &channel().0, + ) + .unwrap(); assert_eq!(path, dir.join(sha1(&body))); assert_eq!(fs::read(&path).unwrap(), body); let sent = server.join().unwrap(); @@ -377,7 +422,10 @@ mod tests { url: "http://127.0.0.1:9/gone.zip".into(), ..request }; - assert_eq!(download_file(&dir, &cached, &[], MAX_SIZE).unwrap(), path); + assert_eq!( + download_file(&dir, &cached, &[], MAX_SIZE, &channel().0).unwrap(), + path + ); fs::remove_dir_all(dir).unwrap(); } @@ -390,7 +438,7 @@ mod tests { url, sha1: Some("0".repeat(40)), }; - let err = download_file(&dir, &wrong, &[], MAX_SIZE).unwrap_err(); + let err = download_file(&dir, &wrong, &[], MAX_SIZE, &channel().0).unwrap_err(); assert!(err.contains("did not match requested"), "{err}"); server.join().unwrap(); let dead = Request { @@ -398,7 +446,7 @@ mod tests { url: "http://127.0.0.1:9/pack.zip".into(), sha1: None, }; - assert!(download_file(&dir.join("dead"), &dead, &[], MAX_SIZE).is_err()); + assert!(download_file(&dir.join("dead"), &dead, &[], MAX_SIZE, &channel().0).is_err()); assert!(!dir.join("dead").exists()); let (url, server) = serve("200 OK", vec![0; 100]); let large = Request { @@ -406,7 +454,7 @@ mod tests { url, sha1: None, }; - let err = download_file(&dir, &large, &[], 10).unwrap_err(); + let err = download_file(&dir, &large, &[], 10, &channel().0).unwrap_err(); assert!(err.contains("bigger than maximum"), "{err}"); let _ = server.join(); let (url, server) = serve("404 Not Found", Vec::new()); @@ -415,7 +463,7 @@ mod tests { url, sha1: None, }; - assert!(download_file(&dir, &missing, &[], MAX_SIZE).is_err()); + assert!(download_file(&dir, &missing, &[], MAX_SIZE, &channel().0).is_err()); server.join().unwrap(); fs::remove_dir_all(dir).unwrap(); } @@ -433,6 +481,7 @@ mod tests { sha1: None, }], Vec::new(), + channel().0, ); let batch = loop { if let Some(b) = queue.finished().pop() { diff --git a/crates/horizon-client/src/title.rs b/crates/horizon-client/src/title.rs index f77ac93eb..94b1ba2e8 100644 --- a/crates/horizon-client/src/title.rs +++ b/crates/horizon-client/src/title.rs @@ -1554,7 +1554,7 @@ impl Title { } } /// SystemToast's 32-pixel background keeps the notice icon and borders intact. -fn toast_background(atlas: &HudAtlas, batch: &mut HudBatch, x: f32, width: f32) { +pub fn toast_background(atlas: &HudAtlas, batch: &mut HudBatch, x: f32, width: f32) { let Some(rect) = atlas.sprites.get("gui/sprites/toast/system").copied() else { return; }; From 4c3abd86de2af8c54e3f68594a064108c788be9d Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sat, 24 Oct 2026 22:53:12 +0300 Subject: [PATCH 033/140] Player: the window stops ticking its player while the game is paused Air kept draining behind the Escape menu in singleplayer and the drowning damage landed on closing it. The server pauses (`IntegratedServer::set_paused` reads the flag), but the window's own copy of the player kept running `controlled_simulation_tick` every frame, and that is where `tick_environment_damage` decrements the air and pushes `MotionEvent::Drown`. `Minecraft.tick` skips the level while the game is paused, so both local paths now skip the player's simulation: the client of a server (`tick_remote_level`) and in-frame single player. Keys are already neutral when a screen is open, so this only stops the environment, hunger and fall prediction from running ahead of the paused server. Fixes #1592. Co-Authored-By: Hermes Agent (Nous Research) --- crates/horizon-client/src/game.rs | 2 +- crates/horizon-client/src/game/remote.rs | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index bf8327cc1..0998eb553 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -4147,7 +4147,7 @@ impl Game<'_> { [player.velocity.x, player.velocity.y, player.velocity.z], [player.position.x, player.position.y, player.position.z], ); - if !riding { + if !riding && !self.pause { MotionWorld { entities: &entity_collisions, player, diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 32cffa306..e3eed3f55 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3175,7 +3175,10 @@ impl Game<'_> { f64::from(head[2]) + 0.5, ); player.velocity = Vec3::ZERO; - } else if !dead && !riding { + } else if !dead && !riding && !self.pause { + // Minecraft.tick skips the level while the game is paused: the window's own + // copy stands still too, so air, hunger and fall prediction do not run ahead + // of the paused server (#1592). player.velocity = player.velocity.add_vector(pushed); MotionWorld { entities: &entity_collisions, From 508cb2df9fcd98ea3ca1189f58b8c5fbf888aea7 Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sat, 24 Oct 2026 23:01:31 +0300 Subject: [PATCH 034/140] Fish: the window tracks the fluid contact of the mobs it only displays `m.fluids` is filled by `Mob::update_fluids`, which only runs in the mob tick on the server. A window that is a client of a server never runs that tick, so every mob it draws kept the default `Fluids { in_water: false }` for its whole life. Cod, salmon and tropical fish rotate onto their side while `!in_water` (`mobs/aquatic.rs`), so they were drawn lying on their flank in water, while their position and heading, which come from the server, looked correct (#1591). `tick_remote_entities` now runs vanilla's `EntityFluidInteraction.update` for the displayed mobs before it ticks their animations, so the renderers read the water contact the same way they do for a mob the window simulates itself. Fixes #1591. Co-Authored-By: Hermes Agent (Nous Research) --- crates/horizon-client/src/game/remote.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 32cffa306..e166ff444 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3325,6 +3325,19 @@ impl Game<'_> { /// ClientLevel.tickEntities; a frozen level only ticks the players /// (`TickRateManager.isEntityFrozen`). fn tick_remote_entities(&mut self, running: bool) { + // EntityFluidInteraction.update for the entities this window only displays: the + // server never sends the fluid contact, and the renderers read it (cod, salmon and + // tropical fish lie on their side without `in_water`, #1591). + let fluids: Vec<_> = { + let w = self.mob_world_base(&[]); + self.mobs + .iter() + .map(|m| w.fluids(m.bounds(), m.eye_y())) + .collect() + }; + for (m, fluids) in self.mobs.iter_mut().zip(fluids) { + m.fluids = fluids; + } let Some(r) = self.remote.as_mut() else { return; }; From 6e8a96a7349ea10dfd5a5e4b4ae0f0ab09328eaf Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 22:03:53 +0200 Subject: [PATCH 035/140] Boats push the player, and startRiding's quiet failures - AbstractBoat.push(player) moves the player too: the boat's own tick and the player's pushEntities run on the player's client in vanilla (pushableBy lets a client push only its local player), so the window's player is pushed in-frame and a server's client pushes itself in remote_pushes, as it does for mobs. - A mob the boat would take that can't get in (boarding cooldown, boat under water) is left alone, not pushed: the tick calls startRiding, which fails quietly, instead of push. - Mob.startRiding drops the mob's lead. - look_at_entity reuses the guest's eye position. Co-Authored-By: Claude Opus 5.5 --- .../src/game/boat_passengers.rs | 43 ++++++++++++------- crates/horizon-client/src/game/boats.rs | 3 +- crates/horizon-client/src/game/lan_actions.rs | 1 - crates/horizon-client/src/game/remote.rs | 27 ++++++++++-- 4 files changed, 54 insertions(+), 20 deletions(-) diff --git a/crates/horizon-client/src/game/boat_passengers.rs b/crates/horizon-client/src/game/boat_passengers.rs index f62381a1a..96686f69b 100644 --- a/crates/horizon-client/src/game/boat_passengers.rs +++ b/crates/horizon-client/src/game/boat_passengers.rs @@ -36,7 +36,7 @@ fn moved_by_push(m: &Mob) -> bool { } /// `Entity.push(Entity)`: the push `other` gets from `this` (which takes the /// opposite one), or None when they stand on nearly the same spot. -fn push_impulse(this: Vec3, other: Vec3) -> Option { +pub(super) fn push_impulse(this: Vec3, other: Vec3) -> Option { let (mut xa, mut za) = (other.x - this.x, other.z - this.z); let mut dd = xa.abs().max(za.abs()); if dd < f64::from(0.01_f32) { @@ -51,7 +51,7 @@ fn push_impulse(this: Vec3, other: Vec3) -> Option { } /// `AbstractBoat.push`: another boat is pushed while it is lower than this /// boat's top, anything else while its feet are no higher than the boat's. -fn boat_pushes(boat: Aabb, other: Aabb, other_is_boat: bool) -> bool { +pub(super) fn boat_pushes(boat: Aabb, other: Aabb, other_is_boat: bool) -> bool { if other_is_boat { other.min_position().y < boat.max_position().y } else { @@ -179,9 +179,9 @@ impl Game<'_> { /// The end of `AbstractBoat.tick` on the server for boat `i`: each /// entity it touches gets in (a mob, while no player steers) or is /// pushed apart from it, and `LivingEntity.pushEntities` of each mob and - /// player touching it pushes the two apart once more. The player's own - /// share of a push only reaches the server's copy of it, which its - /// client never feels, so players are not moved here. + /// player touching it pushes the two apart once more. Only the window's + /// own player is moved here: a server's players are pushed by their + /// clients, which tick the boats near them (`remote_pushes`). pub(super) fn boat_contacts(&mut self, i: usize) { let (id, bb, max) = { let b = &self.boats[i]; @@ -194,7 +194,9 @@ impl Game<'_> { )); let mut count = self.boat_passengers(id); // getControllingPassenger is a player: one rides it (players sit first). - let pick_up = self.boat_players(id) == 0 && !self.boats[i].under_water(); + let pick_up = self.boat_players(id) == 0; + // canAddPassenger, which startRiding asks after the checks below. + let room = !self.boats[i].under_water(); // (mob, touched by the boat's sweep, its own pushEntities reaches the boat) let teams = self.mob_teams(); let mobs: Vec<(usize, bool, bool)> = (0..self.mobs.len()) @@ -214,13 +216,14 @@ impl Game<'_> { }) .collect(); let player_team = teams.of(Who::Player); - let players: Vec<(Aabb, bool, bool)> = self + let players: Vec<(Aabb, bool, bool, bool)> = self .players_outside(id) .into_iter() .map(|(pb, own)| { let team = if own { player_team } else { None }; ( pb, + own, pb.intersects(area) && pushable_by(None, team, true), pb.intersects(bb) && pushable_by(team, None, true), ) @@ -239,13 +242,18 @@ impl Game<'_> { .mob_data() .entity_has("minecraft:cannot_be_pushed_onto_boats", &m.kind.id); if boards { - // Entity.canRide: not while its boarding cooldown runs. - if m.extra.boarding_cooldown <= 0 { + // startRiding fails quietly (no push) while the mob's + // boarding cooldown runs (Entity.canRide) or the boat + // is under water. + if room && m.extra.boarding_cooldown <= 0 { let m = &mut self.mobs[j]; m.extra.mount = Some(id); m.extra.passenger = true; m.ai.nav.stop(); + let mob = m.id; count += 1; + // Mob.startRiding drops its lead. + self.break_leash(mob, true, false); } continue; } @@ -255,15 +263,20 @@ impl Game<'_> { self.boat_push_mob(i, j, count); } } - for (pb, touched, pushes) in players { + for (pb, own, touched, pushes) in players { + let Some(v) = push_impulse(self.boats[i].position, pb.center()) + .filter(|_| boat_pushes(bb, pb, false)) + else { + continue; + }; for _ in 0..usize::from(touched) + usize::from(pushes) { - let b = &mut self.boats[i]; - if count == 0 - && boat_pushes(bb, pb, false) - && let Some(v) = push_impulse(b.position, pb.center()) - { + if count == 0 { + let b = &mut self.boats[i]; b.velocity = b.velocity.subtract(v); } + if own && let Some(p) = self.player.as_mut() { + p.velocity = p.velocity.add_vector(v); + } } } for k in 0..self.boats.len() { diff --git a/crates/horizon-client/src/game/boats.rs b/crates/horizon-client/src/game/boats.rs index 9f1341599..df7158d9a 100644 --- a/crates/horizon-client/src/game/boats.rs +++ b/crates/horizon-client/src/game/boats.rs @@ -96,7 +96,8 @@ impl Boat { Vec3::new(p.x + w, p.y + HEIGHT, p.z + w), ) } - /// Under water or flowing water (`isEyeInFluid(WATER)` for its seats). + /// `isUnderWater`; it stands in for `canAddPassenger`'s + /// `isEyeInFluid(WATER)` too. pub fn under_water(&self) -> bool { matches!(self.status, Status::UnderWater | Status::UnderFlowingWater) } diff --git a/crates/horizon-client/src/game/lan_actions.rs b/crates/horizon-client/src/game/lan_actions.rs index 1fcb05249..58ed97c2f 100644 --- a/crates/horizon-client/src/game/lan_actions.rs +++ b/crates/horizon-client/src/game/lan_actions.rs @@ -1325,7 +1325,6 @@ impl Game<'_> { } }; let g = &mut host.hub.guests[gi]; - let eye = [g.position[0], g.position[1] + g.eye_height(), g.position[2]]; let d = [centre[0] - eye[0], centre[1] - eye[1], centre[2] - eye[2]]; let horizontal = (d[0] * d[0] + d[2] * d[2]).sqrt(); g.yaw = (-d[0].atan2(d[2])).to_degrees() as f32; diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 38f9497ec..b9e3e18fc 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3249,9 +3249,10 @@ impl Game<'_> { player.flying_speed = a.flying_speed; } /// The local player's share of every touching entity's - /// `LivingEntity.pushEntities`: on a client `EntitySelector.pushableBy` - /// lets entities push only the local player, so the server never sends - /// these pushes. `doPush(player)` is `player.push(entity)`. + /// `LivingEntity.pushEntities`, and of the boats' pushes: on a client + /// `EntitySelector.pushableBy` lets entities push only the local player, + /// so the server never sends these pushes. `doPush(player)` is + /// `player.push(entity)`. fn remote_pushes(&self) -> Vec3 { let (Some(p), Some(r)) = (self.player.as_ref(), self.remote.as_ref()) else { return Vec3::ZERO; @@ -3310,6 +3311,26 @@ impl Game<'_> { za *= f64::from(0.05_f32); push = Vec3::new(push.x - xa, push.y, push.z - za); } + // AbstractBoat.push(player) from the boat's own tick (its box grown + // by 0.2 sideways) and from the player's pushEntities (its box). + let player_team = teams.of(Who::Player); + let area = Vec3::new(f64::from(0.2_f32), f64::from(-0.01_f32), f64::from(0.2_f32)); + for b in self.boats.iter().filter(|b| self.riding != Some(b.id)) { + let bb = b.bounds(); + let times = usize::from( + bounds.intersects(bb.inflate(area)) + && horizon_client::scoreboard::pushable_by(None, player_team, true), + ) + usize::from( + bounds.intersects(bb) + && horizon_client::scoreboard::pushable_by(player_team, None, true), + ); + if times > 0 + && super::boat_passengers::boat_pushes(bb, bounds, false) + && let Some(v) = super::boat_passengers::push_impulse(b.position, p.position) + { + push = push.add_vector(v.scale(times as f64)); + } + } push } /// ClientLevel.tickEntities; a frozen level only ticks the players From d83b3e18bc98d93c20fd47ce5b85367a324f7900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Dr=C3=A4ger?= <20014538+sdraeger@users.noreply.github.com> Date: Sat, 24 Oct 2026 13:21:23 -0700 Subject: [PATCH 036/140] Keep mob pitch on /tp --- crates/horizon-client/src/game/commands.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/commands.rs b/crates/horizon-client/src/game/commands.rs index a229cbdc9..bab925c4f 100644 --- a/crates/horizon-client/src/game/commands.rs +++ b/crates/horizon-client/src/game/commands.rs @@ -1098,9 +1098,11 @@ impl Game<'_> { if let Some(m) = self.mobs.iter_mut().find(|m| m.id == id) { m.position = v; m.previous = v; - if let Some([yaw, _]) = rotation { + if let Some([yaw, pitch]) = rotation { m.yaw = yaw; m.body_yaw = yaw; + // Entity.setXRot clamps to -90..90. + m.head_pitch = pitch.clamp(-90.0, 90.0); } } } From 891e1c12830ce848d799e0b8829bffc5832fcf04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Dr=C3=A4ger?= <20014538+sdraeger@users.noreply.github.com> Date: Sat, 24 Oct 2026 13:21:23 -0700 Subject: [PATCH 037/140] Run client mod hooks on the server thread --- crates/horizon-client/src/game/chat.rs | 8 +++++++- crates/horizon-client/src/game/remote.rs | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/chat.rs b/crates/horizon-client/src/game/chat.rs index f760bd82f..1bc30513b 100644 --- a/crates/horizon-client/src/game/chat.rs +++ b/crates/horizon-client/src/game/chat.rs @@ -570,8 +570,14 @@ impl Game<'_> { /// ChatScreen.handleChatInput: history, then a command or a chat line. pub(super) fn handle_chat_input(&mut self, message: &str) { self.ui.chat.add_recent(message); - // On a server (single player's own included) the server runs it. + // On a server (single player's own included) the server runs it, + // unless a client mod owns the command. if self.remote.is_some() { + if let Some(command) = message.strip_prefix('/') + && self.mod_command(command) + { + return; + } self.send_chat(message); return; } diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 32cffa306..23c6677c2 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -733,6 +733,9 @@ impl Game<'_> { self.ticks, self.screen == Screen::Chat, ); + if self.mods.running() { + self.mods_chat(&text); + } if let Some(r) = self.remote.as_mut() { r.chat.push((text, Instant::now())); r.chat_received += 1; @@ -3041,6 +3044,8 @@ impl Game<'_> { /// One client tick while connected (Minecraft.tick with a ClientLevel). pub(super) fn tick_remote(&mut self) -> Result<()> { self.tick_remote_level()?; + // Client mods tick on any server, single player's own included. + self.tick_mods(); // Minecraft.tick sends this even when the player cannot tick yet, // including while waiting for chunks. Keep it outside early returns. if self.remote.as_ref().is_some_and(|r| r.joined) { From 72f88befb804421c88c9584b02f0974c33508d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Dr=C3=A4ger?= <20014538+sdraeger@users.noreply.github.com> Date: Sat, 24 Oct 2026 13:21:23 -0700 Subject: [PATCH 038/140] Allow spaces in horizon-ctl screenshot paths --- crates/horizon-client/src/game/control.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/control.rs b/crates/horizon-client/src/game/control.rs index 205a66074..c6690d435 100644 --- a/crates/horizon-client/src/game/control.rs +++ b/crates/horizon-client/src/game/control.rs @@ -503,7 +503,10 @@ impl Game<'_> { if self.pending_screenshot.is_some() { return Err("a screenshot is already pending".into()); } - renderer.screenshot = Some(arg(1)?.into()); + arg(1)?; + // The rest of the line: a path may hold spaces. + let path = line.trim_start().strip_prefix("screenshot").unwrap_or(""); + renderer.screenshot = Some(path.trim().into()); self.pending_screenshot = Some(reply.clone()); Ok(None) } From 66070b918eae4dd46119c67499f7915491603c40 Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Sat, 24 Oct 2026 21:25:27 +0100 Subject: [PATCH 039/140] Batch cached Perlin Y samples for portable SIMD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Evaluate four same-cell Y samples together while preserving coordinate setup, gradient caching and each sample's floating-point operation order. Safe arrays let LLVM vectorize the interpolation on the portable target; cell boundaries and tails keep scalar evaluation. Add bitwise differential coverage against the original volume loop. Two paired chunk-generation batches reproduce a 4.6–4.7% Nether wall-time reduction, with smaller or unresolved effects in the other dimensions. Co-Authored-By: Codex gpt-6.1-sol --- crates/horizon-core/src/noise/perlin.rs | 223 ++++++++++++++++++++++++ 1 file changed, 223 insertions(+) diff --git a/crates/horizon-core/src/noise/perlin.rs b/crates/horizon-core/src/noise/perlin.rs index ddcccfe9f..fcebd2f1b 100644 --- a/crates/horizon-core/src/noise/perlin.rs +++ b/crates/horizon-core/src/noise/perlin.rs @@ -159,6 +159,104 @@ impl PerlinNoise { y_scale: f64, amplitude: f32, fudge_y_scale: Option, + ) -> Result<(), DensityError> { + if buffer.len() < volume.size() { + return Err(DensityError::BufferTooShort); + } + let [size_x, size_y, size_z] = volume.sizes(); + // Every X/Z column walks the same Y coordinates, so their cells, offsets + // and fades are computed once per volume instead of once per column. + let mut stack = [YSample::default(); STACK_Y]; + let mut heap = Vec::new(); + let ys = if size_y <= STACK_Y { + &mut stack[..size_y] + } else { + heap.resize(size_y, YSample::default()); + &mut heap[..] + }; + for (y, sample) in ys.iter_mut().enumerate() { + let input_y = f64::from(volume.coordinate(1, y)) * y_scale; + let shifted_y = wrap(input_y) + self.table.offsets[1]; + let cell = floor_i32(shifted_y); + let dy = shifted_y - f64::from(cell); + *sample = YSample { + cell, + fade: smoothstep(dy as f32), + offset: match fudge_y_scale { + Some(scale) => (dy - compute_fudge_y(input_y, dy, scale)) as f32, + None => dy as f32, + }, + }; + } + let ys = &*ys; + let mut index = 0; + for z in 0..size_z { + let shifted_z = + wrap(f64::from(volume.coordinate(2, z)) * xz_scale) + self.table.offsets[2]; + let cell_z = floor_i32(shifted_z); + let dz = (shifted_z - f64::from(cell_z)) as f32; + let fade_z = smoothstep(dz); + for x in 0..size_x { + let shifted_x = + wrap(f64::from(volume.coordinate(0, x)) * xz_scale) + self.table.offsets[0]; + let cell_x = floor_i32(shifted_x); + let dx = (shifted_x - f64::from(cell_x)) as f32; + let fade_x = smoothstep(dx); + let p = self.table.permute(cell_x); + let q = self.table.permute(cell_x.wrapping_add(1)); + let mut previous_y = i32::MIN; + let mut xz_dots = [0.0_f32; 8]; + let mut y_gradients = [0.0_f32; 8]; + let column = &mut buffer[index..index + size_y]; + let mut y = 0; + while y < size_y { + let sample = &ys[y]; + if previous_y != sample.cell { + let gradients = self.gradients_at(p, q, sample.cell, cell_z); + for i in 0..8 { + xz_dots[i] = gradients[i][0] * (dx - (i & 1) as f32) + + gradients[i][2] * (dz - ((i >> 2) & 1) as f32); + y_gradients[i] = gradients[i][1]; + } + previous_y = sample.cell; + } + // Batch independent Y samples for LLVM's portable SIMD + // lowering; boundaries and tails use the scalar path. + if y + 4 <= size_y && ys[y + 1..y + 4].iter().all(|s| s.cell == sample.cell) { + add_four( + &mut column[y..y + 4], + &ys[y..y + 4], + xz_dots, + y_gradients, + fade_x, + fade_z, + amplitude, + ); + y += 4; + continue; + } + let out = &mut column[y]; + let dy = sample.offset; + let values = std::array::from_fn(|i| { + xz_dots[i] + y_gradients[i] * (dy - ((i >> 1) & 1) as f32) + }); + *out += amplitude * lerp3([fade_x, sample.fade, fade_z], values); + y += 1; + } + index += size_y; + } + } + Ok(()) + } + #[cfg(test)] + fn add_volume_scalar( + &self, + buffer: &mut [f32], + volume: DensityVolume, + xz_scale: f64, + y_scale: f64, + amplitude: f32, + fudge_y_scale: Option, ) -> Result<(), DensityError> { if buffer.len() < volume.size() { return Err(DensityError::BufferTooShort); @@ -312,3 +410,128 @@ fn compute_fudge_y(input_y: f64, relative_y: f64, scale: f64) -> f64 { }; f64::from(floor_i32(limited_y / scale + f64::from(1e-7_f32))) * scale } + +// Keep four independent Y lanes visible to SLP without requiring unsafe +// intrinsics or a platform-specific target feature. Scalar lowering remains +// valid on every supported platform, and each lane retains the FP order. +#[inline] +fn add_four( + out: &mut [f32], + ys: &[YSample], + dots: [f32; 8], + gradients: [f32; 8], + fade_x: f32, + fade_z: f32, + amplitude: f32, +) { + let dy: [f32; 4] = std::array::from_fn(|lane| ys[lane].offset); + let fy: [f32; 4] = std::array::from_fn(|lane| ys[lane].fade); + let values: [[f32; 4]; 8] = std::array::from_fn(|i| { + std::array::from_fn(|lane| dots[i] + gradients[i] * (dy[lane] - ((i >> 1) & 1) as f32)) + }); + for lane in 0..4 { + out[lane] += amplitude * lerp3([fade_x, fy[lane], fade_z], values.map(|v| v[lane])); + } +} + +#[cfg(test)] +mod simd_tests { + use super::*; + use crate::random::LegacyRandom; + use std::hint::black_box; + + #[test] + fn volume_bitwise_scalar_reference() { + let scales = [ + 0.0, + -0.0, + 0.001, + -0.001, + 0.125, + -0.5, + 1.0, + 4.0, + 1e100, + f64::INFINITY, + f64::NEG_INFINITY, + f64::NAN, + ]; + let amplitudes = [ + 0.0, + -0.0, + 1.0, + -1.0, + f32::INFINITY, + f32::NEG_INFINITY, + f32::NAN, + f32::from_bits(1), + ]; + for seed in [0, -1, 1234, i64::MIN] { + let noise = PerlinNoise::new(&mut LegacyRandom::new(seed)); + for height in [1, 2, 3, 4, 5, 7, 8, 9, 31, 64, 65, 97] { + for (case, &scale) in scales.iter().enumerate() { + let minimum = [ + [-17, -64, 49], + [i32::MAX, i32::MIN, -16777216], + [16777216, 33554431, -33554432], + ][case % 3]; + let volume = DensityVolume::new( + [2, height, 2], + minimum, + [4, if case % 3 == 0 { i32::MAX } else { 1 }, 16], + ) + .unwrap(); + for fudge in [None, Some(0.125), Some(-0.25), Some(0.0), Some(f64::NAN)] { + let initial = [0.0, -0.0, 1.5, f32::from_bits(1)]; + let mut a: Vec<_> = + (0..volume.size() + 3).map(|i| initial[i % 4]).collect(); + let mut b = a.clone(); + let amplitude = amplitudes[case % amplitudes.len()]; + noise + .add_volume_scalar(&mut a, volume, scale, scale, amplitude, fudge) + .unwrap(); + noise + .add_volume(&mut b, volume, scale, scale, amplitude, fudge) + .unwrap(); + for (i, (a, b)) in a.iter().zip(&b).enumerate() { + assert_eq!( + a.to_bits(), + b.to_bits(), + "seed={seed} height={height} scale={scale} fudge={fudge:?} index={i}" + ); + } + } + } + } + } + } + + #[test] + #[ignore] + fn microkernel() { + let noise = PerlinNoise::new(&mut LegacyRandom::new(1234)); + let volume = DensityVolume::new([5, 49, 5], [-16, -64, 32], [4, 8, 4]).unwrap(); + for scale in [0.001, 0.01, 0.1, 1.0] { + for scalar in [true, false] { + let mut buf = vec![0.0; volume.size()]; + let start = std::time::Instant::now(); + for _ in 0..50000 { + if scalar { + noise + .add_volume_scalar(black_box(&mut buf), volume, scale, scale, 0.5, None) + .unwrap(); + } else { + noise + .add_volume(black_box(&mut buf), volume, scale, scale, 0.5, None) + .unwrap(); + } + } + println!( + "scale={scale} scalar={scalar} seconds={:.6}", + start.elapsed().as_secs_f64() + ); + black_box(buf); + } + } + } +} From 0e607404d102ec31fde7567f40b666b3db2b91d9 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 22:28:34 +0200 Subject: [PATCH 040/140] Pause: the server thread stops ticking its players, not the window The window's own tick doesn't run while paused (the frame loop skips Game::tick), so the two gates added there never fired. What kept going was the server thread: its paused pass still ran tick_guests, the players' doTick, so air, hunger and drowning damage moved on behind the pause menu. Vanilla's IntegratedServer.tickPaused only ticks the connections, and ServerGamePacketListenerImpl.tick skips tickPlayer while the server is paused. tick_lan now does the same: the paused pass keeps the connections and skips tick_guests. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game.rs | 4 ++-- crates/horizon-client/src/game/lan.rs | 11 ++++++++--- crates/horizon-client/src/game/levels.rs | 2 +- crates/horizon-client/src/game/remote.rs | 5 +---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 0998eb553..aeeddd58d 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -4147,7 +4147,7 @@ impl Game<'_> { [player.velocity.x, player.velocity.y, player.velocity.z], [player.position.x, player.position.y, player.position.z], ); - if !riding && !self.pause { + if !riding { MotionWorld { entities: &entity_collisions, player, @@ -4413,7 +4413,7 @@ impl Game<'_> { self.resolve_arrivals(); }); } - horizon_client::spans::time("tick_lan", || self.tick_lan()); + horizon_client::spans::time("tick_lan", || self.tick_lan(false)); self.tick_friends(); horizon_client::spans::time("tick_hand", || self.tick_hand()); horizon_client::spans::time("tick_sleep", || self.tick_sleep()); diff --git a/crates/horizon-client/src/game/lan.rs b/crates/horizon-client/src/game/lan.rs index 8bf72abee..8460f54e6 100644 --- a/crates/horizon-client/src/game/lan.rs +++ b/crates/horizon-client/src/game/lan.rs @@ -834,8 +834,11 @@ impl Game<'_> { self.lan_object_states(host_entity, hub, out); } - /// Run the hub for this tick and apply what the guests did. - pub(super) fn tick_lan(&mut self) { + /// Run the hub for this tick and apply what the guests did. While the + /// single player game is `paused` only the connections run + /// (`IntegratedServer.tickPaused`): `ServerGamePacketListenerImpl.tick` + /// skips `tickPlayer`, so no player's air, hunger or damage moves on. + pub(super) fn tick_lan(&mut self, paused: bool) { let Some(mut host) = self.lan.take() else { return; }; @@ -1000,7 +1003,9 @@ impl Game<'_> { host.states = states; } self.lan_flush_effects(&mut host); - self.tick_guests(&mut host); + if !paused { + self.tick_guests(&mut host); + } self.lan_living_flags(&mut host); self.tick_server_travel(&mut host); self.lan_swings(&mut host); diff --git a/crates/horizon-client/src/game/levels.rs b/crates/horizon-client/src/game/levels.rs index 895cda08c..114ee928f 100644 --- a/crates/horizon-client/src/game/levels.rs +++ b/crates/horizon-client/src/game/levels.rs @@ -296,7 +296,7 @@ impl Game<'_> { self.update_dedicated_streaming(); self.update_world(); result = if paused { - self.tick_lan(); + self.tick_lan(true); Ok(()) } else if k == 0 { self.tick() diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index e3eed3f55..32cffa306 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3175,10 +3175,7 @@ impl Game<'_> { f64::from(head[2]) + 0.5, ); player.velocity = Vec3::ZERO; - } else if !dead && !riding && !self.pause { - // Minecraft.tick skips the level while the game is paused: the window's own - // copy stands still too, so air, hunger and fall prediction do not run ahead - // of the paused server (#1592). + } else if !dead && !riding { player.velocity = player.velocity.add_vector(pushed); MotionWorld { entities: &entity_collisions, From 7d06aca17ae73c3d36bb67b64ab2bda0998c1f38 Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sat, 24 Oct 2026 23:29:55 +0300 Subject: [PATCH 041/140] Player: also stop sending the state packet while the game is paused Measured on the built branch: it does not stop the drowning from #1592 on its own. Kept because it is what forcing the level to stand still looks like, and the negative result is in the PR. Co-Authored-By: Hermes Agent (Nous Research) --- crates/horizon-client/src/game/remote.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index e3eed3f55..b1e8dfc9d 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3109,6 +3109,7 @@ impl Game<'_> { // must continue, as well as moves into the unloaded area. if let Some(r) = self.remote.as_ref() && r.loaded_sent + && !self.pause { let input = r.last_input; self.remote_send_state(input); @@ -3243,7 +3244,9 @@ impl Game<'_> { data: 0, })); } - self.remote_send_state(input); + if !self.pause { + self.remote_send_state(input); + } Ok(()) } From 6c6c08f4d9ef42e65b5ed9e4a75fcb022fafa65a Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 22:39:13 +0200 Subject: [PATCH 042/140] Fluid contact on a client: only for the entities that tick A frozen level (TickRateManager.isEntityFrozen) ticks only the players, so their fluid contact is the only one that moves on, as in the loop below. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/remote.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index e166ff444..d4227f60c 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3328,15 +3328,22 @@ impl Game<'_> { // EntityFluidInteraction.update for the entities this window only displays: the // server never sends the fluid contact, and the renderers read it (cod, salmon and // tropical fish lie on their side without `in_water`, #1591). + // A frozen level ticks only the players, as below. let fluids: Vec<_> = { let w = self.mob_world_base(&[]); + let players = self.remote.as_ref().map(|r| &r.level_players); self.mobs .iter() - .map(|m| w.fluids(m.bounds(), m.eye_y())) + .map(|m| { + (running || players.is_some_and(|p| p.contains_key(&(m.id as i32)))) + .then(|| w.fluids(m.bounds(), m.eye_y())) + }) .collect() }; for (m, fluids) in self.mobs.iter_mut().zip(fluids) { - m.fluids = fluids; + if let Some(fluids) = fluids { + m.fluids = fluids; + } } let Some(r) = self.remote.as_mut() else { return; From 3f1a7b28af0ba3fac58ad43194d06912ae969cd0 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 22:39:13 +0200 Subject: [PATCH 043/140] Placement prediction: one helper for predicted blocks, the sound where the block went - predict_use and predict_place set their blocks through one predict_blocks (retainKnownServerState), instead of two copies of the loop. - remote_can_place returns where BlockItem.place put the block, and the placer hears the place sound there: before, set_block only played it at the clicked face's neighbour, so a block that replaced grass or snow where the player clicked made no sound for its placer now that the server leaves the placer out. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/remote.rs | 83 +++++++++++------------- 1 file changed, 39 insertions(+), 44 deletions(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index e54b33b02..11eb3baed 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3932,18 +3932,7 @@ impl Game<'_> { { return; } - for &(p, state) in changes { - let pos = [p.x, p.y, p.z]; - let before = self.world.block(p.x, p.y, p.z); - // BlockStatePredictionHandler.retainKnownServerState. - if let Some(r) = self.remote.as_mut() { - r.predictions - .entry(pos) - .and_modify(|e| e.0 = seq) - .or_insert((seq, before.0 as i32)); - } - self.set_block(pos, state.0 as i32); - } + self.predict_blocks(changes, seq); // `level.playSound(player, ...)`: the clicker hears it from its own use; the // server sends it to the others only. for (pos, sound, volume, pitch) in sounds { @@ -4004,20 +3993,27 @@ impl Game<'_> { } /// MultiPlayerGameMode.useItemOn inside startPrediction, for a block item: - /// the blocks `BlockItem.place` set are placed on this client's level at - /// once, each kept as predicted under the use's sequence until the server - /// acknowledges it (a placement the server refused goes back). Without - /// this, the next click of a fast bridge aims past the block still on its - /// way from the server, and the server refuses it. - fn predict_place( - &mut self, - changes: &[(horizon_core::position::BlockPos, BlockStateId)], - seq: i32, - ) { + /// the blocks `BlockItem.place` set at `pos` are placed on this client's + /// level at once, so the next click of a fast bridge aims at them rather + /// than past them (the server would refuse it). Its place sound is the + /// placer's own (`playSound(player, ...)`: the server sends it to the + /// others only). + fn predict_place(&mut self, (pos, changes): &DryPlace, seq: i32) { + let ticks = self.ticks; + if let Some(r) = self.remote.as_mut() { + // set_block plays the place sound of the block at `placing`. + r.placing = Some(([pos.x, pos.y, pos.z], ticks)); + } + self.predict_blocks(changes, seq); + } + /// The blocks a use changed, set on this client's level and kept as + /// predicted under the use's sequence until the server acknowledges it + /// (`BlockStatePredictionHandler.retainKnownServerState`): a use the + /// server refused goes back. + fn predict_blocks(&mut self, changes: &DryChanges, seq: i32) { for &(p, state) in changes { let pos = [p.x, p.y, p.z]; let before = self.world.block(p.x, p.y, p.z); - // BlockStatePredictionHandler.retainKnownServerState. if let Some(r) = self.remote.as_mut() { r.predictions .entry(pos) @@ -4028,14 +4024,11 @@ impl Game<'_> { } } - /// Run BlockItem.place on a disposable level: the blocks it set, if it - /// placed. The real level supplies collision shapes and building-blocking - /// entities; random draws, scheduled ticks and events stay in the preview. - fn remote_can_place( - &mut self, - hit: &super::Hit, - stack: &ItemStack, - ) -> Option> { + /// Run BlockItem.place on a disposable level: where it placed and the + /// blocks it set. The real level supplies collision shapes and + /// building-blocking entities; random draws, scheduled ticks and events + /// stay in the preview. + fn remote_can_place(&mut self, hit: &super::Hit, stack: &ItemStack) -> Option { if !self.may_build() { return None; } @@ -4052,15 +4045,16 @@ impl Game<'_> { }; self.with_level(|b, level, _| { let mut level = DryLevel::new(level); - matches!( - b.place_block( - &mut level, - &mut horizon_world::level::Ticks::default(), - &ctx - ), - horizon_world::level::PlaceOutcome::Placed { .. } - ) - .then(|| level.changed.into_iter().collect()) + match b.place_block( + &mut level, + &mut horizon_world::level::Ticks::default(), + &ctx, + ) { + horizon_world::level::PlaceOutcome::Placed { pos, .. } => { + Some((pos, level.changed.into_iter().collect())) + } + horizon_world::level::PlaceOutcome::Failed => None, + } }) } @@ -5109,11 +5103,12 @@ type DrySound = ( f32, f32, ); +/// The blocks a use on the dry level set. +type DryChanges = Vec<(horizon_core::position::BlockPos, BlockStateId)>; /// What a use on the dry level changed, and the sounds it played. -type DryUse = ( - Vec<(horizon_core::position::BlockPos, BlockStateId)>, - Vec, -); +type DryUse = (DryChanges, Vec); +/// Where `BlockItem.place` on the dry level placed, and the blocks it set. +type DryPlace = (horizon_core::position::BlockPos, DryChanges); /// The blocks a guest's hand flips that its use predicts (and hears at once): a wooden or /// copper door, trapdoor or fence gate, a lever or a button. An iron door or trapdoor has From c6980fb2b770470de69ae380f044b39f1d55b21b Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 22:43:26 +0200 Subject: [PATCH 044/140] Drop the lang.rs test: layers_selected_language_over_english covers it It reads the same files the same way (assets/pack.mcmeta's language section, a language offered only with its file, Language::load over en_us). Leaving the client out also keeps this PR to horizon-prepare, so its check doesn't rerun the client's harnesses. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/lang.rs | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/crates/horizon-client/src/lang.rs b/crates/horizon-client/src/lang.rs index 646869d02..15f47285a 100644 --- a/crates/horizon-client/src/lang.rs +++ b/crates/horizon-client/src/lang.rs @@ -227,33 +227,4 @@ mod tests { ); assert_eq!(langs[1].label(), "Français (France)"); } - - #[test] - fn a_prepared_root_offers_the_languages_the_asset_index_holds() { - // `horizon-prepare languages` copies `pack.mcmeta` and every `minecraft/lang/*.json` - // from the asset index, since the client jar carries `en_us` alone. `pack.mcmeta`'s - // `language` section is the whole list; a language's own file holds its strings (#1272). - let root = Mem(HashMap::from([ - ( - "assets/pack.mcmeta".into(), - r#"{"pack":{"description":"vanilla"},"language":{"ru_ru":{"name":"Русский","region":"Россия","bidirectional":false}}}"#.as_bytes().to_vec(), - ), - ( - "assets/minecraft/lang/en_us.json".into(), - br#"{"a":"Apple"}"#.to_vec(), - ), - ( - "assets/minecraft/lang/ru_ru.json".into(), - r#"{"a":"Яблоко"}"#.as_bytes().to_vec(), - ), - ])); - let sources: [&dyn ResourceSource; 1] = [&root]; - let langs = available(&sources); - assert_eq!( - langs.iter().map(|l| l.code.as_str()).collect::>(), - ["en_us", "ru_ru"] - ); - assert_eq!(langs[1].label(), "Русский (Россия)"); - assert_eq!(Language::load(&sources, "ru_ru").get("a"), Some("Яблоко")); - } } From 8c611e677b6e84f27116cd0c486f2f64703e1568 Mon Sep 17 00:00:00 2001 From: some-du6e <103129948+some-du6e@users.noreply.github.com> Date: Sat, 24 Oct 2026 14:44:17 -0600 Subject: [PATCH 045/140] Advancement titles and descriptions show a whole text component A server's custom advancements often name themselves with an empty text and the words in its siblings ({"text":"","extra":[...]}); only the top-level text or translate key was read, so their tooltips were blank. Read them as the component they are (ComponentSerialization), with siblings, styles, translation arguments and fallbacks. Co-Authored-By: Claude Opus 5.5 --- .../horizon-client/src/game/advancements.rs | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/crates/horizon-client/src/game/advancements.rs b/crates/horizon-client/src/game/advancements.rs index b0f948c5d..20d54d290 100644 --- a/crates/horizon-client/src/game/advancements.rs +++ b/crates/horizon-client/src/game/advancements.rs @@ -1051,17 +1051,10 @@ impl Game<'_> { } } } -/// A text component from advancement JSON (`translate` or `text`). +/// An advancement's title or description: a whole component (ComponentSerialization.CODEC), +/// with its siblings and styles, as a plugin's `{"text":"","extra":[...]}` needs. pub(super) fn text_of(v: &Value) -> Text { - if let Some(key) = v["translate"].as_str() { - Text::translate(key, &[]) - } else if let Some(s) = v["text"].as_str() { - Text::literal(s) - } else if let Some(s) = v.as_str() { - Text::literal(s) - } else { - Text::empty() - } + horizon_client::scoreboard::comp_text(v) } #[cfg(test)] @@ -1095,6 +1088,20 @@ mod tests { (seen, None) } + #[test] + fn titles_keep_their_siblings_and_styles() { + let title = text_of(&serde_json::json!({ + "text": "", + "extra": [{"text": "Quest ", "color": "gold"}, "Board"], + })); + assert_eq!(title.plain(), "Quest Board"); + assert_eq!(title.spans[0].style.color, Some(horizon_client::text::GOLD)); + assert_eq!( + text_of(&serde_json::json!({"translate": "advancements.story.root.title"})), + Text::translate("advancements.story.root.title", &[]) + ); + } + #[test] fn toasts_slide_in_squared_and_out_after_five_seconds() { let mut toast = recipes(1); From 4ad05aa94a4a1a7c4c9b4b39717a238af5d6584c Mon Sep 17 00:00:00 2001 From: some-du6e <103129948+some-du6e@users.noreply.github.com> Date: Sat, 24 Oct 2026 14:44:17 -0600 Subject: [PATCH 046/140] Show armour trims on items from a server Decode the trim component as its material and pattern registry ids when both are references (a direct holder stays read past) and name them through the server's synced trim_material and trim_pattern registries, as enchantments are, so worn and held trimmed armour draws its trim in multiplayer. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/remote.rs | 13 ++++++ .../examples/item_wire_probe.rs | 6 +-- crates/horizon-protocol/src/item.rs | 45 ++++++++++++++++--- 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 0e6127178..8cf3d52a0 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -598,6 +598,19 @@ impl Game<'_> { let value = match c { // Read past, not decoded: the item keeps its prototype's value. Component::Raw(_) => continue, + // Trim materials and patterns are synced registries, as enchantments are. + Component::Trim { material, pattern } => { + let (Some(material), Some(pattern)) = ( + r.registries.name("minecraft:trim_material", *material), + r.registries.name("minecraft:trim_pattern", *pattern), + ) else { + continue; + }; + Tag::compound([ + ("material", Tag::String(material.into())), + ("pattern", Tag::String(pattern.into())), + ]) + } Component::Int(v) if *kind == component::RARITY => { let rarity = ["common", "uncommon", "rare", "epic"]; Tag::String(rarity.get(*v as usize).copied().unwrap_or("common").into()) diff --git a/crates/horizon-protocol/examples/item_wire_probe.rs b/crates/horizon-protocol/examples/item_wire_probe.rs index 19760ca1a..097a9f40d 100644 --- a/crates/horizon-protocol/examples/item_wire_probe.rs +++ b/crates/horizon-protocol/examples/item_wire_probe.rs @@ -2,8 +2,8 @@ //! the oracle's stacks (JSON lines with `label` and `hex`), decodes each with //! `item::Slot` and prints, per stack, whether every byte was consumed, the //! patch's component ids (added, then removed), which of them Horizon -//! decoded into its own types (the rest it reads past, keeping their bytes) -//! and whether encoding the decoded stack gives the same bytes back. +//! decoded into its own lossy types (the rest it reads past keeping their +//! bytes, or decodes into ids it writes back unchanged, like trims) and whether encoding the decoded stack gives the same bytes back. //! //! cargo run -p horizon-protocol --example item_wire_probe -- vanilla.jsonl rust.jsonl use horizon_protocol::{ @@ -45,7 +45,7 @@ fn main() -> Result<(), Box> { let typed: Vec = stack .iter() .flat_map(|s| &s.added) - .filter(|(_, c)| !matches!(c, Component::Raw(_))) + .filter(|(_, c)| !matches!(c, Component::Raw(_) | Component::Trim { .. })) .map(|(k, _)| *k) .collect(); json!({ diff --git a/crates/horizon-protocol/src/item.rs b/crates/horizon-protocol/src/item.rs index 0aa940a38..2872c0228 100644 --- a/crates/horizon-protocol/src/item.rs +++ b/crates/horizon-protocol/src/item.rs @@ -37,6 +37,7 @@ pub mod component { pub const CHARGED_PROJECTILES: i32 = 51; pub const WRITABLE_BOOK_CONTENT: i32 = 56; pub const WRITTEN_BOOK_CONTENT: i32 = 57; + pub const TRIM: i32 = 58; } /// A written book's content (`WrittenBookContent.STREAM_CODEC`): the @@ -80,6 +81,12 @@ pub enum Component { WrittenBook(WrittenBook), /// `ChargedProjectiles`: a loaded crossbow's ammunition, as templates. Stacks(Vec), + /// `ArmorTrim` naming its material and pattern by registry id (`trim_material`, + /// `trim_pattern`); a trim with a direct holder stays [`Component::Raw`]. + Trim { + material: i32, + pattern: i32, + }, /// A component Horizon reads past without interpreting it: its encoded /// bytes, written back as they came. Raw(Vec), @@ -232,13 +239,28 @@ impl Component { other => { let start = r.position(); skip::component(other, r)?; - Self::Raw(r.since(start).to_vec()) + let bytes = r.since(start); + // Two references: each holder is just its id plus one. + let mut ids = Reader::new(bytes); + match (other, ids.varint(), ids.varint()) { + (TRIM, Ok(material @ 1..), Ok(pattern @ 1..)) if ids.remaining() == 0 => { + Self::Trim { + material: material - 1, + pattern: pattern - 1, + } + } + _ => Self::Raw(bytes.to_vec()), + } } }) } fn write(&self, kind: i32, w: &mut Writer) { match self { Self::Raw(bytes) => w.bytes(bytes), + Self::Trim { material, pattern } => { + w.varint(material + 1); + w.varint(pattern + 1); + } Self::Int(v) if kind == component::DYED_COLOR => w.i32(*v), Self::Int(v) => w.varint(*v), Self::Unit => {} @@ -646,7 +668,7 @@ mod tests { #[test] fn components_read_past_keep_their_bytes() { // Vanilla 26.3's encoding (tools/test_item_wire_parity.py) of a chestplate's - // armour trim, a banner's patterns (one direct), a pot's sherds and a stew's + // armour trim (decoded: both holders are references), a banner's patterns (one direct), a pot's sherds and a stew's // effects: one server's inventory, recipe book and advancements had them. for (hex, kind) in [ ("01bd0801003a0502", 58), @@ -661,10 +683,21 @@ mod tests { let mut r = Reader::new(&bytes); let stack = Slot::read(&mut r).unwrap(); assert_eq!(r.remaining(), 0, "component {kind}"); - assert!(matches!( - stack.as_ref().and_then(|s| s.component(kind)), - Some(Component::Raw(_)) - )); + let expected = |c: &Component| match kind { + 58 => { + *c == Component::Trim { + material: 4, + pattern: 1, + } + } + _ => matches!(c, Component::Raw(_)), + }; + assert!( + stack + .as_ref() + .and_then(|s| s.component(kind)) + .is_some_and(expected) + ); let mut w = Writer::new(); Slot::write(&stack, &mut w); assert_eq!(w.data, bytes, "component {kind}"); From bffb68b0c59168f4354f9664023e18f4bed0b9f9 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 21:03:00 +0200 Subject: [PATCH 047/140] Mod registry index: schema 1, .hpack and the checks before install horizon_mods::index (feature index): index.json's types and rules (unique ids, https URLs, plain file names, hex SHA-256, minisign keys and signatures, a modpack's mods present in the index), open-ended kinds (mod, modpack, resourcepack, shader; unknown kinds kept, not offered), revocations, and check_file: size, hash, revocation, signature and the file's own manifest against its entry. horizon_mods::modpack reads .hpack files: horizon-modpack.toml and an allow-list of overrides. docs/api/mod-index.md documents both, with a sample index the tests read. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 10 +- crates/horizon-mods/Cargo.toml | 5 + crates/horizon-mods/src/index.rs | 538 ++++++++++++++++++ crates/horizon-mods/src/index/tests.rs | 162 ++++++ crates/horizon-mods/src/lib.rs | 3 + crates/horizon-mods/src/manifest.rs | 9 +- crates/horizon-mods/src/modpack.rs | 299 ++++++++++ crates/horizon-mods/src/runtime.rs | 5 +- .../tests/index/coords_hud-0.1.0.hmod | Bin 0 -> 438 bytes .../tests/index/coords_hud-0.1.0.hmod.minisig | 4 + .../horizon-mods/tests/index/cozy-1.0.0.hpack | Bin 0 -> 471 bytes crates/horizon-mods/tests/index/index-v1.json | 109 ++++ crates/horizon-mods/tests/index/test.pub | 2 + docs/api/mod-index.md | 95 ++++ docs/mods.md | 3 +- 15 files changed, 1235 insertions(+), 9 deletions(-) create mode 100644 crates/horizon-mods/src/index.rs create mode 100644 crates/horizon-mods/src/index/tests.rs create mode 100644 crates/horizon-mods/src/modpack.rs create mode 100644 crates/horizon-mods/tests/index/coords_hud-0.1.0.hmod create mode 100644 crates/horizon-mods/tests/index/coords_hud-0.1.0.hmod.minisig create mode 100644 crates/horizon-mods/tests/index/cozy-1.0.0.hpack create mode 100644 crates/horizon-mods/tests/index/index-v1.json create mode 100644 crates/horizon-mods/tests/index/test.pub create mode 100644 docs/api/mod-index.md diff --git a/Cargo.lock b/Cargo.lock index 27eaad0c4..57006aa82 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,7 +155,7 @@ dependencies = [ "objc2-foundation 0.3.2", "parking_lot", "percent-encoding", - "windows-sys 0.59.0", + "windows-sys 0.60.2", "wl-clipboard-rs", "x11rb", ] @@ -1331,8 +1331,10 @@ name = "horizon-mods" version = "0.1.0" dependencies = [ "log", + "minisign-verify", "serde", "serde_json", + "sha2", "toml", "wasmtime", "wit-component 0.239.0", @@ -1898,6 +1900,12 @@ dependencies = [ "libc", ] +[[package]] +name = "minisign-verify" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "871285dc19d8d0ebe0eef3d0e99a205f2a71363b122632cbbfa4a6c370a960ce" + [[package]] name = "miniz_oxide" version = "0.8.9" diff --git a/crates/horizon-mods/Cargo.toml b/crates/horizon-mods/Cargo.toml index 3dfc02331..840fc28c5 100644 --- a/crates/horizon-mods/Cargo.toml +++ b/crates/horizon-mods/Cargo.toml @@ -17,6 +17,9 @@ wasmtime = { version = "36.0.18", default-features = false, features = ["runtime # Turns a mod's core module into a component (cargo horizon-mod build, the tests). wit-component = { version = "0.239", optional = true } wit-parser = { version = "0.239", optional = true } +# The registry index's checks (feature `index`): SHA-256, and minisign signatures (no dependencies of its own). +sha2 = { version = "0.10", optional = true } +minisign-verify = { version = "0.3", optional = true } [features] # Loads and runs mods (the game's `mods` feature); without it only manifests, @@ -24,6 +27,8 @@ wit-parser = { version = "0.239", optional = true } # game's tests and probes) skip wasmtime and cranelift. runtime = ["dep:wasmtime"] pack = ["dep:wit-component", "dep:wit-parser"] +# The mod registry's index (docs/api/mod-index.md): the launcher, the registry server and its CI. +index = ["dep:sha2", "dep:minisign-verify"] # Runs real mods: `cargo test -p horizon-mods --features runtime,pack`. [[test]] diff --git a/crates/horizon-mods/src/index.rs b/crates/horizon-mods/src/index.rs new file mode 100644 index 000000000..73af7b46d --- /dev/null +++ b/crates/horizon-mods/src/index.rs @@ -0,0 +1,538 @@ +//! The mod registry's index, `index.json` (docs/api/mod-index.md): every +//! reviewed mod and modpack, its versions, the file of each with its size, +//! SHA-256 and minisign signature, and the files taken down. The launcher +//! reads it to browse and install, the website to show it, and the +//! registry's CI writes it. +//! +//! [`check_file`] is what a file must pass before it is installed: its size +//! and hash are the ones the index lists, its signature verifies against the +//! project's pinned key, and what its own manifest says matches the entry. +use crate::{ + Capability, Package, Side, + modpack::{self, Modpack}, +}; +use serde::{Deserialize, Serialize}; +use sha2::{Digest, Sha256}; +use std::{io::Read, path::Path}; + +/// The index format this build reads and writes. A reader refuses a newer +/// one rather than misread it. +pub const SCHEMA: u32 = 1; +/// The biggest file the registry takes (a `.hmod` with content, a `.hpack`). +pub const MAX_FILE: u64 = 64 << 20; +/// Where files may be downloaded from: the registry's release assets. +pub const FILE_HOST: &str = "https://github.com/ludovic111/horizon-mods/releases/download/"; + +#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] +pub struct Index { + pub schema: u32, + /// When CI built it, RFC 3339. + #[serde(default)] + pub generated: String, + #[serde(default)] + pub projects: Vec, + #[serde(default)] + pub revoked: Vec, +} + +/// What a project is. New kinds (data packs, worlds, themes) can be added +/// without a new schema: a reader keeps a kind it doesn't know as +/// [`Kind::Other`] and doesn't offer it. +#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)] +#[serde(from = "String", into = "String")] +pub enum Kind { + /// A `.hmod`. + Mod, + /// A `.hpack`: registry mods played together as a profile. + Modpack, + /// A resource pack (`.zip` with `pack.mcmeta`) made or tested for Horizon. + ResourcePack, + /// A Horizon shader pack (the native WGSL format, not Iris or OptiFine + /// packs). Listed by the schema; submissions open with its API. + Shader, + Other(String), +} + +impl Kind { + pub fn name(&self) -> &str { + match self { + Kind::Mod => "mod", + Kind::Modpack => "modpack", + Kind::ResourcePack => "resourcepack", + Kind::Shader => "shader", + Kind::Other(name) => name, + } + } + + /// The extension of its files; None for a kind this build doesn't know. + pub fn extension(&self) -> Option<&'static str> { + match self { + Kind::Mod => Some("hmod"), + Kind::Modpack => Some("hpack"), + Kind::ResourcePack | Kind::Shader => Some("zip"), + Kind::Other(_) => None, + } + } +} + +impl From for Kind { + fn from(name: String) -> Kind { + match name.as_str() { + "mod" => Kind::Mod, + "modpack" => Kind::Modpack, + "resourcepack" => Kind::ResourcePack, + "shader" => Kind::Shader, + _ => Kind::Other(name), + } + } +} + +impl From for String { + fn from(kind: Kind) -> String { + kind.name().to_owned() + } +} + +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +pub struct Project { + /// The manifest's id, `[a-z0-9_]{1,64}`: unique across the index. + pub id: String, + pub kind: Kind, + pub name: String, + /// One line for lists. + pub summary: String, + /// Markdown, for the project's page. + #[serde(default)] + pub description: String, + #[serde(default)] + pub authors: Vec, + /// The GitHub logins allowed to publish its updates. + #[serde(default)] + pub owners: Vec, + /// An SPDX expression. + pub license: String, + /// Where its source code is, `https://`. + pub source: String, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub icon: Option, + /// The author's minisign public key: every version must be signed with + /// it. None: unsigned (the SHA-256 still pins the reviewed file). + #[serde(default, skip_serializing_if = "Option::is_none")] + pub key: Option, + /// Newest first. + pub versions: Vec, +} + +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +pub struct Version { + pub version: String, + /// The day it was published, `YYYY-MM-DD`. + #[serde(default)] + pub published: String, + #[serde(default, skip_serializing_if = "String::is_empty")] + pub changelog: String, + /// A mod's API line (`0.1`), from its manifest; a modpack's format (`1`). + pub api: String, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub side: Option, + #[serde(default, skip_serializing_if = "Vec::is_empty")] + pub capabilities: Vec, + /// The Minecraft version it is for. + pub game: String, + /// A modpack's mods, as its manifest lists them. + #[serde(default, skip_serializing_if = "Vec::is_empty")] + pub requires: Vec, + pub file: File, +} + +#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)] +pub struct Requirement { + pub id: String, + pub version: String, + pub sha256: String, +} + +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +pub struct File { + pub name: String, + pub url: String, + pub size: u64, + /// Lowercase hex. + pub sha256: String, + /// The `.minisig` file's text. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub signature: Option, +} + +/// A file taken down: by hash, or every version of `id` when `sha256` is +/// None. The launcher refuses to install it and turns installed copies off. +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +pub struct Revoked { + pub id: String, + #[serde(default, skip_serializing_if = "Option::is_none")] + pub sha256: Option, + pub reason: String, + #[serde(default)] + pub date: String, +} + +/// How far a checked file is trusted. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Trust { + /// Signed with the project's pinned key. + Verified, + /// The project has no key: only the hash pins it. + Unsigned, +} + +impl Index { + /// Parses and checks an index (see [`Index::check`]). + pub fn parse(text: &str) -> Result { + Self::parse_with(text, false) + } + + /// [`Index::parse`] for a local test registry, whose files may be + /// `file://` paths (trying a registry out before it is published). + pub fn parse_local(text: &str) -> Result { + Self::parse_with(text, true) + } + + fn parse_with(text: &str, local_files: bool) -> Result { + #[derive(Deserialize)] + struct Head { + schema: u32, + } + let head: Head = serde_json::from_str(text).map_err(|e| format!("not a mod index: {e}"))?; + if head.schema > SCHEMA { + return Err(format!( + "the mod index is schema {}; this build reads {SCHEMA}: update Horizon", + head.schema + )); + } + let index: Index = serde_json::from_str(text).map_err(|e| format!("mod index: {e}"))?; + index.check_with(local_files)?; + Ok(index) + } + + /// Every rule a reader relies on: unique valid ids, at least one + /// version each, plain file names with the kind's extension, `https` + /// URLs, hex hashes, keys and signatures that decode, and each + /// modpack's mods present in the index with the same hash. + pub fn check(&self) -> Result<(), String> { + self.check_with(false) + } + + fn check_with(&self, local_files: bool) -> Result<(), String> { + for (i, p) in self.projects.iter().enumerate() { + let at = |e: String| format!("{}: {e}", p.id); + if !valid_id(&p.id) { + return Err(format!("project id {:?} is not [a-z0-9_]{{1,64}}", p.id)); + } + if self.projects[..i].iter().any(|q| q.id == p.id) { + return Err(at("listed twice".into())); + } + if p.name.trim().is_empty() || p.license.trim().is_empty() { + return Err(at("needs a name and a licence".into())); + } + https(&p.source).map_err(at)?; + if let Some(icon) = &p.icon { + https(icon).map_err(at)?; + } + if let Some(key) = &p.key { + minisign_verify::PublicKey::from_base64(key.trim()) + .map_err(|e| at(format!("key: {e}")))?; + } + if p.versions.is_empty() { + return Err(at("has no version".into())); + } + for (j, v) in p.versions.iter().enumerate() { + let at = |e: String| format!("{} {}: {e}", p.id, v.version); + if v.version.trim().is_empty() + || p.versions[..j].iter().any(|w| w.version == v.version) + { + return Err(at("empty or repeated version".into())); + } + let f = &v.file; + let extension_ok = p + .kind + .extension() + .is_none_or(|e| f.name.ends_with(&format!(".{e}"))); + if !plain_name(&f.name) || !extension_ok { + return Err(at(format!( + "{:?} is not a plain file name for a {}", + f.name, + p.kind.name() + ))); + } + if !(local_files && f.url.starts_with("file:///")) { + https(&f.url).map_err(at)?; + } + hex64(&f.sha256).map_err(at)?; + if f.size == 0 || f.size > MAX_FILE { + return Err(at(format!( + "size {} is not 1 byte to {} MiB", + f.size, + MAX_FILE >> 20 + ))); + } + match (&p.key, &f.signature) { + (Some(_), None) => { + return Err(at("unsigned, but the project has a key".into())); + } + (None, Some(_)) => return Err(at("signed, but the project has no key".into())), + (Some(_), Some(sig)) => { + minisign_verify::Signature::decode(sig) + .map_err(|e| at(format!("signature: {e}")))?; + } + (None, None) => {} + } + for r in &v.requires { + let found = self + .project(&r.id) + .and_then(|q| q.versions.iter().find(|w| w.version == r.version)); + match found { + Some(w) if w.file.sha256 == r.sha256 => {} + Some(_) => { + return Err(at(format!( + "{} {}: another file than the index's", + r.id, r.version + ))); + } + None => { + return Err(at(format!( + "needs {} {}, which is not in the index", + r.id, r.version + ))); + } + } + } + } + } + for r in &self.revoked { + if let Some(h) = &r.sha256 { + hex64(h).map_err(|e| format!("revoked {}: {e}", r.id))?; + } + } + Ok(()) + } + + pub fn project(&self, id: &str) -> Option<&Project> { + self.projects.iter().find(|p| p.id == id) + } + + /// Why the file of `id` with this hash was taken down, if it was. + pub fn revoked(&self, id: &str, sha256: &str) -> Option<&Revoked> { + self.revoked.iter().find(|r| { + r.id == id + && r.sha256 + .as_ref() + .is_none_or(|h| h.eq_ignore_ascii_case(sha256)) + }) + } +} + +/// `[a-z0-9_]{1,64}`, the manifests' id rule. +pub fn valid_id(id: &str) -> bool { + (1..=64).contains(&id.len()) + && id + .bytes() + .all(|b| b.is_ascii_lowercase() || b.is_ascii_digit() || b == b'_') +} + +fn https(url: &str) -> Result<(), String> { + match url.strip_prefix("https://") { + Some(rest) if !rest.is_empty() && !url.chars().any(char::is_whitespace) => Ok(()), + _ => Err(format!("{url:?} is not an https:// address")), + } +} + +fn hex64(h: &str) -> Result<(), String> { + if h.len() == 64 + && h.bytes() + .all(|b| b.is_ascii_digit() || (b'a'..=b'f').contains(&b)) + { + Ok(()) + } else { + Err(format!("{h:?} is not a lowercase hex SHA-256")) + } +} + +/// One plain file name: no folder, no hidden file, nothing a file system +/// reads as something else. +fn plain_name(name: &str) -> bool { + !name.is_empty() + && name.len() <= 128 + && !name.starts_with('.') + && name + .bytes() + .all(|b| b.is_ascii_alphanumeric() || b"._-+".contains(&b)) +} + +/// The SHA-256 of a file, lowercase hex. +pub fn sha256_file(path: &Path) -> Result { + let mut file = std::fs::File::open(path).map_err(|e| format!("{}: {e}", path.display()))?; + let mut hasher = Sha256::new(); + let mut buf = vec![0u8; 1 << 16]; + loop { + let n = file.read(&mut buf).map_err(|e| e.to_string())?; + if n == 0 { + break; + } + hasher.update(&buf[..n]); + } + Ok(hex(&hasher.finalize())) +} + +pub fn sha256(bytes: &[u8]) -> String { + hex(&Sha256::digest(bytes)) +} + +fn hex(bytes: &[u8]) -> String { + bytes.iter().map(|b| format!("{b:02x}")).collect() +} + +/// Checks a minisign signature (`.minisig` text) of `path` against `key`. +pub fn verify_signature(key: &str, signature: &str, path: &Path) -> Result<(), String> { + let key = + minisign_verify::PublicKey::from_base64(key.trim()).map_err(|e| format!("key: {e}"))?; + let sig = + minisign_verify::Signature::decode(signature).map_err(|e| format!("signature: {e}"))?; + let file = std::fs::File::open(path).map_err(|e| format!("{}: {e}", path.display()))?; + let mut verifier = key + .verify_stream(&sig) + .map_err(|e| format!("signature: {e}"))?; + let mut reader = std::io::BufReader::new(file); + let mut buf = vec![0u8; 1 << 16]; + loop { + let n = reader.read(&mut buf).map_err(|e| e.to_string())?; + if n == 0 { + break; + } + verifier.update(&buf[..n]); + } + verifier + .finalize() + .map_err(|_| "the signature doesn't match the project's key".to_string()) +} + +/// Checks the file at `path` against its entry before it is installed: +/// size, SHA-256, revocation, signature, and that its manifest says what the +/// index says (id, version, API, side, capabilities; a modpack's mods). +pub fn check_file( + index: &Index, + project: &Project, + version: &Version, + path: &Path, +) -> Result { + let size = std::fs::metadata(path) + .map_err(|e| format!("{}: {e}", path.display()))? + .len(); + if size != version.file.size { + return Err(format!( + "{} bytes, the index lists {}", + size, version.file.size + )); + } + let hash = sha256_file(path)?; + if hash != version.file.sha256 { + return Err("its SHA-256 isn't the one the index lists: nothing was installed".into()); + } + if let Some(r) = index.revoked(&project.id, &hash) { + return Err(format!("{} was taken down: {}", project.name, r.reason)); + } + let trust = match (&project.key, &version.file.signature) { + (Some(key), Some(sig)) => { + verify_signature(key, sig, path)?; + Trust::Verified + } + (None, None) => Trust::Unsigned, + _ => return Err("its signature and the project's key don't go together".into()), + }; + match project.kind { + Kind::Mod => { + let m = Package::read(path)?.manifest; + crate::Content::read(path, &m)?; + let mut caps = m.capabilities.clone(); + caps.sort(); + let mut listed = version.capabilities.clone(); + listed.sort(); + let differs = m.id != project.id + || m.version != version.version + || m.api != version.api + || Some(m.side) != version.side + || caps != listed; + if differs { + return Err(format!( + "its horizon-mod.toml ({} {}, API {}, {:?}, {}) isn't what the index lists", + m.id, + m.version, + m.api, + m.side, + names(&caps) + )); + } + } + Kind::ResourcePack => check_resource_pack(path)?, + Kind::Shader | Kind::Other(_) => { + return Err(format!( + "this Horizon can't install a {} yet", + project.kind.name() + )); + } + Kind::Modpack => { + let pack = Modpack::read(path)?; + let m = &pack.manifest; + let mods: Vec = m.mods.iter().map(modpack::PackMod::requirement).collect(); + if m.id != project.id + || m.version != version.version + || m.format.to_string() != version.api + || m.game != version.game + || mods != version.requires + { + return Err(format!( + "its {} isn't what the index lists", + modpack::MANIFEST + )); + } + } + } + Ok(trust) +} + +/// A resource pack: a zip with `pack.mcmeta` at its root holding a `pack` +/// object, and only plain paths. +fn check_resource_pack(path: &Path) -> Result<(), String> { + let file = std::fs::File::open(path).map_err(|e| format!("{}: {e}", path.display()))?; + let mut zip = zip::ZipArchive::new(file).map_err(|e| e.to_string())?; + for i in 0..zip.len() { + let name = zip + .by_index_raw(i) + .map_err(|e| e.to_string())? + .name() + .to_owned(); + if name.starts_with('/') || name.split('/').any(|part| part == "..") || name.contains('\\') + { + return Err(format!("{name:?} is not a plain path")); + } + } + let mut meta = String::new(); + zip.by_name("pack.mcmeta") + .map_err(|_| "pack.mcmeta: missing".to_string())? + .take(1 << 20) + .read_to_string(&mut meta) + .map_err(|e| format!("pack.mcmeta: {e}"))?; + let json: serde_json::Value = + serde_json::from_str(&meta).map_err(|e| format!("pack.mcmeta: {e}"))?; + if !json["pack"].is_object() { + return Err("pack.mcmeta: no \"pack\" object".into()); + } + Ok(()) +} + +fn names(caps: &[Capability]) -> String { + let names: Vec = caps.iter().map(ToString::to_string).collect(); + format!("[{}]", names.join(", ")) +} + +#[cfg(test)] +mod tests; diff --git a/crates/horizon-mods/src/index/tests.rs b/crates/horizon-mods/src/index/tests.rs new file mode 100644 index 000000000..b6d7f5bfb --- /dev/null +++ b/crates/horizon-mods/src/index/tests.rs @@ -0,0 +1,162 @@ +//! The sample index (`tests/index/index-v1.json`, the one docs/api/mod-index.md +//! shows) and its files: `coords_hud-0.1.0.hmod`, signed with the throwaway +//! key `test.pub` by minisign 0.12 (its secret key was deleted), and +//! `cozy-1.0.0.hpack`, unsigned. +use super::*; +use std::path::PathBuf; + +const OTHER_KEY: &str = "RWSe8ZD+cTOAqNd/jnXTmDtoKp0c0HxkGMrBBWcWQeEkPmcHB+XkaE9S"; + +fn fixtures() -> PathBuf { + Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/index") +} + +fn sample() -> Index { + Index::parse(&std::fs::read_to_string(fixtures().join("index-v1.json")).unwrap()).unwrap() +} + +fn check(index: &Index, id: &str, file: &Path) -> Result { + let p = index.project(id).unwrap(); + check_file(index, p, &p.versions[0], file) +} + +#[test] +fn reads_the_sample_and_keeps_unknown_kinds() { + let index = sample(); + assert_eq!(index.schema, SCHEMA); + let kinds: Vec<&str> = index.projects.iter().map(|p| p.kind.name()).collect(); + assert_eq!(kinds, ["mod", "modpack", "world"]); + assert_eq!(index.projects[2].kind, Kind::Other("world".into())); + let hud = index.project("coords_hud").unwrap(); + assert_eq!( + hud.versions[0].capabilities, + [Capability::GameRead, Capability::Hud, Capability::Chat] + ); + // What CI writes reads back the same. + let again = Index::parse(&serde_json::to_string(&index).unwrap()).unwrap(); + assert_eq!(again, index); +} + +#[test] +fn files_pass_against_their_entries() { + let index = sample(); + let hmod = fixtures().join("coords_hud-0.1.0.hmod"); + assert_eq!(check(&index, "coords_hud", &hmod), Ok(Trust::Verified)); + let hpack = fixtures().join("cozy-1.0.0.hpack"); + assert_eq!(check(&index, "cozy", &hpack), Ok(Trust::Unsigned)); + let world = index.project("skyblock_start").unwrap(); + let e = check_file(&index, world, &world.versions[0], &hpack).unwrap_err(); + assert!(e.contains("bytes"), "{e}"); +} + +#[test] +fn a_changed_file_key_or_manifest_is_refused() { + let index = sample(); + let dir = std::env::temp_dir().join(format!("horizon-index-{}", std::process::id())); + std::fs::create_dir_all(&dir).unwrap(); + let hmod = fixtures().join("coords_hud-0.1.0.hmod"); + let mut bytes = std::fs::read(&hmod).unwrap(); + let last = bytes.len() - 1; + bytes[last] ^= 1; + let tampered = dir.join("coords_hud-0.1.0.hmod"); + std::fs::write(&tampered, &bytes).unwrap(); + let e = check(&index, "coords_hud", &tampered).unwrap_err(); + assert!(e.contains("SHA-256"), "{e}"); + + let mut other_key = index.clone(); + other_key.projects[0].key = Some(OTHER_KEY.into()); + let e = check(&other_key, "coords_hud", &hmod).unwrap_err(); + assert!(e.contains("key"), "{e}"); + + let mut more_caps = index.clone(); + more_caps.projects[0].versions[0].capabilities.pop(); + let e = check(&more_caps, "coords_hud", &hmod).unwrap_err(); + assert!(e.contains("isn't what the index lists"), "{e}"); + + let mut revoked = index.clone(); + revoked.revoked.push(Revoked { + id: "coords_hud".into(), + sha256: None, + reason: "Test.".into(), + date: String::new(), + }); + let e = check(&revoked, "coords_hud", &hmod).unwrap_err(); + assert!(e.contains("taken down: Test."), "{e}"); + std::fs::remove_dir_all(&dir).unwrap(); +} + +#[test] +fn revocations_match_by_hash_or_by_id() { + let index = sample(); + let ones = "1".repeat(64); + assert!(index.revoked("bad_mod", &ones).is_some()); + assert!(index.revoked("bad_mod", &"2".repeat(64)).is_none()); + assert!(index.revoked("coords_hud", &ones).is_none()); +} + +#[test] +fn refuses_broken_indexes() { + let text = std::fs::read_to_string(fixtures().join("index-v1.json")).unwrap(); + let newer = text.replacen("\"schema\": 1", "\"schema\": 2", 1); + assert!(Index::parse(&newer).unwrap_err().contains("schema 2")); + let broken = |edit: &dyn Fn(&mut Index)| { + let mut index = sample(); + edit(&mut index); + index.check().unwrap_err() + }; + let e = broken(&|i| { + let twin = i.projects[0].clone(); + i.projects.push(twin) + }); + assert!(e.contains("listed twice"), "{e}"); + let e = broken(&|i| i.projects[0].versions[0].file.url = "http://example.org/x.hmod".into()); + assert!(e.contains("https"), "{e}"); + // A local test registry may list files on disk; the published one may not. + let local = text.replace( + "https://github.com/ludovic111/horizon-mods/releases/download/coords_hud-0.1.0/", + "file:///tmp/", + ); + assert!(Index::parse(&local).unwrap_err().contains("https")); + assert!(Index::parse_local(&local).is_ok()); + let e = broken(&|i| i.projects[0].versions[0].file.name = "../coords_hud.hmod".into()); + assert!(e.contains("plain file name"), "{e}"); + let e = broken(&|i| i.projects[0].versions[0].file.name = "coords_hud.zip".into()); + assert!(e.contains("plain file name"), "{e}"); + let e = broken(&|i| i.projects[0].versions[0].file.signature = None); + assert!(e.contains("unsigned"), "{e}"); + let e = broken(&|i| i.projects[0].key = Some("not a key".into())); + assert!(e.contains("key"), "{e}"); + let e = broken(&|i| i.projects[1].versions[0].requires[0].version = "9.9".into()); + assert!(e.contains("not in the index"), "{e}"); + let e = broken(&|i| i.projects[1].versions[0].requires[0].sha256 = "2".repeat(64)); + assert!(e.contains("another file"), "{e}"); + let e = broken(&|i| i.projects[0].id = "Coords".into()); + assert!(e.contains("is not"), "{e}"); +} + +#[test] +fn resource_packs_need_a_pack_mcmeta() { + use std::io::Write; + let dir = std::env::temp_dir().join(format!("horizon-index-rp-{}", std::process::id())); + std::fs::create_dir_all(&dir).unwrap(); + let pack = |files: &[(&str, &str)]| { + let path = dir.join("look.zip"); + let mut zip = zip::ZipWriter::new(std::fs::File::create(&path).unwrap()); + for (name, text) in files { + zip.start_file(*name, zip::write::SimpleFileOptions::default()) + .unwrap(); + zip.write_all(text.as_bytes()).unwrap(); + } + zip.finish().unwrap(); + path + }; + let meta = r#"{"pack": {"description": "Look", "min_format": 75, "max_format": 75}}"#; + assert_eq!(check_resource_pack(&pack(&[("pack.mcmeta", meta)])), Ok(())); + let e = check_resource_pack(&pack(&[("assets/x.png", "")])).unwrap_err(); + assert!(e.contains("missing"), "{e}"); + let e = check_resource_pack(&pack(&[("pack.mcmeta", "{}")])).unwrap_err(); + assert!(e.contains("\"pack\""), "{e}"); + let e = check_resource_pack(&pack(&[("pack.mcmeta", meta), ("../x", "")])).unwrap_err(); + assert!(e.contains("plain path"), "{e}"); + std::fs::remove_dir_all(&dir).unwrap(); +} diff --git a/crates/horizon-mods/src/lib.rs b/crates/horizon-mods/src/lib.rs index 5060bf747..17a6c5aa0 100644 --- a/crates/horizon-mods/src/lib.rs +++ b/crates/horizon-mods/src/lib.rs @@ -6,7 +6,10 @@ //! Nothing here runs unless a mod is installed and turned on: an empty //! [`Mods`] makes no engine and every hook returns at once. pub mod content; +#[cfg(feature = "index")] +pub mod index; pub mod manifest; +pub mod modpack; #[cfg(feature = "runtime")] mod runtime; diff --git a/crates/horizon-mods/src/manifest.rs b/crates/horizon-mods/src/manifest.rs index a71210883..3a93b2512 100644 --- a/crates/horizon-mods/src/manifest.rs +++ b/crates/horizon-mods/src/manifest.rs @@ -1,5 +1,5 @@ //! `horizon-mod.toml`, a mod's manifest, and the `.hmod` file around it. -use serde::Deserialize; +use serde::{Deserialize, Serialize}; use std::{ fmt, io::Read, @@ -20,6 +20,9 @@ pub const APIS: [&str; 2] = [API, "0.2"]; /// Namespaces no mod may claim: vanilla's, the convention tags' (mods add /// to those, docs/mods.md) and the game's own. const RESERVED_NAMESPACES: [&str; 3] = ["minecraft", "c", "horizon"]; +/// A mod's data (capability `storage`), in `horizon-mods/` beside the mods +/// (`find` never mistakes it for a mod: it has no manifest). +pub const STORAGE_DIR: &str = ".horizon-mod-data"; /// The biggest `mod.wasm` a mod may ship. const MAX_WASM: u64 = 32 << 20; @@ -48,7 +51,7 @@ pub struct Manifest { pub namespaces: Vec, } -#[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq)] +#[derive(Clone, Copy, Debug, Default, Deserialize, Serialize, PartialEq)] #[serde(rename_all = "lowercase")] pub enum Side { /// Runs in the player's game only (HUD, keys, chat commands). @@ -62,7 +65,7 @@ pub enum Side { /// What a mod may do beyond writing its log. Each is a WIT interface the /// component imports; the player sees them before turning the mod on. -#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord)] +#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord)] #[serde(rename_all = "kebab-case")] pub enum Capability { GameRead, diff --git a/crates/horizon-mods/src/modpack.rs b/crates/horizon-mods/src/modpack.rs new file mode 100644 index 000000000..83c9eef5c --- /dev/null +++ b/crates/horizon-mods/src/modpack.rs @@ -0,0 +1,299 @@ +//! `.hpack`, a Horizon modpack (docs/api/mod-index.md): registry mods +//! played together as a profile. A zip holding `horizon-modpack.toml`, which +//! names each mod by id, version and SHA-256 (the files themselves come from +//! the registry), and optionally `overrides/`: settings and resource packs +//! copied into the profile's game folder. +use crate::manifest::STORAGE_DIR; +use serde::Deserialize; +use std::{ + io::Read, + path::{Path, PathBuf}, +}; + +/// The manifest's file name in a `.hpack`. +pub const MANIFEST: &str = "horizon-modpack.toml"; +/// The manifest formats this build reads. +pub const FORMAT: u32 = 1; +const OVERRIDES: &str = "overrides/"; +/// Bytes per override file and in all, unpacked. +const MAX_OVERRIDE: u64 = 64 << 20; +const MAX_OVERRIDES: u64 = 256 << 20; +/// The settings files an override may replace. +const SETTINGS: [&str; 3] = ["options.txt", "horizon-graphics.txt", "horizon-extras.txt"]; + +#[derive(Clone, Debug, Deserialize, PartialEq)] +#[serde(deny_unknown_fields)] +pub struct Manifest { + pub format: u32, + /// `[a-z0-9_]{1,64}`: its profile's folder. + pub id: String, + pub name: String, + pub version: String, + #[serde(default)] + pub description: String, + #[serde(default)] + pub authors: Vec, + /// The Minecraft version it is for. + pub game: String, + #[serde(default)] + pub mods: Vec, +} + +#[derive(Clone, Debug, Deserialize, PartialEq)] +#[serde(deny_unknown_fields)] +pub struct PackMod { + pub id: String, + pub version: String, + pub sha256: String, + /// Turned on in the profile (`horizon-mods.txt`). + #[serde(default = "on")] + pub on: bool, +} + +fn on() -> bool { + true +} + +#[cfg(feature = "index")] +impl PackMod { + pub fn requirement(&self) -> crate::index::Requirement { + crate::index::Requirement { + id: self.id.clone(), + version: self.version.clone(), + sha256: self.sha256.clone(), + } + } +} + +impl Manifest { + pub fn parse(text: &str) -> Result { + let m: Manifest = toml::from_str(text).map_err(|e| format!("{MANIFEST}: {e}"))?; + if m.format != FORMAT { + return Err(format!( + "{MANIFEST}: format {}; this Horizon reads {FORMAT}", + m.format + )); + } + let id_ok = |id: &str| { + (1..=64).contains(&id.len()) + && id + .bytes() + .all(|b| b.is_ascii_lowercase() || b.is_ascii_digit() || b == b'_') + }; + if !id_ok(&m.id) { + return Err(format!( + "{MANIFEST}: id {:?} is not [a-z0-9_]{{1,64}}", + m.id + )); + } + for (i, pm) in m.mods.iter().enumerate() { + let hex = pm.sha256.len() == 64 + && pm + .sha256 + .bytes() + .all(|b| b.is_ascii_digit() || (b'a'..=b'f').contains(&b)); + if !id_ok(&pm.id) || !hex || pm.version.is_empty() { + return Err(format!( + "{MANIFEST}: mod {:?} needs an id, a version and a lowercase hex sha256", + pm.id + )); + } + if m.mods[..i].iter().any(|other| other.id == pm.id) { + return Err(format!("{MANIFEST}: mod {} is listed twice", pm.id)); + } + } + Ok(m) + } +} + +/// A `.hpack` as read from disk: its manifest and its override files, by +/// path under `overrides/`. +#[derive(Debug)] +pub struct Modpack { + pub manifest: Manifest, + pub overrides: Vec, +} + +impl Modpack { + pub fn read(path: &Path) -> Result { + let file = std::fs::File::open(path).map_err(|e| format!("{}: {e}", path.display()))?; + let mut zip = zip::ZipArchive::new(file).map_err(|e| e.to_string())?; + let mut text = String::new(); + zip.by_name(MANIFEST) + .map_err(|_| format!("{MANIFEST}: missing"))? + .take(1 << 20) + .read_to_string(&mut text) + .map_err(|e| format!("{MANIFEST}: {e}"))?; + let manifest = Manifest::parse(&text)?; + let (mut overrides, mut total) = (Vec::new(), 0u64); + for i in 0..zip.len() { + let entry = zip.by_index_raw(i).map_err(|e| e.to_string())?; + let name = entry.name(); + if name == MANIFEST || entry.is_dir() { + continue; + } + let Some(rest) = name.strip_prefix(OVERRIDES) else { + return Err(format!( + "{name}: a modpack holds only {MANIFEST} and overrides/" + )); + }; + check_override(rest, &manifest)?; + if entry.size() > MAX_OVERRIDE { + return Err(format!("{name} is over {} MiB", MAX_OVERRIDE >> 20)); + } + total += entry.size(); + overrides.push(rest.to_owned()); + } + if total > MAX_OVERRIDES { + return Err(format!("overrides are over {} MiB", MAX_OVERRIDES >> 20)); + } + overrides.sort(); + Ok(Modpack { + manifest, + overrides, + }) + } + + /// Writes the overrides of the pack at `path` into the game folder + /// `home`, each checked again. + pub fn extract_overrides(path: &Path, home: &Path) -> Result, String> { + let pack = Modpack::read(path)?; + let file = std::fs::File::open(path).map_err(|e| format!("{}: {e}", path.display()))?; + let mut zip = zip::ZipArchive::new(file).map_err(|e| e.to_string())?; + let mut written = Vec::new(); + for name in &pack.overrides { + let mut entry = zip + .by_name(&format!("{OVERRIDES}{name}")) + .map_err(|e| format!("{name}: {e}"))?; + let target = home.join(name); + if let Some(dir) = target.parent() { + std::fs::create_dir_all(dir).map_err(|e| format!("{}: {e}", dir.display()))?; + } + let mut out = + std::fs::File::create(&target).map_err(|e| format!("{}: {e}", target.display()))?; + std::io::copy(&mut (&mut entry).take(MAX_OVERRIDE), &mut out) + .map_err(|e| format!("{}: {e}", target.display()))?; + written.push(target); + } + Ok(written) + } +} + +/// An override's path under `overrides/`: a settings file, a resource pack +/// zip, or the stored settings of one of the pack's mods. Plain parts only. +fn check_override(path: &str, manifest: &Manifest) -> Result<(), String> { + let bad = || { + format!( + "overrides/{path}: only {}, resourcepacks/.zip and horizon-mods/{STORAGE_DIR}// may be overridden", + SETTINGS.join(", ") + ) + }; + let parts: Vec<&str> = path.split('/').collect(); + let plain = |p: &&str| { + !p.is_empty() + && !p.starts_with('.') + && p.bytes() + .all(|b| b.is_ascii_alphanumeric() || b"._-+ ".contains(&b)) + }; + let ok = match parts.as_slice() { + [file] => SETTINGS.contains(file), + ["resourcepacks", name] => plain(name) && name.ends_with(".zip"), + ["horizon-mods", dir, id, rest @ ..] => { + *dir == STORAGE_DIR + && manifest.mods.iter().any(|m| m.id == *id) + && !rest.is_empty() + && rest.iter().all(plain) + } + _ => false, + }; + if ok { Ok(()) } else { Err(bad()) } +} + +#[cfg(test)] +mod tests { + use super::*; + use std::io::Write; + + const PACK: &str = r#" +format = 1 +id = "cozy" +name = "Cozy" +version = "1.0.0" +game = "26.3" +[[mods]] +id = "coords_hud" +version = "0.1.0" +sha256 = "0000000000000000000000000000000000000000000000000000000000000000" +"#; + + fn write_pack(dir: &Path, manifest: &str, files: &[(&str, &[u8])]) -> PathBuf { + let path = dir.join("cozy.hpack"); + let mut zip = zip::ZipWriter::new(std::fs::File::create(&path).unwrap()); + let options = zip::write::SimpleFileOptions::default(); + zip.start_file(MANIFEST, options).unwrap(); + zip.write_all(manifest.as_bytes()).unwrap(); + for (name, bytes) in files { + zip.start_file(*name, options).unwrap(); + zip.write_all(bytes).unwrap(); + } + zip.finish().unwrap(); + path + } + + fn scratch(name: &str) -> PathBuf { + let dir = std::env::temp_dir().join(format!("horizon-hpack-{name}-{}", std::process::id())); + let _ = std::fs::remove_dir_all(&dir); + std::fs::create_dir_all(&dir).unwrap(); + dir + } + + #[test] + fn reads_a_pack_and_writes_its_overrides() { + let dir = scratch("read"); + let storage = format!("overrides/horizon-mods/{STORAGE_DIR}/coords_hud/corner.txt"); + let path = write_pack( + &dir, + PACK, + &[ + ("overrides/options.txt", b"renderDistance:8\n"), + ("overrides/resourcepacks/Cozy Look.zip", b"zip"), + (&storage, b"top-left"), + ], + ); + let pack = Modpack::read(&path).unwrap(); + assert_eq!(pack.manifest.mods[0].id, "coords_hud"); + assert!(pack.manifest.mods[0].on); + assert_eq!(pack.overrides.len(), 3); + let home = dir.join("home"); + Modpack::extract_overrides(&path, &home).unwrap(); + let options = std::fs::read_to_string(home.join("options.txt")).unwrap(); + assert_eq!(options, "renderDistance:8\n"); + let corner = home.join(format!("horizon-mods/{STORAGE_DIR}/coords_hud/corner.txt")); + assert!(corner.is_file()); + std::fs::remove_dir_all(&dir).unwrap(); + } + + #[test] + fn refuses_what_a_pack_may_not_hold() { + let dir = scratch("refuse"); + for name in [ + "mods/evil.jar", + "overrides/../../.bashrc", + "overrides/horizon-mods/evil.hmod", + "overrides/resourcepacks/../options.txt", + "overrides/servers.dat", + "overrides/horizon-mods/.horizon-mod-data/other_mod/x", + "overrides/resourcepacks/.hidden.zip", + ] { + let path = write_pack(&dir, PACK, &[(name, b"x")]); + assert!(Modpack::read(&path).is_err(), "{name} was accepted"); + } + let twice = format!("{PACK}{}", &PACK[PACK.find("[[mods]]").unwrap()..]); + assert!(Manifest::parse(&twice).unwrap_err().contains("twice")); + let newer = PACK.replace("format = 1", "format = 2"); + assert!(Manifest::parse(&newer).unwrap_err().contains("format 2")); + let short = PACK.replace("0000000000000000", "00"); + assert!(Manifest::parse(&short).is_err()); + std::fs::remove_dir_all(&dir).unwrap(); + } +} diff --git a/crates/horizon-mods/src/runtime.rs b/crates/horizon-mods/src/runtime.rs index 9dd2eb54e..52da641b4 100644 --- a/crates/horizon-mods/src/runtime.rs +++ b/crates/horizon-mods/src/runtime.rs @@ -49,9 +49,6 @@ const STORAGE_MAX_KEYS: usize = 64; /// a cheap-in-fuel loop replacing one key with large payloads needs its own /// cap, separate from the on-disk quota it would otherwise stay under. const STORAGE_WRITE_BUDGET: u64 = 1 << 20; -/// A mod's data, beside its `horizon-mods` folder (`find`'s `path.parent()` -/// never has a manifest there, so `find` never mistakes it for a mod). -const STORAGE_DIR: &str = ".horizon-mod-data"; /// What mods may read of the game, copied once per tick by the game. #[derive(Clone, Debug, Default)] @@ -237,7 +234,7 @@ impl Mods { let data_dir = path .parent() .unwrap_or(Path::new(".")) - .join(STORAGE_DIR) + .join(crate::manifest::STORAGE_DIR) .join(&m.id); let state = State { name: m.name.clone(), diff --git a/crates/horizon-mods/tests/index/coords_hud-0.1.0.hmod b/crates/horizon-mods/tests/index/coords_hud-0.1.0.hmod new file mode 100644 index 0000000000000000000000000000000000000000..1a4a5ba35e922e3837f43a4c85ae532885f95956 GIT binary patch literal 438 zcmWIWW@Zs#U|`??Vnqg{g-3vzl6r(a7JuqU{R$1LbxwMuKUL{jDkW%b}I^Y(EnZ0!2-=l}P9)q{Knvnp5Juk@9e zqGxlX&LA)==HZ8bZ4cY`cDlZZ|~@Tc;v&WexPvjzn;Ig z&*cM9{C>{ZTZRi75}?ok`MEr?I5*it=Ui$^LIMLrfHxzP2s7@`0%`(-24Lu6h8?FzzT36_V0ctN$u+$EayiFBiS(Qnx9%$Lz5emRdaZeBKlskns86f<A=Xu84Z|kN9Oh8i@ ynM9azhaS)KywhREqEtx6+ literal 0 HcmV?d00001 diff --git a/crates/horizon-mods/tests/index/index-v1.json b/crates/horizon-mods/tests/index/index-v1.json new file mode 100644 index 000000000..215c94667 --- /dev/null +++ b/crates/horizon-mods/tests/index/index-v1.json @@ -0,0 +1,109 @@ +{ + "schema": 1, + "generated": "2026-10-24T18:00:00Z", + "projects": [ + { + "id": "coords_hud", + "kind": "mod", + "name": "Coordinates HUD", + "summary": "Your coordinates, facing and the time of day in a corner of the screen.", + "description": "`/where` puts them in chat, `/coords` hides or shows the panel.", + "authors": [ + "Horizon" + ], + "owners": [ + "ludovic111" + ], + "license": "MIT", + "source": "https://github.com/ludovic111/horizon/tree/main/crates/horizon-mod-sdk/examples/coords-hud", + "icon": "https://ludovic111.github.io/horizon-mods/icons/coords_hud.png", + "key": "RWTVtuGb/GRXcBf3Re5hzM07EzoStr2sLTJjghJia0xX15ULoZRFFZDb", + "versions": [ + { + "version": "0.1.0", + "published": "2026-10-24", + "api": "0.1", + "side": "client", + "capabilities": [ + "game-read", + "hud", + "chat" + ], + "game": "26.3", + "file": { + "name": "coords_hud-0.1.0.hmod", + "url": "https://github.com/ludovic111/horizon-mods/releases/download/coords_hud-0.1.0/coords_hud-0.1.0.hmod", + "size": 438, + "sha256": "e1135345692f6dd8fd4c51920151944b82333e17049c9bb7d756f27b8deefc53", + "signature": "untrusted comment: signature from minisign secret key\nRUTVtuGb/GRXcIa5yCyCHFGFt55tj3T/FLUDv3ecNLVNNiQqQu7xyBrfc3wsvMHmudsEq6yr+QF21XN3+hnr/Ged3ULr5rv3zgE=\ntrusted comment: coords_hud 0.1.0\nIESQkJdTzLOvWegcGFxOMrQbnwJp2OKSSxoCKAxdfwyRb+9atdF+Q5/OpbdYurMnrNN1X1ybb43AszPVecdiCw==\n" + } + } + ] + }, + { + "id": "cozy", + "kind": "modpack", + "name": "Cozy", + "summary": "Coordinates and a calm render distance.", + "authors": [ + "Horizon" + ], + "owners": [ + "ludovic111" + ], + "license": "MIT", + "source": "https://github.com/ludovic111/horizon-mods", + "versions": [ + { + "version": "1.0.0", + "published": "2026-10-24", + "api": "1", + "game": "26.3", + "requires": [ + { + "id": "coords_hud", + "version": "0.1.0", + "sha256": "e1135345692f6dd8fd4c51920151944b82333e17049c9bb7d756f27b8deefc53" + } + ], + "file": { + "name": "cozy-1.0.0.hpack", + "url": "https://github.com/ludovic111/horizon-mods/releases/download/cozy-1.0.0/cozy-1.0.0.hpack", + "size": 471, + "sha256": "241ac840f9c5ea3f6252d849da10c90d36cb1da4d6cd8d1d268c2760a353cd65" + } + } + ] + }, + { + "id": "skyblock_start", + "kind": "world", + "name": "Skyblock start", + "summary": "A kind this reader doesn't know yet: kept, not offered.", + "license": "CC0-1.0", + "source": "https://example.org/skyblock", + "future_field": true, + "versions": [ + { + "version": "1", + "api": "1", + "game": "26.3", + "file": { + "name": "skyblock.hworld", + "url": "https://example.org/skyblock.hworld", + "size": 1, + "sha256": "0000000000000000000000000000000000000000000000000000000000000000" + } + } + ] + } + ], + "revoked": [ + { + "id": "bad_mod", + "sha256": "1111111111111111111111111111111111111111111111111111111111111111", + "reason": "Sent chat messages it didn't declare.", + "date": "2026-10-24" + } + ] +} diff --git a/crates/horizon-mods/tests/index/test.pub b/crates/horizon-mods/tests/index/test.pub new file mode 100644 index 000000000..5cb41bd62 --- /dev/null +++ b/crates/horizon-mods/tests/index/test.pub @@ -0,0 +1,2 @@ +untrusted comment: minisign public key 705764FC9BE1B6D5 +RWTVtuGb/GRXcBf3Re5hzM07EzoStr2sLTJjghJia0xX15ULoZRFFZDb diff --git a/docs/api/mod-index.md b/docs/api/mod-index.md new file mode 100644 index 000000000..959b969fb --- /dev/null +++ b/docs/api/mod-index.md @@ -0,0 +1,95 @@ +# The registry index and `.hpack` + +Horizon's registry lists what is made for Horizon and reviewed: mods (`.hmod`), modpacks (`.hpack`), resource packs +and, once their format exists, Horizon shader packs. Submissions are pull requests in +[ludovic111/horizon-mods](https://github.com/ludovic111/horizon-mods); merging one publishes it. The launcher and the +website read one file, `index.json`, which that repository's CI builds. The Rust types and every check below are +`horizon_mods::index` and `horizon_mods::modpack` (feature `index`); the sample is +`crates/horizon-mods/tests/index/index-v1.json`, read by the tests with the files it lists. + +Level: preview ([stability.md](stability.md)). Schema 1. + +## `index.json` + +```json +{ + "schema": 1, + "generated": "2026-10-24T18:00:00Z", + "projects": [{ + "id": "coords_hud", "kind": "mod", "name": "Coordinates HUD", "summary": "One line.", + "description": "Markdown.", "authors": ["Horizon"], "owners": ["ludovic111"], + "license": "MIT", "source": "https://github.com/...", "icon": "https://...png", "key": "RWT...", + "versions": [{ + "version": "0.1.0", "published": "2026-10-24", "changelog": "", + "api": "0.1", "side": "client", "capabilities": ["game-read", "hud", "chat"], "game": "26.3", + "file": { "name": "coords_hud-0.1.0.hmod", "url": "https://github.com/ludovic111/horizon-mods/releases/download/...", + "size": 438, "sha256": "e113...", "signature": "untrusted comment: ...\n...\ntrusted comment: ...\n...\n" } + }] + }], + "revoked": [{ "id": "bad_mod", "sha256": "1111...", "reason": "Sent chat messages it didn't declare.", "date": "2026-10-24" }] +} +``` + +| Field | Meaning | +| --- | --- | +| `schema` | 1. A reader refuses a higher number with "update Horizon" rather than misread it. | +| `projects[].id` | `[a-z0-9_]{1,64}`, unique; a mod's is its manifest's `id`. | +| `kind` | `mod`, `modpack`, `resourcepack`, `shader` (Horizon's own shader packs, not Iris or OptiFine packs). Other kinds (data packs, worlds, themes) may come without a new schema: a reader keeps a kind it doesn't know and doesn't offer it. | +| `summary`, `description` | One line for lists; Markdown for the project's page. | +| `owners` | GitHub logins allowed to publish updates. | +| `license`, `source` | An SPDX expression and an `https://` address of the source code: both required. | +| `icon` | `https://`, optional. | +| `key` | The author's [minisign](https://jedisct1.github.io/minisign/) public key. When set, every version must be signed with it; an update signed with another key is refused. Absent: the project is unsigned and the launcher says so. | +| `versions` | Newest first, at least one. | +| `api` | A mod's API line (its manifest's `api`); a modpack's manifest format (`1`). | +| `side`, `capabilities` | A mod's, read from its manifest by CI, never typed by hand. | +| `game` | The Minecraft version it is for. | +| `requires` | A modpack's mods: `{ id, version, sha256 }`, each a version in this index with that hash. | +| `file` | A plain name with the kind's extension (`.hmod`, `.hpack`, `.zip`), an `https://` URL, the size (at most 64 MiB), the lowercase hex SHA-256, and the `.minisig` text when the project has a key. | +| `revoked` | Files taken down: one file by `sha256`, or every version of `id` without it. The launcher refuses to install them and turns installed copies off with the reason. | + +Readers ignore fields they don't know, so an optional field can be added to schema 1. Renaming or removing a field, or +changing what one means, makes schema 2. + +## Before a file is installed + +`index::check_file` runs on the downloaded file, before it reaches the game folder: + +1. Its size and SHA-256 are the ones the entry lists, and it isn't revoked. +2. With a project key: its signature verifies with that key (minisign's prehashed and legacy signatures both). +3. What the file says matches the entry: a mod's `horizon-mod.toml` (id, version, API, side, capabilities) and its + content's fence ([mods.md](../mods.md#content-mods-api-02)); a modpack's manifest (id, version, format, game, + mods); a resource pack's `pack.mcmeta`. +4. A kind this build can't install is refused with "this Horizon can't install a … yet". + +The game still checks a mod's component imports against its capabilities when it starts it, as for any mod. + +## `.hpack` + +A zip holding `horizon-modpack.toml` and, optionally, `overrides/`. The mods are not inside: the launcher downloads +each from the index and checks it as above. + +```toml +format = 1 +id = "cozy" # [a-z0-9_]{1,64}: the profile's folder +name = "Cozy" +version = "1.0.0" +description = "Coordinates and a calm render distance." +authors = ["Horizon"] +game = "26.3" + +[[mods]] +id = "coords_hud" +version = "0.1.0" +sha256 = "e1135345692f6dd8fd4c51920151944b82333e17049c9bb7d756f27b8deefc53" +on = true # optional, default true: turned on in the profile's horizon-mods.txt +``` + +Unknown keys are refused. `overrides/` may hold only `options.txt`, `horizon-graphics.txt`, `horizon-extras.txt`, +`resourcepacks/.zip` and `horizon-mods/.horizon-mod-data//...` (a mod's own saved settings, +capability `storage`), each at most 64 MiB and 256 MiB in all; anything else refuses the pack. The launcher copies +them into the profile's game folder. + +## Changelog + +- Schema 1 (2026-10-24): kinds `mod`, `modpack`, `resourcepack`, `shader`; `.hpack` format 1. diff --git a/docs/mods.md b/docs/mods.md index 94abfd636..6f3216d38 100644 --- a/docs/mods.md +++ b/docs/mods.md @@ -19,7 +19,8 @@ folder, loads no runtime and plays exactly like vanilla 26.3. | Authoring tool | `crates/cargo-horizon-mod` | `cargo horizon-mod new / build / run` | | In the game | `crates/horizon-client/src/game/mods.rs`, Options > Mods | client mods | | Launcher mod browser (Modrinth, CurseForge with a key) | [mod-browser.md](mod-browser.md) | resource packs, modpacks | -| `.hmod` index, signing, server mods, registries | this page, [Roadmap](#roadmap) | planned | +| Registry index (`index.json`, `.hpack`), signatures | `horizon_mods::index`, [api/mod-index.md](api/mod-index.md) | schema 1; launcher and website next | +| Server mods, registries | this page, [Roadmap](#roadmap) | planned | ## Design goals From be34f4cd5f1db4dc36eb44d92d0fccfdfd9afd54 Mon Sep 17 00:00:00 2001 From: some-du6e <103129948+some-du6e@users.noreply.github.com> Date: Sat, 24 Oct 2026 12:20:35 -0600 Subject: [PATCH 048/140] Connect to a server's IPv4 address first, as vanilla does Vanilla resolves a server with InetAddress.getByName, and Java's default (java.net.preferIPv6Addresses=false) puts IPv4 addresses first. Horizon tried addresses in the system resolver's order, which on macOS puts IPv6 first: a server whose IPv6 address resets the connection showed "Connection reset by peer (os error 54)" where vanilla joined. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-protocol/src/connection.rs | 39 ++++++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/crates/horizon-protocol/src/connection.rs b/crates/horizon-protocol/src/connection.rs index 8f7ae28cc..e7d465288 100644 --- a/crates/horizon-protocol/src/connection.rs +++ b/crates/horizon-protocol/src/connection.rs @@ -6,7 +6,7 @@ use crate::{Error, Result, buf::Reader, crypto::Cfb8, frame}; use std::{ io::{Read, Write}, - net::{Shutdown, TcpStream, ToSocketAddrs}, + net::{Shutdown, SocketAddr, TcpStream, ToSocketAddrs}, sync::{ Arc, Condvar, Mutex, atomic::{AtomicI64, Ordering}, @@ -180,6 +180,13 @@ pub struct ConnWriter { pub threshold: Option, counters: Arc, } +/// InetAddress.getByName with Java's default `java.net.preferIPv6Addresses=false`: IPv4 addresses +/// first, whatever order the system resolver gives (macOS puts IPv6 first). A server whose IPv6 +/// address doesn't answer the game still lets vanilla in over IPv4. +fn ipv4_first(mut addrs: Vec) -> Vec { + addrs.sort_by_key(SocketAddr::is_ipv6); + addrs +} /// Both halves before the split. pub struct Connection { pub reader: ConnReader, @@ -187,10 +194,12 @@ pub struct Connection { } impl Connection { pub fn connect(host: &str, port: u16, timeout: Duration) -> Result { - let addrs: Vec<_> = (host, port) - .to_socket_addrs() - .map_err(|e| Error::new(format!("Unknown host {host}: {e}")))? - .collect(); + let addrs = ipv4_first( + (host, port) + .to_socket_addrs() + .map_err(|e| Error::new(format!("Unknown host {host}: {e}")))? + .collect(), + ); let mut last = Error::new(format!("Unknown host {host}")); for addr in addrs { match TcpStream::connect_timeout(&addr, timeout) { @@ -315,6 +324,26 @@ mod tests { use super::*; use std::net::TcpListener; + #[test] + fn ipv4_addresses_come_first_in_resolver_order() { + let a = |s: &str| s.parse::().unwrap(); + let resolved = vec![ + a("[2001:db8::1]:25565"), + a("192.0.2.1:25565"), + a("[2001:db8::2]:25565"), + a("10.0.0.1:25565"), + ]; + assert_eq!( + ipv4_first(resolved), + [ + a("192.0.2.1:25565"), + a("10.0.0.1:25565"), + a("[2001:db8::1]:25565"), + a("[2001:db8::2]:25565"), + ] + ); + } + #[test] fn loopback_with_compression_and_encryption() { let listener = TcpListener::bind("127.0.0.1:0").unwrap(); From 0849283a9da0b3f3178a45c29d50ecec97d381c6 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:04:59 +0200 Subject: [PATCH 049/140] Pause: drop the state-packet gates, Game::tick doesn't run while paused The frame loop skips Game::tick while the game is paused, so these never fired; the server thread's paused pass is what moved the player on. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/remote.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index f8ffd6772..32cffa306 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3109,7 +3109,6 @@ impl Game<'_> { // must continue, as well as moves into the unloaded area. if let Some(r) = self.remote.as_ref() && r.loaded_sent - && !self.pause { let input = r.last_input; self.remote_send_state(input); @@ -3241,9 +3240,7 @@ impl Game<'_> { data: 0, })); } - if !self.pause { - self.remote_send_state(input); - } + self.remote_send_state(input); Ok(()) } From cb1c9e6935708a1eb4084ef57a95bf0c50e40b37 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:09:48 +0200 Subject: [PATCH 050/140] Parity: a pass trims only its own .local directory decorated_region compiles its oracle into chunk-generation-parity; when it passed while chunk_generation was still running, the trim deleted chunk_generation's dumps mid-run (FileNotFoundError on *-987654321987-full.txt in CI on #1569, #1571 and #1584). Co-Authored-By: Claude Opus 5.5 --- tests/test_parity_runner.py | 17 +++++++++++++++++ tools/parity.py | 5 ++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/test_parity_runner.py b/tests/test_parity_runner.py index eac664c89..d10fde854 100644 --- a/tests/test_parity_runner.py +++ b/tests/test_parity_runner.py @@ -283,3 +283,20 @@ class OracleReuseTests(unittest.TestCase): if __name__ == "__main__": unittest.main() + + +class LargeOutputTests(unittest.TestCase): + def test_a_pass_clears_only_its_own_directory(self): + with tempfile.TemporaryDirectory() as tmp: + local, state = Path(tmp) / ".local", Path(tmp) / "state" + own, shared = local / "decorated-region-parity", local / "chunk-generation-parity" + for directory in (own, shared): + directory.mkdir(parents=True) + (directory / "dump.txt").write_bytes(b"x" * 16) + trace = {"commands": [["java", "-d", str(shared / "classes")], ["probe", str(own / "dump.txt")]]} + with mock.patch.multiple(parity, LOCAL=local, STATE_DIR=state, LARGE_OUTPUT=8): + parity.outputs_listing("decorated_region", fresh=True) + parity.clear_large_outputs("decorated_region", trace) + self.assertFalse((own / "dump.txt").exists()) + # chunk_generation may still be writing there. + self.assertTrue((shared / "dump.txt").exists()) diff --git a/tools/parity.py b/tools/parity.py index 4ed75f5ef..2422a7049 100644 --- a/tools/parity.py +++ b/tools/parity.py @@ -679,7 +679,10 @@ def clear_large_outputs(name, trace): top = path.relative_to(local).parts[0] except (ValueError, IndexError): continue - if top not in OWN_DIRECTORIES: + # Only the harness's own directory: another harness running beside it may be writing + # large files in a directory this one merely read (decorated_region compiles its oracle + # into chunk-generation-parity while chunk_generation writes its dumps there). + if top not in OWN_DIRECTORIES and top.startswith(name.replace("_", "-")): directories.add(local / top) for directory in directories: for file in (directory.rglob("*") if directory.is_dir() else []): From 2716ad41bed4da8f7ac71e7a5bfe482cfc93881e Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:16:05 +0200 Subject: [PATCH 051/140] Renderer: Metal's flat draws and occlusion culling switch on by sections in view Both switched on past 4,096 section draws, measured when a section had 2.2 to 2.5 draws. A section's draw count now depends on the sides it shows the eye, so the bars count sections in view: 1,600, where 4,096 draws fell. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/gfx.rs | 8 +++++--- crates/horizon-client/src/gfx/cull.rs | 22 ++++++++++++---------- crates/horizon-client/src/gfx/flat.rs | 22 ++++++++++++---------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/crates/horizon-client/src/gfx.rs b/crates/horizon-client/src/gfx.rs index e4c3367f9..a848d36a5 100644 --- a/crates/horizon-client/src/gfx.rs +++ b/crates/horizon-client/src/gfx.rs @@ -2159,7 +2159,7 @@ impl Renderer { cull::Cull::new(&device, config.format.remove_srgb_suffix(), depth_test); cull.always = cull_env.as_deref() == Ok("all"); if !cull.always && adapter.get_info().backend == wgpu::Backend::Metal { - cull.min_draws = cull::TILED_MIN_DRAWS; + cull.min_sections = cull::TILED_MIN_SECTIONS; } cull }); @@ -3131,7 +3131,7 @@ impl Renderer { .cull .as_mut() .filter(|c| { - self.cull_on && !frame.title && self.multi_draw && self.section_draws >= c.min_draws + self.cull_on && !frame.title && self.multi_draw && visible.len() >= c.min_sections }) .and_then(|cull| cull.begin(&self.device).then_some(cull)); self.phase2_draws.clear(); @@ -3533,7 +3533,9 @@ impl Renderer { } let flat_frame = match &mut self.flat { Some(flat) - if self.flat_on && !self.draws.is_empty() && self.draws.len() >= flat.min_draws => + if self.flat_on + && !self.draws.is_empty() + && self.drawn_sections >= flat.min_sections => { let sections = &self.sections; let lods = &self.lods; diff --git a/crates/horizon-client/src/gfx/cull.rs b/crates/horizon-client/src/gfx/cull.rs index 856bd86dd..449401b96 100644 --- a/crates/horizon-client/src/gfx/cull.rs +++ b/crates/horizon-client/src/gfx/cull.rs @@ -46,13 +46,15 @@ const RETEST: u32 = 8; /// more than they save. Else one frame in `PROBE` tests every section. const MIN_SHARE: f32 = 0.1; const PROBE: u32 = 64; -/// On Metal, section draws from which a frame culls. Apple's GPUs store and -/// reload the whole frame at each of the passes the test adds, a fixed cost -/// that the sections it hides repay only at high render distances: on an M4 -/// Pro at 1080p and render distance 12 (1,000–1,600 draws) culling added -/// about 0.05 ms of GPU time while hiding 15–30% of the solid indices; at -/// 32 (drawn flat, over this many draws) it saved 0.25–1.6 ms. -pub const TILED_MIN_DRAWS: usize = 4096; +/// On Metal, sections in view from which a frame culls. Apple's GPUs store +/// and reload the whole frame at each of the passes the test adds, a fixed +/// cost that the sections it hides repay only at high render distances: on +/// an M4 Pro at 1080p and render distance 12 (1,000–1,600 draws) culling +/// added about 0.05 ms of GPU time while hiding 15–30% of the solid +/// indices; at 32 (over 4,096 draws) it saved 0.25–1.6 ms. Those draws were +/// 2.2 to 2.5 per section; a section's draw count now depends on the sides +/// it shows the eye (`mesher::Sides`), so the bar counts sections. +pub const TILED_MIN_SECTIONS: usize = 1600; /// Boxes over more than this share of the screen count as seen untested. const BIG: f32 = 0.25; /// Results read back at once, some frames late so the CPU never waits. @@ -148,8 +150,8 @@ pub struct Cull { pub hidden: ([usize; 2], f32), /// Cull every frame, whatever the hidden share (A/B checks). pub always: bool, - /// Frames with fewer section draws than this do not cull. - pub min_draws: usize, + /// Frames with fewer sections in view than this do not cull. + pub min_sections: usize, } fn buffer( @@ -348,7 +350,7 @@ impl Cull { stamp: 0, hidden: ([0; 2], 1.0), always: false, - min_draws: 0, + min_sections: 0, } } diff --git a/crates/horizon-client/src/gfx/flat.rs b/crates/horizon-client/src/gfx/flat.rs index f6823c5d8..ea6df0d5b 100644 --- a/crates/horizon-client/src/gfx/flat.rs +++ b/crates/horizon-client/src/gfx/flat.rs @@ -96,17 +96,19 @@ pub struct Flat { pub calls: Vec, pub phase1_calls: usize, pub solid_calls: usize, - /// Frames with fewer section draws keep the per-section draws. - pub min_draws: usize, + /// Frames with fewer sections in view keep the per-section draws. + pub min_sections: usize, range_align: u64, } -/// Section draws from which a frame is drawn flat. Below it the index list -/// costs the GPU more than the draw calls cost the CPU: on an M4 Pro at -/// render distance 16 (2,900 draws) the copy and the list add about 0.4 ms -/// of GPU time for 0.5–0.8 ms less CPU time; at 32 (9,300 draws) the CPU -/// saves 1.3 ms. -const MIN_DRAWS: usize = 4096; +/// Sections in view (and distant tiles) from which a frame is drawn flat. +/// Below it the index list costs the GPU more than the draw calls cost the +/// CPU: on an M4 Pro at render distance 16 (2,900 draws) the copy and the +/// list add about 0.4 ms of GPU time for 0.5–0.8 ms less CPU time; at 32 +/// (9,300 draws) the CPU saves 1.3 ms. The bar was 4,096 draws when they +/// were 2.2 to 2.5 per section; a section's draw count now depends on the +/// sides it shows the eye (`mesher::Sides`), so it counts sections. +const MIN_SECTIONS: usize = 1600; /// Whether flat draws apply: the backend emulates multi-draw, and vertex /// shaders can read storage buffers large enough for an index page. @@ -337,10 +339,10 @@ impl Flat { calls: Vec::new(), phase1_calls: 0, solid_calls: 0, - min_draws: if std::env::var("HORIZON_FLAT_DRAWS").as_deref() == Ok("1") { + min_sections: if std::env::var("HORIZON_FLAT_DRAWS").as_deref() == Ok("1") { 0 } else { - MIN_DRAWS + MIN_SECTIONS }, range_align: (u64::from(device.limits().min_storage_buffer_offset_alignment) / 16) .max(1), From d604409be256d03a861b94080cba657714d734e7 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 22:44:53 +0200 Subject: [PATCH 052/140] A client's own fall no longer hurts it: the server's hurt starts the tilt As a client (multiplayer, a LAN guest, single player on its server thread) Horizon ran its own fall damage, fire, freezing, berry bushes and starvation through the local hurt, so the camera's hurt tilt started even when the server cancelled the damage (lobbies that turn fall damage off). Vanilla's client never hurts itself: Entity.hurt does nothing outside a ServerLevel and FoodData.tick is ServerPlayer's. Its hurt animation comes from the server: LocalPlayer.hurtTo on a health drop, and ClientboundDamageEventPacket / ClientboundHurtAnimationPacket for itself. - PlayerMotion.client_side: hurt_blocking and food_tick do nothing; landing sounds and fall-distance tracking still run. - remote: SetHealth flashes on a drop after the first health, and the player's own damage events and hurt animations restart its hurt time. - horizon-ctl state reports the player's hurt_time. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/agent.rs | 2 + crates/horizon-client/src/game/remote.rs | 28 ++++++++++-- crates/horizon-client/src/health.rs | 19 ++++++++ crates/horizon-client/src/hunger.rs | 3 ++ crates/horizon-client/src/motion.rs | 57 ++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 4 deletions(-) diff --git a/crates/horizon-client/src/game/agent.rs b/crates/horizon-client/src/game/agent.rs index 0eb215aa9..f6b68aa74 100644 --- a/crates/horizon-client/src/game/agent.rs +++ b/crates/horizon-client/src/game/agent.rs @@ -472,6 +472,8 @@ impl Game<'_> { "sprinting": self.keys.contains(&KeyCode::ControlLeft), "health": p.health.health(), "absorption": p.health.absorption(), + // The hurt animation's ticks left (the camera's hurt tilt). + "hurt_time": p.health.hurt_animation_time, "air": p.air, "food": p.health.food.food, "saturation": p.health.food.saturation, diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 32cffa306..4efbedd9f 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -143,6 +143,9 @@ pub(super) struct Remote { /// Item entities waiting for their item data. pending_items: HashMap, health: (f32, i32, f32), + /// `LocalPlayer.flashOnSetHealth`: set by the first health the server + /// sends; from then on a drop starts the hurt animation. + flash_on_set_health: bool, game_mode: i32, pub chat: Vec<(String, Instant)>, /// Lines received since joining, for the control socket's events. @@ -411,6 +414,7 @@ impl Game<'_> { head_lerps: HashMap::new(), pending_items: HashMap::new(), health: (20.0, 20, 5.0), + flash_on_set_health: false, game_mode: 0, chat: Vec::new(), chat_received: 0, @@ -2128,14 +2132,24 @@ impl Game<'_> { // ClientPacketListener.handleDamageEvent: LivingEntity.handleDamageEvent // jolts the walk animation and restarts the hurt flash. Its hurt // sound comes as a sound from Horizon's host, which plays it itself. + // This player's own hurt tilt and flash come from the server too + // (sent to the player itself): its own moves never hurt it. C::DamageEvent(p) => { - if let Some(m) = self.mobs.iter_mut().find(|m| m.id == p.id as u32) { + if self.remote.as_ref().is_some_and(|r| r.entity_id == p.id) { + if let Some(pl) = self.player.as_mut() { + pl.health.animate_hurt(); + } + } else if let Some(m) = self.mobs.iter_mut().find(|m| m.id == p.id as u32) { m.limb_speed = 1.5; m.hurt_time = 10; } } C::HurtAnimation(p) => { - if let Some(m) = self.mobs.iter_mut().find(|m| m.id == p.id as u32) { + if self.remote.as_ref().is_some_and(|r| r.entity_id == p.id) { + if let Some(pl) = self.player.as_mut() { + pl.health.animate_hurt(); + } + } else if let Some(m) = self.mobs.iter_mut().find(|m| m.id == p.id as u32) { m.hurt_time = 10; } } @@ -2201,9 +2215,14 @@ impl Game<'_> { self.remote_world_options_difficulty(self.ui.difficulty, p.locked); } C::GameRuleValues(p) => self.remote_world_options_rules(p.entries), + // ClientPacketListener.handleSetHealth: LocalPlayer.hurtTo. C::SetHealth(p) => { - if let Some(r) = self.remote.as_mut() { + let flash = self.remote.as_mut().is_some_and(|r| { r.health = (p.health, p.food, p.saturation); + std::mem::replace(&mut r.flash_on_set_health, true) + }); + if flash && let Some(pl) = self.player.as_mut() { + pl.health.flash_health_change(p.health); } self.apply_remote_health(); if p.health <= 0.0 && self.screen != Screen::Dead && self.player.is_some() { @@ -3176,6 +3195,7 @@ impl Game<'_> { ); player.velocity = Vec3::ZERO; } else if !dead && !riding { + player.client_side = true; player.velocity = player.velocity.add_vector(pushed); MotionWorld { entities: &entity_collisions, @@ -3219,7 +3239,7 @@ impl Game<'_> { _ => {} } } - // The server owns health and hunger: undo local food/fall changes. + // The server owns health and hunger. self.apply_remote_health(); self.tick_avatar(before, false); // The player's own model (third person, the inventory's preview). diff --git a/crates/horizon-client/src/health.rs b/crates/horizon-client/src/health.rs index 9d53869ec..da40f41fc 100644 --- a/crates/horizon-client/src/health.rs +++ b/crates/horizon-client/src/health.rs @@ -253,6 +253,22 @@ impl PlayerHealth { self.hurt_animation_time -= 1; } } + /// `LivingEntity.animateHurt` / `handleDamageEvent` on a client: the hurt + /// tilt and red flash restart. + pub fn animate_hurt(&mut self) { + self.hurt.hurt_duration = 10; + self.hurt.hurt_time = 10; + self.hurt_animation_time = 10; + } + /// `LocalPlayer.hurtTo` with `flashOnSetHealth`: a drop below the current + /// health starts the hurt animation. + pub fn flash_health_change(&mut self, health: f32) { + let damage = self.health() - health; + if damage > 0.0 { + self.hurt.last_hurt = damage; + self.animate_hurt(); + } + } } impl PlayerMotion { pub fn hurt( @@ -274,6 +290,9 @@ impl PlayerMotion { amount: f32, blocking: Option, ) -> Result { + if self.client_side { + return Ok(BlockOutcome::default()); + } let source = resources .damage .source::<()>(source, None, None, None) diff --git a/crates/horizon-client/src/hunger.rs b/crates/horizon-client/src/hunger.rs index 0d9fb02e0..15eac144f 100644 --- a/crates/horizon-client/src/hunger.rs +++ b/crates/horizon-client/src/hunger.rs @@ -55,6 +55,9 @@ impl PlayerMotion { Ok(()) } pub fn food_tick(&mut self, resources: &HealthResources, rules: HealthRules) -> Result<()> { + if self.client_side { + return Ok(()); + } let h = &mut self.health; let mut world = TickWorld { resources, diff --git a/crates/horizon-client/src/motion.rs b/crates/horizon-client/src/motion.rs index 0a626b1e7..5da5d8e79 100644 --- a/crates/horizon-client/src/motion.rs +++ b/crates/horizon-client/src/motion.rs @@ -300,6 +300,10 @@ pub struct PlayerMotion { /// it travels on the server: `isLocalInstanceAuthoritative` is false, so /// its moves check no fall damage. pub server_copy: bool, + /// A client's copy of its own player (`Level.isClientSide`): only the + /// server hurts it (`Entity.hurt` does nothing on a client) and ticks its + /// food (`ServerPlayer.tick`). Its hurt animation comes from the server. + pub client_side: bool, /// `Entity.applyEffectsFromBlocks` runs after travel (always in the game; /// differential fixtures turn it off where their reference does). pub block_effects: bool, @@ -465,6 +469,7 @@ impl PlayerMotion { freeze_immune: false, old_position: position, server_copy: false, + client_side: false, block_effects: true, powder_snow_entered: Vec::new(), hurt_log: Vec::new(), @@ -2860,6 +2865,58 @@ mod tests { } } } + /// A client's own fall (multiplayer, a LAN guest, single player on its + /// server thread) plays its landing but never hurts it: only the server + /// does (`Entity.hurt` on a client), so a server that cancels fall damage + /// leaves the screen still. + #[test] + fn a_clients_own_fall_does_not_hurt_it() { + 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(); + for client_side in [false, true] { + let mut scene = World::test_scene(&assets, &render, 2).unwrap(); + let mut player = PlayerMotion::new(&resources, Vec3::new(20.5, 20.0, 20.5)).unwrap(); + player.client_side = client_side; + player.fall_distance = 30.0; + let mut w = MotionWorld { + entities: &[], + player: &mut player, + scene: &mut scene, + assets: &assets, + collision_binding: &binding, + resources: &resources, + }; + w.move_self(Vec3::new(0.0, -30.0, 0.0)).unwrap(); + assert!(w.player.ground.on_ground); + assert_eq!(w.player.fall_distance, 0.0); + // LivingEntity.causeFallDamage's sounds play on both sides. + assert!(w.player.events.iter().any(|e| matches!( + e, + MotionEvent::Fall(crate::landing::FallEvent::Sound { + sound: crate::landing::SceneSound::BigFall, + .. + }) + ))); + let hurt = w.player.health.health() < 20.0; + assert_eq!(hurt, !client_side); + assert_eq!(w.player.health.hurt_animation_time > 0, !client_side); + // The server's health then starts the client's hurt animation. + if client_side { + w.player.health.flash_health_change(20.0); + assert_eq!(w.player.health.hurt_animation_time, 0); + w.player.health.flash_health_change(12.0); + assert_eq!(w.player.health.hurt_animation_time, 10); + } + } + } #[test] fn a_riptide_spin_lies_flat_and_ends_on_the_first_entity_it_touches() { let root = Path::new(env!("CARGO_MANIFEST_DIR")) From 59281c5c7357c8e8659c491f3312b3db229607c6 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:42:17 +0200 Subject: [PATCH 053/140] Mod registry: cargo horizon-mod check, each kind's own checks - `horizon_mods::index::inspect`: each kind's own check (a mod's manifest and content, a modpack's manifest and overrides, a resource pack's pack.mcmeta), returning what the file says; `check_file` now compares those facts with the index. Shader packs and unknown kinds are refused, and `index::open` says which kinds the registry takes: shader submissions stay closed until Horizon's own format exists. - `cargo horizon-mod check `: those checks plus a trial run of a mod in the sandbox (ticks, frames, a chat line, each command), text or JSON. Co-Authored-By: Claude Opus 5.5 --- crates/cargo-horizon-mod/Cargo.toml | 4 +- crates/cargo-horizon-mod/src/check.rs | 268 +++++++++++++++++++++++++ crates/cargo-horizon-mod/src/main.rs | 38 +++- crates/horizon-mods/src/index.rs | 176 +++++++++++----- crates/horizon-mods/src/index/tests.rs | 5 +- docs/mods.md | 14 +- 6 files changed, 449 insertions(+), 56 deletions(-) create mode 100644 crates/cargo-horizon-mod/src/check.rs diff --git a/crates/cargo-horizon-mod/Cargo.toml b/crates/cargo-horizon-mod/Cargo.toml index 6d0a231ec..34eefe227 100644 --- a/crates/cargo-horizon-mod/Cargo.toml +++ b/crates/cargo-horizon-mod/Cargo.toml @@ -4,10 +4,10 @@ version = "0.1.0" edition.workspace = true license.workspace = true rust-version = "1.86" -description = "cargo horizon-mod new/build/run: make Horizon mods in Rust (docs/mods.md)" +description = "cargo horizon-mod new/build/run/check: make Horizon mods in Rust (docs/mods.md)" [dependencies] -horizon-mods = { path = "../horizon-mods", default-features = false, features = ["pack"] } +horizon-mods = { path = "../horizon-mods", default-features = false, features = ["pack", "runtime", "index"] } serde_json = "1.0.151" [lints] diff --git a/crates/cargo-horizon-mod/src/check.rs b/crates/cargo-horizon-mod/src/check.rs new file mode 100644 index 000000000..0294bec98 --- /dev/null +++ b/crates/cargo-horizon-mod/src/check.rs @@ -0,0 +1,268 @@ +//! `cargo horizon-mod check `: what the registry checks of a submission, +//! run anywhere: its kind's own checks (docs/api/mod-index.md), its signature +//! when given a key, and for a mod a trial run in the sandbox: it must start, +//! survive ticks, frames, a chat line and each of its commands, and import +//! no more than its capabilities. +use horizon_mods::{ + Clock, Mods, Output, Package, Player, Snapshot, Status, + index::{self, Facts, Kind}, + manifest::component_imports, +}; +use serde_json::{Value, json}; +use std::path::Path; + +/// How long the trial run plays: two seconds of game. +const TICKS: u64 = 40; +const FRAMES_PER_TICK: u64 = 3; + +pub struct Report { + pub kind: Kind, + pub facts: Facts, + pub sha256: String, + pub size: u64, + pub signed: bool, + /// A mod's component imports. + pub imports: Vec, + /// A mod's commands, each run once. + pub commands: Vec, + /// What the mod showed during the trial run. + pub output: Vec, +} + +impl Report { + pub fn json(&self) -> Value { + let requires: Vec = self + .facts + .requires + .iter() + .map(|r| json!({"id": r.id, "version": r.version, "sha256": r.sha256})) + .collect(); + json!({ + "kind": self.kind.name(), + "id": self.facts.id, + "version": self.facts.version, + "api": self.facts.api, + "side": self.facts.side, + "capabilities": self.facts.capabilities, + "game": self.facts.game, + "requires": requires, + "sha256": self.sha256, + "size": self.size, + "signed": self.signed, + "imports": self.imports, + "commands": self.commands, + "output": self.output, + }) + } + + pub fn text(&self) -> String { + let f = &self.facts; + let mut out = format!( + "{} {} ({}", + f.id.as_deref().unwrap_or("resource pack"), + f.version.as_deref().unwrap_or(""), + self.kind.name() + ); + if let Some(side) = f.side { + let side = serde_json::to_value(side).unwrap_or_default(); + out += &format!(", API {}, {}", f.api, side.as_str().unwrap_or("?")); + } else if !f.api.is_empty() { + out += &format!(", format {}", f.api); + } + if let Some(game) = &f.game { + out += &format!(", for {game}"); + } + let signed = if self.signed { + "signature verified" + } else { + "unsigned" + }; + out += &format!( + ")\n {} bytes, SHA-256 {}, {signed}\n", + self.size, self.sha256 + ); + for c in &f.capabilities { + out += &format!(" may {}\n", c.describe()); + } + for r in &f.requires { + out += &format!(" needs {} {} ({})\n", r.id, r.version, &r.sha256[..12]); + } + if self.kind == Kind::Mod { + let commands = if self.commands.is_empty() { + String::new() + } else { + format!(", /{}", self.commands.join(", /")) + }; + out += &format!( + " trial run: started, {TICKS} ticks, {} frames, a chat line{commands}: ok\n", + TICKS * FRAMES_PER_TICK + ); + } + out + } +} + +/// The kind a file's extension says. +pub fn kind_of(path: &Path) -> Option { + match path.extension()?.to_str()? { + "hmod" => Some(Kind::Mod), + "hpack" => Some(Kind::Modpack), + "zip" => Some(Kind::ResourcePack), + _ => None, + } +} + +/// Checks the file at `path` as `kind`; `key` and `signature` (the +/// `.minisig` text) check its signature. +pub fn check( + path: &Path, + kind: Kind, + key: Option<&str>, + signature: Option<&str>, +) -> Result { + let size = std::fs::metadata(path) + .map_err(|e| format!("{}: {e}", path.display()))? + .len(); + if size > index::MAX_FILE { + return Err(format!("over {} MiB", index::MAX_FILE >> 20)); + } + index::open(&kind)?; + let facts = index::inspect(&kind, path)?; + let signed = match (key, signature) { + (Some(key), Some(sig)) => { + index::verify_signature(key, sig, path)?; + true + } + (None, None) => false, + _ => return Err("--key and --signature go together".into()), + }; + let mut report = Report { + kind, + facts, + sha256: index::sha256_file(path)?, + size, + signed, + imports: Vec::new(), + commands: Vec::new(), + output: Vec::new(), + }; + if report.kind == Kind::Mod { + trial_run(path, &mut report)?; + } + Ok(report) +} + +/// Runs a mod in the sandbox, as the game does, from a scratch copy so its +/// storage lands in a folder removed afterwards. +fn trial_run(path: &Path, report: &mut Report) -> Result<(), String> { + let package = Package::read(path)?; + let wasm = package.wasm.as_deref().ok_or("the .hmod has no mod.wasm")?; + report.imports = component_imports(wasm)?; + package + .manifest + .check_imports(report.imports.iter().map(String::as_str))?; + let dir = std::env::temp_dir().join(format!("horizon-mod-check-{}", std::process::id())); + let _ = std::fs::remove_dir_all(&dir); + std::fs::create_dir_all(&dir).map_err(|e| e.to_string())?; + let copy = dir.join("mod.hmod"); + let result = std::fs::copy(path, ©) + .map_err(|e| e.to_string()) + .and_then(|_| play(©, report)); + let _ = std::fs::remove_dir_all(&dir); + result +} + +fn play(path: &Path, report: &mut Report) -> Result<(), String> { + let mut mods = Mods::load(&[path.to_path_buf()], |_| true, |_| false); + let failed = |mods: &Mods| match &mods.entries()[0].status { + Status::Failed(reason) => Some(reason.clone()), + _ => None, + }; + if let Some(reason) = failed(&mods) { + return Err(format!("it didn't start: {reason}")); + } + report.commands = mods.commands().map(str::to_owned).collect(); + for t in 0..TICKS { + mods.set_snapshot(Snapshot { + player: Some(Player { + x: 0.5 + t as f64 * 0.1, + y: 64.0, + z: 0.5, + yaw: 90.0, + pitch: 0.0, + health: 20.0, + food: 20, + dimension: "minecraft:overworld".into(), + }), + clock: Some(Clock { + game_time: t, + day_time: 1000 + t, + }), + }); + mods.tick(t); + for _ in 0..FRAMES_PER_TICK { + mods.frame(1.0 / 60.0); + } + } + mods.chat(" hello"); + for name in report.commands.clone() { + mods.command(&name); + } + for out in mods.drain() { + report.output.push(match out { + Output::Chat { text, .. } => format!("chat: {text}"), + Output::Feedback { text, error } => { + format!("{}: {text}", if error { "error" } else { "feedback" }) + } + Output::Stopped { reason, .. } => return Err(format!("it stopped: {reason}")), + }); + } + match failed(&mods) { + Some(reason) => Err(format!("it stopped: {reason}")), + None => Ok(()), + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn fixture(name: &str) -> std::path::PathBuf { + Path::new(env!("CARGO_MANIFEST_DIR")) + .join("../horizon-mods/tests/index") + .join(name) + } + + #[test] + fn checks_each_kind_its_own_way() { + let pack = fixture("cozy-1.0.0.hpack"); + let report = check(&pack, kind_of(&pack).unwrap(), None, None).unwrap(); + assert_eq!(report.facts.requires[0].id, "coords_hud"); + assert!( + report + .text() + .contains("cozy 1.0.0 (modpack, format 1, for 26.3)") + ); + // The fixture mod's code is a stand-in: its manifest reads, its run fails. + let hmod = fixture("coords_hud-0.1.0.hmod"); + let key = std::fs::read_to_string(fixture("test.pub")).unwrap(); + let sig = std::fs::read_to_string(fixture("coords_hud-0.1.0.hmod.minisig")).unwrap(); + let key = key.lines().last().unwrap(); + let e = check(&hmod, Kind::Mod, Some(key), Some(&sig)) + .err() + .unwrap(); + assert!(e.contains("didn't start"), "{e}"); + let e = check( + &hmod, + Kind::Mod, + Some(key), + Some("untrusted comment: x\nRUQ=\n"), + ) + .err() + .unwrap(); + assert!(e.contains("signature"), "{e}"); + let e = check(&pack, Kind::Shader, None, None).err().unwrap(); + assert!(e.contains("shader packs open"), "{e}"); + assert!(check(&pack, Kind::Mod, None, None).is_err()); + } +} diff --git a/crates/cargo-horizon-mod/src/main.rs b/crates/cargo-horizon-mod/src/main.rs index 6b088d278..9e0076083 100644 --- a/crates/cargo-horizon-mod/src/main.rs +++ b/crates/cargo-horizon-mod/src/main.rs @@ -4,10 +4,14 @@ //! - `build [--debug]`: the `.hmod` in `target/horizon-mod/`. //! - `run [--game ] [-- ]`: build, then play with //! the mod; run `build` again and the game reloads it. +//! - `check [--json]`: what the registry checks of a submission +//! (`.hmod`, `.hpack`, resource pack `.zip`), with a trial run for a mod. use horizon_mods::{ Manifest, Package, manifest::{MANIFEST, component_imports, componentize}, }; +mod check; + use std::{ path::{Path, PathBuf}, process::{Command, ExitCode, Stdio}, @@ -28,7 +32,8 @@ fn main() -> ExitCode { println!("Built {}", p.display()); }), Some("run") => run(&args[1..]), - _ => Err("usage: cargo horizon-mod new | build [--debug] | run [--game ] [-- ]".into()), + Some("check") => check(&args[1..]), + _ => Err("usage: cargo horizon-mod new | build [--debug] | run [--game ] [-- ] | check [--kind ] [--key --signature ] [--json]".into()), }; match result { Ok(()) => ExitCode::SUCCESS, @@ -150,6 +155,37 @@ fn build(release: bool) -> Result { Ok(path) } +/// `check `: the registry's checks of a submission, printed; fails +/// when one does. +fn check(args: &[String]) -> Result<(), String> { + let file = args + .first() + .filter(|a| !a.starts_with("--")) + .ok_or("cargo horizon-mod check ")?; + let path = Path::new(file); + let kind = match flag(args, "--kind") { + Some(k) => horizon_mods::index::Kind::from(k.to_string()), + None => check::kind_of(path) + .ok_or("pass --kind mod|modpack|resourcepack: the extension doesn't say")?, + }; + let signature = flag(args, "--signature") + .map(|p| std::fs::read_to_string(p).map_err(|e| format!("{p}: {e}"))) + .transpose()?; + let report = check::check(path, kind, flag(args, "--key"), signature.as_deref()); + if args.iter().any(|a| a == "--json") { + let json = match &report { + Ok(r) => serde_json::json!({"ok": true, "report": r.json()}), + Err(e) => serde_json::json!({"ok": false, "error": e}), + }; + println!("{json}"); + } + let report = report?; + if !args.iter().any(|a| a == "--json") { + print!("{}", report.text()); + } + Ok(()) +} + fn run(args: &[String]) -> Result<(), String> { let path = build(true)?; let game = flag(args, "--game") diff --git a/crates/horizon-mods/src/index.rs b/crates/horizon-mods/src/index.rs index 73af7b46d..692b1ae73 100644 --- a/crates/horizon-mods/src/index.rs +++ b/crates/horizon-mods/src/index.rs @@ -448,60 +448,109 @@ pub fn check_file( (None, None) => Trust::Unsigned, _ => return Err("its signature and the project's key don't go together".into()), }; - match project.kind { - Kind::Mod => { - let m = Package::read(path)?.manifest; - crate::Content::read(path, &m)?; - let mut caps = m.capabilities.clone(); - caps.sort(); - let mut listed = version.capabilities.clone(); - listed.sort(); - let differs = m.id != project.id - || m.version != version.version - || m.api != version.api - || Some(m.side) != version.side - || caps != listed; - if differs { - return Err(format!( - "its horizon-mod.toml ({} {}, API {}, {:?}, {}) isn't what the index lists", - m.id, - m.version, - m.api, - m.side, - names(&caps) - )); - } - } - Kind::ResourcePack => check_resource_pack(path)?, - Kind::Shader | Kind::Other(_) => { - return Err(format!( - "this Horizon can't install a {} yet", - project.kind.name() - )); - } - Kind::Modpack => { - let pack = Modpack::read(path)?; - let m = &pack.manifest; - let mods: Vec = m.mods.iter().map(modpack::PackMod::requirement).collect(); - if m.id != project.id - || m.version != version.version - || m.format.to_string() != version.api - || m.game != version.game - || mods != version.requires - { - return Err(format!( - "its {} isn't what the index lists", - modpack::MANIFEST - )); - } - } + if matches!(project.kind, Kind::Shader | Kind::Other(_)) { + return Err(format!( + "this Horizon can't install a {} yet", + project.kind.name() + )); } + inspect(&project.kind, path)?.matches(project, version)?; Ok(trust) } +/// What a file says about itself, read by its kind's own check +/// ([`inspect`]). The registry's CI writes these into the index; the +/// launcher compares them with the index before it installs. +#[derive(Clone, Debug, Default, PartialEq)] +pub struct Facts { + /// A mod's or a modpack's manifest id; None for a resource pack. + pub id: Option, + pub version: Option, + /// A mod's API line, a modpack's format, a resource pack's pack format. + pub api: String, + pub side: Option, + /// In the manifest's order. + pub capabilities: Vec, + /// The Minecraft version, when the file names one (a modpack does). + pub game: Option, + pub requires: Vec, +} + +impl Facts { + /// Whether the file is the one `version` of `project` describes. + pub fn matches(&self, project: &Project, version: &Version) -> Result<(), String> { + let (mut caps, mut listed) = (self.capabilities.clone(), version.capabilities.clone()); + caps.sort(); + listed.sort(); + let differs = self.id.as_ref().is_some_and(|id| *id != project.id) + || self.version.as_ref().is_some_and(|v| *v != version.version) + || self.api != version.api + || self.side != version.side + || caps != listed + || self.game.as_ref().is_some_and(|g| *g != version.game) + || self.requires != version.requires; + if !differs { + return Ok(()); + } + Err(match project.kind { + Kind::Mod => format!( + "its horizon-mod.toml ({} {}, API {}, {:?}, {}) isn't what the index lists", + self.id.as_deref().unwrap_or("?"), + self.version.as_deref().unwrap_or("?"), + self.api, + self.side, + names(&self.capabilities) + ), + Kind::Modpack => format!("its {} isn't what the index lists", modpack::MANIFEST), + _ => format!("its pack format {} isn't what the index lists", self.api), + }) + } +} + +/// Reads and checks a file as its kind: a mod's manifest and content, a +/// modpack's manifest and overrides, a resource pack's `pack.mcmeta` and +/// paths. Shader packs and kinds this build doesn't know are refused: their +/// checks come with their formats. +pub fn inspect(kind: &Kind, path: &Path) -> Result { + match kind { + Kind::Mod => { + let m = Package::read(path)?.manifest; + crate::Content::read(path, &m)?; + Ok(Facts { + capabilities: m.capabilities, + id: Some(m.id), + version: Some(m.version), + api: m.api, + side: Some(m.side), + ..Facts::default() + }) + } + Kind::Modpack => { + let m = Modpack::read(path)?.manifest; + Ok(Facts { + requires: m.mods.iter().map(modpack::PackMod::requirement).collect(), + id: Some(m.id), + version: Some(m.version), + api: m.format.to_string(), + game: Some(m.game), + ..Facts::default() + }) + } + Kind::ResourcePack => Ok(Facts { + api: check_resource_pack(path)?, + ..Facts::default() + }), + Kind::Shader => Err( + "Horizon's own shader pack format isn't out yet: shader packs open when it is".into(), + ), + Kind::Other(name) => Err(format!("this Horizon can't read a {name} yet")), + } +} + /// A resource pack: a zip with `pack.mcmeta` at its root holding a `pack` -/// object, and only plain paths. -fn check_resource_pack(path: &Path) -> Result<(), String> { +/// object, and only plain paths. Returns its pack format (`pack_format`, or +/// `min_format` in newer packs), empty when it names none. +fn check_resource_pack(path: &Path) -> Result { let file = std::fs::File::open(path).map_err(|e| format!("{}: {e}", path.display()))?; let mut zip = zip::ZipArchive::new(file).map_err(|e| e.to_string())?; for i in 0..zip.len() { @@ -523,10 +572,35 @@ fn check_resource_pack(path: &Path) -> Result<(), String> { .map_err(|e| format!("pack.mcmeta: {e}"))?; let json: serde_json::Value = serde_json::from_str(&meta).map_err(|e| format!("pack.mcmeta: {e}"))?; - if !json["pack"].is_object() { + let pack = &json["pack"]; + if !pack.is_object() { return Err("pack.mcmeta: no \"pack\" object".into()); } - Ok(()) + let format = [&pack["pack_format"], &pack["min_format"]] + .into_iter() + .find(|f| !f.is_null()) + .map(|f| match f { + serde_json::Value::Array(parts) => parts + .iter() + .map(ToString::to_string) + .collect::>() + .join("."), + other => other.to_string(), + }) + .unwrap_or_default(); + Ok(format) +} + +/// The kinds the registry takes submissions for. Shader packs wait for +/// Horizon's own format; other kinds for theirs. +pub fn open(kind: &Kind) -> Result<(), String> { + match kind { + Kind::Mod | Kind::Modpack | Kind::ResourcePack => Ok(()), + Kind::Shader => Err( + "shader packs open when Horizon's own shader pack format is out (Iris and OptiFine packs stay on Modrinth)".into(), + ), + Kind::Other(name) => Err(format!("the registry doesn't take {name} yet")), + } } fn names(caps: &[Capability]) -> String { diff --git a/crates/horizon-mods/src/index/tests.rs b/crates/horizon-mods/src/index/tests.rs index b6d7f5bfb..e3883f79e 100644 --- a/crates/horizon-mods/src/index/tests.rs +++ b/crates/horizon-mods/src/index/tests.rs @@ -151,7 +151,10 @@ fn resource_packs_need_a_pack_mcmeta() { path }; let meta = r#"{"pack": {"description": "Look", "min_format": 75, "max_format": 75}}"#; - assert_eq!(check_resource_pack(&pack(&[("pack.mcmeta", meta)])), Ok(())); + assert_eq!( + check_resource_pack(&pack(&[("pack.mcmeta", meta)])), + Ok("75".into()) + ); let e = check_resource_pack(&pack(&[("assets/x.png", "")])).unwrap_err(); assert!(e.contains("missing"), "{e}"); let e = check_resource_pack(&pack(&[("pack.mcmeta", "{}")])).unwrap_err(); diff --git a/docs/mods.md b/docs/mods.md index 6f3216d38..ac8afda94 100644 --- a/docs/mods.md +++ b/docs/mods.md @@ -16,7 +16,7 @@ folder, loads no runtime and plays exactly like vanilla 26.3. | SDK for mod authors | `crates/horizon-mod-sdk` | 0.1 | | Example mod | `crates/horizon-mod-sdk/examples/coords-hud` | coordinates, facing and time HUD, `/where`, `/coords` | | Runtime | `crates/horizon-mods` | wasmtime 36 LTS, component model | -| Authoring tool | `crates/cargo-horizon-mod` | `cargo horizon-mod new / build / run` | +| Authoring tool | `crates/cargo-horizon-mod` | `cargo horizon-mod new / build / run / check` | | In the game | `crates/horizon-client/src/game/mods.rs`, Options > Mods | client mods | | Launcher mod browser (Modrinth, CurseForge with a key) | [mod-browser.md](mod-browser.md) | resource packs, modpacks | | Registry index (`index.json`, `.hpack`), signatures | `horizon_mods::index`, [api/mod-index.md](api/mod-index.md) | schema 1; launcher and website next | @@ -226,6 +226,18 @@ always on, and the game checks its file once a second: rebuild and it restarts with "Mods reloaded" in chat. Its in-memory state starts over; whatever it saved with capability `storage` survives the reload. +Before you submit it to the registry, run what its CI runs: + +```sh +cargo horizon-mod check target/horizon-mod/my_mod.hmod # --json for the report as JSON +``` + +It reads the manifest and content, refuses imports the capabilities don't +cover, then plays the mod in the sandbox for 40 ticks, 120 frames, a chat line +and each of its commands: it must start and never trap or overrun. It checks a +`.hpack` and a resource pack `.zip` too, and a signature with `--key --signature .minisig`. + ### Template layout ``` From 7d76923a04fbbae783e56577a93465dceeab8bec Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:42:57 +0200 Subject: [PATCH 054/140] Mod registry tools: the registry's entries, build and review - `horizon_mods::index::registry`: the registry repository's `mods/.toml` and `revoked.toml`, `build` (every entry and file checked, every problem listed, the index written) and `review` (a published file never changes or disappears, a kind never changes; non-owner, owner and key changes pointed out). - `cargo horizon-mod registry build|review|check|list` for the registry's CI. Co-Authored-By: Claude Opus 5.5 --- crates/cargo-horizon-mod/src/main.rs | 5 +- crates/cargo-horizon-mod/src/registry.rs | 159 +++++++ crates/horizon-mods/src/index.rs | 1 + crates/horizon-mods/src/index/registry.rs | 415 ++++++++++++++++++ .../horizon-mods/src/index/registry/tests.rs | 237 ++++++++++ docs/api/mod-index.md | 53 +++ docs/mods.md | 2 +- 7 files changed, 870 insertions(+), 2 deletions(-) create mode 100644 crates/cargo-horizon-mod/src/registry.rs create mode 100644 crates/horizon-mods/src/index/registry.rs create mode 100644 crates/horizon-mods/src/index/registry/tests.rs diff --git a/crates/cargo-horizon-mod/src/main.rs b/crates/cargo-horizon-mod/src/main.rs index 9e0076083..925633930 100644 --- a/crates/cargo-horizon-mod/src/main.rs +++ b/crates/cargo-horizon-mod/src/main.rs @@ -6,11 +6,13 @@ //! the mod; run `build` again and the game reloads it. //! - `check [--json]`: what the registry checks of a submission //! (`.hmod`, `.hpack`, resource pack `.zip`), with a trial run for a mod. +//! - `registry build|review|check|list`: the registry repository's CI. use horizon_mods::{ Manifest, Package, manifest::{MANIFEST, component_imports, componentize}, }; mod check; +mod registry; use std::{ path::{Path, PathBuf}, @@ -33,7 +35,8 @@ fn main() -> ExitCode { }), Some("run") => run(&args[1..]), Some("check") => check(&args[1..]), - _ => Err("usage: cargo horizon-mod new | build [--debug] | run [--game ] [-- ] | check [--kind ] [--key --signature ] [--json]".into()), + Some("registry") => registry::main(&args[1..]), + _ => Err("usage: cargo horizon-mod new | build [--debug] | run [--game ] [-- ] | check [--kind ] [--key --signature ] [--json] | registry build|review|check|list".into()), }; match result { Ok(()) => ExitCode::SUCCESS, diff --git a/crates/cargo-horizon-mod/src/registry.rs b/crates/cargo-horizon-mod/src/registry.rs new file mode 100644 index 000000000..ac5e77ea4 --- /dev/null +++ b/crates/cargo-horizon-mod/src/registry.rs @@ -0,0 +1,159 @@ +//! `cargo horizon-mod registry build|review|check|list`: the registry repository's CI +//! (`ludovic111/horizon-mods`, docs/api/mod-index.md). Network-free: the +//! workflow downloads the files and publishes what this writes. +use horizon_mods::index::{ + FILE_HOST, + registry::{self, Sources}, +}; +use std::path::Path; + +/// Where the registry's site is published (its icons). +const SITE: &str = "https://ludovic111.github.io/horizon-mods/"; + +const USAGE: &str = "usage: cargo horizon-mod registry build --files --out [--release ] [--site ] [--generated + cargo horizon-mod registry list "; + +fn flag<'a>(args: &'a [String], name: &str) -> Option<&'a str> { + super::flag(args, name) +} + +fn positional(args: &[String]) -> Vec<&str> { + let mut out = Vec::new(); + let mut skip = false; + for a in args { + if skip { + skip = false; + } else if a == "--json" { + } else if a.starts_with("--") { + skip = true; + } else { + out.push(a.as_str()); + } + } + out +} + +fn lines(errors: Vec) -> String { + format!("{} problem(s):\n {}", errors.len(), errors.join("\n ")) +} + +pub fn main(args: &[String]) -> Result<(), String> { + let rest = args.get(1..).unwrap_or_default(); + let pos = positional(rest); + match args.first().map(String::as_str) { + Some("build") => { + let [checkout] = pos[..] else { + return Err(USAGE.into()); + }; + let (files, out) = (flag(rest, "--files"), flag(rest, "--out")); + let (Some(files), Some(out)) = (files, out) else { + return Err(USAGE.into()); + }; + let generated = flag(rest, "--generated") + .map(str::to_owned) + .or_else(|| std::env::var("REGISTRY_GENERATED").ok()) + .unwrap_or_default(); + let index = registry::build(&Sources { + registry: Path::new(checkout), + files: Path::new(files), + release: flag(rest, "--release").unwrap_or(FILE_HOST), + site: flag(rest, "--site").unwrap_or(SITE), + generated, + }) + .map_err(lines)?; + let text = serde_json::to_string_pretty(&index).map_err(|e| e.to_string())?; + std::fs::write(out, text + "\n").map_err(|e| format!("{out}: {e}"))?; + println!( + "Wrote {out}: {} project(s), {} taken down", + index.projects.len(), + index.revoked.len() + ); + Ok(()) + } + Some("review") => { + let [base, head] = pos[..] else { + return Err(USAGE.into()); + }; + let author = flag(rest, "--author").ok_or(USAGE)?; + let (base, _) = registry::load(Path::new(base)).map_err(lines)?; + let (head, _) = registry::load(Path::new(head)).map_err(lines)?; + let review = registry::review(&base, &head, author); + if rest.iter().any(|a| a == "--json") { + let json = serde_json::json!({"errors": review.errors, "notes": review.notes}); + println!("{json}"); + } else { + for n in &review.notes { + println!("note: {n}"); + } + for e in &review.errors { + println!("error: {e}"); + } + } + if review.errors.is_empty() { + Ok(()) + } else { + Err(format!( + "{} change(s) the registry refuses", + review.errors.len() + )) + } + } + // `check` (and its trial run) on each file `head` lists and `base` + // doesn't: a pull request's new files. + Some("check") => { + let [base, head] = pos[..] else { + return Err(USAGE.into()); + }; + let files = Path::new(flag(rest, "--files").ok_or(USAGE)?); + let old: Vec = match registry::load(Path::new(base)) { + Ok((entries, _)) => entries + .iter() + .flat_map(|e| e.versions.iter().map(|v| v.sha256.clone())) + .collect(), + // The first pull request has no entries to compare with. + Err(_) => Vec::new(), + }; + let (entries, _) = registry::load(Path::new(head)).map_err(lines)?; + let mut failed = 0; + for e in &entries { + for v in e.versions.iter().filter(|v| !old.contains(&v.sha256)) { + println!("{} {} ({}):", e.id, v.version, v.file); + let report = crate::check::check( + &files.join(&v.sha256), + e.kind.clone(), + e.key.as_deref(), + v.signature.as_deref(), + ); + match report { + Ok(r) => print!("{}", r.text()), + Err(err) => { + failed += 1; + println!(" error: {err}"); + } + } + } + } + if failed == 0 { + Ok(()) + } else { + Err(format!("{failed} file(s) failed their check")) + } + } + // The files CI must download for `build`: ` `. + Some("list") => { + let [checkout] = pos[..] else { + return Err(USAGE.into()); + }; + let (entries, _) = registry::load(Path::new(checkout)).map_err(lines)?; + for e in &entries { + for v in &e.versions { + println!("{} {} {} {}", v.sha256, e.id, v.version, v.file); + } + } + Ok(()) + } + _ => Err(USAGE.into()), + } +} diff --git a/crates/horizon-mods/src/index.rs b/crates/horizon-mods/src/index.rs index 692b1ae73..db860fd9f 100644 --- a/crates/horizon-mods/src/index.rs +++ b/crates/horizon-mods/src/index.rs @@ -608,5 +608,6 @@ fn names(caps: &[Capability]) -> String { format!("[{}]", names.join(", ")) } +pub mod registry; #[cfg(test)] mod tests; diff --git a/crates/horizon-mods/src/index/registry.rs b/crates/horizon-mods/src/index/registry.rs new file mode 100644 index 000000000..21b5de9fb --- /dev/null +++ b/crates/horizon-mods/src/index/registry.rs @@ -0,0 +1,415 @@ +//! The registry repository (`ludovic111/horizon-mods`, docs/api/mod-index.md): +//! one `mods/.toml` per project, written by the submission form or by +//! hand and reviewed in a pull request, plus `revoked.toml`. Its CI turns +//! them into `index.json` with [`build`], reading every listed file, and +//! checks a pull request's changes with [`review`]. +//! +//! What an entry can't say for itself (a mod's API, side and capabilities, +//! a modpack's mods, a file's size) is read from the file, never typed. +pub use super::open; +use super::{File, Index, Kind, Project, Revoked, SCHEMA, Version, hex64, inspect, valid_id}; +use serde::{Deserialize, Serialize}; +use std::path::{Path, PathBuf}; + +/// The folder of entries in the registry repository. +pub const ENTRIES: &str = "mods"; +/// The list of files taken down. +pub const REVOKED: &str = "revoked.toml"; +/// Ids the site uses for its own pages (`/mods/submit`). +const RESERVED: [&str; 1] = ["submit"]; +/// The biggest icon, a PNG in `icons/`. +const MAX_ICON: u64 = 256 << 10; + +/// `mods/.toml`. +#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)] +#[serde(deny_unknown_fields)] +pub struct Entry { + pub id: String, + pub kind: Kind, + pub name: String, + pub summary: String, + #[serde(default, skip_serializing_if = "String::is_empty")] + pub description: String, + #[serde(default)] + pub authors: Vec, + /// GitHub logins allowed to publish updates. + pub owners: Vec, + pub license: String, + pub source: String, + /// `icons/.png` in the registry repository, or an `https://` address. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub icon: Option, + /// The author's minisign public key. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub key: Option, + /// Newest first. + pub versions: Vec, +} + +#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)] +#[serde(deny_unknown_fields)] +pub struct EntryVersion { + pub version: String, + /// `YYYY-MM-DD`. + pub published: String, + /// The Minecraft version it is for. + pub game: String, + /// The name players download, with the kind's extension. + pub file: String, + /// Lowercase hex: pins the reviewed file. + pub sha256: String, + /// The `.minisig` text, when the project has a key. + #[serde(default, skip_serializing_if = "Option::is_none")] + pub signature: Option, + #[serde(default, skip_serializing_if = "String::is_empty")] + pub changelog: String, +} + +#[derive(Deserialize)] +#[serde(deny_unknown_fields)] +struct RevokedFile { + #[serde(default)] + revoked: Vec, +} + +/// Where [`build`] reads and what it writes into the index. +pub struct Sources<'a> { + /// A checkout of the registry repository. + pub registry: &'a Path, + /// Every listed file, named by its SHA-256 (CI downloads them there). + pub files: &'a Path, + /// Where the files are published: `/-/` + /// ([`super::FILE_HOST`]; `file:///` for a local test registry). + pub release: &'a str, + /// Where the registry's site is (its icons): `https://.../horizon-mods/`. + pub site: &'a str, + /// RFC 3339. + pub generated: String, +} + +/// The release tag a version's file is published under. +pub fn tag(id: &str, version: &str) -> String { + format!("{id}-{version}") +} + +/// Reads `mods/*.toml` and `revoked.toml`: every problem found, not only the +/// first, so a pull request's check lists them all. +pub fn load(registry: &Path) -> Result<(Vec, Vec), Vec> { + let mut errors = Vec::new(); + let mut entries = Vec::new(); + let dir = registry.join(ENTRIES); + let mut paths: Vec = match std::fs::read_dir(&dir) { + Ok(read) => read.filter_map(|e| e.ok().map(|e| e.path())).collect(), + Err(e) => return Err(vec![format!("{}: {e}", dir.display())]), + }; + paths.sort(); + for path in paths { + let name = path.file_name().and_then(|n| n.to_str()).unwrap_or(""); + let Some(stem) = name.strip_suffix(".toml") else { + errors.push(format!("{ENTRIES}/{name}: only .toml files go here")); + continue; + }; + let parsed = std::fs::read_to_string(&path) + .map_err(|e| e.to_string()) + .and_then(|text| toml::from_str::(&text).map_err(|e| e.to_string())); + match parsed { + Ok(entry) if entry.id == stem => entries.push(entry), + Ok(entry) => errors.push(format!( + "{ENTRIES}/{name}: its id is {:?}; the file must be {ENTRIES}/{}.toml", + entry.id, entry.id + )), + Err(e) => errors.push(format!("{ENTRIES}/{name}: {e}")), + } + } + let revoked = match std::fs::read_to_string(registry.join(REVOKED)) { + Ok(text) => match toml::from_str::(&text) { + Ok(file) => file.revoked, + Err(e) => { + errors.push(format!("{REVOKED}: {e}")); + Vec::new() + } + }, + Err(e) if e.kind() == std::io::ErrorKind::NotFound => Vec::new(), + Err(e) => { + errors.push(format!("{REVOKED}: {e}")); + Vec::new() + } + }; + if errors.is_empty() { + Ok((entries, revoked)) + } else { + Err(errors) + } +} + +/// A version string that is also a plain release tag and file name part. +fn plain_version(v: &str) -> bool { + !v.is_empty() + && v.len() <= 64 + && v.as_bytes()[0].is_ascii_alphanumeric() + && v.bytes() + .all(|b| b.is_ascii_alphanumeric() || b".-_".contains(&b)) +} + +fn plain_date(d: &str) -> bool { + let b = d.as_bytes(); + b.len() == 10 + && b[4] == b'-' + && b[7] == b'-' + && b.iter() + .enumerate() + .all(|(i, c)| i == 4 || i == 7 || c.is_ascii_digit()) +} + +/// One project's entry and its files, as the index lists them. +pub fn project(entry: &Entry, src: &Sources) -> Result> { + let mut errors = Vec::new(); + let id = &entry.id; + if !valid_id(id) { + return Err(vec![format!("{id:?} is not [a-z0-9_]{{1,64}}")]); + } + if RESERVED.contains(&id.as_str()) { + return Err(vec![format!("{id:?} is reserved: pick another id")]); + } + open(&entry.kind).map_err(|e| vec![format!("{id}: {e}")])?; + if entry.owners.is_empty() { + errors.push(format!("{id}: needs at least one owner (a GitHub login)")); + } + if entry.summary.chars().count() > 160 { + errors.push(format!("{id}: the summary is over 160 characters")); + } + let icon = match entry.icon.as_deref() { + None => None, + Some(url) if url.starts_with("https://") => Some(url.to_owned()), + Some(path) => { + let ok = path + .strip_prefix("icons/") + .is_some_and(|name| super::plain_name(name) && name.ends_with(".png")); + let size = std::fs::metadata(src.registry.join(path)).map(|m| m.len()); + match (ok, size) { + (true, Ok(n)) if n <= MAX_ICON => Some(format!("{}{path}", src.site)), + (true, Ok(_)) => { + errors.push(format!("{id}: {path} is over {} KiB", MAX_ICON >> 10)); + None + } + (true, Err(e)) => { + errors.push(format!("{id}: {path}: {e}")); + None + } + (false, _) => { + errors.push(format!( + "{id}: icon {path:?} is neither icons/.png nor https://" + )); + None + } + } + } + }; + if entry.versions.is_empty() { + errors.push(format!("{id}: has no version")); + } + let mut versions = Vec::new(); + for v in &entry.versions { + match version(entry, v, src) { + Ok(v) => versions.push(v), + Err(e) => errors.push(format!("{id} {}: {e}", v.version)), + } + } + if !errors.is_empty() { + return Err(errors); + } + Ok(Project { + id: id.clone(), + kind: entry.kind.clone(), + name: entry.name.clone(), + summary: entry.summary.clone(), + description: entry.description.clone(), + authors: entry.authors.clone(), + owners: entry.owners.clone(), + license: entry.license.clone(), + source: entry.source.clone(), + icon, + key: entry.key.as_ref().map(|k| k.trim().to_owned()), + versions, + }) +} + +fn version(entry: &Entry, v: &EntryVersion, src: &Sources) -> Result { + if !plain_version(&v.version) { + return Err("a version is letters, digits, '.', '-' and '_'".into()); + } + if !plain_date(&v.published) { + return Err(format!("published {:?} is not YYYY-MM-DD", v.published)); + } + hex64(&v.sha256)?; + let path = src.files.join(&v.sha256); + let size = std::fs::metadata(&path) + .map_err(|e| format!("its file {}: {e}", v.sha256))? + .len(); + if super::sha256_file(&path)? != v.sha256 { + return Err("the file isn't the one its sha256 names".into()); + } + match (&entry.key, &v.signature) { + (Some(key), Some(sig)) => super::verify_signature(key, sig, &path)?, + (Some(_), None) => return Err("the project has a key: sign the file with it".into()), + (None, Some(_)) => return Err("signed, but the project has no key".into()), + (None, None) => {} + } + let facts = inspect(&entry.kind, &path)?; + if facts.id.as_ref().is_some_and(|id| *id != entry.id) { + return Err(format!( + "the file's id is {:?}, not {:?}", + facts.id.unwrap_or_default(), + entry.id + )); + } + if facts.version.as_ref().is_some_and(|x| *x != v.version) { + return Err(format!( + "the file says version {:?}", + facts.version.unwrap_or_default() + )); + } + if facts.game.as_ref().is_some_and(|g| *g != v.game) { + return Err(format!( + "the file is for {:?}, the entry says {:?}", + facts.game.unwrap_or_default(), + v.game + )); + } + Ok(Version { + version: v.version.clone(), + published: v.published.clone(), + changelog: v.changelog.clone(), + api: facts.api, + side: facts.side, + capabilities: facts.capabilities, + game: v.game.clone(), + requires: facts.requires, + file: File { + url: format!("{}{}/{}", src.release, tag(&entry.id, &v.version), v.file), + name: v.file.clone(), + size, + sha256: v.sha256.clone(), + signature: v.signature.clone(), + }, + }) +} + +impl Entry { + /// The entry as `mods/.toml` holds it (the submission form writes it). + pub fn to_toml(&self) -> Result { + toml::to_string(self).map_err(|e| e.to_string()) + } +} + +/// The index of the whole registry: every entry and file checked, then the +/// index's own rules ([`Index::check`]: names, a modpack's mods present). +pub fn build(src: &Sources) -> Result> { + let (mut entries, revoked) = load(src.registry)?; + entries.sort_by(|a, b| a.id.cmp(&b.id)); + let mut errors = Vec::new(); + let mut projects = Vec::new(); + for entry in &entries { + match project(entry, src) { + Ok(p) => projects.push(p), + Err(e) => errors.extend(e), + } + } + if !errors.is_empty() { + return Err(errors); + } + let index = Index { + schema: SCHEMA, + generated: src.generated.clone(), + projects, + revoked, + }; + let local = src.release.starts_with("file:///"); + index.check_with(local).map_err(|e| vec![e])?; + Ok(index) +} + +/// What a pull request changes, for its reviewers. +#[derive(Debug, Default, PartialEq)] +pub struct Review { + /// Changes the registry refuses whoever reviews them. + pub errors: Vec, + /// What reviewers should look at: new projects, new owners or keys, a + /// change by someone who isn't an owner. + pub notes: Vec, +} + +/// Compares the entries of a pull request (`head`) with `main`'s (`base`): +/// a published file never changes and is never removed (take it down in +/// `revoked.toml`), a project's kind never changes, and changes by someone +/// who isn't an owner, or to owners and keys, are pointed out. +pub fn review(base: &[Entry], head: &[Entry], author: &str) -> Review { + let mut r = Review::default(); + for old in base { + let Some(new) = head.iter().find(|e| e.id == old.id) else { + r.errors.push(format!( + "{}: removed; take its files down in {REVOKED} instead", + old.id + )); + continue; + }; + if new == old { + continue; + } + if !old.owners.iter().any(|o| o.eq_ignore_ascii_case(author)) { + r.notes.push(format!( + "{}: changed by {author}, who isn't one of its owners ({})", + old.id, + old.owners.join(", ") + )); + } + if new.kind != old.kind { + r.errors.push(format!("{}: its kind can't change", old.id)); + } + for v in &old.versions { + match new.versions.iter().find(|w| w.version == v.version) { + None => r.errors.push(format!( + "{} {}: removed; take it down in {REVOKED} instead", + old.id, v.version + )), + Some(w) if w.sha256 != v.sha256 || w.file != v.file => r.errors.push(format!( + "{} {}: a published file never changes: publish a new version", + old.id, v.version + )), + Some(_) => {} + } + } + if new.owners != old.owners { + r.notes.push(format!( + "{}: owners {} -> {}", + old.id, + old.owners.join(", "), + new.owners.join(", ") + )); + } + if new.key != old.key { + r.notes.push(format!( + "{}: its signing key changes; updates signed with the old one stop working", + old.id + )); + } + let added = new.versions.len().saturating_sub(old.versions.len()); + if added > 0 { + r.notes.push(format!("{}: {added} new version(s)", old.id)); + } + } + for new in head { + if !base.iter().any(|e| e.id == new.id) { + r.notes.push(format!( + "{}: a new {} by {}", + new.id, + new.kind.name(), + new.owners.join(", ") + )); + } + } + r +} + +#[cfg(test)] +mod tests; diff --git a/crates/horizon-mods/src/index/registry/tests.rs b/crates/horizon-mods/src/index/registry/tests.rs new file mode 100644 index 000000000..48d2c506b --- /dev/null +++ b/crates/horizon-mods/src/index/registry/tests.rs @@ -0,0 +1,237 @@ +//! A registry checkout holding the sample index's mod and modpack builds the +//! sample index (`tests/index/index-v1.json`) exactly. +use super::*; + +const HMOD: &str = "e1135345692f6dd8fd4c51920151944b82333e17049c9bb7d756f27b8deefc53"; +const HPACK: &str = "241ac840f9c5ea3f6252d849da10c90d36cb1da4d6cd8d1d268c2760a353cd65"; + +fn fixtures() -> PathBuf { + Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/index") +} + +fn sample() -> Index { + Index::parse(&std::fs::read_to_string(fixtures().join("index-v1.json")).unwrap()).unwrap() +} + +fn hud_entry() -> String { + let p = sample(); + let sig = p.project("coords_hud").unwrap().versions[0] + .file + .signature + .clone() + .unwrap(); + format!( + r#"id = "coords_hud" +kind = "mod" +name = "Coordinates HUD" +summary = "Your coordinates, facing and the time of day in a corner of the screen." +description = "`/where` puts them in chat, `/coords` hides or shows the panel." +authors = ["Horizon"] +owners = ["ludovic111"] +license = "MIT" +source = "https://github.com/ludovic111/horizon/tree/main/crates/horizon-mod-sdk/examples/coords-hud" +icon = "icons/coords_hud.png" +key = "RWTVtuGb/GRXcBf3Re5hzM07EzoStr2sLTJjghJia0xX15ULoZRFFZDb" + +[[versions]] +version = "0.1.0" +published = "2026-10-24" +game = "26.3" +file = "coords_hud-0.1.0.hmod" +sha256 = "{HMOD}" +signature = """{sig}""" +"# + ) +} + +const COZY: &str = r#"id = "cozy" +kind = "modpack" +name = "Cozy" +summary = "Coordinates and a calm render distance." +authors = ["Horizon"] +owners = ["ludovic111"] +license = "MIT" +source = "https://github.com/ludovic111/horizon-mods" + +[[versions]] +version = "1.0.0" +published = "2026-10-24" +game = "26.3" +file = "cozy-1.0.0.hpack" +sha256 = "241ac840f9c5ea3f6252d849da10c90d36cb1da4d6cd8d1d268c2760a353cd65" +"#; + +const REVOKED_TOML: &str = r#"[[revoked]] +id = "bad_mod" +sha256 = "1111111111111111111111111111111111111111111111111111111111111111" +reason = "Sent chat messages it didn't declare." +date = "2026-10-24" +"#; + +/// A registry checkout and its downloaded files, in a scratch folder. +struct Scratch(PathBuf); + +impl Scratch { + fn new(name: &str) -> Scratch { + let dir = + std::env::temp_dir().join(format!("horizon-registry-{name}-{}", std::process::id())); + let _ = std::fs::remove_dir_all(&dir); + for sub in ["repo/mods", "repo/icons", "files"] { + std::fs::create_dir_all(dir.join(sub)).unwrap(); + } + let s = Scratch(dir); + s.write("mods/coords_hud.toml", &hud_entry()); + s.write("mods/cozy.toml", COZY); + s.write("revoked.toml", REVOKED_TOML); + s.write("icons/coords_hud.png", "png"); + for (name, hash) in [("coords_hud-0.1.0.hmod", HMOD), ("cozy-1.0.0.hpack", HPACK)] { + std::fs::copy(fixtures().join(name), s.0.join("files").join(hash)).unwrap(); + } + s + } + + fn write(&self, path: &str, text: &str) { + std::fs::write(self.0.join("repo").join(path), text).unwrap(); + } + + fn build(&self) -> Result> { + let (repo, files) = (self.0.join("repo"), self.0.join("files")); + build(&Sources { + registry: &repo, + files: &files, + release: super::super::FILE_HOST, + site: "https://ludovic111.github.io/horizon-mods/", + generated: "2026-10-24T18:00:00Z".into(), + }) + } +} + +impl Drop for Scratch { + fn drop(&mut self) { + let _ = std::fs::remove_dir_all(&self.0); + } +} + +#[test] +fn builds_the_sample_index() { + let s = Scratch::new("sample"); + let built = s.build().unwrap(); + let sample = sample(); + assert_eq!(built.projects, sample.projects[..2]); + assert_eq!(built.revoked, sample.revoked); + assert_eq!(built.generated, sample.generated); + // What it writes reads back. + Index::parse(&serde_json::to_string_pretty(&built).unwrap()).unwrap(); +} + +#[test] +fn lists_every_problem_of_a_registry() { + let s = Scratch::new("bad"); + // A file that isn't the one its hash names, an unsigned version of a + // signed project, a shader pack, and a mod whose file is another mod. + std::fs::write(s.0.join("files").join(HPACK), b"other bytes").unwrap(); + s.write( + "mods/coords_hud.toml", + &hud_entry().replace("signature = \"\"\"", "changelog = \"\"\""), + ); + s.write( + "mods/glow.toml", + &COZY + .replace("\"cozy\"", "\"glow\"") + .replace("modpack", "shader"), + ); + s.write( + "mods/other.toml", + &hud_entry() + .replace("\"coords_hud\"", "\"other\"") + .replace("key = ", "# key = ") + .replace("signature = \"\"\"", "changelog = \"\"\""), + ); + let errors = s.build().unwrap_err(); + let has = |part: &str| errors.iter().any(|e| e.contains(part)); + assert!( + has("cozy 1.0.0: the file isn't the one its sha256 names"), + "{errors:?}" + ); + assert!(has("coords_hud 0.1.0: the project has a key"), "{errors:?}"); + assert!(has("glow: shader packs open when"), "{errors:?}"); + assert!( + has("other 0.1.0: the file's id is \"coords_hud\""), + "{errors:?}" + ); + assert_eq!(errors.len(), 4, "{errors:?}"); +} + +#[test] +fn an_entry_is_named_by_its_id_and_has_only_known_fields() { + let s = Scratch::new("names"); + s.write("mods/hud.toml", &hud_entry()); + s.write("mods/notes.txt", ""); + s.write("mods/cozy.toml", &format!("{COZY}homepage = \"x\"\n")); + let errors = load(&s.0.join("repo")).unwrap_err(); + assert_eq!(errors.len(), 3, "{errors:?}"); + assert!(errors[0].contains("cozy.toml") && errors[0].contains("homepage")); + assert!(errors[1].contains("must be mods/coords_hud.toml")); + assert!(errors[2].contains("only .toml")); +} + +#[test] +fn an_entry_written_reads_back() { + let entry: Entry = toml::from_str(&hud_entry()).unwrap(); + let text = entry.to_toml().unwrap(); + assert_eq!(toml::from_str::(&text).unwrap(), entry); + assert!(text.contains("[[versions]]"), "{text}"); +} + +#[test] +fn a_review_protects_published_files() { + let base: Entry = toml::from_str(&hud_entry()).unwrap(); + let cozy: Entry = toml::from_str(COZY).unwrap(); + let one = std::slice::from_ref(&base); + let same = review(one, one, "someone"); + assert_eq!(same, Review::default()); + + let mut update = base.clone(); + let mut next = update.versions[0].clone(); + next.version = "0.2.0".into(); + update.versions.insert(0, next); + let r = review(one, std::slice::from_ref(&update), "ludovic111"); + assert!(r.errors.is_empty(), "{r:?}"); + assert_eq!(r.notes, ["coords_hud: 1 new version(s)"]); + let r = review(one, &[update], "stranger"); + assert!(r.notes[0].contains("isn't one of its owners"), "{r:?}"); + + let mut swapped = base.clone(); + swapped.versions[0].sha256 = HPACK.into(); + swapped.kind = Kind::ResourcePack; + swapped.key = None; + let r = review(&[base.clone(), cozy.clone()], &[swapped], "ludovic111"); + assert_eq!(r.errors.len(), 3, "{r:?}"); + assert!(r.errors.iter().any(|e| e.contains("cozy: removed"))); + assert!(r.errors.iter().any(|e| e.contains("never changes"))); + assert!(r.errors.iter().any(|e| e.contains("kind can't change"))); + assert!(r.notes.iter().any(|n| n.contains("signing key"))); + + let r = review(&[], &[cozy], "newcomer"); + assert_eq!(r.notes, ["cozy: a new modpack by ludovic111"]); +} + +#[test] +fn only_open_kinds_are_taken() { + assert!(open(&Kind::Mod).is_ok() && open(&Kind::ResourcePack).is_ok()); + assert!(open(&Kind::Shader).unwrap_err().contains("Iris")); + assert!(open(&Kind::Other("world".into())).is_err()); + let mut submit: Entry = toml::from_str(COZY).unwrap(); + submit.id = "submit".into(); + let dir = std::env::temp_dir(); + let src = Sources { + registry: &dir, + files: &dir, + release: super::super::FILE_HOST, + site: "https://x.test/", + generated: String::new(), + }; + assert!(project(&submit, &src).unwrap_err()[0].contains("reserved")); + assert!(plain_version("1.0.0-beta.2") && !plain_version("../1") && !plain_version("1 0")); + assert!(plain_date("2026-10-24") && !plain_date("24/10/2026")); +} diff --git a/docs/api/mod-index.md b/docs/api/mod-index.md index 959b969fb..afa6e8944 100644 --- a/docs/api/mod-index.md +++ b/docs/api/mod-index.md @@ -90,6 +90,59 @@ Unknown keys are refused. `overrides/` may hold only `options.txt`, `horizon-gra capability `storage`), each at most 64 MiB and 256 MiB in all; anything else refuses the pack. The launcher copies them into the profile's game folder. +## The registry repository + +[ludovic111/horizon-mods](https://github.com/ludovic111/horizon-mods) holds one `mods/.toml` per project, written by +the submission form or by hand, and `revoked.toml`. What an entry can't vouch for is read from its file by the kind's +own check (`index::inspect`): a mod's API, side and capabilities, a modpack's mods, the size. Types and rules: +`horizon_mods::index::registry`. + +```toml +id = "coords_hud" # the file's name, and the manifest's id +kind = "mod" # mod | modpack | resourcepack; shader once its format exists +name = "Coordinates HUD" +summary = "One line, at most 160 characters." +description = """Markdown.""" # optional +authors = ["Horizon"] +owners = ["ludovic111"] # GitHub logins who may publish updates +license = "MIT" +source = "https://github.com/..." +icon = "icons/coords_hud.png" # optional: a PNG of at most 256 KiB in the repository, or https:// +key = "RWT..." # optional: the minisign public key every version is signed with + +[[versions]] # newest first +version = "0.1.0" # letters, digits, '.', '-', '_': the release tag is - +published = "2026-10-24" +game = "26.3" +file = "coords_hud-0.1.0.hmod" # the name players download +sha256 = "e113..." # pins the reviewed file +signature = """untrusted comment: ...""" # when the project has a key +changelog = "" # optional +``` + +```toml +# revoked.toml +[[revoked]] +id = "bad_mod" +sha256 = "1111..." # optional: without it, every version +reason = "Sent chat messages it didn't declare." +date = "2026-10-24" +``` + +Unknown keys are refused. Its CI runs `cargo-horizon-mod` (`crates/cargo-horizon-mod`): + +| Command | What it does | +| --- | --- | +| `cargo horizon-mod check [--json]` | A submission's checks: its kind's (above), its signature with `--key` and `--signature`, and for a mod a trial run in the sandbox (40 ticks, 120 frames, a chat line, each command). | +| `cargo horizon-mod registry check --files ` | `check` on each file `head` lists and `base` doesn't: a pull request's new files. | +| `cargo horizon-mod registry list ` | ` ` per version: the files to download. | +| `cargo horizon-mod registry build --files --out index.json` | Reads every entry and its file (`/`), lists every problem, and writes the index with URLs `/-/`. | +| `cargo horizon-mod registry review --author ` | A pull request's changes: a published file never changes and is never removed (take it down in `revoked.toml`), a kind never changes; changes by a non-owner and to owners or keys are pointed out for the reviewers. | + +Kinds open to submissions: `mod`, `modpack`, `resourcepack`. `shader` is in the schema and stays closed until +Horizon's own shader pack format exists (Iris and OptiFine packs are for the Modrinth browser); its check will compile +the pack in a headless Horizon. A new kind gets its own check before it opens. + ## Changelog - Schema 1 (2026-10-24): kinds `mod`, `modpack`, `resourcepack`, `shader`; `.hpack` format 1. diff --git a/docs/mods.md b/docs/mods.md index ac8afda94..5fa6a290d 100644 --- a/docs/mods.md +++ b/docs/mods.md @@ -16,7 +16,7 @@ folder, loads no runtime and plays exactly like vanilla 26.3. | SDK for mod authors | `crates/horizon-mod-sdk` | 0.1 | | Example mod | `crates/horizon-mod-sdk/examples/coords-hud` | coordinates, facing and time HUD, `/where`, `/coords` | | Runtime | `crates/horizon-mods` | wasmtime 36 LTS, component model | -| Authoring tool | `crates/cargo-horizon-mod` | `cargo horizon-mod new / build / run / check` | +| Authoring tool | `crates/cargo-horizon-mod` | `cargo horizon-mod new / build / run / check`, and the registry's CI (`registry build / review / list`) | | In the game | `crates/horizon-client/src/game/mods.rs`, Options > Mods | client mods | | Launcher mod browser (Modrinth, CurseForge with a key) | [mod-browser.md](mod-browser.md) | resource packs, modpacks | | Registry index (`index.json`, `.hpack`), signatures | `horizon_mods::index`, [api/mod-index.md](api/mod-index.md) | schema 1; launcher and website next | From 7b56b59e7c08af912cba137148c958cb6da8ce2e Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sat, 24 Oct 2026 22:04:36 +0200 Subject: [PATCH 055/140] Mod registry: the submission form's service (crates/horizon-mod-registry) Its own workspace, as the telemetry server's, for its own Railway service. GitHub sign-in with no scope (the user's token reads the login once and is dropped), signed-cookie sessions, an origin check and a CSRF token, six submissions per account and sixty in all per hour. A submission runs the file's own checks (horizon_mods::index::inspect, the signature, the entry's fields through registry::project), uploads it to the registry's `staging` release as ., writes mods/.toml on a new branch with the submitter as co-author, and opens the pull request. Only an entry's owners publish updates; a key change is a pull request by hand. Shader packs are refused until their format exists. Tested end to end against a mock GitHub: sign-in, the signed sample mod, what lands on GitHub, and what is refused. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/mod-registry.yml | 34 + Cargo.toml | 2 +- crates/horizon-mod-registry/Cargo.lock | 1352 +++++++++++++++++++ crates/horizon-mod-registry/Cargo.toml | 33 + crates/horizon-mod-registry/Dockerfile | 14 + crates/horizon-mod-registry/README.md | 44 + crates/horizon-mod-registry/railway.json | 21 + crates/horizon-mod-registry/src/github.rs | 276 ++++ crates/horizon-mod-registry/src/lib.rs | 675 +++++++++ crates/horizon-mod-registry/src/main.rs | 25 + crates/horizon-mod-registry/tests/submit.rs | 373 +++++ docs/api/mod-index.md | 2 + 12 files changed, 2850 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/mod-registry.yml create mode 100644 crates/horizon-mod-registry/Cargo.lock create mode 100644 crates/horizon-mod-registry/Cargo.toml create mode 100644 crates/horizon-mod-registry/Dockerfile create mode 100644 crates/horizon-mod-registry/README.md create mode 100644 crates/horizon-mod-registry/railway.json create mode 100644 crates/horizon-mod-registry/src/github.rs create mode 100644 crates/horizon-mod-registry/src/lib.rs create mode 100644 crates/horizon-mod-registry/src/main.rs create mode 100644 crates/horizon-mod-registry/tests/submit.rs diff --git a/.github/workflows/mod-registry.yml b/.github/workflows/mod-registry.yml new file mode 100644 index 000000000..0f252bb68 --- /dev/null +++ b/.github/workflows/mod-registry.yml @@ -0,0 +1,34 @@ +name: mod-registry +# The submission service is its own workspace (crates/horizon-mod-registry), so the checks job doesn't build +# it: this one does, when it or horizon-mods (the checks it shares with the launcher and the game) changes. +on: + push: + branches: [main] + paths: + - 'crates/horizon-mods/**' + - 'crates/horizon-mod-registry/**' + - '.github/workflows/mod-registry.yml' + pull_request: + paths: + - 'crates/horizon-mods/**' + - 'crates/horizon-mod-registry/**' + - '.github/workflows/mod-registry.yml' +permissions: + contents: read +jobs: + check: + runs-on: ubuntu-latest + timeout-minutes: 20 + defaults: + run: + working-directory: crates/horizon-mod-registry + steps: + - uses: actions/checkout@v4 + - run: rustup toolchain install stable --profile minimal --component rustfmt --component clippy + - uses: Swatinem/rust-cache@v2 + with: + workspaces: crates/horizon-mod-registry + save-if: ${{ github.ref == 'refs/heads/main' }} + - run: cargo +stable fmt --check + - run: cargo +stable clippy --all-targets --locked -- -D warnings + - run: cargo +stable test --locked diff --git a/Cargo.toml b/Cargo.toml index f197c34fe..6271b9673 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -exclude = ["launcher", "crates/horizon-telemetry-server", "third_party/wgpu-hal"] +exclude = ["launcher", "crates/horizon-telemetry-server", "crates/horizon-mod-registry", "third_party/wgpu-hal"] members = ["crates/horizon-core", "crates/horizon-dualsense", "crates/horizon-threads", "crates/horizon-world", "crates/horizon-client", "crates/horizon-server-files", "crates/horizon-server", "crates/horizon-bots", "crates/horizon-assets", "crates/horizon-protocol", "crates/horizon-theme", "crates/horizon-prepare", "crates/horizon-telemetry", "crates/horizon-bench", "crates/horizon-friends", "crates/horizon-relay", "crates/horizon-mod-sdk", "crates/horizon-mods", "crates/horizon-mods/tests/guest", "crates/cargo-horizon-mod", "crates/horizon-port-pack", "crates/horizon-release-sign", "crates/horizon-mod-sdk/examples/coords-hud", "xtask"] resolver = "2" diff --git a/crates/horizon-mod-registry/Cargo.lock b/crates/horizon-mod-registry/Cargo.lock new file mode 100644 index 000000000..44ef1e078 --- /dev/null +++ b/crates/horizon-mod-registry/Cargo.lock @@ -0,0 +1,1352 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "arbitrary" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bc62ac97cc33321f50863d514c3bc38a453947a8f9e781137e47c7401020aed" +dependencies = [ + "derive_arbitrary", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "axum" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90" +dependencies = [ + "axum-core", + "bytes", + "form_urlencoded", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-util", + "itoa", + "matchit", + "memchr", + "mime", + "multer", + "percent-encoding", + "pin-project-lite", + "serde_core", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "sync_wrapper", + "tower-layer", + "tower-service", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" + +[[package]] +name = "bytes" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" + +[[package]] +name = "cc" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0" +dependencies = [ + "find-msvc-tools", + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" + +[[package]] +name = "core_detect" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48" + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" + +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "derive_arbitrary" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b034bd7d5f032402a2479444dcc6f74e36a03f31854d41680fb240ef682a1ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "encoding_rs" +version = "0.8.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679" +dependencies = [ + "cfg-if", + "core_detect", + "multiversion_no_op", + "rustversion", + "scopeguard", + "simdutf8", +] + +[[package]] +name = "equivalent" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" + +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48" + +[[package]] +name = "flate2" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-core" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" + +[[package]] +name = "futures-task" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" + +[[package]] +name = "futures-util" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasip2", +] + +[[package]] +name = "hashbrown" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "horizon-mod-registry" +version = "0.1.0" +dependencies = [ + "axum", + "base64", + "getrandom 0.3.4", + "hmac", + "horizon-mods", + "http-body-util", + "serde", + "serde_json", + "sha2", + "tokio", + "toml", + "tower", + "ureq", +] + +[[package]] +name = "horizon-mods" +version = "0.1.0" +dependencies = [ + "log", + "minisign-verify", + "serde", + "serde_json", + "sha2", + "toml", + "zip", +] + +[[package]] +name = "http" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3e324da4c95177d6291d4c8730197c0d1822f8a9766814a4a44fa5ab797c9c" +dependencies = [ + "atomic-waker", + "bytes", + "futures-core", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", +] + +[[package]] +name = "hyper-util" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddc03d96684f9226b8a787cdb71488417b53ab5ea8fdb1dac946cb9431cc8bff" +dependencies = [ + "bytes", + "http", + "http-body", + "hyper", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "icu_collections" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe090a42a0d3140fed8c63263ed1fecc02422cb2f4bfe55cd8de2de1b8e105dd" +dependencies = [ + "displaydoc", + "potential_utf", + "utf8_iter", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "404a3b8c486f205c87fe7f23ab6894d84a4ad76d6e4671ae1981ba7def87c599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20f0088bfb7441f7a37fa0c9e20cb1e9cba1cac6b9ce8cd2a6dc44294f8e8cbc" + +[[package]] +name = "icu_properties" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ea83d991c56158f7cf898bf86436c1dfe7c07ee82fe88951f2695c9f37a379f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98f29af82d02b163fe50161388350e743bb3107cc8e8c2f7314cb505faddfcf" + +[[package]] +name = "icu_provider" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" + +[[package]] +name = "libc" +version = "0.2.191" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a" + +[[package]] +name = "litemap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" + +[[package]] +name = "log" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" + +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + +[[package]] +name = "memchr" +version = "2.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minisign-verify" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "871285dc19d8d0ebe0eef3d0e99a205f2a71363b122632cbbfa4a6c370a960ce" + +[[package]] +name = "miniz_oxide" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.61.2", +] + +[[package]] +name = "multer" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" +dependencies = [ + "bytes", + "encoding_rs", + "futures-util", + "http", + "httparse", + "memchr", + "mime", + "spin", + "version_check", +] + +[[package]] +name = "multiversion_no_op" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" + +[[package]] +name = "once_cell" +version = "1.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "pin-project-lite" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" + +[[package]] +name = "potential_utf" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" +dependencies = [ + "zerovec", +] + +[[package]] +name = "proc-macro2" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.17", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" +dependencies = [ + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" + +[[package]] +name = "ryu" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.229" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.154" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6" +dependencies = [ + "itoa", + "memchr", + "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457" +dependencies = [ + "itoa", + "serde", + "serde_core", +] + +[[package]] +name = "serde_spanned" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c" +dependencies = [ + "serde_core", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" + +[[package]] +name = "simdutf8" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" + +[[package]] +name = "slab" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" + +[[package]] +name = "smallvec" +version = "1.16.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8" + +[[package]] +name = "socket2" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "spin" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" + +[[package]] +name = "synstructure" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinystr" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tokio" +version = "1.54.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" +dependencies = [ + "bytes", + "libc", + "mio", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-macros" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "toml" +version = "1.1.8+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d" +dependencies = [ + "indexmap", + "serde_core", + "serde_spanned", + "toml_datetime", + "toml_parser", + "toml_writer", + "winnow", +] + +[[package]] +name = "toml_datetime" +version = "1.1.2+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_parser" +version = "1.1.5+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c" +dependencies = [ + "winnow", +] + +[[package]] +name = "toml_writer" +version = "1.1.3+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" + +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "typenum" +version = "1.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20" + +[[package]] +name = "unicode-ident" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" +dependencies = [ + "base64", + "log", + "once_cell", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "url", + "webpki-roots 0.26.11", +] + +[[package]] +name = "url" +version = "2.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.4+wasi-0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.26.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.11", +] + +[[package]] +name = "webpki-roots" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "winnow" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" + +[[package]] +name = "wit-bindgen" +version = "0.57.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" + +[[package]] +name = "writeable" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" + +[[package]] +name = "yoke" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerofrom" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" + +[[package]] +name = "zerotrie" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zip" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dcb24d0152526ae49b9b96c1dcf71850ca1e0b882e4e28ed898a93c41334744" +dependencies = [ + "arbitrary", + "crc32fast", + "crossbeam-utils", + "flate2", + "indexmap", + "memchr", + "zopfli", +] + +[[package]] +name = "zmij" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" + +[[package]] +name = "zopfli" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaf7fc5d30c28483d93805c4a5e12b05bbb52407fa67c5f8bd552374cd01fb11" +dependencies = [ + "bumpalo", + "crc32fast", + "log", + "simd-adler32", +] diff --git a/crates/horizon-mod-registry/Cargo.toml b/crates/horizon-mod-registry/Cargo.toml new file mode 100644 index 000000000..affc08f62 --- /dev/null +++ b/crates/horizon-mod-registry/Cargo.toml @@ -0,0 +1,33 @@ +[package] +name = "horizon-mod-registry" +version = "0.1.0" +edition = "2024" +license = "MIT" +rust-version = "1.90" +publish = false +description = "The registry's submission service: GitHub sign-in, the file's checks, staging, and a pull request (docs/api/mod-index.md)" + +# Its own workspace, as the telemetry server's: the game's workspace never builds a web server. +[workspace] + +[dependencies] +horizon-mods = { path = "../horizon-mods", default-features = false, features = ["index"] } +axum = { version = "0.8", default-features = false, features = ["http1", "tokio", "json", "query", "multipart"] } +tokio = { version = "1", features = ["rt-multi-thread", "macros", "net", "signal", "fs", "io-util"] } +serde = { version = "1", features = ["derive"] } +serde_json = "1" +toml = "1" +# GitHub's API, blocking, on tokio's blocking pool: the launcher's HTTP client. +ureq = { version = "2", default-features = false, features = ["json", "tls"] } +hmac = "0.12" +sha2 = "0.10" +base64 = "0.22" +getrandom = "0.3" + +[dev-dependencies] +tower = { version = "0.5", features = ["util"] } +http-body-util = "0.1" + +[profile.release] +strip = true +lto = "thin" diff --git a/crates/horizon-mod-registry/Dockerfile b/crates/horizon-mod-registry/Dockerfile new file mode 100644 index 000000000..13522165a --- /dev/null +++ b/crates/horizon-mod-registry/Dockerfile @@ -0,0 +1,14 @@ +# Built from the repository root: docker build -f crates/horizon-mod-registry/Dockerfile . +FROM rust:1-slim AS build +WORKDIR /src +# The root manifest only for the shared crate's workspace settings (edition, lints). +COPY Cargo.toml Cargo.toml +COPY crates/horizon-mods crates/horizon-mods +COPY crates/horizon-mod-registry crates/horizon-mod-registry +RUN cargo build --release --locked --manifest-path crates/horizon-mod-registry/Cargo.toml + +FROM debian:stable-slim +RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && rm -rf /var/lib/apt/lists/* +COPY --from=build /src/crates/horizon-mod-registry/target/release/horizon-mod-registry /usr/local/bin/ +USER nobody +CMD ["horizon-mod-registry"] diff --git a/crates/horizon-mod-registry/README.md b/crates/horizon-mod-registry/README.md new file mode 100644 index 000000000..936fe5acf --- /dev/null +++ b/crates/horizon-mod-registry/README.md @@ -0,0 +1,44 @@ +# horizon-mod-registry + +The service behind the registry's submission form (`playhorizon.dev/mods/submit`). A creator signs in with GitHub and +sends a file with its page; the service runs the file's own checks (`horizon_mods::index::inspect`, the signature, the +entry's fields), uploads it to the `staging` release of +[ludovic111/horizon-mods](https://github.com/ludovic111/horizon-mods) as `.`, and opens a pull +request adding or updating `mods/.toml`. That repository's CI checks it again, with a trial run of a mod in the +sandbox; reviewers decide, and merging publishes. Formats and rules: [docs/api/mod-index.md](../../docs/api/mod-index.md). + +It keeps no data: a session is a signed cookie holding the GitHub login, and the user's OAuth token is used once, to +read that login, and dropped. The sign-in asks for no scope. + +| Route | | +| --- | --- | +| `GET /api/mods/auth/login` | Starts the GitHub sign-in | +| `GET /api/mods/auth/callback` | GitHub's redirect: sets the session, back to `/mods/submit` | +| `POST /api/mods/auth/logout` | Ends it | +| `GET /api/mods/me` | `{login, csrf}`, or 401 | +| `POST /api/mods/submit` | Multipart: `entry` (JSON: `id kind name summary description authors license source icon key signature version game changelog`) and `file`; `{pull_request}` or `{error}` | +| `GET /healthz` | `ok` | + +A submission must come from `REGISTRY_PUBLIC_URL`'s origin with the session's `X-CSRF-Token`. Six per account and sixty +in all per hour. Only an entry's `owners` publish its updates; a key change, an icon in the repository or anything else +is a pull request by hand. + +## Running it + +```sh +cargo test # against a mock GitHub (tests/submit.rs) +REGISTRY_PUBLIC_URL=http://localhost:4173 REGISTRY_SESSION_KEY=... GITHUB_CLIENT_ID=... GITHUB_CLIENT_SECRET=... \ + GITHUB_BOT_TOKEN=... REGISTRY_REPO=you/horizon-mods-test cargo run +``` + +| Variable | | +| --- | --- | +| `REGISTRY_PUBLIC_URL` | The site, `https://playhorizon.dev`: the OAuth callback is `/api/mods/auth/callback` | +| `REGISTRY_SESSION_KEY` | 32 characters or more, random: signs sessions | +| `GITHUB_CLIENT_ID`, `GITHUB_CLIENT_SECRET` | The OAuth app | +| `GITHUB_BOT_TOKEN` | Fine-grained, the registry repository only: Contents and Pull requests read and write | +| `REGISTRY_REPO` | Default `ludovic111/horizon-mods` | +| `PORT` | Default 8080 | + +On Railway it is its own service (`railway.json`, built with the `Dockerfile` from the repository root); the website's +Caddy sends `/api/mods/*` to it over Railway's private network. diff --git a/crates/horizon-mod-registry/railway.json b/crates/horizon-mod-registry/railway.json new file mode 100644 index 000000000..cfafe4367 --- /dev/null +++ b/crates/horizon-mod-registry/railway.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://railway.com/railway.schema.json", + "build": { + "builder": "DOCKERFILE", + "dockerfilePath": "crates/horizon-mod-registry/Dockerfile", + "watchPatterns": [ + "/crates/horizon-mods/**", + "/crates/horizon-mod-registry/**", + "/Cargo.toml" + ] + }, + "deploy": { + "healthcheckPath": "/healthz", + "healthcheckTimeout": 60, + "restartPolicyType": "ON_FAILURE", + "restartPolicyMaxRetries": 5, + "multiRegionConfig": { + "europe-west4-drams3a": { "numReplicas": 1 } + } + } +} diff --git a/crates/horizon-mod-registry/src/github.rs b/crates/horizon-mod-registry/src/github.rs new file mode 100644 index 000000000..01a1b1bdb --- /dev/null +++ b/crates/horizon-mod-registry/src/github.rs @@ -0,0 +1,276 @@ +//! What the service asks of GitHub: the sign-in (OAuth, no scope: only the +//! public profile), and with the bot's token on the registry repository +//! alone, an entry, the `staging` release, a branch, a file, a pull request. +//! Blocking (ureq): called from tokio's blocking pool. +use base64::{Engine, engine::general_purpose::STANDARD}; +use horizon_mods::index::registry::Entry; +use serde_json::{Value, json}; +use std::{path::Path, time::Duration}; + +/// Where GitHub is: the real one, or a test's mock. +#[derive(Clone, Debug)] +pub struct Endpoints { + /// `https://github.com`: OAuth. + pub web: String, + /// `https://api.github.com`. + pub api: String, + /// `https://uploads.github.com`: release assets. + pub uploads: String, +} + +impl Default for Endpoints { + fn default() -> Self { + Endpoints { + web: "https://github.com".into(), + api: "https://api.github.com".into(), + uploads: "https://uploads.github.com".into(), + } + } +} + +#[derive(Clone)] +pub struct GitHub { + pub at: Endpoints, + /// `owner/name` of the registry repository. + pub repo: String, + pub client_id: String, + pub client_secret: String, + /// Fine-grained, this repository only: contents and pull requests. + pub bot_token: String, + agent: ureq::Agent, +} + +/// A failed call: `status` is GitHub's, 0 when it wasn't reached. +#[derive(Debug)] +pub struct Failure { + pub status: u16, + pub message: String, +} + +type Result = std::result::Result; + +fn failure(e: ureq::Error) -> Failure { + match e { + ureq::Error::Status(status, response) => Failure { + status, + message: response + .into_string() + .unwrap_or_default() + .chars() + .take(300) + .collect(), + }, + other => Failure { + status: 0, + message: other.to_string(), + }, + } +} + +fn read(response: ureq::Response) -> Result { + response.into_json().map_err(|e| Failure { + status: 0, + message: e.to_string(), + }) +} + +impl GitHub { + pub fn new( + at: Endpoints, + repo: String, + client_id: String, + client_secret: String, + bot_token: String, + ) -> GitHub { + let agent = ureq::AgentBuilder::new() + .timeout(Duration::from_secs(60)) + .user_agent("horizon-mod-registry") + .build(); + GitHub { + at, + repo, + client_id, + client_secret, + bot_token, + agent, + } + } + + /// Where the sign-in starts. + pub fn authorize_url(&self, redirect: &str, state: &str) -> String { + format!( + "{}/login/oauth/authorize?client_id={}&redirect_uri={}&state={state}&allow_signup=true", + self.at.web, + self.client_id, + encode(redirect) + ) + } + + /// The signed-in account (login, id) for an OAuth `code`. Its token is + /// used once and dropped. + pub fn sign_in(&self, code: &str, redirect: &str) -> Result<(String, u64)> { + let token = self + .agent + .post(&format!("{}/login/oauth/access_token", self.at.web)) + .set("Accept", "application/json") + .send_json(json!({ + "client_id": self.client_id, + "client_secret": self.client_secret, + "code": code, + "redirect_uri": redirect, + })) + .map_err(failure) + .and_then(read)?; + let Some(token) = token["access_token"].as_str() else { + return Err(Failure { + status: 401, + message: "GitHub refused the sign-in".into(), + }); + }; + let user = self + .agent + .get(&format!("{}/user", self.at.api)) + .set("Authorization", &format!("Bearer {token}")) + .set("Accept", "application/vnd.github+json") + .call() + .map_err(failure) + .and_then(read)?; + match (user["login"].as_str(), user["id"].as_u64()) { + (Some(login), Some(id)) => Ok((login.to_owned(), id)), + _ => Err(Failure { + status: 0, + message: "GitHub sent no login".into(), + }), + } + } + + fn call(&self, method: &str, path: &str) -> ureq::Request { + self.agent + .request( + method, + &format!("{}/repos/{}{path}", self.at.api, self.repo), + ) + .set("Authorization", &format!("Bearer {}", self.bot_token)) + .set("Accept", "application/vnd.github+json") + .set("X-GitHub-Api-Version", "2022-11-28") + } + + /// `mods/.toml` on main, with its blob sha; None when it isn't there. + pub fn entry(&self, id: &str) -> Result> { + let response = self + .call("GET", &format!("/contents/mods/{id}.toml")) + .query("ref", "main") + .call(); + let file = match response { + Ok(r) => read(r)?, + Err(ureq::Error::Status(404, _)) => return Ok(None), + Err(e) => return Err(failure(e)), + }; + let bytes = file["content"] + .as_str() + .map(|c| c.replace('\n', "")) + .and_then(|c| STANDARD.decode(c).ok()) + .unwrap_or_default(); + let entry = toml::from_str(&String::from_utf8_lossy(&bytes)).map_err(|e| Failure { + status: 0, + message: format!("mods/{id}.toml on main: {e}"), + })?; + Ok(Some((entry, file["sha"].as_str().unwrap_or("").to_owned()))) + } + + /// Uploads `path` as asset `name` of the `staging` prerelease, unless it + /// is already there (the same file submitted again). + pub fn stage(&self, name: &str, path: &Path) -> Result<()> { + let release = self + .call("GET", "/releases/tags/staging") + .call() + .map_err(failure) + .and_then(read)?; + let there = release["assets"] + .as_array() + .is_some_and(|a| a.iter().any(|x| x["name"] == name)); + if there { + return Ok(()); + } + let id = release["id"].as_u64().unwrap_or(0); + let bytes = std::fs::read(path).map_err(|e| Failure { + status: 0, + message: e.to_string(), + })?; + self.agent + .post(&format!( + "{}/repos/{}/releases/{id}/assets", + self.at.uploads, self.repo + )) + .query("name", name) + .set("Authorization", &format!("Bearer {}", self.bot_token)) + .set("Accept", "application/vnd.github+json") + .set("Content-Type", "application/octet-stream") + .send_bytes(&bytes) + .map_err(failure)?; + Ok(()) + } + + /// Makes branch `name` from main; false when it already exists. + pub fn branch(&self, name: &str) -> Result { + let main = self + .call("GET", "/git/ref/heads/main") + .call() + .map_err(failure) + .and_then(read)?; + let sha = main["object"]["sha"].as_str().unwrap_or(""); + match self + .call("POST", "/git/refs") + .send_json(json!({"ref": format!("refs/heads/{name}"), "sha": sha})) + { + Ok(_) => Ok(true), + Err(ureq::Error::Status(422, _)) => Ok(false), + Err(e) => Err(failure(e)), + } + } + + /// Writes `path` on `branch` in one commit; `sha` is the blob it replaces. + pub fn put( + &self, + path: &str, + text: &str, + branch: &str, + sha: Option<&str>, + message: &str, + ) -> Result<()> { + let mut body = json!({ + "message": message, + "content": STANDARD.encode(text), + "branch": branch, + }); + if let Some(sha) = sha { + body["sha"] = json!(sha); + } + self.call("PUT", &format!("/contents/{path}")) + .send_json(body) + .map_err(failure)?; + Ok(()) + } + + /// Opens the pull request; its address. + pub fn pull(&self, title: &str, head: &str, body: &str) -> Result { + let pr = self + .call("POST", "/pulls") + .send_json(json!({"title": title, "head": head, "base": "main", "body": body})) + .map_err(failure) + .and_then(read)?; + Ok(pr["html_url"].as_str().unwrap_or("").to_owned()) + } +} + +/// Percent-encodes a query value. +fn encode(s: &str) -> String { + s.bytes() + .map(|b| match b { + b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'.' | b'_' | b'~' => { + (b as char).to_string() + } + _ => format!("%{b:02X}"), + }) + .collect() +} diff --git a/crates/horizon-mod-registry/src/lib.rs b/crates/horizon-mod-registry/src/lib.rs new file mode 100644 index 000000000..9799bace8 --- /dev/null +++ b/crates/horizon-mod-registry/src/lib.rs @@ -0,0 +1,675 @@ +//! `horizon-mod-registry`: the submission form's service at +//! `playhorizon.dev/api/mods/*` (docs/api/mod-index.md). A creator signs in +//! with GitHub, sends a file and its page; the service runs the file's own +//! checks, uploads it to the registry's `staging` release and opens a pull +//! request with the entry. Reviewers decide; merging publishes. It keeps no +//! data: sessions are signed cookies, and GitHub holds everything else. +pub mod github; + +use axum::{ + Json, Router, + extract::{DefaultBodyLimit, Multipart, Query, State}, + http::{HeaderMap, StatusCode, header}, + response::{IntoResponse, Redirect, Response}, + routing::{get, post}, +}; +use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD}; +use github::GitHub; +use hmac::{Hmac, Mac}; +use horizon_mods::index::{ + self, Kind, + registry::{self, Entry, EntryVersion, Sources}, +}; +use serde::Deserialize; +use serde_json::json; +use sha2::Sha256; +use std::{ + collections::{HashMap, VecDeque}, + path::{Path, PathBuf}, + sync::{Arc, Mutex}, + time::{Duration, Instant, SystemTime, UNIX_EPOCH}, +}; + +/// How long a sign-in lasts. +const SESSION: u64 = 12 * 3600; +/// Submissions per account per hour, and from everyone. +const PER_ACCOUNT: usize = 6; +const PER_HOUR: usize = 60; +/// The page's JSON. +const MAX_FORM: usize = 64 << 10; + +pub struct Config { + /// `https://playhorizon.dev`: where the form is, and the only origin it + /// takes submissions from. + pub public_url: String, + /// At least 32 bytes: signs sessions. + pub session_key: Vec, + pub github: GitHub, + /// Where files wait during a submission. + pub scratch: PathBuf, +} + +impl Config { + /// `REGISTRY_PUBLIC_URL`, `REGISTRY_SESSION_KEY`, `REGISTRY_REPO`, + /// `GITHUB_CLIENT_ID`, `GITHUB_CLIENT_SECRET`, `GITHUB_BOT_TOKEN`. + pub fn from_env() -> Result { + let var = |name: &str| std::env::var(name).map_err(|_| format!("{name} is not set")); + let key = var("REGISTRY_SESSION_KEY")?; + if key.len() < 32 { + return Err("REGISTRY_SESSION_KEY needs at least 32 characters".into()); + } + Ok(Config { + public_url: var("REGISTRY_PUBLIC_URL")?.trim_end_matches('/').to_owned(), + session_key: key.into_bytes(), + github: GitHub::new( + github::Endpoints::default(), + std::env::var("REGISTRY_REPO").unwrap_or_else(|_| "ludovic111/horizon-mods".into()), + var("GITHUB_CLIENT_ID")?, + var("GITHUB_CLIENT_SECRET")?, + var("GITHUB_BOT_TOKEN")?, + ), + scratch: std::env::temp_dir().join("horizon-mod-registry"), + }) + } + + fn callback(&self) -> String { + format!("{}/api/mods/auth/callback", self.public_url) + } +} + +#[derive(Clone)] +pub struct App(Arc); + +struct Inner { + config: Config, + recent: Mutex>>, +} + +impl App { + pub fn new(config: Config) -> App { + App(Arc::new(Inner { + config, + recent: Mutex::new(HashMap::new()), + })) + } +} + +pub fn router(app: App) -> Router { + Router::new() + .route("/healthz", get(|| async { "ok" })) + .route("/api/mods/auth/login", get(login)) + .route("/api/mods/auth/callback", get(callback)) + .route("/api/mods/auth/logout", post(logout)) + .route("/api/mods/me", get(me)) + .route( + "/api/mods/submit", + post(submit).layer(DefaultBodyLimit::max( + index::MAX_FILE as usize + MAX_FORM * 2, + )), + ) + .with_state(app) +} + +/// An error players read in the form. +#[derive(Debug)] +pub struct Refusal(StatusCode, String); + +impl Refusal { + fn new(status: StatusCode, message: impl Into) -> Refusal { + Refusal(status, message.into()) + } +} + +impl IntoResponse for Refusal { + fn into_response(self) -> Response { + (self.0, Json(json!({"error": self.1}))).into_response() + } +} + +fn bad(message: impl Into) -> Refusal { + Refusal::new(StatusCode::BAD_REQUEST, message) +} + +fn github_down(e: github::Failure) -> Refusal { + eprintln!("horizon-mod-registry: GitHub {}: {}", e.status, e.message); + Refusal::new( + StatusCode::BAD_GATEWAY, + "GitHub didn't answer as expected: try again in a minute", + ) +} + +// Signed values: `.`, both base64url. + +fn sign(key: &[u8], payload: &str) -> String { + let mut mac = Hmac::::new_from_slice(key).expect("any key length"); + mac.update(payload.as_bytes()); + format!( + "{}.{}", + URL_SAFE_NO_PAD.encode(payload), + URL_SAFE_NO_PAD.encode(mac.finalize().into_bytes()) + ) +} + +fn unsign(key: &[u8], value: &str) -> Option { + let (payload, tag) = value.split_once('.')?; + let payload = String::from_utf8(URL_SAFE_NO_PAD.decode(payload).ok()?).ok()?; + let mut mac = Hmac::::new_from_slice(key).ok()?; + mac.update(payload.as_bytes()); + mac.verify_slice(&URL_SAFE_NO_PAD.decode(tag).ok()?).ok()?; + Some(payload) +} + +fn now() -> u64 { + SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_secs() +} + +fn random_hex() -> String { + let mut bytes = [0u8; 16]; + getrandom::fill(&mut bytes).expect("the system's random numbers"); + bytes.iter().map(|b| format!("{b:02x}")).collect() +} + +fn cookie(headers: &HeaderMap, name: &str) -> Option { + headers + .get_all(header::COOKIE) + .iter() + .filter_map(|v| v.to_str().ok()) + .flat_map(|v| v.split(';')) + .filter_map(|c| c.trim().split_once('=')) + .find(|(k, _)| *k == name) + .map(|(_, v)| v.to_owned()) +} + +fn set_cookie(name: &str, value: &str, max_age: u64) -> String { + format!("{name}={value}; Path=/api/mods; HttpOnly; Secure; SameSite=Lax; Max-Age={max_age}") +} + +/// The signed-in account: (login, id). +fn session(app: &Inner, headers: &HeaderMap) -> Option<(String, u64)> { + let payload = unsign(&app.config.session_key, &cookie(headers, "hm_session")?)?; + let mut parts = payload.split('\n'); + let (login, id, until) = (parts.next()?, parts.next()?, parts.next()?); + (until.parse::().ok()? > now()).then(|| (login.to_owned(), id.parse().unwrap_or(0))) +} + +/// The form sends this with each submission: a page on another site can't +/// read it, so it can't submit in a signed-in creator's name. +fn csrf(app: &Inner, headers: &HeaderMap) -> Option { + let session = cookie(headers, "hm_session")?; + let signed = sign(&app.config.session_key, &format!("csrf\n{session}")); + Some(signed.rsplit('.').next()?.chars().take(32).collect()) +} + +async fn login(State(app): State) -> Response { + let state = random_hex(); + let signed = sign(&app.0.config.session_key, &state); + let url = app + .0 + .config + .github + .authorize_url(&app.0.config.callback(), &state); + ( + [(header::SET_COOKIE, set_cookie("hm_state", &signed, 600))], + Redirect::to(&url), + ) + .into_response() +} + +#[derive(Deserialize)] +struct Callback { + code: String, + state: String, +} + +async fn callback( + State(app): State, + headers: HeaderMap, + Query(q): Query, +) -> Result { + let expected = cookie(&headers, "hm_state").and_then(|v| unsign(&app.0.config.session_key, &v)); + if expected.as_deref() != Some(q.state.as_str()) { + return Err(Refusal::new( + StatusCode::FORBIDDEN, + "the sign-in expired or didn't start here: try again", + )); + } + let inner = app.0.clone(); + let (login, id) = tokio::task::spawn_blocking(move || { + inner + .config + .github + .sign_in(&q.code, &inner.config.callback()) + }) + .await + .map_err(|_| Refusal::new(StatusCode::INTERNAL_SERVER_ERROR, "sign-in failed"))? + .map_err(github_down)?; + let value = sign( + &app.0.config.session_key, + &format!("{login}\n{id}\n{}", now() + SESSION), + ); + let back = format!("{}/mods/submit", app.0.config.public_url); + let mut response = Redirect::to(&back).into_response(); + let headers = response.headers_mut(); + headers.append( + header::SET_COOKIE, + set_cookie("hm_session", &value, SESSION).parse().unwrap(), + ); + headers.append( + header::SET_COOKIE, + set_cookie("hm_state", "", 0).parse().unwrap(), + ); + Ok(response) +} + +async fn logout() -> Response { + ( + [(header::SET_COOKIE, set_cookie("hm_session", "", 0))], + StatusCode::NO_CONTENT, + ) + .into_response() +} + +async fn me( + State(app): State, + headers: HeaderMap, +) -> Result, Refusal> { + let (login, _) = session(&app.0, &headers) + .ok_or_else(|| Refusal::new(StatusCode::UNAUTHORIZED, "not signed in"))?; + Ok(Json( + json!({"login": login, "csrf": csrf(&app.0, &headers)}), + )) +} + +/// The page a submission fills in: a project's fields, and the version's. +#[derive(Clone, Debug, Deserialize)] +#[serde(deny_unknown_fields)] +pub struct Form { + pub id: String, + pub kind: String, + pub name: String, + pub summary: String, + #[serde(default)] + pub description: String, + #[serde(default)] + pub authors: Vec, + pub license: String, + pub source: String, + /// `https://` only; an icon in the repository is a pull request by hand. + #[serde(default)] + pub icon: Option, + /// A new project's minisign public key. + #[serde(default)] + pub key: Option, + /// The `.minisig` text. + #[serde(default)] + pub signature: Option, + pub version: String, + pub game: String, + #[serde(default)] + pub changelog: String, +} + +fn take(window: &mut VecDeque, max: usize) -> bool { + while window + .front() + .is_some_and(|t| t.elapsed() > Duration::from_secs(3600)) + { + window.pop_front(); + } + window.len() < max +} + +async fn submit( + State(app): State, + headers: HeaderMap, + mut multipart: Multipart, +) -> Result, Refusal> { + let inner = app.0.clone(); + let origin = headers.get(header::ORIGIN).and_then(|v| v.to_str().ok()); + if origin != Some(inner.config.public_url.as_str()) { + return Err(Refusal::new( + StatusCode::FORBIDDEN, + "submit from the registry's form", + )); + } + let (login, user_id) = session(&inner, &headers) + .ok_or_else(|| Refusal::new(StatusCode::UNAUTHORIZED, "sign in with GitHub first"))?; + let sent = headers.get("x-csrf-token").and_then(|v| v.to_str().ok()); + if sent.is_none() || sent.map(str::to_owned) != csrf(&inner, &headers) { + return Err(Refusal::new( + StatusCode::FORBIDDEN, + "reload the form and try again", + )); + } + { + let mut recent = inner.recent.lock().unwrap(); + let ok = take(recent.entry(String::new()).or_default(), PER_HOUR) + && take(recent.entry(login.to_lowercase()).or_default(), PER_ACCOUNT); + if !ok { + return Err(Refusal::new( + StatusCode::TOO_MANY_REQUESTS, + "too many submissions this hour: try again later", + )); + } + let at = Instant::now(); + recent.entry(String::new()).or_default().push_back(at); + recent + .entry(login.to_lowercase()) + .or_default() + .push_back(at); + } + let dir = inner.config.scratch.join(random_hex()); + std::fs::create_dir_all(&dir) + .map_err(|e| Refusal::new(StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?; + let result = receive(&mut multipart, &dir).await; + let result = match result { + Ok((form, file)) => { + let inner = inner.clone(); + tokio::task::spawn_blocking(move || { + publish(&inner.config, &login, user_id, &form, &file) + }) + .await + .unwrap_or_else(|_| { + Err(Refusal::new( + StatusCode::INTERNAL_SERVER_ERROR, + "the check crashed", + )) + }) + } + Err(e) => Err(e), + }; + let _ = std::fs::remove_dir_all(&dir); + result.map(|url| Json(json!({"pull_request": url}))) +} + +/// Reads the form's two parts: `entry` (JSON) and `file`, streamed to `dir`. +async fn receive(multipart: &mut Multipart, dir: &Path) -> Result<(Form, PathBuf), Refusal> { + use tokio::io::AsyncWriteExt; + let (mut form, mut file) = (None, None); + while let Some(mut field) = multipart + .next_field() + .await + .map_err(|e| bad(e.body_text()))? + { + match field.name() { + Some("entry") => { + let text = field.text().await.map_err(|e| bad(e.body_text()))?; + if text.len() > MAX_FORM { + return Err(bad("the page's text is too long")); + } + form = Some(serde_json::from_str::
(&text).map_err(|e| bad(e.to_string()))?); + } + Some("file") => { + let path = dir.join("upload"); + let mut out = tokio::fs::File::create(&path) + .await + .map_err(|e| Refusal::new(StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?; + let mut size = 0u64; + while let Some(chunk) = field.chunk().await.map_err(|e| bad(e.body_text()))? { + size += chunk.len() as u64; + if size > index::MAX_FILE { + return Err(bad(format!( + "the file is over {} MiB", + index::MAX_FILE >> 20 + ))); + } + out.write_all(&chunk).await.map_err(|e| { + Refusal::new(StatusCode::INTERNAL_SERVER_ERROR, e.to_string()) + })?; + } + out.flush().await.ok(); + file = Some(path); + } + _ => {} + } + } + match (form, file) { + (Some(form), Some(file)) => Ok((form, file)), + _ => Err(bad("send the page and the file")), + } +} + +/// `YYYY-MM-DD` of a Unix time (UTC). +fn date(secs: u64) -> String { + // Howard Hinnant's days-to-civil. + let z = (secs / 86400) as i64 + 719_468; + let era = z.div_euclid(146_097); + let doe = z - era * 146_097; + let yoe = (doe - doe / 1460 + doe / 36524 - doe / 146_096) / 365; + let doy = doe - (365 * yoe + yoe / 4 - yoe / 100); + let mp = (5 * doy + 2) / 153; + let d = doy - (153 * mp + 2) / 5 + 1; + let m = if mp < 10 { mp + 3 } else { mp - 9 }; + let y = yoe + era * 400 + i64::from(m <= 2); + format!("{y:04}-{m:02}-{d:02}") +} + +/// The submission, past its checks: the entry written on a new branch and a +/// pull request opened. Returns the pull request's address. +pub fn publish( + config: &Config, + login: &str, + user_id: u64, + form: &Form, + file: &Path, +) -> Result { + let gh = &config.github; + let kind = Kind::from(form.kind.clone()); + registry::open(&kind).map_err(bad)?; + if !index::valid_id(&form.id) { + return Err(bad("an id is 1 to 64 of a-z, 0-9 and _")); + } + if form + .icon + .as_ref() + .is_some_and(|i| !i.starts_with("https://")) + { + return Err(bad("the icon must be an https:// address")); + } + if !form.source.trim().starts_with("https://") { + return Err(bad("the source must be an https:// address of the code")); + } + if form.name.trim().is_empty() || form.license.trim().is_empty() { + return Err(bad("a project needs a name and a licence")); + } + // The file's own checks first: a wrong file never reaches GitHub. + let facts = index::inspect(&kind, file).map_err(bad)?; + if let Some(id) = facts.id.as_ref().filter(|id| **id != form.id) { + return Err(bad(format!("the file's id is {id:?}, not {:?}", form.id))); + } + if let Some(v) = facts + .version + .as_ref() + .filter(|v| **v != form.version.trim()) + { + return Err(bad(format!( + "the file says version {v:?}, not {:?}", + form.version.trim() + ))); + } + let sha256 = index::sha256_file(file).map_err(bad)?; + let extension = kind.extension().unwrap_or("zip"); + let version = EntryVersion { + version: form.version.trim().to_owned(), + published: date(now()), + game: form.game.trim().to_owned(), + file: format!("{}-{}.{extension}", form.id, form.version.trim()), + sha256: sha256.clone(), + signature: form.signature.clone().filter(|s| !s.trim().is_empty()), + changelog: form.changelog.clone(), + }; + let existing = gh.entry(&form.id).map_err(github_down)?; + let is_new = existing.is_none(); + let (entry, blob) = match existing { + None => ( + Entry { + id: form.id.clone(), + kind: kind.clone(), + name: form.name.trim().to_owned(), + summary: form.summary.trim().to_owned(), + description: form.description.clone(), + authors: form.authors.clone(), + owners: vec![login.to_owned()], + license: form.license.trim().to_owned(), + source: form.source.trim().to_owned(), + icon: form.icon.clone(), + key: form.key.clone().filter(|k| !k.trim().is_empty()), + versions: vec![version.clone()], + }, + None, + ), + Some((mut entry, blob)) => { + if !entry.owners.iter().any(|o| o.eq_ignore_ascii_case(login)) { + return Err(Refusal::new( + StatusCode::FORBIDDEN, + format!( + "{} is {}'s: only its owners publish its updates", + form.id, + entry.owners.join(", ") + ), + )); + } + if entry.kind != kind { + return Err(bad(format!("{} is a {}", form.id, entry.kind.name()))); + } + if entry.versions.iter().any(|v| v.version == version.version) { + return Err(Refusal::new( + StatusCode::CONFLICT, + format!( + "{} {} is already published: give this file a new version", + form.id, version.version + ), + )); + } + let key = form.key.clone().filter(|k| !k.trim().is_empty()); + if key.is_some() && key != entry.key { + return Err(bad( + "changing a project's key is a pull request by hand, reviewed on its own", + )); + } + entry.name = form.name.trim().to_owned(); + entry.summary = form.summary.trim().to_owned(); + entry.description = form.description.clone(); + entry.authors = form.authors.clone(); + entry.license = form.license.trim().to_owned(); + entry.source = form.source.trim().to_owned(); + if form.icon.is_some() { + entry.icon = form.icon.clone(); + } + entry.versions.insert(0, version.clone()); + (entry, Some(blob)) + } + }; + // Every check CI runs but the trial run: the file as its kind, its id and + // version, its signature, the entry's fields. CI runs it all again. + let files = file.parent().unwrap_or(Path::new(".")); + std::fs::copy(file, files.join(&sha256)).map_err(|e| bad(e.to_string()))?; + let mut checked = entry.clone(); + checked.versions.truncate(1); + if checked + .icon + .as_ref() + .is_some_and(|i| !i.starts_with("https://")) + { + checked.icon = None; + } + let project = registry::project( + &checked, + &Sources { + registry: files, + files, + release: index::FILE_HOST, + site: "https://example.invalid/", + generated: String::new(), + }, + ) + .map_err(|errors| bad(errors.join("; ")))?; + let text = entry.to_toml().map_err(bad)?; + gh.stage(&format!("{sha256}.{extension}"), file) + .map_err(github_down)?; + let branch = format!("submit/{}-{}", form.id, version.version); + if !gh.branch(&branch).map_err(github_down)? { + return Err(Refusal::new( + StatusCode::CONFLICT, + format!( + "{} {} was already submitted: its pull request is open", + form.id, version.version + ), + )); + } + let what = if is_new { "Add" } else { "Update" }; + let message = format!( + "{what} {} {}\n\nSubmitted by @{login} through the form.\n\nCo-authored-by: {login} <{user_id}+{login}@users.noreply.github.com>", + form.id, version.version + ); + gh.put( + &format!("mods/{}.toml", form.id), + &text, + &branch, + blob.as_deref(), + &message, + ) + .map_err(github_down)?; + let v = &project.versions[0]; + let capabilities: Vec = v + .capabilities + .iter() + .map(|c| format!("- may {}", c.describe())) + .collect(); + let requires: Vec = v + .requires + .iter() + .map(|r| format!("- needs {} {}", r.id, r.version)) + .collect(); + let body = format!( + "\nSubmitted by @{login} through [the form]({public}/mods/submit).\n\n\ + | | |\n|---|---|\n| Project | `{id}` ({kind}, {new}) |\n| Version | {version} for {game} |\n| File | `{file}`, {size} bytes, SHA-256 `{sha256}` |\n| Signed | {signed} |\n| Source | {source} |\n\n{lists}\n\n\ + The checks below run the file's own checks again and, for a mod, a trial run in the sandbox. \ + Reviewers: read the source and the checks' report before you approve.", + public = config.public_url, + id = form.id, + kind = kind.name(), + new = if is_new { "new" } else { "update" }, + version = v.version, + game = v.game, + file = v.file.name, + size = v.file.size, + signed = if entry.key.is_some() { + "yes, with the project's key" + } else { + "no" + }, + source = entry.source, + lists = [capabilities, requires].concat().join("\n"), + ); + gh.pull( + &format!("{what} {} {}", form.id, version.version), + &branch, + &body, + ) + .map_err(github_down) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn dates_and_signatures() { + assert_eq!(date(0), "1970-01-01"); + assert_eq!(date(1_792_800_000), "2026-10-24"); + let key = b"0123456789abcdef0123456789abcdef"; + let signed = sign(key, "alice\n7\n99"); + assert_eq!(unsign(key, &signed).as_deref(), Some("alice\n7\n99")); + assert_eq!(unsign(b"another key, another key, another", &signed), None); + let forged = format!( + "{}.{}", + URL_SAFE_NO_PAD.encode("mallory\n8\n99"), + signed.split_once('.').unwrap().1 + ); + assert_eq!(unsign(key, &forged), None); + } +} diff --git a/crates/horizon-mod-registry/src/main.rs b/crates/horizon-mod-registry/src/main.rs new file mode 100644 index 000000000..81fe1b7b6 --- /dev/null +++ b/crates/horizon-mod-registry/src/main.rs @@ -0,0 +1,25 @@ +//! `horizon-mod-registry`: serves on `PORT` (default 8080). Configured by the +//! environment (see `Config::from_env`); keeps no data. +use std::net::SocketAddr; + +use horizon_mod_registry::{App, Config, router}; + +#[tokio::main(flavor = "multi_thread", worker_threads = 2)] +async fn main() { + let port: u16 = std::env::var("PORT") + .ok() + .and_then(|p| p.parse().ok()) + .unwrap_or(8080); + let config = Config::from_env().unwrap_or_else(|e| panic!("horizon-mod-registry: {e}")); + let repo = config.github.repo.clone(); + let listener = tokio::net::TcpListener::bind(SocketAddr::from(([0, 0, 0, 0], port))) + .await + .unwrap_or_else(|e| panic!("port {port}: {e}")); + eprintln!("horizon-mod-registry: listening on {port}, submitting to {repo}"); + axum::serve(listener, router(App::new(config))) + .with_graceful_shutdown(async { + let _ = tokio::signal::ctrl_c().await; + }) + .await + .unwrap_or_else(|e| panic!("{e}")); +} diff --git a/crates/horizon-mod-registry/tests/submit.rs b/crates/horizon-mod-registry/tests/submit.rs new file mode 100644 index 000000000..77487089d --- /dev/null +++ b/crates/horizon-mod-registry/tests/submit.rs @@ -0,0 +1,373 @@ +//! The whole submission against a mock GitHub: sign in, submit the sample +//! signed mod (`crates/horizon-mods/tests/index`), and what lands on GitHub; +//! then what is refused. +use axum::{ + Json, Router, + body::{Body, Bytes}, + extract::{Path as UrlPath, Query, State}, + http::{Request, StatusCode, header}, + routing::{get, post}, +}; +use base64::{Engine, engine::general_purpose::STANDARD}; +use horizon_mod_registry::{App, Config, github, router}; +use horizon_mods::index::registry::Entry; +use http_body_util::BodyExt; +use serde_json::{Value, json}; +use std::{ + collections::HashMap, + path::PathBuf, + sync::{Arc, Mutex}, +}; +use tower::ServiceExt; + +const PUBLIC: &str = "https://playhorizon.test"; +const HMOD_SHA: &str = "e1135345692f6dd8fd4c51920151944b82333e17049c9bb7d756f27b8deefc53"; + +#[derive(Default)] +struct Mock { + /// Path -> text on main. + main: HashMap, + assets: Vec<(String, usize)>, + branches: Vec, + /// (branch, path) -> (text, message, replaced blob). + commits: HashMap<(String, String), (String, String, Option)>, + pulls: Vec, + /// The account the next sign-in gets. + login: String, +} + +type Shared = Arc>; + +async fn mock_github() -> (String, Shared) { + let state: Shared = Arc::default(); + state.lock().unwrap().login = "alice".into(); + let app = Router::new() + .route( + "/login/oauth/access_token", + post(|Json(body): Json| async move { + Json(if body["code"] == "good" { + json!({"access_token": "gho_user"}) + } else { + json!({"error": "bad_verification_code"}) + }) + }), + ) + .route( + "/user", + get(|State(s): State| async move { + Json(json!({"login": s.lock().unwrap().login, "id": 7})) + }), + ) + .route( + "/repos/o/r/contents/mods/{file}", + get( + |State(s): State, UrlPath(file): UrlPath| async move { + let s = s.lock().unwrap(); + match s.main.get(&format!("mods/{file}")) { + Some(text) => Ok(Json(json!({"content": STANDARD.encode(text), "sha": "blob1"}))), + None => Err(StatusCode::NOT_FOUND), + } + }, + ) + .put( + |State(s): State, UrlPath(file): UrlPath, Json(b): Json| async move { + let text = String::from_utf8(STANDARD.decode(b["content"].as_str().unwrap()).unwrap()).unwrap(); + let key = (b["branch"].as_str().unwrap().to_owned(), format!("mods/{file}")); + let value = (text, b["message"].as_str().unwrap().to_owned(), b["sha"].as_str().map(str::to_owned)); + s.lock().unwrap().commits.insert(key, value); + Json(json!({})) + }, + ), + ) + .route( + "/repos/o/r/releases/tags/staging", + get(|State(s): State| async move { + let names: Vec = s.lock().unwrap().assets.iter().map(|(n, _)| json!({"name": n})).collect(); + Json(json!({"id": 42, "assets": names})) + }), + ) + .route( + "/repos/o/r/releases/42/assets", + post( + |State(s): State, Query(q): Query>, body: Bytes| async move { + s.lock().unwrap().assets.push((q["name"].clone(), body.len())); + Json(json!({})) + }, + ), + ) + .route( + "/repos/o/r/git/ref/heads/main", + get(|| async { Json(json!({"object": {"sha": "abc123"}})) }), + ) + .route( + "/repos/o/r/git/refs", + post(|State(s): State, Json(b): Json| async move { + assert_eq!(b["sha"], "abc123"); + let name = b["ref"].as_str().unwrap().trim_start_matches("refs/heads/").to_owned(); + let mut s = s.lock().unwrap(); + if s.branches.contains(&name) { + return Err(StatusCode::UNPROCESSABLE_ENTITY); + } + s.branches.push(name); + Ok(Json(json!({}))) + }), + ) + .route( + "/repos/o/r/pulls", + post(|State(s): State, Json(b): Json| async move { + let mut s = s.lock().unwrap(); + s.pulls.push(b); + Json(json!({"html_url": format!("https://github.com/o/r/pull/{}", s.pulls.len())})) + }), + ) + .with_state(state.clone()); + let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap(); + let base = format!("http://{}", listener.local_addr().unwrap()); + tokio::spawn(async move { axum::serve(listener, app).await.unwrap() }); + (base, state) +} + +fn fixtures() -> PathBuf { + PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../horizon-mods/tests/index") +} + +struct Client { + app: Router, + cookies: HashMap, +} + +impl Client { + async fn send(&mut self, request: Request) -> (StatusCode, Value, Option) { + let response = self.app.clone().oneshot(request).await.unwrap(); + let status = response.status(); + for c in response.headers().get_all(header::SET_COOKIE) { + let (pair, _) = c.to_str().unwrap().split_once(';').unwrap(); + let (k, v) = pair.split_once('=').unwrap(); + self.cookies.insert(k.into(), v.into()); + } + let location = response + .headers() + .get(header::LOCATION) + .map(|l| l.to_str().unwrap().to_owned()); + let bytes = response.into_body().collect().await.unwrap().to_bytes(); + ( + status, + serde_json::from_slice(&bytes).unwrap_or(Value::Null), + location, + ) + } + + fn cookie_header(&self) -> String { + self.cookies + .iter() + .filter(|(_, v)| !v.is_empty()) + .map(|(k, v)| format!("{k}={v}")) + .collect::>() + .join("; ") + } + + fn get(&self, uri: &str) -> Request { + Request::get(uri) + .header(header::COOKIE, self.cookie_header()) + .body(Body::empty()) + .unwrap() + } + + async fn sign_in(&mut self) -> String { + let (status, _, location) = self.send(self.get("/api/mods/auth/login")).await; + assert_eq!(status, StatusCode::SEE_OTHER); + let location = location.unwrap(); + assert!(location.contains( + "redirect_uri=https%3A%2F%2Fplayhorizon.test%2Fapi%2Fmods%2Fauth%2Fcallback" + )); + let state = location + .split("state=") + .nth(1) + .unwrap() + .split('&') + .next() + .unwrap() + .to_owned(); + // Another state than the one this browser started with is refused. + let (status, ..) = self + .send(self.get("/api/mods/auth/callback?code=good&state=other")) + .await; + assert_eq!(status, StatusCode::FORBIDDEN); + let (status, _, location) = self + .send(self.get(&format!("/api/mods/auth/callback?code=good&state={state}"))) + .await; + assert_eq!(status, StatusCode::SEE_OTHER); + assert_eq!( + location.as_deref(), + Some("https://playhorizon.test/mods/submit") + ); + let (status, me, _) = self.send(self.get("/api/mods/me")).await; + assert_eq!(status, StatusCode::OK); + me["csrf"].as_str().unwrap().to_owned() + } + + async fn submit(&mut self, csrf: &str, form: &Value, file: &[u8]) -> (StatusCode, Value) { + let boundary = "XhorizonX"; + let mut body = format!( + "--{boundary}\r\nContent-Disposition: form-data; name=\"entry\"\r\n\r\n{form}\r\n--{boundary}\r\nContent-Disposition: form-data; name=\"file\"; filename=\"f\"\r\nContent-Type: application/octet-stream\r\n\r\n" + ) + .into_bytes(); + body.extend_from_slice(file); + body.extend_from_slice(format!("\r\n--{boundary}--\r\n").as_bytes()); + let request = Request::post("/api/mods/submit") + .header(header::COOKIE, self.cookie_header()) + .header(header::ORIGIN, PUBLIC) + .header("x-csrf-token", csrf) + .header( + header::CONTENT_TYPE, + format!("multipart/form-data; boundary={boundary}"), + ) + .body(Body::from(body)) + .unwrap(); + let (status, json, _) = self.send(request).await; + (status, json) + } +} + +fn form() -> Value { + let key = std::fs::read_to_string(fixtures().join("test.pub")).unwrap(); + json!({ + "id": "coords_hud", + "kind": "mod", + "name": "Coordinates HUD", + "summary": "Your coordinates in a corner.", + "authors": ["Alice"], + "license": "MIT", + "source": "https://github.com/alice/coords", + "key": key.lines().last().unwrap(), + "signature": std::fs::read_to_string(fixtures().join("coords_hud-0.1.0.hmod.minisig")).unwrap(), + "version": "0.1.0", + "game": "26.3", + }) +} + +async fn setup() -> (Client, Shared) { + let (base, mock) = mock_github().await; + let scratch = + std::env::temp_dir().join(format!("horizon-mod-registry-test-{}", std::process::id())); + let config = Config { + public_url: PUBLIC.into(), + session_key: b"a test key of at least thirty-two bytes".to_vec(), + github: github::GitHub::new( + github::Endpoints { + web: base.clone(), + api: base.clone(), + uploads: base, + }, + "o/r".into(), + "client".into(), + "secret".into(), + "bot".into(), + ), + scratch, + }; + let client = Client { + app: router(App::new(config)), + cookies: HashMap::new(), + }; + (client, mock) +} + +#[tokio::test(flavor = "multi_thread")] +async fn a_submission_becomes_a_pull_request() { + let (mut client, mock) = setup().await; + let file = std::fs::read(fixtures().join("coords_hud-0.1.0.hmod")).unwrap(); + // Not signed in. + let (status, _) = client.submit("x", &form(), &file).await; + assert_eq!(status, StatusCode::UNAUTHORIZED); + let csrf = client.sign_in().await; + let (status, _) = client.submit("wrong", &form(), &file).await; + assert_eq!(status, StatusCode::FORBIDDEN); + + let (status, json) = client.submit(&csrf, &form(), &file).await; + assert_eq!(status, StatusCode::OK, "{json}"); + assert_eq!(json["pull_request"], "https://github.com/o/r/pull/1"); + { + let m = mock.lock().unwrap(); + assert_eq!(m.assets, [(format!("{HMOD_SHA}.hmod"), file.len())]); + assert_eq!(m.branches, ["submit/coords_hud-0.1.0"]); + let (text, message, replaced) = &m.commits[&( + "submit/coords_hud-0.1.0".into(), + "mods/coords_hud.toml".into(), + )]; + let entry: Entry = toml::from_str(text).unwrap(); + assert_eq!(entry.owners, ["alice"]); + assert_eq!(entry.versions[0].sha256, HMOD_SHA); + assert_eq!(entry.versions[0].file, "coords_hud-0.1.0.hmod"); + assert!(entry.versions[0].signature.is_some() && entry.key.is_some()); + assert!(message.contains("Co-authored-by: alice <7+alice@users.noreply.github.com>")); + assert_eq!(replaced, &None); + let body = m.pulls[0]["body"].as_str().unwrap(); + assert!(body.starts_with(""), "{body}"); + assert!(body.contains("may draw text on your screen"), "{body}"); + } + // The same version again: its branch is there. + let (status, json) = client.submit(&csrf, &form(), &file).await; + assert_eq!(status, StatusCode::CONFLICT, "{json}"); + assert_eq!(mock.lock().unwrap().assets.len(), 1, "uploaded once"); +} + +#[tokio::test(flavor = "multi_thread")] +async fn what_the_form_refuses() { + let (mut client, mock) = setup().await; + let file = std::fs::read(fixtures().join("coords_hud-0.1.0.hmod")).unwrap(); + let csrf = client.sign_in().await; + let refused = |status: StatusCode, json: &Value, part: &str| { + assert!( + json["error"].as_str().unwrap_or("").contains(part), + "{status} {json}" + ); + }; + // A file that isn't what the page says. + let mut f = form(); + f["id"] = json!("other_mod"); + let (status, json) = client.submit(&csrf, &f, &file).await; + assert_eq!(status, StatusCode::BAD_REQUEST); + refused(status, &json, "the file's id is \"coords_hud\""); + // A broken signature. + let mut f = form(); + f["signature"] = json!( + std::fs::read_to_string(fixtures().join("coords_hud-0.1.0.hmod.minisig")) + .unwrap() + .replace("RUTV", "RUTW") + ); + let (status, json) = client.submit(&csrf, &f, &file).await; + assert_eq!(status, StatusCode::BAD_REQUEST, "{json}"); + // Shader packs aren't open. + let mut f = form(); + f["kind"] = json!("shader"); + let (status, json) = client.submit(&csrf, &f, &file).await; + refused(status, &json, "shader packs open"); + // An update by someone who isn't an owner. + let owned = "id = \"coords_hud\"\nkind = \"mod\"\nname = \"C\"\nsummary = \"s\"\nowners = [\"bob\"]\nlicense = \"MIT\"\nsource = \"https://x.test\"\n\n[[versions]]\nversion = \"0.0.1\"\npublished = \"2026-01-01\"\ngame = \"26.3\"\nfile = \"coords_hud-0.0.1.hmod\"\nsha256 = \"0000000000000000000000000000000000000000000000000000000000000000\"\n"; + mock.lock() + .unwrap() + .main + .insert("mods/coords_hud.toml".into(), owned.into()); + let (status, json) = client.submit(&csrf, &form(), &file).await; + assert_eq!(status, StatusCode::FORBIDDEN); + refused(status, &json, "bob's"); + // From another site. + let mut request = Request::post("/api/mods/submit") + .header(header::COOKIE, client.cookie_header()) + .header(header::ORIGIN, "https://evil.test") + .header("x-csrf-token", &csrf) + .body(Body::empty()) + .unwrap(); + request.headers_mut().insert( + header::CONTENT_TYPE, + "multipart/form-data; boundary=x".parse().unwrap(), + ); + let (status, ..) = client.send(request).await; + assert_eq!(status, StatusCode::FORBIDDEN); + let m = mock.lock().unwrap(); + assert!( + m.assets.is_empty() && m.pulls.is_empty(), + "nothing reached GitHub" + ); +} diff --git a/docs/api/mod-index.md b/docs/api/mod-index.md index afa6e8944..beb6ec2c8 100644 --- a/docs/api/mod-index.md +++ b/docs/api/mod-index.md @@ -129,6 +129,8 @@ reason = "Sent chat messages it didn't declare." date = "2026-10-24" ``` +The submission form's service (`crates/horizon-mod-registry`) writes these entries: it signs the creator in with GitHub, runs the file's checks, uploads the file to the repository's `staging` release as `.` and opens the pull request. Only an entry's `owners` publish updates through it. + Unknown keys are refused. Its CI runs `cargo-horizon-mod` (`crates/cargo-horizon-mod`): | Command | What it does | From 8800d1878a9c903942da4f65e65386c562aa73af Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 00:03:46 +0200 Subject: [PATCH 056/140] Perlin volume: one loop with a BATCH switch instead of a test copy The batched loop and the one-at-a-time reference were two copies of the same 100 lines; a const generic picks the path, so the test compares the code that ships with itself minus the batching. Drops the ignored microkernel timer. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-core/src/noise/perlin.rs | 137 +++--------------------- 1 file changed, 16 insertions(+), 121 deletions(-) diff --git a/crates/horizon-core/src/noise/perlin.rs b/crates/horizon-core/src/noise/perlin.rs index fcebd2f1b..130238c41 100644 --- a/crates/horizon-core/src/noise/perlin.rs +++ b/crates/horizon-core/src/noise/perlin.rs @@ -148,10 +148,11 @@ impl PerlinNoise { y_scale: f64, amplitude: f32, ) -> Result<(), DensityError> { - self.add_volume(buffer, volume, xz_scale, y_scale, amplitude, None) + self.add_volume::(buffer, volume, xz_scale, y_scale, amplitude, None) } - fn add_volume( + /// `BATCH` = false evaluates one Y at a time: the reference the batched loop is tested against. + fn add_volume( &self, buffer: &mut [f32], volume: DensityVolume, @@ -220,9 +221,12 @@ impl PerlinNoise { } previous_y = sample.cell; } - // Batch independent Y samples for LLVM's portable SIMD - // lowering; boundaries and tails use the scalar path. - if y + 4 <= size_y && ys[y + 1..y + 4].iter().all(|s| s.cell == sample.cell) { + // Four Ys in one cell share the corners: side by side, LLVM computes them + // as vectors. Cell boundaries and the column's tail go one at a time. + if BATCH + && y + 4 <= size_y + && ys[y + 1..y + 4].iter().all(|s| s.cell == sample.cell) + { add_four( &mut column[y..y + 4], &ys[y..y + 4], @@ -248,84 +252,6 @@ impl PerlinNoise { } Ok(()) } - #[cfg(test)] - fn add_volume_scalar( - &self, - buffer: &mut [f32], - volume: DensityVolume, - xz_scale: f64, - y_scale: f64, - amplitude: f32, - fudge_y_scale: Option, - ) -> Result<(), DensityError> { - if buffer.len() < volume.size() { - return Err(DensityError::BufferTooShort); - } - let [size_x, size_y, size_z] = volume.sizes(); - // Every X/Z column walks the same Y coordinates, so their cells, offsets - // and fades are computed once per volume instead of once per column. - let mut stack = [YSample::default(); STACK_Y]; - let mut heap = Vec::new(); - let ys = if size_y <= STACK_Y { - &mut stack[..size_y] - } else { - heap.resize(size_y, YSample::default()); - &mut heap[..] - }; - for (y, sample) in ys.iter_mut().enumerate() { - let input_y = f64::from(volume.coordinate(1, y)) * y_scale; - let shifted_y = wrap(input_y) + self.table.offsets[1]; - let cell = floor_i32(shifted_y); - let dy = shifted_y - f64::from(cell); - *sample = YSample { - cell, - fade: smoothstep(dy as f32), - offset: match fudge_y_scale { - Some(scale) => (dy - compute_fudge_y(input_y, dy, scale)) as f32, - None => dy as f32, - }, - }; - } - let ys = &*ys; - let mut index = 0; - for z in 0..size_z { - let shifted_z = - wrap(f64::from(volume.coordinate(2, z)) * xz_scale) + self.table.offsets[2]; - let cell_z = floor_i32(shifted_z); - let dz = (shifted_z - f64::from(cell_z)) as f32; - let fade_z = smoothstep(dz); - for x in 0..size_x { - let shifted_x = - wrap(f64::from(volume.coordinate(0, x)) * xz_scale) + self.table.offsets[0]; - let cell_x = floor_i32(shifted_x); - let dx = (shifted_x - f64::from(cell_x)) as f32; - let fade_x = smoothstep(dx); - let p = self.table.permute(cell_x); - let q = self.table.permute(cell_x.wrapping_add(1)); - let mut previous_y = i32::MIN; - let mut xz_dots = [0.0_f32; 8]; - let mut y_gradients = [0.0_f32; 8]; - for (sample, out) in ys.iter().zip(&mut buffer[index..index + size_y]) { - if previous_y != sample.cell { - let gradients = self.gradients_at(p, q, sample.cell, cell_z); - for i in 0..8 { - xz_dots[i] = gradients[i][0] * (dx - (i & 1) as f32) - + gradients[i][2] * (dz - ((i >> 2) & 1) as f32); - y_gradients[i] = gradients[i][1]; - } - previous_y = sample.cell; - } - let dy = sample.offset; - let values = std::array::from_fn(|i| { - xz_dots[i] + y_gradients[i] * (dy - ((i >> 1) & 1) as f32) - }); - *out += amplitude * lerp3([fade_x, sample.fade, fade_z], values); - } - index += size_y; - } - } - Ok(()) - } } /// Y columns up to this height keep their per-Y samples on the stack. @@ -391,7 +317,7 @@ impl SmearedPerlinNoise { y_scale: f64, amplitude: f32, ) -> Result<(), DensityError> { - self.base.add_volume( + self.base.add_volume::( buffer, volume, xz_scale, @@ -411,9 +337,8 @@ fn compute_fudge_y(input_y: f64, relative_y: f64, scale: f64) -> f64 { f64::from(floor_i32(limited_y / scale + f64::from(1e-7_f32))) * scale } -// Keep four independent Y lanes visible to SLP without requiring unsafe -// intrinsics or a platform-specific target feature. Scalar lowering remains -// valid on every supported platform, and each lane retains the FP order. +/// Adds four Y samples of one cell, laid out lane by lane so LLVM vectorizes them (no intrinsics, +/// no target feature). Each lane does the one-at-a-time loop's operations in the same order. #[inline] fn add_four( out: &mut [f32], @@ -435,13 +360,12 @@ fn add_four( } #[cfg(test)] -mod simd_tests { +mod tests { use super::*; use crate::random::LegacyRandom; - use std::hint::black_box; #[test] - fn volume_bitwise_scalar_reference() { + fn batched_volume_is_bit_identical() { let scales = [ 0.0, -0.0, @@ -488,10 +412,10 @@ mod simd_tests { let mut b = a.clone(); let amplitude = amplitudes[case % amplitudes.len()]; noise - .add_volume_scalar(&mut a, volume, scale, scale, amplitude, fudge) + .add_volume::(&mut a, volume, scale, scale, amplitude, fudge) .unwrap(); noise - .add_volume(&mut b, volume, scale, scale, amplitude, fudge) + .add_volume::(&mut b, volume, scale, scale, amplitude, fudge) .unwrap(); for (i, (a, b)) in a.iter().zip(&b).enumerate() { assert_eq!( @@ -505,33 +429,4 @@ mod simd_tests { } } } - - #[test] - #[ignore] - fn microkernel() { - let noise = PerlinNoise::new(&mut LegacyRandom::new(1234)); - let volume = DensityVolume::new([5, 49, 5], [-16, -64, 32], [4, 8, 4]).unwrap(); - for scale in [0.001, 0.01, 0.1, 1.0] { - for scalar in [true, false] { - let mut buf = vec![0.0; volume.size()]; - let start = std::time::Instant::now(); - for _ in 0..50000 { - if scalar { - noise - .add_volume_scalar(black_box(&mut buf), volume, scale, scale, 0.5, None) - .unwrap(); - } else { - noise - .add_volume(black_box(&mut buf), volume, scale, scale, 0.5, None) - .unwrap(); - } - } - println!( - "scale={scale} scalar={scalar} seconds={:.6}", - start.elapsed().as_secs_f64() - ); - black_box(buf); - } - } - } } From f1cfb3069f32ededae09a08c94840da703ad7223 Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:25:01 +0100 Subject: [PATCH 057/140] Remove unused launcher release wrapper Co-Authored-By: OpenAI Codex --- launcher/src/backend.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/launcher/src/backend.rs b/launcher/src/backend.rs index 104a086a5..d12dcd13c 100644 --- a/launcher/src/backend.rs +++ b/launcher/src/backend.rs @@ -282,11 +282,6 @@ pub fn releases() -> Result, String> { Ok(parse_releases(&release_list()?, ASSET, is_game_tag)) } -/// Published launcher releases (`launcher-v…`), newest first, with this platform's archive. -pub fn launcher_releases() -> Result, String> { - Ok(launcher_releases_in(&release_list()?)) -} - /// The launcher releases in `list` (the newest 100 releases). Game releases come out several times /// a day, so the newest launcher release can be older than all of those: then the newest /// `launcher@` and `launcher-v` tags are looked up one by one (a draft's tag is skipped: it has no From 2a6347dc555dcef80b7a52511b601e8b8977b80d Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:25:01 +0100 Subject: [PATCH 058/140] Remove unused saved-chunk section loader Co-Authored-By: OpenAI Codex --- crates/horizon-world/src/chunk.rs | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/crates/horizon-world/src/chunk.rs b/crates/horizon-world/src/chunk.rs index fdbefe259..74a2011db 100644 --- a/crates/horizon-world/src/chunk.rs +++ b/crates/horizon-world/src/chunk.rs @@ -318,23 +318,6 @@ impl ChunkData { )?)) } - pub fn load_block_section<'r>( - &self, - block: BlockPos, - registry: &'r BlockRegistry, - ) -> io::Result>> { - let Some(index) = self.section_index(block)? else { - return Ok(None); - }; - let Tag::List(sections) = self.root.tag.get("sections").unwrap() else { - unreachable!() - }; - sections[index] - .get("block_states") - .map(|tag| BlockSection::from_nbt(tag, registry)) - .transpose() - } - /// Storage-only mutation. The caller must arrange simulation-derived updates /// before treating this as a gameplay block placement. pub fn set_block_data(&mut self, block: BlockPos, state: BlockState) -> io::Result { From 7072a407019c0de07d0b81cd2244bcd8cce00aba Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:25:02 +0100 Subject: [PATCH 059/140] Remove orphaned baseline loader benchmark Co-Authored-By: OpenAI Codex --- tools/baseline_loader_profile.rs | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 tools/baseline_loader_profile.rs diff --git a/tools/baseline_loader_profile.rs b/tools/baseline_loader_profile.rs deleted file mode 100644 index f966301b8..000000000 --- a/tools/baseline_loader_profile.rs +++ /dev/null @@ -1,23 +0,0 @@ -//! Historical baseline comparator for PR #607; one normal independent loading sequence. -use horizon_client::{assets::Assets, blocks::BlockFacts}; -use horizon_world::level::Behaviours; -use std::{path::Path, time::Instant}; - -fn main() -> Result<(), Box> { - let mut args = std::env::args().skip(1); - let root = args.next().ok_or("expected prepared resource directory")?; - if args.next().as_deref() != Some("baseline") { - return Err("expected baseline".into()); - } - let root = Path::new(&root); - let total = Instant::now(); - let assets = Assets::load(root)?; - let started = Instant::now(); - let facts = BlockFacts::load(root, assets.registry)?; - let behaviours = Behaviours::load(assets.registry, root)?; - println!("phase_ms={:.3}", started.elapsed().as_secs_f64() * 1000.0); - println!("total_ms={:.3}", total.elapsed().as_secs_f64() * 1000.0); - println!("states={}", facts.states.len()); - std::hint::black_box((facts, behaviours)); - Ok(()) -} From 282ecf16a974bc0c6de5c18b35d7f278ea9279c8 Mon Sep 17 00:00:00 2001 From: socksprox Date: Sun, 25 Oct 2026 00:45:16 +0200 Subject: [PATCH 060/140] Tests: fix boss-event verify failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit boss_event_round_trips missed its #[test] attribute, failing clippy's dead-code lint; unknown_packets_keep_their_payload decoded boss_event, which this PR gives a real decoder, so the garbage payload no longer comes back Unknown — it uses player_look_at, which still has none. Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- crates/horizon-protocol/src/packets/play.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/horizon-protocol/src/packets/play.rs b/crates/horizon-protocol/src/packets/play.rs index 7dd8156c4..1a2880f5e 100644 --- a/crates/horizon-protocol/src/packets/play.rs +++ b/crates/horizon-protocol/src/packets/play.rs @@ -2880,10 +2880,11 @@ mod tests { #[test] fn unknown_packets_keep_their_payload() { - let p = Clientbound::decode(crate::ids::play::clientbound::BOSS_EVENT, &[1, 2, 3]).unwrap(); + let p = + Clientbound::decode(crate::ids::play::clientbound::PLAYER_LOOK_AT, &[1, 2, 3]).unwrap(); assert_eq!( p, - Clientbound::Unknown(crate::ids::play::clientbound::BOSS_EVENT, vec![1, 2, 3]) + Clientbound::Unknown(crate::ids::play::clientbound::PLAYER_LOOK_AT, vec![1, 2, 3]) ); assert_eq!(p.encode()[1..], [1, 2, 3]); } @@ -2980,6 +2981,7 @@ mod tests { w.varint(101); assert!(BookPages::read(&mut Reader::new(&w.data)).is_err()); } + #[test] fn boss_event_round_trips() { let add = Clientbound::BossEvent(BossEvent { id: 0x0123_4567_89ab_cdef_fedc_ba98_7654_3210, From 6774b2b3e78675aeccc83eea48fbb3dd449b528f Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 00:47:49 +0200 Subject: [PATCH 061/140] Docs: "How Horizon is built", a page on who writes it and why it's safe to run New players ask on Discord whether Horizon is legit and whether it is vibecoded. One plain page answers both, every claim checked against the repository today: agents write most of the code, what checks it instead of a human reading every line (harnesses, verify, parity, the contribution gate, the release smoke test), signed checksums, the macOS and Windows signing status as it is (not notarized, not code-signed), the mod sandbox, opt-in telemetry, no Mojang files and no other project's code. On the website (docs nav under Start here, a card in the home page's community section, the footers) and as docs/how-horizon-is-built.md. CONTRIBUTING.md gets the public "Only original code" rule the page links. Co-Authored-By: Claude Opus 5.5 --- CONTRIBUTING.md | 9 ++++++ docs/how-horizon-is-built.md | 41 ++++++++++++++++++++++++++++ website/build.mjs | 2 +- website/docs/how-horizon-is-built.md | 39 ++++++++++++++++++++++++++ website/docs/nav.json | 2 +- website/src/index.html | 3 +- 6 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 docs/how-horizon-is-built.md create mode 100644 website/docs/how-horizon-is-built.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index af44d89f8..5191ea1f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,6 +40,15 @@ probe against Horizon, and compares their outputs. There are about 290 of them. Never commit game files, decompiled source or prepared resources (`.local/`): `tools/check_public_tree.py` rejects them (`git config core.hooksPath .githooks` runs it before every commit). +## Only original code + +Horizon's code is written from Minecraft 26.3 itself and from public documentation, never from another mod, loader +or renderer. Don't read, copy, translate or paraphrase the source of Iris, OptiFine, Sodium or any other project, +and don't send code an AI tool wrote from it. Their user documentation and file formats are fine to read, and their +packs and mods are fine to run and observe. Shader packs were removed on 24 October 2026 (#1561) because their code +had been written from another project's source; they come back only as a clean-room rewrite from a written +description of the pack format. + ## Before asking for review Run the self-check and paste the block it prints into your pull request: diff --git a/docs/how-horizon-is-built.md b/docs/how-horizon-is-built.md new file mode 100644 index 000000000..784abfc88 --- /dev/null +++ b/docs/how-horizon-is-built.md @@ -0,0 +1,41 @@ +# How Horizon is built + +Who writes Horizon, how changes are checked, and why it is safe to run. You can check every claim on this page in the repository, and anything not done yet is marked as not done. + +This page is also on the website: [playhorizon.dev/docs/how-horizon-is-built](https://playhorizon.dev/docs/how-horizon-is-built). The longer version, with what is still missing, is [Security](security.md). + +## Who builds it + +Horizon is Ludovic Marie's project: he decides what it does and what ships. **Most of the code is written by AI agents**: Claude sessions that Ludovic runs, and contributors' own AI tools. Some contributors write their code by hand. + +Agents say what they are. A pull request opened by one of Ludovic's agents starts with "Opened by Ludovic's AI agent (Claude), not by Ludovic himself.", its comments start with "🤖 Agent:", and its commits name the agent in a `Co-Authored-By` line. + +## How changes are checked + +Not every line is read by a person. Instead, every change is checked against the real game, automatically: + +- **Harnesses.** A harness is a test that gives the same inputs to Horizon and to the real Minecraft 26.3, then compares the results. There are 326 of them (25 October 2026), from world generation to mobs, redstone and commands. The [status table](https://playhorizon.dev/#parity) shows what they cover. Passing them all does not prove that nothing else differs. +- **Checks on every pull request.** `verify` runs on GitHub's machines for every pull request and every change to main: formatting, lints with warnings treated as errors, the tests, and the check that no Minecraft files are committed. Main takes no change without it. `parity` runs the harnesses a change can affect, on a machine that holds a copy of Minecraft. For a pull request from a fork, it runs once a maintainer has read the change. +- **Outside contributions are checked again.** Before a contributor's pull request merges, Ludovic's agents compare what it claims with vanilla's own code, review it line by line, rewrite the weak parts, and test it in single player, on a LAN and on a dedicated server where those apply. +- **Releases are tested first.** A release is published only after its smoke test passes (the game starts and draws a world) and while no issue is labelled `release-blocker`. + +## Why it's safe to run + +- **Open source.** All of the code is public on [GitHub](https://github.com/ludovic111/horizon), under the MIT licence. +- **Built from the public code.** Releases are built by GitHub Actions, the build service of GitHub, from the public source. Linux and Windows are built on GitHub's machines, and macOS on Ludovic's Mac mini, which runs GitHub Actions jobs. Every build log is [public](https://github.com/ludovic111/horizon/actions/workflows/release.yml). +- **Signed checksums.** Every release has a `SHA256SUMS` file, a fingerprint of each download, and `SHA256SUMS.sig`, a signature of that list made with Horizon's release key, which only release builds from main can use. The launcher and `horizon-server update` check both before they install anything, and refuse a file that does not match. The very first server install with `install.sh` checks the fingerprint but not the signature. +- **Not yet signed by Apple or Microsoft.** The macOS app is not notarized by Apple, because it is not signed with a paid Apple developer account, so macOS asks you to confirm the first time ([Install](https://playhorizon.dev/docs/install#download-the-launcher) shows how). The Windows programs are not code-signed either, so Windows may warn you too. +- **Mods run in a sandbox.** Horizon mods are WebAssembly programs with no access to your files, the network or other programs. A mod lists what it needs, you see that list before you turn it on, and it can do nothing else. See [Mods](mods.md). +- **Nothing collected unless you say yes.** Data collection is off until you turn it on, with four separate switches. The one exception is an anonymous "I'm playing" ping for the launcher's player count, which holds nothing about you. See [Opt-in data collection](telemetry.md). + +## What it doesn't contain + +- **No Minecraft files.** Horizon contains no Minecraft code, assets or data, and never downloads them. The launcher builds the game files on your computer from your own copy of Minecraft: Java Edition 26.3. A check that runs on every pull request (`tools/check_public_tree.py`) keeps game files and decompiled code out of the repository and its history. +- **No code from other mods.** Since 24 October 2026, Horizon's code may only be written from Minecraft 26.3 itself and public documentation, never from another mod, loader or renderer ([the rule](../CONTRIBUTING.md#only-original-code)). That day shader packs were removed ([#1561](https://github.com/ludovic111/horizon/pull/1561)), after a developer of Iris showed that our shader pack code had been written from Iris's source. They are being written again from a description of the pack format only. + +## Check it yourself + +- **Read the code and its checks.** [The source](https://github.com/ludovic111/horizon), [the checks on every pull request](https://github.com/ludovic111/horizon/actions/workflows/ci.yml) and [the release builds](https://github.com/ludovic111/horizon/actions/workflows/release.yml). +- **Compare the fingerprints.** Put a release's files and its `SHA256SUMS` in one folder and run `sha256sum -c SHA256SUMS --ignore-missing` (on macOS `shasum -a 256 -c SHA256SUMS --ignore-missing`, on Windows `Get-FileHash ` in PowerShell). Each file should say `OK`. +- **Check the signature.** Download a whole release into a folder, then from a clone of the repository run `cargo run -p horizon-release-sign -- verify --tag `. The public key is in `crates/horizon-release-sign/release-keys.txt`. +- **Build it yourself.** The README explains how to [build from source](../README.md#build-from-source). diff --git a/website/build.mjs b/website/build.mjs index 781e838bb..f871d5dbb 100644 --- a/website/build.mjs +++ b/website/build.mjs @@ -231,7 +231,7 @@ const siteFooter = `
diff --git a/website/docs/how-horizon-is-built.md b/website/docs/how-horizon-is-built.md new file mode 100644 index 000000000..af9f956ba --- /dev/null +++ b/website/docs/how-horizon-is-built.md @@ -0,0 +1,39 @@ +# How Horizon is built + +Who writes Horizon, how changes are checked, and why it is safe to run. You can check every claim on this page in the repository, and anything not done yet is marked as not done. + +## Who builds it + +Horizon is Ludovic Marie's project: he decides what it does and what ships. **Most of the code is written by AI agents**: Claude sessions that Ludovic runs, and contributors' own AI tools. Some contributors write their code by hand. + +Agents say what they are. A pull request opened by one of Ludovic's agents starts with "Opened by Ludovic's AI agent (Claude), not by Ludovic himself.", its comments start with "🤖 Agent:", and its commits name the agent in a `Co-Authored-By` line. + +## How changes are checked + +Not every line is read by a person. Instead, every change is checked against the real game, automatically: + +- **Harnesses.** A harness is a test that gives the same inputs to Horizon and to the real Minecraft 26.3, then compares the results. There are 326 of them (25 October 2026), from world generation to mobs, redstone and commands. The [status table](/#parity) shows what they cover. Passing them all does not prove that nothing else differs. +- **Checks on every pull request.** `verify` runs on GitHub's machines for every pull request and every change to main: formatting, lints with warnings treated as errors, the tests, and the check that no Minecraft files are committed. Main takes no change without it. `parity` runs the harnesses a change can affect, on a machine that holds a copy of Minecraft. For a pull request from a fork, it runs once a maintainer has read the change. +- **Outside contributions are checked again.** Before a contributor's pull request merges, Ludovic's agents compare what it claims with vanilla's own code, review it line by line, rewrite the weak parts, and test it in single player, on a LAN and on a dedicated server where those apply. +- **Releases are tested first.** A release is published only after its smoke test passes (the game starts and draws a world) and while no issue is labelled `release-blocker`. + +## Why it's safe to run + +- **Open source.** All of the code is public on [GitHub](https://github.com/ludovic111/horizon), under the MIT licence. +- **Built from the public code.** Releases are built by GitHub Actions, the build service of GitHub, from the public source. Linux and Windows are built on GitHub's machines, and macOS on Ludovic's Mac mini, which runs GitHub Actions jobs. Every build log is [public](https://github.com/ludovic111/horizon/actions/workflows/release.yml). +- **Signed checksums.** Every release has a `SHA256SUMS` file, a fingerprint of each download, and `SHA256SUMS.sig`, a signature of that list made with Horizon's release key, which only release builds from main can use. The launcher and `horizon-server update` check both before they install anything, and refuse a file that does not match. The very first server install with `install.sh` checks the fingerprint but not the signature. +- **Not yet signed by Apple or Microsoft.** The macOS app is not notarized by Apple, because it is not signed with a paid Apple developer account, so macOS asks you to confirm the first time ([Install](/docs/install#download-the-launcher) shows how). The Windows programs are not code-signed either, so Windows may warn you too. +- **Mods run in a sandbox.** Horizon mods are WebAssembly programs with no access to your files, the network or other programs. A mod lists what it needs, you see that list before you turn it on, and it can do nothing else. See [Mods and data packs](/docs/mods). +- **Nothing collected unless you say yes.** Data collection is off until you turn it on, with four separate switches. The one exception is an anonymous "I'm playing" ping for the launcher's player count, which holds nothing about you. See [Privacy](/privacy). + +## What it doesn't contain + +- **No Minecraft files.** Horizon contains no Minecraft code, assets or data, and never downloads them. The launcher builds the game files on your computer from your own copy of Minecraft: Java Edition 26.3. A check that runs on every pull request (`tools/check_public_tree.py`) keeps game files and decompiled code out of the repository and its history. +- **No code from other mods.** Since 24 October 2026, Horizon's code may only be written from Minecraft 26.3 itself and public documentation, never from another mod, loader or renderer ([the rule](https://github.com/ludovic111/horizon/blob/main/CONTRIBUTING.md#only-original-code)). That day shader packs were removed ([#1561](https://github.com/ludovic111/horizon/pull/1561)), after a developer of Iris showed that our shader pack code had been written from Iris's source. They are being written again from a description of the pack format only. + +## Check it yourself + +- **Read the code and its checks.** [The source](https://github.com/ludovic111/horizon), [the checks on every pull request](https://github.com/ludovic111/horizon/actions/workflows/ci.yml) and [the release builds](https://github.com/ludovic111/horizon/actions/workflows/release.yml). +- **Compare the fingerprints.** Put a release's files and its `SHA256SUMS` in one folder and run `sha256sum -c SHA256SUMS --ignore-missing` (on macOS `shasum -a 256 -c SHA256SUMS --ignore-missing`, on Windows `Get-FileHash ` in PowerShell). Each file should say `OK`. +- **Check the signature.** Download a whole release into a folder, then from a clone of the repository run `cargo run -p horizon-release-sign -- verify --tag `. The public key is in `crates/horizon-release-sign/release-keys.txt`. +- **Build it yourself.** The README explains how to [build from source](https://github.com/ludovic111/horizon#build-from-source). diff --git a/website/docs/nav.json b/website/docs/nav.json index e44fddb26..e0a2eb552 100644 --- a/website/docs/nav.json +++ b/website/docs/nav.json @@ -1,5 +1,5 @@ [ - { "group": "Start here", "pages": ["index", "install"] }, + { "group": "Start here", "pages": ["index", "install", "how-horizon-is-built"] }, { "group": "Playing", "pages": ["settings", "multiplayer", "troubleshooting"] }, { "group": "Hosting", "pages": ["hosting"] }, { "group": "Going further", "pages": ["modpacks", "mods", "performance", "agents"] }, diff --git a/website/src/index.html b/website/src/index.html index 5f9bba03e..a457d7ee3 100644 --- a/website/src/index.html +++ b/website/src/index.html @@ -218,6 +218,7 @@ DiscordQuestions, bug reports and screenshots. SponsorSponsors on GitHub fund the next release. SourceIssues and pull requests are welcome. + How it's builtWho writes it, how changes are checked, why it's safe to run.

Contributors

@@ -238,7 +239,7 @@
From 977ef7181f5b38d4d11e7791653690fc876f40ae Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sun, 25 Oct 2026 01:51:47 +0300 Subject: [PATCH 062/140] Data: `/data get entity` writes a mob's live riders A mounted mob answered "Found no elements matching Passengers": the command built the entity with the flat serializer, so `Passengers` was never in the tag, even though the game had the relationship and saving a world kept it. Persistence already writes the tree (`Game::mob_tree_nbt`, which also carries the leash), and vanilla's command path uses the same one, so the command reads it now. Fixes #1519. Co-Authored-By: Hermes Agent (Nous Research) --- crates/horizon-client/src/game/commands/data.rs | 7 ++++--- tools/command_exec_corpus.py | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/crates/horizon-client/src/game/commands/data.rs b/crates/horizon-client/src/game/commands/data.rs index 89e3d6397..6e4c9825f 100644 --- a/crates/horizon-client/src/game/commands/data.rs +++ b/crates/horizon-client/src/game/commands/data.rs @@ -65,9 +65,10 @@ impl Game<'_> { tag } Target::Mob(id) => { - let uuid = self.uuid_for(id); - let m = self.mobs.iter().find(|m| m.id == id)?; - entity_nbt::mob_to_nbt(m, uuid, self.persist.raw.get(&id)) + // `saveWithoutId` writes the entity as saved, riders under + // `Passengers`: `/data get` reads the same tree persistence does (#1519). + let i = self.mobs.iter().position(|m| m.id == id)?; + self.mob_tree_nbt(i) } Target::Item(id) => { let uuid = self.uuid_for(id); diff --git a/tools/command_exec_corpus.py b/tools/command_exec_corpus.py index 2b2a0afd1..eacc52a32 100644 --- a/tools/command_exec_corpus.py +++ b/tools/command_exec_corpus.py @@ -280,6 +280,12 @@ def entities(): cmd('/execute as @e[tag=h] run say mob'), cmd('/execute store result score @s harness_score run data get entity @s SelectedItemSlot'), cmd('/kill @e[tag=h]'), + # A live rider travels with its vehicle in `/data get`, the way `saveWithoutId` + # writes it (#1519): the pig is mounted, so its health is the nested value. + cmd('/summon minecraft:cow 4.5 210 8.5 {Tags:["root"],NoAI:1b,Passengers:[{id:"minecraft:pig",NoAI:1b}]}'), + cmd('/data get entity @e[tag=root,limit=1] Passengers[0].Health'), + cmd('/data get entity @e[tag=root,limit=1] Passengers[0].id'), + cmd('/kill @e[tag=root]'), *setup('/kill @e[type=minecraft:armor_stand]'), {'op': 'tick', 'n': 25}, cmd('/execute if entity @e[tag=h]'), From 0d1736da8ffd016b4e66624d4ea87c34015cf1a7 Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:53:00 +0100 Subject: [PATCH 063/140] Make startup and world-loading execution roles explicit Separate client, integrated-server and dedicated-server roles from connection state. Use roles for startup, presentation work and server dimension loading while preserving in-frame client simulation. Co-Authored-By: OpenAI Codex (GPT-6.1) --- crates/horizon-client/src/game.rs | 32 +++++++++------ .../horizon-client/src/game/execution_role.rs | 39 +++++++++++++++++++ crates/horizon-client/src/game/integrated.rs | 10 ++--- crates/horizon-client/src/game/levels.rs | 4 +- .../horizon-client/src/game/world_loading.rs | 2 +- docs/server-levels.md | 16 +++++--- 6 files changed, 76 insertions(+), 27 deletions(-) create mode 100644 crates/horizon-client/src/game/execution_role.rs diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index c46b86032..fbf5d17ab 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -43,6 +43,7 @@ mod enchant_effects; mod end; mod entity_culling; mod events; +mod execution_role; mod explosion; mod extras; mod falling_damage; @@ -289,8 +290,8 @@ struct Options { /// as vanilla's does: the default. `--in-frame` (or `--no-server-thread`, /// or `HORIZON_SERVER_THREAD=0`) runs the world in the frame instead. server_thread: bool, - /// Set on the integrated server's own options: it draws nothing, so it skips meshing. - integrated: bool, + /// What this Game executes; independent of its current server connection. + execution_role: execution_role::ExecutionRole, } impl Options { /// The name to join servers with: the one given, else the offline name kept @@ -347,7 +348,7 @@ impl Options { // itself, without the event loop: it stays in the frame. server_thread: std::env::var("HORIZON_SERVER_THREAD").map_or(true, |v| v != "0") && std::env::var_os("HORIZON_COMMAND_SCRIPT").is_none(), - integrated: false, + execution_role: execution_role::ExecutionRole::Client, }; let mut session_file = std::env::var("HORIZON_SESSION_FILE").ok(); let mut args = std::env::args().skip(1); @@ -361,6 +362,7 @@ impl Options { return Ok(None); } "--dedicated" => { + o.execution_role = execution_role::ExecutionRole::DedicatedServer; o.dedicated = Some(args.by_ref().collect()); break; } @@ -7521,7 +7523,11 @@ impl Game<'_> { } self.join_world_rest()?; let save_root = std::env::current_dir()?.join("saves").join(folder); - if integrated::wanted(&self.options, &save_root) { + if self + .options + .execution_role + .starts_integrated_server(self.options.server_thread) + { return self.open_integrated(folder, name, seed, creative, create); } self.perf.world_opening(); @@ -10556,7 +10562,7 @@ impl Game<'_> { } // The loading screen's chunk map fills ring by ring, as vanilla's. self.streaming.loading = - self.options.dedicated.is_none() && self.loading_reason().is_some(); + self.options.execution_role.is_client() && self.loading_reason().is_some(); let (uploads, unloaded) = horizon_client::spans::time("streaming", || self.streaming.update(&mut self.world)); if let Some(lod) = &mut self.lod { @@ -12243,7 +12249,7 @@ fn synchronous_startup(options: &Options) -> bool { || options.world_frames.is_some() || options.benchmark.is_some() || options.control.is_some() - || options.dedicated.is_some() + || !options.execution_role.is_client() || std::env::var_os("HORIZON_DISPENSE_FIXTURE").is_some() || std::env::var_os("HORIZON_SCULK_FIXTURE").is_some() || std::env::var_os("HORIZON_COMMAND_SCRIPT").is_some() @@ -12784,7 +12790,7 @@ fn start_game<'a>( game.sculk_fixture(&spec)?; return Ok(None); } - if game.options.dedicated.is_some() { + if game.options.execution_role == execution_role::ExecutionRole::DedicatedServer { game.run_dedicated()?; return Ok(None); } @@ -13061,7 +13067,7 @@ impl Loading { ); let renderer_ms = renderer_at.elapsed().as_millis(); // Audio is created on the main thread, after the core is ready. - let audio = if options.dedicated.is_some() { + let audio = if !options.execution_role.is_client() { Audio::silent(&options.resources) } else { Audio::new(&options.resources) @@ -13236,13 +13242,15 @@ pub fn run() -> Result<()> { let Some(mut options) = Options::read()? else { return Ok(()); }; - if options.dedicated.is_some() && !dedicated::preflight(&mut options)? { + if options.execution_role == execution_role::ExecutionRole::DedicatedServer + && !dedicated::preflight(&mut options)? + { return Ok(()); } // Before any worker starts: on Linux they go behind the server thread // and the render thread. horizon_threads::put_helpers_behind(); - if options.dedicated.is_none() { + if options.execution_role.is_client() { // The render thread, like the server thread, ahead of the workers on // macOS and Windows. While terrain loads, the worker pools (two with // single player's server thread) and other programs outnumber the @@ -13252,7 +13260,7 @@ pub fn run() -> Result<()> { } // Someone is playing: the anonymous ping behind the launcher's "N playing now". Not for a // server, a benchmark or a run that quits by itself. - if options.dedicated.is_none() + if options.execution_role.is_client() && options.benchmark.is_none() && !options.offscreen && options.frames.is_none() @@ -13293,7 +13301,7 @@ pub fn run() -> Result<()> { )?; let gui = loaded.gui.ok_or("missing menu bundle")?; options.resources = loaded.root.clone(); - let audio = if options.dedicated.is_some() { + let audio = if !options.execution_role.is_client() { Audio::silent(&options.resources) } else { Audio::new(&options.resources) diff --git a/crates/horizon-client/src/game/execution_role.rs b/crates/horizon-client/src/game/execution_role.rs new file mode 100644 index 000000000..e9054576d --- /dev/null +++ b/crates/horizon-client/src/game/execution_role.rs @@ -0,0 +1,39 @@ +//! A Game's execution role is fixed at construction. Connecting or disconnecting +//! changes `remote`, not this role. A client may simulate a world in-frame. + +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub(super) enum ExecutionRole { + Client, + IntegratedServer, + DedicatedServer, +} + +impl ExecutionRole { + /// Only a client owns presentation work (audio, loading UI, chunk meshes). + pub fn is_client(self) -> bool { + self == Self::Client + } + + /// The optional in-frame simulation remains a client execution mode. + pub fn starts_integrated_server(self, server_thread: bool) -> bool { + self.is_client() && server_thread + } +} + +#[cfg(test)] +mod tests { + use super::ExecutionRole::*; + + #[test] + fn world_loading_keeps_in_frame_clients_and_server_roles_separate() { + for (role, client, threaded) in [ + (Client, true, true), + (IntegratedServer, false, false), + (DedicatedServer, false, false), + ] { + assert_eq!(role.is_client(), client); + assert_eq!(role.starts_integrated_server(true), threaded); + assert!(!role.starts_integrated_server(false)); + } + } +} diff --git a/crates/horizon-client/src/game/integrated.rs b/crates/horizon-client/src/game/integrated.rs index 44df5fe20..f70c90432 100644 --- a/crates/horizon-client/src/game/integrated.rs +++ b/crates/horizon-client/src/game/integrated.rs @@ -12,6 +12,7 @@ //! way. use super::{ Game, Options, PackResources, Resources, UiResources, + execution_role::ExecutionRole, lan::{LanSettings, Owner}, }; use horizon_client::{ @@ -26,7 +27,6 @@ use horizon_protocol::connection::Pipe; use horizon_protocol::{crypto::offline_uuid, text::translatable}; use std::{ net::TcpListener, - path::Path, sync::{ Arc, Mutex, atomic::{AtomicBool, AtomicI32, AtomicU16, AtomicU32, Ordering}, @@ -170,11 +170,6 @@ struct Launch { player: String, } -/// Whether this world opens on a server thread: asked for. -pub(super) fn wanted(options: &Options, _world: &Path) -> bool { - options.server_thread && options.dedicated.is_none() -} - impl Game<'_> { /// `Minecraft.hasSingleplayerServer`: a world of this window's own, run /// in the frame or on its server thread. @@ -215,9 +210,10 @@ impl Game<'_> { }; let mut options = self.options.clone(); // A server without a console: no local player, no window, no control socket. + // Compatibility for gameplay checks outside startup/world loading. options.dedicated = Some(Vec::new()); options.server_thread = false; - options.integrated = true; + options.execution_role = ExecutionRole::IntegratedServer; options.control = None; options.benchmark = None; options.frames = None; diff --git a/crates/horizon-client/src/game/levels.rs b/crates/horizon-client/src/game/levels.rs index 895cda08c..d5b9c8d90 100644 --- a/crates/horizon-client/src/game/levels.rs +++ b/crates/horizon-client/src/game/levels.rs @@ -221,7 +221,7 @@ impl Game<'_> { /// holds it (`self.lan` is taken during the network tick). pub(super) fn enter_level(&mut self, host: Option<&mut LanHost>, target: Dim) -> Result<()> { // The in-frame game keeps its one level (`enter_dimension`). - if self.options.dedicated.is_none() { + if self.options.execution_role.is_client() { return Ok(()); } if target != self.dim { @@ -261,7 +261,7 @@ impl Game<'_> { /// nobody is in it; returns the level to put back afterwards. Only a /// server holds other levels. pub(super) fn enter_command_level(&mut self, dim: Dim) -> Option { - if self.options.dedicated.is_none() || dim == self.dim { + if self.options.execution_role.is_client() || dim == self.dim { return None; } let back = self.dim; diff --git a/crates/horizon-client/src/game/world_loading.rs b/crates/horizon-client/src/game/world_loading.rs index bd9ae7caa..91c375322 100644 --- a/crates/horizon-client/src/game/world_loading.rs +++ b/crates/horizon-client/src/game/world_loading.rs @@ -250,7 +250,7 @@ pub(super) fn make_streaming( streaming.nether_shading = dim == Dim::Nether; // A server draws nothing: neither the integrated server nor the // dedicated one meshes sections. - streaming.mesh = !options.integrated && options.dedicated.is_none(); + streaming.mesh = options.execution_role.is_client(); Ok((streaming, save, locator)) } diff --git a/docs/server-levels.md b/docs/server-levels.md index df45efc1f..36571d6b6 100644 --- a/docs/server-levels.md +++ b/docs/server-levels.md @@ -32,11 +32,17 @@ stay in the host's dimension. That mode is the escape hatch, so it gets no multi ## One code path for both -The dedicated server and the server thread are the same code. The server thread runs a `Game` with -`options.dedicated` set and a hub without a host player. The window joins it through memory as one -more player. Everything above serves both, and `server_dimension_players` (vanilla clients on Horizon's -dedicated server) and `lan_e2e --server-thread` (Horizon clients on the server thread) check it from -the two sides. +The dedicated server and the server thread are the same code. Each `Game` has an explicit +`ExecutionRole`: `Client`, `IntegratedServer` or `DedicatedServer`, selected before construction in +`Options.execution_role`. Startup, world loading and opening other dimensions use that role. Only +clients mesh chunks and show loading progress; a client can still run its simulation in-frame. +Connecting or disconnecting changes `remote`, independently of the execution role. + +The server thread has a hub without a host player. The window joins it through memory as one +more player. It still sets `options.dedicated` for gameplay checks outside the role migration's +startup/world-loading scope. Everything above serves both servers, and `server_dimension_players` +(vanilla clients on Horizon's dedicated server) and `lan_e2e --server-thread` (Horizon clients on the +server thread) check it from the two sides. ## Cost of an extra level From c41a053c15526b3273365a887c39962991186453 Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Sat, 24 Oct 2026 23:53:29 +0100 Subject: [PATCH 064/140] refactor: separate client world entry from authoritative loading Give integrated and dedicated startup a synchronous loading entry point without client deferral or integrated-server selection. Keep client orchestration and background loading unchanged. Co-Authored-By: OpenAI Codex GPT-6.1 --- crates/horizon-client/src/game.rs | 21 ++++++++++--------- crates/horizon-client/src/game/dedicated.rs | 6 +++--- crates/horizon-client/src/game/integrated.rs | 5 +++-- .../horizon-client/src/game/world_loading.rs | 17 +++++++++++++++ 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index c46b86032..38fdb9e37 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -7501,7 +7501,7 @@ impl Game<'_> { (sky.star_brightness > 0.0).then(|| (frame(sky.star_angle), sky.star_brightness)); (out, stars) } - /// Load (or create) a world folder under saves/ and start streaming it. + /// Enter a local world from the client, selecting its simulation mode. fn open_world( &mut self, folder: &str, @@ -7524,16 +7524,9 @@ impl Game<'_> { if integrated::wanted(&self.options, &save_root) { return self.open_integrated(folder, name, seed, creative, create); } - self.perf.world_opening(); - let request = world_loading::WorldRequest { - save_root, - folder: folder.to_owned(), - name: name.map(str::to_owned), - seed, - creative, - create: create.cloned(), - }; + let request = world_loading::WorldRequest::new(folder, name, seed, creative, create)?; if self.window.is_some() { + self.perf.world_opening(); if self.title.is_none() { self.title = Some(Title::new( std::env::current_dir()?.join("saves"), @@ -7549,6 +7542,14 @@ impl Game<'_> { )?); return Ok(()); } + self.load_world(request) + } + + /// Load authoritative world state synchronously, without client entry or + /// integrated-server selection. Server startup must use this entry point. + fn load_world(&mut self, request: world_loading::WorldRequest) -> Result<()> { + self.join_world_rest()?; + self.perf.world_opening(); let prepared = request.prepare(&self.res, &self.pack, &self.options, &self.settings)?; self.finish_open_world(prepared) } diff --git a/crates/horizon-client/src/game/dedicated.rs b/crates/horizon-client/src/game/dedicated.rs index eee12fe3f..4c436c60c 100644 --- a/crates/horizon-client/src/game/dedicated.rs +++ b/crates/horizon-client/src/game/dedicated.rs @@ -6,7 +6,7 @@ //! its simulation and the play-state hub that LAN hosting uses, configured //! from server.properties, with the operator, whitelist and ban lists and a //! console on standard input. -use super::{Game, Options, lan::LanSettings}; +use super::{Game, Options, lan::LanSettings, world_loading::WorldRequest}; use horizon_client::{ Result, lan::{LoginGate, NetConfig, NetLog, OnlineMode, hub::HubConfig}, @@ -546,13 +546,13 @@ impl Game<'_> { let lists = Arc::new(Mutex::new(lists)); log("INFO", &format!("Preparing level \"{level_name}\"")); let folder = world_dir.to_string_lossy().into_owned(); - self.open_world( + self.load_world(WorldRequest::new( &folder, Some(&level_name), Some(props.seed), game_mode == 1, None, - )?; + )?)?; if new_world { self.level.hardcore = props.hardcore; } diff --git a/crates/horizon-client/src/game/integrated.rs b/crates/horizon-client/src/game/integrated.rs index 44df5fe20..4cbe41ccf 100644 --- a/crates/horizon-client/src/game/integrated.rs +++ b/crates/horizon-client/src/game/integrated.rs @@ -13,6 +13,7 @@ use super::{ Game, Options, PackResources, Resources, UiResources, lan::{LanSettings, Owner}, + world_loading::WorldRequest, }; use horizon_client::{ Result, @@ -287,13 +288,13 @@ impl Game<'_> { tasks: Receiver, ready: &Sender, ) -> Result<()> { - self.open_world( + self.load_world(WorldRequest::new( &launch.folder, launch.name.as_deref(), launch.seed, launch.creative, launch.create.as_ref(), - )?; + )?)?; let saved = Box::new(self.level.clone()); // Math.max(2, options.renderDistance): past vanilla's 32 when the // window's render distance is (Horizon's options go to 64). diff --git a/crates/horizon-client/src/game/world_loading.rs b/crates/horizon-client/src/game/world_loading.rs index bd9ae7caa..3db3b733d 100644 --- a/crates/horizon-client/src/game/world_loading.rs +++ b/crates/horizon-client/src/game/world_loading.rs @@ -22,6 +22,23 @@ pub(super) struct PreparedWorld { } impl WorldRequest { + pub fn new( + folder: &str, + name: Option<&str>, + seed: Option, + creative: bool, + create: Option<&horizon_client::title::WorldOptions>, + ) -> Result { + Ok(Self { + save_root: std::env::current_dir()?.join("saves").join(folder), + folder: folder.to_owned(), + name: name.map(str::to_owned), + seed, + creative, + create: create.cloned(), + }) + } + pub fn prepare( self, res: &Resources, From 3612f5181232b79527c345cc0d6f9b3339cc3839 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:00:21 +0200 Subject: [PATCH 065/140] Game releases send people to the launcher: notes open with it, archives labelled GitHub's "Latest release" is the newest game release, so new players download the game's archive, which does not start on its own (#1647). Making a launcher release the latest instead would break every installed horizon-server, install.sh and install.ps1: they ask for releases/latest and expect the game's archives, and a server that can't update can't fetch a fix either. So the game stays the latest and says where to go: - The notes open with "Want to play? Download the Horizon launcher, not the files below", linking playhorizon.dev and the launcher releases. It is raw HTML on one line, which GitHub renders and the launcher's notes view and one-line summary skip (pulldown-cmark HTML events), so launchers already installed don't tell players to download themselves. The game footer that said the same at the bottom goes. The site's Releases page leaves the block out. - release.yml gives each archive a label ("Game files the launcher installs: Linux (...)", "Dedicated server for Linux (...)"), which GitHub shows instead of the file name. Everything that downloads matches the asset's name, which is unchanged. Fixes #1647 Co-Authored-By: Claude Opus 5.5 --- .github/workflows/release.yml | 11 ++++++++--- docs/release-flow.md | 9 +++++++++ tests/test_release_train.py | 18 ++++++++++++++++-- tools/release_train.py | 24 ++++++++++++++++-------- website/src/releases.js | 8 ++++++-- website/src/releases.test.mjs | 13 +++++++++++++ 6 files changed, 68 insertions(+), 15 deletions(-) create mode 100644 website/src/releases.test.mjs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b0fb2e0f..4cba851fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -367,10 +367,15 @@ jobs: TAG: ${{ needs.decide.outputs.tag }} run: | signature=(); [[ -f dist/SHA256SUMS.sig ]] && signature=(dist/SHA256SUMS.sig) - # The release and the latest at once: there is one channel (docs/release-flow.md). + # The release and the latest at once: there is one channel (docs/release-flow.md). Each archive gets a + # label (file#label), which GitHub's page shows instead of the file name, so nobody takes the game's + # files for the download (#1647). Launchers, servers and install.sh match the name, which stays. gh release create "$TAG" --target "${{ needs.decide.outputs.head }}" --title "$(cat notes/title.txt)" \ - --notes-file notes/body.md --latest dist/horizon-linux-x86_64.tar.gz \ - dist/horizon-windows-x64.zip dist/horizon-macos-arm64.zip dist/horizon-server-linux-x86_64.tar.gz \ + --notes-file notes/body.md --latest \ + "dist/horizon-linux-x86_64.tar.gz#Game files the launcher installs: Linux (horizon-linux-x86_64.tar.gz)" \ + "dist/horizon-windows-x64.zip#Game files the launcher installs: Windows (horizon-windows-x64.zip)" \ + "dist/horizon-macos-arm64.zip#Game files the launcher installs: macOS (horizon-macos-arm64.zip)" \ + "dist/horizon-server-linux-x86_64.tar.gz#Dedicated server for Linux (horizon-server-linux-x86_64.tar.gz)" \ dist/SHA256SUMS "${signature[@]}" dist/smoke-test.json - name: Dry run, the release that would be published if: needs.decide.outputs.dry_run == 'true' diff --git a/docs/release-flow.md b/docs/release-flow.md index 758f254ee..4fb0209d9 100644 --- a/docs/release-flow.md +++ b/docs/release-flow.md @@ -312,6 +312,15 @@ and by hand; pushes to `launcher` and `launcher-*` branches only build. - Published with `--latest=false`: the repository's latest release stays a game release. Notes list the pull requests under New and Fixed; Kira posts launcher releases without pinging. +Making a launcher release GitHub's latest instead would break servers: every `horizon-server` already installed, +`install.sh` and `install.ps1` ask for `releases/latest` and expect the game's archives there, and a server that +can't update can't fetch the fix either. So the game release stays the latest, and it sends people to the launcher +(#1647): its notes open with a "Want to play? Download the Horizon launcher" block (`PLAYERS` in +`tools/release_train.py`: raw HTML, which GitHub shows and launchers' notes skip; the site's Releases page leaves +it out too), and its archives carry labels ("Game files the +launcher installs: Linux (…)") that GitHub shows in place of the file names. Everything that downloads matches +the asset's name, which is unchanged. + Starting by hand, pausing and rolling back work as for the game (`gh workflow run launcher …`, `RELEASES_PAUSED`, `gh release edit launcher@X.Y.Z --draft`). Launchers older than the withdrawn release then see the previous one as the newest; launchers that already updated keep running. diff --git a/tests/test_release_train.py b/tests/test_release_train.py index dde734c7d..56064fa42 100644 --- a/tests/test_release_train.py +++ b/tests/test_release_train.py @@ -106,16 +106,18 @@ class ReleaseTrainTests(unittest.TestCase): def test_the_first_release_of_0_2_says_what_changed(self): title, body = train.notes("game", "v0.2.0", [pr(1)], [], previous="v2026.10.21") self.assertTrue(title.startswith("Horizon 0.2.0: "), title) + body = body.removeprefix(train.PLAYERS + "\n\n") self.assertTrue(body.startswith("Horizon is numbered from now on: this is Horizon 0.2.0, the release after 2026.10.21.")) self.assertIn("`horizon-server update --version v0.2.0`", body) title, body = train.notes("launcher", "launcher@0.2.0", [], [], previous="launcher-v0.17.0") self.assertEqual(title, "Horizon launcher 0.2.0") self.assertIn("the release after launcher 0.17.0", body) self.assertIn("Rebuilt from the latest main.", body) - self.assertTrue(train.notes("game", "v0.3.0", [pr(1)], [], previous="v0.2.14")[1].startswith("The first release of Horizon 0.3.")) + body = train.notes("game", "v0.3.0", [pr(1)], [], previous="v0.2.14")[1] + self.assertTrue(body.startswith(train.PLAYERS + "\n\nThe first release of Horizon 0.3.")) for version, previous in [("v0.2.1", "v0.2.0"), ("v0.3.0-rc.1", "v0.2.9"), ("v2026.10.23", "v2026.10.21")]: body = train.notes("game", version, [pr(1)], [], previous=previous)[1] - self.assertTrue(body.startswith("### Fixed"), (version, body)) + self.assertTrue(body.startswith(train.PLAYERS + "\n\n### Fixed"), (version, body)) def test_decision(self): minute = dt.timedelta(minutes=1) @@ -201,6 +203,18 @@ class ReleaseTrainTests(unittest.TestCase): self.assertEqual(title, "Horizon launcher 0.2.0") self.assertIn("### Fixed\n- Launcher: say the self-update succeeded (#3)", body) self.assertNotIn("Known issues", body) + self.assertNotIn(train.PLAYERS, body) + self.assertIn("Your launcher updates itself.", body) + + def test_a_game_release_opens_with_the_way_to_the_launcher(self): + # GitHub's latest is a game release: whoever lands on it is sent to the launcher first (#1647). + _, body = train.notes("game", "v0.2.50", [pr(1)], ["- Sound cuts out after an hour."]) + self.assertTrue(body.startswith('

Want to play? Download the Horizon launcher')) + self.assertIn('href="https://github.com/ludovic111/horizon/releases?q=launcher&expanded=true"', body) + self.assertNotIn("\n", train.PLAYERS, "one line: one HTML block, which ends at the blank line after it") + self.assertEqual(body.count("playhorizon.dev"), 1, "said once, at the top") + _, body = train.notes("game", "v0.2.51", [], []) + self.assertTrue(body.startswith(train.PLAYERS + "\n\nRebuilt from the latest main.")) def test_known_issues_are_the_bullets_of_the_file(self): with tempfile.TemporaryDirectory() as temp: diff --git a/tools/release_train.py b/tools/release_train.py index 6ec2739d9..48d4d46cf 100644 --- a/tools/release_train.py +++ b/tools/release_train.py @@ -74,12 +74,17 @@ LAUNCHER_PATHS = [ ] LAUNCHER_IGNORED = ["launcher/links.json", "launcher/docs/", "launcher/tests/"] -FOOTER = { - "game": "Install or update it from the Horizon launcher: it installs new versions by itself. " - "New here? Get the launcher at https://playhorizon.dev. You need your own copy of Minecraft: Java Edition.", - "launcher": "Your launcher updates itself. New here? Download the archive for your system below, extract it, " - "and run `horizon-launcher`. Website: https://playhorizon.dev", -} +# A game release is GitHub's latest (servers and install.sh follow it), so it is the first release people land on: +# its notes open with the way to the launcher (#1647). Raw HTML on one line, which GitHub shows and every launcher's +# notes view and one-line summary skip (pulldown-cmark's HTML events), so launchers never tell players to get +# themselves. The site's Releases page leaves it out too. +PLAYERS = ('

Want to play? Download the Horizon launcher, not the files ' + 'below

It installs this version and keeps it up to date. It is also on GitHub: the launcher releases. You need your ' + "own copy of Minecraft: Java Edition. The files below are what the launcher installs, and the dedicated " + "server for people who host one.

") +LAUNCHER_FOOTER = ("Your launcher updates itself. New here? Download the archive for your system below, extract it, " + "and run `horizon-launcher`. Website: https://playhorizon.dev") DISCLAIMER = "Not an official Minecraft product. Not approved by or associated with Mojang or Microsoft." # An open issue with this label holds every game release (docs/release-flow.md). Only people who can triage the # repository can add it, and the issue's text is never read: its author could edit it afterwards. @@ -374,7 +379,9 @@ def notes(kind, version, prs, issues, previous=None): else: title = f"Horizon launcher {version.removeprefix(OLD_LAUNCHER_PREFIX).removeprefix(LAUNCHER_PREFIX)}" intro = line_intro(kind, version, previous) - parts = [intro] if intro else [] + parts = [PLAYERS] if kind == "game" else [] + if intro: + parts.append(intro) if not shown: parts.append("Rebuilt from the latest main.") if new: @@ -386,7 +393,8 @@ def notes(kind, version, prs, issues, previous=None): contributors = sorted({pr["author"] for pr in shown if pr["author"] and pr["author"] != REPO.split("/")[0]}) if contributors: parts.append("Thanks to " + ", ".join(f"@{name}" for name in contributors) + ".") - parts.append(FOOTER[kind]) + if kind == "launcher": + parts.append(LAUNCHER_FOOTER) parts.append(DISCLAIMER) return title, "\n\n".join(parts) + "\n" diff --git a/website/src/releases.js b/website/src/releases.js index de59c8fef..d4932e7f7 100644 --- a/website/src/releases.js +++ b/website/src/releases.js @@ -50,8 +50,12 @@ export function sections(body) { // An item without its pull request references: "Riptide (#123, fixes #45)" -> "Riptide". export const plainItem = (item) => item.replace(/\s*\((?:#\d+|fixes #\d+|[^()]*#\d+[^()]*)\)\s*/g, " ").replace(/\s+/g, " ").trim(); +// A game release's notes open with an HTML block sending people to the launcher (PLAYERS in tools/release_train.py): +// GitHub's latest release is the game's. This site has its own download button, so it leaves the block out. +export const notesText = (body) => (body || "").replace(/^

Want to play\?[^\n]*(?:\r?\n)*/, ""); + // The notes' first sentence, for a release with no title line and no sections ("Rebuilt from the latest main."). -const firstLine = (body) => ((body || "").split(/\r?\n/).find((l) => l.trim() && !/^#/.test(l)) || "").trim().replace(/[.:]$/, ""); +const firstLine = (body) => (notesText(body).split(/\r?\n/).find((l) => l.trim() && !/^#/.test(l)) || "").trim().replace(/[.:]$/, ""); const count = (n, one, many) => `${n} ${n === 1 ? one : many}`; @@ -135,7 +139,7 @@ function releaseHtml(r, open) { ${o.text ? `

${escape(o.text)}

` : ""} ${top.length ? `
    ${top.map((t) => `
  • ${inline(t)}
  • `).join("")}
` : ""}

` : ""} -
${markdown(r.body || "") || "

No notes for this release.

"}
+
${markdown(notesText(r.body)) || "

No notes for this release.

"}
${downloads ? `

Downloads

    ${downloads}
` : ""}

This release on GitHub

diff --git a/website/src/releases.test.mjs b/website/src/releases.test.mjs new file mode 100644 index 000000000..acd1a0965 --- /dev/null +++ b/website/src/releases.test.mjs @@ -0,0 +1,13 @@ +// node --test src/: the release notes as the site shows them. +import { test } from "node:test"; +import assert from "node:assert/strict"; +import { notesText } from "./releases.js"; + +const players = '

Want to play? Download the Horizon launcher, not the files below

It installs this version.

'; + +test("the block sending people to the launcher is left out, the notes stay", () => { + assert.equal(notesText(`${players}\n\n### Fixed\n- A fix (#1)\n`), "### Fixed\n- A fix (#1)\n"); + assert.equal(notesText(`${players}\r\n\r\nRebuilt from the latest main.\r\n`), "Rebuilt from the latest main.\r\n"); + assert.equal(notesText("

Other HTML

\n\n### New\n- A thing (#2)\n"), "

Other HTML

\n\n### New\n- A thing (#2)\n"); + assert.equal(notesText(undefined), ""); +}); From fab71df1857dafcf3768f3d86afff40e210612da Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:21:23 +0200 Subject: [PATCH 066/140] Mesher: sort solid quads in the meshing workers, not in Mesher::mesh Mesher::mesh keeps model order, which the leaf-culling test pairs with the baked faces; the section and tile workers sort what they upload. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/lod.rs | 3 ++- crates/horizon-client/src/lod/mesh.rs | 6 ++---- crates/horizon-client/src/mesher.rs | 6 +++--- crates/horizon-client/src/streaming.rs | 3 ++- crates/horizon-client/tests/streaming_meshes.rs | 4 +++- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/crates/horizon-client/src/lod.rs b/crates/horizon-client/src/lod.rs index ee17acee1..a429863a7 100644 --- a/crates/horizon-client/src/lod.rs +++ b/crates/horizon-client/src/lod.rs @@ -689,7 +689,7 @@ impl Lod { } let finer = finer.remove(&key).unwrap_or_default(); let input = snapshot.mesh_input(key, finer); - let mesh = mesher.mesh( + let mut mesh = mesher.mesh( input.key, &input.columns(), &covered, @@ -698,6 +698,7 @@ impl Lod { &input.neighbors, &input.finer, ); + mesh.sort_solid(); meshes.push((input.key, mesh)); } Done::Mesh { diff --git a/crates/horizon-client/src/lod/mesh.rs b/crates/horizon-client/src/lod/mesh.rs index bdd77fbea..852f45e5b 100644 --- a/crates/horizon-client/src/lod/mesh.rs +++ b/crates/horizon-client/src/lod/mesh.rs @@ -67,7 +67,7 @@ impl Mesher { neighbors: &[Vec; 4], finer: &[TileKey], ) -> SectionMesh { - let mut mesh = mesh_columns_with_edges( + mesh_columns_with_edges( key, columns, covered, @@ -75,9 +75,7 @@ impl Mesher { neighbors, finer, |span, direction| self.material(span, direction, context), - ); - mesh.sort_solid(); - mesh + ) } fn material(&mut self, span: &Span, direction: Direction, context: &WorkerContext) -> Material { let styles = *self diff --git a/crates/horizon-client/src/mesher.rs b/crates/horizon-client/src/mesher.rs index d1b27bec9..c4bfffc1c 100644 --- a/crates/horizon-client/src/mesher.rs +++ b/crates/horizon-client/src/mesher.rs @@ -116,8 +116,9 @@ mod vertex_tests { } pub struct SectionMesh { pub solid: Vec, - /// The buckets `solid` is sorted in by the side its quads face - /// (`sort_solid`; empty until then). + /// The buckets `solid` is sorted in by the side its quads face: empty + /// until `sort_solid`, which the meshing workers call; `solid` is in + /// model order before. pub sides: Sides, pub translucent: Vec, /// VisGraph: bit `a * 6 + b` is set when faces `a` and `b` (Direction @@ -811,7 +812,6 @@ impl Mesher<'_> { } } } - out.sort_solid(); out } /// `BlockColors` tint source `index`, or `None` for an untinted (-1) layer. diff --git a/crates/horizon-client/src/streaming.rs b/crates/horizon-client/src/streaming.rs index 15ed1674e..5a52dfffe 100644 --- a/crates/horizon-client/src/streaming.rs +++ b/crates/horizon-client/src/streaming.rs @@ -507,7 +507,8 @@ impl Streaming { biomes: &context.biomes, visibility, }; - let mesh = mesher.mesh(&borrow(®ion), sy); + let mut mesh = mesher.mesh(&borrow(®ion), sy); + mesh.sort_solid(); faces = Some((context.tables.clone(), mesher.visibility)); Done::Meshed(x, sy, z, mesh, seq) } diff --git a/crates/horizon-client/tests/streaming_meshes.rs b/crates/horizon-client/tests/streaming_meshes.rs index f0b6fb038..142d31fde 100644 --- a/crates/horizon-client/tests/streaming_meshes.rs +++ b/crates/horizon-client/tests/streaming_meshes.rs @@ -222,7 +222,9 @@ fn relit_columns_keep_every_mesh_current() { biomes: &context.biomes, visibility: context.tables.visibility.clone(), }; - let fresh = mesher.mesh(&borrow(®ion), sy); + // The workers sort solid quads by side, as uploads expect. + let mut fresh = mesher.mesh(&borrow(®ion), sy); + fresh.sort_solid(); let bytes = |m: &SectionMesh| { [ bytemuck::cast_slice::<_, u8>(&m.solid).to_vec(), From 0253d9bc47f9debca046edd6b14be1f550900485 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:23:59 +0200 Subject: [PATCH 067/140] Multiplayer: no play packets after the client acknowledges a reconfiguration A proxy switching servers (Velocity, BungeeCord) sends the client back to configuration. The network thread acknowledged it, but the game thread kept ticking the old level and its client_tick_end went out right after the acknowledgement, where the server reads it as configuration packet 13. Velocity drops the client: "A packet did not decode successfully", shown as "An internal error occurred in your connection". Vanilla's handleConfigurationStart clears the level before it acknowledges, so nothing of play follows. Session::send now drops play packets while the connection is in configuration, checked under the writer lock that the acknowledgement is sent with. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/net.rs | 67 +++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/crates/horizon-client/src/net.rs b/crates/horizon-client/src/net.rs index 31f9b9094..9cce9e1c6 100644 --- a/crates/horizon-client/src/net.rs +++ b/crates/horizon-client/src/net.rs @@ -147,7 +147,12 @@ impl Session { pub fn poll(&self) -> Vec { self.events.try_iter().collect() } - /// Send a play packet; silently dropped once the connection is gone. + /// Send a play packet; silently dropped once the connection is gone, + /// and while the server has the connection back in configuration (a + /// proxy switching servers). Vanilla's `handleConfigurationStart` clears + /// the level before it acknowledges, so no play packet follows the + /// acknowledgement; one that did would reach the server as a + /// configuration packet, and Velocity drops such a client. pub fn send(&self, packet: play::Serverbound) { if self.debug && !matches!( @@ -159,7 +164,11 @@ impl Session { { eprintln!("[net] -> {packet:?}"); } - if let Some(w) = self.writer.lock().unwrap().as_mut() + let mut writer = self.writer.lock().unwrap(); + if self.configuring.load(Ordering::Relaxed) { + return; + } + if let Some(w) = writer.as_mut() && w.send(&packet.encode()).is_err() { w.shutdown(); @@ -686,6 +695,60 @@ mod tests { assert!(thread.join().unwrap().is_err()); } + #[test] + fn play_packets_wait_out_a_reconfiguration() { + let (client, server) = horizon_protocol::connection::Pipe::pair(); + let (mut reader, writer) = Connection::local(client).split(); + let (send, events) = channel(); + let session = Session { + events, + writer: Arc::new(Mutex::new(Some(writer))), + configuring: Arc::new(AtomicBool::new(false)), + thread: None, + address: "local".into(), + name: "Player".into(), + counters: Arc::new(Mutex::new(None)), + debug: false, + }; + let (thread_writer, thread_configuring) = + (session.writer.clone(), session.configuring.clone()); + let thread = std::thread::spawn(move || { + receive_play( + &mut reader, + &thread_writer, + &thread_configuring, + &Language::new(), + &send, + ) + }); + let mut server = Connection::local(server); + let tick_end = play::Serverbound::ClientTickEnd(Empty); + server + .send(&play::Clientbound::StartConfiguration(Empty).encode()) + .unwrap(); + let (id, body) = server.recv().unwrap(); + assert_eq!( + play::Serverbound::decode(id, &body).unwrap(), + play::Serverbound::ConfigurationAcknowledged(Empty) + ); + // The game thread still ticks the old level: nothing of it goes out. + session.send(tick_end.clone()); + server + .send(&cfg::Clientbound::FinishConfiguration(Empty).encode()) + .unwrap(); + let (id, body) = server.recv().unwrap(); + assert_eq!( + cfg::Serverbound::decode(id, &body).unwrap(), + cfg::Serverbound::FinishConfiguration(Empty) + ); + // Back in play, the game's packets flow again. + session.send(tick_end.clone()); + let (id, body) = server.recv().unwrap(); + assert_eq!(play::Serverbound::decode(id, &body).unwrap(), tick_end); + drop(session); + assert!(thread.join().unwrap().is_err()); + } + #[test] fn server_brand_payload_is_decoded_and_invalid_or_unrelated_payloads_are_ignored() { let (send, events) = channel(); From f500be1b5ed8933af93610c90780fe97d25b8701 Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sun, 25 Oct 2026 02:28:27 +0300 Subject: [PATCH 068/140] Title: the main menu labels follow the game language (#1672) The screen built them from literals, so the buttons stayed English in every language while the world select screen next to them was translated. Each has a vanilla key the prepared resources already carry; Friends is Horizon's own and reads horizon.menu.friends with the English text as fallback. --- crates/horizon-client/src/title.rs | 81 ++++++++++++++++++++++-------- 1 file changed, 61 insertions(+), 20 deletions(-) diff --git a/crates/horizon-client/src/title.rs b/crates/horizon-client/src/title.rs index f77ac93eb..19316541b 100644 --- a/crates/horizon-client/src/title.rs +++ b/crates/horizon-client/src/title.rs @@ -581,23 +581,57 @@ impl Title { let cx = (w / 2.0).floor(); let y = (h / 4.0).floor() + 48.0; let mut buttons = vec![ - b(cx - 100.0, y, 200.0, "Singleplayer", true, 1), - b(cx - 100.0, y + 24.0, 200.0, "Multiplayer", true, 4), - b(cx - 100.0, y + 48.0, 200.0, "Minecraft Realms", false, 0), - b(cx - 100.0, y + 96.0, 98.0, "Options...", true, 3), - b(cx + 2.0, y + 96.0, 98.0, "Quit Game", true, 2), - ]; - for (i, (label, enabled, id, icon, size)) in [ - // Horizon's Join a Friend (an invite code) behind - // vanilla's Friends button. - ("Friends", true, 5, "friends/friends", 15.0), - ("Language", true, 6, "icon/language", 15.0), - ( - "Accessibility Settings", + b( + cx - 100.0, + y, + 200.0, + &lang::get_or("menu.singleplayer", "Singleplayer"), true, + 1, + ), + b( + cx - 100.0, + y + 24.0, + 200.0, + &lang::get_or("menu.multiplayer", "Multiplayer"), + true, + 4, + ), + b( + cx - 100.0, + y + 48.0, + 200.0, + &lang::get_or("menu.online", "Minecraft Realms"), + false, + 0, + ), + b( + cx - 100.0, + y + 96.0, + 98.0, + &lang::get_or("menu.options", "Options..."), + true, + 3, + ), + b( + cx + 2.0, + y + 96.0, + 98.0, + &lang::get_or("menu.quit", "Quit Game"), + true, + 2, + ), + ]; + // Horizon's Join a Friend (an invite code) sits behind vanilla's + // Friends button; the other two are vanilla tooltips. + for (i, (key, plain, id, icon)) in [ + ("horizon.menu.friends", "Friends", 5, "friends/friends"), + ("options.language", "Language", 6, "icon/language"), + ( + "options.accessibility", + "Accessibility Settings", 7, "icon/accessibility", - 15.0, ), ] .into_iter() @@ -607,11 +641,11 @@ impl Title { cx - 34.0 + i as f32 * 24.0, y + 72.0, 20.0, - label, - enabled, + &lang::get_or(key, plain), + true, id, ); - button.icon = Some((icon, size)); + button.icon = Some((icon, 15.0)); buttons.push(button); } buttons @@ -621,7 +655,7 @@ impl Title { (w / 2.0).floor() - 154.0, h - 52.0, 150.0, - "Play Selected World", + &lang::get_or("selectWorld.select", "Play Selected World"), selected.is_some(), 10, ), @@ -629,7 +663,7 @@ impl Title { (w / 2.0).floor() + 4.0, h - 52.0, 150.0, - "Create New World", + &lang::get_or("selectWorld.create", "Create New World"), true, 11, ), @@ -657,7 +691,14 @@ impl Title { selected.is_some(), 15, ), - b((w / 2.0).floor() + 83.0, h - 28.0, 71.0, "Back", true, 12), + b( + (w / 2.0).floor() + 83.0, + h - 28.0, + 71.0, + &lang::get_or("gui.back", "Back"), + true, + 12, + ), ], Mode::Create { creative, options, .. From 3dc14b6eda81e87b88676c87c277a910babad7fa Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:29:12 +0200 Subject: [PATCH 069/140] Advancement chat names: the description goes after the title's siblings Advancement.decorateName appends a new line and the description to the title's copy; adv_name replaced the title's extra list, so a title built from siblings (a plugin's {"text":"","extra":[...]}) reached clients as just the description. Co-Authored-By: Claude Opus 5.5 --- .../horizon-client/src/game/advancements.rs | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/crates/horizon-client/src/game/advancements.rs b/crates/horizon-client/src/game/advancements.rs index 20d54d290..c6f3a2410 100644 --- a/crates/horizon-client/src/game/advancements.rs +++ b/crates/horizon-client/src/game/advancements.rs @@ -886,14 +886,15 @@ pub(super) fn adv_name(a: &adv::Advancement) -> Text { _ => text::GREEN, }; // Advancement.decorateName: the title in the frame's colour (styles - // merged into it), a new line and the description. + // merged into it), then a new line and the description after the + // title's own siblings. let coloured = text_of(&d.title).with_color(color); let mut component = coloured.component(); if let Some(o) = component.as_object_mut() { - o.insert( - "extra".into(), - serde_json::json!(["\n", text_of(&d.description).component()]), - ); + let extra = o.entry("extra").or_insert_with(|| serde_json::json!([])); + if let Some(extra) = extra.as_array_mut() { + extra.extend(["\n".into(), text_of(&d.description).component()]); + } } let tooltip = coloured .append("\n") @@ -1102,6 +1103,32 @@ mod tests { ); } + #[test] + fn chat_hover_keeps_the_titles_siblings_before_the_description() { + let a = adv::Advancement { + id: "quests:board".into(), + parent: None, + display: Some(adv::Display { + icon: "minecraft:book".into(), + title: serde_json::json!({"text": "", "extra": ["Quest ", "Board"]}), + description: serde_json::json!("Open the board"), + frame: Frame::Task, + background: None, + show_toast: true, + announce: true, + hidden: false, + }), + criteria: Vec::new(), + requirements: Vec::new(), + rewards: adv::Rewards::default(), + }; + // The JSON a client receives, not just the local spans. + let name = adv_name(&a).component(); + let hover = &name["with"][0]["hover_event"]["value"]; + let sent = horizon_client::scoreboard::comp_text(hover); + assert_eq!(sent.plain(), "Quest Board\nOpen the board"); + } + #[test] fn toasts_slide_in_squared_and_out_after_five_seconds() { let mut toast = recipes(1); From 6d735c26d31f060623fb2b7835925555e0105158 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:40:53 +0200 Subject: [PATCH 070/140] Server packs: the download toast follows DownloadedPackSource's notifier What the toast showed differed from vanilla 26.3 in several ways: - the title and the failure line had no arguments: download.pack.title takes the request number and the batch size, download.pack.failed the failures and the batch size; - sizes read "1.3 KiB" style; com.mojang.realmsclient.Unit.humanReadable gives "1.3 KB" ("512 B" below 1 KiB, half-up rounding), checked against the jar; - each update didn't restart SystemToast's 5 s display time, so a download longer than 5 s lost its toast, and the Notification Time option was ignored; - a finished batch removed the toast at once instead of forceHide's slide out; - the failure title sat at y 7 in white; SystemToast draws titles yellow, and a title without a message at y 12; - a second batch replaced the first one's channel and lost its events. The download thread now reports HttpUtil's listener calls (requestStart, downloadStart with the Content-Length, downloadedBytes, requestFinished), and each batch gets a PackNotifier (createDownloadNotifier) with its own toast. The toast is a shared toasts::SystemToast; the system background moved to toasts.rs with a y, so the pack toasts stack under an advancement toast. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game.rs | 2 +- .../horizon-client/src/game/server_packs.rs | 368 +++++++++++------- .../src/server_packs/download.rs | 36 +- crates/horizon-client/src/title.rs | 32 +- crates/horizon-client/src/toasts.rs | 102 +++++ 5 files changed, 367 insertions(+), 173 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index e162c9e0f..3b9aee231 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -5034,7 +5034,7 @@ impl Game<'_> { Screen::Playing | Screen::Options | Screen::Win => {} } self.draw_toasts(&mut batch); - self.draw_pack_toast(&mut batch); + self.draw_pack_toasts(&mut batch); self.remote_hud(&mut batch); self.draw_sign_editor(&mut batch); self.draw_book(&mut batch); diff --git a/crates/horizon-client/src/game/server_packs.rs b/crates/horizon-client/src/game/server_packs.rs index 6fdec751e..58d25de0e 100644 --- a/crates/horizon-client/src/game/server_packs.rs +++ b/crates/horizon-client/src/game/server_packs.rs @@ -8,15 +8,19 @@ use horizon_client::{ Result, confirm_screen::Confirm, hud::{HudAtlas, HudBatch}, - multiplayer, packs, + java_text, multiplayer, packs, scoreboard::{comp_text, tag_to_json}, server_packs::{Prompt, ServerPacks, action, download, parse_sha1, valid_url}, text::{Text, named_color}, - toasts::Slide, + toasts::SystemToast, ui, }; +use horizon_core::jmath; use horizon_protocol::{packets::configuration::ResourcePackPush, servers}; -use std::{path::PathBuf, sync::mpsc::Receiver}; +use std::{ + path::PathBuf, + sync::mpsc::{Receiver, TryRecvError}, +}; /// `ClientCommonPacketListenerImpl.PackConfirmScreen`: the packs it asks /// about, whether the last one is required, and the server's message. @@ -76,32 +80,111 @@ pub(super) struct ServerPackState { user: (String, u128), /// The packs loaded on top of the player's own, bottom first. pub(super) active: Vec, - /// `packDownloadNotifier` (`PackDownloadNotificationComponent`): the - /// toast while packs download; `downloadFinished` hides it, a failed - /// batch turns it into `download.pack.failed` until it slides out. - toast: Option, - toast_rx: Option>, + /// The download batches' notifiers, oldest first. + notifiers: Vec, } -/// The download toast: vanilla's `SystemToast` `download.pack.title` with the -/// running progress, `download.pack.failed` when a batch fails. -#[derive(Default)] -struct PackToast { - slide: Slide, - /// `downloadedBytes`: the bytes the request in flight has written. - bytes: u64, - /// Its Content-Length — the progress is a percent, else a byte count. +/// `DownloadedPackSource.createDownloadNotifier`: one batch's progress in its +/// own `SystemToast`. +struct PackNotifier { + progress: Receiver, + total: usize, + /// `count`: the requests started. + count: usize, + /// `failCount`. + failed: usize, + /// `totalBytes`: the Content-Length of the request in flight. size: Option, - failed: bool, + /// The bytes it has written so far: none before the first response. + bytes: Option, + /// The last request has finished. + done: bool, + toast: Option, } -/// `Unit.humanReadable`, for `download.pack.progress.bytes`. -fn human_readable(bytes: u64) -> String { - const UNITS: [&str; 7] = ["B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB"]; - let (mut value, mut unit) = (bytes as f64, 0); - while value >= 1024.0 && unit < UNITS.len() - 1 { - value /= 1024.0; - unit += 1; +impl PackNotifier { + fn new(progress: Receiver, total: usize) -> Self { + Self { + progress, + total, + count: 0, + failed: 0, + size: None, + bytes: None, + done: false, + toast: None, + } } - format!("{value:.1} {}", UNITS[unit]) + /// The batch's events since the last call, with the toast updated once + /// for all of them. False once the batch has ended and its toast is gone. + fn poll(&mut self) -> bool { + let (mut changed, mut hide) = (false, false); + let ended = loop { + let event = match self.progress.try_recv() { + Ok(event) => event, + Err(e) => break e == TryRecvError::Disconnected, + }; + changed |= match event { + download::Progress::RequestStart => { + self.count += 1; + true + } + download::Progress::DownloadStart(size) => { + self.size = size; + self.bytes = Some(0); + true + } + download::Progress::Bytes(bytes) => { + self.bytes = Some(bytes); + true + } + download::Progress::RequestFinished(ok) => { + self.failed += usize::from(!ok); + self.done = self.count == self.total; + // Every pack came: forceHide; else the failure title. + hide |= self.done && self.failed == 0; + self.done && self.failed > 0 + } + }; + }; + if changed { + let (title, message) = self.text(); + let (title, message) = (title.plain(), message.map(|m| m.plain())); + // SystemToast.addOrUpdate. + match &mut self.toast { + Some(toast) => toast.reset(title, message), + None => self.toast = Some(SystemToast::new(title, message)), + } + } + if hide && let Some(toast) = &mut self.toast { + toast.force_hide(); + } + !ended || self.toast.is_some() + } + /// The toast's title and message. + fn text(&self) -> (Text, Option) { + if self.done && self.failed > 0 { + let failed = Text::tr("download.pack.failed", &[&self.failed, &self.total]); + return (failed, None); + } + let title = Text::tr("download.pack.title", &[&self.count, &self.total]); + let message = self.bytes.map(|bytes| match self.size { + Some(size) if size > 0 => { + Text::tr("download.pack.progress.percent", &[&(bytes * 100 / size)]) + } + _ => Text::tr("download.pack.progress.bytes", &[&human_readable(bytes)]), + }); + (title, message) + } +} +/// `com.mojang.realmsclient.Unit.humanReadable`, for +/// `download.pack.progress.bytes`. +fn human_readable(bytes: u64) -> String { + if bytes < 1024 { + return format!("{bytes} B"); + } + let exp = (jmath::log(bytes as f64) / jmath::log(1024.0)) as i32; + let prefix = &"KMGTPE"[exp as usize - 1..exp as usize]; + let value = bytes as f64 / 1024f64.powi(exp); + format!("{} {prefix}B", java_text::format_fixed(value, 1)) } fn saves() -> PathBuf { @@ -116,8 +199,7 @@ impl Game<'_> { let state = &mut self.server_packs; state.user = user; state.prompt = None; - state.toast = None; - state.toast_rx = None; + state.notifiers.clear(); let Some(address) = address else { state.address = None; state.packs.local_world(); @@ -132,8 +214,7 @@ impl Game<'_> { /// `Minecraft.clearDownloadedResourcePacks`: every server pack goes at once. pub(super) fn server_packs_disconnect(&mut self) { self.server_packs.prompt = None; - self.server_packs.toast = None; - self.server_packs.toast_rx = None; + self.server_packs.notifiers.clear(); self.server_packs.packs.disconnect(); self.tick_server_packs(); } @@ -228,56 +309,11 @@ impl Game<'_> { /// that finished, the ones to start, a resource reload when the active /// packs change, and the statuses for the server. pub(super) fn tick_server_packs(&mut self) { - // SystemToast.update: the toast slides for 5000 ms fully shown. - if let Some(toast) = &mut self.server_packs.toast { - let (sound, finished) = toast.slide.update_now(|fully| fully < 5000); - if let Some(sound) = sound { - self.audio.play( - if sound { - "minecraft:ui.toast.in" - } else { - "minecraft:ui.toast.out" - }, - None, - 1.0, - 1.0, - ); - } - if finished { - self.server_packs.toast = None; - } - } + self.server_packs.notifiers.retain_mut(PackNotifier::poll); // A reload waits for the world's resources (`reload_packs`). if self.rest_loader.is_some() || self.world_loader.is_some() { return; } - let progress = self - .server_packs - .toast_rx - .as_ref() - .map(|rx| rx.try_iter().collect::>()) - .unwrap_or_default(); - for p in progress { - let toast = &mut self.server_packs.toast; - match p { - download::Progress::RequestStart(size) => { - if let Some(t) = toast { - t.bytes = 0; - t.size = size; - } - } - download::Progress::Bytes(done) => { - if let Some(t) = toast { - t.bytes = done; - } - } - download::Progress::Finished => { - if toast.as_ref().is_some_and(|t| !t.failed) { - self.server_packs.toast = None; - } - } - } - } let finished = self .server_packs .queue @@ -285,16 +321,7 @@ impl Game<'_> { .map(download::Queue::finished) .unwrap_or_default(); for batch in finished { - let failed = !batch.failed.is_empty(); self.server_packs.packs.downloaded(batch); - if failed { - // PackDownloadNotificationComponent.onFailure: the failure - // toast replaces the progress one and stays its 5 seconds. - self.server_packs.toast = Some(PackToast { - failed: true, - ..PackToast::default() - }); - } } while self.server_packs.packs.wants_tick() { let tick = self.server_packs.packs.tick(); @@ -324,10 +351,15 @@ impl Game<'_> { Ok(queue) => state.queue = Some(queue), Err(e) => { log::error!("Horizon: failed to open the download queue: {e}"); - state.toast = Some(PackToast { - failed: true, - ..PackToast::default() - }); + // Every request failed, as the notifier would hear it. + let (progress, events) = std::sync::mpsc::channel(); + for _ in &requests { + let _ = progress.send(download::Progress::RequestStart); + let _ = progress.send(download::Progress::RequestFinished(false)); + } + state + .notifiers + .push(PackNotifier::new(events, requests.len())); let failed = requests.iter().map(|r| r.id).collect(); state.packs.downloaded(horizon_client::server_packs::Batch { downloaded: Vec::new(), @@ -338,10 +370,10 @@ impl Game<'_> { } } let headers = download::headers(&state.user.0, state.user.1); - // PackDownloadNotificationComponent: a toast follows the download. - let (progress, rx) = std::sync::mpsc::channel(); - state.toast = Some(PackToast::default()); - state.toast_rx = Some(rx); + let (progress, events) = std::sync::mpsc::channel(); + state + .notifiers + .push(PackNotifier::new(events, requests.len())); if let Some(queue) = &state.queue { queue.download(requests, headers, progress); } @@ -391,45 +423,27 @@ impl Game<'_> { .layout(atlas, (w, h)) .draw(batch, atlas, self.cursor, [&yes, &no]); } - /// `PackDownloadNotificationComponent`'s toast: `download.pack.title` - /// with the running progress, or `download.pack.failed` alone. - pub(super) fn draw_pack_toast(&self, batch: &mut HudBatch) { - let Some(toast) = &self.server_packs.toast else { - return; - }; - let atlas = &self.gui.atlas; - let t = |key: &str| Text::translate(key, &[]).plain(); - let title = if toast.failed { - t("download.pack.failed") - } else { - t("download.pack.title") - }; - let body = (!toast.failed).then(|| { - if let Some(size) = toast.size.filter(|s| *s > 0) { - Text::tr( - "download.pack.progress.percent", - &[&(toast.bytes * 100 / size)], - ) - .plain() - } else { - Text::tr( - "download.pack.progress.bytes", - &[&human_readable(toast.bytes)], - ) - .plain() + /// The download notifiers' toasts, each in the next 32-pixel slot + /// below an advancement or recipe toast (`ToastManager`). + pub(super) fn draw_pack_toasts(&mut self, batch: &mut HudBatch) { + let multiplier = f64::from(self.settings.notification_display_time); + let mut slot = usize::from(!self.adv.toasts.is_empty()); + for notifier in &mut self.server_packs.notifiers { + let Some(toast) = &mut notifier.toast else { + continue; + }; + let (sound, finished) = toast.update(multiplier); + if let Some(show) = sound { + let event = if show { "ui.toast.in" } else { "ui.toast.out" }; + self.audio + .play(&format!("minecraft:{event}"), None, 1.0, 1.0); } - }); - let width = body.as_ref().map_or_else( - || HudBatch::text_width(atlas, &title), - |body| HudBatch::text_width(atlas, &title).max(HudBatch::text_width(atlas, body)), - ); - let width = width.ceil().max(160.0) + 30.0; - // Toast.xPos: in from the right edge by the visible portion. - let x = batch.width - width * toast.slide.portion; - horizon_client::title::toast_background(atlas, batch, x, width); - batch.text(atlas, &title, x + 18.0, 7.0, u32::MAX, false); - if let Some(body) = &body { - batch.text(atlas, body, x + 18.0, 19.0, u32::MAX, false); + if finished { + notifier.toast = None; + continue; + } + toast.draw(&self.gui.atlas, batch, 32.0 * slot as f32); + slot += 1; } } /// A left click on the prompt: its answer when it hit a button. @@ -449,3 +463,97 @@ impl Game<'_> { } } } + +#[cfg(test)] +mod tests { + use super::*; + use download::Progress::*; + + fn notifier(total: usize, events: &[download::Progress]) -> PackNotifier { + let (send, receive) = std::sync::mpsc::channel(); + for event in events { + send.send(*event).unwrap(); + } + let mut notifier = PackNotifier::new(receive, total); + assert!(notifier.poll()); + notifier + } + fn texts(n: &PackNotifier) -> (serde_json::Value, Option) { + let (title, message) = n.text(); + (title.component(), message.map(|m| m.component())) + } + + #[test] + fn the_toast_counts_requests_and_shows_progress() { + let n = notifier(2, &[RequestStart]); + let (title, message) = texts(&n); + assert_eq!(title["translate"], "download.pack.title"); + assert_eq!(title["with"], serde_json::json!([1, 2])); + assert_eq!(message, None); + let n = notifier(2, &[RequestStart, DownloadStart(Some(400)), Bytes(100)]); + assert_eq!( + texts(&n).1.unwrap(), + serde_json::json!({"translate": "download.pack.progress.percent", "with": [25]}) + ); + let n = notifier(1, &[RequestStart, DownloadStart(None), Bytes(1280)]); + assert_eq!( + texts(&n).1.unwrap()["with"], + serde_json::json!([{"text": "1.3 KB"}]) + ); + } + + #[test] + fn a_failed_pack_turns_the_toast_into_the_failure_count() { + let events = [ + RequestStart, + RequestFinished(false), + RequestStart, + DownloadStart(Some(3)), + Bytes(3), + ]; + let (send, receive) = std::sync::mpsc::channel(); + for event in events { + send.send(event).unwrap(); + } + let mut n = PackNotifier::new(receive, 2); + assert!(n.poll()); + // Not the last request yet: still downloading. + assert_eq!(texts(&n).0["translate"], "download.pack.title"); + send.send(RequestFinished(true)).unwrap(); + drop(send); + assert!(n.poll(), "the failure toast stays until it slides out"); + let (title, message) = texts(&n); + assert_eq!( + title, + serde_json::json!({"translate": "download.pack.failed", "with": [1, 2]}) + ); + assert_eq!(message, None); + } + + #[test] + fn a_finished_batch_without_a_toast_is_dropped() { + let (send, receive) = std::sync::mpsc::channel::(); + drop(send); + assert!(!PackNotifier::new(receive, 1).poll()); + } + + #[test] + fn sizes_read_as_realms_unit_human_readable() { + // com.mojang.realmsclient.Unit.humanReadable, run on the 26.3 jar. + for (bytes, text) in [ + (0, "0 B"), + (1023, "1023 B"), + (1024, "1.0 KB"), + (1280, "1.3 KB"), + (1535, "1.5 KB"), + (10_000, "9.8 KB"), + (1_048_575, "1024.0 KB"), + (1_048_576, "1.0 MB"), + (52_428_800, "50.0 MB"), + (262_144_000, "250.0 MB"), + (1_073_741_824, "1.0 GB"), + ] { + assert_eq!(human_readable(bytes), text, "{bytes}"); + } + } +} diff --git a/crates/horizon-client/src/server_packs/download.rs b/crates/horizon-client/src/server_packs/download.rs index c299db9b9..4b075962f 100644 --- a/crates/horizon-client/src/server_packs/download.rs +++ b/crates/horizon-client/src/server_packs/download.rs @@ -34,16 +34,18 @@ pub fn headers(name: &str, uuid: u128) -> Vec<(&'static str, String)> { ] } -/// `DownloadProgressListener`, on the channel a download was given. -#[derive(Clone, Copy, Debug)] +/// `HttpUtil.DownloadProgressListener`, on the channel a batch was given. +#[derive(Clone, Copy, Debug, PartialEq)] pub enum Progress { - /// `requestStart`: a request began; its Content-Length when the - /// response said one. - RequestStart(Option), - /// `downloadedBytes`: the bytes this request has written so far. + /// `requestStart`: the batch's next request begins. + RequestStart, + /// `downloadStart`: the response came, with its Content-Length if it + /// said one. + DownloadStart(Option), + /// `downloadedBytes`: what this request has written so far. Bytes(u64), - /// `downloadFinished`: the batch ran, whatever it downloaded. - Finished, + /// `requestFinished`: whether it succeeded. + RequestFinished(bool), } type Job = (Vec, Vec<(&'static str, String)>, Sender); @@ -97,7 +99,9 @@ fn run( let mut batch = Batch::default(); for request in requests { let id = horizon_protocol::crypto::uuid_string(request.id); + let _ = progress.send(Progress::RequestStart); let result = download_file(&dir.join(&id), request, headers, MAX_SIZE, progress); + let _ = progress.send(Progress::RequestFinished(result.is_ok())); // DownloadQueue.LogEntry, its fields in the codec's order. let mut entry = vec![ ("id", serde_json::Value::from(id)), @@ -137,7 +141,6 @@ fn run( Err(_) => batch.failed.push(request.id), } } - let _ = progress.send(Progress::Finished); batch } @@ -225,6 +228,7 @@ pub fn download_file( .header("Content-Length") .and_then(|v| v.trim().parse::().ok()); fs::create_dir_all(dir).map_err(|e| e.to_string())?; + let _ = progress.send(Progress::DownloadStart(size)); if let Some(size) = size && size > max_size { @@ -232,7 +236,6 @@ pub fn download_file( "Filesize is bigger than maximum allowed (file is {size}, limit is {max_size})" )); } - let _ = progress.send(Progress::RequestStart(size)); let mut input = response.into_reader(); let mut report = |written: u64| { let _ = progress.send(Progress::Bytes(written)); @@ -473,6 +476,7 @@ mod tests { let dir = scratch(); let (url, server) = serve("200 OK", b"zip".to_vec()); let queue = Queue::open(dir.clone()).unwrap(); + let (progress, events) = channel(); let id = 0x5b2c_7a4e_1f3d_4c8b_9a6e_2d4f_8b1c_3e5a; queue.download( vec![Request { @@ -481,7 +485,7 @@ mod tests { sha1: None, }], Vec::new(), - channel().0, + progress, ); let batch = loop { if let Some(b) = queue.finished().pop() { @@ -494,6 +498,16 @@ mod tests { .join("5b2c7a4e-1f3d-4c8b-9a6e-2d4f8b1c3e5a") .join(sha1(b"zip")); assert_eq!(batch.downloaded, [(id, file)]); + // HttpUtil.downloadFile's listener calls, in order. + assert_eq!( + events.iter().collect::>(), + [ + Progress::RequestStart, + Progress::DownloadStart(Some(3)), + Progress::Bytes(3), + Progress::RequestFinished(true), + ] + ); let log = fs::read_to_string(dir.join("log.json")).unwrap(); let entry: serde_json::Value = serde_json::from_str(log.trim()).unwrap(); assert_eq!(entry["id"], "5b2c7a4e-1f3d-4c8b-9a6e-2d4f8b1c3e5a"); diff --git a/crates/horizon-client/src/title.rs b/crates/horizon-client/src/title.rs index 94b1ba2e8..ce1c8abf8 100644 --- a/crates/horizon-client/src/title.rs +++ b/crates/horizon-client/src/title.rs @@ -1150,7 +1150,7 @@ impl Title { + 30.0; // Toast.xPos: in from the right edge by the visible portion. let x = w - width * slide.portion; - toast_background(atlas, batch, x, width); + crate::toasts::background(atlas, batch, x, 0.0, width); batch.text(atlas, &title, x + 18.0, 7.0, rgba(255, 255, 0, 255), false); batch.text(atlas, &message, x + 18.0, 19.0, u32::MAX, false); } @@ -1553,36 +1553,6 @@ impl Title { } } } -/// SystemToast's 32-pixel background keeps the notice icon and borders intact. -pub fn toast_background(atlas: &HudAtlas, batch: &mut HudBatch, x: f32, width: f32) { - let Some(rect) = atlas.sprites.get("gui/sprites/toast/system").copied() else { - return; - }; - let source_x = [0.0, 17.0, rect.w as f32 - 4.0, rect.w as f32]; - let target_x = [x, x + 17.0, x + width - 4.0, x + width]; - for col in 0..3 { - for (sy, sh, y, h) in [ - (0.0, 28.0, 0.0, 28.0), - (rect.h as f32 - 4.0, 4.0, 28.0, 4.0), - ] { - let mut piece = rect; - let du = (rect.u1 - rect.u0) / rect.w as f32; - let dv = (rect.v1 - rect.v0) / rect.h as f32; - piece.u0 = rect.u0 + source_x[col] * du; - piece.u1 = rect.u0 + source_x[col + 1] * du; - piece.v0 = rect.v0 + sy * dv; - piece.v1 = rect.v0 + (sy + sh) * dv; - batch.rect_uv( - target_x[col], - y, - target_x[col + 1] - target_x[col], - h, - piece, - u32::MAX, - ); - } - } -} fn centered(atlas: &HudAtlas, batch: &mut HudBatch, text: &str, y: f32, color: u32) { batch.text( atlas, diff --git a/crates/horizon-client/src/toasts.rs b/crates/horizon-client/src/toasts.rs index 26807100a..b70a37036 100644 --- a/crates/horizon-client/src/toasts.rs +++ b/crates/horizon-client/src/toasts.rs @@ -1,5 +1,6 @@ //! `ToastManager`'s slide, shared by the game's toasts and the title //! screens' system toasts. +use crate::hud::{HudAtlas, HudBatch}; use std::time::Instant; /// `ToastManager.ToastInstance`: slides a toast in and out over 600 ms, @@ -56,3 +57,104 @@ impl Slide { self.update(origin.elapsed().as_millis() as i64, wants_show) } } + +/// `SystemToast`: a yellow title over a white message (or the title alone, +/// lower down) on the system background. It stays until its display time +/// has passed since its last change, or until it is hidden. +pub struct SystemToast { + pub slide: Slide, + title: String, + message: Option, + /// `changed`: the next update takes its time as `lastChanged`. + changed: bool, + last_changed: i64, + force_hide: bool, +} +impl SystemToast { + /// `SystemToastId.displayTime`'s default, in milliseconds. + const DISPLAY_TIME: f64 = 5000.0; + pub fn new(title: String, message: Option) -> Self { + Self { + slide: Slide::default(), + title, + message, + changed: false, + last_changed: 0, + force_hide: false, + } + } + /// `reset`: new text, and the display time starts again. + pub fn reset(&mut self, title: String, message: Option) { + self.title = title; + self.message = message; + self.changed = true; + } + pub fn force_hide(&mut self) { + self.force_hide = true; + } + /// `ToastInstance.update` with `SystemToast.update`, the display time + /// scaled by the Notification Time option: the visibility it switched + /// to (the sound to play), and whether it has slid out. + pub fn update(&mut self, multiplier: f64) -> (Option, bool) { + self.slide.update_now(|fully| { + if std::mem::take(&mut self.changed) { + self.last_changed = fully; + } + !self.force_hide + && ((fully - self.last_changed) as f64) < Self::DISPLAY_TIME * multiplier + }) + } + /// `extractRenderState` at `y`, in from the right edge by the visible + /// portion (`Toast.xPos`). + pub fn draw(&self, atlas: &HudAtlas, batch: &mut HudBatch, y: f32) { + let width = std::iter::once(&self.title) + .chain(&self.message) + .map(|line| HudBatch::text_width(atlas, line)) + .fold(0.0, f32::max) + .ceil() + .max(160.0) + + 30.0; + let x = batch.width - width * self.slide.portion; + background(atlas, batch, x, y, width); + let yellow = crate::hud::rgba(255, 255, 0, 255); + match &self.message { + Some(message) => { + batch.text(atlas, &self.title, x + 18.0, y + 7.0, yellow, false); + batch.text(atlas, message, x + 18.0, y + 19.0, u32::MAX, false); + } + None => { + batch.text(atlas, &self.title, x + 18.0, y + 12.0, yellow, false); + } + } + } +} +/// SystemToast's 32-pixel background keeps the notice icon and borders intact. +pub fn background(atlas: &HudAtlas, batch: &mut HudBatch, x: f32, y: f32, width: f32) { + let Some(rect) = atlas.sprites.get("gui/sprites/toast/system").copied() else { + return; + }; + let source_x = [0.0, 17.0, rect.w as f32 - 4.0, rect.w as f32]; + let target_x = [x, x + 17.0, x + width - 4.0, x + width]; + for col in 0..3 { + for (sy, sh, y, h) in [ + (0.0, 28.0, y, 28.0), + (rect.h as f32 - 4.0, 4.0, y + 28.0, 4.0), + ] { + let mut piece = rect; + let du = (rect.u1 - rect.u0) / rect.w as f32; + let dv = (rect.v1 - rect.v0) / rect.h as f32; + piece.u0 = rect.u0 + source_x[col] * du; + piece.u1 = rect.u0 + source_x[col + 1] * du; + piece.v0 = rect.v0 + sy * dv; + piece.v1 = rect.v0 + (sy + sh) * dv; + batch.rect_uv( + target_x[col], + y, + target_x[col + 1] - target_x[col], + h, + piece, + u32::MAX, + ); + } + } +} From f07d66c7cfa9b298b0e36b6035e2d9fe7ffc5eda Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:44:21 +0200 Subject: [PATCH 071/140] Trims: their own arm in Component::read The trim decode sat inside the read-past fallback and matched the kind there; it now has a TRIM arm, and the fallback only reads past. Long comment lines wrapped. Co-Authored-By: Claude Opus 5.5 --- .../examples/item_wire_probe.rs | 3 +- crates/horizon-protocol/src/item.rs | 33 +++++++++++-------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/crates/horizon-protocol/examples/item_wire_probe.rs b/crates/horizon-protocol/examples/item_wire_probe.rs index 097a9f40d..eb613b520 100644 --- a/crates/horizon-protocol/examples/item_wire_probe.rs +++ b/crates/horizon-protocol/examples/item_wire_probe.rs @@ -3,7 +3,8 @@ //! `item::Slot` and prints, per stack, whether every byte was consumed, the //! patch's component ids (added, then removed), which of them Horizon //! decoded into its own lossy types (the rest it reads past keeping their -//! bytes, or decodes into ids it writes back unchanged, like trims) and whether encoding the decoded stack gives the same bytes back. +//! bytes, or decodes into ids it writes back unchanged, like trims) and +//! whether encoding the decoded stack gives the same bytes back. //! //! cargo run -p horizon-protocol --example item_wire_probe -- vanilla.jsonl rust.jsonl use horizon_protocol::{ diff --git a/crates/horizon-protocol/src/item.rs b/crates/horizon-protocol/src/item.rs index 2872c0228..6b6b845f8 100644 --- a/crates/horizon-protocol/src/item.rs +++ b/crates/horizon-protocol/src/item.rs @@ -236,21 +236,25 @@ impl Component { hidden: (0..n).map(|_| r.varint()).collect::>()?, } } + // ArmorTrim.STREAM_CODEC: two holders, each a reference's id plus + // one. A direct material or pattern has no registry name: read past. + TRIM => { + let start = r.position(); + skip::component(TRIM, r)?; + let bytes = r.since(start); + let mut ids = Reader::new(bytes); + match (ids.varint(), ids.varint()) { + (Ok(material @ 1..), Ok(pattern @ 1..)) if ids.remaining() == 0 => Self::Trim { + material: material - 1, + pattern: pattern - 1, + }, + _ => Self::Raw(bytes.to_vec()), + } + } other => { let start = r.position(); skip::component(other, r)?; - let bytes = r.since(start); - // Two references: each holder is just its id plus one. - let mut ids = Reader::new(bytes); - match (other, ids.varint(), ids.varint()) { - (TRIM, Ok(material @ 1..), Ok(pattern @ 1..)) if ids.remaining() == 0 => { - Self::Trim { - material: material - 1, - pattern: pattern - 1, - } - } - _ => Self::Raw(bytes.to_vec()), - } + Self::Raw(r.since(start).to_vec()) } }) } @@ -668,8 +672,9 @@ mod tests { #[test] fn components_read_past_keep_their_bytes() { // Vanilla 26.3's encoding (tools/test_item_wire_parity.py) of a chestplate's - // armour trim (decoded: both holders are references), a banner's patterns (one direct), a pot's sherds and a stew's - // effects: one server's inventory, recipe book and advancements had them. + // armour trim (decoded: both holders are references), a banner's patterns + // (one direct), a pot's sherds and a stew's effects: one server's + // inventory, recipe book and advancements had them. for (hex, kind) in [ ("01bd0801003a0502", 58), ("01890b01004a02200e000b6d696e6563726166743a7801790b", 74), From ba09b086a67573debb21c124fe41df35e70897e8 Mon Sep 17 00:00:00 2001 From: socksprox Date: Sun, 25 Oct 2026 01:49:31 +0200 Subject: [PATCH 072/140] Multiplayer: drop the player name from the join loading line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The pre-world overlay said "Joined as {name}; loading terrain..." after Event::Joined. Vanilla's LevelLoadingScreen only ever draws the multiplayer.downloadingTerrain text there — use that translation, no name. Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- crates/horizon-client/src/game/remote.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 45ba4bebe..4aa431810 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -829,7 +829,13 @@ impl Game<'_> { r.joined = true; r.profile = uuid; r.profile_name = name.clone(); - r.status = format!("Joined as {name}; loading terrain..."); + // `multiplayer.downloadingTerrain`, as + // LevelLoadingScreen shows it; no player name. + r.status = horizon_client::text::Text::translate( + "multiplayer.downloadingTerrain", + &[], + ) + .plain(); } } Event::Brand(brand) => { From e30166f23bad89819e505fa1b2abd865cdafd63b Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sun, 25 Oct 2026 02:51:11 +0300 Subject: [PATCH 073/140] Options: Horizon's own captions read a bundled language namespace (#1672) The settings screen's own options (controller, vibration, dead zones and the rest) are not vanilla options and have no vanilla keys, so their captions were English literals. They now read horizon.options.* from assets/horizon/lang, which the client bundles as one more language source placed first, so a pack or the prepared root can still override it. English and Russian ship here. --- .../assets/horizon/lang/en_us.json | 16 +++++++++ .../assets/horizon/lang/ru_ru.json | 16 +++++++++ crates/horizon-client/src/lang.rs | 33 +++++++++++++++++++ crates/horizon-client/src/options_ui.rs | 29 ++++++++-------- 4 files changed, 80 insertions(+), 14 deletions(-) create mode 100644 crates/horizon-client/assets/horizon/lang/en_us.json create mode 100644 crates/horizon-client/assets/horizon/lang/ru_ru.json diff --git a/crates/horizon-client/assets/horizon/lang/en_us.json b/crates/horizon-client/assets/horizon/lang/en_us.json new file mode 100644 index 000000000..056162553 --- /dev/null +++ b/crates/horizon-client/assets/horizon/lang/en_us.json @@ -0,0 +1,16 @@ +{ + "horizon.menu.friends": "Friends", + "horizon.options.controller": "Controller", + "horizon.options.vibration": "Vibration", + "horizon.options.adaptive_triggers": "Adaptive Triggers", + "horizon.options.lightbar": "Lightbar", + "horizon.options.look_sensitivity": "Look Sensitivity", + "horizon.options.invert_x": "Invert Look X", + "horizon.options.invert_y": "Invert Look Y", + "horizon.options.sneak_button": "Sneak Button", + "horizon.options.move_deadzone": "Move Deadzone", + "horizon.options.look_deadzone": "Look Deadzone", + "horizon.options.button_glyphs": "Button Glyphs", + "horizon.options.menu_navigation": "Menu Navigation", + "horizon.options.on_screen_keyboard": "On-Screen Keyboard" +} diff --git a/crates/horizon-client/assets/horizon/lang/ru_ru.json b/crates/horizon-client/assets/horizon/lang/ru_ru.json new file mode 100644 index 000000000..1152f3669 --- /dev/null +++ b/crates/horizon-client/assets/horizon/lang/ru_ru.json @@ -0,0 +1,16 @@ +{ + "horizon.menu.friends": "Друзья", + "horizon.options.controller": "Геймпад", + "horizon.options.vibration": "Вибрация", + "horizon.options.adaptive_triggers": "Адаптивные триггеры", + "horizon.options.lightbar": "Подсветка", + "horizon.options.look_sensitivity": "Чувствительность обзора", + "horizon.options.invert_x": "Инверсия обзора по X", + "horizon.options.invert_y": "Инверсия обзора по Y", + "horizon.options.sneak_button": "Кнопка приседания", + "horizon.options.move_deadzone": "Мёртвая зона движения", + "horizon.options.look_deadzone": "Мёртвая зона обзора", + "horizon.options.button_glyphs": "Символы кнопок", + "horizon.options.menu_navigation": "Навигация по меню", + "horizon.options.on_screen_keyboard": "Экранная клавиатура" +} diff --git a/crates/horizon-client/src/lang.rs b/crates/horizon-client/src/lang.rs index 15f47285a..f761e1199 100644 --- a/crates/horizon-client/src/lang.rs +++ b/crates/horizon-client/src/lang.rs @@ -29,6 +29,22 @@ pub const DEFAULT: &str = "en_us"; static CURRENT: RwLock>> = RwLock::new(None); +/// Horizon's own strings, compiled in so they need no prepared resources. +struct Bundled; +impl ResourceSource for Bundled { + fn read(&self, path: &str) -> Option> { + let body = match path { + "assets/horizon/lang/en_us.json" => include_str!("../assets/horizon/lang/en_us.json"), + "assets/horizon/lang/ru_ru.json" => include_str!("../assets/horizon/lang/ru_ru.json"), + _ => return None, + }; + Some(body.as_bytes().to_vec()) + } + fn namespaces(&self) -> Vec { + vec!["horizon".into()] + } +} + /// A source of resource files: the prepared root plus packs, highest priority last. pub trait ResourceSource { fn read(&self, path: &str) -> Option>; @@ -86,6 +102,12 @@ impl Language { if code != DEFAULT { codes.push(code); } + // Horizon's own strings first, so a pack or the prepared root can still + // override them. Vanilla has no key for "Controller vibration". + let bundled = Bundled; + let mut all: Vec<&dyn ResourceSource> = vec![&bundled]; + all.extend_from_slice(sources); + let sources = all.as_slice(); let namespaces: std::collections::BTreeSet = sources.iter().flat_map(|s| s.namespaces()).collect(); for c in codes { @@ -204,6 +226,17 @@ mod tests { self.0.get(path).cloned() } } + #[test] + fn bundled_horizon_strings_follow_the_language() { + // No prepared resources at all: the namespace is compiled in. + let empty = Mem(HashMap::new()); + let en = Language::load(&[&empty], "en_us"); + assert_eq!(en.get("horizon.options.controller"), Some("Controller")); + let ru = Language::load(&[&empty], "ru_ru"); + assert_eq!(ru.get("horizon.options.controller"), Some("Геймпад")); + assert_eq!(ru.get("horizon.menu.friends"), Some("Друзья")); + } + #[test] fn layers_selected_language_over_english() { let base = Mem(HashMap::from([ diff --git a/crates/horizon-client/src/options_ui.rs b/crates/horizon-client/src/options_ui.rs index 99a83072f..d344c2df8 100644 --- a/crates/horizon-client/src/options_ui.rs +++ b/crates/horizon-client/src/options_ui.rs @@ -267,20 +267,21 @@ impl Opt { Opt::HighContrastBlockOutlines => "options.accessibility.high_contrast_block_outline", Opt::ForceUnicode => "options.forceUnicodeFont", Opt::JapaneseGlyphs => "options.japaneseGlyphVariants", - // Horizon's own options: English captions (no vanilla keys). - Opt::PadEnabled => "Controller", - Opt::PadVibration => "Vibration", - Opt::PadAdaptiveTriggers => "Adaptive Triggers", - Opt::PadLightbar => "Lightbar", - Opt::PadLookSensitivity => "Look Sensitivity", - Opt::PadInvertX => "Invert Look X", - Opt::PadInvertY => "Invert Look Y", - Opt::PadToggleSneak => "Sneak Button", - Opt::PadMoveDeadzone => "Move Deadzone", - Opt::PadLookDeadzone => "Look Deadzone", - Opt::PadGlyphs => "Button Glyphs", - Opt::PadMenuNav => "Menu Navigation", - Opt::PadKeyboard => "On-Screen Keyboard", + // Horizon's own options: vanilla has no keys for them, so they read + // the namespace the client bundles (assets/horizon/lang). + Opt::PadEnabled => "horizon.options.controller", + Opt::PadVibration => "horizon.options.vibration", + Opt::PadAdaptiveTriggers => "horizon.options.adaptive_triggers", + Opt::PadLightbar => "horizon.options.lightbar", + Opt::PadLookSensitivity => "horizon.options.look_sensitivity", + Opt::PadInvertX => "horizon.options.invert_x", + Opt::PadInvertY => "horizon.options.invert_y", + Opt::PadToggleSneak => "horizon.options.sneak_button", + Opt::PadMoveDeadzone => "horizon.options.move_deadzone", + Opt::PadLookDeadzone => "horizon.options.look_deadzone", + Opt::PadGlyphs => "horizon.options.button_glyphs", + Opt::PadMenuNav => "horizon.options.menu_navigation", + Opt::PadKeyboard => "horizon.options.on_screen_keyboard", } } pub(crate) fn kind(self, s: &Settings) -> Kind { From 75c009e3fc9ce99d3e6e31fa138a7c1656d89640 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:53:03 +0200 Subject: [PATCH 074/140] Boss events: one path from the host's diff to every overlay The host diffed each viewer's boss events into a Change enum, then turned the changes into packets for guests and, through a second match, into setter calls on the window's own overlay; the client turned packets into the same setters a third way. The diff now yields ClientboundBossEventPacket values, guests get them as packets and the local overlay applies them with BossOverlay::apply, the same function a server's packets reach. Gone: Change, Snap, Sent, apply_local, boss_packet and the overlay's nine-argument add and setters. UUIDUtil.uuidFromIntArray joins uuid_ints in lan::playerdata. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/boss_overlay.rs | 160 +++++++---- crates/horizon-client/src/game/bossbars.rs | 282 +++++--------------- crates/horizon-client/src/game/remote.rs | 2 +- crates/horizon-client/src/lan/playerdata.rs | 5 + 4 files changed, 178 insertions(+), 271 deletions(-) diff --git a/crates/horizon-client/src/boss_overlay.rs b/crates/horizon-client/src/boss_overlay.rs index e51a59668..12920e0d0 100644 --- a/crates/horizon-client/src/boss_overlay.rs +++ b/crates/horizon-client/src/boss_overlay.rs @@ -1,6 +1,11 @@ //! `BossHealthOverlay` and `LerpingBossEvent`: the boss bars a client is //! showing, in the order their add packets arrived. -use crate::{hud_overlays::BossBar, text::Text}; +use crate::{ + hud_overlays::BossBar, + scoreboard::{comp_text, tag_to_json}, + text::Text, +}; +use horizon_protocol::packets::play::{BossAction, BossEvent}; /// `LerpingBossEvent.LERP_MILLISECONDS`. const LERP_MS: u128 = 100; @@ -57,61 +62,62 @@ impl BossOverlay { pub fn reset(&mut self) { *self = Self::default(); } - /// `Handler.add`. An id already shown keeps its place. - pub fn add( - &mut self, - id: u128, - name: Text, - progress: f32, - color: u8, - overlay: u8, - darken: bool, - music: bool, - fog: bool, - now: u128, - ) { - let event = Event { - id, + /// `ClientboundBossEventPacket.dispatch` into `BossHealthOverlay`'s + /// handler. An id already shown keeps its place when added again. + pub fn apply(&mut self, packet: &BossEvent, now: u128) { + // An ordinal past the enum shows as its last value. + let color = |c: i32| c.clamp(0, 6) as u8; + let overlay = |o: i32| o.clamp(0, 4) as u8; + let id = packet.id; + if let BossAction::Add { name, progress, - target: progress, - set_at: now, - color: color.min(6), - overlay: overlay.min(4), + color: c, + overlay: o, darken, music, fog, + } = &packet.action + { + let event = Event { + id, + name: comp_text(&tag_to_json(name)), + progress: *progress, + target: *progress, + set_at: now, + color: color(*c), + overlay: overlay(*o), + darken: *darken, + music: *music, + fog: *fog, + }; + match self.events.iter_mut().find(|e| e.id == id) { + Some(slot) => *slot = event, + None => self.events.push(event), + } + return; + } + if let BossAction::Remove = packet.action { + self.events.retain(|e| e.id != id); + return; + } + let Some(e) = self.events.iter_mut().find(|e| e.id == id) else { + return; }; - if let Some(slot) = self.events.iter_mut().find(|e| e.id == id) { - *slot = event; - } else { - self.events.push(event); - } - } - pub fn remove(&mut self, id: u128) { - self.events.retain(|e| e.id != id); - } - pub fn set_progress(&mut self, id: u128, progress: f32, now: u128) { - if let Some(e) = self.events.iter_mut().find(|e| e.id == id) { - e.set_progress(progress, now); - } - } - pub fn set_name(&mut self, id: u128, name: Text) { - if let Some(e) = self.events.iter_mut().find(|e| e.id == id) { - e.name = name; - } - } - pub fn set_style(&mut self, id: u128, color: u8, overlay: u8) { - if let Some(e) = self.events.iter_mut().find(|e| e.id == id) { - e.color = color.min(6); - e.overlay = overlay.min(4); - } - } - pub fn set_properties(&mut self, id: u128, darken: bool, music: bool, fog: bool) { - if let Some(e) = self.events.iter_mut().find(|e| e.id == id) { - e.darken = darken; - e.music = music; - e.fog = fog; + match &packet.action { + BossAction::UpdateProgress { progress } => e.set_progress(*progress, now), + BossAction::UpdateName { name } => e.name = comp_text(&tag_to_json(name)), + BossAction::UpdateStyle { + color: c, + overlay: o, + } => { + e.color = color(*c); + e.overlay = overlay(*o); + } + BossAction::UpdateProperties { darken, music, fog } => { + (e.darken, e.music, e.fog) = (*darken, *music, *fog); + } + BossAction::Add { .. } | BossAction::Remove => {} } } /// `GameRenderer.tick` while the level runs. @@ -157,26 +163,54 @@ impl BossOverlay { #[cfg(test)] mod tests { use super::*; + use horizon_world::nbt::Tag; + + fn add(id: u128, name: &str, progress: f32, darken: bool, fog: bool) -> BossEvent { + BossEvent { + id, + action: BossAction::Add { + name: Tag::String(name.into()), + progress, + color: 5, + overlay: 0, + darken, + music: false, + fog, + }, + } + } + fn progress(id: u128, progress: f32) -> BossEvent { + BossEvent { + id, + action: BossAction::UpdateProgress { progress }, + } + } #[test] fn progress_lerps_over_a_tenth_of_a_second() { let mut overlay = BossOverlay::default(); - overlay.add(1, Text::literal("W"), 0.0, 5, 0, true, false, false, 0); - overlay.set_progress(1, 1.0, 0); + overlay.apply(&add(1, "W", 0.0, true, false), 0); + overlay.apply(&progress(1, 1.0), 0); assert!((overlay.bars(50)[0].progress - 0.5).abs() < 1.0e-5); assert!((overlay.bars(100)[0].progress - 1.0).abs() < 1.0e-5); // A new target starts from the value on screen. - overlay.set_progress(1, 0.0, 50); + overlay.apply(&progress(1, 0.0), 50); assert!((overlay.bars(150)[0].progress - 0.0).abs() < 1.0e-5); } #[test] fn darken_ramps_and_fades() { let mut overlay = BossOverlay::default(); - overlay.add(1, Text::literal("W"), 1.0, 5, 0, true, false, false, 0); + overlay.apply(&add(1, "W", 1.0, true, false), 0); overlay.tick_darken(true); assert!((overlay.darken_amount(1.0) - 0.05).abs() < 1.0e-5); - overlay.remove(1); + overlay.apply( + &BossEvent { + id: 1, + action: BossAction::Remove, + }, + 0, + ); overlay.tick_darken(true); assert!((overlay.darken - 0.0375).abs() < 1.0e-5); assert!(!overlay.should_play_music()); @@ -185,9 +219,11 @@ mod tests { #[test] fn bars_keep_arrival_order() { let mut overlay = BossOverlay::default(); - overlay.add(2, Text::literal("b"), 1.0, 0, 0, false, true, true, 0); - overlay.add(1, Text::literal("a"), 1.0, 0, 0, false, false, false, 0); - overlay.add(2, Text::literal("c"), 0.5, 1, 2, false, true, true, 0); + overlay.apply(&add(2, "b", 1.0, false, true), 0); + overlay.apply(&add(1, "a", 1.0, false, false), 0); + overlay.apply(&add(2, "c", 0.5, false, true), 0); + // An update for a bar this client never got is ignored. + overlay.apply(&progress(9, 0.5), 0); let names: Vec<_> = overlay .bars(0) .into_iter() @@ -195,7 +231,13 @@ mod tests { .collect(); assert_eq!(names, ["c", "a"]); assert!(overlay.should_create_world_fog()); - overlay.remove(2); + overlay.apply( + &BossEvent { + id: 2, + action: BossAction::Remove, + }, + 0, + ); assert!(!overlay.should_create_world_fog()); } } diff --git a/crates/horizon-client/src/game/bossbars.rs b/crates/horizon-client/src/game/bossbars.rs index 85638da4a..d747fd749 100644 --- a/crates/horizon-client/src/game/bossbars.rs +++ b/crates/horizon-client/src/game/bossbars.rs @@ -9,7 +9,7 @@ use horizon_client::{ command::{Arg, Context}, mobs::Species, save, - scoreboard::{self as sb, Comp, comp_text, json_to_tag, tag_to_json}, + scoreboard::{self as sb, Comp, json_to_tag}, scoreboard_cmd::format_list, text::Text, }; @@ -23,7 +23,7 @@ pub(super) struct BossState { pub bars: BossBars, loaded: bool, /// What each viewer was last sent, so a change becomes one packet. - sent: HashMap>, + sent: HashMap>, } fn num(n: impl std::fmt::Display) -> Text { @@ -418,12 +418,11 @@ impl Game<'_> { let mut packets = Vec::new(); for viewer in &viewers { let desired = self.boss_events_for(viewer); - let changes = self.diff_boss_events(viewer, &desired); - if viewer.local { - apply_local(&mut self.boss_overlay, &changes, now); - } else if let Some(conn) = viewer.conn { - for change in changes { - packets.push((conn, boss_packet(change))); + for event in self.diff_boss_events(viewer, desired) { + if viewer.local { + self.boss_overlay.apply(&event, now); + } else if let Some(conn) = viewer.conn { + packets.push((conn, C::BossEvent(event))); } } } @@ -446,7 +445,7 @@ impl Game<'_> { if local && let Some(p) = &self.player { let ints = self.level.player_uuid.unwrap_or_else(|| self.acting_uuid()); out.push(Viewer { - uuid: ints_to_uuid(ints), + uuid: horizon_client::lan::playerdata::ints_uuid(ints), ints, at: [p.position.x, p.position.y, p.position.z], alive: !p.health.dead_or_dying(), @@ -552,8 +551,8 @@ impl Game<'_> { id: b.uuid, name: json_to_tag(&b.name), progress: b.progress(), - color: color_index(&b.color) as u8, - overlay: style_index(&b.style) as u8, + color: color_index(&b.color), + overlay: style_index(&b.style), darken: b.darken, music: b.music, fog: b.fog, @@ -562,108 +561,66 @@ impl Game<'_> { } out } - fn diff_boss_events(&mut self, viewer: &Viewer, desired: &[Offer]) -> Vec { + /// The packets that take `viewer` from what it was last sent to `desired` + /// (`ServerBossEvent`'s broadcasts). + fn diff_boss_events(&mut self, viewer: &Viewer, desired: Vec) -> Vec { let full = viewer.local; let dim = self.dim; let sent = self.bosses.sent.entry(viewer.uuid).or_default(); - let mut changes = Vec::new(); - let gone: Vec = sent - .iter() - .filter(|(id, prev)| { - let owned = full || prev.scope == Scope::Global || prev.scope == Scope::Level(dim); - owned && !desired.iter().any(|e| e.id == **id) - }) - .map(|(id, _)| *id) - .collect(); - for id in gone { - sent.remove(&id); - changes.push(Change::Remove(id)); - } - for event in desired { - let snap = event.snap(); - match sent.get(&event.id).map(|s| s.snap.clone()) { - None => { - sent.insert( - event.id, - Sent { - snap, - scope: event.scope, - }, - ); - changes.push(Change::Add(event.clone())); - } - Some(prev) => { - if prev.progress != snap.progress { - changes.push(Change::Progress(event.id, snap.progress)); - } - if prev.name != snap.name { - changes.push(Change::Name(event.id, snap.name.clone())); - } - if prev.color != snap.color || prev.overlay != snap.overlay { - changes.push(Change::Style(event.id, snap.color, snap.overlay)); - } - if prev.darken != snap.darken - || prev.music != snap.music - || prev.fog != snap.fog - { - changes.push(Change::Properties( - event.id, - snap.darken, - snap.music, - snap.fog, - )); - } - sent.insert( - event.id, - Sent { - snap, - scope: event.scope, - }, - ); - } + let mut out = Vec::new(); + let event = |id, action| play::BossEvent { id, action }; + sent.retain(|id, prev| { + let owned = full || prev.scope == Scope::Global || prev.scope == Scope::Level(dim); + let keep = !owned || desired.iter().any(|e| e.id == *id); + if !keep { + out.push(event(*id, BossAction::Remove)); } + keep + }); + for offer in desired { + let Some(prev) = sent.get(&offer.id) else { + out.push(event( + offer.id, + BossAction::Add { + name: offer.name.clone(), + progress: offer.progress, + color: offer.color, + overlay: offer.overlay, + darken: offer.darken, + music: offer.music, + fog: offer.fog, + }, + )); + sent.insert(offer.id, offer); + continue; + }; + let id = offer.id; + if prev.progress != offer.progress { + let progress = offer.progress; + out.push(event(id, BossAction::UpdateProgress { progress })); + } + if prev.name != offer.name { + let name = offer.name.clone(); + out.push(event(id, BossAction::UpdateName { name })); + } + if (prev.color, prev.overlay) != (offer.color, offer.overlay) { + let (color, overlay) = (offer.color, offer.overlay); + out.push(event(id, BossAction::UpdateStyle { color, overlay })); + } + if (prev.darken, prev.music, prev.fog) != (offer.darken, offer.music, offer.fog) { + let (darken, music, fog) = (offer.darken, offer.music, offer.fog); + out.push(event( + id, + BossAction::UpdateProperties { darken, music, fog }, + )); + } + sent.insert(id, offer); } - changes + out } /// `ClientPacketListener.handleBossUpdate`. - pub(super) fn apply_boss_event(&mut self, packet: play::BossEvent) { - let now = boss_overlay::now_millis(); - let ord = |v: i32| v.clamp(0, 255) as u8; - match packet.action { - BossAction::Add { - name, - progress, - color, - overlay, - darken, - music, - fog, - } => self.boss_overlay.add( - packet.id, - component_text(&name), - progress, - ord(color), - ord(overlay), - darken, - music, - fog, - now, - ), - BossAction::Remove => self.boss_overlay.remove(packet.id), - BossAction::UpdateProgress { progress } => { - self.boss_overlay.set_progress(packet.id, progress, now) - } - BossAction::UpdateName { name } => { - self.boss_overlay.set_name(packet.id, component_text(&name)) - } - BossAction::UpdateStyle { color, overlay } => { - self.boss_overlay - .set_style(packet.id, ord(color), ord(overlay)) - } - BossAction::UpdateProperties { darken, music, fog } => self - .boss_overlay - .set_properties(packet.id, darken, music, fog), - } + pub(super) fn apply_boss_event(&mut self, packet: &play::BossEvent) { + self.boss_overlay.apply(packet, boss_overlay::now_millis()); } } @@ -673,27 +630,20 @@ fn insecure_uuid(random: &mut impl RandomSource) -> u128 { let least = random.next_long() & 4_611_686_018_427_387_903 | i64::MIN; ((most as u64 as u128) << 64) | (least as u64 as u128) } -fn ints_to_uuid(ints: [i32; 4]) -> u128 { - ints.iter() - .fold(0u128, |acc, &i| (acc << 32) | u128::from(i as u32)) -} fn translate_tag(key: &str) -> Tag { Tag::compound([("translate", Tag::String(key.into()))]) } -fn color_index(color: &str) -> usize { +fn color_index(color: &str) -> i32 { bossbar::COLORS .iter() .position(|c| *c == color) - .unwrap_or(6) + .unwrap_or(6) as i32 } -fn style_index(style: &str) -> usize { +fn style_index(style: &str) -> i32 { bossbar::STYLES .iter() .position(|s| *s == style) - .unwrap_or(0) -} -fn component_text(tag: &Tag) -> Text { - comp_text(&tag_to_json(tag)) + .unwrap_or(0) as i32 } #[derive(Clone, Copy, PartialEq, Eq)] @@ -701,20 +651,6 @@ enum Scope { Global, Level(Dim), } -#[derive(Clone)] -struct Snap { - name: Tag, - progress: f32, - color: u8, - overlay: u8, - darken: bool, - music: bool, - fog: bool, -} -struct Sent { - snap: Snap, - scope: Scope, -} struct Viewer { uuid: u128, ints: [i32; 4], @@ -725,92 +661,16 @@ struct Viewer { conn: Option, view_chunks: i32, } -#[derive(Clone)] +/// A boss event as one viewer should see it, and as it was last sent. struct Offer { id: u128, name: Tag, progress: f32, - color: u8, - overlay: u8, + /// `BossBarColor` and `BossBarOverlay` ordinals. + color: i32, + overlay: i32, darken: bool, music: bool, fog: bool, scope: Scope, } -impl Offer { - fn snap(&self) -> Snap { - Snap { - name: self.name.clone(), - progress: self.progress, - color: self.color, - overlay: self.overlay, - darken: self.darken, - music: self.music, - fog: self.fog, - } - } -} -enum Change { - Add(Offer), - Remove(u128), - Progress(u128, f32), - Name(u128, Tag), - Style(u128, u8, u8), - Properties(u128, bool, bool, bool), -} -fn apply_local(overlay: &mut boss_overlay::BossOverlay, changes: &[Change], now: u128) { - for change in changes { - match change { - Change::Add(e) => overlay.add( - e.id, - component_text(&e.name), - e.progress, - e.color, - e.overlay, - e.darken, - e.music, - e.fog, - now, - ), - Change::Remove(id) => overlay.remove(*id), - Change::Progress(id, progress) => overlay.set_progress(*id, *progress, now), - Change::Name(id, name) => overlay.set_name(*id, component_text(name)), - Change::Style(id, color, overlay_style) => { - overlay.set_style(*id, *color, *overlay_style) - } - Change::Properties(id, darken, music, fog) => { - overlay.set_properties(*id, *darken, *music, *fog) - } - } - } -} -fn boss_packet(change: Change) -> C { - let (id, action) = match change { - Change::Add(e) => ( - e.id, - BossAction::Add { - name: e.name, - progress: e.progress, - color: i32::from(e.color), - overlay: i32::from(e.overlay), - darken: e.darken, - music: e.music, - fog: e.fog, - }, - ), - Change::Remove(id) => (id, BossAction::Remove), - Change::Progress(id, progress) => (id, BossAction::UpdateProgress { progress }), - Change::Name(id, name) => (id, BossAction::UpdateName { name }), - Change::Style(id, color, overlay) => ( - id, - BossAction::UpdateStyle { - color: i32::from(color), - overlay: i32::from(overlay), - }, - ), - Change::Properties(id, darken, music, fog) => { - (id, BossAction::UpdateProperties { darken, music, fog }) - } - }; - C::BossEvent(play::BossEvent { id, action }) -} diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 9c0504a2c..0b11a0882 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -2642,7 +2642,7 @@ impl Game<'_> { } // ClientPacketListener.setActionBarText, setTitleText, // setSubtitleText, setTitlesAnimation and handleTitlesClear. - C::BossEvent(p) => self.apply_boss_event(p), + C::BossEvent(p) => self.apply_boss_event(&p), C::SetActionBarText(p) => self.titles.set_overlay(remote_text(&p.text), false), C::SetTitleText(p) => self.titles.set_title(remote_text(&p.text)), C::SetSubtitleText(p) => self.titles.set_subtitle(remote_text(&p.text)), diff --git a/crates/horizon-client/src/lan/playerdata.rs b/crates/horizon-client/src/lan/playerdata.rs index 62102ade1..90fe0bcfe 100644 --- a/crates/horizon-client/src/lan/playerdata.rs +++ b/crates/horizon-client/src/lan/playerdata.rs @@ -27,6 +27,11 @@ pub fn uuid_ints(uuid: u128) -> [i32; 4] { uuid as i32, ] } +/// `UUIDUtil.uuidFromIntArray`. +pub fn ints_uuid(ints: [i32; 4]) -> u128 { + ints.iter() + .fold(0, |acc, &i| acc << 32 | u128::from(i as u32)) +} /// Whether a saved file exists for this player. pub fn exists(world: &Path, uuid: u128) -> bool { From 4d3f3b639183a2550713c818b862fd9d6b4d57bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Dr=C3=A4ger?= <20014538+sdraeger@users.noreply.github.com> Date: Sat, 24 Oct 2026 17:02:57 -0700 Subject: [PATCH 075/140] Load fireballs from NBT as live projectiles --- crates/horizon-client/src/entity_nbt.rs | 91 +++++++++++++++++++ crates/horizon-client/src/game/commands.rs | 39 ++++---- .../horizon-client/src/game/commands/data.rs | 5 +- .../horizon-client/src/game/lan_entities.rs | 15 +-- crates/horizon-client/src/game/persist.rs | 13 ++- crates/horizon-client/src/game/scoreboard.rs | 2 +- crates/horizon-client/src/projectiles.rs | 28 +++++- 7 files changed, 153 insertions(+), 40 deletions(-) diff --git a/crates/horizon-client/src/entity_nbt.rs b/crates/horizon-client/src/entity_nbt.rs index 49ea776ba..3c014e59b 100644 --- a/crates/horizon-client/src/entity_nbt.rs +++ b/crates/horizon-client/src/entity_nbt.rs @@ -1155,6 +1155,62 @@ pub fn arrow_from_nbt( Some((p, tag.get("inBlockState").cloned())) } +/// `LargeFireball` and `SmallFireball`: `AbstractHurtingProjectile`'s +/// `acceleration_power`, `Projectile`'s owner and flags, `ExplosionPower`. +pub fn fireball_to_nbt( + p: &Projectile, + uuid: [i32; 4], + owner: Option<[i32; 4]>, + raw: Option<&Tag>, +) -> Option { + let power = match p.kind { + ProjectileKind::LargeFireball { power } => Some(power), + ProjectileKind::SmallFireball => None, + _ => return None, + }; + let base = Base { + id: p.kind.id(), + uuid, + position: p.position, + motion: p.velocity, + rotation: [p.yaw, p.pitch], + on_ground: false, + fall_distance: 0.0, + }; + let mut tag = base.tag(raw); + put( + &mut tag, + "acceleration_power", + Tag::Double(p.acceleration.to_bits()), + ); + put(&mut tag, "LeftOwner", Tag::Byte(i8::from(p.left_owner))); + if let Some(power) = power { + put(&mut tag, "ExplosionPower", Tag::Byte(power as i8)); + } + if let Some(owner) = owner { + put(&mut tag, "Owner", Tag::IntArray(owner.to_vec())); + } + Some(tag) +} + +pub fn fireball_from_nbt(tag: &Tag, player: Option<[i32; 4]>) -> Option { + let kind = match kind(tag)?.as_str() { + "minecraft:fireball" => ProjectileKind::LargeFireball { + power: number(tag.get("ExplosionPower")).unwrap_or(1) as i32, + }, + "minecraft:small_fireball" => ProjectileKind::SmallFireball, + _ => return None, + }; + let owner = uuid_from_tag(tag.get("Owner")); + let from_player = player.is_some() && owner == player; + let mut p = Projectile::new(kind, position(tag)?, from_player.then_some(Who::Player)); + p.velocity = motion(tag); + [p.yaw, p.pitch] = rotation(tag); + p.left_owner = flag(tag, "LeftOwner"); + p.acceleration = float(tag.get("acceleration_power")).unwrap_or(0.1); + Some(p) +} + /// `FallingBlockEntity`: BlockState, Time, DropItem, HurtEntities. #[allow(clippy::too_many_arguments)] pub fn falling_block_to_nbt( @@ -2139,3 +2195,38 @@ mod sheep_nbt_tests { assert_eq!((back.extra.color, back.extra.sheared), (14, true)); } } + +#[cfg(test)] +mod fireball_nbt_tests { + use super::*; + #[test] + fn a_fireball_round_trips_its_flight() { + let raw = Tag::compound([ + ("id", Tag::String("minecraft:fireball".into())), + ("Pos", doubles(&[1.0, 70.0, -2.5])), + ("Motion", doubles(&[0.0, -0.5, 1.0])), + ("ExplosionPower", Tag::Byte(4)), + ("acceleration_power", Tag::Double(0.0f64.to_bits())), + ]); + let p = fireball_from_nbt(&raw, None).unwrap(); + assert_eq!(p.kind, ProjectileKind::LargeFireball { power: 4 }); + assert_eq!((p.velocity.z, p.acceleration), (1.0, 0.0)); + let back = fireball_to_nbt(&p, [1, 2, 3, 4], None, None).unwrap(); + assert_eq!(number(back.get("ExplosionPower")), Some(4)); + assert_eq!(float(back.get("acceleration_power")), Some(0.0)); + assert_eq!( + read_doubles::<3>(back.get("Motion")), + Some([0.0, -0.5, 1.0]) + ); + // A default fireball keeps vanilla's power and acceleration. + let plain = Tag::compound([ + ("id", Tag::String("minecraft:fireball".into())), + ("Pos", doubles(&[0.0, 0.0, 0.0])), + ]); + let p = fireball_from_nbt(&plain, None).unwrap(); + assert_eq!( + (p.kind, p.acceleration), + (ProjectileKind::LargeFireball { power: 1 }, 0.1) + ); + } +} diff --git a/crates/horizon-client/src/game/commands.rs b/crates/horizon-client/src/game/commands.rs index a229cbdc9..3cb3fcbf5 100644 --- a/crates/horizon-client/src/game/commands.rs +++ b/crates/horizon-client/src/game/commands.rs @@ -42,7 +42,8 @@ pub(super) enum Target { Mob(u32), Item(u32), Orb(usize), - Arrow(usize), + /// By index in `creatures.projectiles`. + Projectile(usize), Stand(u32), Frame(u32), Painting(u32), @@ -327,7 +328,7 @@ impl Game<'_> { .orbs .get(i) .map(|o| [o.position.x, o.position.y, o.position.z]), - Target::Arrow(i) => self + Target::Projectile(i) => self .creatures .projectiles .get(i) @@ -382,7 +383,11 @@ impl Game<'_> { }), Target::Item(_) => "minecraft:item".into(), Target::Orb(_) => "minecraft:experience_orb".into(), - Target::Arrow(_) => "minecraft:arrow".into(), + Target::Projectile(i) => self + .creatures + .projectiles + .get(i) + .map_or_else(String::new, |p| p.kind.id().into()), Target::Stand(_) => "minecraft:armor_stand".into(), Target::Frame(id) => { if self.item_frames.iter().any(|f| f.id == id && f.glow) { @@ -503,6 +508,7 @@ impl Game<'_> { _ => {} } if s.kind != 's' { + use horizon_client::projectiles::ProjectileKind as K; candidates.extend(self.player_candidates(s)); candidates.extend( self.mobs @@ -517,8 +523,12 @@ impl Game<'_> { .projectiles .iter() .enumerate() - .filter(|(_, p)| p.arrow.is_some()) - .map(|(i, _)| Target::Arrow(i)), + // The kinds /data can write (entity_nbt). + .filter(|(_, p)| { + p.arrow.is_some() + || matches!(p.kind, K::LargeFireball { .. } | K::SmallFireball) + }) + .map(|(i, _)| Target::Projectile(i)), ); candidates.extend(self.armor_stands.iter().map(|a| Target::Stand(a.id))); candidates.extend(self.item_frames.iter().map(|f| Target::Frame(f.id))); @@ -1116,7 +1126,7 @@ impl Game<'_> { o.previous = v; } } - Target::Arrow(i) => { + Target::Projectile(i) => { if let Some(a) = self.creatures.projectiles.get_mut(i) { a.position = v; a.previous = v; @@ -1540,14 +1550,10 @@ impl Game<'_> { self.orbs[i].age = u32::MAX / 2; } } - Target::Arrow(i) => { - if let Some(a) = self - .creatures - .projectiles - .get_mut(i) - .and_then(|p| p.arrow.as_mut()) - { - a.removed = true; + // cmd_kill goes from the highest index down. + Target::Projectile(i) => { + if i < self.creatures.projectiles.len() { + self.creatures.projectiles.remove(i); } } Target::Stand(id) => self.armor_stands.retain(|a| a.id != id), @@ -1569,7 +1575,7 @@ impl Game<'_> { let mut ordered = targets.clone(); ordered.sort_by_key(|t| { std::cmp::Reverse(match t { - Target::Orb(i) | Target::Arrow(i) => *i, + Target::Orb(i) | Target::Projectile(i) => *i, _ => 0, }) }); @@ -1577,9 +1583,6 @@ impl Game<'_> { self.kill_target(t); } self.orbs.retain(|o| o.age < u32::MAX / 2); - self.creatures - .projectiles - .retain(|p| !p.arrow.as_ref().is_some_and(|a| a.removed)); let message = if targets.len() == 1 { Text::translate("commands.kill.success.single", &[names[0].clone()]) } else { diff --git a/crates/horizon-client/src/game/commands/data.rs b/crates/horizon-client/src/game/commands/data.rs index 89e3d6397..da6f6f3bc 100644 --- a/crates/horizon-client/src/game/commands/data.rs +++ b/crates/horizon-client/src/game/commands/data.rs @@ -113,7 +113,7 @@ impl Game<'_> { self.other_to_nbt(&o, uuid) } Target::Orb(i) => entity_nbt::orb_to_nbt(self.orbs.get(i)?, random_uuid()), - Target::Arrow(i) => { + Target::Projectile(i) => { let p = self.creatures.projectiles.get(i)?; let owner = if p.owner == Some(horizon_client::mobs::Who::Player) { player_uuid @@ -125,7 +125,8 @@ impl Game<'_> { .as_ref() .and_then(|a| a.last_state) .map(|s| self.state_to_nbt(s)); - entity_nbt::arrow_to_nbt(p, random_uuid(), owner, in_block, None)? + entity_nbt::arrow_to_nbt(p, random_uuid(), owner, in_block, None) + .or_else(|| entity_nbt::fireball_to_nbt(p, random_uuid(), owner, None))? } }) } diff --git a/crates/horizon-client/src/game/lan_entities.rs b/crates/horizon-client/src/game/lan_entities.rs index db0c3e8b2..dd272719a 100644 --- a/crates/horizon-client/src/game/lan_entities.rs +++ b/crates/horizon-client/src/game/lan_entities.rs @@ -321,20 +321,7 @@ impl Game<'_> { } for p in self.creatures.projectiles.iter().filter(|p| p.id != 0) { use horizon_client::projectiles::ProjectileKind as K; - let kind = match &p.kind { - K::Arrow { .. } => "minecraft:arrow", - K::Snowball => "minecraft:snowball", - K::Egg => "minecraft:egg", - K::EnderPearl => "minecraft:ender_pearl", - K::SmallFireball => "minecraft:small_fireball", - K::LargeFireball { .. } => "minecraft:fireball", - K::LlamaSpit => "minecraft:llama_spit", - K::WindCharge => "minecraft:wind_charge", - K::BreezeWindCharge => "minecraft:breeze_wind_charge", - K::ShulkerBullet { .. } => "minecraft:shulker_bullet", - K::WitherSkull { .. } => "minecraft:wither_skull", - K::Potion { .. } => "minecraft:splash_potion", - }; + let kind = p.kind.id(); let mut e = state(p.id, kind, at(p.position), p.yaw, false); e.pitch = p.pitch; e.velocity = at(p.velocity); diff --git a/crates/horizon-client/src/game/persist.rs b/crates/horizon-client/src/game/persist.rs index ad9d7fe7e..d3afbf6ce 100644 --- a/crates/horizon-client/src/game/persist.rs +++ b/crates/horizon-client/src/game/persist.rs @@ -156,6 +156,8 @@ impl Game<'_> { kind.as_str(), "minecraft:experience_orb" | "minecraft:arrow" + | "minecraft:fireball" + | "minecraft:small_fireball" | "minecraft:falling_block" | "minecraft:end_crystal" | "minecraft:ender_dragon" @@ -195,6 +197,11 @@ impl Game<'_> { self.creatures.projectiles.push(p); } } + "minecraft:fireball" | "minecraft:small_fireball" => { + if let Some(p) = entity_nbt::fireball_from_nbt(&tag, player_uuid) { + self.creatures.projectiles.push(p); + } + } "minecraft:falling_block" => { if let Some((state, position, velocity, age, fall_distance)) = entity_nbt::falling_block_from_nbt(&tag) @@ -642,13 +649,15 @@ impl Game<'_> { } else { None }; - let (uuid, raw) = anon(&self.persist, "minecraft:arrow", p.position); + let (uuid, raw) = anon(&self.persist, p.kind.id(), p.position); let in_block = p .arrow .as_ref() .and_then(|a| a.last_state) .map(|s| self.state_to_nbt(s)); - if let Some(tag) = entity_nbt::arrow_to_nbt(p, uuid, owner, in_block, raw.as_ref()) { + let tag = entity_nbt::arrow_to_nbt(p, uuid, owner, in_block, raw.as_ref()) + .or_else(|| entity_nbt::fireball_to_nbt(p, uuid, owner, raw.as_ref())); + if let Some(tag) = tag { out.entry(chunk_of(p.position)).or_default().push(tag); } } diff --git a/crates/horizon-client/src/game/scoreboard.rs b/crates/horizon-client/src/game/scoreboard.rs index 4905fb80f..227a09a6c 100644 --- a/crates/horizon-client/src/game/scoreboard.rs +++ b/crates/horizon-client/src/game/scoreboard.rs @@ -180,7 +180,7 @@ impl Game<'_> { | Target::Cart(id) | Target::Other(id) => self.persist.raw.get(&id), Target::Player => self.level.player_extra.as_ref(), - Target::Guest(_) | Target::Orb(_) | Target::Arrow(_) => None, + Target::Guest(_) | Target::Orb(_) | Target::Projectile(_) => None, }; match raw.and_then(|r| r.get("Tags")) { Some(Tag::List(l)) => l diff --git a/crates/horizon-client/src/projectiles.rs b/crates/horizon-client/src/projectiles.rs index 093482a08..8244da4d9 100644 --- a/crates/horizon-client/src/projectiles.rs +++ b/crates/horizon-client/src/projectiles.rs @@ -61,6 +61,25 @@ pub enum ProjectileKind { color: u32, }, } +impl ProjectileKind { + /// Its entity type. + pub fn id(&self) -> &'static str { + match self { + Self::Arrow { .. } => "minecraft:arrow", + Self::Snowball => "minecraft:snowball", + Self::Egg => "minecraft:egg", + Self::EnderPearl => "minecraft:ender_pearl", + Self::SmallFireball => "minecraft:small_fireball", + Self::LargeFireball { .. } => "minecraft:fireball", + Self::LlamaSpit => "minecraft:llama_spit", + Self::WindCharge => "minecraft:wind_charge", + Self::BreezeWindCharge => "minecraft:breeze_wind_charge", + Self::ShulkerBullet { .. } => "minecraft:shulker_bullet", + Self::WitherSkull { .. } => "minecraft:wither_skull", + Self::Potion { .. } => "minecraft:splash_potion", + } + } +} #[derive(Clone, Debug, PartialEq)] pub struct Projectile { /// The entity id a server tracks it by (0 until it is tracked). @@ -83,6 +102,8 @@ pub struct Projectile { pub bonus: crate::mobs::gear::ArrowBonus, /// Arrows' `AbstractArrow` state (ticked by `arrows::tick`). pub arrow: Option>, + /// `AbstractHurtingProjectile.accelerationPower`. + pub acceleration: f64, } /// What a projectile struck this tick. #[derive(Clone, Copy, Debug, PartialEq)] @@ -146,6 +167,7 @@ impl Projectile { stuck: false, left_owner: false, bonus: Default::default(), + acceleration: 0.1, arrow: kind_is_arrow.then(|| { // Entity.random: seeded unpredictably, the position stands in. Box::new(crate::arrows::ArrowState::new( @@ -571,9 +593,9 @@ impl Projectile { let v = self.velocity; let len = (v.x * v.x + v.y * v.y + v.z * v.z).sqrt().max(1.0e-9); self.velocity = Vec3::new( - (v.x + v.x / len * 0.1) * inertia, - (v.y + v.y / len * 0.1) * inertia, - (v.z + v.z / len * 0.1) * inertia, + (v.x + v.x / len * self.acceleration) * inertia, + (v.y + v.y / len * self.acceleration) * inertia, + (v.z + v.z / len * self.acceleration) * inertia, ); } // Arrows tick with `arrows::tick`. From 42afd721e7497b63c1195f64012816e24b3318ff Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 02:04:39 +0200 Subject: [PATCH 076/140] Server packs: the download toast shows over the connection screen A server sends its packs in the configuration phase, while the joining screen covers the frame; vanilla's ToastManager draws over every screen. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 3b9aee231..ee86ba3cf 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -4818,11 +4818,15 @@ impl Game<'_> { } let atlas_ptr: *const HudAtlas = &self.gui.atlas; let _ = atlas_ptr; + // The ToastManager draws over every screen: a server's packs + // download while the connection screen shows. if self.remote_overlay(&mut batch) { + self.draw_pack_toasts(&mut batch); return batch; } if let Some(reason) = self.loading_reason() { self.draw_level_loading(&mut batch, reason); + self.draw_pack_toasts(&mut batch); return batch; } // Hud.extractRenderState: F1 (keyToggleGui) hides camera overlays, the From 7c27b85fbd290a48ff000dfcb3e84f862914752a Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 02:08:31 +0200 Subject: [PATCH 077/140] server_pack_e2e: start the game and the servers through lab.game_env The new home-leak test rejects scripts that set HORIZON_NO_AUDIO by hand; this one, added on main since, did. Co-Authored-By: Claude Opus 5.5 --- tools/server_pack_e2e.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/server_pack_e2e.py b/tools/server_pack_e2e.py index 83e434435..160083d5e 100644 --- a/tools/server_pack_e2e.py +++ b/tools/server_pack_e2e.py @@ -206,9 +206,8 @@ class Game: self.home = work / 'home' for d in ('home', 'launcher', 'data', 'config'): (work / d).mkdir(parents=True) - self.env = dict(os.environ, HORIZON_HOME=str(self.home), HORIZON_LAUNCHER_HOME=str(work / 'launcher'), - XDG_DATA_HOME=str(work / 'data'), XDG_CONFIG_HOME=str(work / 'config'), - HORIZON_LAUNCHER_NO_SELF_UPDATE='1', HORIZON_NO_AUDIO='1', HORIZON_TELEMETRY_URL='off') + self.env = lab.game_env(HORIZON_HOME=self.home, HORIZON_LAUNCHER_HOME=work / 'launcher', + XDG_DATA_HOME=work / 'data', XDG_CONFIG_HOME=work / 'config', HORIZON_TELEMETRY_URL='off') self.base = [str(bins / 'horizon-ctl'), '--socket', str(work / 'c.sock')] self.log = work / 'c.log' reply = self('launch', '--game', bins / 'horizon-client', '--offscreen', '--resources', resources) @@ -343,7 +342,7 @@ class Run: ('XDG_CONFIG_HOME', 'config')): (work / 'servers' / sub).mkdir(parents=True) os.environ[var] = str(work / 'servers' / sub) - os.environ.update(HORIZON_LAUNCHER_NO_SELF_UPDATE='1', HORIZON_NO_AUDIO='1', HORIZON_TELEMETRY_URL='off') + os.environ.update(lab.game_env(HORIZON_TELEMETRY_URL='off')) game = self.game = Game(Path(self.args.bin), self.resources, work / 'game') servers_dat = game.home / 'servers.dat' downloads = game.home / 'downloads' From a26297058a38c8817f07fc5ba6a7107cbc16f450 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 02:15:25 +0200 Subject: [PATCH 078/140] Trims: a Horizon host sends them too The host wrote no trim component, so single player on its server thread, LAN guests and dedicated-server players saw armour without its trim. network_stack now takes the connection's synced-registry lookup for any registry and writes Component::Trim when both names are in it. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/lan/guest.rs | 59 ++++++++++++++++++++++++-- crates/horizon-client/src/lan/hub.rs | 2 +- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/crates/horizon-client/src/lan/guest.rs b/crates/horizon-client/src/lan/guest.rs index 256f3a5cf..440b58284 100644 --- a/crates/horizon-client/src/lan/guest.rs +++ b/crates/horizon-client/src/lan/guest.rs @@ -432,18 +432,21 @@ impl Guest { } /// The off hand slot is conventionally 40 in saves and 45 in the menu. +/// `synced_id` names an entry of a synced registry (enchantments, trim +/// materials and patterns) by its id on this connection. pub fn stack_to_network( item_id: impl Fn(&str) -> i32, - enchantment_id: impl Fn(&str) -> Option, + synced_id: impl Fn(&str, &str) -> Option, s: &Option, ) -> Option { - network_stack(&item_id, &enchantment_id, s) + network_stack(&item_id, &synced_id, s) } fn network_stack( item_id: &dyn Fn(&str) -> i32, - enchantment_id: &dyn Fn(&str) -> Option, + synced_id: &dyn Fn(&str, &str) -> Option, s: &Option, ) -> Option { + let enchantment_id = |name: &str| synced_id("minecraft:enchantment", name); let s = s.as_ref()?; let mut stack = Stack::new(item_id(&s.item), s.count as i32); if s.damage > 0 { @@ -481,6 +484,25 @@ fn network_stack( horizon_protocol::item::Component::Int(rgb), )); } + // ArmorTrim: both holders as references into the synced registries. + if let Some((material, pattern)) = &d.trim { + let id = |registry: &str, name: &str| { + if name.contains(':') { + synced_id(registry, name) + } else { + synced_id(registry, &format!("minecraft:{name}")) + } + }; + if let (Some(material), Some(pattern)) = ( + id("minecraft:trim_material", material), + id("minecraft:trim_pattern", pattern), + ) { + stack.added.push(( + horizon_protocol::item::component::TRIM, + horizon_protocol::item::Component::Trim { material, pattern }, + )); + } + } if let Some(id) = d.map_id { stack.added.push(( horizon_protocol::item::component::MAP_ID, @@ -504,7 +526,7 @@ fn network_stack( let charged = d .charged .iter() - .filter_map(|c| network_stack(item_id, enchantment_id, &Some(c.clone()))) + .filter_map(|c| network_stack(item_id, synced_id, &Some(c.clone()))) .collect(); stack.added.push(( horizon_protocol::item::component::CHARGED_PROJECTILES, @@ -545,3 +567,32 @@ fn network_stack( } Some(stack) } + +#[cfg(test)] +mod tests { + use super::*; + use horizon_protocol::item::{Component, component}; + + #[test] + fn trims_go_as_synced_registry_references() { + let mut chestplate = ItemStack::new("minecraft:diamond_chestplate", 1); + chestplate.data_mut().trim = Some(("minecraft:gold".into(), "coast".into())); + let synced_id = |registry: &str, name: &str| match (registry, name) { + ("minecraft:trim_material", "minecraft:gold") => Some(4), + ("minecraft:trim_pattern", "minecraft:coast") => Some(1), + _ => None, + }; + let stack = stack_to_network(|_| 7, synced_id, &Some(chestplate.clone())).unwrap(); + assert_eq!( + stack.component(component::TRIM), + Some(&Component::Trim { + material: 4, + pattern: 1 + }) + ); + // A name the connection's registry lacks sends no trim. + chestplate.data_mut().trim = Some(("minecraft:x".into(), "coast".into())); + let stack = stack_to_network(|_| 7, synced_id, &Some(chestplate)).unwrap(); + assert_eq!(stack.component(component::TRIM), None); + } +} diff --git a/crates/horizon-client/src/lan/hub.rs b/crates/horizon-client/src/lan/hub.rs index 4f93b6ff9..c7c1512a7 100644 --- a/crates/horizon-client/src/lan/hub.rs +++ b/crates/horizon-client/src/lan/hub.rs @@ -351,7 +351,7 @@ impl Hub { pub fn stack(&mut self, s: &Option) -> Option { let id = s.as_ref().map(|s| self.item_id(&s.item))?; let sync = self.sync.clone(); - stack_to_network(|_| id, |name| sync.id("minecraft:enchantment", name), s) + stack_to_network(|_| id, |registry, name| sync.id(registry, name), s) } pub fn broadcast(&self, packet: &C) { From a93c1507f9ff1ee64b33f0298913ee7947ae2f5d Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sun, 25 Oct 2026 03:16:56 +0300 Subject: [PATCH 079/140] Launcher: a version removal retries a locked file and leaves the UI thread remove_dir_all stops at the first file another process still holds and leaves the rest deleted, so a removal that worked reported os error 5. Retry five times 250ms apart and treat a missing folder as done. The window froze because the deletion ran from the update loop; it now runs on a thread and reports back with Msg::Removed, as install already did. --- launcher/src/backend.rs | 23 ++++++++++++++++++++++- launcher/src/main.rs | 31 ++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/launcher/src/backend.rs b/launcher/src/backend.rs index d12dcd13c..02131cb42 100644 --- a/launcher/src/backend.rs +++ b/launcher/src/backend.rs @@ -558,7 +558,26 @@ pub fn install(release: &Release, progress: impl Fn(f32)) -> Result<(), String> } pub fn remove(tag: &str) -> Result<(), String> { - fs::remove_dir_all(version_dir(tag)).map_err(|e| e.to_string()) + let dir = version_dir(tag); + // Windows keeps a handle on a file for a moment after the game, a scan or the launcher's own + // reader lets go of it, and remove_dir_all stops at the first one: a removal that already + // took most of the folder reported os error 5 while the rest of it did go. Retry, and treat a + // folder that is already gone as done. + let mut last = None; + for attempt in 0..5 { + match fs::remove_dir_all(&dir) { + Ok(()) => return Ok(()), + Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(()), + Err(e) => last = Some(e), + } + if attempt < 4 { + std::thread::sleep(std::time::Duration::from_millis(250)); + } + } + Err(match last { + Some(e) => e.to_string(), + None => format!("could not remove {}", dir.display()), + }) } /// The Minecraft version a Horizon build targets, from its research-lock.json. @@ -2170,6 +2189,8 @@ pub enum Msg { Links(Links), Progress(String, f32), Installed(String, Result<(), String>), + /// A removal finished off the UI thread. + Removed(String, Result<(), String>), Line(Job, String), Exit(Job, Result<(), String>), Updates(Result), diff --git a/launcher/src/main.rs b/launcher/src/main.rs index 4a68ecdef..fd7e3d343 100644 --- a/launcher/src/main.rs +++ b/launcher/src/main.rs @@ -144,6 +144,9 @@ struct Launcher { releases: Load>, installed: Vec, installing: Option<(String, f32)>, + /// The version being deleted: the removal runs off the UI thread, so the window has to know + /// which row is busy until `Msg::Removed` arrives. + removing: Option, install_error: Option<(String, String)>, confirm_remove: Option, picker_open: bool, @@ -286,6 +289,7 @@ impl Launcher { releases: Load::Loading, installed, installing: None, + removing: None, install_error: None, confirm_remove: None, picker_open: false, @@ -516,6 +520,16 @@ impl Launcher { self.bar = (self.bar.1, p); self.installing = Some((tag, p)); } + Msg::Removed(tag, result) => { + self.removing = None; + self.installed = backend::installed(); + self.settings.selected = Settings::load() + .selected + .or_else(|| self.installed.first().cloned()); + if let Err(e) = result { + self.install_error = Some((tag, e)); + } + } Msg::Installed(tag, result) => { self.installing = None; self.bar = (0., 0.); @@ -725,14 +739,16 @@ impl Launcher { } fn remove(&mut self, tag: &str) { - if let Err(e) = backend::remove_version(tag) { - self.install_error = Some((tag.to_string(), e)); - } + // Same shape as install: the folder is hundreds of megabytes and Windows may hold a file + // for a moment, so the deletion goes to a thread instead of stalling the window. + let (tag, tx) = (tag.to_string(), self.tx.clone()); + self.removing = Some(tag.clone()); self.confirm_remove = None; - self.installed = backend::installed(); - self.settings.selected = Settings::load() - .selected - .or_else(|| self.installed.first().cloned()); + self.install_error = None; + std::thread::spawn(move || { + let result = backend::remove_version(&tag); + let _ = tx.send(Msg::Removed(tag, result)); + }); } fn prepare(&mut self) { @@ -2921,6 +2937,7 @@ impl Launcher { let keep = |i: usize| { let tag = &releases[i].tag; self.installing.as_ref().is_some_and(|(t, _)| t == tag) + || self.removing.as_deref() == Some(tag.as_str()) || self.install_error.as_ref().is_some_and(|(t, _)| t == tag) || self.confirm_remove.as_ref() == Some(tag) }; From b0a5334cb53c84db4369aae4e41de7b623e9c50c Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:17:28 +0100 Subject: [PATCH 080/140] Creative inventory: highlight hovered hotbar slots The item-tab hotbar loop only set the tooltip, so the nine slots never showed the white hover fill the 5x9 grid uses. Apply the same fill, including over empty slots, before picking the tooltip item. Fixes #1341 Co-Authored-By: opencode (deepseek-v4.1-flash-free) --- crates/horizon-client/src/game.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index e25732bdd..a0b1f6e47 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -9541,13 +9541,13 @@ impl Game<'_> { let (x, y) = (ox + 9.0 + c as f32 * 18.0, oy + 112.0); let stack = self.inventory[c].clone(); self.draw_slot_item(batch, drag.as_ref(), c, stack.clone(), x, y); - if let Some(stack) = stack - && self.cursor.0 >= x + if self.cursor.0 >= x && self.cursor.0 < x + 16.0 && self.cursor.1 >= y && self.cursor.1 < y + 16.0 { - hovered = Some(stack); + batch.fill(&self.gui.atlas, x, y, 16.0, 16.0, rgba(255, 255, 255, 128)); + hovered = stack; } } let scrollable = self.creative_screen.rows(&self.pack.names) > 5; From e55b5b7c00fc05667eaa431af0e1626957565b86 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 02:21:03 +0200 Subject: [PATCH 081/140] Boss events: custom bars first, as a joining player gets them CustomBossEvents.onPlayerConnect adds a joining player to its bars before any entity, dragon fight or raid tells it about theirs. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/bossbars.rs | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/crates/horizon-client/src/game/bossbars.rs b/crates/horizon-client/src/game/bossbars.rs index d747fd749..51b64604f 100644 --- a/crates/horizon-client/src/game/bossbars.rs +++ b/crates/horizon-client/src/game/bossbars.rs @@ -474,9 +474,26 @@ impl Game<'_> { } out } - /// Dragon, withers, the raid and custom bars, in that order. + /// Custom bars (`CustomBossEvents.onPlayerConnect` sends them as a player + /// joins), then the dragon, withers and the raid. fn boss_events_for(&self, viewer: &Viewer) -> Vec { let mut out = Vec::new(); + for b in &self.bosses.bars.bars { + if !b.visible || !b.players.contains(&viewer.ints) { + continue; + } + out.push(Offer { + id: b.uuid, + name: json_to_tag(&b.name), + progress: b.progress(), + color: color_index(&b.color), + overlay: style_index(&b.style), + darken: b.darken, + music: b.music, + fog: b.fog, + scope: Scope::Global, + }); + } if viewer.here && let Some(progress) = self.dragon_boss_progress(viewer.at, viewer.alive) { @@ -543,22 +560,6 @@ impl Game<'_> { scope: Scope::Level(self.dim), }); } - for b in &self.bosses.bars.bars { - if !b.visible || !b.players.contains(&viewer.ints) { - continue; - } - out.push(Offer { - id: b.uuid, - name: json_to_tag(&b.name), - progress: b.progress(), - color: color_index(&b.color), - overlay: style_index(&b.style), - darken: b.darken, - music: b.music, - fog: b.fog, - scope: Scope::Global, - }); - } out } /// The packets that take `viewer` from what it was last sent to `desired` From 6240124557c9f12f2dfaba4c9cb4636919d616a9 Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:21:59 +0100 Subject: [PATCH 082/140] Slow Falling clears the fall distance so landing does not hurt The effect capped downward gravity but left the fall distance to accumulate, so the landing tick still dealt fall damage. Clear it at the start of check_fall_damage, where both local travel and the server thread's replay of a guest's move pass. Co-Authored-By: opencode (deepseek-v4.1-flash-free) --- crates/horizon-client/src/motion.rs | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/crates/horizon-client/src/motion.rs b/crates/horizon-client/src/motion.rs index 0a626b1e7..5f91fee3a 100644 --- a/crates/horizon-client/src/motion.rs +++ b/crates/horizon-client/src/motion.rs @@ -1753,6 +1753,9 @@ impl EntityMoveWorld for MotionWorld<'_, '_, '_> { state: BlockStateId, position: BlockPos, ) -> Result<()> { + if self.player.status.slow_falling { + self.player.fall_distance = 0.0; + } if self.player.spawn_extra_particles_on_fall && grounded && self.player.fall_distance > 0.0 { self.player.events.push(MotionEvent::SmashLanding { @@ -2861,6 +2864,46 @@ mod tests { } } #[test] + fn slow_falling_clears_the_fall_distance_so_landing_does_not_hurt() { + 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(); + for slow_falling in [false, true] { + let mut scene = World::test_scene(&assets, &render, 2).unwrap(); + let mut player = PlayerMotion::new(&resources, Vec3::new(20.5, 9.0, 20.5)).unwrap(); + player.fall_distance = 30.0; + player.status.slow_falling = slow_falling; + let mut w = MotionWorld { + entities: &[], + player: &mut player, + scene: &mut scene, + assets: &assets, + collision_binding: &binding, + resources: &resources, + }; + for _ in 0..200 { + if w.player.ground.on_ground { + break; + } + w.player_movement_tick([0.0, 0.0], false).unwrap(); + } + assert!(w.player.ground.on_ground); + if slow_falling { + assert_eq!(w.player.health.health(), 20.0); + assert_eq!(w.player.fall_distance, 0.0); + } else { + assert!(w.player.health.health() < 20.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") From 96b6ed4916d6490be22fe2b0faaa7fe00ee546f3 Mon Sep 17 00:00:00 2001 From: some-du6e <103129948+some-du6e@users.noreply.github.com> Date: Sat, 24 Oct 2026 18:33:22 -0600 Subject: [PATCH 083/140] Test that a connection reaches IPv4 first and report the first address's error A loopback test listens on both [::1] and 127.0.0.1 and checks the connection lands on IPv4 although IPv6 is listed first; it fails without the sort. Another checks the fallback to IPv6 when IPv4 refuses. When every address fails, the error is now the first address's (the one vanilla tries) rather than an IPv6 fallback's, which is often only "no route to host". Co-Authored-By: Claude Opus 5.5 --- crates/horizon-protocol/src/connection.rs | 60 ++++++++++++++++++++--- 1 file changed, 54 insertions(+), 6 deletions(-) diff --git a/crates/horizon-protocol/src/connection.rs b/crates/horizon-protocol/src/connection.rs index c16a62ad6..80200612f 100644 --- a/crates/horizon-protocol/src/connection.rs +++ b/crates/horizon-protocol/src/connection.rs @@ -207,15 +207,18 @@ impl Connection { Self::connect_addresses(host, addrs, timeout) } fn connect_addresses(host: &str, addrs: Vec, timeout: Duration) -> Result { - let addrs = ipv4_first(addrs); - let mut last = Error::new(format!("Unknown host {host}")); - for addr in addrs { + // Report the first address's failure: it is the one vanilla tries, and the IPv6 + // fallbacks after it often fail only because the client has no IPv6 route. + let mut first = None; + for addr in ipv4_first(addrs) { match TcpStream::connect_timeout(&addr, timeout) { Ok(stream) => return Self::from_stream(stream), - Err(e) => last = Error::new(format!("Connection refused: {e}")), + Err(e) => { + first.get_or_insert_with(|| Error::new(format!("Connection refused: {e}"))); + } } } - Err(last) + Err(first.unwrap_or_else(|| Error::new(format!("Unknown host {host}")))) } pub fn from_stream(stream: TcpStream) -> Result { stream.set_nodelay(true)?; @@ -333,7 +336,7 @@ mod tests { use std::net::TcpListener; #[test] - fn ipv4_addresses_come_first_in_resolver_order() { + fn ipv4_first_keeps_each_familys_order() { let a = |s: &str| s.parse::().unwrap(); let resolved = vec![ a("[2001:db8::1]:25565"), @@ -352,6 +355,51 @@ mod tests { ); } + fn peer(c: &Connection) -> SocketAddr { + match &c.reader.stream { + Stream::Tcp(s) => s.peer_addr().unwrap(), + Stream::Memory(_) => panic!("not a socket"), + } + } + + /// Binds `[::1]`, or `None` where the machine has no IPv6 loopback. + fn ipv6_loopback() -> Option { + let listener = TcpListener::bind("[::1]:0"); + if listener.is_err() { + eprintln!("skipped: no IPv6 loopback"); + } + listener.ok() + } + + #[test] + fn connects_to_ipv4_although_the_resolver_lists_ipv6_first() { + // Both listen, as with a server whose IPv6 address accepts and then resets. + let Some(v6_listener) = ipv6_loopback() else { + return; + }; + let v4_listener = TcpListener::bind("127.0.0.1:0").unwrap(); + let v6 = v6_listener.local_addr().unwrap(); + let v4 = v4_listener.local_addr().unwrap(); + let c = + Connection::connect_addresses("test", vec![v6, v4], Duration::from_secs(5)).unwrap(); + assert_eq!(peer(&c), v4); + } + + #[test] + fn falls_back_to_ipv6_when_ipv4_refuses() { + let Some(v6_listener) = ipv6_loopback() else { + return; + }; + let v6 = v6_listener.local_addr().unwrap(); + let closed = TcpListener::bind("127.0.0.1:0") + .unwrap() + .local_addr() + .unwrap(); + let c = Connection::connect_addresses("test", vec![v6, closed], Duration::from_secs(5)) + .unwrap(); + assert_eq!(peer(&c), v6); + } + #[test] fn loopback_with_compression_and_encryption() { let listener = TcpListener::bind("127.0.0.1:0").unwrap(); From fe253fe534c7dc45e371d8f2c4508e25826da898 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:44:59 +0200 Subject: [PATCH 084/140] Server clients: dropped items and falling blocks fall by themselves between updates A server sends an item's and a falling block's position only every 20 ticks. As a client (multiplayer, a LAN guest, single player on its server thread) Horizon moved them only when a position arrived, three steps towards it, so a dropped item or falling sand hung in the air and then jumped down once a second (#1568). Vanilla runs ItemEntity.tick and FallingBlockEntity.tick on the client too (gravity, collisions, drag), takes their motion from AddEntity (recreateFromPacket) and SetEntityMotion (Entity.lerpMotion), and snaps them to each position packet: neither overrides Entity's NO_OP InterpolationHandler. The client now does the same, with the same ticks single player in-frame uses; only the server removes them or places the block. lan_e2e --check falling: the guest samples both every 2 ticks over 16 ticks. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/remote.rs | 72 +++++++++++++------ .../src/game/remote_projectiles.rs | 16 +++-- tools/lan_e2e.py | 44 ++++++++++++ 3 files changed, 106 insertions(+), 26 deletions(-) diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 45ba4bebe..1c7e30abb 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -140,8 +140,9 @@ pub(super) struct Remote { stepped: HashMap, /// `LivingEntity.lerpHeadTo`: the head yaw and the ticks left to reach it. head_lerps: HashMap, - /// Item entities waiting for their item data. - pending_items: HashMap, + /// Item entities waiting for their item data: where they are and their + /// motion. + pending_items: HashMap, health: (f32, i32, f32), game_mode: i32, pub chat: Vec<(String, Instant)>, @@ -1382,7 +1383,7 @@ impl Game<'_> { } if let Some(r) = self.remote.as_mut() { if kind == "minecraft:item" { - r.pending_items.insert(id, position); + r.pending_items.insert(id, (position, Vec3::ZERO)); } r.entities.insert( id, @@ -1461,6 +1462,23 @@ impl Game<'_> { m.on_ground = on_ground; return; } + if let Some(p) = r.pending_items.get_mut(&id) { + p.0 = position; + } + // ItemEntity and FallingBlockEntity keep Entity's NO_OP + // InterpolationHandler: moveOrInterpolateTo puts them there at + // once, and their own tick moves them on between the server's + // updates (`tick_remote_entities`). + let at = Vec3::new(position[0], position[1], position[2]); + if let Some(d) = self.dropped.iter_mut().find(|d| d.id == id as u32) { + d.position = at; + d.on_ground = on_ground; + return; + } + if let Some(f) = self.falling.iter_mut().find(|f| f.id == id as u32) { + f.position = at; + return; + } // AbstractInterpolationHandler.interpolateTo: without a rotation, // the one it was heading for. let rotation = rotation.or_else(|| r.lerps.get(&id).and_then(|l| l.rotation)); @@ -1472,9 +1490,6 @@ impl Game<'_> { steps: 3, }, ); - if let Some(p) = r.pending_items.get_mut(&id) { - *p = position; - } } self.turn_remote_object(id, rotation.map(|(yaw, _)| yaw), on_ground); self.turn_remote_projectile(id, rotation); @@ -1807,6 +1822,8 @@ impl Game<'_> { } } self.spawn_entity(p.id, &kind, p.position, rotation); + // Entity.recreateFromPacket: setDeltaMovement(packet.getMovement()). + self.remote_motion(p.id, p.velocity); if !self.spawn_remote_object(p.id, &kind, p.position, rotation[0], p.data) { self.spawn_remote_projectile( p.id, @@ -2125,6 +2142,8 @@ impl Game<'_> { pl.velocity = Vec3::new(p.velocity[0], p.velocity[1], p.velocity[2]); } } + // The same packet for another entity: Entity.lerpMotion. + C::SetEntityMotion(p) => self.remote_motion(p.id, p.velocity), // ClientPacketListener.handleDamageEvent: LivingEntity.handleDamageEvent // jolts the walk animation and restarts the hurt flash. Its hurt // sound comes as a sound from Horizon's host, which plays it itself. @@ -2933,7 +2952,9 @@ impl Game<'_> { item.stack = stack; return; } - let Some(p) = position else { return }; + let Some((p, velocity)) = position else { + return; + }; let at = Vec3::new(p[0], p[1], p[2]); let bob_offset = self.world.random.next_float() * std::f32::consts::PI * 2.0; self.dropped.push(ItemEntity { @@ -2944,7 +2965,7 @@ impl Game<'_> { stack, position: at, previous: at, - velocity: Vec3::ZERO, + velocity, on_ground: false, age: 0, pickup_delay: 0, @@ -2952,6 +2973,23 @@ impl Game<'_> { ticks: 0, }); } + /// `Entity.lerpMotion` (and `recreateFromPacket`'s motion) for the + /// entities whose own tick moves them on a client: dropped items and + /// falling blocks. + fn remote_motion(&mut self, id: i32, velocity: [f64; 3]) { + let v = Vec3::new(velocity[0], velocity[1], velocity[2]); + if let Some(d) = self.dropped.iter_mut().find(|d| d.id == id as u32) { + d.velocity = v; + } else if let Some(f) = self.falling.iter_mut().find(|f| f.id == id as u32) { + f.velocity = v; + } else if let Some(p) = self + .remote + .as_mut() + .and_then(|r| r.pending_items.get_mut(&id)) + { + p.1 = v; + } + } fn apply_remote_health(&mut self) { let Some((health, food, saturation)) = self.remote.as_ref().map(|r| r.health) else { return; @@ -3471,20 +3509,12 @@ impl Game<'_> { l.steps -= 1; } } + // ItemEntity.tick runs on a client too: gravity, collisions and + // friction move the item between the server's updates (every 20 + // ticks), and only the server removes it. + let (world, facts, collision) = (&self.world, self.res.facts(), self.collision); for d in self.dropped.iter_mut().filter(|_| running) { - d.previous = d.position; - d.age += 1; - if let Some(l) = lerps.get_mut(&(d.id as i32)) - && l.steps > 0 - { - let n = f64::from(l.steps); - d.position = Vec3::new( - d.position.x + (l.target[0] - d.position.x) / n, - d.position.y + (l.target[1] - d.position.y) / n, - d.position.z + (l.target[2] - d.position.z) / n, - ); - l.steps -= 1; - } + d.tick(world, facts, collision, false); } head_lerps.retain(|_, (_, steps)| *steps > 0); for (item, ticks, at, eye, pitch, yaw) in using { diff --git a/crates/horizon-client/src/game/remote_projectiles.rs b/crates/horizon-client/src/game/remote_projectiles.rs index 58f82e3a9..33c69728b 100644 --- a/crates/horizon-client/src/game/remote_projectiles.rs +++ b/crates/horizon-client/src/game/remote_projectiles.rs @@ -2,7 +2,7 @@ //! end crystals on a server's client (`ClientPacketListener.handleAddEntity` //! and `handleSetEntityData`): the server simulates them, the client draws //! them where it says and interpolates their moves. -use super::{FallingBlock, Game}; +use super::{FallStep, FallingBlock, Game}; use horizon_client::projectiles::{Projectile, ProjectileKind}; use horizon_core::{geometry::Vec3, position::BlockPos}; use horizon_protocol::entity_data::Value; @@ -185,11 +185,17 @@ impl Game<'_> { t.previous = t.position; t.position = step(t.id, t.position); } - for f in &mut self.falling { - f.previous = f.position; - f.age += 1; - f.position = step(f.id, f.position); + // FallingBlockEntity.tick runs on a client too: the block falls by + // itself between the server's updates (every 20 ticks), then waits + // where it lands for the server to place it and remove it. + let mut falling = std::mem::take(&mut self.falling); + for f in &mut falling { + if let Ok(FallStep::Landed(_)) = self.fall_step(f, false) { + // Block.updateEntityMovementAfterFallOn, then the air drag. + f.velocity = Vec3::new(f.velocity.x * 0.98, 0.0, f.velocity.z * 0.98); + } } + self.falling = falling; for p in &mut self.creatures.projectiles { p.previous = p.position; p.age += 1; diff --git a/tools/lan_e2e.py b/tools/lan_e2e.py index 3ece4b448..a0fe0e181 100755 --- a/tools/lan_e2e.py +++ b/tools/lan_e2e.py @@ -228,6 +228,9 @@ address. The script then checks, from both sides, what a guest's game used to ge - villagers: the guest sees each villager's and zombie villager's type, profession and level as the host has them, and an unemployed villager that takes a composter becomes a farmer on the guest too (the guest used to draw every villager as an unemployed plains one). +- falling: an item and a falling block the host summons high up fall smoothly on the guest, a + little further every tick between the server's updates (every 20 ticks), as their own + client tick moves them (they used to hang, then jump down once a second, #1568). Each check is reported on its own (a failing one doesn't stop the others) and the screenshots of both sides go to --out (host-*.png, guest-*.png). @@ -5496,5 +5499,46 @@ CHECKS += ['villagers'] CHECK_FNS.update(villagers=check_villagers) +def check_falling(host, guest, out): + """ItemEntity and FallingBlockEntity tick on a client too (gravity, collisions, drag), and their + position packets snap them (Entity's NO_OP InterpolationHandler). The server sends an item's + and a falling block's position every 20 ticks, so between two updates the guest's own tick is + what moves them: sampled every 2 ticks over the first 16, both are lower nearly every time.""" + x, y, z = (int(v // 1) for v in pos_of(guest)) + top = y + 30 + tag = 'falling_e2e' + host('command', command=f'fill {x + 2} {y} {z - 1} {x + 4} {top + 2} {z + 1} minecraft:air') + host('command', command=f'summon minecraft:item {x + 3.5} {top} {z + 0.5} ' + f'{{Tags:["{tag}"],Item:{{id:"minecraft:diamond",count:1}},PickupDelay:32767}}') + host('command', command=f'summon minecraft:falling_block {x + 2.5} {top} {z - 0.5} ' + f'{{Tags:["{tag}"],BlockState:{{Name:"minecraft:sand"}},DropItem:0b}}') + heights = {'item': [], 'falling block': []} + try: + for _ in range(8): + items = [e['pos'][1] for e in guest.raw('entities', 48, 'minecraft:item')['entities'] + if abs(e['pos'][0] - x - 3.5) < 0.5 and abs(e['pos'][2] - z - 0.5) < 0.5] + blocks = [o['position'][1] for o in guest('status')['projectiles'] + if o.get('kind') == 'minecraft:falling_block' + and abs(o['position'][0] - x - 2.5) < 0.5 and abs(o['position'][2] - z + 0.5) < 0.5] + heights['item'].append(items[0] if items else None) + heights['falling block'].append(blocks[0] if blocks else None) + guest.wait(2) + guest.shot(out, 'falling') + finally: + host('command', command=f'kill @e[tag={tag}]') + host('command', command=f'fill {x + 2} {y} {z - 1} {x + 4} {top + 2} {z + 1} minecraft:air') + for name, ys in heights.items(): + seen = [h for h in ys if h is not None] + assert len(seen) >= 6, f'the guest saw the {name} {len(seen)} times of 8: {heights}' + drops = sum(b < a for a, b in zip(seen, seen[1:])) + # A tick or two can pass between two samples with no move; never most of them. + assert drops >= len(seen) - 2, f'the {name} fell in {drops} of {len(seen) - 1} samples: {heights}' + return heights + + +CHECKS += ['falling'] +CHECK_FNS.update(falling=check_falling) + + if __name__ == '__main__': main() From 7a7bfdde7963809848d03b7749637bdf7f5c5a96 Mon Sep 17 00:00:00 2001 From: some-du6e <103129948+some-du6e@users.noreply.github.com> Date: Sat, 24 Oct 2026 18:39:57 -0600 Subject: [PATCH 085/140] Advancement chat hover: the description takes the title's own style Advancement.decorateName merges the frame colour under the title's own style and appends the description after its siblings. Built from the parsed Text, a styled root with siblings had its style moved down a level, so the description showed in the frame colour instead of the title's (a gold, bold title gave a green description). The hover is now built on the title's JSON, and the local spans are decoded from that JSON, so an in-frame player sees the description coloured as a client does. Co-Authored-By: Claude Opus 5.5 --- .../horizon-client/src/game/advancements.rs | 124 +++++++++++++----- 1 file changed, 92 insertions(+), 32 deletions(-) diff --git a/crates/horizon-client/src/game/advancements.rs b/crates/horizon-client/src/game/advancements.rs index c6f3a2410..62b931040 100644 --- a/crates/horizon-client/src/game/advancements.rs +++ b/crates/horizon-client/src/game/advancements.rs @@ -881,31 +881,40 @@ pub(super) fn adv_name(a: &adv::Advancement) -> Text { let Some(d) = &a.display else { return Text::literal(a.id.clone()); }; - let color = match d.frame { - Frame::Challenge => text::DARK_PURPLE, - _ => text::GREEN, - }; - // Advancement.decorateName: the title in the frame's colour (styles - // merged into it), then a new line and the description after the - // title's own siblings. - let coloured = text_of(&d.title).with_color(color); - let mut component = coloured.component(); - if let Some(o) = component.as_object_mut() { - let extra = o.entry("extra").or_insert_with(|| serde_json::json!([])); - if let Some(extra) = extra.as_array_mut() { - extra.extend(["\n".into(), text_of(&d.description).component()]); - } - } - let tooltip = coloured - .append("\n") - .append(text_of(&d.description)) - .with_component(component); + let color = frame_color(d.frame); let title = text_of(&d.title).with_style(&Style { - hover: Some(Box::new(tooltip)), + hover: Some(Box::new(decorate_name(d))), ..Style::default() }); Text::translate("chat.square_brackets", &[title]).with_color(color) } +fn frame_color(frame: Frame) -> u32 { + match frame { + Frame::Challenge => text::DARK_PURPLE, + _ => text::GREEN, + } +} +/// `Advancement.decorateName`: a copy of the title with the frame's colour +/// under its own style (mergeStyles), then a new line and the description +/// after the title's own siblings, so both inherit the title's root style. +/// Built on the title's JSON: a parsed Text moves a styled root's style down +/// a level once it has siblings. +fn decorate_name(d: &adv::Display) -> Text { + let mut component = match &d.title { + Value::Object(_) => d.title.clone(), + Value::String(s) => serde_json::json!({ "text": s }), + other => text_of(other).component(), + }; + if let Some(o) = component.as_object_mut() { + let frame = Text::empty().with_color(frame_color(d.frame)).component(); + o.entry("color").or_insert_with(|| frame["color"].clone()); + let extra = o.entry("extra").or_insert_with(|| serde_json::json!([])); + if let Some(extra) = extra.as_array_mut() { + extra.extend(["\n".into(), d.description.clone()]); + } + } + text_of(&component).with_component(component) +} impl Game<'_> { /// `AdvancementCommands.Action.GRANT` on one advancement (or one of /// its criteria): false when nothing changed. @@ -1096,22 +1105,27 @@ mod tests { "extra": [{"text": "Quest ", "color": "gold"}, "Board"], })); assert_eq!(title.plain(), "Quest Board"); - assert_eq!(title.spans[0].style.color, Some(horizon_client::text::GOLD)); + assert_eq!(title.spans[0].style.color, Some(text::GOLD)); + assert_eq!(title.spans[1].style.color, None); + let vanilla = text_of(&serde_json::json!({"translate": "advancements.story.root.title"})); assert_eq!( - text_of(&serde_json::json!({"translate": "advancements.story.root.title"})), + vanilla, Text::translate("advancements.story.root.title", &[]) ); + assert_eq!( + vanilla.translation_key(), + Some("advancements.story.root.title") + ); } - #[test] - fn chat_hover_keeps_the_titles_siblings_before_the_description() { - let a = adv::Advancement { + fn announced(title: Value, description: Value) -> adv::Advancement { + adv::Advancement { id: "quests:board".into(), parent: None, display: Some(adv::Display { icon: "minecraft:book".into(), - title: serde_json::json!({"text": "", "extra": ["Quest ", "Board"]}), - description: serde_json::json!("Open the board"), + title, + description, frame: Frame::Task, background: None, show_toast: true, @@ -1121,12 +1135,58 @@ mod tests { criteria: Vec::new(), requirements: Vec::new(), rewards: adv::Rewards::default(), - }; - // The JSON a client receives, not just the local spans. - let name = adv_name(&a).component(); - let hover = &name["with"][0]["hover_event"]["value"]; - let sent = horizon_client::scoreboard::comp_text(hover); + } + } + /// The chat hover: the JSON a client receives, and the spans drawn here. + fn hover(a: &adv::Advancement) -> (Value, Text) { + let local = decorate_name(a.display.as_ref().unwrap()); + let sent = adv_name(a).component()["with"][0]["hover_event"]["value"].clone(); + (sent, local) + } + + #[test] + fn chat_hover_keeps_the_titles_siblings_before_the_description() { + let a = announced( + serde_json::json!({"text": "", "extra": [{"text": "Quest ", "color": "gold"}, "Board"]}), + serde_json::json!("Open the board"), + ); + let (sent, local) = hover(&a); + let sent = horizon_client::scoreboard::comp_text(&sent); assert_eq!(sent.plain(), "Quest Board\nOpen the board"); + let colors = |t: &Text| t.spans.iter().map(|s| s.style.color).collect::>(); + let (gold, green) = (Some(text::GOLD), Some(text::GREEN)); + assert_eq!(colors(&sent), [gold, green, green, green]); + assert_eq!(colors(&local), colors(&sent)); + } + + #[test] + fn chat_hover_description_takes_a_styled_titles_own_style() { + // mergeStyles keeps the title's gold; the description inherits it. + let a = announced( + serde_json::json!({"text": "Quest", "color": "gold", "bold": true, "extra": [" Board"]}), + serde_json::json!("Open the board"), + ); + let (sent, local) = hover(&a); + let sent = horizon_client::scoreboard::comp_text(&sent); + let last = &sent.spans.last().unwrap().style; + assert_eq!((last.color, last.bold), (Some(text::GOLD), Some(true))); + assert_eq!(local.spans.last().unwrap().style, *last); + } + + #[test] + fn chat_hover_of_a_vanilla_advancement() { + let a = announced( + serde_json::json!({"translate": "advancements.story.root.title"}), + serde_json::json!({"translate": "advancements.story.root.description"}), + ); + assert_eq!( + hover(&a).0, + serde_json::json!({ + "translate": "advancements.story.root.title", + "color": "green", + "extra": ["\n", {"translate": "advancements.story.root.description"}], + }) + ); } #[test] From 9f1a8809518bd6070d7f97f92b64c4673ff83c65 Mon Sep 17 00:00:00 2001 From: some-du6e <103129948+some-du6e@users.noreply.github.com> Date: Sat, 24 Oct 2026 18:43:58 -0600 Subject: [PATCH 086/140] Advancement chat hover: a title in list form keeps its first element's style A component list is its first element with the rest as siblings, so decorateName merges the frame colour under that element's style. The parsed list moved a styled first element down a level, which gave the description the frame colour instead of the title's. Co-Authored-By: Claude Opus 5.5 --- .../horizon-client/src/game/advancements.rs | 43 ++++++++++++++----- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/crates/horizon-client/src/game/advancements.rs b/crates/horizon-client/src/game/advancements.rs index 62b931040..bb50e79bf 100644 --- a/crates/horizon-client/src/game/advancements.rs +++ b/crates/horizon-client/src/game/advancements.rs @@ -900,11 +900,7 @@ fn frame_color(frame: Frame) -> u32 { /// Built on the title's JSON: a parsed Text moves a styled root's style down /// a level once it has siblings. fn decorate_name(d: &adv::Display) -> Text { - let mut component = match &d.title { - Value::Object(_) => d.title.clone(), - Value::String(s) => serde_json::json!({ "text": s }), - other => text_of(other).component(), - }; + let mut component = root_component(&d.title); if let Some(o) = component.as_object_mut() { let frame = Text::empty().with_color(frame_color(d.frame)).component(); o.entry("color").or_insert_with(|| frame["color"].clone()); @@ -915,6 +911,25 @@ fn decorate_name(d: &adv::Display) -> Text { } text_of(&component).with_component(component) } +/// A component's JSON as one object whose root keeps its own style: a list is +/// its first element with the rest appended to its siblings. +fn root_component(v: &Value) -> Value { + match v { + Value::Object(_) => v.clone(), + Value::String(s) => serde_json::json!({ "text": s }), + Value::Array(list) if !list.is_empty() => { + let mut root = root_component(&list[0]); + if let Some(o) = root.as_object_mut() { + let extra = o.entry("extra").or_insert_with(|| serde_json::json!([])); + if let Some(extra) = extra.as_array_mut() { + extra.extend(list[1..].iter().cloned()); + } + } + root + } + other => text_of(other).component(), + } +} impl Game<'_> { /// `AdvancementCommands.Action.GRANT` on one advancement (or one of /// its criteria): false when nothing changed. @@ -1156,6 +1171,7 @@ mod tests { let colors = |t: &Text| t.spans.iter().map(|s| s.style.color).collect::>(); let (gold, green) = (Some(text::GOLD), Some(text::GREEN)); assert_eq!(colors(&sent), [gold, green, green, green]); + // The spans drawn here come from the same JSON a client receives. assert_eq!(colors(&local), colors(&sent)); } @@ -1166,11 +1182,18 @@ mod tests { serde_json::json!({"text": "Quest", "color": "gold", "bold": true, "extra": [" Board"]}), serde_json::json!("Open the board"), ); - let (sent, local) = hover(&a); - let sent = horizon_client::scoreboard::comp_text(&sent); - let last = &sent.spans.last().unwrap().style; - assert_eq!((last.color, last.bold), (Some(text::GOLD), Some(true))); - assert_eq!(local.spans.last().unwrap().style, *last); + let list = announced( + serde_json::json!([{"text": "Quest", "color": "gold", "bold": true}, " Board"]), + serde_json::json!("Open the board"), + ); + for a in [a, list] { + let (sent, local) = hover(&a); + let sent = horizon_client::scoreboard::comp_text(&sent); + assert_eq!(sent.plain(), "Quest Board\nOpen the board"); + let last = &sent.spans.last().unwrap().style; + assert_eq!((last.color, last.bold), (Some(text::GOLD), Some(true))); + assert_eq!(local.spans.last().unwrap().style, *last); + } } #[test] From f66c257ae595d0316802db4b5f6d5765b0ea2da2 Mon Sep 17 00:00:00 2001 From: some-du6e <103129948+some-du6e@users.noreply.github.com> Date: Sat, 24 Oct 2026 18:46:24 -0600 Subject: [PATCH 087/140] Advancement chat hover: normalise the title with canonical_component scoreboard::canonical_component already re-encodes a component as vanilla does, list form included, so decorate_name uses it instead of its own copy. Co-Authored-By: Claude Opus 5.5 --- .../horizon-client/src/game/advancements.rs | 33 +++++-------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/crates/horizon-client/src/game/advancements.rs b/crates/horizon-client/src/game/advancements.rs index bb50e79bf..0f76d0ca9 100644 --- a/crates/horizon-client/src/game/advancements.rs +++ b/crates/horizon-client/src/game/advancements.rs @@ -897,10 +897,14 @@ fn frame_color(frame: Frame) -> u32 { /// `Advancement.decorateName`: a copy of the title with the frame's colour /// under its own style (mergeStyles), then a new line and the description /// after the title's own siblings, so both inherit the title's root style. -/// Built on the title's JSON: a parsed Text moves a styled root's style down -/// a level once it has siblings. +/// Built on the title's JSON (a list as its first element with the rest as +/// siblings): a parsed Text moves a styled root's style down a level once it +/// has siblings. fn decorate_name(d: &adv::Display) -> Text { - let mut component = root_component(&d.title); + let mut component = match horizon_client::scoreboard::canonical_component(&d.title) { + Value::String(s) => serde_json::json!({ "text": s }), + c => c, + }; if let Some(o) = component.as_object_mut() { let frame = Text::empty().with_color(frame_color(d.frame)).component(); o.entry("color").or_insert_with(|| frame["color"].clone()); @@ -911,25 +915,6 @@ fn decorate_name(d: &adv::Display) -> Text { } text_of(&component).with_component(component) } -/// A component's JSON as one object whose root keeps its own style: a list is -/// its first element with the rest appended to its siblings. -fn root_component(v: &Value) -> Value { - match v { - Value::Object(_) => v.clone(), - Value::String(s) => serde_json::json!({ "text": s }), - Value::Array(list) if !list.is_empty() => { - let mut root = root_component(&list[0]); - if let Some(o) = root.as_object_mut() { - let extra = o.entry("extra").or_insert_with(|| serde_json::json!([])); - if let Some(extra) = extra.as_array_mut() { - extra.extend(list[1..].iter().cloned()); - } - } - root - } - other => text_of(other).component(), - } -} impl Game<'_> { /// `AdvancementCommands.Action.GRANT` on one advancement (or one of /// its criteria): false when nothing changed. @@ -1178,7 +1163,7 @@ mod tests { #[test] fn chat_hover_description_takes_a_styled_titles_own_style() { // mergeStyles keeps the title's gold; the description inherits it. - let a = announced( + let object = announced( serde_json::json!({"text": "Quest", "color": "gold", "bold": true, "extra": [" Board"]}), serde_json::json!("Open the board"), ); @@ -1186,7 +1171,7 @@ mod tests { serde_json::json!([{"text": "Quest", "color": "gold", "bold": true}, " Board"]), serde_json::json!("Open the board"), ); - for a in [a, list] { + for a in [object, list] { let (sent, local) = hover(&a); let sent = horizon_client::scoreboard::comp_text(&sent); assert_eq!(sent.plain(), "Quest Board\nOpen the board"); From 6d1f6965d23ec297186704fcdc43df40ea17a4f0 Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sun, 25 Oct 2026 03:57:00 +0300 Subject: [PATCH 088/140] Packs: an untouched vanilla directory is mirrored on Windows too (#1688) link cannot symlink a directory on Windows, so mirror has to recurse into one itself, but it only did so when a pack had filters. An untouched directory fell through to the link branch and vanished from the overlay, which took textures/font and the panorama with it and made a pack that overrides a font crash the client before its window. --- crates/horizon-client/src/packs.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/horizon-client/src/packs.rs b/crates/horizon-client/src/packs.rs index 5b4d11e82..1e012fd90 100644 --- a/crates/horizon-client/src/packs.rs +++ b/crates/horizon-client/src/packs.rs @@ -517,7 +517,11 @@ fn build_overlay_uncached( } } } else if touched.contains(&child) - || (vanilla.join(&child).is_dir() && !filters.is_empty()) + // Windows cannot link a directory the way unix does (`link` above), so an + // untouched one has to be mirrored: skipping it hid textures/font and the + // title panorama from the overlay, and a font json that names those sheets + // then failed to load (#1688). + || (vanilla.join(&child).is_dir() && (cfg!(not(unix)) || !filters.is_empty())) { mirror( &child, From a96dccf6918aa18b509b42a217dc0388a7fb5ec6 Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sun, 25 Oct 2026 03:57:31 +0300 Subject: [PATCH 089/140] Save: the write paths report a failure instead of dropping it The moderation lists on a dedicated server, command storage, boss bars, the world clocks, the difficulty and the emergency save before a crash all used let _ = and lost the error. write_dat also swallowed the rename that moves the current file aside, which made the following rename fail on the existing path with nothing reporting it. --- crates/horizon-client/src/command_storage.rs | 6 ++++-- crates/horizon-client/src/game/bossbars.rs | 6 ++++-- crates/horizon-client/src/game/chat.rs | 8 ++++++-- crates/horizon-client/src/game/debug_keys.rs | 4 +++- crates/horizon-client/src/game/dedicated.rs | 17 +++++++++++++---- crates/horizon-client/src/save.rs | 5 ++++- 6 files changed, 34 insertions(+), 12 deletions(-) diff --git a/crates/horizon-client/src/command_storage.rs b/crates/horizon-client/src/command_storage.rs index ce6e88f5c..560423e90 100644 --- a/crates/horizon-client/src/command_storage.rs +++ b/crates/horizon-client/src/command_storage.rs @@ -55,7 +55,7 @@ impl CommandStorage { .iter() .map(|(k, v)| (k.as_str().into(), v.clone())) .collect(); - let _ = save::write_dat( + if let Err(e) = save::write_dat( &file(root, namespace), Tag::compound([ ( @@ -64,7 +64,9 @@ impl CommandStorage { ), ("DataVersion", Tag::Int(horizon_world::DATA_VERSION)), ]), - ); + ) { + log::warn!("command storage {namespace} was not written: {e}"); + } } } /// `get`: an empty compound when unset. diff --git a/crates/horizon-client/src/game/bossbars.rs b/crates/horizon-client/src/game/bossbars.rs index ec7b72632..f03257f18 100644 --- a/crates/horizon-client/src/game/bossbars.rs +++ b/crates/horizon-client/src/game/bossbars.rs @@ -47,13 +47,15 @@ impl Game<'_> { if self.bosses.bars.bars.is_empty() && !self.bossbar_path().exists() { return; } - let _ = save::write_dat( + if let Err(e) = save::write_dat( &self.bossbar_path(), Tag::compound([ ("data", self.bosses.bars.pack(self.level.player_uuid)), ("DataVersion", Tag::Int(horizon_world::DATA_VERSION)), ]), - ); + ) { + log::warn!("boss bars were not written: {e}"); + } } pub(in crate::game) fn bossbar_exists(&self, id: &str) -> bool { self.bosses.bars.get(id).is_some() diff --git a/crates/horizon-client/src/game/chat.rs b/crates/horizon-client/src/game/chat.rs index f760bd82f..d06d303ae 100644 --- a/crates/horizon-client/src/game/chat.rs +++ b/crates/horizon-client/src/game/chat.rs @@ -816,8 +816,12 @@ impl Game<'_> { ("data", data), ("DataVersion", Tag::Int(horizon_world::DATA_VERSION)), ]); - let _ = horizon_client::save::write_dat(&path, root); - let _ = write_difficulty(&self.world_root, self.ui.difficulty); + if let Err(e) = horizon_client::save::write_dat(&path, root) { + log::warn!("the world clocks were not written: {e}"); + } + if let Err(e) = write_difficulty(&self.world_root, self.ui.difficulty) { + log::warn!("the difficulty was not written: {e}"); + } } /// Death message in chat (CombatTracker.getDeathMessage, as far as the /// cause is known to the client). diff --git a/crates/horizon-client/src/game/debug_keys.rs b/crates/horizon-client/src/game/debug_keys.rs index e0ad706de..61e2b2f05 100644 --- a/crates/horizon-client/src/game/debug_keys.rs +++ b/crates/horizon-client/src/game/debug_keys.rs @@ -185,7 +185,9 @@ impl Game<'_> { // Minecraft.emergencySaveAndCrash: the world is saved, then the // game stops; main writes the crash report. let crash = horizon_client::crash::DebugCrash::new(); - let _ = self.save_game(); + if let Err(e) = self.save_game() { + log::error!("the emergency save before the crash failed: {e}"); + } return Err(crash.into()); } } diff --git a/crates/horizon-client/src/game/dedicated.rs b/crates/horizon-client/src/game/dedicated.rs index eee12fe3f..4e91b9704 100644 --- a/crates/horizon-client/src/game/dedicated.rs +++ b/crates/horizon-client/src/game/dedicated.rs @@ -225,14 +225,23 @@ impl Lists { }; // DedicatedPlayerList's constructor order. warn("user banlist", l.bans.load()); - let _ = l.bans.save(); + warn( + "user banlist write", + l.bans.save().map_err(|e| e.to_string()), + ); warn("ip banlist", l.ip_bans.load()); - let _ = l.ip_bans.save(); + warn( + "ip banlist write", + l.ip_bans.save().map_err(|e| e.to_string()), + ); warn("operators list", l.ops.load()); warn("white-list", l.white.load()); - let _ = l.ops.save(); + warn("operators write", l.ops.save().map_err(|e| e.to_string())); if !l.white.file.exists() { - let _ = l.white.save(); + warn( + "white-list write", + l.white.save().map_err(|e| e.to_string()), + ); } l } diff --git a/crates/horizon-client/src/save.rs b/crates/horizon-client/src/save.rs index 7819a9b0b..9dc7f62fd 100644 --- a/crates/horizon-client/src/save.rs +++ b/crates/horizon-client/src/save.rs @@ -1913,7 +1913,10 @@ pub fn write_dat(path: &Path, tag: Tag) -> Result<()> { Some(stem) => path.with_file_name(format!("{stem}.dat_old")), None => path.with_file_name(format!("{file}_old")), }; - let _ = fs::rename(path, old); + // Vanilla's safeReplaceFile moves the current file aside first. This used to be + // swallowed, and the rename below then failed on the existing path with nothing + // reporting it: a save that could not happen looked like one that did. + fs::rename(path, old).map_err(|e| format!("{}: {e}", path.display()))?; } fs::rename(temporary, path)?; Ok(()) From c10261f008e4a80344bfb8c3f14232c6ffffe632 Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sun, 25 Oct 2026 03:58:02 +0300 Subject: [PATCH 090/140] Cleanup: one predicate property helper, a Windows-only allow, tolerant locks in the bots predicate_property was the same fifteen lines in block_feature and state_provider; it is worldgen::bound_property now. The mojang link helpers are unix-only in use but worth testing everywhere, so they are allowed to look dead elsewhere, which clears the launcher's -D warnings red on Windows. The bots harness recovers from a poisoned lock instead of panicking. --- crates/horizon-bots/src/main.rs | 99 +++++++++++++------ crates/horizon-world/src/worldgen.rs | 17 ++++ .../src/worldgen/block_feature.rs | 12 +-- .../src/worldgen/state_provider.rs | 12 +-- launcher/src/mojang.rs | 4 + 5 files changed, 92 insertions(+), 52 deletions(-) diff --git a/crates/horizon-bots/src/main.rs b/crates/horizon-bots/src/main.rs index 090daeb4e..666ead349 100644 --- a/crates/horizon-bots/src/main.rs +++ b/crates/horizon-bots/src/main.rs @@ -329,7 +329,7 @@ fn read( ) { use ids::play::clientbound as cb; use ids::play::serverbound as sb; - let send = |body: Vec| writer.lock().unwrap().send(&body); + let send = |body: Vec| writer.lock().unwrap_or_else(|e| e.into_inner()).send(&body); let mut seen = HashSet::new(); let mut batch = BatchSize::new(); let mut teleports = 0u64; @@ -338,7 +338,7 @@ fn read( Ok(packet) => packet, Err(e) => { if bot.online.swap(false, Ordering::SeqCst) { - *bot.error.lock().unwrap() = Some(e.to_string()); + *bot.error.lock().unwrap_or_else(|e| e.into_inner()) = Some(e.to_string()); } return; } @@ -356,7 +356,12 @@ fn read( cb::LEVEL_CHUNK_WITH_LIGHT => { bot.chunks.fetch_add(1, Ordering::Relaxed); if let (Ok(x), Ok(z)) = (r.i32(), r.i32()) { - if !bot.held.lock().unwrap().insert((x, z)) { + if !bot + .held + .lock() + .unwrap_or_else(|e| e.into_inner()) + .insert((x, z)) + { bot.resent.fetch_add(1, Ordering::Relaxed); } if seen.insert((x, z)) { @@ -368,7 +373,11 @@ fn read( cb::FORGET_LEVEL_CHUNK => { if let Ok(play::Clientbound::ForgetLevelChunk(p)) = play::Clientbound::decode(id, &body) - && bot.held.lock().unwrap().remove(&(p.pos[0], p.pos[1])) + && bot + .held + .lock() + .unwrap_or_else(|e| e.into_inner()) + .remove(&(p.pos[0], p.pos[1])) { bot.forgotten.fetch_add(1, Ordering::Relaxed); } @@ -389,7 +398,7 @@ fn read( } cb::PLAYER_POSITION => match play::Clientbound::decode(id, &body) { Ok(play::Clientbound::PlayerPosition(p)) => { - let mut at = bot.teleport.lock().unwrap(); + let mut at = bot.teleport.lock().unwrap_or_else(|e| e.into_inner()); let previous = at.unwrap_or([0.0; 3]); // Relative flags: X 1, Y 2, Z 4. let pos: [f64; 3] = std::array::from_fn(|i| { @@ -420,17 +429,18 @@ fn read( }, cb::DISCONNECT | cb::START_CONFIGURATION => { bot.online.store(false, Ordering::SeqCst); - *bot.error.lock().unwrap() = Some(if id == cb::DISCONNECT { - format!( - "disconnected: {}", - String::from_utf8_lossy(&body) - .chars() - .filter(|c| !c.is_control()) - .collect::() - ) - } else { - "sent back to configuration".into() - }); + *bot.error.lock().unwrap_or_else(|e| e.into_inner()) = + Some(if id == cb::DISCONNECT { + format!( + "disconnected: {}", + String::from_utf8_lossy(&body) + .chars() + .filter(|c| !c.is_control()) + .collect::() + ) + } else { + "sent back to configuration".into() + }); return; } _ => Ok(()), @@ -455,7 +465,7 @@ fn run_bot( let connection = match join(&o, &name) { Ok(c) => c, Err(e) => { - *bot.error.lock().unwrap() = Some(e); + *bot.error.lock().unwrap_or_else(|e| e.into_inner()) = Some(e); return; } }; @@ -469,12 +479,18 @@ fn run_bot( use ids::play::serverbound as sb; // Wait for the spawn position. let spawn = loop { - if let Some(at) = *bot.teleport.lock().unwrap() { + if let Some(at) = *bot.teleport.lock().unwrap_or_else(|e| e.into_inner()) { break at; } if !bot.online.load(Ordering::SeqCst) || asked.elapsed() > Duration::from_secs(60) { - if bot.error.lock().unwrap().is_none() { - *bot.error.lock().unwrap() = Some("no spawn position within 60 s".into()); + if bot + .error + .lock() + .unwrap_or_else(|e| e.into_inner()) + .is_none() + { + *bot.error.lock().unwrap_or_else(|e| e.into_inner()) = + Some("no spawn position within 60 s".into()); } return; } @@ -482,7 +498,13 @@ fn run_bot( }; bot.joined_after_ms .store(asked.elapsed().as_millis() as u64, Ordering::SeqCst); - let send = |body: Vec| writer.lock().unwrap().send(&body).is_ok(); + let send = |body: Vec| { + writer + .lock() + .unwrap_or_else(|e| e.into_inner()) + .send(&body) + .is_ok() + }; send(raw(sb::PLAYER_LOADED, |_| {})); let mut random = Random(o.seed ^ (index as u64).wrapping_mul(0x2545_F491_4F6C_DD1D)); let mut pos = spawn; @@ -491,17 +513,30 @@ fn run_bot( let mut target = pos; let mut next = Instant::now(); loop { - if until.lock().unwrap().is_some_and(|u| Instant::now() >= u) + if until + .lock() + .unwrap_or_else(|e| e.into_inner()) + .is_some_and(|u| Instant::now() >= u) || !bot.online.load(Ordering::SeqCst) { break; } // A teleport from the server wins over where the bot thought it was. - if let Some(at) = bot.teleport.lock().unwrap().take() { + if let Some(at) = bot + .teleport + .lock() + .unwrap_or_else(|e| e.into_inner()) + .take() + { pos = at; } let here = ((pos[0].floor() as i32) >> 4, (pos[2].floor() as i32) >> 4); - if !bot.held.lock().unwrap().contains(&here) { + if !bot + .held + .lock() + .unwrap_or_else(|e| e.into_inner()) + .contains(&here) + { bot.waited.fetch_add(1, Ordering::Relaxed); } else if pos[1] < cruise { pos[1] = (pos[1] + 0.5).min(cruise); @@ -558,7 +593,7 @@ fn run_bot( } // Offline first, so the reader doesn't count the closed connection as a failure. bot.online.store(false, Ordering::SeqCst); - writer.lock().unwrap().shutdown(); + writer.lock().unwrap_or_else(|e| e.into_inner()).shutdown(); } fn behaviour_of(mode: &str, index: usize) -> Behaviour { @@ -614,11 +649,12 @@ fn main() { }; let failed = bots .iter() - .filter(|b| b.error.lock().unwrap().is_some()) + .filter(|b| b.error.lock().unwrap_or_else(|e| e.into_inner()).is_some()) .count(); if first.is_none() && online > 0 { first = Some(Instant::now()); - *until.lock().unwrap() = Some(Instant::now() + Duration::from_secs(o.seconds)); + *until.lock().unwrap_or_else(|e| e.into_inner()) = + Some(Instant::now() + Duration::from_secs(o.seconds)); } println!( "{}", @@ -636,10 +672,13 @@ fn main() { }) ); previous_chunks = chunks; - let over = until.lock().unwrap().is_some_and(|u| Instant::now() >= u); + let over = until + .lock() + .unwrap_or_else(|e| e.into_inner()) + .is_some_and(|u| Instant::now() >= u); let all_failed = failed == o.bots; if over || all_failed || (first.is_none() && start.elapsed() > Duration::from_secs(120)) { - *until.lock().unwrap() = Some(Instant::now()); + *until.lock().unwrap_or_else(|e| e.into_inner()) = Some(Instant::now()); break; } } @@ -669,7 +708,7 @@ fn main() { "forgotten": b.forgotten.load(Ordering::Relaxed), "pulled_back": b.pulled_back.load(Ordering::Relaxed), "waited_ticks": b.waited.load(Ordering::Relaxed), - "error": *b.error.lock().unwrap(), + "error": *b.error.lock().unwrap_or_else(|e| e.into_inner()), })).collect::>(), }); if o.report.as_deref() == Some("-") { diff --git a/crates/horizon-world/src/worldgen.rs b/crates/horizon-world/src/worldgen.rs index 63de74d24..294f96336 100644 --- a/crates/horizon-world/src/worldgen.rs +++ b/crates/horizon-world/src/worldgen.rs @@ -103,6 +103,23 @@ impl std::fmt::Display for DecodeError { } } impl std::error::Error for DecodeError {} + +/// The bound value of one physical block property, for the two decode contexts that read +/// block predicates (`block_feature` and `state_provider`). +pub(crate) fn bound_property( + values: Option<&[crate::block_properties::BoundBlockProperty; 4]>, + property: crate::block_properties::BlockProperty, +) -> Result { + use crate::block_properties::BlockProperty; + let values = values.ok_or(DecodeError::Field("predicate block property registry"))?; + let index = match property { + BlockProperty::Solid => 0, + BlockProperty::Replaceable => 1, + BlockProperty::Liquid => 2, + BlockProperty::SolidRender => 3, + }; + Ok(values[index].clone()) +} impl From for DecodeError { fn from(value: serde_json::Error) -> Self { Self::Json(value) diff --git a/crates/horizon-world/src/worldgen/block_feature.rs b/crates/horizon-world/src/worldgen/block_feature.rs index 1ee122772..d943bd1be 100644 --- a/crates/horizon-world/src/worldgen/block_feature.rs +++ b/crates/horizon-world/src/worldgen/block_feature.rs @@ -192,17 +192,7 @@ impl super::block_predicate::PredicateBlockResolver for FeatureBlockBindings<'_> &self, property: BlockProperty, ) -> Result { - let values = self - .physical_properties - .as_ref() - .ok_or(DecodeError::Field("predicate block property registry"))?; - Ok(values[match property { - BlockProperty::Solid => 0, - BlockProperty::Replaceable => 1, - BlockProperty::Liquid => 2, - BlockProperty::SolidRender => 3, - }] - .clone()) + super::bound_property(self.physical_properties.as_ref(), property) } fn predicate_biome_set( &self, diff --git a/crates/horizon-world/src/worldgen/state_provider.rs b/crates/horizon-world/src/worldgen/state_provider.rs index da39cd246..e261192f9 100644 --- a/crates/horizon-world/src/worldgen/state_provider.rs +++ b/crates/horizon-world/src/worldgen/state_provider.rs @@ -186,17 +186,7 @@ impl PredicateBlockResolver for StateProviderBindings<'_> { &self, property: BlockProperty, ) -> Result { - let values = self - .physical_properties - .as_ref() - .ok_or(DecodeError::Field("predicate block property registry"))?; - Ok(values[match property { - BlockProperty::Solid => 0, - BlockProperty::Replaceable => 1, - BlockProperty::Liquid => 2, - BlockProperty::SolidRender => 3, - }] - .clone()) + super::bound_property(self.physical_properties.as_ref(), property) } fn predicate_biome_set( &self, diff --git a/launcher/src/mojang.rs b/launcher/src/mojang.rs index 070db43aa..27f9c3f0b 100644 --- a/launcher/src/mojang.rs +++ b/launcher/src/mojang.rs @@ -181,12 +181,16 @@ pub fn java_runtime( Ok(home) } +// Used by the unix link step below; the path-traversal check itself is tested on every +// platform, so these stay compiled and are allowed to look unused elsewhere. +#[cfg_attr(not(unix), allow(dead_code))] fn name_in<'a>(home: &Path, path: &'a Path) -> &'a Path { path.strip_prefix(home).unwrap_or(path) } /// Whether a link at `link` (relative to the runtime's home) pointing at `target` stays in the /// home. +#[cfg_attr(not(unix), allow(dead_code))] fn link_stays_inside(link: &Path, target: &str) -> bool { let mut depth = link.components().count().saturating_sub(1); for c in Path::new(target).components() { From 961af30997b43f76ff02cfe0b5dac24c59366cc0 Mon Sep 17 00:00:00 2001 From: Alexander Krylov Date: Sun, 25 Oct 2026 04:34:05 +0300 Subject: [PATCH 091/140] Clippy: clear the two warnings that the whole tree fails on The update tests' scratch helper only feeds unix-gated tests, and receive_decorated takes the box the queue already put the protos in. --- crates/horizon-client/src/streaming.rs | 4 ++++ crates/horizon-server/src/update.rs | 2 ++ 2 files changed, 6 insertions(+) diff --git a/crates/horizon-client/src/streaming.rs b/crates/horizon-client/src/streaming.rs index 4cad224fd..17af59746 100644 --- a/crates/horizon-client/src/streaming.rs +++ b/crates/horizon-client/src/streaming.rs @@ -637,6 +637,10 @@ impl Streaming { }); self.shared.ready.notify_one(); } + #[expect( + clippy::boxed_local, + reason = "the box is `Done::Decorated`'s, so moving it out copies nothing" + )] fn receive_decorated(&mut self, x: i32, z: i32, region: Box<[Proto; 9]>) { self.generation_scan.exhausted = false; self.decorating -= 1; diff --git a/crates/horizon-server/src/update.rs b/crates/horizon-server/src/update.rs index 8c87c66bc..0f3f57080 100644 --- a/crates/horizon-server/src/update.rs +++ b/crates/horizon-server/src/update.rs @@ -781,6 +781,8 @@ mod tests { use super::*; use serde_json::json; + // Only the unix tests build an install tree; the path helper goes with them. + #[cfg_attr(not(unix), allow(dead_code))] fn scratch(name: &str) -> PathBuf { let dir = std::env::temp_dir().join(format!( "horizon-server-update-{name}-{}", From e820e9e1af18b7ec556f9bfc7c8f202c7aac3100 Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Sun, 25 Oct 2026 01:40:39 +0000 Subject: [PATCH 092/140] Website: use one navigation bar across pages Co-Authored-By: OpenCode gpt-6.1-sol --- website/README.md | 4 ++++ website/build.mjs | 22 ++++++++++++-------- website/scripts/shots.mjs | 3 --- website/src/chrome.js | 8 ++++---- website/src/docs-page.js | 5 +++++ website/src/docs.html | 20 ++++++------------ website/src/index.html | 42 +------------------------------------- website/src/main.js | 8 +++----- website/src/style.css | 43 +++++++++++++-------------------------- 9 files changed, 50 insertions(+), 105 deletions(-) create mode 100644 website/src/docs-page.js diff --git a/website/README.md b/website/README.md index 8ac6e3910..9d1f8dc8d 100644 --- a/website/README.md +++ b/website/README.md @@ -10,6 +10,9 @@ stone texture and a pixel landscape drawn in code (`scripts/art.mjs`), and short releases, the community links and the contributors. Plain HTML, CSS and JavaScript; no framework and no runtime dependencies. +Home, Releases, Benchmarks and every Docs page share the header and phone menu rendered by +`build.mjs`, with the same links, theme switch and Download button. + ## Layout ``` @@ -29,6 +32,7 @@ src/main.js the home page: download buttons, recent releases, links, cont src/chrome.js the light/dark switch, the phone menu and GitHub fetching, shared by the pages src/releases-page.js the Releases page: the channel filter and the refresh from GitHub src/benchmarks-page.js the Benchmarks page: players' results from the telemetry server, the picker +src/docs-page.js the Docs pages: the shared theme switch and phone menu src/bench.js the Benchmarks tables, shared by build and page src/hardware.js the spec table estimates use (GPU TFLOPS and bandwidth, CPU single-thread score) src/estimate.js estimates for unmeasured hardware from the nearest measured machine diff --git a/website/build.mjs b/website/build.mjs index f871d5dbb..8b0954054 100644 --- a/website/build.mjs +++ b/website/build.mjs @@ -170,7 +170,7 @@ await writeFile(join(dist, "favicon.ico"), Buffer.concat([ico, png32])); const names = {}; const rewrite = (code) => code.replace(/"\.\/(\w+\.js)"/g, (all, file) => (names[file] ? `"./${names[file]}"` : all)); // Dependencies before what imports them. -const modules = ["markdown.js", "versions.js", "chrome.js", "hardware.js", "estimate.js", "releases.js", "contributors.js", "bench.js", "main.js", "releases-page.js", "benchmarks-page.js"]; +const modules = ["markdown.js", "versions.js", "chrome.js", "hardware.js", "estimate.js", "releases.js", "contributors.js", "bench.js", "main.js", "releases-page.js", "benchmarks-page.js", "docs-page.js"]; for (const file of modules) { const code = rewrite(await readFile(join(site, "src", file), "utf8")); names[file] = `${file.replace(".js", "")}.${fingerprint(code)}.js`; @@ -201,13 +201,16 @@ const baked = { const unavailable = `

The release notes could not be loaded here.

Read them on GitHub`; -// The top bar and the footer of the pages beside the home page (Releases, Benchmarks). -const navLinks = [["/#about", "About"], ["/releases", "Releases"], ["/benchmarks", "Benchmarks"], ["/docs/", "Docs"]]; -const siteNav = (current) => `