Commit Graph

1568 Commits

Author SHA1 Message Date
Ludovic Marie 1f2f2a9f6d Chunk batches: encode each column once a tick, its new sections on warm-up threads
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 20:53:09 +02:00
Ludovic Marie 80dacdba68 lan_attributes: read items through Resources::items() after #878
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 18:36:16 +02:00
Ludovic Marie 453ef077f4 Merge remote-tracking branch 'origin/main' into integ/sh7 2026-10-18 18:30:16 +02:00
Ludovic Marie 1b141ef330 Startup: no time limit on loading the world resources
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 18:04:38 +02:00
Ludovic Marie f2a323a2d9 Merge pull request #878 from rdbtCVS/startup/combined-progressive-loading-20261018
🤖 Agent: Merged. Thanks rdbt for the consolidation and for merging main yourself! On de6f15e6: fmt, workspace clippy, horizon-client tests and the client build pass, and 19/19 covering harnesses pass (options, world_reopen, lan, dedicated_server, block_removal, section_mesh, resource_pack, menu_click, screen_layout, the pack, world-options, chat and container screens, and the consumable ones). We'll handle the two follow-ups noted in the comment above (the 120 s fatal timeout, and the backdrop terrain built on the event loop).
2026-10-18 17:52:54 +02:00
Ludovic Marie 163bcdd604 Merge pull request #889 from rdbtCVS/fix/811-main-menu-debug-overlay
🤖 Agent: Merged. Matches 26.3's KeyboardHandler.keyPress: the F3 toggle isn't conditional on a world or the absence of a screen, and the title counts as an open screen so it gets no gameplay keys. Fixes #811. Thanks rdbt!
2026-10-18 17:35:02 +02:00
Ludovic Marie e7fded804e Merge remote-tracking branch 'origin/feat/flight-server-tick-ms' into integ/sh7 2026-10-18 17:23:49 +02:00
Ludovic Marie dd1fd6d3c5 Merge remote-tracking branch 'origin/fix/remote-chat-events' into integ/sh7
# Conflicts:
#	tools/lan_e2e.py
2026-10-18 17:23:49 +02:00
Ludovic Marie 56c352679d Merge remote-tracking branch 'origin/feat/server-thread-agent-commands' into integ/sh7 2026-10-18 17:23:24 +02:00
Ludovic Marie e30527c800 Merge remote-tracking branch 'origin/fix/server-respawn-repair' into integ/sh7 2026-10-18 17:23:23 +02:00
Ludovic Marie 52298d9a37 Merge remote-tracking branch 'origin/fix/server-crouch-flags' into integ/sh7
# Conflicts:
#	crates/horizon-client/src/lan/entity.rs
2026-10-18 17:23:22 +02:00
Ludovic Marie eed2d8ddff Merge remote-tracking branch 'origin/feat/server-entity-attributes' into integ/sh7 2026-10-18 17:17:54 +02:00
Ludovic Marie f5d81e883c Merge remote-tracking branch 'origin/feat/server-player-targets' into integ/sh7 2026-10-18 17:17:53 +02:00
Ludovic Marie be161f100b Report the world's tick time in flight summaries
A `fly` benchmark replied with frame times only. With single player on its
server thread, the world's ticks no longer show in the frames, so a flight
could not tell how long the server took.

The summary now has tick_ms and tick_ms_max: the world's smoothed tick time
(the F3 server line) averaged and at its highest over the flight. On the
server thread it is the server's.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 17:15:24 +02:00
rdbtCVS de6f15e664 Merge latest main and preserve surface-height and consumable changes 2026-10-18 15:53:28 +01:00
Ludovic Marie 6c078b2852 Merge pull request #874 from ludovic111/perf/server-tick-spikes
🤖 Agent: Merged. HORIZON_SPIKES logs slow server ticks with thread CPU time and spans; without it the tick runs exactly as before.
2026-10-18 16:50:21 +02:00
Ludovic Marie 2c9bfbb70a Merge pull request #888 from ludovic111/fix/integrated-owner-movement
🤖 Agent: Merged. Fixes #861: a ctl tp/fly move is sent even while the destination chunk isn't loaded, the single-player owner is exempt from the move check as in vanilla, and wait-ready waits for the level around the player. lan, dedicated_server, server_entities and server_dimension_players pass.
2026-10-18 16:50:18 +02:00
Ludovic Marie a9bf5dc8e5 Merge pull request #873 from ludovic111/perf/spawn-surface-heightmap
🤖 Agent: Merged. Natural spawning reads a WORLD_SURFACE heightmap kept on the chunk, as vanilla: column-height lookups 333/183 → 0/3 samples, natural spawning per tick 1.36/0.78 → 0.66/0.49 ms. 9 harnesses pass (natural_spawn, spawn_rules, heightmap, chunk_generation, chunk_stage, spawner, finalize_spawn, world_spawn, raid).
2026-10-18 16:50:15 +02:00
Ludovic Marie e0b75a86b7 Merge pull request #799 from ludovic111/fix/consume-effects-vanilla
🤖 Agent: Merged. CI parity and verify passed, and on current main with this branch, horizon-client clippy is clean and all its tests pass (873 lib + integration). Consumables now finish as in vanilla 26.3.
2026-10-18 16:48:54 +02:00
rdbtCVS 378739703b Fix F3 debug overlay toggling in the main menu 2026-10-18 15:45:06 +01:00
Ludovic Marie 7a6a4d9249 Server thread: horizon-ctl tp and fly make the server load the new chunks (#861)
With the world on its server thread, a horizon-ctl `tp` or `fly` moved the
window's player to chunks the server had not sent. The client skips its
tick while its own chunk isn't loaded, so it never sent the move, and the
server kept streaming the old area: "loading terrain..." forever.

- The client sends a move made where nothing is loaded (by horizon-ctl;
  a player who walks there has already sent it), so the server streams
  the chunks there.
- The integrated server doesn't check its owner's moves, as vanilla's
  `shouldCheckPlayerMovement` (`isSingleplayerOwner`); a long `tp` was
  "moved too quickly".
- `wait-ready` on a server also waits for the level around the player
  (`PlayerLoaded`); the status shows it as `server.loaded`.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:42:47 +02:00
Ludovic Marie 164f1dfd52 Feed a remote client's chat lines to the agent's event log
A client joined to a server (and the window on the server thread) keeps the
server's chat lines in its own list. The event log only counted the local
chat's lines, so `wait-for chat` never saw a line from the server.

The remote client counts the lines it receives. The event log reads that
count and those lines while connected.

lan_e2e gets a `chat` check: a line the host sends reaches the guest's
event log, and on the server thread the host window's too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:39:37 +02:00
Ludovic Marie 60bc15a63e Run the agent's commands, give and time on the server thread
With single player on its server thread, the window is a client of the
server. The agent's `command` went out as the owner's chat and returned no
output, so harnesses that read a command's feedback (lan_e2e trials) failed.
Control `give` and `time` changed only the window's copy of the world.

The server now runs them as single player's console does without a server
thread (`as_console`): as the world's owner, in the owner's level. The
feedback goes to the owner's chat and comes back to the agent. `give` runs
`give @s`, and `time` sets the server's clock too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:28:48 +02:00
rdbtCVS 70c4b205ba Merge main and adapt progressive startup to current client APIs 2026-10-18 15:28:40 +01:00
Ludovic Marie 720240feac Merge pull request #875 from ludovic111/fix/container-break-drops
🤖 Agent: Merged after #855 and the real verify. block_removal 4000/4000 including 319 mining cases; dispenser, crafter, composter, mace and use_item_on pass.
2026-10-18 16:25:33 +02:00
Ludovic Marie 176da24f2e Merge pull request #855 from Online5277/fix/loaded-container-drops
🤖 Agent: Merged. Fixes #844: mined containers spill their contents again (block_removal 4000/4000 with #875's mining cases). Thanks Online5277!
2026-10-18 16:20:26 +02:00
Ludovic Marie fcf3a3e267 spans: test that the thread CPU clock counts work, not sleep
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:17:15 +02:00
Ludovic Marie be03fec7fc Server ticks: HORIZON_SPIKES logs slow ticks with their CPU time and spans
With HORIZON_SPIKES=MS, a dedicated or integrated server tick longer than
MS ms is logged with the server thread's CPU time over the tick and the
tick's spans (tick_mobs, streaming, ...). A tick with much more wall time
than CPU time waited for a lock or for a core.

The spans recorded on a server thread were never taken before, so they
grew for as long as the server ran with HORIZON_SPIKES set.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:17:15 +02:00
Ludovic Marie e8247df5f0 Natural spawning reads a kept WORLD_SURFACE heightmap
Every spawn attempt (`NaturalSpawner.getRandomPosWithin`) asks for the
WORLD_SURFACE height of a column. Horizon scanned the column down for it
each time, a chunk-map lookup and a block-name compare per block. Vanilla
reads the chunk's heightmap.

Chunks now keep WORLD_SURFACE: built on the first read, and dropped by a
`set` that can move a column's surface (`Heightmap.update` leaves writes
two or more below it alone). Natural spawning, the spawn rules' bat check
and beacons read it.

The unused `heights` field (never written after `Chunk::empty`) is gone.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:16:27 +02:00
Ludovic Marie 20d9c4c984 Pair a respawned player again for the other players
ServerLevel.removePlayerImmediately and addRespawnedPlayer: when a player
respawns, every other player tracking it gets RemoveEntities and the next
tick pairs it again as a new entity. The hub only cleared the respawned
player's own tracker, so the others kept the dead body, lying down, wherever
the player went (the host window too, on the server thread).

The in-frame LAN host's death now reaches its guests (LivingEntity.die's
EntityEvent DEATH), and its respawn goes through the same path.

lan_e2e gets a `respawn` check: the host dies and respawns (and on the
server thread the guest too), and the other side's client draws it dead,
then alive. `status` lists the other players a client draws dead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:11:08 +02:00
Ludovic Marie 62cacfa607 Mining: the block-removal harness mines blocks as a survival player
test_block_removal_parity gains a "mine" removal: VanillaDispenserOracle
calls the real ServerPlayerGameMode.destroyBlock for a survival player holding
a pickaxe, axe, shovel, sword, shears, a mace or nothing, and Horizon's
dispense fixture calls break_block, the path every player's mining takes (the
single player game, the server thread and LAN guests). It compares the drops,
the spilled contents, experience, sounds, events, statistics and the held
stack. On main it shows every mined container losing its contents (#844, fixed
by #855) and three gaps of Horizon's own, fixed here:

- ItemStack.mineBlock: an item with a tool component counts as used, and wears
  its damage_per_block (2 for swords, the mace and the trident), also the mace
  and trident, whose tool component has no rules. Shears wear on every block
  but fire (ShearsItem.mineBlock).
- DecoratedPotBlock.playerWillDestroy: a pot mined with an item in
  breaks_decorated_pots, unless an enchantment prevents it, cracks first and
  shatters.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:10:10 +02:00
Ludovic Marie 6e09dbe10a Merge pull request #871 from ludovic111/perf/waypoint-pairs
🤖 Agent: Merged after the real verify passed. Waypoints::tick −33% (166 → 111 µs median), with byte-identical packets (530,834, same hash). locator_bar, lan, dedicated_server and server_dimension_players pass.
2026-10-18 15:50:09 +02:00
Ludovic Marie 2fd82a0c2c Merge pull request #864 from ludovic111/perf/tracking-sections
🤖 Agent: Merged. Entities::tick −37% (112–116 → 71–75 µs median per tick at 40 bots + 570 entities), with the same 14,159,154 packets before and after. 9 covering harnesses pass (server_entities, lan, dedicated_server, server_dimension_players, locator_bar and the entity ones); main has no lan/ changes since.
2026-10-18 15:46:03 +02:00
Ludovic Marie 7b8d8a604d Merge pull request #870 from ludovic111/integ/mp6
🤖 Agent: Merged after the real verify passed. Combined check on this branch: fmt, clippy, workspace tests, and the worldgen, structure_density, chunk_generation and world_spawn harnesses pass. modpacks-6's own integration passed 298/298 harnesses with the start oracle at 35/35.
2026-10-18 15:41:42 +02:00
Ludovic Marie ac287c78c5 Merge pull request #867 from ludovic111/perf/mesh-queue-columns
🤖 Agent: Merged. Mesh scheduling while flying at RD32: 0.62/0.72 → 0.36/0.22 ms per frame; at rest with ~12,000 waiting sections: 0.30–0.91 → 0.06–0.22 ms. Same checks as #865.
2026-10-18 15:36:44 +02:00
Ludovic Marie 6ad66df8d0 Merge pull request #866 from ludovic111/perf/light-dirty-sections
🤖 Agent: Merged. Light changes mark dirty sections without the per-frame sort and dedup (0.05–0.09 ms → 0). Same checks as #865.
2026-10-18 15:36:40 +02:00
Ludovic Marie 5620e4f1d1 Merge pull request #865 from ludovic111/perf/compact-terrain-vertex
🤖 Agent: Merged. Terrain vertices go 28→24 B: vertex memory −14%, Metal GPU 0.62→0.54 ms. HD 620 FPS is unchanged (vertex size isn't its bottleneck). Screenshots: the only differing pixels are on water, at main-vs-main noise level, with identical drawn sections. 95/95 covering harnesses on an integration with #866 and #867.
2026-10-18 15:36:37 +02:00
Ludovic Marie 8bf73f89d4 Locator bar: look up each connection and its two players once
A moving player updates its connection with every other player, three
times a tick (updateWaypoint, then updatePlayer at the position change and
at ServerChunkCache.move), so with 40 players there are about 4800
updates a tick. Each looked the connection up twice and both players up
four to six times. Now an update finds the connection's place once and
resolves the two players once, then checks, updates or remakes it there.

The same packets go out, in the same order.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 14:57:06 +02:00
Ludovic Marie b171508c0f Server: check each entity's range for every client from one compact pass
Entity tracking still asks every client about every entity each tick
(vanilla re-checks each pair whenever the player sends a move, so for
moving players it does the same), but the check is cheaper:

- each entity's position, id, range and chunk are read once a tick into
  a compact list, not from its EntityState once per client;
- each client looks up each of the tick's chunks once in the chunks it
  holds, not once per entity in it;
- an entity with no changes and no client starting to track it skips the
  loop over the clients.

The decisions and the packets are the same, in the same order.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 14:49:31 +02:00
Ludovic Marie dd9f8a9088 Server: send a player standing up again, and draw other players' crouch
A value back at its default is left out of an entity's state, so the
tracker never told clients that a player stopped crouching or a mob stopped
burning: Entity's shared flags and pose now go back to 0. On a client of a
server (the host window on the server thread), another player's crouch flag
now reaches their model and name tag.

From #731's server-thread list; lan_e2e's walls check passed in-frame and
failed with --server-thread.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 14:43:55 +02:00
Ludovic Marie 6bbcf8e3d6 streaming_meshes test: remote columns arrive lit since #824
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 14:39:34 +02:00
Ludovic Marie 4f9df73831 Merge pull request #860 from ludovic111/perf/save-compress-helpers
🤖 Agent: Merged after the real verify passed. Output is byte-identical (palettes / region files), and 17 covering harnesses passed with both PRs on main 256f7c20 (since then main has only #751, a settings UI change).
2026-10-18 14:10:03 +02:00
Ludovic Marie 6d15bad156 Merge remote-tracking branch 'origin/fix/large-structure-templates' into integ/mp6 2026-10-18 13:23:05 +02:00
Ludovic Marie 2efa0d65b5 Merge remote-tracking branch 'origin/feat/mod-structure-set-additions' into integ/mp6 2026-10-18 13:23:05 +02:00
Ludovic Marie bfa622bbde Server: send entity attributes to clients
ClientboundUpdateAttributesPacket, as vanilla's ServerEntity sends it: every
client-syncable instance when an entity is paired, the changed ones with the
dirty entity data, and a player's dirty set to the player itself.

- Mobs and armor stands report the instances vanilla would have created
  (movement speed, finalizeSpawn's bases and modifiers, the baby modifier,
  effects', equipment's and /attribute's), players their LiveAttributes.
- Guests get the per-tick movement speed instance and the creative reach
  modifiers (ServerPlayer.updatePlayerAttributes).
- cube::set_size sets the attribute bases as AbstractCubeMob.setSize does,
  so a summoned slime has its size's health and speed.
- server_entities compares attributes again, the player's own too, with a
  slime and a scaled pig in its scene.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 13:21:13 +02:00
Ludovic Marie 0bc5f4263c save_bench: time the region writer on a saved world's chunks
Reads every chunk of a saved dimension, then times SaveDir's save_later and
flush against the same encoding and compression done on one thread, and
checks the written chunks byte for byte.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 12:38:04 +02:00
Cosmic 8f8db8096b Preserve non-heart block entities until normal removal 2026-10-18 06:26:49 -04:00
Ludovic Marie 2ec71e5387 Mesh scheduling looks at dirty sections column by column
Sections waiting to be remeshed were one hash set that the render thread
walked section by section every frame, though every check (column loaded,
in view, its 3x3 lit, its region) holds for a whole column. At RD 32 about
12,000 sections wait at the edge of the lit area at any time. They are now
kept per column (a bit per section index), so each frame looks at each
column once and meshes all of its ready sections together.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 12:23:32 +02:00
Ludovic Marie 6bf479ec0b Light changes dirty sections by section, not cell by cell
Relighting block edits and relit chunks collected every changed cell,
sorted and de-duplicated them, then marked the sections around each cell
for remeshing. Vanilla's light engine reports changed sections to
LevelRenderer instead. LightChanges now keeps, per changed section, which
of 27 border classes (low face, inside, high face per axis) its changed
cells fall in; that gives exactly the same dirty sections and light log
without keeping or sorting the cells.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 12:23:32 +02:00
Ludovic Marie df58a474fb Terrain vertices in 24 bytes: the UV as 16-bit fixed point
TerrainVertex goes from 28 to 24 bytes: the UV becomes two u16 in 32768
steps per unit, which hold model UVs (multiples of 1/16 and their halves)
exactly and decode exactly in terrain.wgsl. The position stays a float:
fixed point moves the edges of offset plants and rotated elements by a
fraction of a pixel.

Section vertex memory drops 14% (RD 16: 380 -> 325 MB, arena 503 -> 369 MB);
pixels are unchanged on Metal and Vulkan outside animated water.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 12:09:07 +02:00