Commit Graph

4750 Commits

Author SHA1 Message Date
Ludovic Marie a9ad185287 Lithostitched's block swaps, with the properties both blocks have
ChoiceTheorem's Overhauled Village swaps blocks in its templates through
Lithostitched's block_swap processor (137 lists): a map of block to
block, the new one taking Block.withPropertiesOf the old state, and the
block left alone when the new one is not registered. Carry dropped it.

- Game: horizon:block_swap, the same map; the new block's default state
  with each property of the old one it has too (by name, when the value
  is one of its own).
- Carry: lithostitched:block_swap becomes it.

ATM10: processors carried 136 -> 273 of 1,427 (dropped 1,291 -> 1,154).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 22:45:28 +02:00
Ludovic Marie 50215b484a Better Dungeons' small dungeons: one or two chests, as the mod caps them
Better Dungeons' small dungeon templates hold several chests; its Java
chest processor keeps the first, then each other one on nextFloat <= 0.2
until two have stayed, and turns the rest into cave air. Carry dropped it,
so every chest stayed.

- Game: horizon:count_cap. Of `blocks`, the first `min` a placement meets
  stay, then each stays on settings.getRandom(pos).nextFloat() <= chance
  until `max` have; the others become `replacement`. Counted per
  placement (PlaceSettings, reset in process_infos), like the mod's
  DungeonContext, set up per StructureTemplate.placeInWorld.
- Carry: betterdungeons:small_dungeon_chest_processor becomes it with the
  mod's config defaults (1, 2, 0.2; chest and trapped chest).

Seed 1234, five small dungeons decorated: 12 chests -> 6.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 22:39:03 +02:00
Ludovic Marie c7985974e7 Better Desert Temples' placeholder blocks: suspicious sand, sherds, swaps
Better Desert Temples builds its temples with placeholder blocks (orange,
red and white glass, blue and yellow concrete, red wool, polished diorite,
blank pots) that its Java processors turn into suspicious sand, sand and
sandstone, upside-down stairs, cobwebs, terracotta, TNT and pots with
sherds. Carry dropped them, so the placeholders stayed in the world.

- Game: a horizon:pick processor. A block of `block` takes the first
  pick whose `below` is past one settings.getRandom(pos).nextFloat(),
  else `default`; an outcome is a state or one of several by nextInt
  (Util.getRandom), a new block entity or the block's own, and NBT lists
  of picked strings (one float each).
- Carry: the fixed swaps become vanilla's rule; the random ones
  horizon:pick with the mod's bounds (BlockStateRandomizer's sums as
  floats). The processors that read or change the world around (pillars,
  Diorite's waterlogging) stay dropped.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 22:23:18 +02:00
Ludovic Marie a0bcc13f1c Tick blocks around every player, from vanilla's chunk tickets (#890)
Without a local player (dedicated server, --server-thread) no block ticked:
tick_blocks returned early, so crops, fluids, redstone, pistons and pressure
plates stood still, and a LAN host ticked only around itself.

ticket_levels ports DistanceManager's levels: PLAYER_LOADING at 31 within the
view distance and PLAYER_SIMULATION at 31 - simulation distance for every
player in the level (the local player, LAN guests, a server's players), and
FORCED at 31. Random ticks run in simulation entity-ticking chunks that are
ticking chunks, scheduled ticks, block events and block entities in block
ticking ones, entities in entity ticking ones; the sculk blocks follow the
same rule. Saved ticks unpack when a chunk starts ticking
(startTickingChunk), not when it loads.

The hub keeps the tick-rate state current while nobody is in the game, so a
player joining a frozen server is told once (updateJoiningPlayer).

dedicated_server parity froze nothing while the client was sent its chunks:
saved fluid ticks there (a lava fall that never settles) ran before or after
the chunk was sent depending on each server's loading speed, and it failed on
main too. It now freezes the game until the client has its chunks.

lan_e2e gets a growth check: water flows and wheat grows next to a guest
1000 blocks from the host.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 22:20:39 +02:00
Ludovic Marie 96822cd5f8 Moog's trial spawners and vaults: the saved state out, the configs in
Moog's trial spawner and vault randomizing processors keep the block and
change its block entity. The templates were saved with state that breaks
them in a new world: a vault's server_data holds
state_updating_resumes_at far in the future (it never opens) and a
spawner's spawn_data an empty entity (it spawns nothing of its own).

- Game: a horizon:edit block entity modifier takes `remove`'s keys out,
  then merges `data` in. append_static now merges as CompoundTag.merge
  does (compounds in both are merged), not a shallow replace.
- Carry: each processor becomes vanilla's rule processor, one rule per
  block state (12 trial spawner, 32 vault), with horizon:edit: the
  spawner's normal and ominous configs by id, the vault's loot table and
  key (the ominous ones on ominous vaults). trial_spawner/ files get their
  mobs' 1.21.1 ArmorItems/HandItems as 26.3's equipment.

ATM10: 6 more processors carried (125 of 1,427).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 22:12:37 +02:00
Ludovic Marie 3cd155792d Entity tracking: check a pair again only when one side moves, as vanilla's ChunkMap
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 22:11:47 +02:00
Ludovic Marie 24bcef42be Merge pull request #887 from ludovic111/fix/lan-remote-item-use
🤖 Agent: verify passes; merged with main and checked locally (see the comment above). Part of #803: players see each other eat and use items.
2026-10-18 21:59:12 +02:00
Ludovic Marie 4b18b79d15 vanilla_client.py on macOS: the real vanilla 26.3 client joins Horizon's server
The tool picks this machine's natives (macOS arm64 or Linux), adds -XstartOnFirstThread on macOS
and turns vsync off there: with it on, an unseen window (a locked session) blocks in
SDL_GL_SwapWindow before the client joins. docs/server.md records the join.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 21:46:09 +02:00
Ludovic Marie 1e800099e9 Carry: vertical_distance_from_start_piece is a dead field, not a lost rule
Repurposed Structures' jungle fortress and End stronghold still write
vertical_distance_from_start_piece, but no codec of the mod (or of Moog's
Structure Lib) reads it any more: its own structures ignore it. Carry
drops it without counting it in rules_lost, which now lists only rules
the mods do run.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 21:43:58 +02:00
Ludovic Marie e3909f4370 Carry: Better Dungeons' small Nether dungeon, as YUNG's jigsaw
betterdungeons:small_nether_dungeon is YUNG's jigsaw structure (the same
fields and YungJigsawManager assembly) behind the mod's
smallNetherDungeons config switch, which ships on. Carry maps it as it
maps yungsapi:yung_jigsaw: minecraft:jigsaw with horizon:yungsapi.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 21:43:45 +02:00
Ludovic Marie 82c8de262f Repurposed's mineshafts: laid out under the terrain, carried as jigsaws
Repurposed Structures' 10 overworld mineshafts (birch, desert, icy,
jungle, ocean...) are its generic jigsaw with one change in
MineshaftStructure.postLayoutAdjustments: the layout is not centred on
the chunk; its top goes 15 blocks under the lowest ocean floor at the
chunk's middle and 16 blocks to each side (taking one off after each
side, as the mod does), never up, within y_allowance.

- Game: "layout": "mineshaft" in horizon:piece_limited runs that step.
- Carry: repurposed_structures:generic_mineshaft becomes minecraft:jigsaw
  with the piece-limited layout and that key, as its generic jigsaw does.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 21:43:37 +02:00
Ludovic Marie b77891dfe0 Merge pull request #918 from ludovic111/ci/cancel-on-close
🤖 Agent: verify passes; workflow-only change (cancel a PR's unfinished runs on close).
2026-10-18 21:43:12 +02:00
Ludovic Marie 41bd91f295 CI: cancel a pull request's unfinished checks when it closes
A merged or closed pull request's queued runs held the self-hosted runners
until someone cancelled them by hand. pull_request_target lets the token
cancel runs of fork pull requests too; the job checks out nothing. It
matches the branch and the head commit, so a fork's branch named like
another doesn't cancel that one's runs.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 21:35:47 +02:00
Ludovic Marie 00343ad2e2 Chunk packets: pack a paletted container a long at a time
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 21:21:34 +02:00
Ludovic Marie f1d5bf5209 server_bench: compare each bot count's work across servers, and flag runs that aren't equal
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 20:57:07 +02:00
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 5fcea03fb8 Carry: Repurposed's rule tests as the game's, and the chain as the iron chain
Two things kept Repurposed Structures' mineshaft processor lists from
loading in 26.3, and with them the mod's 5 Nether mineshaft pools:

- Its three rule tests written in Java. Carry renames them to the game's
  horizon:matter_phase, horizon:piece_origin_axis_aligned_linear_pos and
  horizon:y_value (213 in 75 lists), counted in the report's
  rule_tests_carried.
- 1.21.1's minecraft:chain, which 26.3 calls minecraft:iron_chain (its
  datafixers rename it in worlds). Carry renames it in recipes, loot
  tables and worldgen files: 112 files in 5 of ATM10's mods.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 20:49:23 +02:00
Ludovic Marie d634870f15 Structures: Repurposed's matter phase, piece origin and y value rule tests
Repurposed Structures' mineshafts and Nether monument test blocks with
three rule tests of their own. Vanilla, and the game, refuse a processor
list naming a type they do not know, and with it every pool naming the
list: the 5 Nether mineshaft start pools in a ported pack never load.

The game now runs them under its own types, with the mod's fields:

- horizon:matter_phase (MatterPhaseRuleTest): solid (not air, no fluid,
  canOcclude), liquid, air, and air or liquid with rails and chains,
  optionally inverted. Structure processors now bind the block
  properties to read canOcclude.
- horizon:piece_origin_axis_aligned_linear_pos: vanilla's axis-aligned
  chance over the block's distance from its template's origin.
- horizon:y_value: the block's world height in a range.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 20:48:34 +02:00
Ludovic Marie b18df1fd6b Merge origin/fix/lan-remote-item-use (#887) into main
Conflicts: the hub's player state keeps both main's attributes (#857) and
#887's living_flags; remote.rs and lan.rs debug JSON keep swinging and
using; the guests' model tick keeps both the swing update and the item
in use; lan_e2e.py checks unioned. remote_player_eating reads main's
Option<Consumable> (#799): any consumable with particles, its own use
time and should_emit, as the local player does.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 20:36:43 +02:00
Ludovic Marie 573f3a64f7 Merge pull request #913 from ludovic111/integ/bl4
🤖 Agent: verify passes; local checks in the PR body. Merges bugs-lan-4's #881–#886.
2026-10-18 20:27:03 +02:00
Ludovic Marie 20cc48b48f Merge pull request #905 from ludovic111/perf/render-encode
🤖 Agent: reviewed; verify passes. Mac mini RD32 standing, 4 alternating pairs: 116.1 → 163.3 FPS, CPU 7.09 → 4.98 ms/frame. Screenshots of 6 views plus HUD and inventory: no pixel differs beyond main-vs-main noise. parity --changed 95/95 locally. No early return after the copies encoder is taken, so staged section copies can't be dropped.
2026-10-18 20:26:51 +02:00
Ludovic Marie 519ec1217c Server build: the game without sound or controllers, so Linux servers need neither ALSA nor udev
horizon-client's cpal output and its controllers (gilrs, the DualSense's HID output) move behind the
audio and controllers features, on by default, so the game is unchanged. Built with
--no-default-features it links neither libasound.so.2 nor libudev.so.1. release.yml packages that
build as horizon-engine in horizon-server-linux-x86_64.tar.gz (xtask package-server, checked by
check_imports.py --server); install.sh installs it on Linux (and --archive installs a local one);
horizon-server already prefers horizon-engine. The Dockerfile uses it too, and CI lints it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 20:17:21 +02:00
Ludovic Marie def901b06f Merge remote-tracking branch 'origin/main' into integ/bl4 2026-10-18 20:09:06 +02:00
Ludovic Marie 51c49e11f4 Merge pull request #911 from ludovic111/feat/carry-repurposed-jigsaw-types
🤖 Agent: reviewed; verify passes. Parity: 298/298 harnesses on the integration commit 234bd101 (main + #907/#908/#910); vanilla structure-start oracle 35/35 with all five modpacks-7 changes. Merged in the required order #907 → #908 → #909 → #910 → #911.
2026-10-18 20:08:30 +02:00
Ludovic Marie 7a78d15c9e Merge pull request #910 from ludovic111/feat/repurposed-start-checks
🤖 Agent: reviewed; verify passes. Parity: 298/298 harnesses on the integration commit 234bd101 (main + #907/#908/#910); vanilla structure-start oracle 35/35 with all five modpacks-7 changes. Merged in the required order #907 → #908 → #909 → #910 → #911.
2026-10-18 20:08:04 +02:00
Ludovic Marie 36775db223 Merge pull request #909 from ludovic111/feat/carry-spawner-processors
🤖 Agent: reviewed; verify passes. Parity: 298/298 harnesses on the integration commit 234bd101 (main + #907/#908/#910); vanilla structure-start oracle 35/35 with all five modpacks-7 changes. Merged in the required order #907 → #908 → #909 → #910 → #911.
2026-10-18 20:07:39 +02:00
Ludovic Marie 567a68dd4f Merge pull request #908 from ludovic111/feat/spawner-mobs-processor
🤖 Agent: reviewed; verify passes. Parity: 298/298 harnesses on the integration commit 234bd101 (main + #907/#908/#910); vanilla structure-start oracle 35/35 with all five modpacks-7 changes. Merged in the required order #907 → #908 → #909 → #910 → #911.
2026-10-18 20:07:15 +02:00
Ludovic Marie 00a2ea23f0 Merge pull request #907 from ludovic111/fix/processor-ids-namespace
🤖 Agent: reviewed; verify passes. Parity: 298/298 harnesses on the integration commit 234bd101 (main + #907/#908/#910); vanilla structure-start oracle 35/35 with all five modpacks-7 changes. Merged in the required order #907 → #908 → #909 → #910 → #911.
2026-10-18 20:06:49 +02:00
rdbtCVS 4de112fe16 Fix multiplayer tick ordering and interaction target parity 2026-10-18 19:06:34 +01:00
Ludovic Marie 87cf8cb9e9 Merge pull request #904 from ludovic111/fix/server-log-lines
🤖 Agent: reviewed; verify passes. Refused logins name Server thread in latest.log; console, supervisor.log and the panel print local time.
2026-10-18 19:56:57 +02:00
Ludovic Marie 2a9d67bd68 Merge pull request #902 from ludovic111/docs/server-benchmark-mixed
🤖 Agent: reviewed; verify passes.
2026-10-18 19:52:37 +02:00
Ludovic Marie a714a9b6f8 Merge pull request #900 from ludovic111/fix/server-light-border
🤖 Agent: reviewed; verify passes.
2026-10-18 19:52:34 +02:00
Ludovic Marie e046036869 Merge pull request #898 from ludovic111/fix/server-linux-libraries
🤖 Agent: reviewed; verify passes (client --help exits 0 without loading the game, so the start check only catches a program the system can't load). Linux installs now name the missing ALSA/udev libraries; services run through the installer's current link.
2026-10-18 19:52:31 +02:00
Ludovic Marie 2d1dd54b33 Merge pull request #893 from ludovic111/fix/server-find-resources
🤖 Agent: reviewed; verify passes. Fresh installs now find game files prepared without sounds (horizon-resources.json).
2026-10-18 19:52:22 +02:00
Ludovic Marie 02a6ab7429 Guest ticks: count the per-tick statistics without making strings, and date a criterion only when one is granted
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 19:29:23 +02:00
Ludovic Marie bdc758c5e5 Server log: vanilla's thread in latest.log, and local time on the console
A dedicated server printed refused logins on its console as vanilla
does ("[Server thread/INFO]: Disconnecting <name> ..."), but wrote them
to logs/latest.log under the connection thread's own name
("[horizon-lan-conn/INFO]"): the file logger used the OS thread's name,
not the one vanilla logs the line from. The engine's lines now go to the
file under the same thread as on the console.

The console's times were UTC while logs/latest.log and vanilla's
console (Log4j's %d{HH:mm:ss}) use local time, so the two disagreed by
the time zone, as did the supervisor's own lines in
logs/supervisor.log and the web panel's console. Both now print local
time. Backup names keep their UTC time, as documented.

Found by the end-to-end install check on the Mac mini and the ThinkPad.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 19:27:23 +02:00
Ludovic Marie 40972de77a Benchmark: Horizon's server against vanilla 26.3 with mixed bots, as installed
The first published benchmark for the working version (docs/server.md
section 10, item 4). It ran the v2026.10.18.15 release, as install.sh
installs it, against vanilla 26.3 with 1, 10, 25 and 50 mixed bots. The
servers ran on the ThinkPad (quiet, under nice 19) and the bots on the
Mac mini over the tailnet. Vanilla's default game rules applied on both;
Horizon's server runs the locator bar now.

Both servers kept 20 TPS throughout. Horizon used 3.7 to 5.2 times less
memory. Its average tick was shorter with 1, 10 and 25 bots and 18 %
longer with 50, while it generated about twice the new terrain a second
(the exploring bots fly as fast as each server sends chunks). Its P99
was lower at every count.

benchmarks/server-mixed-2026-10-18/ holds the README, the report and the
machine's load; docs/server.md links it from sections 9 and 10.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 19:26:26 +02:00
Ludovic Marie d4d46b1bb7 Merge remote-tracking branch 'origin/fix/lan-paused-clock' into integ/bl4
# Conflicts:
#	tools/lan_e2e.py
2026-10-18 19:22:08 +02:00
Ludovic Marie faba097ff2 Merge remote-tracking branch 'origin/fix/lan-swings' into integ/bl4
# Conflicts:
#	crates/horizon-client/src/game/lan_actions.rs
#	tools/lan_e2e.py
2026-10-18 19:22:07 +02:00
Ludovic Marie c234641ead Merge remote-tracking branch 'origin/fix/lan-damage-events' into integ/bl4
# Conflicts:
#	crates/horizon-protocol/src/packets/play.rs
#	tools/lan_e2e.py
2026-10-18 19:17:43 +02:00
Ludovic Marie bff5121f6e Merge remote-tracking branch 'origin/fix/lan-guest-pressure-plates' into integ/bl4
# Conflicts:
#	tools/lan_e2e.py
2026-10-18 19:16:57 +02:00
Ludovic Marie 40fbae13b6 Merge remote-tracking branch 'origin/fix/lan-guest-brewing' into integ/bl4
# Conflicts:
#	crates/horizon-client/src/game/lan_crafting.rs
#	tools/lan_e2e.py
2026-10-18 19:16:56 +02:00
Ludovic Marie feb85f6d15 Merge remote-tracking branch 'origin/fix/lan-guest-machine-screens' into integ/bl4
# Conflicts:
#	tools/lan_e2e.py
2026-10-18 19:16:35 +02:00
Ludovic Marie f422cbb79a Merge pull request #901 from ludovic111/integ/sh7
🤖 Agent: Merged after the real verify passed; checks in the description.
2026-10-18 19:15:06 +02:00
Ludovic Marie ac2547c24a lan_e2e light: wait for the border chunk's light before comparing
On the server thread, lan_e2e --check light failed its border step (#891):
the guest's border chunk still had block light 0 next to glowstone placed
in the chunk past it. The server was right; the check was not.
same_light() waits until the host's light equals the guest's, but on the
server thread the host's game is a client too, and both are dark until
the light update arrives. They agreed at once, same_light returned, and
the next line read the guest's light before the update came.

The check now waits up to 100 ticks for the guest's border light, then
compares the host's with it.

With temporary logging on the server thread: the glowstone lands in a
finished chunk that isn't lit (the ring past what the guest tracks), so
the edit queues a full light job for its neighbours. The border chunk's
job then relights sections 15 to 17, and Hub::broadcast_light_changes
sends them to both clients as a tracked border chunk, as
ChunkMap.isChunkOnTrackedBorder does. Nothing in the engine changes.

Fixes #891

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 19:03:29 +02:00
Ludovic Marie b0b4414397 Merge pull request #752 from rdbtCVS/perf/biome-zoom-shared-mix
🤖 Agent: Merged. Bit-exact against the per-corner oracle (unit test over a dense grid, 7 seeds, wrapping extremes), CI parity passed, and the surface pass is about 10% faster in chunkgen_bench. Thanks rdbt!
2026-10-18 18:37:12 +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 4ea2243e4d horizon-server on Linux: say which libraries the game needs, and follow updates
On a Linux without ALSA's library (most minimal server images), the
game exits at once with the loader's "error while loading shared
libraries: libasound.so.2". The supervisor took that for a crash and
restarted it five times over two and a half minutes before giving up
with "see logs/latest.log", which holds nothing about it.

Now:
- `run` starts the game with --help first (it loads no game files) and,
  if the system can't load it, stops at once with the loader's line and
  the packages to install on Debian/Ubuntu, Fedora, Arch and NixOS;
- `init` prints the same as a warning after "Game:";
- install.sh lists the libraries `ldd` can't find, with the same advice;
- docs/server.md says so in the install section.

Also, a service installed without the installer's launcher on the PATH
ran `<dir>/releases/<tag>/horizon-server`: Linux reports the running
program with links resolved, so the unit pinned that release and an
update never reached it. The fallback now goes through `<dir>/current`
while it points at that release.

Found by the end-to-end install check on the ThinkPad (NixOS, no
nix-ld libraries) with v2026.10.18.15.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 18:16:14 +02:00
Ludovic Marie 73787507d1 Merge pull request #895 from ludovic111/fix/world-rest-no-timeout
🤖 Agent: Merged after the real verify passed.
2026-10-18 18:11:00 +02:00