Commit Graph

2442 Commits

Author SHA1 Message Date
Ludovic Marie 643dccfa42 Merge remote-tracking branch 'origin/feat/piece-limited-jigsaw' into integ/mp6 2026-10-18 13:23:06 +02:00
Ludovic Marie 6a5e3a836d Merge remote-tracking branch 'origin/feat/carry-yung-placements' into integ/mp6 2026-10-18 13:23:06 +02:00
Ludovic Marie d5ab26f1d9 Merge remote-tracking branch 'origin/feat/yung-placements' into integ/mp6 2026-10-18 13:23:06 +02:00
Ludovic Marie 32be8bac0a Merge remote-tracking branch 'origin/feat/carry-yung-jigsaw' into integ/mp6 2026-10-18 13:23:06 +02:00
Ludovic Marie eae7688378 Merge remote-tracking branch 'origin/feat/yung-jigsaw-game' into integ/mp6 2026-10-18 13:23:06 +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 2d8d55942c Merge remote-tracking branch 'origin/feat/carry-structure-set-additions' 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 e508a5ce1d Merge pull request #751 from LookImEcho-Rick/codex/issue-582-settings-search
🤖 Agent: Merged. CI parity passed 94 of 95. The one miss, tooltip_display, passes locally on main with this branch, and so does options. Thanks LookImEcho-Rick!
2026-10-18 12:04:59 +02:00
Ludovic Marie 256f7c200a Merge pull request #842 from ludovic111/perf/waypoint-lookups
🤖 Agent: Merged. Waypoints::tick is 3.5× cheaper with the same packets in the same order. Same checks as #841.
2026-10-18 11:36:36 +02:00
Ludovic Marie 96a1e1cb24 Merge pull request #841 from ludovic111/perf/tracker-dirty-data
🤖 Agent: Merged. tick_lan is 40–55% cheaper and MSPT about 20% lower (40 bots, ~600 entities). The agent ran 95/95 harnesses (--changed) with #842 on main 4b43242a. The orchestrator then ran clippy and the lan tests on current main with both: clean.
2026-10-18 11:36:33 +02:00
Ludovic Marie 798249a212 Merge pull request #781 from rdbtCVS/t3code/2a9d6cd1
🤖 Agent: Merged. light_chunk is 28% faster, light parity shows 0 differing values against vanilla 26.3, and CI parity passed on a merge with main after #824's light changes. Thanks rdbt!
2026-10-18 11:36:23 +02:00
Ludovic Marie f0c7df2000 Merge pull request #836 from LookImEcho-Rick/codex/falling-block-collision-parity
🤖 Agent: Merged. Reviewed against vanilla: landing comes from Entity.move's vertical collision, the landing position is blockPosition(), velocity is zeroed per axis, and placement goes through Level.isUnobstructed with the collision shape. Locally on this head, fmt and clippy are clean, and contextual_collision, level_place, placement, powder_snow_collision and world_movement all PASS. Thanks LookImEcho-Rick!
2026-10-18 11:16:57 +02:00
Ludovic Marie aab43c46ae Carry: YUNG's placements, and the vanilla structures its mods turn off
YUNG's enhanced random spread becomes vanilla's random spread with its
enhanced exclusion zone as horizon:exclusion_zone; the desert and jungle
temples' placements add horizon:avoid_biomes (no ocean or river within 48
blocks of the chunk's middle at y 120); Better Strongholds' adds
horizon:ring_sections. A YUNG's structure the game can start gets
horizon:disables with the vanilla type its mod's mixin turns off; Better
Mineshafts, a Java structure type, leaves vanilla's mineshafts in place.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 11:10:58 +02:00
Ludovic Marie f57c59a971 Structures: Repurposed Structures' and Moog's piece-limited jigsaw assembler
A jigsaw structure with "horizon:piece_limited" is laid out as
PieceLimitedJigsawManager does (the same code in both mods): a fresh
random seeded by the chunk, the start piece drawn uniformly and moved to
the surface at its center, a volume 120 blocks down and 180 up, children
drawn by weight from the pools' entries in order, pieces capped per
template and some required (retried up to 40 times), pools whose
fallbacks ignore the bounds, y_allowance clipping. After the layout, the
structure's postLayoutAdjustments: the pieces centred on the chunk corner,
then buried (lowest corner, average land, lowest side) or, for the Nether
variants, moved onto the highest or lowest land or a fixed height.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 11:08:03 +02:00
Ludovic Marie 845a122faa Merge pull request #758 from rdbtCVS/perf/portal-section-mask
🤖 Agent: Merged. CI parity passed 88 of 89 harnesses. The one miss, dedicated_server (a known intermittent failure), passes locally on this head. Thanks rdbt!
2026-10-18 11:01:13 +02:00
Ludovic Marie 4db511079d Locator bar: update each connection in place, without clones
ServerWaypointManager's per-tick work for every moving player copied each
connection out of its row (its icon's style string too), scanned the row
again to put it back, copied the lists of players and waypoints it walked,
and looked players up through SipHash. Connections are now updated where
they are (the same row order and the same packets), the lists are walked
by index and the maps use FxHash.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 10:28:17 +02:00
Ludovic Marie c63fa74239 Server: track each entity once for all its clients, as vanilla's ServerEntity
Every guest had its own copy of what it was last told about every entity,
so each tick compared each entity's data and built and encoded its update
packets once per guest. A level now keeps one ServerEntity state per
entity (ChunkMap.entityMap), whose changes are worked out once a tick,
encoded once and sent to every guest tracking it; a guest's Tracker is the
set of entities it is paired with. The update cadence is the entity's own
tickCount, as vanilla's, and late clients are paired with the data the
others hold. The per-tick copy of every entity state, the id lists and the
packet lists are gone too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 10:28:16 +02:00
Ludovic Marie c7c9725942 Structures: YUNG's placements and their vanilla counterparts turned off
Three keys a carried mod's data can hold, which vanilla data never has:
- "horizon:ring_sections" on a random spread (BetterStrongholdsPlacement):
  starts only in the odd rings around the origin, with Java's int math.
- "horizon:avoid_biomes" (BetterDesertTemplePlacement and
  BetterJungleTemplePlacement): no start when one of the biomes is found
  around the chunk's middle block, as findBiomeHorizontal samples it.
- "horizon:disables" on a structure: every structure of the listed types
  fails to start, as YUNG's DisableVanilla*Mixin makes
  ChunkGenerator.tryGenerateStructure return false; in a set of several
  structures the next one is tried, as in vanilla.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 10:22:22 +02:00
Ludovic Marie 4b43242a61 Merge pull request #835 from ludovic111/perf/decoration-order-grid
🤖 Agent: merged: decoration_order::vanilla_order on flat arrays (RD32 8.14→1.06 ms per call; ticket order unchanged, checked against the old version). Combined on current main with #834/#835: clippy, client + world tests PASS.
2026-10-18 10:21:16 +02:00
Ludovic Marie 9a71700d51 Merge pull request #834 from ludovic111/perf/section-upload-belt
🤖 Agent: merged: section uploads through one reused staging buffer and one encoder, as vanilla's SectionRenderDispatcher (RD32 exploring: FPS 43.5→56.0, CPU 23.7→18.6 ms/frame, p99 122→106 ms; sections drawn identical in 12 views). Combined on current main with #834/#835: clippy, client + world tests PASS.
2026-10-18 10:21:11 +02:00
Ludovic Marie 6fff54b95d Merge pull request #837 from ludovic111/fix/tooltip-display-harness-bools
🤖 Agent: merged the tooltip_display harness fix (lowercase case flags; harness PASS).
2026-10-18 10:11:18 +02:00
Ludovic Marie 9dd896bfc3 tooltip_display harness: write the case flags in lowercase
Rust's bool parser takes only true/false, so the fixture failed on Python's
True/False; Java's Boolean.parseBoolean ignores case.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 10:10:57 +02:00
LookImEcho-Rick 7ddb4ddae5 Fix falling block collisions with partial blocks 2026-10-18 03:02:55 -05:00
Ludovic Marie 4676ea2819 Carry: YUNG's jigsaws and pieces with their rules
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 09:54:51 +02:00
Ludovic Marie 3c08f74d79 Structures: YUNG's API's jigsaw assembler for carried structures
A jigsaw structure with "horizon:yungsapi" (min_y/max_y) assembles the way
YUNG's API's JigsawManager does: the start piece by priority then weight
from the shuffled raw entries, children breadth-first, pool or fallback per
depth, and per-element rules from the element's "horizon:yungsapi": a name
capped by max_count, a depth range, a priority, ignore_bounds and a
condition (true, false, not, all_of, any_of, depth, altitude,
random_chance, rotation, piece_in_horizontal_direction).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 09:54:51 +02:00
Ludovic Marie 571066158e Structure templates read without a node cap, as vanilla does
Vanilla reads structure templates with NbtAccounter.unlimitedHeap()
(TemplateSource.readStructure). Horizon used the default 1,000,000-node
cap, so a template past it loaded as empty: YUNG's Better Ocean
Monuments' start piece (115x64x126 blocks) never started. Limits::templates
keeps the 256 MiB byte cap and drops the node cap, for worldgen and /place.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 09:54:31 +02:00
Ludovic Marie c1b4ccd571 Merge pull request #824 from ludovic111/perf/chunk-light-sync
🤖 Agent: merged: LAN guests and the server-thread game keep each chunk's light and get vanilla light updates (travel CPU −17%, light_chunk −35%; lan_e2e light PASS with and without --server-thread).
2026-10-18 09:46:11 +02:00
Ludovic Marie f845e26050 Merge pull request #829 from ludovic111/perf/anim-tick-hash
🤖 Agent: merged: block-entity animation list rebuilt only when drawn block entities change (anim tick −82% with 32,768 chests). perf-ticks-7's four PRs together on main d85a3603: clippy, 861 client + world tests, 19 harnesses (light, lan, dedicated_server, save_roundtrip, world_reopen, disk, datafix ×6, world, server_world_gen, block_entity ×4, chunk_stage) PASS.
2026-10-18 09:45:28 +02:00
Ludovic Marie 5177fb3601 Merge pull request #828 from ludovic111/perf/brewing-ticker
🤖 Agent: merged: brewing stands tick in the level's single ticker list, in vanilla's order. perf-ticks-7's four PRs together on main d85a3603: clippy, 861 client + world tests, 19 harnesses (light, lan, dedicated_server, save_roundtrip, world_reopen, disk, datafix ×6, world, server_world_gen, block_entity ×4, chunk_stage) PASS.
2026-10-18 09:45:24 +02:00
Ludovic Marie c717628169 Merge pull request #827 from ludovic111/perf/region-in-place
🤖 Agent: merged: chunks saved in place in their region file, as vanilla (save into a full region 80.3→7.1 ms). perf-ticks-7's four PRs together on main d85a3603: clippy, 861 client + world tests, 19 harnesses (light, lan, dedicated_server, save_roundtrip, world_reopen, disk, datafix ×6, world, server_world_gen, block_entity ×4, chunk_stage) PASS.
2026-10-18 09:45:19 +02:00
Ludovic Marie e93c99a4c7 Merge remote-tracking branch 'origin/main' into fix/pr751-merge
# Conflicts:
#	crates/horizon-client/src/options_horizon.rs
2026-10-18 09:44:42 +02:00
Ludovic Marie 8901a49d0b Upload section meshes through a reused staging belt
Queue::write_buffer creates a staging buffer for every call: on Metal a
kernel call to make the buffer, then page faults while the mesh is copied
into fresh memory. While exploring at render distance 32 the render thread
made two such writes per uploaded section, plus one for its flat-draw ids.

Section meshes and flat ids now go through their own StagingBelt (4 MiB
mapped buffers, reused once the GPU has read them) into one encoder that
the frame's submission runs ahead of its own commands. A page of the
section arena that grows records its copy into that encoder too, so copies
recorded before the grow reach the grown buffer. A frame that is not drawn
still submits the copies, and more than 64 MiB of them are submitted early.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 09:40:55 +02:00
Ludovic Marie 817a71ffa5 Clients keep the light the server sends; the server sends light updates
A remote client (a LAN guest, or the game on its server thread) threw away
the light in each LevelChunkWithLight and relit the column and its
neighbours itself. It now applies the sky and block layers as
ClientPacketListener.applyLightData does, and relights only block changes,
as vanilla's client does.

The hub now sends ClientboundLightUpdatePacket for the light sections that
changed in a column to the players for whom it is on the tracked border
(ChunkHolder.broadcastChanges), so light from blocks a guest doesn't track
reaches it.

horizon-ctl gains 'light X1 Y1 Z1 X2 Y2 Z2', and lan_e2e a 'light' check
comparing the guest's light with the host's.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 09:39:50 +02:00
Ludovic Marie d85a3603bd Merge pull request #761 from rdbtCVS/t3code/9960489f
🤖 Agent: merged rdbt's paletted container access (BlockSection::set 1.12x; identical palette, counts and NBT; CI parity green).
2026-10-18 09:33:45 +02:00
Ludovic Marie d8f81f7a98 Carry: lithostitched set and pool additions, and CTOV's villages
Lithostitched's add_structure_set_entries and add_template_pool_elements
modifiers become horizon:add_to files under worldgen/<kind>/horizon_added/,
upgraded as the mod's own pools are. Their load conditions (lithostitched's
predicate, NeoForge's, else Fabric's) are checked against the mods ported
along; other modifier types and tag targets are counted, not carried.

ChoiceTheorem's Overhauled Village adds its villages and outposts to
vanilla's sets in Java code; carry writes them with its default config
(small, medium and large villages weighted 10, 4 and 1, outposts 1).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 08:56:01 +02:00
Ludovic Marie 1ccc41c8b2 Content mods: add to other structure sets and pools (horizon:add_to)
A content mod's structure set or template pool file holding
"horizon:add_to" appends its entries to the sets or pools it names
(vanilla's, another mod's) instead of being one of its own, as
lithostitched's add_structure_set_entries and add_template_pool_elements
modifiers do on NeoForge and Fabric. The content root merges them after
every mod's own files, in mod and file order; a name nobody defines is
skipped. Vanilla data never has the key.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 08:56:01 +02:00
Ludovic Marie 1d937524a9 Merge pull request #826 from ludovic111/docs/modpacks-structures
🤖 Agent: merged: docs/modpacks.md. Combined check of main + modpacks-5's six: clippy, tests, worldgen structure_density block_properties registry_fluid chunk_stage PASS.
2026-10-18 08:53:03 +02:00
Ludovic Marie 6da2d8ebcc Merge pull request #825 from ludovic111/perf/facts-registry-stream
🤖 Agent: merged: facts.json streamed into the block registry (registry peak 816→153 MB at ATM10 size). Combined check of main + modpacks-5's six: clippy, tests, worldgen structure_density block_properties registry_fluid chunk_stage PASS.
2026-10-18 08:52:58 +02:00
Ludovic Marie 3415246998 Merge pull request #820 from ludovic111/feat/structure-start-checks
🤖 Agent: merged: Repurposed and Moog jigsaw start rules (Repurposed 1→13 starts, MVS 829→90, failing pools 65→0, vanilla oracle 35/35). Combined check of main + modpacks-5's six: clippy, tests, worldgen structure_density block_properties registry_fluid chunk_stage PASS.
2026-10-18 08:52:53 +02:00
Ludovic Marie c741bde15f Merge pull request #822 from ludovic111/feat/carry-drop-java-processors
🤖 Agent: merged: Java-only processors dropped and counted (1,427). Combined check of main + modpacks-5's six: clippy, tests, worldgen structure_density block_properties registry_fluid chunk_stage PASS.
2026-10-18 08:52:48 +02:00
Ludovic Marie 166b7f8d05 Merge pull request #821 from ludovic111/feat/carry-structure-rules
🤖 Agent: merged: carry writes the mods' structure start rules and Moog's spacing. Combined check of main + modpacks-5's six: clippy, tests, worldgen structure_density block_properties registry_fluid chunk_stage PASS.
2026-10-18 08:52:44 +02:00
Ludovic Marie 73c726759e Merge pull request #816 from ludovic111/fix/carry-worldgen-block-states
🤖 Agent: merged: worldgen block states rewritten to 26.3's format (1,005 files in 17 mods). Combined check of main + modpacks-5's six: clippy, tests, worldgen structure_density block_properties registry_fluid chunk_stage PASS.
2026-10-18 08:52:39 +02:00
Ludovic Marie eb3f2b94ca Merge pull request #831 from ludovic111/feat/secure-chat
🤖 Agent: merged secure chat as vanilla 26.3's server (chat sessions, signed chat and commands, enforce-secure-profile; secure_chat harness identical to vanilla offline and online; 7 server harnesses pass).
2026-10-18 08:40:05 +02:00
Ludovic Marie dc206d6132 Merge pull request #830 from ludovic111/fix/server-thread-view-distance
🤖 Agent: merged: the integrated server follows the window's render distance past 32 (fixes #804), and the lan_e2e hazards check now finds the guest by name (the server-thread hunger gap was a test bug).
2026-10-18 08:39:19 +02:00
Ludovic Marie 84d3d2a9a0 Rerun CI (flaky options_ui test, #802)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 08:14:28 +02:00
Ludovic Marie a2363a3bf6 fix(server-thread): the integrated server follows the render distance, past 32 too
IntegratedServer.tickServer: the server takes the window's render and
simulation distances when they change ("Changing view distance to N, from
M"), tells every player (SetChunkCacheRadius, SetSimulationDistance), and
each player's chunks follow, up to what they asked for. The integrated
server no longer clamps the view distance to 32, and a remote client sends
its render distance again when it changes (Options.broadcastOptions),
past 32 too. Fixes #804.

lan_e2e: a distance check (--server-thread), and the guest is found by
name in lan status, where the server thread lists the owner too: the
hazards check read the owner's food (the "no hunger from moving" gap).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 08:09:49 +02:00
Ludovic Marie 8f3d35ab6d Block entity animations: read the drawn block entities only when they change
tick_block_entity_anims rebuilt a map of every drawn block entity, sorted
it and swept the animation states against it every tick. The renderer now
keeps a revision that changes when its block entities do, and the sorted
ticker list is rebuilt only then. The animation states use FxHashMap.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 07:57:10 +02:00
Ludovic Marie 454b3842bb feat(server): secure chat, as vanilla 26.3's server
Chat session updates with their profile key checked against the services'
keys, signed chat and the message chain, last-seen acknowledgements, the
signature cache, signed say/me/msg, enforce-secure-profile, and vanilla's
log lines. Offline servers and players without a chat session chat
unsigned, as on vanilla. tools/test_secure_chat_parity.py compares both
servers with test keys and a mock services server.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 07:52:46 +02:00
Ludovic Marie 05517a167f docs/modpacks.md: structure carry-over now decodes and starts where the mod would; facts.json streams
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 07:40:41 +02:00