Commit Graph

4750 Commits

Author SHA1 Message Date
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 44fba3bf9d horizon-server: find game files prepared without sounds
init and run looked for asset-index.json to recognise a prepared folder,
but horizon-prepare writes that file only with the optional sounds
(`horizon-prepare sounds`). A server prepared the usual way, without
sounds, was never found: init said "no prepared game files" and listed
the folder that held them. They are now recognised by
horizon-resources.json, the manifest every preparation writes and the
one the game itself reads.

Found by installing v2026.10.18.15 with install.sh on the Mac mini and
preparing from the release folder.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 17:50:52 +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 aea18f245f Renderer: one command buffer per frame, uploads before the first pass
wgpu-core ends its Metal command buffer at every pass: each render or
compute pass costs two command buffers (the pass and its barriers), each
run of copies between passes one more, and Metal creates and commits every
one on its own. The frame made about 18: the section copies in their own
encoder, the queue's pending writes for the HUD's fire animation, copies
before and after the flatten pass, and the screen effects' and HUD's
vertex uploads between later passes. At render distance 32 that cost 2-5 ms
of submit per frame, mostly waiting on the command queue's lock.

The frame now records after the section copies in their encoder, stages
the fire animation and the HUD's glyph patches through the frame's belt
instead of Queue::write_texture, and records every upload (screen
effects, HUD, flatten inputs, indirect draws) before the first pass.
The commands and their order within each pass are unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 17:22:43 +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
Ludovic Marie 159a5dfa5f LAN: pressure plates, tripwires and detector rails see the guests
Block triggers counted only the host's own player and the minecarts, so a
guest stepping on a plate did nothing. The guests in the level, not
spectators, now trigger them through Entity.checkInsideBlocks and are
counted by the plates' entity queries. On the server thread no block
ticks run at all yet (#890).

lan_e2e.py plates: a stone plate under the guest, on both sides.

Part of #848

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:59:56 +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 c5b6eed173 Merge pull request #872 from ludovic111/perf/structure-start-shards
🤖 Agent: Merged. Game thread waiting on the structure-start cache lock while exploring: 194/57 → 1/0 samples; structures_reaching 260/127 → 15/50. structure_density, worldgen, chunk_stage and chunk_generation pass.
2026-10-18 16:50:12 +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 5b47d53dbf LAN: guests use brewing stands
BrewingStandBlock opens BrewingStandMenu for a guest: the host clicks it on
the menu engine over the stand's slots (one bottle per slot, ingredient and
fuel slots, quick moves by item) and sends its four data slots
(BrewingStandBlockEntity.dataAccess). The guest opens minecraft:brewing_stand
menus, maps their slots, predicts clicks on Kind::Brewing and shows the
times. Reported by Tydragon00.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:41:07 +02:00
Ludovic Marie 76e659c74b LAN: players see each other use items (eating, bows, shields)
Neither side sent LivingEntity.DATA_LIVING_ENTITY_FLAGS for players, so
no one saw another player eat, draw a bow or raise a shield. The host now
sends the item in use and its hand for itself and every guest (always:
the trackers send only the entries that changed, and stopping is a change
back to 0), and draws its guests' bodies using their items. A guest's
client starts and stops the other players' item use from the flags and
drops their eating crumbs at their mouth (Consumable.onConsumeTick); the
eating sounds already come from the server.

lan_e2e.py eating: the host and the guest each see the other eat bread,
and stop.

Part of #803

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:41:06 +02:00
Ludovic Marie 89cbe03ebe LAN: everyone sees players' arm swings
The host ignored ServerboundPunchPacket, so a guest mining or hitting
swung only on its own screen; only the first swing a guest's use ever
started went out, the host's own swings never did, the host drew no swing
on guests' bodies and a guest's client ignored
ClientboundSwingAnimationPacket.

The host now swings the guest's hand on a punch (handlePunch), sends each
tick's guest swings to the players around and the host's own to the
guests, and swings and ticks the guests' bodies it draws. A use the server
ran that swung goes back to the guest too: Horizon's client does not run
uses itself, so it never predicted that swing (the hoe). The guest's
client swings itself or the other entity on the packet.

lan_e2e.py swings: mining swings seen from each side, and the guest's own
hoe swing.

Part of #848

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:41:06 +02:00
Ludovic Marie 0bc19687aa LAN: guests see mobs flash when hit
The host told guests of a hurt mob with EntityEvent 2, which 26.3's
clients read as a kinetic hit, not a hurt. It now sends
ClientboundDamageEventPacket (ServerLevel.broadcastDamageEvent) with the
damage type and the attacker, and the guest's client restarts the hurt
flash and jolts the walk animation (LivingEntity.handleDamageEvent).

lan_e2e.py hurt: a pig the guest hits and one the host hits flash on
both sides.

Part of #848

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:41:06 +02:00
Ludovic Marie a49f93f9ef LAN: guests open hoppers, dispensers and droppers
The guest's client closed every menu it had no screen for, so hoppers
(MenuType.HOPPER) and dispensers and droppers (GENERIC_3x3) did nothing.
They open as their 5 and 9 slot screens now, drawn by the menu's type
and under the server's title.

lan_e2e.py machines: each opens with its slots and keeps a stack the guest
shift-clicks in.

Part of #848

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:41:06 +02:00
Ludovic Marie 567cc33576 LAN: the guest's clock stops with /time pause and keeps up with the server's game time
The host sent the overworld clock's rate even while /time pause held it
(ServerClockInstance.packNetworkState sends 0 when paused), so a guest's
day kept running. A guest also moved its clock by the rounded rate each
client tick and never caught up when the server's game-time sync moved
game_time on, so a guest whose game lagged fell behind for good.
ClientClockManager.tick advances the clock by the game time passed, with
its partial tick; the guest now does the same.

lan_e2e.py time: the paused clock and a guest stalled for 4 seconds.

Part of #848

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:41:05 +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
rdbtCVS c296578a17 Remove startup verification screenshots 2026-10-18 15:38:01 +01:00
Ludovic Marie 7b5a57be7c Carry: Repurposed's Nether city, Nether shipwreck and End stronghold
They are Repurposed's generic jigsaw with a start check of their own:
carried as minecraft:jigsaw with the piece-limited layout and the
check named in horizon:start_checks.repurposed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:37:24 +02:00
Ludovic Marie f3099e8340 Start checks: Repurposed's Nether city, Nether shipwreck and End stronghold rules
Repurposed Structures' city_nether, shipwreck_nether and stronghold_end
types are its generic jigsaw with one more start check each. The
`repurposed` key of horizon:start_checks names the check:
- city_nether: no block from sea level + 20 to sea level + 45 at the
  corners of the eight chunks around;
- shipwreck_nether: no solid, filled block in a 33x30x33 grid above the start;
- stronghold_end: land at least 45 above the bottom at 70 and 35 blocks
  in each direction and at the start.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:36:52 +02:00
Ludovic Marie db13bd7df5 Carry: the structure mods' spawner processors, as data the game runs
Carry used to take every processor written in Java out of its list (#822),
so spawners kept what the template has: an empty spawner in Moog's
templates, a placeholder pig in Better Dungeons'. The new processors module
rewrites the ones with a data form before that:

- Moog's Structure Lib's and Repurposed Structures' spawner randomizing
  processors become horizon:spawner_mobs, with Repurposed's rs_spawners list
  written in (weight-0 entries left out, as its loader does);
- YUNG's Better Dungeons and Better Desert Temples spawner processors (a
  spawner or a placeholder block becomes a spawner of a fixed mob) become
  vanilla's rule processor with an append_static block entity, the entity in
  26.3's shape (equipment, drop_chances);
- Moog's vanilla loot swap is a no-op while its "replace vanilla" preset is
  off, as they ship, and is taken out.

Each is counted in carry-report.json's processors_carried. The game's own
horizon: types stay in the lists.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:36:52 +02:00
Ludovic Marie 2ebc1c44b3 Structures: horizon:spawner_mobs, the mods' spawner randomizing processors
Moog's Structure Lib and Repurposed Structures register a spawner
randomizing processor in Java: each spawner of the template gets one mob of
a weighted list, picked with settings.getRandom(pos).nextFloat(), and the
spawner NBT they write (Delay ... SpawnRange as shorts, the mob as the only
potential and the next spawn, optional custom spawn rules). With nothing to
pick the spawner becomes the replacement block.

horizon:spawner_mobs does the same from data; horizon-port-pack writes it in
place of theirs. Without it carry drops the processors, and Moog's templates
keep their spawners empty.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:36:46 +02:00
Ludovic Marie ae3622eb92 Processors: read rule ids without a namespace, as vanilla does
A rule processor's position predicate and block entity modifier types are
identifiers: vanilla reads "always_true" as minecraft:always_true. Horizon
matched the full string, so a list writing the short form failed, and with it
every pool naming the list. ChoiceTheorem's Overhauled Village writes
"always_true" in four village pools (plains, plains fortified, halloween), whose
houses then never generated.

The two decoders move out of Rule's decode into PosRule::decode and
Modifier::decode, which normalize the type first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:36:46 +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 2b6ae71fb7 Merge pull request #877 from ludovic111/fix/launcher-fmt
🤖 Agent: Merged after the real verify passed (formatting only).
2026-10-18 16:25:48 +02: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 3a474c2060 Launcher: rustfmt modpacks.rs
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 16:20:32 +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 f257131bde Merge pull request #858 from ludovic111/fix/prism-prepare-libraries
🤖 Agent: Merged after the real verify passed. Prism's metadata renames native jars (same sha1), so prepare now also looks under Prism's name, still checked against Mojang's sha1, with nothing downloaded. Launcher and horizon-prepare tests pass.
2026-10-18 16:20:22 +02:00
rdbtCVS 409a014ff0 Report the progressive title RSS comparison and its limits 2026-10-18 15:20:09 +01:00
rdbtCVS 55cd4e90f4 Record startup phase, early-entry and memory verification 2026-10-18 15:20:09 +01: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 43223c34e2 Structure starts: a sharded cache, so the server thread stops waiting on workers
The generator's structure-start cache was one Mutex<HashMap>. Each
generated chunk reads the 289 start chunks around it for its references,
and the server thread reads the starts of the chunks its mobs and spawn
attempts are in (`structures_reaching`). While workers generated, the
server thread spent most of its start lookups waiting for that lock.

The cache is now 64 RwLock shards keyed by a hash of the chunk: a lookup
read-locks one shard. Vanilla keeps the starts on each chunk
(`StructureManager.getStartForStructure` -> `chunk.getStartForStructure`),
so its lookups share no lock either. The first starts built for a chunk
are still the ones everyone keeps.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 15:58:20 +02:00