Commit Graph

64 Commits

Author SHA1 Message Date
Ludovic Marie d5972490a5 Merge pull request #1193 from ludovic111/docs/modpacks-12-numbers
🤖 Agent: merged last in wave 2 (docs: modpacks-12 numbers), after the modpack PRs it describes.
2026-10-22 15:22:18 +02:00
Ludovic Marie 631160263f Merge pull request #1177 from ludovic111/feat/formations-fountain
🤖 Agent: merged after integration wave 2 on the desktop (integ/w2 @ 38307d15 = main c16b41ab + this wave): fmt, clippy -D warnings, workspace + launcher + telemetry-server tests, release build and every affected parity harness pass; the 3 harness failures and the panel test passed on rerun (known flakes).
2026-10-22 15:10:39 +02:00
Ludovic Marie badc91f94b Merge pull request #1176 from ludovic111/feat/ctov-compat-sky-view
🤖 Agent: merged after integration wave 2 on the desktop (integ/w2 @ 38307d15 = main c16b41ab + this wave): fmt, clippy -D warnings, workspace + launcher + telemetry-server tests, release build and every affected parity harness pass; the 3 harness failures and the panel test passed on rerun (known flakes).
2026-10-22 15:10:27 +02:00
Ludovic Marie 938a25a712 Modpacks doc: where ATM10's data mods stand, and what is missing, ranked
Pack-wide numbers after the modpacks-12 PRs (#1175, #1176, #1177, #1191):
structures that start, processors carried and dropped per mod, content,
load time and the play-through, and the gaps ranked by how much a player
notices them.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 12:05:53 +02:00
Ludovic Marie e6b92eb4ee Structures: Formations' fountain (its pieced structure) generates
Formations' PiecedStructure starts like its SimpleStructure, then lays out
the element's jigsaw children with vanilla's jigsaw. The game's jigsaw
assembler now exposes its child layout (add_children) for a start piece
placed by another structure type; horizon:formations reads horizon:pieced
(max_depth, max_distance_from_center), which carry writes for
formations:pieced.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 09:03:34 +02:00
Ludovic Marie 2f3f1377a3 Structures: CTOV's mod-compat hooks and Repurposed's mineshaft sky view carried
ctov:modular_compat runs another processor list only when the mod it names
is loaded: carry writes that list in when the mod is ported along and takes
the hook out otherwise (142 copies in ATM10, all for Nature's Spirit).
Repurposed Structures' mineshaft_sky_view_processor (71 lists) becomes the
game's horizon:mineshaft_sky_view: nothing at or above the world's
OCEAN_FLOOR_WG height, except plain rails over a block that can occlude,
waterlogged where the world holds water. Placement contexts gain
can_occlude.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 08:46:42 +02:00
Ludovic Marie 255f1960ee Structures: Mo' Structures generate (jigsaw with its terrain check, config spacing, exclusion by spread)
Carry maps mostructures:generic to vanilla's jigsaw with horizon:start_checks
(terrain_radius 2, terrain_range = heightRange) and mostructures:type to a
random spread with the config's default spacing and separation and its sets
to avoid as horizon:exclusion_zone. The game's exclusion zone gains
"their_zones": false, which tests the avoided sets by spread and frequency
alone, as ModStructurePlacement does.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-22 08:33:20 +02:00
Ludovic Marie 85f65a69b7 Merge pull request #1021 from ludovic111/feat/mod-vanilla-tags
🤖 Agent: merged. Verify passed. Integration proof (main + #1041 #1043 #1021 #1020 #1032 #659 #1029 #1066), 2026-10-21: 97 of 100 harnesses passed on the desktop. world_reopen and save_roundtrip need a display there; they pass on the Mac mini with #1041/#1043. dedicated_server is a pre-existing flake: it fails on plain main too, and is pass/fail in 2 runs on the integration.
2026-10-21 15:38:16 +02:00
Ludovic Marie edcf8b26f3 Merge pull request #1032 from ludovic111/feat/rs-waterlog-when-replacing-water
🤖 Agent: merged. Verify passed. Integration proof (main + #1041 #1043 #1021 #1020 #1032 #659 #1029 #1066), 2026-10-21: 97 of 100 harnesses passed on the desktop. world_reopen and save_roundtrip need a display there; they pass on the Mac mini with #1041/#1043. dedicated_server is a pre-existing flake: it fails on plain main too, and is pass/fail in 2 runs on the integration.
2026-10-21 15:38:11 +02:00
Ludovic Marie 870d2f4297 Merge pull request #1020 from ludovic111/feat/close-off-air-sources
🤖 Agent: merged. Verify and CI parity passed; local proof on main + the four modpacks PRs is in the body.
2026-10-21 15:05:14 +02:00
Ludovic Marie 5513361783 Merge pull request #1027 from ludovic111/fix/carry-vine-template
🤖 Agent: merged after verify and CI parity passed (modpacks-11: Chipped's 11 vines carried as vines; the 11 blockstate errors are gone from the game log).
2026-10-21 11:02:04 +02:00
Ludovic Marie 9e50fd8df2 Merge pull request #1028 from ludovic111/fix/carry-enter-block-advancements
🤖 Agent: merged after verify and CI parity passed (modpacks-11).
2026-10-19 17:23:05 +02:00
Ludovic Marie 8b53bd8a47 Merge pull request #1022 from ludovic111/fix/carry-rs-structure-void
🤖 Agent: merged after verify and CI parity passed (modpacks-11).
2026-10-19 17:23:00 +02:00
Ludovic Marie f441acf2f8 Merge pull request #1019 from ludovic111/fix/carry-untyped-loot-numbers
🤖 Agent: merged after verify and CI parity passed (modpacks-11).
2026-10-19 17:22:55 +02:00
Ludovic Marie 0eda0b0aaa docs/modpacks.md: Repurposed's waterlogging fix is carried
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 16:34:07 +02:00
Ludovic Marie 399178174d port-pack: Repurposed's structure voids keep the world's block
repurposed_structures:structure_void_processor returns null for a
template's structure_void blocks, which is what vanilla's block_ignore
does with blocks: [structure_void]. Carry writes it that way, so the
82 lists that use it (its mineshafts, ocean village and temples, the
jungle pyramid's hidden room, swamp village) no longer place structure
voids over the terrain.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 16:19:24 +02:00
Ludovic Marie 9adeb682cb docs/modpacks.md: Repurposed's air fix is carried
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 16:18:43 +02:00
Ludovic Marie 72515b99a7 Content mods: shared tags merge like a data pack's, replace honoured with a warning
A mod's file for a vanilla, convention or other mod's tag adds its values in
load order; one with "replace": true now drops vanilla's entries and the
earlier mods' first, as a higher data pack does, and the log says which mod
replaced what (kept with the cached root, so a reused root warns too).
Carry keeps such tags instead of setting them aside: Towns and Towers'
seven minecraft:has_structure biome tags load. Mods still own no other
minecraft content.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 16:18:12 +02:00
Ludovic Marie 8011d274eb port-pack: enter_block criteria name their block as blocks
26.3's EnterBlockTrigger reads a block list from 'blocks' and skips
1.21.1's 'block', so a carried criterion matched any block the player
entered: Regions Unexplored's Downer, From the Tree Tops and Light as a
Frog were granted on the first dive into the sea. Carry renames the
field (20 advancements in Regions Unexplored, with its boat recipes'
in-water criteria).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 16:16:54 +02:00
Ludovic Marie 6b5694d2b7 port-pack: blocks with sides and up that are true or false are vines, not walls
Without the oracle, a block's template is guessed from its blockstate's
property names, and a vine's (east, north, south, up, west) fit
cobblestone_wall. The game then refused Chipped's 11 vine blockstates:
a wall's sides are none, low or tall, so 'true' is an unknown multipart
property value. block_template looks at the sides' values and makes those
vines; Luminax's 32 walls stay walls.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 16:11:16 +02:00
Ludovic Marie 59a8aa2cd5 Merge pull request #984 from ludovic111/feat/carry-sea-level-processors
🤖 Agent: merged after verify passed and a local check on main + #983 + #984 (clippy clean; chunk_generation and locator_bar, the two harnesses that failed in CI on the old head, both pass; modpacks-10's integration ran 301/301). Structures built under the sea are flooded and waterlogged; Better Ocean Monuments' processors carried.
2026-10-19 16:02:52 +02:00
Ludovic Marie d468e1e78d Merge pull request #974 from ludovic111/feat/carry-extra-namespaces
🤖 Agent: merged after verify and CI parity passed, plus modpacks-10's local integration (parity 301/301, structure-start oracle 150/150 and 134/134). Towns and Towers' namespaces carried in its manifest.
2026-10-19 15:20:55 +02:00
Ludovic Marie 9a0077794c Merge pull request #969 from ludovic111/feat/mod-extra-namespaces
🤖 Agent: merged after verify and CI parity passed, plus modpacks-10's local integration (all nine branches on main: parity 301/301, structure-start oracle 150/150 and 134/134). Content mods may own namespaces besides their id; two mods may not share one.
2026-10-19 15:20:30 +02:00
Ludovic Marie 418e22a4b5 Merge pull request #975 from ludovic111/fix/mod-loot-tables
🤖 Agent: merged after verify and CI parity passed, plus modpacks-10's local integration (all nine branches on main: parity 301/301, structure-start oracle 150/150 and 134/134). Mod loot tables from every namespace, so modded structure chests are filled.
2026-10-19 15:20:26 +02:00
Ludovic Marie 621cea18ca docs/modpacks.md: carry types bare number ranges
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 15:04:18 +02:00
Ludovic Marie adb1476582 Merge pull request #989 from ludovic111/feat/carry-formations
🤖 Agent: merged after verify and CI parity passed (modpacks-10, reviewed with local harness proof in the agent's report). Carries Formations' structures.
2026-10-19 13:20:30 +02:00
Ludovic Marie 8beeea55ff Carry Formations' structures
Its formations:simple becomes the game's horizon:formations (its pool and
placement), and its single pool element vanilla's with its ground_level
under horizon:ground_level. Its pieced structure (one) stays out; its
processors are still dropped.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 08:35:08 +02:00
Ludovic Marie adb07c96ff Carry Better Ocean Monuments' processors and YUNG's legs
Better Ocean Monuments' ten processors (no fields; their behaviour is in
its Java) become vanilla's rule, the game's horizon:pick (one new
nextFloat per chance), horizon:flood_air, horizon:waterlog,
horizon:keep_world_block and horizon:yung_pillar; Better Witch Huts' log
and fence legs become horizon:yung_pillar. Its monuments are no longer
dry.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 08:29:23 +02:00
Ludovic Marie d983b47db6 Carry the mods' pillar and fluid fix processors
Repurposed Structures' and Moog's pillar_processor, Repurposed's
bottom_pillar_processor and close_off_fluid_sources_processor, YUNG's
pillar_processor (Better Fortresses, Better Jungle Temples) and Better
Fortresses' stair_pillar_processor become the game's horizon:pillar,
horizon:bottom_pillar, horizon:close_off_fluid_sources,
horizon:yung_pillar and horizon:stair_pillar. A pillar's own processor
list is written in, with the Java processors in it dropped.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 08:29:09 +02:00
Ludovic Marie 0a733cec55 Carry: the namespaces a mod's own files name, as its manifest's namespaces
Towns and Towers ships its 60 structures under kaisyn and towns_and_towers,
not its mod id t_and_t, so carry left them outside. A namespace is now the
mod's when its own files (its id's, its tag additions, the namespaces
already claimed) name ids in it and no mod of the pack has it as its id.
Compat files for other mods and pack mods' configs stay outside; of ATM10's
42 jars only T&T claims any. A replacing tag of its own is an addition.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 08:29:00 +02:00
Ludovic Marie df8bc603ff Content mods: namespaces besides the mod id, with no namespace shared by two mods
A content mod's manifest may list namespaces its files use besides its id
(Towns and Towers ships kaisyn and towns_and_towers under mod id t_and_t).
They are the mod's as its id is: files load, loaders read them. minecraft,
c and horizon cannot be listed. Two mods that are on owning one namespace
is an error naming both; the game keeps the first and leaves the other's
content out.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 08:28:42 +02:00
Ludovic Marie 6008be0a68 Loot: tables, modifiers, predicates, tags and recipes of every namespace
The loot loader read data/minecraft/ only, so every chest in a carried
mod's structure that names its mod's loot table opened empty. It now reads
every namespace (a vanilla root has only minecraft). Integers written as
floats (rolls 3.0, as Towns and Towers writes them) read as vanilla's int
codecs read them. 534 of the 675 non-block tables in ATM10's carried mods
now fill a chest; vanilla's chest fills are byte-identical.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 08:28:42 +02:00
Ludovic Marie 0af3dd3900 Merge pull request #959 from ludovic111/feat/carry-yung-modifiers
🤖 Agent: merged after verify and CI parity passed, and a combined check with rdbt's #796 on current main (fmt, clippy, 359 tests, 14 world-gen harnesses). YUNG/Moog terrain adaptation around structures (Better Fortresses netherrack inside bridges 39–41 % → 2.5–7 %), its carry, and YUNG modifiers.
2026-10-19 08:10:05 +02:00
Ludovic Marie 0def8931cb Merge pull request #956 from ludovic111/feat/carry-terrain-adaptation
🤖 Agent: merged after verify and CI parity passed, and a combined check with rdbt's #796 on current main (fmt, clippy, 359 tests, 14 world-gen harnesses). YUNG/Moog terrain adaptation around structures (Better Fortresses netherrack inside bridges 39–41 % → 2.5–7 %), its carry, and YUNG modifiers.
2026-10-19 08:09:53 +02:00
Ludovic Marie 4b28390f72 docs/modpacks.md: Lithostitched's processors carried, and what they change
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 04:42:29 +02:00
Ludovic Marie a19a6b5bcc docs/modpacks.md: YUNG's modifiers and dead-end pools, Towns and Towers' namespaces
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 04:06:59 +02:00
Ludovic Marie 9a836c50a8 Docs: carried terrain kernels and what they change in seed 1234
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 04:06:59 +02:00
Ludovic Marie bc549713bb Merge feat/yung-chest-cap (with main) into feat/lithostitched-block-swap
processors.rs tests: keep both sides' tests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 00:57:59 +02:00
Ludovic Marie 63044f339c Merge feat/yung-placeholder-blocks (with main) into feat/yung-chest-cap
processors.rs tests: keep both sides' tests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 00:57:52 +02:00
Ludovic Marie c3595f1a9c Merge feat/carry-trial-spawners-vaults (with main) into feat/yung-placeholder-blocks
processors.rs tests: keep #929's desert temple test and #920's rule-test test.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 00:57:45 +02:00
Ludovic Marie 03c423daac Merge origin/main into feat/carry-trial-spawners-vaults
processors.rs tests: keep both #926's trial spawner and vault tests and
#920's Repurposed rule-test test.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-19 00:57:14 +02:00
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 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 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 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 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 1b6a3cf535 Docs: modpacks, the structure libraries Horizon now runs
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-18 11:41:27 +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