From d199ac253e26bac2493828b25528c8bc8b9a2d62 Mon Sep 17 00:00:00 2001 From: Dustin Norberg Date: Tue, 17 Nov 2026 18:12:07 -0500 Subject: [PATCH] Add native biome families, desert vegetation, static sky controls and Seamless views --- README.md | 42 +++-- RELEASE_NOTES_1.21.1.0.4.md | 14 ++ RELEASE_NOTES_1.21.1.0.5.md | 13 ++ RELEASE_NOTES_1.21.1.0.6.md | 15 ++ docs/DESERT_VEGETATION.md | 104 +++++++++++++ docs/DUAL_VERSION_RELEASE.md | 4 + docs/NATIVE_BIOME_FAMILIES.md | 139 +++++++++++++++++ docs/PUBLISHING_APIS.md | 5 +- docs/PUBLISHING_DESCRIPTION.md | 61 ++++++++ docs/SEAMLESS_PORTALS.md | 136 +++++++++++++++++ docs/STATIC_SKY_RESOLUTION.md | 102 +++++++++++++ docs/WRITING_GRAMMAR.md | 13 ++ gradle.properties | 2 +- ports/mc263/README.md | 31 ++-- ports/mc263/RELEASE_NOTES_26.3.0.10.md | 19 +++ ports/mc263/RELEASE_NOTES_26.3.0.6.md | 13 ++ ports/mc263/RELEASE_NOTES_26.3.0.7.md | 14 ++ ports/mc263/RELEASE_NOTES_26.3.0.8.md | 16 ++ ports/mc263/RELEASE_NOTES_26.3.0.9.md | 23 +++ ports/mc263/build.gradle | 1 + ports/mc263/gradle.properties | 2 +- ports/mc263/port_en_us.json | 3 - .../net/dnorberg/rivencraft/PortConfig.java | 10 ++ .../net/dnorberg/rivencraft/Rivencraft.java | 2 +- .../rivencraft/age/AgeCatalogSync.java | 2 +- .../rivencraft/age/PortAgeColors.java | 32 ++-- .../rivencraft/age/PortBiomePlan.java | 14 +- .../age/PortFeatureChunkGenerator.java | 8 + .../rivencraft/age/PortNativeBiomePools.java | 53 +++++++ .../age/PortRandomAgeSelection.java | 6 +- .../rivencraft/age/PortRandomPagePolicy.java | 2 +- .../age/PortStaticSkyResolution.java | 20 +++ .../rivencraft/age/PortSurfaceVegetation.java | 100 ++++++++++++ .../rivencraft/age/RuntimeAgeBackend.java | 23 ++- .../rivencraft/block/CrystalPortalBlock.java | 2 +- .../entity/BookReceptacleBlockEntity.java | 4 +- ...Panel.java => ImmersiveLiveBookPanel.java} | 10 +- .../rivencraft/client/PortBookPreview.java | 7 +- .../rivencraft/client/PortStaticSky.java | 26 +++- .../rivencraft/client/StaticSkyState.java | 2 + .../compat/ImmersiveBookPreviews.java | 47 ++++++ ...tals.java => ImmersiveCrystalPortals.java} | 19 ++- ...talView.java => ImmersiveCrystalView.java} | 4 +- ...hunks.java => ImmersivePreviewChunks.java} | 6 +- .../rivencraft/compat/RebornBookPreviews.java | 35 ----- ...n.java => ImmersiveGuiRenderingMixin.java} | 10 +- .../rivencraft/mixin/RebornBlockAckMixin.java | 4 +- .../mixin/StaticSkyRendererMixin.java | 7 +- .../rivencraft/mixin/StaticSkyStateMixin.java | 4 + .../network/PortBookNetworking.java | 4 +- .../portal/CrystalPortalNetwork.java | 6 +- .../writing/PortAuthoredWriting.java | 15 +- .../writing/PortWritingRecovery.java | 18 ++- .../tags/worldgen/biome/cave_biomes.json | 7 +- .../src/main/resources/rivencraft.mixins.json | 2 +- .../desert108/DesertVegetationChecks.java | 77 ++++++++++ .../rivencraft/regression/DesertProbe.java | 64 ++++++++ .../rivencraft/book/NativeBiomeProbe.java | 143 ++++++++++++++++++ .../rivencraft/age/NativeBiomeProbe.java | 128 ++++++++++++++++ .../regression/PortalEngineProbe.java | 124 +++++++++++++++ .../rivencraft/regression/StaticSkyProbe.java | 70 +++++++++ .../rivencraft/regression/StaticSkyProbe.java | 71 +++++++++ scripts/regression_desert263.py | 61 ++++++++ scripts/regression_native111.py | 67 ++++++++ scripts/regression_portal117.py | 68 +++++++++ scripts/regression_static109.py | 59 ++++++++ scripts/test_desert_vegetation.py | 14 ++ .../rivencraft/shared/DesertVegetation.java | 60 ++++++++ .../rivencraft/shared/NativeBiomeKind.java | 19 +++ .../shared/StaticSkyResolution.java | 36 +++++ .../rivencraft/book/AgeBiomeSelection.java | 38 ++++- .../rivencraft/book/AgeDefinition.java | 17 ++- .../rivencraft/book/AgeDimensionService.java | 14 +- .../rivencraft/book/AgeGenerationPlan.java | 16 +- .../rivencraft/book/AgeRegistrySavedData.java | 14 +- .../rivencraft/book/AgeSkyProfile.java | 26 +++- .../rivencraft/book/NativeBiomePools.java | 53 +++++++ .../rivencraft/book/RandomPagePolicy.java | 2 +- .../client/RivencraftSkyEffects.java | 3 +- .../network/AgeCelestialAnglePayload.java | 4 +- .../rivencraft/network/ModNetworking.java | 2 +- .../world/AgeFeatureChunkGenerator.java | 5 +- .../world/AgeFlatChunkGenerator.java | 5 + .../world/AgeSurfaceVegetation.java | 102 +++++++++++++ .../rivencraft/writing/SymbolSemantics.java | 2 +- .../rivencraft/writing/WritingGrammar.java | 26 ++-- .../assets/rivencraft/lang/en_us.json | 22 ++- .../symbols/biome/native_caves.json | 11 ++ .../rivencraft/symbols/biome/native_end.json | 11 ++ .../symbols/biome/native_nether.json | 11 ++ .../tags/worldgen/biome/cave_biomes.json | 6 +- .../worldgen/biome/desert_vegetation.json | 10 ++ 92 files changed, 2520 insertions(+), 224 deletions(-) create mode 100644 RELEASE_NOTES_1.21.1.0.4.md create mode 100644 RELEASE_NOTES_1.21.1.0.5.md create mode 100644 RELEASE_NOTES_1.21.1.0.6.md create mode 100644 docs/DESERT_VEGETATION.md create mode 100644 docs/NATIVE_BIOME_FAMILIES.md create mode 100644 docs/PUBLISHING_DESCRIPTION.md create mode 100644 docs/SEAMLESS_PORTALS.md create mode 100644 docs/STATIC_SKY_RESOLUTION.md create mode 100644 ports/mc263/RELEASE_NOTES_26.3.0.10.md create mode 100644 ports/mc263/RELEASE_NOTES_26.3.0.6.md create mode 100644 ports/mc263/RELEASE_NOTES_26.3.0.7.md create mode 100644 ports/mc263/RELEASE_NOTES_26.3.0.8.md create mode 100644 ports/mc263/RELEASE_NOTES_26.3.0.9.md create mode 100644 ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortNativeBiomePools.java create mode 100644 ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortStaticSkyResolution.java create mode 100644 ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortSurfaceVegetation.java rename ports/mc263/src/main/java/net/dnorberg/rivencraft/client/{RebornLiveBookPanel.java => ImmersiveLiveBookPanel.java} (94%) create mode 100644 ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveBookPreviews.java rename ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/{RebornCrystalPortals.java => ImmersiveCrystalPortals.java} (52%) rename ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/{RebornCrystalView.java => ImmersiveCrystalView.java} (99%) rename ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/{RebornPreviewChunks.java => ImmersivePreviewChunks.java} (98%) delete mode 100644 ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornBookPreviews.java rename ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/{RebornGuiRenderingMixin.java => ImmersiveGuiRenderingMixin.java} (66%) create mode 100644 scripts/fixtures/desert108/DesertVegetationChecks.java create mode 100644 scripts/fixtures/desert263/net/dnorberg/rivencraft/regression/DesertProbe.java create mode 100644 scripts/fixtures/native111/mc1211/net/dnorberg/rivencraft/book/NativeBiomeProbe.java create mode 100644 scripts/fixtures/native111/mc263/net/dnorberg/rivencraft/age/NativeBiomeProbe.java create mode 100644 scripts/fixtures/portal117/net/dnorberg/rivencraft/regression/PortalEngineProbe.java create mode 100644 scripts/fixtures/static109/mc1211/net/dnorberg/rivencraft/regression/StaticSkyProbe.java create mode 100644 scripts/fixtures/static109/mc263/net/dnorberg/rivencraft/regression/StaticSkyProbe.java create mode 100644 scripts/regression_desert263.py create mode 100644 scripts/regression_native111.py create mode 100644 scripts/regression_portal117.py create mode 100644 scripts/regression_static109.py create mode 100644 scripts/test_desert_vegetation.py create mode 100644 shared/src/main/java/net/dnorberg/rivencraft/shared/DesertVegetation.java create mode 100644 shared/src/main/java/net/dnorberg/rivencraft/shared/NativeBiomeKind.java create mode 100644 shared/src/main/java/net/dnorberg/rivencraft/shared/StaticSkyResolution.java create mode 100644 src/main/java/net/dnorberg/rivencraft/book/NativeBiomePools.java create mode 100644 src/main/java/net/dnorberg/rivencraft/world/AgeSurfaceVegetation.java create mode 100644 src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_caves.json create mode 100644 src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_end.json create mode 100644 src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_nether.json create mode 100644 src/main/resources/data/rivencraft/tags/worldgen/biome/desert_vegetation.json diff --git a/README.md b/README.md index 35ec951..8d9d6c5 100644 --- a/README.md +++ b/README.md @@ -10,33 +10,25 @@ also lets you author modern terrain, biomes, structures, seasons, and celestial bodies. It is an independently developed project, not a byte-for-byte copy of the 1.12.2 mod. +Current releases: **1.21.1.0.6** and **26.3.0.10**, with separate Minecraft-specific JARs and saves. + The gameplay guide below describes the **Minecraft 1.21.1 release**. The separate -**Minecraft 26.3 release, 26.3.0.1**, uses Java 25, NeoForge 26.3.0.99 and a -first-party Age backend; it does not need Dynamic Dimensions or Bad Packets. -It includes authored/seeded Ages, writing stations and collections, libraries, -crystal portals, celestials/eclipses, instability and Link Modifier controls. -JEI, TerraBlender/Biomes O' Plenty, Serene Seasons and Ruins remain optional. -Immersive Portals Reborn 7.0.12 adds live book previews and crystal portal views; -animated fallbacks work without it. Random-page eligibility and random-Age glyph -descriptions are included. Full 1.21.1 parity and the final expanded-catalog -two-client regression remain ongoing. Reborn's Static Sky rendering bug is tracked -in [#116](https://git.paddedcell.org/dnorberg/rivencraft/issues/116). -See the [26.3 guide](ports/mc263/README.md) and -[release notes](ports/mc263/RELEASE_NOTES_26.3.0.1.md). -Keep the builds and their saves separate, and back up worlds before updating. +**Minecraft 26.3 release** uses Java 25, NeoForge 26.3.0.99 and a first-party Age +backend; it does not require Dynamic Dimensions or Bad Packets. Both tracks include +authored/seeded Ages, writing stations, libraries, crystal portals, celestials, +instability and Link Modifier controls. JEI, TerraBlender/Biomes O' Plenty, +Serene Seasons and Ruins remain optional. See the [26.3 guide](ports/mc263/README.md) +and [parity review](docs/MC263_PARITY_REVIEW.md). -Minecraft **26.3** is also supported through a separate **Java 25 / NeoForge -26.3.0.99** release with a first-party Age backend. See the -[26.3 guide](ports/mc263/README.md) and -[parity review](docs/MC263_PARITY_REVIEW.md). Keep the game-version JARs and saves -separate; 1.21.1 remains supported with its existing dependencies. The guide below -describes 1.21.1 unless stated otherwise. - -Current releases: **1.21.1.0.3** and **26.3.0.5**. Both add -[Flooded Pages](docs/FLOODED_PAGES.md). The 1.21.1 update also corrects Ink Mixer -cost and Flat ground height. Reborn's known 26.3 crashes are tracked in -[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); full optional -Seamless support is planned in [#117](https://git.paddedcell.org/dnorberg/rivencraft/issues/117). +These releases add [Native biome-family Pages](docs/NATIVE_BIOME_FAMILIES.md), +[desert vegetation](docs/DESERT_VEGETATION.md) and Number-controlled +[Static Sky resolution](docs/STATIC_SKY_RESOLUTION.md). +On 26.3, optional Immersive Portals Reborn or Seamless Portals provides live book +and crystal portal views, including look-only exploration in the book panel. +Install only one fork; built-in animations work without either. +Known Reborn/Seamless crashes and travel disconnects remain tracked in +[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118). +Use matching client/server builds, keep Minecraft tracks separate and back up worlds before updating. ## Getting started diff --git a/RELEASE_NOTES_1.21.1.0.4.md b/RELEASE_NOTES_1.21.1.0.4.md new file mode 100644 index 0000000..e622215 --- /dev/null +++ b/RELEASE_NOTES_1.21.1.0.4.md @@ -0,0 +1,14 @@ +# Rivencraft 1.21.1.0.4 + +Local test build for issue #108; pending player validation and explicit publication. + +- Trees add ordinary cacti in vanilla and tagged modded deserts. +- Huge Trees add tall 5–9-block cactus columns; Flowers add dead bushes. +- Repeated pages add seeded attempts; normal biome decoration remains. +- Uses common `c:is_desert` via a data-pack-extensible Rivencraft tag. BOP + Dryland/Lush Desert are included; Cold Desert is unchanged. +- Candidate biome, air, ground and bounds checks protect existing blocks. +- Existing chunks are not rewritten. Creative/JEI tooltips describe the behavior. +- Flat Ages now apply these authored vegetation pages as well. + +Shared placement checks passed. See [desert vegetation rules](docs/DESERT_VEGETATION.md). diff --git a/RELEASE_NOTES_1.21.1.0.5.md b/RELEASE_NOTES_1.21.1.0.5.md new file mode 100644 index 0000000..869dea4 --- /dev/null +++ b/RELEASE_NOTES_1.21.1.0.5.md @@ -0,0 +1,13 @@ +# Rivencraft 1.21.1.0.5 + +Local test build for Minecraft 1.21.1; pending player validation and explicit publication. + +- Number Pages immediately before Static Sky set its cells per face in base 25. + Default 48; supported range 1–128, with zero and oversized inputs clamped. +- Resolution persists across travel/save/reload and synchronizes with clients. + Matching updated server/client builds are required. +- Static animation timing and tint remain independent; other skies are unchanged. +- Existing Static Sky/Number Pages and Creative/JEI descriptions are updated. +- Includes the previously validated desert vegetation changes from issue #108. + +Focused checks passed; GPU appearance awaits player validation. See [rules and tests](docs/STATIC_SKY_RESOLUTION.md). diff --git a/RELEASE_NOTES_1.21.1.0.6.md b/RELEASE_NOTES_1.21.1.0.6.md new file mode 100644 index 0000000..cecf3cb --- /dev/null +++ b/RELEASE_NOTES_1.21.1.0.6.md @@ -0,0 +1,15 @@ +# Rivencraft 1.21.1.0.6 + +Release for Minecraft 1.21.1 / NeoForge 21.1.264 / Java 21. +Requires Dynamic Dimensions AR Edition and Bad Packets. Use matching client/server builds. + +- Adds Native Caves, Native Nether and Native End Pages, selecting seeded regional biome pools independently of terrain. Includes recognized modded biomes. +- New ordinary Native Cave Ages exclude Nether tags and TerraBlender Nether regions. Explicit Nether biome authoring on Cave terrain remains supported. +- Trees add cacti in vanilla and tagged modded deserts, Huge Trees add tall cactus columns, and Flowers add dead bushes. Works on Flat terrain, including BOP Dryland and Lush Desert. +- Number Pages immediately before Static Sky set resolution in base 25: default 48, clamped to 1–128. Resolution saves and synchronizes with clients. +- New Pages appear in the biome generation Creative tab and optional JEI. Updated tooltips explain the new behavior. +- Saves freeze the selected biome family and IDs. Existing frozen pools and generated chunks are not rewritten. + +Player in-game checks passed for both supported Minecraft versions. Focused Native-family checks passed: 91 without biome mods, 94 with BOP/TerraBlender. Desert and Static Sky checks also passed. + +Writing examples: Link Panel → Terrain → Native Caves/Nether/End. Native is itself a biome controller; do not add a second distribution controller. diff --git a/docs/DESERT_VEGETATION.md b/docs/DESERT_VEGETATION.md new file mode 100644 index 0000000..ada108a --- /dev/null +++ b/docs/DESERT_VEGETATION.md @@ -0,0 +1,104 @@ +# Desert vegetation Pages — issue #108 + +Applies to Minecraft 1.21.1 and 26.3. Local test builds: **1.21.1.0.4** and +**26.3.0.7**. Minecraft 1.21.1 (including BOP Dryland) passed player validation. The 26.3 +Flat soil correction awaits player retest; not committed or published. + +## Classification + +The biome tag `rivencraft:desert_vegetation` includes vanilla Desert and the +optional common tag `c:is_desert`. No TerraBlender dependency or biome-ID +substring guessing is used. In the installed BOP 21.1.0.14 and 26.3.0.0.16 +assets, Dryland and Lush Desert have that common tag; Cold Desert does not. +Cold Desert therefore retains the ordinary non-desert behavior. Hot/dry +climate alone does not classify a biome as desert. + +Data packs can extend `data/rivencraft/tags/worldgen/biome/desert_vegetation.json` +with additional biome IDs using `replace: false`. The existing exclusion of +Nether/End/cave biomes for generic surface vegetation still applies. + +## Authored effects + +| Page | Desert effect per occurrence per chunk | +| --- | --- | +| Flowers | 16 attempts to place individual dead bushes | +| Trees | 8 attempts to place 1–3-block cactus columns | +| Huge Trees | 4 attempts to place 5–9-block cactus columns | + +Repeated Pages add independent, deterministic attempts within the existing +feature-page limit. Space and ground checks still apply: attempts are not a +guarantee of a fixed number of plants. Vanilla biome decoration runs normally +before authored vegetation. Non-desert candidates keep the existing vanilla +flower, plains-tree and old-growth-spruce features. + +Placement checks the actual candidate biome. Desert writes and neighbor reads +stay within the decorating chunk, leave existing structures/plants intact, and +require clear air. Cacti require horizontal clearance for their full height. +Sand/red sand are preserved. Supported dirt/grass can have just the cactus's +base converted to sand, permitting grass-layer Flat Ages without repainting +the terrain. Soil over an unsupported block is skipped to avoid falling bases. +Dead bushes can grow on supported sand/soil. Other materials are left alone. + +The 1.21.1 Flat generator now applies these three authored plant Pages too; +previously that path did not run them. Both versions use the same cactus/bush +placement algorithm; version-specific adapters retain their vanilla placement +APIs. No new item, recipe, generated texture or hard dependency is introduced. +Existing Creative/JEI Pages receive updated tooltip descriptions. + +## Saves + +Only newly decorated chunks change. Existing plants/chunks are not rewritten. +Saved written Page order/count and Age seed remain the inputs, with no new +saved plan field. Reopening/restarting retains the same placement inputs; +it does not rerun decoration on existing chunks. + +## Verification + +Run `python3 scripts/test_desert_vegetation.py` for storage-free checks of all +three effects, repeatability, repeated attempts, biome boundaries, chunk +bounds, invalid ground, obstruction, Flat base conversion and ceiling limits. +Temporary Java outputs are deleted. Test fixtures stay outside production JARs. + +### Player checks, both versions + +1. Create fresh Standard + Desert + Single Biome Ages with a Link Panel and + separately Flowers, Trees or Huge Trees. Use a no-feature control and a + four-copy version of each page; matching Age seeds improve comparisons. +2. Expect additional dead bushes, ordinary cacti, or visibly taller cactus + columns respectively. Repeated pages increase attempts; no generic + flowers/oak/spruce should be added by these pages in Desert. +3. Repeat on Flat + Desert + Single Biome, including the grass-layer surface. + Cactus bases may be single sand blocks; other Flat layers remain intact. +4. Repeat in BOP Dryland/Lush Desert when installed. Check nearby Plains and + Cold Desert keep their previous non-desert behavior. +5. Revisit after restart, then explore new chunks. Existing vegetation must + remain intact; new chunks should continue the selected behavior. +6. Check mixed-biome Ages and occupied/rocky surfaces: vegetation respects the + candidate biome, solid obstructions and ground rules. + +No test server or saved test world is required by the offline checks. If a +future runtime test stalls, stop it and hand it to the player without retry. + +## 26.3 Flat Dryland regression + +The saved `drybones` Age uses Flat terrain, Single BOP Dryland, and all three +plant pages. Its writing and runtime desert tags were correct. In Minecraft +26.3, `minecraft:dirt` no longer contains grass blocks; the old soil check +therefore rejected the grass surface. The 26.3 adapter now checks both +`minecraft:dirt` and `minecraft:grass_blocks`. No 1.21.1 code change was needed. + +An isolated 26.3 server with BOP, TerraBlender and GlitchCore reproduced zero +cactus blocks before the fix. With the same seed and pages, the corrected +first chunk contained 22 cactus blocks / 15 dead bushes in vanilla Desert and +12 cactus blocks / 17 dead bushes in BOP Dryland. These are one-seed observations, +not guaranteed densities. The test world and isolated build output were removed; +the retained log is `build/verification/desert108/mc263.log`. + +Run `python3 scripts/regression_desert263.py` for this optional-mod runtime +check using the local Dev 26.3 mod files. It uses the single-server lock and +a 60-second timeout, hands off a stalled test without retry, and removes its +temporary world regardless of result. + +## Release validation (2026-11-17) + +Player in-game checks passed. Included in releases 1.21.1.0.6 and 26.3.0.10 (Seamless integration applies to 26.3 only). Earlier candidate notes above describe development history. Known Reborn/Seamless acknowledgement and rendering failures remain tracked in [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); this release does not resolve them. diff --git a/docs/DUAL_VERSION_RELEASE.md b/docs/DUAL_VERSION_RELEASE.md index 1edb35f..8986c48 100644 --- a/docs/DUAL_VERSION_RELEASE.md +++ b/docs/DUAL_VERSION_RELEASE.md @@ -111,3 +111,7 @@ the Reborn acknowledgement guard. Both player checks passed; publication was explicitly authorized. Reborn is not crash-free: #118 remains open. #117 owns full Seamless support. #116 was user-closed as resolved. Prior dated evidence above remains historical; unchanged earlier artifacts are not relabeled. + +## 2026-11-17 release update + +Player-approved 1.21.1.0.6 and 26.3.0.10 collect #108 desert vegetation, #109 Static Sky resolution and #111 Native biome families. The 26.3 release also includes #117 optional Seamless live rendering. #118 remains open for Reborn/Seamless failures, including the recovered caves_on_top acknowledgement disconnect. Both JARs retain their player-tested hashes. diff --git a/docs/NATIVE_BIOME_FAMILIES.md b/docs/NATIVE_BIOME_FAMILIES.md new file mode 100644 index 0000000..4dece0a --- /dev/null +++ b/docs/NATIVE_BIOME_FAMILIES.md @@ -0,0 +1,139 @@ +# Native biome families — issue #111 + +Release builds: **1.21.1.0.6** and **26.3.0.10**. Player in-game validation passed on both versions (2026-11-17). + +## Pages and terrain + +| Controller Page | Biome selection | +| --- | --- | +| Native | Existing terrain default. On new Cave Ages, non-Nether cave biomes only. | +| Native Caves | All recognized non-Nether caves, using seeded regional placement. | +| Native Nether | All recognized Nether biomes, using seeded regional placement. | +| Native End | All recognized End biomes, using seeded regional placement. | + +The three explicit family controllers work with Standard, Amplified, Island, +Cave, Flat and Void terrain. The **Terrain Page still controls geometry**. +Void stays empty; its biomes can affect weather and seasons. These controllers +do not select a sky style, dimension type or season. + +The player chose **seeded regional layout including modded biomes** for Native +Nether/End, rather than vanilla climate or End-island placement. The family +controllers use the established Native Cave/Tiny regional scale (16-block +base cells), across the whole frozen family pool. A single available biome +uses a FixedBiomeSource. + +Native controllers select their own pool. Individual biome Pages before one +retain the existing conflict/recovery rule: the manual biome entries are +discarded and instability applies. To choose/weight individual Nether biomes +on Cave terrain, use Single/Tiled/region controllers as before. + +## Classification + +- Caves: `rivencraft:cave_biomes`, including optional `c:is_cave`, plus + recognized vanilla cave keys. 26.3 retains its new **Sulfur Caves** biome. +- Nether: `minecraft:is_nether` **or** membership in a TerraBlender Nether + region. No mod-specific name list or namespace heuristic is used. +- End: `minecraft:is_end` and known vanilla End members. TerraBlender exposes + Overworld and Nether regions, not an End region in either supported API. +- Nether classification wins over Cave tagging for Native Caves, including + a biome that belongs to a Nether region but lacks `is_nether`. +- TerraBlender's internal deferred placeholder is never a native-family biome. + +Family pools are sorted and deduplicated. Vanilla family members provide safe +fallbacks when broad tags are empty; Cave fallbacks are still checked against +Nether classification. A one-biome pool remains valid. If no cave family member +can be used at all, a registered non-Nether biome is the last-resort safety +fallback; an entirely unusable registry reports a binding error. + +The broader Cave-compatible authoring pool is preserved. Explicit Nether +biome Pages on Cave terrain remain legal and retain existing materials. +Other terrain eligibility and non-Native distributions are not filtered by +this new default-pool rule. + +## Random Ages and persistence + +Ordinary random-Age controller ranks remain unchanged. When random or +seed-completed writing resolves to Cave terrain + Native, its new pool excludes +Nether biomes. The new family Pages are explicit authoring choices; they are +not added as extra rank tickets to the random controller deck. + +The selected family is saved separately from the existing NATIVE distribution +enum, so seeded distribution ordinals/ranks do not change. + +- Authored 1.21.1 plans save optional `NativeKind` with their frozen biome IDs. +- New random Native Cave Ages in 1.21.1 generation version **18** also save + `RandomBiomes` in the Age definition. Spawn updates and reseeding retain it. +- 26.3's existing frozen biome plan saves optional `native_kind`. Random Native + Cave Ages now explicitly freeze the CAVES family. +- Missing family fields on old saves mean TERRAIN and **do not re-filter the + old list**. Existing frozen Cave pools containing Nether biomes are preserved. +- Unplanned generation-16/17 Native Cave Ages retain their prior broad pool + algorithm; older Ages retain their existing legacy generator. They are not + silently migrated to the new family default. +- Regions use the Age seed; reseeding can change spatial placement in future + chunks while retaining the selected IDs. Existing chunks are not rewritten. + +On 26.3, authored noise-terrain generation can now construct a vanilla noise +baseline when the primary Overworld is Flat/custom rather than a Noise generator. +This allows the independent Native-family/terrain pairing in that setup instead +of failing with “Overworld generator cannot accept authored noise settings.” +The existing path for an ordinary noise Overworld is unchanged. Issue #115's +separate material-abundance baseline work is not completed by this fix. + +## Creative, JEI and loot policy + +All three new JSON-backed controllers enter the existing **biome generation** +Creative category and optional JEI page feed. Glyphs use the existing component +renderer and poems; no new generated texture or recipe is needed. +Native/Cave tooltips explain the default-pool rule. + +Page allow/block lists categorize the new IDs as biome controllers, separately +from individual biome IDs. Manual authoring is still unaffected by those lists. +Normal library eligibility can expose the new Pages; Age-only loot uses the +Age's own written/result Pages. + +## Verification + +Run one target at a time: + +```sh +python3 scripts/regression_native111.py mc1211 +python3 scripts/regression_native111.py mc263 +python3 scripts/regression_native111.py mc1211 --biome-mods +python3 scripts/regression_native111.py mc263 --biome-mods +``` + +The optional-mod checks use the installed Dev instance's BOP/TerraBlender/ +GlitchCore JARs. Every run uses the host-wide server lock, a new temporary +world, isolated fixture output and a 60-second stall handoff. Worlds and fixture +outputs are deleted on pass or fail; logs remain in +`build/verification/native111/`. The fixture code is not shipped in the mod +or added to the default GameTest deck. + +Results: **91 checks per version without biome mods; 94 per version with +BOP/TerraBlender**. Coverage includes: + +- All three explicit family controllers on all six terrains. +- Explicit Native, seed-completed Native and random Native Cave selection. +- Overlapping Cave/Nether tags, region-only Nether membership, empty-tag + fallback, a valid single-cave saved pool and optional-mod absence. +- Explicit Crimson Forest + Cave + Single authoring. +- Frozen plan/codec and root random-Age registry save/load behavior. +- Preservation of an older mixed Cave/Nether snapshot without a family field. +- Controller-policy categories, last-controller recovery, and new Creative/JEI index entries. +- 26.3 runtime source overrides on Standard, Void and Cave, including a Flat + primary world. Actual world appearance remains player validation. + +### Player checks — both versions + +1. Create **Cave + Native** Ages and explore: no Nether biomes should be selected. + Revisit after restart; the chosen cave pool should remain stable. +2. Try Native Caves, Native Nether and Native End with Standard or Flat terrain. + Confirm their biome IDs and normal travel, including optional BOP biome IDs. +3. Try those family Pages on Void terrain: no terrain should be added solely + by the controller. Biome-based weather/season behavior can still apply. +4. Create **Cave + Crimson Forest + Single** to confirm explicit Nether authoring + still works. Native End on Cave should also bind through the explicit family. +5. Verify all three Pages appear under biome generation in Creative and JEI. +6. Reopen an older Native Cave Age if available. Its saved mixed pool is kept; + create a new Age to test the new default rather than expecting migration. diff --git a/docs/PUBLISHING_APIS.md b/docs/PUBLISHING_APIS.md index 6c2efb6..f5bfbec 100644 --- a/docs/PUBLISHING_APIS.md +++ b/docs/PUBLISHING_APIS.md @@ -1,10 +1,7 @@ # Publishing Rivencraft with the Gitea, Modrinth, and CurseForge APIs The local helper is [`scripts/publish_mod_sites.py`](../scripts/publish_mod_sites.py). -It previews a release unless `--publish` is explicitly supplied. The current -configuration is for the Minecraft **26.3** artifact only. The 1.21.1 line needs -its required external dependencies mapped on both sites before API publishing -is enabled for it. +It previews a release unless `--publish` is explicitly supplied. Both Minecraft **1.21.1** and **26.3** are supported. The publisher maps required Dynamic Dimensions AR Edition and Bad Packets dependencies for 1.21.1; 26.3 uses its first-party backend. ## One-time token setup diff --git a/docs/PUBLISHING_DESCRIPTION.md b/docs/PUBLISHING_DESCRIPTION.md new file mode 100644 index 0000000..cee0eaf --- /dev/null +++ b/docs/PUBLISHING_DESCRIPTION.md @@ -0,0 +1,61 @@ +# Rivencraft + +*Write a book. Name an Age. Step into a world that did not exist before.* + +Rivencraft brings the book-writing and dimension-travelling spirit of Mystcraft to **Minecraft 1.21.1 and Minecraft 26.3 on NeoForge**. Collect and arrange Symbol Pages to author an Age, or bind a Link Panel alone to discover a random world. Explore libraries, build crystal portals, and contend with instability when your writing asks too much of an Age. + +Rivencraft is an independent community project inspired by Mystcraft Legacy—not an official Mystcraft release or a byte-for-byte copy. + +## Minecraft versions + +Rivencraft is available for **Minecraft 1.21.1 and 26.3**. Both versions include authored and random Ages, Symbol Pages, writing stations, libraries, crystal portals, and instability. Download the file matching your Minecraft version and install matching builds on clients and servers. + +| Minecraft | NeoForge | Java | Required companion mods | +| --- | --- | --- | --- | +| **1.21.1** | 21.1.264 or newer in the 21.1 line | **21** | Dynamic Dimensions AR Edition and Bad Packets | +| **26.3** | 26.3.0.99 | **25** | None; Rivencraft includes its own Age-loading backend | + +The Minecraft tracks use separate builds and saves. Cross-version world migration is not supported. + +See the [installation guide](https://git.paddedcell.org/dnorberg/rivencraft/wiki/Installation), [26.3 guide](https://git.paddedcell.org/dnorberg/rivencraft/src/branch/main/ports/mc263/README.md), and [latest releases](https://git.paddedcell.org/dnorberg/rivencraft/releases). + +## What you can do + +- Write Descriptive Books with pages for terrain, biomes, weather, seasons, sky colors, celestials, structures, decorations, and more. +- Explore randomly generated Ages and discover pages in Age libraries. +- Store and arrange pages in Notebooks; copy pages at the Writing Desk with paper and ink. +- Travel with Linking Books, Book Stands, and crystal-frame portals. +- Experience Legacy-inspired instability, including decay and environmental hazards. +- Preview destinations with the built-in Legacy-style animation or an optional rendering integration for your Minecraft version. +- Set an Age’s water level with Flooded and Number Pages. +- Select Native Caves, Nether or End biome pools independently of terrain, grow desert vegetation with Trees/Huge Trees/Flowers, and control Static Sky resolution with Number Pages. + +## Getting started + +1. Craft an Ink Vial, Ink Mixer, Writing Desk, and Book Binder. +2. Put paper and ink in the Ink Mixer to make a Link Panel Page. Modifier ingredients can change how the link behaves. +3. Put leather or an empty Notebook and the Link Panel in the Book Binder. Name the Age and take its Descriptive Book. Add Symbol Pages to author the Age; a Link Panel alone creates a seeded random Age. +4. Open the book, then click its destination preview to travel. Bring a bound Linking Book for the return trip—automatic Return Links are disabled by default. + +## Installation and optional integrations + +For **Minecraft 1.21.1**, install **[Dynamic Dimensions AR Edition 0.9.1](https://www.curseforge.com/minecraft/mc-mods/dynamicdimension-ar-edition)** and **[Bad Packets 0.8.2](https://www.curseforge.com/minecraft/mc-mods/badpackets)** alongside Rivencraft on clients and servers. **Minecraft 26.3 does not require either companion mod.** + +Optional integrations include **JEI**, **TerraBlender** and compatible biome mods such as Biomes O’ Plenty, **Serene Seasons** with GlitchCore, and **Ruins**. Use each integration’s Minecraft-specific files. Rivencraft’s core gameplay works without these optional mods. Ecliptic Seasons is not currently supported. + +Destination previews depend on the Minecraft version: + +- **1.21.1:** optional Create/Ponder snapshots or Immersive Portals live views. +- **26.3:** optional **Immersive Portals Reborn or Seamless Portals** live book and crystal-portal views, including look-only exploration inside the book panel. Install only one fork per instance. **Known Reborn/Seamless crashes and travel disconnects remain under investigation:** [issue #118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118). + +Built-in animated previews remain available without a portal renderer. Create/Ponder scenes are not currently included in the 26.3 build. + +Back up the **entire world folder** before changing versions, data packs, or biome mods. Age definitions and dimension data must be restored together. + +## Community, issues, and wiki + +Rivencraft is developed at [BlackSheep Git](https://git.paddedcell.org/dnorberg/rivencraft). Please [report bugs or suggest features](https://git.paddedcell.org/dnorberg/rivencraft/issues) there. Want to help document Ages, pages, and crafting? Visit the [Rivencraft wiki](https://git.paddedcell.org/dnorberg/rivencraft/wiki) to contribute, or open an issue with guide ideas and corrections. + +## Thanks and attribution + +Heartfelt thanks to **XCompWiz**, the original creator of Mystcraft, for making such a wonderful mod and inspiring years of exploration and creative world-writing. Please visit the original [Mystcraft](https://www.curseforge.com/minecraft/mc-mods/mystcraft) and his early, unfinished [Mystcraft 2](https://www.curseforge.com/minecraft/mc-mods/mystcraft-2). Rivencraft is independent and is not endorsed by the original Mystcraft team. Selected Legacy-derived assets are credited in the project's NOTICE and asset-provenance document. Rivencraft is licensed under LGPL-3.0-or-later. diff --git a/docs/SEAMLESS_PORTALS.md b/docs/SEAMLESS_PORTALS.md new file mode 100644 index 0000000..4b68d7c --- /dev/null +++ b/docs/SEAMLESS_PORTALS.md @@ -0,0 +1,136 @@ +# Optional Seamless Portals integration — issue #117 + +Local candidate **26.3.0.9**, Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25. +Pending real-client validation; not committed or published. Minecraft 1.21.1 +is unchanged by this issue. + +## Supported engines and API boundary + +Install **one** portal fork per instance: + +- Seamless Portals **1.0.0**, installed file `seamlessportals-neoforge-1.0.0.jar`. +- Immersive Portals Reborn **7.0.12**, retaining its previously implemented path. +- Neither: Rivencraft's animated panels/surfaces and ordinary travel remain. + +The actual installed Seamless JAR was inspected and compiled against, not +assumed compatible from its name. Used public GUI rendering, WorldRenderInfo +builder, chunk-loader and PortalAPI signatures match Reborn. ClientWorldLoader +and Portal have additional fork-specific members; Rivencraft does not use those +differences for live views. The native dimension adapter still uses each fork's +own `DimIdSyncPacket.createFromServer` factory and wire format. + +The existing Reborn implementation has been renamed into shared +`ImmersiveBookPreviews`, `ImmersivePreviewChunks`, `ImmersiveLiveBookPanel`, +`ImmersiveCrystalPortals` and `ImmersiveCrystalView` classes. No second copy +of the rendering, destination, chunk-stream or mesh algorithms was introduced. +Optional API references remain behind availability guards; neither fork is +bundled or required. + +The Reborn acknowledgement workaround is still **Reborn-only**. This change +does not resolve or establish a root cause for the Reborn crashes in +[#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118). + +## Configuration + +In `config/rivencraft-local.toml`: + +```toml +[book_previews] +seamless_live_views = true +seamless_crystal_live_views = true +reborn_live_views = true +reborn_crystal_live_views = true +``` + +The active fork uses its own switches. The existing Reborn preferences keep +their meanings; Seamless defaults to enabled. Book views are a local client +choice. Crystal views are server-controlled. Disable the relevant switch for +animated fallback; portal/book travel remains Rivencraft's responsibility. + +## Books + +Both Linking and Descriptive Books request a rotating live destination panel. +Stand books get the panel without exploration. The handheld eye enters +look-only exploration inside the book window; movement is disabled, and +right-click returns to ordinary book controls. The camera starts at the linked +arrival eye position. Missing/unready destination chunks retain the animation. + +Each player has one validated preview stream, tied to source world, held or +stand book and session UUID. Requests are rate limited. A 30-second lease is +renewed by the open book and released on close, logout, dimension changes, +invalid source book, expiry and shutdown. Late responses cannot overwrite a +newer book session. + +Only one GUI render target task is queued at once. The target stays alive +across deferred GUI frames rather than being destroyed while still referenced. +The shared engine hook clears the remote target before rendering and restores +the player's local camera afterward. Remote book-world sounds are filtered; +source rain/audio and camera restoration remain explicit player checks. + +## Crystal portals + +Native portals are render-only: Rivencraft portal cells retain travel, +cooldowns, link properties and destination safety rules. Connected cells are +grouped into one coplanar masked mesh per side of an opening, not repeated +per-block views. The linked standing eye position maps through the native +transform onto the actual destination eye position; the frame sits in front +of the live view. + +A complete native surface disables the fallback texture. Missing/disabled +native views retain it. Receptacle maintenance restores views after reload; +book removal/frame shutdown removes native entities. Existing ownership tags +are preserved so maintenance can find saved views rather than duplicate them. + +## Automated and player validation + +The isolated `scripts/regression_portal117.py` probe accepts `none`, +`seamless --jar /path/to/seamless.jar`, or `reborn`. Run each separately; +the host-wide server lock prevents overlap. Every run uses a new temporary +world, removes it and fixture outputs regardless of result, and retains a log +under `build/verification/portal117/`. A 60-second stall is stopped and handed +to the player without retry. + +The fixture explicitly warms a forced test chunk before querying native +entities. An unticked startup chunk does not expose its entities through the +normal spatial query. Portal widths/heights use the engine's W/H axes, which +can swap relative to world X/Y; assertions check world-space spans and the +actual eye transform. + +Final sequential server results: **24 checks passed with Seamless, 24 with +Reborn, and 8 with neither**. Earlier fixture assertions were corrected for +entity-section visibility and native axis ordering; no stalled run was retried. + +Server checks cover dynamic Age registration/catalog synchronization, six-cell +frame formation, one mesh per side, correct physical spans, exact eye mapping, +non-teleporting/non-interactive native surfaces, refresh reuse, config fallback, +reactivation and cleanup. They do **not** verify GPU output, connected preview +leases, multiplayer packet delivery, or real-client restart behavior. + +### Required player matrix + +Use Seamless alone with Rivencraft 26.3.0.9 on both ends: + +1. Bind a new Descriptive Book, open/close it repeatedly and link through it. + Compare the live view with the real destination. +2. Test a Linking Book and a stand book. Confirm the panel stays inside the + book and stands have no eye exploration. +3. Enter handheld exploration, look around, right-click out, re-enter, close + and reopen. Confirm no movement or full-screen view, and local rain/audio + remain correct. +4. Form a multi-block crystal opening. Check one continuous view, frame + occlusion, no fallback overlay, matching arrival position/facing, and travel. +5. Remove/reinsert the book and break/rebuild the frame; no orphan views. +6. Reconnect and fully restart. Check saved books, previews and portal + reactivation, including initially unloaded destination chunks. +7. Explore across chunk boundaries for a sustained period. Do not assume + Seamless is free of the Reborn renderer problem without testing. +8. On a dedicated server, check two players using different books/portals, + closing/logging out independently, and creating a new Age after joining. +9. Disable each Seamless switch and verify its animated fallback and normal + travel. No portal mod and Reborn are separate regression configurations. + +Inspected Seamless artifact SHA-256: `5d2bfc2a811a6526e3f6722c521d97e5de2869a6ead1c681323c3c472e4367a0`. + +## Release validation (2026-11-17) + +Player in-game checks passed. Included in releases 1.21.1.0.6 and 26.3.0.10 (Seamless integration applies to 26.3 only). Earlier candidate notes above describe development history. Known Reborn/Seamless acknowledgement and rendering failures remain tracked in [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); this release does not resolve them. diff --git a/docs/STATIC_SKY_RESOLUTION.md b/docs/STATIC_SKY_RESOLUTION.md new file mode 100644 index 0000000..4ff6eff --- /dev/null +++ b/docs/STATIC_SKY_RESOLUTION.md @@ -0,0 +1,102 @@ +# Static Sky resolution — issue #109 + +Local test builds: **Minecraft 1.21.1 / 1.21.1.0.5** and **Minecraft 26.3 / +26.3.0.8**. Pending player validation; not committed or published. + +## Authoring + +Place one or more Number Pages **immediately before Static Sky**. Digits are +0–24 in base 25, as with Flooded. No Number Pages means the existing **48 × 48 +cells on each of six faces**. + +| Written sequence | Resolution on each face | +| --- | --- | +| Static Sky | 48 × 48 | +| Number 0 → Static Sky | 1 × 1 (minimum) | +| Number 8 → Static Sky | 8 × 8 | +| Number 24 → Static Sky | 24 × 24 | +| Number 1 → Number 23 → Static Sky | 48 × 48 | +| Number 5 → Number 3 → Static Sky | 128 × 128 (maximum) | +| Number 24 → Number 24 → Static Sky | 128 × 128 (624 clamps) | + +Any intervening non-number Page breaks the digit run. A Number followed by a +color still modifies that color, not the later sky. Other Sky styles do not +consume resolution numbers. Duplicate Sky controllers retain the existing +last-choice recovery and instability rules; the final unnumbered Static Sky +returns to 48. Dangling/misplaced numbers retain their usual diagnostics. + +Higher values make smaller cells. Resolution does not change the animation +cadence, colors, celestial geometry, terrain or lighting. Random/unmodified +Static Ages retain 48; no new Page or recipe is added. Creative and JEI use +the existing Static Sky and Number items, with updated tooltips. + +## Persistence and synchronization + +- **1.21.1:** derive resolution from the persisted ordered semantic writing, + include it in AgeSkyProfile and its server-to-client sky payload. +- **26.3:** freeze resolution in the existing presentation settings record + (PortAgeColors), save optional `static_resolution` in the Age index and + synchronize it with the full Age catalog. Old records without the field + default to 48. +- Require matching updated client/server builds: sky payload protocol is 19 + on 1.21.1 and Age catalog protocol is 12 on 26.3. +- No existing chunks or writing are rewritten. Existing unnumbered Static + Ages retain their old appearance. Save/revisit/reconnect/restart preserve + newly authored settings. + +## Render bounds and lifecycle + +Shared bounds are **1–128** cells per face, including the constructors and +client render entry points. Long digit runs saturate safely before clamping. + +The 1.21.1 procedural renderer draws at most 98,304 quads (393,216 vertices), +roughly 6 MiB of position/color vertex data per draw. The bound limits its +existing per-cell work; the normal 48 setting is unchanged. + +The 26.3 renderer keeps one 24-vertex cube. Its current noise atlas is at most +768 × 128 RGBA pixels (384 KiB of image data). It creates a replacement only +when the extracted resolution changes, closes the previous texture, invalidates +the frame/tint cache, and reuses the cube. World metadata is read during +extraction, never during drawing. Extracted state resets to 48; renderer close +releases both GPU resources. No growing per-Age texture cache is introduced. + +## Automated checks + +Run separately, sequentially: + +```sh +python3 scripts/regression_static109.py mc1211 +python3 scripts/regression_static109.py mc263 +``` + +These use the server lock, isolated startup fixtures and new temporary worlds, +with a 60-second stall handoff. They delete worlds and fixture outputs on +success or failure and retain logs in `build/verification/static109/`. +The probes do not enter the production JAR or default GameTest suite. + +Results: 34 checks passed on 1.21.1 and 42 on 26.3 for unmodified/default, +zero, single and multi-digit writing, bounds, ordering, saved plan/codec and +full packet/catalog round trips, independent color, old-save defaults, +non-Static behavior and unchanged Flooded digit grammar. Actual GPU appearance +and preview interactions remain player checks. + +## Player checks — both versions + +1. Bind fresh Ages with Static Sky alone, Number 8 + Static Sky, Number 24 + + Static Sky, and Number 5 + Number 3 + Static Sky. Prefer the same remaining + Pages and an explicit celestial choice to make comparison straightforward. +2. Look up, down and around: all six faces should show the selected cell size + and keep animating. The plain book retains the previous fine static. +3. Check Number 0 gives the coarse minimum. Compare Number 1 + Number 23 to the + unnumbered default. Oversized values clamp instead of crashing. +4. Add numbered color Pages before the resolution digits; verify the tint and + resolution work independently. +5. Travel between different-resolution Ages, the Overworld and a non-Static + Age. Check book/portal destination views with the installed optional renderer + for leaked settings. +6. Revisit, reconnect and restart; the selected resolution must persist. + Update both ends if using a dedicated server. + +## Release validation (2026-11-17) + +Player in-game checks passed. Included in releases 1.21.1.0.6 and 26.3.0.10 (Seamless integration applies to 26.3 only). Earlier candidate notes above describe development history. Known Reborn/Seamless acknowledgement and rendering failures remain tracked in [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118); this release does not resolve them. diff --git a/docs/WRITING_GRAMMAR.md b/docs/WRITING_GRAMMAR.md index 8ceae78..bf154fc 100644 --- a/docs/WRITING_GRAMMAR.md +++ b/docs/WRITING_GRAMMAR.md @@ -23,3 +23,16 @@ Crystal Formations are an authored, material-free feature on exposed solid terra Star Fissures are a material-free feature on every terrain profile, including Cave and Void. The fissure is generated once beside the first resolved spawn, using Legacy's spawn-chunk offset and 10–17 paired, irregular X-span rows running along +Z. Legacy's y=0 portal floor maps to the modern dimension's minimum build height, replacing lower bedrock if present. The rift opens to the sky on ordinary terrain; in Cave terrain it opens into the cavern but stops below the upper bedrock roof. Water in the carved columns is cleared before the portal is placed. Its non-solid portal links to the Overworld spawn with the Legacy fissure sound; the animated starfield is drawn with Minecraft's current End Portal renderer, which uses the same end-sky/end-portal art as Legacy's custom renderer. Random Ages sample Legacy's default small-feature grammar for fissure selection: the stop/one/repeat branches have rank-derived weights 1:1:3, and the fissure has weight 1 of 9 among its small-feature rules. The remainder of random feature selection still follows Rivencraft's current pipeline, rather than running Legacy's entire Age grammar. The Rivencraft symbol-page creative tabs read a generated index of bundled symbol definitions and group Pages by each definition's category, except biome-controller roles, which appear in a separate Biome Generation tab rather than the Biome tab. Adding another valid JSON symbol under `src/main/resources/data/rivencraft/rivencraft/symbols/` includes its page in the matching category tab on the next build; a new bundled category receives its own tab. Registry-derived Block and Fluid Pages have separate tabs and both appear in optional JEI. Registry-derived biome pages share a creative/JEI feed; `terrablender:deferred_placeholder` is excluded because it is TerraBlender's internal staging biome, not a player-facing biome choice. Other modded biomes remain listed. Link Pages have a separate tab. Blank Pages appear in neither the creative tabs nor JEI's ingredient list. The server catalog still decides whether a page is valid for writing. External server data-pack symbols are not included in this bundled index. + +## Static Sky resolution (issue #109) + +Adjacent Number Pages before Static Sky form a base-25 cell count per face. +Default 48, bounded 1–128; zero clamps to 1. Other sky styles do not consume +resolution numbers. See [Static Sky resolution](STATIC_SKY_RESOLUTION.md). + +## Native biome families (issue #111) + +Native Caves, Native Nether and Native End are singular biome controllers, +usable on any Terrain Page. They choose a frozen family pool in seeded regions; +individual biome Pages retain Native conflict recovery. New ordinary Native Cave +pools exclude Nether tags/regions. See [family rules](NATIVE_BIOME_FAMILIES.md). diff --git a/gradle.properties b/gradle.properties index 5d7ec39..06481bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,7 +36,7 @@ mod_name=Rivencraft # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=LGPL-3.0-or-later # Minecraft.release-slice.iteration; independent of the 26.3 release track. -mod_version=1.21.1.0.3 +mod_version=1.21.1.0.6 immersive_portals_version=6.0.7 terrablender_version=4.1.0.8 serene_seasons_version_id=pHEgQQUE diff --git a/ports/mc263/README.md b/ports/mc263/README.md index db5b472..e6a06b2 100644 --- a/ports/mc263/README.md +++ b/ports/mc263/README.md @@ -1,24 +1,27 @@ # Minecraft 26.3 -The current **Minecraft 26.3 release is 26.3.0.5**, for NeoForge 26.3.0.99 and +The current **Minecraft 26.3 release is 26.3.0.10**, for NeoForge 26.3.0.99 and Java 25. It uses Rivencraft's first-party Age backend, with no Dynamic Dimensions or Bad Packets dependency. The writing loop, authored/seeded Ages, generation features, weather/skies/celestials, libraries, crystal portals, live instability, and Link Modifier controls are ported. JEI, TerraBlender/Biomes O' Plenty, Serene Seasons/GlitchCore and Ruins are optional. -Immersive Portals Reborn 7.0.12 optionally supplies rotating live book previews -and continuous crystal portal views. Built-in animations and normal travel remain -available without it. Random-page eligibility and glyph descriptions are included. -Use one portal fork per instance. The server controls crystal live views through -`book_previews.reborn_crystal_live_views`; clients can disable live book views -with `book_previews.reborn_live_views` in `rivencraft-local.toml`. -**Known Reborn crashes:** [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118) -tracks the world-reset acknowledgement problem and an unresolved null-section -rebuild crash during exploration. 26.3.0.5 mitigates the acknowledgement gap; -it does not fix the section rebuild crash. The earlier Static Sky issue #116 -was closed after the user reported it resolved. Full Seamless live-view support -is tracked in [#117](https://git.paddedcell.org/dnorberg/rivencraft/issues/117). +Immersive Portals Reborn 7.0.12 or Seamless Portals 1.0.0 optionally supplies +rotating live book previews, look-only exploration and continuous crystal portal +views. Install only one fork per instance. Built-in animations and normal travel +remain available without either. Independent settings under book_previews control +each fork's live book and crystal views. + +**Known portal-mod failures:** [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118) +tracks Reborn section-rebuild crashes and Reborn/Seamless acknowledgement disconnects +during travel. Rejoining recovered the observed Seamless Age-loading disconnect. +This release does not fix those failures. See [integration details](../../docs/SEAMLESS_PORTALS.md). + +Native Caves/Nether/End Pages, desert vegetation and Number-controlled Static Sky +resolution passed player checks on both supported versions. Native controls select +their own seeded biome pool independently of terrain. Write Link Panel → Terrain +→ one Native choice. See [family rules](../../docs/NATIVE_BIOME_FAMILIES.md). The port feature and acceptance review is recorded in [the parity review](../../docs/MC263_PARITY_REVIEW.md). Book exploration matches @@ -26,7 +29,7 @@ The port feature and acceptance review is recorded in movement is disabled. The final dedicated-server restart/return check passed. Create/Ponder scenes are not ported to this target. Use matching client/server builds, keep saves separate from 1.21.1 and back up before updating. -See [release notes](RELEASE_NOTES_26.3.0.5.md). +See [release notes](RELEASE_NOTES_26.3.0.10.md). Flooded Environment Pages now fill Cave and other terrain to Y=63 by default, or the absolute base-25 Number Pages immediately before Flooded. Both-version diff --git a/ports/mc263/RELEASE_NOTES_26.3.0.10.md b/ports/mc263/RELEASE_NOTES_26.3.0.10.md new file mode 100644 index 0000000..cc913a3 --- /dev/null +++ b/ports/mc263/RELEASE_NOTES_26.3.0.10.md @@ -0,0 +1,19 @@ +# Rivencraft 26.3.0.10 + +Release for Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25. +Uses Rivencraft's first-party Age backend. Use matching client/server builds. + +- Adds Native Caves, Native Nether and Native End Pages, selecting seeded regional biome pools independently of terrain. Includes recognized modded biomes and 26.3 Sulfur Caves. +- New ordinary Native Cave Ages exclude Nether tags and TerraBlender Nether regions. Explicit Nether authoring remains supported. +- Authored noise terrain can use a vanilla noise baseline when the primary Overworld uses Flat/custom generation. +- Trees add cacti in vanilla and tagged modded deserts, Huge Trees add tall cactus columns, and Flowers add dead bushes. Fixes Flat grass-surface placement in BOP Dryland. +- Number Pages immediately before Static Sky set resolution in base 25: default 48, clamped to 1–128. Resolution persists and synchronizes; the renderer releases replaced textures. +- Enables optional Seamless Portals 1.0.0 live book previews, look-only book exploration and continuous crystal-portal views. Install only one portal fork. +- Adds independent seamless_live_views and seamless_crystal_live_views configuration options. Animated previews and ordinary travel remain available without an optional renderer. +- New Pages enter the biome generation Creative/JEI feeds. Existing frozen pools and generated chunks are not rewritten. + +Player in-game checks passed. Native-family checks passed: 91 without biome mods, 94 with BOP/TerraBlender. Optional-portal server probes passed sequentially: Seamless 24, Reborn 24, neither 8. + +Known issue: [#118](https://git.paddedcell.org/dnorberg/rivencraft/issues/118) tracks Reborn renderer crashes and Reborn/Seamless acknowledgement disconnects during travel. A Seamless disconnect occurred loading “caves on top”; rejoining loaded the Age successfully. This release does not fix that failure. Disable optional live views or remove the optional renderer if needed. + +Writing examples: Link Panel → Terrain → Native Caves/Nether/End. Native is itself a biome controller; do not add a second distribution controller. diff --git a/ports/mc263/RELEASE_NOTES_26.3.0.6.md b/ports/mc263/RELEASE_NOTES_26.3.0.6.md new file mode 100644 index 0000000..50dc783 --- /dev/null +++ b/ports/mc263/RELEASE_NOTES_26.3.0.6.md @@ -0,0 +1,13 @@ +# Rivencraft 26.3.0.6 + +Local test build for issue #108; pending player validation and explicit publication. + +- Trees add ordinary cacti in vanilla and tagged modded deserts. +- Huge Trees add tall 5–9-block cactus columns; Flowers add dead bushes. +- Repeated pages add seeded attempts; normal biome decoration remains. +- Uses common `c:is_desert` via a data-pack-extensible Rivencraft tag. BOP + Dryland/Lush Desert are included; Cold Desert is unchanged. +- Candidate biome, air, ground and bounds checks protect existing blocks. +- Existing chunks are not rewritten. Creative/JEI tooltips describe the behavior. + +Shared placement checks passed. See [desert vegetation rules](../../docs/DESERT_VEGETATION.md). diff --git a/ports/mc263/RELEASE_NOTES_26.3.0.7.md b/ports/mc263/RELEASE_NOTES_26.3.0.7.md new file mode 100644 index 0000000..ef421a4 --- /dev/null +++ b/ports/mc263/RELEASE_NOTES_26.3.0.7.md @@ -0,0 +1,14 @@ +# Rivencraft 26.3.0.7 + +Local test build for issue #108; pending player retest and explicit publication. + +- Includes the desert Trees, Huge Trees and Flowers page behavior from 26.3.0.6. +- Fixes cactus placement on Flat grass surfaces in BOP Dryland and other tagged + deserts: Minecraft 26.3 splits dirt and grass-like soils into separate tags. +- Keeps existing plants/blocks and normal biome decoration; old generated + chunks are not rewritten. +- The isolated BOP/TerraBlender server probe reproduced the failure, then + confirmed cactus and dead-bush placement with the corrected ground rule. +- Minecraft 1.21.1.0.4 passed player validation and is unchanged by this fix. + +See [desert vegetation rules](../../docs/DESERT_VEGETATION.md). diff --git a/ports/mc263/RELEASE_NOTES_26.3.0.8.md b/ports/mc263/RELEASE_NOTES_26.3.0.8.md new file mode 100644 index 0000000..547f407 --- /dev/null +++ b/ports/mc263/RELEASE_NOTES_26.3.0.8.md @@ -0,0 +1,16 @@ +# Rivencraft 26.3.0.8 + +Local test build for Minecraft 26.3; pending player validation and explicit publication. + +- Number Pages immediately before Static Sky set its cells per face in base 25. + Default 48; supported range 1–128, with zero and oversized inputs clamped. +- Resolution persists across travel/save/reload and synchronizes with clients. + Matching updated server/client builds are required. +- Static animation timing and tint remain independent; other skies are unchanged. +- Existing Static Sky/Number Pages and Creative/JEI descriptions are updated. +- Includes the previously validated desert vegetation changes from issue #108. + +The 26.3 renderer reuses its cube, resizes only the current noise texture, +and releases the previous texture on resolution changes. + +Focused checks passed; GPU appearance awaits player validation. See [rules and tests](../../docs/STATIC_SKY_RESOLUTION.md). diff --git a/ports/mc263/RELEASE_NOTES_26.3.0.9.md b/ports/mc263/RELEASE_NOTES_26.3.0.9.md new file mode 100644 index 0000000..cb40e2f --- /dev/null +++ b/ports/mc263/RELEASE_NOTES_26.3.0.9.md @@ -0,0 +1,23 @@ +# Rivencraft 26.3.0.9 + +Local candidate for Minecraft 26.3 / NeoForge 26.3.0.99 / Java 25. +Pending player validation and explicit publication. + +- Enables optional Seamless Portals 1.0.0 live rotating Linking/Descriptive Book + panels and handheld look-only exploration, reusing the established renderer. +- Enables continuous masked crystal portal views through the same adapter, + with Rivencraft retaining teleportation and link-property handling. +- Adds independent `seamless_live_views` and `seamless_crystal_live_views` + options under `book_previews`. Existing Reborn options remain unchanged. +- Shares preview leases, camera/audio restoration and portal maintenance across + the two optional forks. Install only one fork per instance. +- Retains animations/ordinary travel without a renderer or when disabled. +- Keeps the Reborn acknowledgement workaround Reborn-only. Known Reborn + renderer crashes in issue #118 are not fixed by this release. +- Includes the validated desert vegetation and Static Sky resolution changes + from issues #108 and #109. + +Sequential focused server checks pass: Seamless 24, Reborn 24, no portal mod 8. +Actual client rendering and multiplayer/restart behavior await player validation. + +See [Seamless integration and manual checks](../../docs/SEAMLESS_PORTALS.md). diff --git a/ports/mc263/build.gradle b/ports/mc263/build.gradle index 82678bc..21e432a 100644 --- a/ports/mc263/build.gradle +++ b/ports/mc263/build.gradle @@ -249,6 +249,7 @@ tasks.named('processResources', ProcessResources).configure { include 'assets/rivencraft/models/block/decay_*.json' include 'assets/rivencraft/textures/block/decay_*.png' include 'data/rivencraft/tags/block/decay_protected.json' + include 'data/rivencraft/tags/worldgen/biome/desert_vegetation.json' include 'assets/rivencraft/sounds.json' include 'assets/rivencraft/sounds/**/*.ogg' include 'assets/rivencraft/textures/item/crystal_shard.png' diff --git a/ports/mc263/gradle.properties b/ports/mc263/gradle.properties index 83542ce..254d275 100644 --- a/ports/mc263/gradle.properties +++ b/ports/mc263/gradle.properties @@ -7,7 +7,7 @@ neo_version=26.3.0.99 mod_id=rivencraft mod_name=Rivencraft mod_license=LGPL-3.0-or-later -mod_version=26.3.0.5 +mod_version=26.3.0.10 jei_version=31.17.0.109 diff --git a/ports/mc263/port_en_us.json b/ports/mc263/port_en_us.json index e4508d9..2b0bbf5 100644 --- a/ports/mc263/port_en_us.json +++ b/ports/mc263/port_en_us.json @@ -11,10 +11,8 @@ "symbol.rivencraft.sky.overworld.description": "Use the native Overworld sky. Terrain and lighting remain independently authored.", "symbol.rivencraft.sky.nether.description": "Use a Nether-style reddish fog backdrop. Authored celestials render over it; terrain and gameplay rules remain independent.", "symbol.rivencraft.sky.end.description": "Use the native End sky backdrop with authored celestials over it, without End terrain or a dragon fight.", - "symbol.rivencraft.sky.static.description": "Animated static surrounds the Age, behind authored celestials. Preceding colors tint it; otherwise it is gray.", "symbol.rivencraft.lighting.ambient_color": "Ambient Light Color", "symbol.rivencraft.lighting.ambient_color.description": "Apply preceding shared colors to ambient light. Use Bright separately for full effective ambient lighting.", - "symbol.rivencraft.number.description": "Before Color: value × 10 per channel. Before Length: value × 0.08 days. Before Phase/Angle: value × 15 degrees. Before Size: 0.25× to 3× (0-24).", "symbol.rivencraft.size.small.description": "Before Sun/Moon: 0.5× body size. Before Normal Time: size the sun only. A preceding Number overrides the size.", "symbol.rivencraft.size.normal.description": "Before Sun/Moon: 1× body size. Before Normal Time: size the sun only. A preceding Number selects 0.25× through 3× (0-24).", "symbol.rivencraft.size.large.description": "Before Sun/Moon: 2× body size. Before Normal Time: size the sun only. A preceding Number selects 0.25× through 3× (0-24).", @@ -85,7 +83,6 @@ "symbol.rivencraft.feature.abandoned_camps": "Abandoned Camps", "symbol.rivencraft.feature.abandoned_camps.description": "Allow abandoned camps on surface noise terrain, including outside their usual biomes.", "symbol.rivencraft.block.generated.description": "Modify the next compatible feature. Without a following feature, choose a compatible feature from the Age seed.", - "symbol.rivencraft.biome.native.description": "Use the terrain's default biome source. Cave uses Tiny regions from recognized Cave/Nether biomes. Do not include Biome pages.", "symbol.rivencraft.feature.dungeons.description": "Add monster-room dungeon attempts throughout surface noise or Cave terrain, including Nether cave biomes. Not Flat or Void.", "symbol.rivencraft.biome.single.description": "Use one biome across the Age. If omitted, choose an eligible biome from the Age seed.", "symbol.rivencraft.terrain.flat.description": "A level, biome-decorated landscape with its foundation at Y=0.", diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/PortConfig.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/PortConfig.java index c41eb40..85846a1 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/PortConfig.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/PortConfig.java @@ -11,6 +11,8 @@ public final class PortConfig { public static final ModConfigSpec.ConfigValue> RANDOM_PAGE_BLOCKLIST; public static final ModConfigSpec.BooleanValue LIVE_BOOK_PREVIEWS; public static final ModConfigSpec.BooleanValue CRYSTAL_LIVE_VIEWS; + public static final ModConfigSpec.BooleanValue SEAMLESS_BOOK_PREVIEWS; + public static final ModConfigSpec.BooleanValue SEAMLESS_CRYSTAL_VIEWS; public static final ModConfigSpec SPEC; public static final ModConfigSpec.BooleanValue AUTO_WHITELIST_SERENE_AGES; public static final ModConfigSpec.IntValue SYMBOL_INK_COST; @@ -28,6 +30,14 @@ public final class PortConfig { CRYSTAL_LIVE_VIEWS = builder.comment("Server option: create native live crystal portal surfaces when Reborn is installed.", "Disabling keeps crystal portal travel with the animated surface.") .define("reborn_crystal_live_views", true); + SEAMLESS_BOOK_PREVIEWS = builder.comment( + "Show rotating live book views and handheld look-only exploration with Seamless on client and server.", + "Disable locally to retain animated Legacy link panels; existing Reborn switches remain independent.") + .define("seamless_live_views", true); + SEAMLESS_CRYSTAL_VIEWS = builder.comment( + "Server option: create native live crystal portal surfaces when Seamless is installed.", + "Disabling retains normal portal travel and the animated surface.") + .define("seamless_crystal_live_views", true); builder.pop(); builder.push("random_pages"); RANDOM_PAGE_ALLOWLIST = builder.comment( diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/Rivencraft.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/Rivencraft.java index e4b2aca..47e646d 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/Rivencraft.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/Rivencraft.java @@ -249,7 +249,7 @@ public final class Rivencraft { COMPONENTS.register(modEventBus); RECIPE_SERIALIZERS.register(modEventBus); net.dnorberg.rivencraft.compat.RuinsCompatibility.register(); - net.dnorberg.rivencraft.compat.RebornBookPreviews.register(); + net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.register(); ModCreativeTabs.register(modEventBus); PortBiomeSources.register(modEventBus); PortChunkGenerators.register(modEventBus); diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/AgeCatalogSync.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/AgeCatalogSync.java index bd14885..fac4bc4 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/AgeCatalogSync.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/AgeCatalogSync.java @@ -21,7 +21,7 @@ public final class AgeCatalogSync { } public static void registerPayloads(RegisterPayloadHandlersEvent event) { - var registrar = event.registrar("11"); + var registrar = event.registrar("12"); registrar.playToClient(AgeCatalogPayload.TYPE, AgeCatalogPayload.STREAM_CODEC); registrar.playToServer(AgeCatalogAckPayload.TYPE, AgeCatalogAckPayload.STREAM_CODEC, (payload, context) -> { diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortAgeColors.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortAgeColors.java index db5931a..35f1b20 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortAgeColors.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortAgeColors.java @@ -3,6 +3,7 @@ package net.dnorberg.rivencraft.age; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import java.util.List; +import net.dnorberg.rivencraft.shared.StaticSkyResolution; import java.util.Map; import java.util.Random; import net.minecraft.network.RegistryFriendlyByteBuf; @@ -14,26 +15,33 @@ import org.joml.Vector3f; import org.joml.Vector3fc; /** Frozen shared-color writing, adapted from 1.21.1 AgeSkyProfile. -1 means native. */ -public record PortAgeColors(int sky, int ambient, int celestial) { +public record PortAgeColors(int sky, int ambient, int celestial, int staticResolution) { public static final PortAgeColors NATIVE = new PortAgeColors(-1, -1); public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( Codec.intRange(-1, 0xffffff).fieldOf("sky").forGetter(PortAgeColors::sky), Codec.intRange(-1, 0xffffff).fieldOf("ambient").forGetter(PortAgeColors::ambient), - Codec.intRange(-1, 0xffffff).optionalFieldOf("celestial", -1).forGetter(PortAgeColors::celestial) + Codec.intRange(-1, 0xffffff).optionalFieldOf("celestial", -1).forGetter(PortAgeColors::celestial), + Codec.intRange(StaticSkyResolution.MIN, StaticSkyResolution.MAX) + .optionalFieldOf("static_resolution", StaticSkyResolution.DEFAULT).forGetter(PortAgeColors::staticResolution) ).apply(instance, PortAgeColors::new)); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( ByteBufCodecs.INT, PortAgeColors::sky, ByteBufCodecs.INT, PortAgeColors::ambient, - ByteBufCodecs.INT, PortAgeColors::celestial, PortAgeColors::new); + ByteBufCodecs.INT, PortAgeColors::celestial, + ByteBufCodecs.VAR_INT, PortAgeColors::staticResolution, PortAgeColors::new); public static final Identifier AMBIENT = Identifier.fromNamespaceAndPath("rivencraft", "lighting/ambient_color"); private static volatile Map clientColors = Map.of(); public PortAgeColors { + staticResolution = StaticSkyResolution.clamp(staticResolution); if (sky < -1 || sky > 0xffffff || ambient < -1 || ambient > 0xffffff || celestial < -1 || celestial > 0xffffff) throw new IllegalArgumentException("Invalid Age color"); } public PortAgeColors(int sky, int ambient) { this(sky, ambient, -1); } + public PortAgeColors(int sky, int ambient, int celestial) { + this(sky, ambient, celestial, StaticSkyResolution.DEFAULT); + } public static void updateClient(Map colors) { clientColors = Map.copyOf(colors); } @@ -60,11 +68,17 @@ public record PortAgeColors(int sky, int ambient, int celestial) { public static boolean isModifier(Identifier page) { return isColor(page) || number(page) >= 0 || page.equals(AMBIENT); } public static boolean validNumbers(List pages) { - for (int i = 0; i < pages.size(); i++) - if (number(pages.get(i)) >= 0 && (i + 1 == pages.size() - || !isColor(pages.get(i + 1)) && !PortDayCycle.isPeriod(pages.get(i + 1)) - && !PortDayCycle.isPhase(pages.get(i + 1)) && !PortDayCycle.isAngle(pages.get(i + 1)) - && !PortDayCycle.isSize(pages.get(i + 1)))) return false; + for (int i = 0; i < pages.size(); i++) { + if (number(pages.get(i)) < 0) continue; + int next = i + 1; + while (next < pages.size() && number(pages.get(next)) >= 0) next++; + if (next < pages.size() && (pages.get(next).equals(PortStaticSkyResolution.PAGE) + || pages.get(next).equals(PortFlooding.PAGE))) continue; + if (i + 1 >= pages.size()) return false; + Identifier target = pages.get(i + 1); + if (!isColor(target) && !PortDayCycle.isPeriod(target) && !PortDayCycle.isPhase(target) + && !PortDayCycle.isAngle(target) && !PortDayCycle.isSize(target)) return false; + } return true; } @@ -101,7 +115,7 @@ public record PortAgeColors(int sky, int ambient, int celestial) { } } if (written) sky = clamp(red) << 16 | clamp(green) << 8 | clamp(blue); - return new PortAgeColors(sky, ambient, celestial); + return new PortAgeColors(sky, ambient, celestial, PortStaticSkyResolution.compile(pages)); } /** Only pageless random Ages receive a random sky tint, as in 1.21.1. */ diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortBiomePlan.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortBiomePlan.java index a4ce33e..2f0ec51 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortBiomePlan.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortBiomePlan.java @@ -3,19 +3,29 @@ package net.dnorberg.rivencraft.age; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import java.util.List; +import net.dnorberg.rivencraft.shared.NativeBiomeKind; import net.minecraft.resources.Identifier; /** Frozen biome choice; Native may carry an explicit Cave pool. Repeats retain weight. */ -public record PortBiomePlan(Distribution distribution, List biomes) { +public record PortBiomePlan(Distribution distribution, List biomes, NativeBiomeKind nativeKind) { public enum Distribution { NATIVE, SINGLE, TILED, GRID, TINY, SMALL, MEDIUM, LARGE, HUGE } public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( Codec.STRING.xmap(Distribution::valueOf, Distribution::name).fieldOf("distribution") .forGetter(PortBiomePlan::distribution), - Identifier.CODEC.listOf().fieldOf("biomes").forGetter(PortBiomePlan::biomes) + Identifier.CODEC.listOf().fieldOf("biomes").forGetter(PortBiomePlan::biomes), + Codec.STRING.xmap(NativeBiomeKind::valueOf, NativeBiomeKind::name) + .optionalFieldOf("native_kind", NativeBiomeKind.TERRAIN).forGetter(PortBiomePlan::nativeKind) ).apply(instance, PortBiomePlan::new)); + public PortBiomePlan(Distribution distribution, List biomes) { + this(distribution, biomes, NativeBiomeKind.TERRAIN); + } + public PortBiomePlan { + java.util.Objects.requireNonNull(nativeKind, "nativeKind"); + if (nativeKind != NativeBiomeKind.TERRAIN && (distribution != Distribution.NATIVE || biomes.isEmpty())) + throw new IllegalArgumentException("A native family requires a nonempty Native pool"); biomes = List.copyOf(biomes); if (distribution == null || distribution == Distribution.SINGLE && biomes.size() != 1 || distribution != Distribution.NATIVE && distribution != Distribution.SINGLE && biomes.size() < 2) diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortFeatureChunkGenerator.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortFeatureChunkGenerator.java index aabf2d8..51b6ed1 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortFeatureChunkGenerator.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortFeatureChunkGenerator.java @@ -292,6 +292,14 @@ public final class PortFeatureChunkGenerator extends ChunkGenerator { PortShelfMushrooms.decorate(level, chunk, mushroomHosts, random); continue; } + if (page.equals(PortVegetationPlan.FLOWERS) || page.equals(PortVegetationPlan.TREES) + || page.equals(PortVegetationPlan.HUGE_TREES)) { + PortSurfaceVegetation.place(level, this, chunk, + page.getPath().substring("feature/".length()), + PortVegetationPlan.placedFeature(page), random); + if (PortVegetationPlan.addsLogs(page)) mushroomHosts = null; + continue; + } if (!surfaceBiome) continue; Identifier placedId = PortVegetationPlan.placedFeature(page); PlacedFeature vanilla = registry.getOrThrow( diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortNativeBiomePools.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortNativeBiomePools.java new file mode 100644 index 0000000..522d4d0 --- /dev/null +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortNativeBiomePools.java @@ -0,0 +1,53 @@ +package net.dnorberg.rivencraft.age; + +import java.util.List; +import java.util.stream.Stream; +import net.dnorberg.rivencraft.shared.NativeBiomeKind; +import net.dnorberg.rivencraft.compat.TerraBlenderBiomes; +import net.minecraft.core.Holder; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.BiomeTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; + +/** Family pools are resolved only when binding new writing, never re-filtered on load. */ +public final class PortNativeBiomePools { + private PortNativeBiomePools() {} + public static final TagKey CAVES = TagKey.create(Registries.BIOME, + Identifier.fromNamespaceAndPath("rivencraft", "cave_biomes")); + + public static List pool(HolderLookup.Provider registries, NativeBiomeKind kind) { + var biomes = registries.lookupOrThrow(Registries.BIOME); + var nether = java.util.Set.copyOf(TerraBlenderBiomes.nether(registries)); + java.util.function.Predicate> isNether = + biome -> biome.is(BiomeTags.IS_NETHER) || nether.contains(biome.key().identifier()); + var selected = biomes.listElements() + .filter(biome -> !biome.key().identifier().equals(Identifier.parse("terrablender:deferred_placeholder"))) + .filter(biome -> switch (kind) { + case CAVES -> biome.is(CAVES) && !isNether.test(biome); + case NETHER -> isNether.test(biome); + case END -> biome.is(BiomeTags.IS_END); + case TERRAIN -> throw new IllegalArgumentException("Terrain Native uses its own preset"); + }).map(biome -> biome.key().identifier()).toList(); + // Built-in family members remain recognizable if a data pack replaces the broad tags. + List vanilla = switch (kind) { + case CAVES -> List.of("lush_caves", "dripstone_caves", "deep_dark", "sulfur_caves"); + case NETHER -> List.of("nether_wastes", "soul_sand_valley", "crimson_forest", "warped_forest", "basalt_deltas"); + case END -> List.of("the_end", "end_highlands", "end_midlands", "small_end_islands", "end_barrens"); + default -> List.of(); + }; + var fallback = vanilla.stream().map(Identifier::withDefaultNamespace) + .filter(id -> biomes.get(ResourceKey.create(Registries.BIOME, id)) + .filter(biome -> kind != NativeBiomeKind.CAVES || !isNether.test(biome)).isPresent()); + var result = Stream.concat(selected.stream(), fallback).distinct().sorted().toList(); + if (!result.isEmpty()) return result; // A one-biome family becomes a safe FixedBiomeSource. + var safe = kind == NativeBiomeKind.CAVES ? biomes.listElements().filter(biome -> !isNether.test(biome) + && !biome.key().identifier().equals(Identifier.parse("terrablender:deferred_placeholder"))) + .map(biome -> biome.key().identifier()).sorted().findFirst() + : java.util.Optional.empty(); + return safe.map(List::of).orElseThrow(() -> new IllegalArgumentException("No usable " + kind + " biomes")); + } +} diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortRandomAgeSelection.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortRandomAgeSelection.java index 8440490..f156198 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortRandomAgeSelection.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortRandomAgeSelection.java @@ -45,7 +45,11 @@ public final class PortRandomAgeSelection { } if (distribution == PortBiomePlan.Distribution.NATIVE) return new Selection(terrain, new PortBiomePlan(distribution, - terrain == PortAgeTerrain.CAVE ? eligible : List.of())); + terrain == PortAgeTerrain.CAVE + ? PortNativeBiomePools.pool(server.registryAccess(), net.dnorberg.rivencraft.shared.NativeBiomeKind.CAVES) + : List.of(), terrain == PortAgeTerrain.CAVE + ? net.dnorberg.rivencraft.shared.NativeBiomeKind.CAVES + : net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN)); int count = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2; if (count > 1) { diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortRandomPagePolicy.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortRandomPagePolicy.java index c6c575f..1e69153 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortRandomPagePolicy.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortRandomPagePolicy.java @@ -53,7 +53,7 @@ public record PortRandomPagePolicy(Set allowlist, Set bl private static String category(Identifier id) { String path = id.getPath(); - if (path.startsWith("biome/") && java.util.Set.of("native", "single", "tiled", "grid", + if (path.startsWith("biome/") && java.util.Set.of("native", "native_caves", "native_nether", "native_end", "single", "tiled", "grid", "tiny", "small", "medium", "large", "huge").contains(path.substring("biome/".length()))) return "biome_distribution"; return path.substring(0, path.indexOf('/') < 0 ? path.length() : path.indexOf('/')); diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortStaticSkyResolution.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortStaticSkyResolution.java new file mode 100644 index 0000000..18c0599 --- /dev/null +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortStaticSkyResolution.java @@ -0,0 +1,20 @@ +package net.dnorberg.rivencraft.age; + +import java.util.List; +import net.dnorberg.rivencraft.shared.StaticSkyResolution; +import net.minecraft.resources.Identifier; + +public final class PortStaticSkyResolution { + public static final Identifier PAGE = Identifier.fromNamespaceAndPath("rivencraft", "sky/static"); + private PortStaticSkyResolution() {} + + public static int compile(List pages) { + return StaticSkyResolution.requested(pages.stream().map(page -> { + int number = PortAgeColors.number(page); + if (number >= 0) return number; + if (page.equals(PAGE)) return StaticSkyResolution.STATIC; + return PortSkyStyle.forPage(page) != null + ? StaticSkyResolution.OTHER_SKY : StaticSkyResolution.OTHER; + }).toList()); + } +} diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortSurfaceVegetation.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortSurfaceVegetation.java new file mode 100644 index 0000000..bc65fb7 --- /dev/null +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/PortSurfaceVegetation.java @@ -0,0 +1,100 @@ +package net.dnorberg.rivencraft.age; + +import java.util.Optional; +import net.dnorberg.rivencraft.writing.PortRegistryPages; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; +import net.dnorberg.rivencraft.shared.DesertVegetation; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.chunk.ChunkAccess; +import net.minecraft.world.level.chunk.ChunkGenerator; +import net.minecraft.world.level.levelgen.Heightmap; +import net.minecraft.world.level.levelgen.placement.BiomeFilter; +import net.minecraft.world.level.levelgen.placement.PlacementContext; + +/** Routes only the three generic plant pages by the actual candidate biome. */ +public final class PortSurfaceVegetation { + public static final TagKey DESERTS = TagKey.create(Registries.BIOME, + Identifier.fromNamespaceAndPath("rivencraft", "desert_vegetation")); + + private PortSurfaceVegetation() {} + + public static boolean isDesert(Holder biome) { + return biome.is(DESERTS) && (!biome.is(net.minecraft.tags.BiomeTags.IS_END) && !PortRegistryPages.isCaveBiome(biome)); + } + + public static void place(WorldGenLevel level, ChunkGenerator generator, ChunkAccess chunk, + String page, Identifier placedId, RandomSource random) { + DesertVegetation.Kind kind = switch (page) { + case "flowers" -> DesertVegetation.Kind.FLOWERS; + case "trees" -> DesertVegetation.Kind.TREES; + case "huge_trees" -> DesertVegetation.Kind.HUGE_TREES; + default -> throw new IllegalArgumentException("Not a generic vegetation page: " + page); + }; + int x = chunk.getPos().getMinBlockX(); + int z = chunk.getPos().getMinBlockZ(); + // Separate streams keep ordinary non-desert placement independent of desert attempts. + RandomSource desertRandom = RandomSource.create(random.nextLong()); + DesertVegetation.place(new DesertVegetation.World() { + public int surfaceY(int px, int pz) { + return level.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, px, pz); + } + public int maxY() { return level.getMaxY(); } + public boolean desert(int px, int py, int pz) { + return isDesert(level.getBiome(new BlockPos(px, py, pz))); + } + public DesertVegetation.Ground ground(int px, int py, int pz) { + var state = level.getBlockState(new BlockPos(px, py, pz)); + if (state.is(Blocks.SAND) || state.is(Blocks.RED_SAND)) return DesertVegetation.Ground.SAND; + // Modern dirt and grass-like soils are separate tags. + return (state.is(BlockTags.DIRT) || state.is(BlockTags.GRASS_BLOCKS)) + && level.getBlockState(new BlockPos(px, py - 1, pz)).isFaceSturdy( + level, new BlockPos(px, py - 1, pz), net.minecraft.core.Direction.UP) + ? DesertVegetation.Ground.SOIL : DesertVegetation.Ground.OTHER; + } + public boolean air(int px, int py, int pz) { + return level.getBlockState(new BlockPos(px, py, pz)).isAir(); + } + public void set(int px, int py, int pz, DesertVegetation.Plant plant) { + var block = switch (plant) { + case SAND -> Blocks.SAND; + case CACTUS -> Blocks.CACTUS; + case DEAD_BUSH -> Blocks.DEAD_BUSH; + }; + level.setBlock(new BlockPos(px, py, pz), block.defaultBlockState(), 2); + } + }, kind, x, z, desertRandom::nextInt); + + var vanilla = level.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE) + .getOrThrow(ResourceKey.create(Registries.PLACED_FEATURE, placedId)).value(); + var context = new PlacementContext(level, generator, Optional.empty()); + placeOrdinary(vanilla, context, random, 0, new BlockPos(x, level.getMinY(), z)); + } + + private static void placeOrdinary(PlacedFeature feature, PlacementContext context, + RandomSource random, int index, BlockPos position) { + if (index == feature.placement().size()) { + Holder biome = context.getLevel().getBiome(position); + if (!biome.is(net.minecraft.tags.BiomeTags.IS_END) + && !PortRegistryPages.isCaveBiome(biome) && !isDesert(biome)) + feature.feature().value().place(context.getLevel(), context.generator(), random, position); + return; + } + var modifier = feature.placement().get(index); + if (modifier instanceof BiomeFilter) { + placeOrdinary(feature, context, random, index + 1, position); + } else { + modifier.modify(context, random, position, + candidate -> placeOrdinary(feature, context, random, index + 1, candidate)); + } + } +} diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/RuntimeAgeBackend.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/RuntimeAgeBackend.java index 053b4f6..1a019f2 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/RuntimeAgeBackend.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/age/RuntimeAgeBackend.java @@ -538,7 +538,8 @@ public final class RuntimeAgeBackend { ResourceKey key = ResourceKey.create(Registries.DIMENSION, id); if (server.getLevel(key) != null) throw new IllegalArgumentException("Level already loaded: " + id); if (biomePlan != null && biomePlan.distribution() == PortBiomePlan.Distribution.NATIVE - && !biomePlan.biomes().isEmpty() && terrain != PortAgeTerrain.CAVE) + && !biomePlan.biomes().isEmpty() && terrain != PortAgeTerrain.CAVE + && biomePlan.nativeKind() == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN) throw new IllegalArgumentException("Only Native Cave terrain may carry an explicit native biome pool"); // Noise terrains reuse the Overworld biome source unless a @@ -577,15 +578,24 @@ public final class RuntimeAgeBackend { generator = biomePlan != null && biomePlan.biomes().size() > 1 ? new PortFlatChunkGenerator(authoredBiomeSource(server, biomePlan, seed), settings) : new FlatLevelSource(settings); - } else if ((biomePlan != null && biomePlan.distribution() != PortBiomePlan.Distribution.NATIVE) + } else if ((biomePlan != null && (biomePlan.distribution() != PortBiomePlan.Distribution.NATIVE + || biomePlan.nativeKind() != net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN)) || terrain != PortAgeTerrain.STANDARD) { - if (!(generator instanceof NoiseBasedChunkGenerator noise)) - throw new IllegalStateException("Overworld generator cannot accept authored noise settings"); + // A Flat/skyblock Overworld has no noise generator to adapt. Native + // family pages must still work with an independently authored noise terrain. + NoiseBasedChunkGenerator noise = generator instanceof NoiseBasedChunkGenerator existingNoise ? existingNoise + : new NoiseBasedChunkGenerator( + net.minecraft.world.level.biome.MultiNoiseBiomeSource.createFromPreset( + server.registryAccess().lookupOrThrow(Registries.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST) + .getOrThrow(ResourceKey.create(Registries.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST, + Identifier.withDefaultNamespace("overworld")))), + server.registryAccess().lookupOrThrow(Registries.NOISE_SETTINGS).getOrThrow(NoiseGeneratorSettings.OVERWORLD)); var source = terrain == PortAgeTerrain.CAVE ? new FixedBiomeSource(server.registryAccess().lookupOrThrow(Registries.BIOME) .getOrThrow(Biomes.LUSH_CAVES)) - : generator.getBiomeSource(); - if (terrain == PortAgeTerrain.CAVE && biomePlan != null) { + : noise.getBiomeSource(); + if (terrain == PortAgeTerrain.CAVE && biomePlan != null + && biomePlan.nativeKind() == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN) { var biomes = server.registryAccess().lookupOrThrow(Registries.BIOME); for (Identifier biomeId : biomePlan.biomes()) { var holder = biomes.get(ResourceKey.create(Registries.BIOME, biomeId)) @@ -595,6 +605,7 @@ public final class RuntimeAgeBackend { } } if (biomePlan != null && (biomePlan.distribution() != PortBiomePlan.Distribution.NATIVE + || biomePlan.nativeKind() != net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN || terrain == PortAgeTerrain.CAVE && !biomePlan.biomes().isEmpty())) { source = authoredBiomeSource(server, biomePlan, seed); } diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/block/CrystalPortalBlock.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/block/CrystalPortalBlock.java index 9bcc314..68a4c0b 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/block/CrystalPortalBlock.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/block/CrystalPortalBlock.java @@ -40,7 +40,7 @@ public final class CrystalPortalBlock extends BaseEntityBlock { @Override protected RenderShape getRenderShape(BlockState state) { // Keep the animated fallback until the optional destination view has // actually been established, including after a world restart. - return net.dnorberg.rivencraft.compat.RebornBookPreviews.available() && state.getValue(LIVE_VIEW) + return net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.available() && state.getValue(LIVE_VIEW) ? RenderShape.INVISIBLE : RenderShape.MODEL; } @Override public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/block/entity/BookReceptacleBlockEntity.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/block/entity/BookReceptacleBlockEntity.java index 3ae8784..6d28ab8 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/block/entity/BookReceptacleBlockEntity.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/block/entity/BookReceptacleBlockEntity.java @@ -26,7 +26,7 @@ public final class BookReceptacleBlockEntity extends BlockEntity { public int skyColor() { return skyColor; } public void setBook(ItemStack value) { if (level instanceof ServerLevel server) - net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(server, worldPosition); + net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition); book = value.copyWithCount(1); restore = true; skyColor = 0xffffff; @@ -58,7 +58,7 @@ public final class BookReceptacleBlockEntity extends BlockEntity { } public ItemStack takeBook() { if (level instanceof ServerLevel server) - net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(server, worldPosition); + net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(server, worldPosition); ItemStack result = book; book = ItemStack.EMPTY; skyColor = 0xffffff; sync(); return result; } private void sync() { diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/RebornLiveBookPanel.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/ImmersiveLiveBookPanel.java similarity index 94% rename from ports/mc263/src/main/java/net/dnorberg/rivencraft/client/RebornLiveBookPanel.java rename to ports/mc263/src/main/java/net/dnorberg/rivencraft/client/ImmersiveLiveBookPanel.java index 63dc297..54e3281 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/RebornLiveBookPanel.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/ImmersiveLiveBookPanel.java @@ -18,12 +18,12 @@ import qouteall.imm_ptl.core.ClientWorldLoader; import qouteall.imm_ptl.core.render.GuiPortalRendering; import qouteall.imm_ptl.core.render.context_management.WorldRenderInfo; -/** Reborn renders before GUI drawing; the deferred GUI samples its target normally. */ -public final class RebornLiveBookPanel implements PortBookPreview.LivePanel { +/** The portal engine renders before GUI drawing; the deferred GUI samples its target normally. */ +public final class ImmersiveLiveBookPanel implements PortBookPreview.LivePanel { // The engine retains queued tasks. Keep one reusable target alive across screen // removal instead of deleting textures still referenced by a queued GUI frame. private static RenderTarget target; - private static RebornLiveBookPanel queued; + private static ImmersiveLiveBookPanel queued; private LinkBookTarget destination; private boolean closed; private boolean exploring; @@ -71,11 +71,11 @@ public final class RebornLiveBookPanel implements PortBookPreview.LivePanel { .setCameraTransformation(transform).setOverwriteCameraTransformation(true) .setRenderDistance(Math.min(8, minecraft.options.getEffectiveRenderDistance())) .setDoRenderHand(false).setEnableViewBobbing(false).setDoRenderSky(true).setHasFog(true).build(); - // Overlay-to-screen transitions can extract this panel twice before Reborn + // Overlay-to-screen transitions can extract this panel twice before the portal engine // drains its queue. Its API accepts only one task per target until then. // Reuse that pending view for subsequent draws instead of submitting twice. if (queued == null) { - // Submit first: Reborn may resize the target and invalidate its texture view. + // Submit first: The portal engine may resize the target and invalidate its texture view. // GPU clearing happens in beginRender(), before remote rendering. GuiPortalRendering.submitNextFrameRendering(info, target); queued = this; diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/PortBookPreview.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/PortBookPreview.java index 35d4e0c..96d3ed4 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/PortBookPreview.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/PortBookPreview.java @@ -1,8 +1,7 @@ package net.dnorberg.rivencraft.client; import java.util.UUID; -import net.dnorberg.rivencraft.PortConfig; -import net.dnorberg.rivencraft.compat.RebornBookPreviews; +import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews; import net.dnorberg.rivencraft.network.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphicsExtractor; @@ -35,8 +34,8 @@ public final class PortBookPreview { request = minecraft.level == null ? null : new RequestBookPreviewPayload(session, hand == InteractionHand.OFF_HAND, stand != null, minecraft.level.dimension().identifier(), stand == null ? BlockPos.ZERO : stand.pos(), book.copy()); - boolean enabled = RebornBookPreviews.available() && PortConfig.LIVE_BOOK_PREVIEWS.get(); - live = enabled ? new RebornLiveBookPanel() : null; + boolean enabled = ImmersiveBookPreviews.bookViewsEnabled(); + live = enabled ? new ImmersiveLiveBookPanel() : null; if (active != null) active.close(); active = this; sendRequest(); diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/PortStaticSky.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/PortStaticSky.java index 81c881e..bdbc964 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/PortStaticSky.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/PortStaticSky.java @@ -10,33 +10,43 @@ import com.mojang.renderpearl.api.buffers.GpuBuffer; import com.mojang.renderpearl.api.buffers.GpuBufferSlice; import com.mojang.renderpearl.api.pipeline.PrimitiveTopology; import java.util.Optional; +import net.dnorberg.rivencraft.shared.StaticSkyResolution; import java.util.OptionalDouble; import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.util.RandomSource; import org.joml.Matrix4f; -/** Legacy's six 48x48 noise faces, uploaded once per animation frame rather than per cell. */ +/** Six bounded authored-resolution noise faces, uploaded once per animation frame rather than per cell. */ public final class PortStaticSky implements AutoCloseable { - private static final int GRID = 48; - private final DynamicTexture texture = new DynamicTexture("Rivencraft static sky", GRID * 6, GRID, false); + private int grid; + private DynamicTexture texture; private final GpuBuffer cube = buildCube(); private long uploadedFrame = Long.MIN_VALUE; private int uploadedTint = -1; - public void render(RenderTarget target, GpuBufferSlice fog, long frame, int tint) { + public void render(RenderTarget target, GpuBufferSlice fog, long frame, int tint, int resolution) { + int requested = StaticSkyResolution.clamp(resolution); + if (texture == null || grid != requested) { + var replacement = new DynamicTexture("Rivencraft static sky", requested * 6, requested, false); + if (texture != null) texture.close(); + texture = replacement; + grid = requested; + uploadedFrame = Long.MIN_VALUE; + uploadedTint = -1; + } if (tint < 0) tint = 0x929292; if (uploadedFrame != frame || uploadedTint != tint) { RandomSource random = RandomSource.create(frame); var image = texture.getPixels(); for (int face = 0; face < 6; face++) { - for (int y = 0; y < GRID; y++) { - for (int x = 0; x < GRID; x++) { + for (int y = 0; y < grid; y++) { + for (int x = 0; x < grid; x++) { int noise = 65 + random.nextInt(160); int red = (tint >> 16 & 255) * noise / 255; int green = (tint >> 8 & 255) * noise / 255; int blue = (tint & 255) * noise / 255; - image.setPixel(face * GRID + x, y, 0xff000000 | red << 16 | green << 8 | blue); + image.setPixel(face * grid + x, y, 0xff000000 | red << 16 | green << 8 | blue); } } } @@ -88,6 +98,6 @@ public final class PortStaticSky implements AutoCloseable { @Override public void close() { cube.close(); - texture.close(); + if (texture != null) texture.close(); } } diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/StaticSkyState.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/StaticSkyState.java index 79e73e7..e54b659 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/StaticSkyState.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/client/StaticSkyState.java @@ -9,6 +9,8 @@ public interface StaticSkyState { void rivencraft$bodies(java.util.List bodies); long rivencraft$staticFrame(); void rivencraft$staticFrame(long frame); + int rivencraft$staticResolution(); + void rivencraft$staticResolution(int resolution); int rivencraft$skyTint(); void rivencraft$skyTint(int color); int rivencraft$orbitBearing(); diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveBookPreviews.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveBookPreviews.java new file mode 100644 index 0000000..59dfdf9 --- /dev/null +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveBookPreviews.java @@ -0,0 +1,47 @@ +package net.dnorberg.rivencraft.compat; + +import net.dnorberg.rivencraft.Rivencraft; +import net.dnorberg.rivencraft.PortConfig; +import net.dnorberg.rivencraft.network.RequestBookPreviewPayload; +import net.minecraft.server.level.ServerPlayer; +import net.neoforged.fml.ModList; +import net.neoforged.neoforge.common.NeoForge; + +/** No optional API appears in common class signatures. */ +public final class ImmersiveBookPreviews { + public static boolean reborn() { return ModList.get().isLoaded("immersive_portals_reborn"); } + public static boolean seamless() { return ModList.get().isLoaded("seamlessportals"); } + public static boolean available() { return reborn() || seamless(); } + public static String engineName() { return seamless() ? "Seamless" : "Reborn"; } + public static boolean bookViewsEnabled() { + return seamless() ? PortConfig.SEAMLESS_BOOK_PREVIEWS.get() + : reborn() && PortConfig.LIVE_BOOK_PREVIEWS.get(); + } + public static boolean crystalViewsEnabled() { + return seamless() ? PortConfig.SEAMLESS_CRYSTAL_VIEWS.get() + : reborn() && PortConfig.CRYSTAL_LIVE_VIEWS.get(); + } + public static void open(ServerPlayer player, RequestBookPreviewPayload payload) { + if (!available()) return; + try { ImmersivePreviewChunks.open(player, payload); } + catch (RuntimeException | LinkageError error) { + Rivencraft.LOGGER.warn("{} book preview unavailable; retaining animated panel", engineName(), error); + ImmersivePreviewChunks.close(player); + } + } + public static void release(ServerPlayer player, java.util.UUID session) { + if (available()) ImmersivePreviewChunks.release(player, session); + } + public static void register() { + if (!available()) return; + NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) -> ImmersivePreviewChunks.tick(event.getServer())); + NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent event) -> { + if (event.getEntity() instanceof ServerPlayer player) ImmersivePreviewChunks.logout(player); + }); + NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerChangedDimensionEvent event) -> { + if (event.getEntity() instanceof ServerPlayer player) ImmersivePreviewChunks.close(player); + }); + NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.server.ServerStoppingEvent event) -> ImmersivePreviewChunks.stop()); + } + private ImmersiveBookPreviews() {} +} diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornCrystalPortals.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveCrystalPortals.java similarity index 52% rename from ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornCrystalPortals.java rename to ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveCrystalPortals.java index 538ca02..f5de787 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornCrystalPortals.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveCrystalPortals.java @@ -1,6 +1,5 @@ package net.dnorberg.rivencraft.compat; -import net.dnorberg.rivencraft.PortConfig; import net.dnorberg.rivencraft.Rivencraft; import net.dnorberg.rivencraft.portal.CrystalPortalNetwork; import net.minecraft.core.BlockPos; @@ -8,23 +7,23 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.item.ItemStack; /** Render-only optional integration. Crystal portal blocks retain all travel rules. */ -public final class RebornCrystalPortals { +public final class ImmersiveCrystalPortals { public static void refresh(ServerLevel source, BlockPos owner, CrystalPortalNetwork.Plan plan, ItemStack book) { boolean live = false; - if (RebornBookPreviews.available()) { + if (ImmersiveBookPreviews.available()) { try { - if (!book.isEmpty() && PortConfig.CRYSTAL_LIVE_VIEWS.get()) - live = RebornCrystalView.refresh(source, owner, plan, book); - else RebornCrystalView.remove(source, owner); + if (!book.isEmpty() && ImmersiveBookPreviews.crystalViewsEnabled()) + live = ImmersiveCrystalView.refresh(source, owner, plan, book); + else ImmersiveCrystalView.remove(source, owner); } catch (RuntimeException | LinkageError failure) { - Rivencraft.LOGGER.warn("Could not establish Reborn crystal view at {}; retaining portal travel and fallback", owner, failure); - RebornCrystalView.remove(source, owner); + Rivencraft.LOGGER.warn("Could not establish immersive crystal view at {}; retaining portal travel and fallback", owner, failure); + ImmersiveCrystalView.remove(source, owner); } } CrystalPortalNetwork.setLiveView(source, plan, live); } public static void remove(ServerLevel source, BlockPos owner) { - if (RebornBookPreviews.available()) RebornCrystalView.remove(source, owner); + if (ImmersiveBookPreviews.available()) ImmersiveCrystalView.remove(source, owner); } - private RebornCrystalPortals() {} + private ImmersiveCrystalPortals() {} } diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornCrystalView.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveCrystalView.java similarity index 99% rename from ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornCrystalView.java rename to ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveCrystalView.java index 7add0e9..5206844 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornCrystalView.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersiveCrystalView.java @@ -23,7 +23,7 @@ import qouteall.q_misc_util.my_util.DQuaternion; import qouteall.q_misc_util.my_util.Mesh2D; /** One native mesh per coplanar opening/side, not one repeated image per block. */ -final class RebornCrystalView { +final class ImmersiveCrystalView { private static final String PREFIX = "rivencraft:crystal:mc263:v1:"; private record View(CrystalPortalSurfaces.Surface surface, Direction normal, LinkBookTarget target, boolean preserveFacing, boolean relative, String tag) {} @@ -127,5 +127,5 @@ final class RebornCrystalView { return to.hamiltonProduct(from.getConjugated()).getNormalized(); } private static String ownerTag(BlockPos owner) { return PREFIX + owner.asLong() + ":"; } - private RebornCrystalView() {} + private ImmersiveCrystalView() {} } diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornPreviewChunks.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersivePreviewChunks.java similarity index 98% rename from ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornPreviewChunks.java rename to ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersivePreviewChunks.java index 9783a58..5fb76ac 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornPreviewChunks.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/ImmersivePreviewChunks.java @@ -23,7 +23,7 @@ import qouteall.imm_ptl.core.chunk_loading.ChunkLoader; import qouteall.imm_ptl.core.chunk_loading.ImmPtlChunkTracking; /** Optional API class: one expiring stream per player, validated before any chunk load. */ -final class RebornPreviewChunks { +final class ImmersivePreviewChunks { private static final Map LEASES = new IdentityHashMap<>(); private static final Map REQUESTS = new IdentityHashMap<>(); private static final int LIFETIME = 600; @@ -69,7 +69,7 @@ final class RebornPreviewChunks { var center = BlockPos.containing(target.x(), target.y(), target.z()); if (level == null || !level.isInWorldBounds(center) || !level.getWorldBorder().isWithinBounds(center)) return; close(player); - // Match the root live renderer's eight-chunk orbit view. Reborn schedules + // Match the root live renderer's eight-chunk orbit view. The portal engine schedules // generation/streaming; no synchronous square of getChunk() calls here. var loader = new ChunkLoader(level.dimension(), center.getX() >> 4, center.getZ() >> 4, 8); PortalAPI.addChunkLoaderForPlayer(player, loader); @@ -108,5 +108,5 @@ final class RebornPreviewChunks { for (ServerPlayer player : java.util.List.copyOf(LEASES.keySet())) close(player); REQUESTS.clear(); } - private RebornPreviewChunks() {} + private ImmersivePreviewChunks() {} } diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornBookPreviews.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornBookPreviews.java deleted file mode 100644 index 489ece4..0000000 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/compat/RebornBookPreviews.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.dnorberg.rivencraft.compat; - -import net.dnorberg.rivencraft.Rivencraft; -import net.dnorberg.rivencraft.network.RequestBookPreviewPayload; -import net.minecraft.server.level.ServerPlayer; -import net.neoforged.fml.ModList; -import net.neoforged.neoforge.common.NeoForge; - -/** No optional API appears in common class signatures. */ -public final class RebornBookPreviews { - public static boolean available() { return ModList.get().isLoaded("immersive_portals_reborn"); } - public static void open(ServerPlayer player, RequestBookPreviewPayload payload) { - if (!available()) return; - try { RebornPreviewChunks.open(player, payload); } - catch (RuntimeException | LinkageError error) { - Rivencraft.LOGGER.warn("Reborn book preview unavailable; retaining animated panel", error); - RebornPreviewChunks.close(player); - } - } - public static void release(ServerPlayer player, java.util.UUID session) { - if (available()) RebornPreviewChunks.release(player, session); - } - public static void register() { - if (!available()) return; - NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) -> RebornPreviewChunks.tick(event.getServer())); - NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent event) -> { - if (event.getEntity() instanceof ServerPlayer player) RebornPreviewChunks.logout(player); - }); - NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerChangedDimensionEvent event) -> { - if (event.getEntity() instanceof ServerPlayer player) RebornPreviewChunks.close(player); - }); - NeoForge.EVENT_BUS.addListener((net.neoforged.neoforge.event.server.ServerStoppingEvent event) -> RebornPreviewChunks.stop()); - } - private RebornBookPreviews() {} -} diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/RebornGuiRenderingMixin.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/ImmersiveGuiRenderingMixin.java similarity index 66% rename from ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/RebornGuiRenderingMixin.java rename to ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/ImmersiveGuiRenderingMixin.java index eebc913..a4b09cc 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/RebornGuiRenderingMixin.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/ImmersiveGuiRenderingMixin.java @@ -1,7 +1,7 @@ package net.dnorberg.rivencraft.mixin; -import net.dnorberg.rivencraft.client.RebornLiveBookPanel; -import net.dnorberg.rivencraft.compat.RebornBookPreviews; +import net.dnorberg.rivencraft.client.ImmersiveLiveBookPanel; +import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Pseudo; import org.spongepowered.asm.mixin.injection.At; @@ -10,13 +10,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Pseudo @Mixin(targets = "qouteall.imm_ptl.core.render.GuiPortalRendering", remap = false) -public abstract class RebornGuiRenderingMixin { +public abstract class ImmersiveGuiRenderingMixin { @Inject(method = "_onGameRenderEnd", at = @At("HEAD"), remap = false) private static void rivencraft$clearLiveTarget(CallbackInfo ci) { - if (RebornBookPreviews.available()) RebornLiveBookPanel.beginRender(); + if (ImmersiveBookPreviews.available()) ImmersiveLiveBookPanel.beginRender(); } @Inject(method = "_onGameRenderEnd", at = @At("RETURN"), remap = false) private static void rivencraft$restoreCamera(CallbackInfo ci) { - if (RebornBookPreviews.available()) RebornLiveBookPanel.endRender(); + if (ImmersiveBookPreviews.available()) ImmersiveLiveBookPanel.endRender(); } } diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/RebornBlockAckMixin.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/RebornBlockAckMixin.java index d73f16e..c18c475 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/RebornBlockAckMixin.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/RebornBlockAckMixin.java @@ -1,7 +1,7 @@ package net.dnorberg.rivencraft.mixin; import net.dnorberg.rivencraft.client.RebornPredictionAcks; -import net.dnorberg.rivencraft.compat.RebornBookPreviews; +import net.dnorberg.rivencraft.compat.ImmersiveBookPreviews; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientPacketListener; @@ -20,7 +20,7 @@ public abstract class RebornBlockAckMixin { @Inject(method = "handleBlockChangedAck", at = @At("HEAD"), cancellable = true) private void rivencraft$ackDuringWorldReset(ClientboundBlockChangedAckPacket packet, CallbackInfo callback) { // Off-thread packets must reach vanilla's normal scheduling path first. - if (Minecraft.getInstance().isSameThread() && RebornBookPreviews.available() + if (Minecraft.getInstance().isSameThread() && ImmersiveBookPreviews.reborn() && RebornPredictionAcks.handleDuringWorldReset(level, packet.sequence())) callback.cancel(); } } diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/StaticSkyRendererMixin.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/StaticSkyRendererMixin.java index db505a0..1e33607 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/StaticSkyRendererMixin.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/StaticSkyRendererMixin.java @@ -52,7 +52,9 @@ public class StaticSkyRendererMixin { key.identifier().getNamespace().equals("rivencraft") && key.identifier().getPath().endsWith("_sky_static")).orElse(false); ((StaticSkyState) state).rivencraft$staticFrame(enabled ? level.getGameTime() / 2 : Long.MIN_VALUE); - ((StaticSkyState) state).rivencraft$skyTint(net.dnorberg.rivencraft.age.PortAgeColors.forLevel(level).sky()); + var colors = net.dnorberg.rivencraft.age.PortAgeColors.forLevel(level); + ((StaticSkyState) state).rivencraft$skyTint(colors.sky()); + ((StaticSkyState) state).rivencraft$staticResolution(colors.staticResolution()); var cycle = net.dnorberg.rivencraft.age.PortDayCycle.forLevel(level); // 0=native Overworld/no authored overlay, 1=fog-only backdrop, // 2=native End backdrop, 3=custom Static backdrop. @@ -132,7 +134,8 @@ public class StaticSkyRendererMixin { } if (frame == Long.MIN_VALUE) return; if (rivencraft$staticSky == null) rivencraft$staticSky = new PortStaticSky(); - rivencraft$staticSky.render(renderTarget, fog, frame, rivencraft$endTint); + rivencraft$staticSky.render(renderTarget, fog, frame, rivencraft$endTint, + ((StaticSkyState) state).rivencraft$staticResolution()); if (((StaticSkyState) state).rivencraft$bodyOverlay() == 3) rivencraft$overlay(fog, state); ci.cancel(); } diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/StaticSkyStateMixin.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/StaticSkyStateMixin.java index 202b714..b19521b 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/StaticSkyStateMixin.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/mixin/StaticSkyStateMixin.java @@ -12,6 +12,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class StaticSkyStateMixin implements StaticSkyState { @Unique private long rivencraft$frame = Long.MIN_VALUE; @Unique private int rivencraft$tint = -1; + @Unique private int rivencraft$resolution = net.dnorberg.rivencraft.shared.StaticSkyResolution.DEFAULT; + public int rivencraft$staticResolution() { return rivencraft$resolution; } + public void rivencraft$staticResolution(int resolution) { rivencraft$resolution = resolution; } @Unique private int rivencraft$bearing = -1; @Unique private float rivencraft$sunSize = 1F; @Unique private int rivencraft$celestialTint = -1; @@ -39,6 +42,7 @@ public class StaticSkyStateMixin implements StaticSkyState { private void rivencraft$reset(CallbackInfo ci) { rivencraft$frame = Long.MIN_VALUE; rivencraft$tint = -1; + rivencraft$resolution = net.dnorberg.rivencraft.shared.StaticSkyResolution.DEFAULT; rivencraft$bearing = -1; rivencraft$sunSize = 1F; rivencraft$celestialTint = -1; diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/network/PortBookNetworking.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/network/PortBookNetworking.java index 44940a2..f1adbde 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/network/PortBookNetworking.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/network/PortBookNetworking.java @@ -37,12 +37,12 @@ public final class PortBookNetworking { registrar.playToServer(RequestBookPreviewPayload.TYPE, RequestBookPreviewPayload.STREAM_CODEC, (payload, context) -> { if (context.player() instanceof ServerPlayer player) - net.dnorberg.rivencraft.compat.RebornBookPreviews.open(player, payload); + net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.open(player, payload); }); registrar.playToServer(ReleaseBookPreviewPayload.TYPE, ReleaseBookPreviewPayload.STREAM_CODEC, (payload, context) -> { if (context.player() instanceof ServerPlayer player) - net.dnorberg.rivencraft.compat.RebornBookPreviews.release(player, payload.session()); + net.dnorberg.rivencraft.compat.ImmersiveBookPreviews.release(player, payload.session()); }); registrar.playToServer(SetLinkModifierSeedPayload.TYPE, SetLinkModifierSeedPayload.STREAM_CODEC, (payload, context) -> { diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/portal/CrystalPortalNetwork.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/portal/CrystalPortalNetwork.java index d9caf87..3efd1a7 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/portal/CrystalPortalNetwork.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/portal/CrystalPortalNetwork.java @@ -176,12 +176,12 @@ public final class CrystalPortalNetwork { return false; } } - net.dnorberg.rivencraft.compat.RebornCrystalPortals.refresh(level, receptacle, plan, holder.getBook()); + net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.refresh(level, receptacle, plan, holder.getBook()); return true; } public static void shutdown(ServerLevel level, BlockPos receptacle) { - net.dnorberg.rivencraft.compat.RebornCrystalPortals.remove(level, receptacle); + net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.remove(level, receptacle); // A broken support can disconnect the graph. Scan a bounded volume rather // than trusting a path through blocks that no longer exist. for (BlockPos pos : BlockPos.betweenClosed(receptacle.offset(-CLEANUP_RADIUS, -CLEANUP_RADIUS, -CLEANUP_RADIUS), @@ -224,7 +224,7 @@ public final class CrystalPortalNetwork { } orientSurfaces(level, plan); var holder = (BookReceptacleBlockEntity) level.getBlockEntity(receptacle); - net.dnorberg.rivencraft.compat.RebornCrystalPortals.refresh(level, receptacle, plan, holder.getBook()); + net.dnorberg.rivencraft.compat.ImmersiveCrystalPortals.refresh(level, receptacle, plan, holder.getBook()); return true; } diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/writing/PortAuthoredWriting.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/writing/PortAuthoredWriting.java index 9aff378..5783042 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/writing/PortAuthoredWriting.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/writing/PortAuthoredWriting.java @@ -241,7 +241,7 @@ public final class PortAuthoredWriting { private static PortBiomePlan.Distribution controller(Identifier page) { if (!page.getNamespace().equals(Rivencraft.MOD_ID)) return null; return switch (page.getPath()) { - case "biome/native" -> PortBiomePlan.Distribution.NATIVE; + case "biome/native", "biome/native_caves", "biome/native_nether", "biome/native_end" -> PortBiomePlan.Distribution.NATIVE; case "biome/single" -> PortBiomePlan.Distribution.SINGLE; case "biome/tiled" -> PortBiomePlan.Distribution.TILED; case "biome/grid" -> PortBiomePlan.Distribution.GRID; @@ -423,10 +423,15 @@ public final class PortAuthoredWriting { ? PortBiomePlan.Distribution.TILED : PortBiomePlan.Distribution.MEDIUM; } if (distribution == PortBiomePlan.Distribution.NATIVE) { - var nativePool = caveTerrain - ? (available != null ? available : net.dnorberg.rivencraft.age.PortRandomAgeSelection.caveBiomes(registries)) - : List.of(); - return new PortBiomePlan(distribution, nativePool); + var kind = pages.stream().filter(page -> controller(page) == PortBiomePlan.Distribution.NATIVE) + .map(page -> net.dnorberg.rivencraft.shared.NativeBiomeKind.controller( + page.getPath().substring("biome/".length()))) + .reduce((prior, current) -> current).orElse(net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN); + if (kind == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN && caveTerrain) + kind = net.dnorberg.rivencraft.shared.NativeBiomeKind.CAVES; + return new PortBiomePlan(distribution, + kind == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN ? List.of() + : net.dnorberg.rivencraft.age.PortNativeBiomePools.pool(registries, kind), kind); } if (distribution != null && available != null) { int minimum = distribution == PortBiomePlan.Distribution.SINGLE ? 1 : 2; diff --git a/ports/mc263/src/main/java/net/dnorberg/rivencraft/writing/PortWritingRecovery.java b/ports/mc263/src/main/java/net/dnorberg/rivencraft/writing/PortWritingRecovery.java index f90f127..9d23beb 100644 --- a/ports/mc263/src/main/java/net/dnorberg/rivencraft/writing/PortWritingRecovery.java +++ b/ports/mc263/src/main/java/net/dnorberg/rivencraft/writing/PortWritingRecovery.java @@ -29,13 +29,13 @@ public final class PortWritingRecovery { var entry = PortSymbolPages.find(page); if (entry == null || !PortAuthoredWriting.isPageImplemented(page)) { implemented = false; continue; } String role = entry.role(); - if (pendingNumber != null && !numberTarget(role) - && !(role.equals("color_number") && numberRunTargetsFlooded(pages, index))) { + if (pendingNumber != null && !numberTarget(role, page) + && !(role.equals("color_number") && numberRunTargetsInteger(pages, index))) { diagnostics.add(new Diagnostic("misplaced_modifier", pendingNumber, 100)); pendingNumber = null; } if (role.equals("color_number")) pendingNumber = index; - else if (numberTarget(role)) pendingNumber = null; + else if (numberTarget(role, page)) pendingNumber = null; if (MODIFIERS.contains(role)) pendingModifiers.put(role, index); else if (role.equals("celestial")) pendingModifiers.clear(); if (SINGULAR.contains(role)) { @@ -56,7 +56,7 @@ public final class PortWritingRecovery { for (int index : pendingModifiers.values()) diagnostics.add(new Diagnostic("dangling_modifier", index, 100)); Integer controller = last.get("biome_controller"); - boolean nativeBiomes = controller != null && pages.get(controller).getPath().equals("biome/native"); + boolean nativeBiomes = controller != null && net.dnorberg.rivencraft.shared.NativeBiomeKind.isController(pages.get(controller).getPath().substring("biome/".length())); boolean single = controller != null && pages.get(controller).getPath().equals("biome/single"); if (nativeBiomes && biomes > 0 || single && biomes > 1) diagnostics.add(new Diagnostic("conflict", controller, 500)); @@ -79,18 +79,20 @@ public final class PortWritingRecovery { // The port's category compilers select by role, so no physical resort is necessary. return new Result(active, diagnostics, implemented); } - private static boolean numberRunTargetsFlooded(List pages, int index) { + private static boolean numberRunTargetsInteger(List pages, int index) { for (int next = index + 1; next < pages.size(); next++) { var entry = PortSymbolPages.find(pages.get(next)); if (entry == null) return false; - if (!entry.role().equals("color_number")) return entry.role().equals("flooding"); + if (!entry.role().equals("color_number")) return entry.role().equals("flooding") + || pages.get(next).equals(net.dnorberg.rivencraft.age.PortStaticSkyResolution.PAGE); } return false; } - private static boolean numberTarget(String role) { + private static boolean numberTarget(String role, Identifier page) { return role.equals("color") || role.equals("period_modifier") || role.equals("angle_modifier") - || role.equals("phase_modifier") || role.equals("size_modifier") || role.equals("flooding"); + || role.equals("phase_modifier") || role.equals("size_modifier") || role.equals("flooding") + || page.equals(net.dnorberg.rivencraft.age.PortStaticSkyResolution.PAGE); } private static int stage(String role) { return switch (role) { diff --git a/ports/mc263/src/main/resources/data/rivencraft/tags/worldgen/biome/cave_biomes.json b/ports/mc263/src/main/resources/data/rivencraft/tags/worldgen/biome/cave_biomes.json index 1f0ddfb..fd33bf5 100644 --- a/ports/mc263/src/main/resources/data/rivencraft/tags/worldgen/biome/cave_biomes.json +++ b/ports/mc263/src/main/resources/data/rivencraft/tags/worldgen/biome/cave_biomes.json @@ -3,6 +3,11 @@ "values": [ "minecraft:lush_caves", "minecraft:dripstone_caves", - "minecraft:deep_dark" + "minecraft:deep_dark", + "minecraft:sulfur_caves", + { + "id": "#c:is_cave", + "required": false + } ] } diff --git a/ports/mc263/src/main/resources/rivencraft.mixins.json b/ports/mc263/src/main/resources/rivencraft.mixins.json index 1b2af71..acb8219 100644 --- a/ports/mc263/src/main/resources/rivencraft.mixins.json +++ b/ports/mc263/src/main/resources/rivencraft.mixins.json @@ -17,7 +17,7 @@ "client": [ "StaticSkyStateMixin", "StaticSkyRendererMixin", - "RebornGuiRenderingMixin", + "ImmersiveGuiRenderingMixin", "ClientLevelSoundMixin", "RebornBlockAckMixin" ], diff --git a/scripts/fixtures/desert108/DesertVegetationChecks.java b/scripts/fixtures/desert108/DesertVegetationChecks.java new file mode 100644 index 0000000..6fb041f --- /dev/null +++ b/scripts/fixtures/desert108/DesertVegetationChecks.java @@ -0,0 +1,77 @@ +import java.util.HashMap; +import java.util.Map; +import java.util.Random; +import net.dnorberg.rivencraft.shared.DesertVegetation; +import net.dnorberg.rivencraft.shared.DesertVegetation.*; + +/** Storage-free shared placement checks; no fixture is packaged into either mod JAR. */ +public class DesertVegetationChecks { + record Pos(int x, int y, int z) {} + static class World implements DesertVegetation.World { + final Map plants = new HashMap<>(); + Ground ground = Ground.SAND; + boolean desert = true; + boolean mixed; + boolean blocked; + int ceiling = 320; + int readsOutside; + public int surfaceY(int x, int z) { return 4; } + public int maxY() { return ceiling; } + public boolean desert(int x, int y, int z) { return desert && (!mixed || x < 8); } + public Ground ground(int x, int y, int z) { return ground; } + public boolean air(int x, int y, int z) { + if (x < 0 || x > 15 || z < 0 || z > 15) readsOutside++; + return y >= 4 && !blocked && !plants.containsKey(new Pos(x,y,z)); + } + public void set(int x, int y, int z, Plant plant) { + if (x < 0 || x > 15 || z < 0 || z > 15 || y >= ceiling) + throw new AssertionError("Write outside chunk/world bounds"); + if (plants.putIfAbsent(new Pos(x,y,z),plant) != null) + throw new AssertionError("Overwrote existing vegetation"); + } + } + static int place(World w, Kind k, long seed) { + return DesertVegetation.place(w,k,0,0,new Random(seed)::nextInt); + } + static void check(boolean condition, String label) { + if (!condition) throw new AssertionError(label); + } + public static void main(String[] args) { + for (Kind kind : Kind.values()) { + var a = new World(); + int count = place(a,kind,108); + check(count > 0,"Page produces plants: "+kind); + var b = new World(); + place(b,kind,108); + check(a.plants.equals(b.plants),"Seeded repeatability: "+kind); + check(a.readsOutside == 0,"Chunk-local checks: "+kind); + if (kind == Kind.FLOWERS) + check(a.plants.values().stream().allMatch(p -> p == Plant.DEAD_BUSH),"Desert plants only"); + else { + int max = a.plants.keySet().stream().mapToInt(Pos::y).max().orElseThrow() - 3; + check(kind == Kind.HUGE_TREES ? max >= 5 && max <= 9 : max <= 3,"Cactus heights"); + } + int original = a.plants.size(); + for (int n=1;n<4;n++) place(a,kind,108+n); + check(a.plants.size() > original,"Repeated pages add plants: "+kind); + + var outside = new World(); outside.desert = false; + check(place(outside,kind,108)==0 && outside.plants.isEmpty(),"No non-desert writes"); + var unsupported = new World(); unsupported.ground=Ground.OTHER; + check(place(unsupported,kind,108)==0 && unsupported.plants.isEmpty(),"Preserve rock/invalid ground"); + var blocked = new World(); blocked.blocked=true; blocked.ground=Ground.SOIL; + check(place(blocked,kind,108)==0 && blocked.plants.isEmpty(),"No partial writes when obstructed"); + var mixed = new World(); mixed.mixed=true; + place(mixed,kind,108); + check(mixed.plants.keySet().stream().allMatch(p -> p.x()<8),"Candidate biome selection"); + } + var flat = new World(); flat.ground=Ground.SOIL; + int cacti=place(flat,Kind.TREES,108); + check(cacti>0 && flat.plants.values().stream().filter(p -> p==Plant.SAND).count()==cacti, + "Flat soil converts exactly one base per cactus"); + var low = new World(); low.ceiling=8; + check(place(low,Kind.HUGE_TREES,108)==0 && low.plants.isEmpty(),"No truncated tall cactus/headroom writes"); + System.out.println("DESERT108_PASS: placement, heights, repeated pages, seed repeatability, biome boundaries, " + +"chunk bounds, obstruction, ground protection, Flat bases and ceiling"); + } +} diff --git a/scripts/fixtures/desert263/net/dnorberg/rivencraft/regression/DesertProbe.java b/scripts/fixtures/desert263/net/dnorberg/rivencraft/regression/DesertProbe.java new file mode 100644 index 0000000..747486b --- /dev/null +++ b/scripts/fixtures/desert263/net/dnorberg/rivencraft/regression/DesertProbe.java @@ -0,0 +1,64 @@ +package net.dnorberg.rivencraft.regression; + +import java.util.List; +import net.dnorberg.rivencraft.age.*; +import net.dnorberg.rivencraft.writing.PortRegistryPages; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.Blocks; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.server.ServerStartedEvent; + +@EventBusSubscriber(modid="rivencraft") +public class DesertProbe { + @SubscribeEvent public static void start(ServerStartedEvent event) { + event.getServer().execute(() -> { + try { + var server=event.getServer(); + for (String name : List.of("minecraft:desert","biomesoplenty:dryland")) { + var biome=server.registryAccess().lookupOrThrow(Registries.BIOME) + .getOrThrow(ResourceKey.create(Registries.BIOME,Identifier.parse(name))); + System.out.println("DESERT263_CLASSIFY "+name+" own="+biome.is(PortSurfaceVegetation.DESERTS) + +" common="+biome.is(TagKey.create(Registries.BIOME,Identifier.parse("c:is_desert"))) + +" cave="+PortRegistryPages.isCaveBiome(biome)); + var level=RuntimeAgeBackend.create(server,Identifier.parse("rivencraft:age/probe_"+name.split(":")[1]), + 1115555888188619066L, + new PortBiomePlan(PortBiomePlan.Distribution.SINGLE,List.of(Identifier.parse(name))), + PortAgeTerrain.FLAT,null, + new PortVegetationPlan(List.of(PortVegetationPlan.TREES,PortVegetationPlan.HUGE_TREES, + PortVegetationPlan.FLOWERS)),0,null,null); + level.getChunk(0,0); + var probePos=new BlockPos(8,3,8); + System.out.println("DESERT263_HEIGHT "+name + +" motion="+level.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.MOTION_BLOCKING_NO_LEAVES,8,8) + +" wg="+level.getHeight(net.minecraft.world.level.levelgen.Heightmap.Types.WORLD_SURFACE_WG,8,8) + +" ground="+level.getBlockState(probePos) + +" dirt="+level.getBlockState(probePos).is(net.minecraft.tags.BlockTags.DIRT) + +" belowSturdy="+level.getBlockState(probePos.below()).isFaceSturdy(level,probePos.below(),net.minecraft.core.Direction.UP)); + java.util.Map ground=new java.util.TreeMap<>(); + int cacti=0,bushes=0; + for(int x=0;x<16;x++)for(int z=0;z<16;z++) { + ground.merge(level.getBlockState(new BlockPos(x,4,z)).toString(),1,Integer::sum); + for(int y=4;y<20;y++) { + var state=level.getBlockState(new BlockPos(x,y,z)); + if(state.is(Blocks.CACTUS))cacti++; + if(state.is(Blocks.DEAD_BUSH))bushes++; + } + } + System.out.println("DESERT263_RESULT "+name+" cacti="+cacti+" bushes="+bushes+" ground="+ground); + if(cacti==0) + throw new AssertionError("No authored cactus in "+name); + } + System.out.println("DESERT263_PASS"); + }catch(Throwable error){ + System.out.println("DESERT263_FAIL "+error); + error.printStackTrace(); + }finally{event.getServer().halt(false);} + }); + } +} diff --git a/scripts/fixtures/native111/mc1211/net/dnorberg/rivencraft/book/NativeBiomeProbe.java b/scripts/fixtures/native111/mc1211/net/dnorberg/rivencraft/book/NativeBiomeProbe.java new file mode 100644 index 0000000..d169e6c --- /dev/null +++ b/scripts/fixtures/native111/mc1211/net/dnorberg/rivencraft/book/NativeBiomeProbe.java @@ -0,0 +1,143 @@ +package net.dnorberg.rivencraft.book; +import java.util.*; +import net.dnorberg.rivencraft.shared.NativeBiomeKind; +import net.dnorberg.rivencraft.compat.TerraBlenderBiomes; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.BiomeTags; +import net.minecraft.world.level.biome.*; +import net.minecraft.server.MinecraftServer; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.server.ServerStartedEvent; + + +@EventBusSubscriber(modid="rivencraft") +public final class NativeBiomeProbe { + static net.dnorberg.rivencraft.writing.WritingEntry page(String path) { + return net.dnorberg.rivencraft.writing.WritingEntry.symbol( + new net.dnorberg.rivencraft.writing.SymbolReference(id(path))); + } + static int checks; + static void check(boolean value,String label) { if(!value) throw new AssertionError(label); checks++; } + static ResourceLocation id(String path) { return ResourceLocation.fromNamespaceAndPath("rivencraft",path); } + @SubscribeEvent public static void start(ServerStartedEvent event) { + event.getServer().execute(() -> { + try { run(event.getServer()); System.out.println("NATIVE111_PASS checks="+checks); } + catch(Throwable error) { System.out.println("NATIVE111_FAIL "+error); error.printStackTrace(); } + finally { event.getServer().halt(false); } + }); + } + static void run(MinecraftServer server) throws Exception { + var registry=server.registryAccess().lookupOrThrow(Registries.BIOME); + var nether=new HashSet<>(TerraBlenderBiomes.nether(server.registryAccess())); + nether.remove(ResourceLocation.parse("terrablender:deferred_placeholder")); + var caves=NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES); + check(caves.size()>=3,"Multiple baseline caves"); + check(caves.stream().allMatch(key->!registry.getOrThrow(ResourceKey.create(Registries.BIOME,key)) + .is(BiomeTags.IS_NETHER) && !nether.contains(key)),"Native caves exclude all Nether sources"); + check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).containsAll(nether),"Region-based Nether inclusion"); + var lush=registry.getOrThrow(Biomes.LUSH_CAVES); + var bind=Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class); + bind.setAccessible(true); + var old=lush.tags().toList(); + try { + var tags=new ArrayList<>(old);tags.add(BiomeTags.IS_NETHER);bind.invoke(lush,tags); + check(!NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.location()), + "Nether wins over overlapping Cave tag"); + } finally { bind.invoke(lush,old); } + if(!nether.isEmpty()) { + var key=nether.stream().sorted().findFirst().orElseThrow(); + var biome=registry.getOrThrow(ResourceKey.create(Registries.BIOME,key)); + var original=biome.tags().toList(); + try { + var tags=new ArrayList<>(original);tags.remove(BiomeTags.IS_NETHER);tags.add(NativeBiomePools.CAVES); + bind.invoke(biome,tags); + check(!biome.is(BiomeTags.IS_NETHER),"Region-only fixture lacks Nether tag"); + check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).contains(key),"Region-only Nether retained"); + check(!NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(key),"Region-only Nether excluded from Caves"); + } finally { bind.invoke(biome,original); } + } + var allTags=new LinkedHashMap,List>>(); + try { + registry.listElements().forEach(biome->{ + var tags=biome.tags().toList();allTags.put(biome,tags); + var stripped=new ArrayList<>(tags);stripped.remove(NativeBiomePools.CAVES); + try { bind.invoke(biome,stripped); } catch(Exception error) { throw new RuntimeException(error); } + }); + check(NativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.location()), + "Empty cave tag has non-Nether vanilla fallback"); + } finally { + for(var entry:allTags.entrySet()) bind.invoke(entry.getKey(),entry.getValue()); + } + var traits=AgeTraits.select(111L).withBiomeDistribution(AgeTraits.BiomeDistribution.NATIVE); + var sourceMethod=AgeDimensionService.class.getDeclaredMethod("createBiomeSource", + MinecraftServer.class,AgeDefinition.class,AgeRuntimeProfile.class); + sourceMethod.setAccessible(true); + for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END)) + for(var terrain:List.of("standard","amplified","island","cave","flat","void")) { + var writing=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of( + net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/"+terrain), + page("biome/native_"+family.name().toLowerCase(Locale.ROOT)))); + var plan=AgeGenerationPlan.compile(writing,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess()); + check(plan.biomeSelection().nativeKind()==family,"Family on "+terrain); + check(plan.biomeSelection().biomes().equals(NativeBiomePools.pool(server.registryAccess(),family)),"Frozen family pool"); + var loaded=AgeGenerationPlan.load(plan.save()); + check(loaded.biomeSelection().equals(plan.biomeSelection()),"Plan reload"); + var age=new AgeDefinition(UUID.randomUUID(),"probe",111L,AgeGenerationProfiles.STANDARD, + AgeDefinition.CURRENT_GENERATION_VERSION,0L,id("age/probe"),null,traits,loaded); + var source=(BiomeSource)sourceMethod.invoke(null,server,age,loaded.runtimeProfile()); + check(source.possibleBiomes().stream().map(b->b.unwrapKey().orElseThrow().location()).collect(java.util.stream.Collectors.toSet()) + .equals(new HashSet<>(plan.biomeSelection().biomes())),"Generator consumes family on "+terrain); + } + var repeated=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of( + net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/flat"), + page("biome/native_nether"),page("biome/native_end"))); + check(AgeGenerationPlan.compile(repeated,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess()) + .biomeSelection().nativeKind()==NativeBiomeKind.END,"Last family controller wins"); + var caveProfile=AgeRuntimeProfiles.resolve(AgeGenerationProfiles.CAVE); + var empty=net.dnorberg.rivencraft.writing.WritingGrammar.parse(net.dnorberg.rivencraft.writing.OrderedWriting.EMPTY); + var omitted=AgeBiomeSelection.compile(empty,traits,caveProfile,111L,server.registryAccess()); + check(omitted.nativeKind()==NativeBiomeKind.CAVES && omitted.biomes().equals(caves),"Seed-completed Cave Native"); + var nativeWriting=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of( + net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/cave"),page("biome/native"))); + check(AgeGenerationPlan.compile(nativeWriting,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess()) + .biomeSelection().biomes().equals(caves),"Explicit Cave Native"); + var authored=new net.dnorberg.rivencraft.writing.OrderedWriting(List.of( + net.dnorberg.rivencraft.writing.WritingEntry.linkPanel(),page("terrain/cave"), + page("biome/crimson_forest"),page("biome/single"))); + check(AgeGenerationPlan.compile(authored,111L,AgeGenerationProfiles.STANDARD,traits,server.registryAccess()) + .biomeSelection().biomes().equals(List.of(ResourceLocation.withDefaultNamespace("crimson_forest"))),"Authored Nether Cave retained"); + var oldPool=new AgeBiomeSelection(AgeTraits.BiomeDistribution.NATIVE,List.of( + ResourceLocation.withDefaultNamespace("lush_caves"),ResourceLocation.withDefaultNamespace("crimson_forest"))); + var tag=oldPool.save();tag.remove("NativeKind"); + check(AgeBiomeSelection.load(tag).equals(oldPool),"Old frozen mixed pool retained"); + var one=new AgeBiomeSelection(AgeTraits.BiomeDistribution.NATIVE,List.of(ResourceLocation.withDefaultNamespace("lush_caves")),NativeBiomeKind.CAVES); + check(AgeBiomeSelection.load(one.save()).equals(one),"Single-cave pool is valid"); + var policy=new RandomPagePolicy(Set.of(id("biome/native_nether")),Set.of()); + check(policy.allows(id("biome/plains")) && !policy.allows(id("biome/native")),"Controller lists do not restrict individual biomes"); + String name=null; + for(int i=0;i<10000;i++) { + String candidate="native111_"+i; + long seed=server.overworld().getSeed()+AgeDefinition.namedDimensionId(candidate).hashCode(); + if(AgeRuntimeProfiles.select(seed).equals(AgeGenerationProfiles.CAVE) + && AgeTraits.select(seed).biomeDistribution()==AgeTraits.BiomeDistribution.NATIVE) {name=candidate;break;} + } + check(name!=null,"Find random Native Cave seed"); + var age=AgeRegistrySavedData.resolveOrCreate(server.overworld(),new AgeReference(UUID.randomUUID(),name)); + check(age.randomBiomes()!=null && age.randomBiomes().nativeKind()==NativeBiomeKind.CAVES,"Random Native Cave frozen at creation"); + check(age.withSpawn(new net.minecraft.core.BlockPos(0,64,0)).randomBiomes().equals(age.randomBiomes()),"Spawn update preserves pool"); + var saved=AgeRegistrySavedData.get(server.overworld()).save(new net.minecraft.nbt.CompoundTag(),server.registryAccess()); + var restored=AgeRegistrySavedData.load(saved,server.registryAccess()).find(age.id()).orElseThrow(); + check(restored.randomBiomes().equals(age.randomBiomes()),"Random pool registry round trip"); + + try(var stream=NativeBiomeProbe.class.getResourceAsStream("/assets/rivencraft/creative_symbol_pages.json")) { + var index=com.google.gson.JsonParser.parseReader(new java.io.InputStreamReader(stream)).getAsJsonObject(); + for(var family:List.of("native_caves","native_nether","native_end")) + check(index.getAsJsonObject("rivencraft:biome/"+family).getAsJsonObject("semantics") + .get("role").getAsString().equals("biome_controller"),"Creative/JEI index controller "+family); + } + } +} diff --git a/scripts/fixtures/native111/mc263/net/dnorberg/rivencraft/age/NativeBiomeProbe.java b/scripts/fixtures/native111/mc263/net/dnorberg/rivencraft/age/NativeBiomeProbe.java new file mode 100644 index 0000000..3455cf5 --- /dev/null +++ b/scripts/fixtures/native111/mc263/net/dnorberg/rivencraft/age/NativeBiomeProbe.java @@ -0,0 +1,128 @@ +package net.dnorberg.rivencraft.age; +import java.util.*; +import net.dnorberg.rivencraft.shared.NativeBiomeKind; +import net.dnorberg.rivencraft.compat.TerraBlenderBiomes; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.BiomeTags; +import net.minecraft.world.level.biome.*; +import net.minecraft.server.MinecraftServer; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.server.ServerStartedEvent; + + +@EventBusSubscriber(modid="rivencraft") +public final class NativeBiomeProbe { + static int checks; + static void check(boolean value,String label) { if(!value) throw new AssertionError(label); checks++; } + static Identifier id(String path) { return Identifier.fromNamespaceAndPath("rivencraft",path); } + @SubscribeEvent public static void start(ServerStartedEvent event) { + event.getServer().execute(() -> { + try { run(event.getServer()); System.out.println("NATIVE111_PASS checks="+checks); } + catch(Throwable error) { System.out.println("NATIVE111_FAIL "+error); error.printStackTrace(); } + finally { event.getServer().halt(false); } + }); + } + static void run(MinecraftServer server) throws Exception { + var registry=server.registryAccess().lookupOrThrow(Registries.BIOME); + var nether=new HashSet<>(TerraBlenderBiomes.nether(server.registryAccess())); + nether.remove(Identifier.parse("terrablender:deferred_placeholder")); + var caves=PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES); + check(caves.size()>=3,"Multiple baseline caves"); + check(caves.stream().allMatch(key->!registry.getOrThrow(ResourceKey.create(Registries.BIOME,key)) + .is(BiomeTags.IS_NETHER) && !nether.contains(key)),"Native caves exclude all Nether sources"); + check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).containsAll(nether),"Region-based Nether inclusion"); + var lush=registry.getOrThrow(Biomes.LUSH_CAVES); + var bind=Holder.Reference.class.getDeclaredMethod("bindTags",Collection.class); + bind.setAccessible(true); + var old=lush.tags().toList(); + try { + var tags=new ArrayList<>(old);tags.add(BiomeTags.IS_NETHER);bind.invoke(lush,tags); + check(!PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.identifier()), + "Nether wins over overlapping Cave tag"); + } finally { bind.invoke(lush,old); } + if(!nether.isEmpty()) { + var key=nether.stream().sorted().findFirst().orElseThrow(); + var biome=registry.getOrThrow(ResourceKey.create(Registries.BIOME,key)); + var original=biome.tags().toList(); + try { + var tags=new ArrayList<>(original);tags.remove(BiomeTags.IS_NETHER);tags.add(PortNativeBiomePools.CAVES); + bind.invoke(biome,tags); + check(!biome.is(BiomeTags.IS_NETHER),"Region-only fixture lacks Nether tag"); + check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.NETHER).contains(key),"Region-only Nether retained"); + check(!PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(key),"Region-only Nether excluded from Caves"); + } finally { bind.invoke(biome,original); } + } + var allTags=new LinkedHashMap,List>>(); + try { + registry.listElements().forEach(biome->{ + var tags=biome.tags().toList();allTags.put(biome,tags); + var stripped=new ArrayList<>(tags);stripped.remove(PortNativeBiomePools.CAVES); + try { bind.invoke(biome,stripped); } catch(Exception error) { throw new RuntimeException(error); } + }); + check(PortNativeBiomePools.pool(server.registryAccess(),NativeBiomeKind.CAVES).contains(Biomes.LUSH_CAVES.identifier()), + "Empty cave tag has non-Nether vanilla fallback"); + } finally { + for(var entry:allTags.entrySet()) bind.invoke(entry.getKey(),entry.getValue()); + } + var sourceMethod=RuntimeAgeBackend.class.getDeclaredMethod("authoredBiomeSource", + MinecraftServer.class,PortBiomePlan.class,long.class);sourceMethod.setAccessible(true); + for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END)) + for(var terrain:List.of("standard","amplified","island","cave","flat","void")) { + var selected=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,List.of( + id("terrain/"+terrain),id("biome/native_"+family.name().toLowerCase(Locale.ROOT))),111L); + var plan=selected.biomes(); + check(plan.nativeKind()==family,"Family on "+terrain); + check(plan.biomes().equals(PortNativeBiomePools.pool(server.registryAccess(),family)),"Frozen family pool"); + var saved=PortBiomePlan.CODEC.encodeStart(com.mojang.serialization.JsonOps.INSTANCE,plan).getOrThrow(); + check(PortBiomePlan.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,saved).getOrThrow().equals(plan),"Plan codec reload"); + var source=(BiomeSource)sourceMethod.invoke(null,server,plan,111L); + check(source.possibleBiomes().stream().map(b->b.unwrapKey().orElseThrow().identifier()).collect(java.util.stream.Collectors.toSet()) + .equals(new HashSet<>(plan.biomes())),"Source consumes family"); + } + check(net.dnorberg.rivencraft.writing.PortAuthoredWriting.biomePlan(List.of(id("terrain/flat"), + id("biome/native_nether"),id("biome/native_end")),server,111L).nativeKind()==NativeBiomeKind.END, + "Last family controller wins even for direct compiler calls"); + var explicit=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server, + List.of(id("terrain/cave"),id("biome/native")),111L).biomes(); + check(explicit.nativeKind()==NativeBiomeKind.CAVES && explicit.biomes().equals(caves),"Explicit Cave Native"); + long nativeSeed=0; + while(PortRandomAgeSelection.distribution(nativeSeed)!=PortBiomePlan.Distribution.NATIVE)nativeSeed++; + var omitted=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server, + List.of(id("terrain/cave")),nativeSeed).biomes(); + check(omitted.nativeKind()==NativeBiomeKind.CAVES,"Seed-completed Native Cave"); + long randomSeed=0; + while(PortRandomAgeSelection.terrain(randomSeed)!=PortAgeTerrain.CAVE + || PortRandomAgeSelection.distribution(randomSeed)!=PortBiomePlan.Distribution.NATIVE)randomSeed++; + var random=PortRandomAgeSelection.select(server,randomSeed); + check(random.biomes().nativeKind()==NativeBiomeKind.CAVES && random.biomes().biomes().equals(caves),"Random Native Cave"); + var authored=net.dnorberg.rivencraft.writing.PortAuthoredTerrainSelection.select(server,List.of( + id("terrain/cave"),id("biome/crimson_forest"),id("biome/single")),111L).biomes(); + check(authored.biomes().equals(List.of(Identifier.withDefaultNamespace("crimson_forest"))),"Authored Nether Cave retained"); + var oldJson=com.google.gson.JsonParser.parseString( + "{\"distribution\":\"NATIVE\",\"biomes\":[\"minecraft:lush_caves\",\"minecraft:crimson_forest\"]}"); + var oldPool=PortBiomePlan.CODEC.parse(com.mojang.serialization.JsonOps.INSTANCE,oldJson).getOrThrow(); + check(oldPool.nativeKind()==NativeBiomeKind.TERRAIN && oldPool.biomes().size()==2,"Old frozen mixed pool retained"); + var policy=new PortRandomPagePolicy(Set.of(id("biome/native_nether")),Set.of()); + check(policy.allows(id("biome/plains")) && !policy.allows(id("biome/native")),"Policy category"); + int n=0; + for(var family:List.of(NativeBiomeKind.CAVES,NativeBiomeKind.NETHER,NativeBiomeKind.END)) { + var terrain=family==NativeBiomeKind.CAVES?PortAgeTerrain.VOID:family==NativeBiomeKind.NETHER?PortAgeTerrain.STANDARD:PortAgeTerrain.CAVE; + var plan=new PortBiomePlan(PortBiomePlan.Distribution.NATIVE,PortNativeBiomePools.pool(server.registryAccess(),family),family); + var age=RuntimeAgeBackend.create(server,id("age/native111_"+n++),111L,plan,terrain); + check(age.getChunkSource().getGenerator().getBiomeSource().possibleBiomes().size()==plan.biomes().size(),"Runtime terrain override "+terrain); + } + check(registry.get(ResourceKey.create(Registries.BIOME,Identifier.withDefaultNamespace("sulfur_caves"))).isEmpty() + || caves.contains(Identifier.withDefaultNamespace("sulfur_caves")),"New vanilla Sulfur Caves included"); + + try(var stream=NativeBiomeProbe.class.getResourceAsStream("/assets/rivencraft/creative_symbol_pages.json")) { + var index=com.google.gson.JsonParser.parseReader(new java.io.InputStreamReader(stream)).getAsJsonObject(); + for(var family:List.of("native_caves","native_nether","native_end")) + check(index.getAsJsonObject("rivencraft:biome/"+family).getAsJsonObject("semantics") + .get("role").getAsString().equals("biome_controller"),"Creative/JEI index controller "+family); + } + } +} diff --git a/scripts/fixtures/portal117/net/dnorberg/rivencraft/regression/PortalEngineProbe.java b/scripts/fixtures/portal117/net/dnorberg/rivencraft/regression/PortalEngineProbe.java new file mode 100644 index 0000000..b377591 --- /dev/null +++ b/scripts/fixtures/portal117/net/dnorberg/rivencraft/regression/PortalEngineProbe.java @@ -0,0 +1,124 @@ +package net.dnorberg.rivencraft.regression; + +import java.util.List; +import net.dnorberg.rivencraft.Rivencraft; +import net.dnorberg.rivencraft.PortConfig; +import net.dnorberg.rivencraft.age.*; +import net.dnorberg.rivencraft.compat.*; +import net.dnorberg.rivencraft.portal.*; +import net.dnorberg.rivencraft.block.*; +import net.dnorberg.rivencraft.block.entity.BookReceptacleBlockEntity; +import net.dnorberg.rivencraft.item.LinkBookTarget; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.AABB; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.server.ServerStartedEvent; + +@EventBusSubscriber(modid="rivencraft") +public final class PortalEngineProbe { + private static int checks; + @SubscribeEvent public static void join(net.neoforged.neoforge.event.entity.EntityJoinLevelEvent event) { + if(event.getEntity().getClass().getName().startsWith("qouteall.imm_ptl")) + System.out.println("PORTAL117_SPAWN "+event.getEntity()+" at "+event.getEntity().getBoundingBox()); + } + private static void check(boolean pass,String label) { + if(!pass) throw new AssertionError(label); + checks++; + } + private static int warmup; + @SubscribeEvent public static void start(ServerStartedEvent event) { + event.getServer().overworld().setChunkForced(0,0,true); + warmup=3; + } + @SubscribeEvent public static void tick(net.neoforged.neoforge.event.tick.ServerTickEvent.Post event) { + if(warmup<=0 || --warmup!=0) return; + event.getServer().execute(() -> { + try { + run(event.getServer()); + System.out.println("PORTAL117_PASS checks="+checks); + }catch(Throwable error) { + System.out.println("PORTAL117_FAIL "+error); + error.printStackTrace(); + }finally { event.getServer().halt(false); } + }); + } + private static void run(net.minecraft.server.MinecraftServer server) { + boolean nativeViews=ImmersiveBookPreviews.available(); + check(ImmersiveBookPreviews.bookViewsEnabled()==nativeViews,"Default book view selection"); + check(ImmersiveBookPreviews.crystalViewsEnabled()==nativeViews,"Default crystal view selection"); + var id=Identifier.parse("rivencraft:age/portal117"); + var destination=RuntimeAgeBackend.create(server,id,117L,null,PortAgeTerrain.FLAT); + check(ImmersivePortalsCompatibility.synchronize(server),"Dynamic catalog sync"); + check(server.getLevel(destination.dimension())==destination,"First-party Age remains authoritative"); + destination.getChunkAt(new BlockPos(24,4,24)); + var level=server.overworld(); + level.getChunk(0,0); + var owner=new BlockPos(7,65,7); + for(int x=7;x<=10;x++) for(int y=64;y<=68;y++) + if(x==7 || x==10 || y==64 || y==68) + level.setBlock(new BlockPos(x,y,8),Rivencraft.CRYSTAL_BLOCK.get().defaultBlockState(),2); + level.setBlock(owner,Rivencraft.BOOK_RECEPTACLE.get().defaultBlockState() + .setValue(BookReceptacleBlock.FACING,Direction.NORTH),2); + var holder=(BookReceptacleBlockEntity)level.getBlockEntity(owner); + var book=new ItemStack(Rivencraft.LINKING_BOOK.get()); + book.set(Rivencraft.LINK_BOOK_TARGET.get(),new LinkBookTarget(id,24.5,4,24.5,90,0)); + holder.setBook(book); + var plan=CrystalPortalNetwork.plan(level,owner); + check(plan.valid() && plan.portalCells().size()==6,"One six-cell opening"); + check(CrystalPortalNetwork.activate(level,owner,plan,null),"Frame activation"); + System.out.println("PORTAL117_SURFACES "+CrystalPortalSurfaces.group(level,plan)); + System.out.println("PORTAL117_DEST "+PortalBookTravel.destination(level,book,owner,0,0)); + if(nativeViews) System.out.println("PORTAL117_NATIVE "+Native.count(level,owner)); + check(plan.portalCells().stream().allMatch(pos->level.getBlockState(pos).getValue(CrystalPortalBlock.LIVE_VIEW)==nativeViews), + "Native or fallback state"); + if(nativeViews) Native.checkViews(level,owner,plan,id); + CrystalPortalNetwork.shutdown(level,owner); + if(nativeViews) check(Native.count(level,owner)==0,"Shutdown removes native surfaces"); + check(plan.portalCells().stream().noneMatch(pos->level.getBlockState(pos).is(Rivencraft.CRYSTAL_PORTAL.get())), + "Shutdown removes cells"); + } + private static final class Native { + static java.util.List portals( + net.minecraft.server.level.ServerLevel level,BlockPos owner) { + return level.getEntitiesOfClass(qouteall.imm_ptl.core.portal.Portal.class,new AABB(owner).inflate(20), + e->e.portalTag!=null && e.portalTag.startsWith("rivencraft:crystal:mc263:v1:")); + } + static int count(net.minecraft.server.level.ServerLevel level,BlockPos owner) { return portals(level,owner).size(); } + static void checkViews(net.minecraft.server.level.ServerLevel level,BlockPos owner, + CrystalPortalNetwork.Plan plan,Identifier id) { + var views=portals(level,owner); + check(views.size()==2,"One continuous mesh per side, not six repeated views"); + for(var view:views) { + check(!view.getTeleportable() && !view.isInteractable(),"Rivencraft retains travel/interactions"); + double spanX=Math.abs(view.getAxisW().x*view.getWidth())+Math.abs(view.getAxisH().x*view.getHeight()); + double spanY=Math.abs(view.getAxisW().y*view.getWidth())+Math.abs(view.getAxisH().y*view.getHeight()); + check(Math.abs(spanX-2)<0.00001 && Math.abs(spanY-3)<0.00001,"Whole opening dimensions"); + var eye=new net.minecraft.world.phys.Vec3(9,65+1.62,8.5); + check(view.transformPoint(eye).distanceTo(new net.minecraft.world.phys.Vec3(24.5,4+1.62,24.5))<0.00001, + "Standing eye maps to exact linked arrival"); + check(view.getDestDim().identifier().equals(id),"Dynamic destination"); + check(view.getPortalShape() instanceof qouteall.imm_ptl.core.portal.shape.SpecialFlatPortalShape, + "Masked opening mesh"); + } + var ids=views.stream().map(net.minecraft.world.entity.Entity::getUUID).collect(java.util.stream.Collectors.toSet()); + ImmersiveCrystalPortals.refresh(level,owner,plan, + ((BookReceptacleBlockEntity)level.getBlockEntity(owner)).getBook()); + check(portals(level,owner).stream().allMatch(p->ids.contains(p.getUUID())),"Refresh reuses existing views"); + var setting=ImmersiveBookPreviews.seamless()?PortConfig.SEAMLESS_CRYSTAL_VIEWS:PortConfig.CRYSTAL_LIVE_VIEWS; + setting.set(false); + ImmersiveCrystalPortals.refresh(level,owner,plan, + ((BookReceptacleBlockEntity)level.getBlockEntity(owner)).getBook()); + check(count(level,owner)==0,"Config disable removes views"); + check(plan.portalCells().stream().noneMatch(pos->level.getBlockState(pos).getValue(CrystalPortalBlock.LIVE_VIEW)), + "Disabled config restores animated fallback"); + setting.set(true); + ImmersiveCrystalPortals.refresh(level,owner,plan, + ((BookReceptacleBlockEntity)level.getBlockEntity(owner)).getBook()); + check(count(level,owner)==2,"Config enable rebuilds views"); + } + } +} diff --git a/scripts/fixtures/static109/mc1211/net/dnorberg/rivencraft/regression/StaticSkyProbe.java b/scripts/fixtures/static109/mc1211/net/dnorberg/rivencraft/regression/StaticSkyProbe.java new file mode 100644 index 0000000..b185b85 --- /dev/null +++ b/scripts/fixtures/static109/mc1211/net/dnorberg/rivencraft/regression/StaticSkyProbe.java @@ -0,0 +1,70 @@ +package net.dnorberg.rivencraft.regression; +import java.util.List; +import io.netty.buffer.Unpooled; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.server.ServerStartedEvent; +import net.dnorberg.rivencraft.book.*; +import net.dnorberg.rivencraft.writing.*; +import net.dnorberg.rivencraft.network.AgeCelestialAnglePayload; +import net.minecraft.resources.ResourceLocation; +@EventBusSubscriber(modid="rivencraft") +public class StaticSkyProbe { + static int checks; + static void check(boolean condition,String label) { + if(!condition) throw new AssertionError(label); + checks++; + } + @SubscribeEvent public static void start(ServerStartedEvent event) { + event.getServer().execute(() -> { + try { + run(event.getServer()); + System.out.println("STATIC109_PASS checks="+checks); + }catch(Throwable error) { + System.out.println("STATIC109_FAIL "+error); + error.printStackTrace(); + }finally { event.getServer().halt(false); } + }); + } + static WritingEntry page(String id) { + return WritingEntry.symbol(new SymbolReference(ResourceLocation.fromNamespaceAndPath("rivencraft",id))); + } + static AgeGenerationPlan plan(net.minecraft.server.MinecraftServer server,String... ids) { + var entries=new java.util.ArrayList(); + entries.add(WritingEntry.linkPanel()); + for(var id:ids) entries.add(page(id)); + return AgeGenerationPlan.compile(new OrderedWriting(entries),109L, + AgeGenerationProfiles.STANDARD,AgeTraits.select(109L),server.registryAccess()); + } + static void run(net.minecraft.server.MinecraftServer server) { + String[][] pages={{"sky/static"},{"number/0","sky/static"},{"number/8","sky/static"}, + {"number/1","number/23","sky/static"},{"number/5","number/3","sky/static"}, + {"number/24","number/24","sky/static"}}; + int[] expected={48,1,8,48,128,128}; + for(int i=0;i { + try { + run(event.getServer()); + System.out.println("STATIC109_PASS checks="+checks); + }catch(Throwable error) { + System.out.println("STATIC109_FAIL "+error); + error.printStackTrace(); + }finally { event.getServer().halt(false); } + }); + } + static List pages(String... paths) { + return java.util.Arrays.stream(paths).map(s->Identifier.fromNamespaceAndPath("rivencraft",s)).toList(); + } + static void run(net.minecraft.server.MinecraftServer server) { + String[][] cases={{"sky/static"},{"number/0","sky/static"},{"number/8","sky/static"}, + {"number/1","number/23","sky/static"},{"number/5","number/3","sky/static"}, + {"number/24","number/24","sky/static"}}; + int[] expected={48,1,8,48,128,128}; + for(int i=0;i + p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """')) + p.afterEvaluate { + p.dependencies.add('localRuntime', p.files('""" + "','".join(str(path) for path in extra) + """')) + p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/desert263") + """')) + } +} +""") + server = work / "server" + server.mkdir() + (server / "eula.txt").write_text("eula=true\n") + (server / "server.properties").write_text( + "server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n" + "level-type=minecraft:flat\nlevel-seed=107\nview-distance=2\nsimulation-distance=2\n" + 'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n') + process = None + try: + with log.open("w") as output: + process = subprocess.Popen([str(ROOT / "gradlew"), "-p", str(ROOT / "ports/mc263"), + "--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"], + cwd=ROOT, stdin=subprocess.PIPE, stdout=output, stderr=subprocess.STDOUT, + text=True, start_new_session=True) + try: + process.wait(timeout=60) + except subprocess.TimeoutExpired: + print("HANDOFF: Desert probe stalled; stopping without retry. Use docs/DESERT_VEGETATION.md.") + return 2 + text = log.read_text() + if process.returncode or "DESERT263_PASS" not in text or "DESERT263_FAIL" in text: + print(text[-10000:]) + return 1 + print(next(line for line in text.splitlines() if "DESERT263_PASS" in line)) + return 0 + finally: + stop(process) + print("Removing temporary server world, fixture configuration and isolated outputs. Log:", log) + + +if __name__ == "__main__": + raise SystemExit(run()) diff --git a/scripts/regression_native111.py b/scripts/regression_native111.py new file mode 100644 index 0000000..b215477 --- /dev/null +++ b/scripts/regression_native111.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 +"""Check Native biome-family contracts; real rendering remains player validation.""" +import argparse +import subprocess +import tempfile +from pathlib import Path +from server_test_lock import server_test_lock +from smoke_server import stop + +ROOT = Path(__file__).resolve().parents[1] + +def run(target, biome_mods=False): + log = ROOT / f"build/verification/native111/{target}-{'bop' if biome_mods else 'vanilla'}.log" + log.parent.mkdir(parents=True, exist_ok=True) + with server_test_lock(), tempfile.TemporaryDirectory(prefix=f"rivencraft-native111-{target}-") as directory: + work = Path(directory) + init = work / "fixture.gradle" + init.write_text(""" +gradle.beforeProject { p -> + p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """')) + p.afterEvaluate { + p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/native111" / target) + """')) + } +} +""") + if biome_mods: + game = "1.21.1" if target == "mc1211" else "26.3" + mods = Path.home() / ".local/share/PrismLauncher/instances" / ("Dev " + game) / "minecraft/mods" + jars = [next(mods.glob(pattern)) for pattern in ("BiomesOPlenty*.jar", "TerraBlender*.jar", "GlitchCore*.jar")] + init.write_text(init.read_text() + "\ngradle.projectsEvaluated { gradle.rootProject.dependencies.add('localRuntime', gradle.rootProject.files(" + + ",".join("'" + str(jar) + "'" for jar in jars) + ")) }\n") + server = work / "server" + server.mkdir() + (server / "eula.txt").write_text("eula=true\n") + (server / "server.properties").write_text( + "server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n" + "level-type=minecraft:flat\nlevel-seed=109\nview-distance=2\nsimulation-distance=2\n" + 'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n') + process = None + try: + args = [str(ROOT / "gradlew")] + if target == "mc263": args += ["-p", str(ROOT / "ports/mc263")] + args += ["--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"] + with log.open("w") as output: + process = subprocess.Popen(args, cwd=ROOT, stdin=subprocess.PIPE, stdout=output, + stderr=subprocess.STDOUT, text=True, start_new_session=True) + try: + process.wait(timeout=60) + except subprocess.TimeoutExpired: + print("HANDOFF: Native biome probe stalled; stopping without retry. Use docs/NATIVE_BIOME_FAMILIES.md.") + return 2 + text = log.read_text() + if process.returncode or "NATIVE111_PASS" not in text or "NATIVE111_FAIL" in text: + print(text[-8000:]) + return 1 + print(next(line for line in text.splitlines() if "NATIVE111_PASS" in line)) + return 0 + finally: + stop(process) + print("Removed temporary test world and isolated fixture outputs. Log:", log) + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("target", choices=("mc1211", "mc263")) + parser.add_argument("--biome-mods", action="store_true") + args=parser.parse_args() + raise SystemExit(run(args.target,args.biome_mods)) diff --git a/scripts/regression_portal117.py b/scripts/regression_portal117.py new file mode 100644 index 0000000..104fd19 --- /dev/null +++ b/scripts/regression_portal117.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python3 +"""Check optional portal engines sequentially; actual client rendering remains player validation.""" +import argparse +import subprocess +import tempfile +from pathlib import Path +from server_test_lock import server_test_lock +from smoke_server import stop + +ROOT = Path(__file__).resolve().parents[1] + +def run(engine, jar=None): + target="mc263" + log = ROOT / f"build/verification/portal117/{engine}.log" + log.parent.mkdir(parents=True, exist_ok=True) + with server_test_lock(), tempfile.TemporaryDirectory(prefix=f"rivencraft-portal117-{engine}-") as directory: + work = Path(directory) + init = work / "fixture.gradle" + init.write_text(""" +gradle.beforeProject { p -> + p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """')) + p.afterEvaluate { + p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/portal117") + """')) + } +} +""") + server = work / "server" + server.mkdir() + (server / "eula.txt").write_text("eula=true\n") + (server / "server.properties").write_text( + "server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n" + "level-type=minecraft:flat\nlevel-seed=109\nview-distance=2\nsimulation-distance=2\n" + 'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n') + process = None + try: + args = [str(ROOT / "gradlew")] + if target == "mc263": args += ["-p", str(ROOT / "ports/mc263")] + if engine == "seamless": + args += ["-PwithSeamlessPortals", f"-PseamlessPortalsJar={jar}"] + elif engine == "reborn": + args += ["-PwithImmersivePortalsReborn"] + args += ["--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"] + with log.open("w") as output: + process = subprocess.Popen(args, cwd=ROOT, stdin=subprocess.PIPE, stdout=output, + stderr=subprocess.STDOUT, text=True, start_new_session=True) + try: + process.wait(timeout=60) + except subprocess.TimeoutExpired: + print("HANDOFF: Portal engine probe stalled; stopping without retry. Use docs/SEAMLESS_PORTALS.md.") + return 2 + text = log.read_text() + if process.returncode or "PORTAL117_PASS" not in text or "PORTAL117_FAIL" in text: + print(text[-8000:]) + return 1 + print(next(line for line in text.splitlines() if "PORTAL117_PASS" in line)) + return 0 + finally: + stop(process) + print("Removed temporary test world and isolated fixture outputs. Log:", log) + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("engine", choices=("none", "seamless", "reborn")) + parser.add_argument("--jar", type=Path) + args=parser.parse_args() + if args.engine=="seamless" and (args.jar is None or not args.jar.is_file()): + parser.error("Seamless test needs --jar pointing at its actual 26.3 JAR") + raise SystemExit(run(args.engine,args.jar)) diff --git a/scripts/regression_static109.py b/scripts/regression_static109.py new file mode 100644 index 0000000..24c7b1f --- /dev/null +++ b/scripts/regression_static109.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python3 +"""Check Static Sky writing/save/network contracts; real rendering remains player validation.""" +import argparse +import subprocess +import tempfile +from pathlib import Path +from server_test_lock import server_test_lock +from smoke_server import stop + +ROOT = Path(__file__).resolve().parents[1] + +def run(target): + log = ROOT / f"build/verification/static109/{target}.log" + log.parent.mkdir(parents=True, exist_ok=True) + with server_test_lock(), tempfile.TemporaryDirectory(prefix=f"rivencraft-static109-{target}-") as directory: + work = Path(directory) + init = work / "fixture.gradle" + init.write_text(""" +gradle.beforeProject { p -> + p.layout.buildDirectory.set(p.file('""" + str(work / "build") + """')) + p.afterEvaluate { + p.sourceSets.main.java.srcDir(p.file('""" + str(ROOT / "scripts/fixtures/static109" / target) + """')) + } +} +""") + server = work / "server" + server.mkdir() + (server / "eula.txt").write_text("eula=true\n") + (server / "server.properties").write_text( + "server-ip=127.0.0.1\nserver-port=0\nonline-mode=false\nwhite-list=false\n" + "level-type=minecraft:flat\nlevel-seed=109\nview-distance=2\nsimulation-distance=2\n" + 'generator-settings={"layers":[{"height":1,"block":"minecraft:bedrock"}],"biome":"minecraft:plains"}\n') + process = None + try: + args = [str(ROOT / "gradlew")] + if target == "mc263": args += ["-p", str(ROOT / "ports/mc263")] + args += ["--no-daemon", "-I", str(init), "runServer", f"-PserverRunDir={server}", "--console=plain"] + with log.open("w") as output: + process = subprocess.Popen(args, cwd=ROOT, stdin=subprocess.PIPE, stdout=output, + stderr=subprocess.STDOUT, text=True, start_new_session=True) + try: + process.wait(timeout=60) + except subprocess.TimeoutExpired: + print("HANDOFF: Static Sky probe stalled; stopping without retry. Use docs/STATIC_SKY_RESOLUTION.md.") + return 2 + text = log.read_text() + if process.returncode or "STATIC109_PASS" not in text or "STATIC109_FAIL" in text: + print(text[-8000:]) + return 1 + print(next(line for line in text.splitlines() if "STATIC109_PASS" in line)) + return 0 + finally: + stop(process) + print("Removed temporary test world and isolated fixture outputs. Log:", log) + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("target", choices=("mc1211", "mc263")) + raise SystemExit(run(parser.parse_args().target)) diff --git a/scripts/test_desert_vegetation.py b/scripts/test_desert_vegetation.py new file mode 100644 index 0000000..8041947 --- /dev/null +++ b/scripts/test_desert_vegetation.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python3 +"""Run the shared desert placement checks without a server or saved world.""" +import subprocess +import tempfile +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] + +if __name__ == "__main__": + with tempfile.TemporaryDirectory(prefix="rivencraft-desert108-") as directory: + subprocess.run(["javac", "--release", "21", "-d", directory, + str(ROOT / "shared/src/main/java/net/dnorberg/rivencraft/shared/DesertVegetation.java"), + str(ROOT / "scripts/fixtures/desert108/DesertVegetationChecks.java")], check=True) + subprocess.run(["java", "-cp", directory, "DesertVegetationChecks"], check=True) diff --git a/shared/src/main/java/net/dnorberg/rivencraft/shared/DesertVegetation.java b/shared/src/main/java/net/dnorberg/rivencraft/shared/DesertVegetation.java new file mode 100644 index 0000000..6417185 --- /dev/null +++ b/shared/src/main/java/net/dnorberg/rivencraft/shared/DesertVegetation.java @@ -0,0 +1,60 @@ +package net.dnorberg.rivencraft.shared; + +import java.util.function.IntUnaryOperator; + +/** Version-independent desert page placement. All writes stay inside the decorating chunk. */ +public final class DesertVegetation { + public enum Kind { FLOWERS, TREES, HUGE_TREES } + public enum Ground { SAND, SOIL, OTHER } + public enum Plant { SAND, CACTUS, DEAD_BUSH } + + public interface World { + int surfaceY(int x, int z); + int maxY(); + boolean desert(int x, int y, int z); + Ground ground(int x, int y, int z); + boolean air(int x, int y, int z); + void set(int x, int y, int z, Plant plant); + } + + private DesertVegetation() {} + + /** Each occurrence gets its own random stream from the Age seed, chunk and page index. */ + public static int place(World world, Kind kind, int chunkX, int chunkZ, IntUnaryOperator random) { + int placed = 0; + int attempts = switch (kind) { + case FLOWERS -> 16; + case TREES -> 8; + case HUGE_TREES -> 4; + }; + for (int attempt = 0; attempt < attempts; attempt++) { + // A one-block margin permits all neighbor checks without touching another chunk. + int x = chunkX + 1 + random.applyAsInt(14); + int z = chunkZ + 1 + random.applyAsInt(14); + int y = world.surfaceY(x, z); + if (y >= world.maxY() || !world.desert(x, y, z) || !world.air(x, y, z)) continue; + Ground ground = world.ground(x, y - 1, z); + if (ground == Ground.OTHER) continue; + if (kind == Kind.FLOWERS) { + world.set(x, y, z, Plant.DEAD_BUSH); + placed++; + continue; + } + int height = kind == Kind.HUGE_TREES ? 5 + random.applyAsInt(5) : 1 + random.applyAsInt(3); + if (y + height > world.maxY()) continue; + boolean clear = true; + for (int dy = 0; dy < height && clear; dy++) { + int py = y + dy; + clear = world.air(x, py, z) && world.air(x - 1, py, z) + && world.air(x + 1, py, z) && world.air(x, py, z - 1) + && world.air(x, py, z + 1); + } + if (!clear) continue; + // Flat Ages retain grass layers. Convert only a cactus's soil base, never the biome surface. + if (ground == Ground.SOIL) world.set(x, y - 1, z, Plant.SAND); + for (int dy = 0; dy < height; dy++) world.set(x, y + dy, z, Plant.CACTUS); + placed++; + } + return placed; + } +} diff --git a/shared/src/main/java/net/dnorberg/rivencraft/shared/NativeBiomeKind.java b/shared/src/main/java/net/dnorberg/rivencraft/shared/NativeBiomeKind.java new file mode 100644 index 0000000..959f6aa --- /dev/null +++ b/shared/src/main/java/net/dnorberg/rivencraft/shared/NativeBiomeKind.java @@ -0,0 +1,19 @@ +package net.dnorberg.rivencraft.shared; + +/** Native chooses terrain defaults; explicit families use frozen seeded regional pools. */ +public enum NativeBiomeKind { + TERRAIN, CAVES, NETHER, END; + + public static NativeBiomeKind controller(String choice) { + return switch (choice) { + case "native_caves" -> CAVES; + case "native_nether" -> NETHER; + case "native_end" -> END; + default -> TERRAIN; + }; + } + + public static boolean isController(String choice) { + return choice.equals("native") || controller(choice) != TERRAIN; + } +} diff --git a/shared/src/main/java/net/dnorberg/rivencraft/shared/StaticSkyResolution.java b/shared/src/main/java/net/dnorberg/rivencraft/shared/StaticSkyResolution.java new file mode 100644 index 0000000..39d8da0 --- /dev/null +++ b/shared/src/main/java/net/dnorberg/rivencraft/shared/StaticSkyResolution.java @@ -0,0 +1,36 @@ +package net.dnorberg.rivencraft.shared; + +import java.util.List; + +/** Ordered base-25 Static Sky resolution, shared by both writing/rendering implementations. */ +public final class StaticSkyResolution { + public static final int DEFAULT = 48; + public static final int MIN = 1; + public static final int MAX = 128; + public static final int STATIC = -1; + public static final int OTHER = -2; + public static final int OTHER_SKY = -3; + + private StaticSkyResolution() {} + + public static int clamp(int value) { return Math.max(MIN, Math.min(MAX, value)); } + + /** Only adjacent digits 0..24 before Static apply; last sky controller wins. */ + public static int requested(List tokens) { + int resolution = DEFAULT; + long value = 0; + boolean numbered = false; + for (int token : tokens) { + if (token >= 0 && token <= 24) { + value = Math.min(Integer.MAX_VALUE, value * 25 + token); + numbered = true; + } else { + if (token == STATIC) resolution = numbered ? clamp((int) value) : DEFAULT; + else if (token == OTHER_SKY) resolution = DEFAULT; + value = 0; + numbered = false; + } + } + return resolution; + } +} diff --git a/src/main/java/net/dnorberg/rivencraft/book/AgeBiomeSelection.java b/src/main/java/net/dnorberg/rivencraft/book/AgeBiomeSelection.java index ad053c2..9c826c7 100644 --- a/src/main/java/net/dnorberg/rivencraft/book/AgeBiomeSelection.java +++ b/src/main/java/net/dnorberg/rivencraft/book/AgeBiomeSelection.java @@ -1,6 +1,7 @@ package net.dnorberg.rivencraft.book; import java.util.ArrayList; +import net.dnorberg.rivencraft.shared.NativeBiomeKind; import java.util.Comparator; import java.util.LinkedHashSet; import java.util.List; @@ -23,14 +24,39 @@ import net.minecraft.world.level.biome.MultiNoiseBiomeSource; import net.minecraft.world.level.biome.MultiNoiseBiomeSourceParameterList; /** Frozen biome pool and controller for an authored Age. Repeated IDs are intentional weights. */ -public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List biomes) { +public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List biomes, NativeBiomeKind nativeKind) { public static final TagKey CAVE_BIOMES = TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "cave_biomes")); + public AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List biomes) { + this(distribution, biomes, NativeBiomeKind.TERRAIN); + } + public AgeBiomeSelection { + java.util.Objects.requireNonNull(nativeKind, "nativeKind"); if (distribution == null) throw new IllegalArgumentException("Missing biome distribution"); biomes = List.copyOf(biomes); if (biomes.isEmpty()) throw new IllegalArgumentException("An Age biome pool cannot be empty"); + if (nativeKind != NativeBiomeKind.TERRAIN && distribution != AgeTraits.BiomeDistribution.NATIVE) + throw new IllegalArgumentException("A native family requires Native distribution"); + } + + public net.minecraft.nbt.CompoundTag save() { + var tag = new net.minecraft.nbt.CompoundTag(); + tag.putString("Distribution", distribution.name()); + tag.putString("NativeKind", nativeKind.name()); + var ids = new net.minecraft.nbt.ListTag(); + biomes.forEach(id -> ids.add(net.minecraft.nbt.StringTag.valueOf(id.toString()))); + tag.put("Ids", ids); + return tag; + } + + public static AgeBiomeSelection load(net.minecraft.nbt.CompoundTag tag) { + var ids = tag.getList("Ids", net.minecraft.nbt.Tag.TAG_STRING); + var biomes = new ArrayList(); + for (int i = 0; i < ids.size(); i++) biomes.add(ResourceLocation.parse(ids.getString(i))); + return new AgeBiomeSelection(AgeTraits.BiomeDistribution.valueOf(tag.getString("Distribution")), biomes, + tag.contains("NativeKind") ? NativeBiomeKind.valueOf(tag.getString("NativeKind")) : NativeBiomeKind.TERRAIN); } public static AgeBiomeSelection compile(WritingGrammar.Result writing, AgeTraits traits, @@ -48,8 +74,10 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List symbol.semantics().role() == SymbolSemantics.Role.BIOME_CONTROLLER) .map(symbol -> ((SymbolSemantics.ChoiceValue) symbol.semantics().value()).id()) .findFirst(); + NativeBiomeKind nativeKind = controller.map(NativeBiomeKind::controller).orElse(NativeBiomeKind.TERRAIN); AgeTraits.BiomeDistribution distribution = controller - .map(value -> AgeTraits.BiomeDistribution.valueOf(value.toUpperCase(java.util.Locale.ROOT))) + .map(value -> NativeBiomeKind.isController(value) ? AgeTraits.BiomeDistribution.NATIVE + : AgeTraits.BiomeDistribution.valueOf(value.toUpperCase(java.util.Locale.ROOT))) .orElse(traits.biomeDistribution()); if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID && controller.isEmpty() && authored.isEmpty()) { distribution = AgeTraits.BiomeDistribution.SINGLE; @@ -63,6 +91,12 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List randomFeatures, AgeInstability instability, AgeInstabilityPlan instabilityPlan, - RandomPagePolicy randomPagePolicy + RandomPagePolicy randomPagePolicy, + @Nullable AgeBiomeSelection randomBiomes ) { public static final ResourceLocation RANDOM_VANILLA_PROFILE = ResourceLocation.fromNamespaceAndPath( Rivencraft.MOD_ID, "random_vanilla" ); public static final int LEGACY_GENERATOR_CUTOFF = 16; - public static final int CURRENT_GENERATION_VERSION = AgeSkyProfile.RANDOM_SKY_GENERATION_VERSION; + public static final int NATIVE_CAVE_GENERATION_VERSION = 18; + public static final int CURRENT_GENERATION_VERSION = NATIVE_CAVE_GENERATION_VERSION; public AgeDefinition { Objects.requireNonNull(id, "id"); @@ -100,6 +102,15 @@ public record AgeDefinition( instabilityPlan, RandomPagePolicy.UNRESTRICTED); } + public AgeDefinition(UUID id, String name, long seed, ResourceLocation generationProfile, + int generationVersion, long createdGameTime, ResourceLocation dimensionId, + BlockPos spawn, AgeTraits traits, AgeGenerationPlan plan, AgeSeasonMode seasonMode, + List randomFeatures, AgeInstability instability, + AgeInstabilityPlan instabilityPlan, RandomPagePolicy randomPagePolicy) { + this(id, name, seed, generationProfile, generationVersion, createdGameTime, dimensionId, spawn, + traits, plan, seasonMode, randomFeatures, instability, instabilityPlan, randomPagePolicy, null); + } + public static ResourceLocation dimensionId(UUID ageId) { return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "age/" + ageId); } @@ -129,7 +140,7 @@ public record AgeDefinition( public AgeDefinition withSpawn(BlockPos spawn) { return new AgeDefinition(id, name, seed, generationProfile, generationVersion, createdGameTime, dimensionId, spawn.immutable(), traits, plan, seasonMode, - randomFeatures, instability, instabilityPlan, randomPagePolicy); + randomFeatures, instability, instabilityPlan, randomPagePolicy, randomBiomes); } /** A frozen authored profile takes precedence over the profile ID on old books. */ diff --git a/src/main/java/net/dnorberg/rivencraft/book/AgeDimensionService.java b/src/main/java/net/dnorberg/rivencraft/book/AgeDimensionService.java index 2079b03..8b15502 100644 --- a/src/main/java/net/dnorberg/rivencraft/book/AgeDimensionService.java +++ b/src/main/java/net/dnorberg/rivencraft/book/AgeDimensionService.java @@ -489,11 +489,19 @@ public final class AgeDimensionService { } AgeBiomeSelection selection = age.plan() != null && age.plan().biomeSelection() != null ? age.plan().biomeSelection() + : age.randomBiomes() != null ? age.randomBiomes() + : age.generationVersion() < AgeDefinition.NATIVE_CAVE_GENERATION_VERSION + && AgeBiomeSelection.isCave(profile) + && age.traits().biomeDistribution() == AgeTraits.BiomeDistribution.NATIVE + ? new AgeBiomeSelection(AgeTraits.BiomeDistribution.NATIVE, + AgeBiomeSelection.eligible(server.registryAccess(), profile)) : AgeBiomeSelection.compile(net.dnorberg.rivencraft.writing.WritingGrammar.parse(OrderedWriting.EMPTY), age.traits(), profile, age.seed(), server.registryAccess(), age.randomPagePolicy()); var registry = server.registryAccess().lookupOrThrow(Registries.BIOME); List> biomes = new ArrayList<>(); - List fallbacks = AgeBiomeSelection.eligible(server.registryAccess(), profile); + List fallbacks = selection.nativeKind() == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN + ? AgeBiomeSelection.eligible(server.registryAccess(), profile) + : NativeBiomePools.pool(server.registryAccess(), selection.nativeKind()); Set present = new LinkedHashSet<>(); for (ResourceLocation id : selection.biomes()) { var holder = registry.get(ResourceKey.create(Registries.BIOME, id)); @@ -514,7 +522,9 @@ public final class AgeDimensionService { ResourceKey.create(Registries.BIOME, fallback))); } AgeTraits.BiomeDistribution distribution = selection.distribution(); - if (distribution == AgeTraits.BiomeDistribution.NATIVE && !AgeBiomeSelection.isCave(profile) + if (distribution == AgeTraits.BiomeDistribution.NATIVE + && selection.nativeKind() == net.dnorberg.rivencraft.shared.NativeBiomeKind.TERRAIN + && !AgeBiomeSelection.isCave(profile) && profile.terrain() == AgeRuntimeProfile.Terrain.NOISE) { var parameters = server.registryAccess() .lookupOrThrow(Registries.MULTI_NOISE_BIOME_SOURCE_PARAMETER_LIST); diff --git a/src/main/java/net/dnorberg/rivencraft/book/AgeGenerationPlan.java b/src/main/java/net/dnorberg/rivencraft/book/AgeGenerationPlan.java index b847b11..8b5cdbc 100644 --- a/src/main/java/net/dnorberg/rivencraft/book/AgeGenerationPlan.java +++ b/src/main/java/net/dnorberg/rivencraft/book/AgeGenerationPlan.java @@ -160,12 +160,7 @@ public record AgeGenerationPlan(int version, long ageSeed, OrderedWriting writin profile.putString("Dimension", runtimeProfile.dimensionType().toString()); tag.put("RuntimeProfile", profile); if (biomeSelection != null) { - CompoundTag biomeTag = new CompoundTag(); - biomeTag.putString("Distribution", biomeSelection.distribution().name()); - ListTag biomeIds = new ListTag(); - biomeSelection.biomes().forEach(id -> biomeIds.add(StringTag.valueOf(id.toString()))); - biomeTag.put("Ids", biomeIds); - tag.put("BiomeSelection", biomeTag); + tag.put("BiomeSelection", biomeSelection.save()); } return tag; } @@ -199,14 +194,7 @@ public record AgeGenerationPlan(int version, long ageSeed, OrderedWriting writin CompoundTag profile = tag.getCompound("RuntimeProfile"); AgeBiomeSelection selection = null; if (version >= 2) { - CompoundTag biomeTag = tag.getCompound("BiomeSelection"); - ListTag biomeIds = biomeTag.getList("Ids", CompoundTag.TAG_STRING); - List ids = new ArrayList<>(); - for (int index = 0; index < biomeIds.size(); index++) { - ids.add(ResourceLocation.parse(biomeIds.getString(index))); - } - selection = new AgeBiomeSelection(AgeTraits.BiomeDistribution.valueOf( - biomeTag.getString("Distribution")), ids); + selection = AgeBiomeSelection.load(tag.getCompound("BiomeSelection")); } List activeIndices = version >= 3 ? java.util.Arrays.stream(tag.getIntArray("ActiveSymbolIndices")).boxed().toList() diff --git a/src/main/java/net/dnorberg/rivencraft/book/AgeRegistrySavedData.java b/src/main/java/net/dnorberg/rivencraft/book/AgeRegistrySavedData.java index 310f16a..f0a9f4e 100644 --- a/src/main/java/net/dnorberg/rivencraft/book/AgeRegistrySavedData.java +++ b/src/main/java/net/dnorberg/rivencraft/book/AgeRegistrySavedData.java @@ -167,7 +167,7 @@ public final class AgeRegistrySavedData extends SavedData { previous.generationProfile(), previous.generationVersion(), previous.createdGameTime(), previous.dimensionId(), previous.spawn(), previous.traits(), plan, previous.seasonMode(), previous.randomFeatures(), previous.instability(), previous.instabilityPlan(), - previous.randomPagePolicy()); + previous.randomPagePolicy(), previous.randomBiomes()); if (AgeDimensionService.unload(server, previous) == AgeDimensionService.UnloadResult.FAILED) return false; ages.put(ageId, changed); @@ -217,7 +217,12 @@ public final class AgeRegistrySavedData extends SavedData { AgeRuntimeProfiles.resolve(seedProfile), registries, policy) : List.of(), instability, instabilityPlan, - plan == null ? policy : RandomPagePolicy.UNRESTRICTED + plan == null ? policy : RandomPagePolicy.UNRESTRICTED, + plan == null && effectiveTraits.biomeDistribution() == AgeTraits.BiomeDistribution.NATIVE + && AgeBiomeSelection.isCave(AgeRuntimeProfiles.resolve(seedProfile)) + ? AgeBiomeSelection.compile(net.dnorberg.rivencraft.writing.WritingGrammar.parse(OrderedWriting.EMPTY), + effectiveTraits, AgeRuntimeProfiles.resolve(seedProfile), seed, registries, policy) + : null ); ages.put(created.id(), created); setDirty(); @@ -287,7 +292,9 @@ public final class AgeRegistrySavedData extends SavedData { instabilityPlan, entry.contains(RANDOM_PAGE_POLICY_TAG, CompoundTag.TAG_COMPOUND) ? RandomPagePolicy.load(entry.getCompound(RANDOM_PAGE_POLICY_TAG)) - : RandomPagePolicy.UNRESTRICTED + : RandomPagePolicy.UNRESTRICTED, + entry.contains("RandomBiomes", CompoundTag.TAG_COMPOUND) + ? AgeBiomeSelection.load(entry.getCompound("RandomBiomes")) : null )); } return data; @@ -321,6 +328,7 @@ public final class AgeRegistrySavedData extends SavedData { traits.putFloat(CELESTIAL_PHASE_TAG, age.traits().celestialPhase()); entry.put(TRAITS_TAG, traits); if (age.plan() != null) entry.put(PLAN_TAG, age.plan().save()); + if (age.randomBiomes() != null) entry.put("RandomBiomes", age.randomBiomes().save()); if (!age.randomFeatures().isEmpty()) { ListTag featureTags = new ListTag(); for (AgeFeatureSelection.Choice choice : age.randomFeatures()) { diff --git a/src/main/java/net/dnorberg/rivencraft/book/AgeSkyProfile.java b/src/main/java/net/dnorberg/rivencraft/book/AgeSkyProfile.java index f5202ba..b0482dc 100644 --- a/src/main/java/net/dnorberg/rivencraft/book/AgeSkyProfile.java +++ b/src/main/java/net/dnorberg/rivencraft/book/AgeSkyProfile.java @@ -1,6 +1,7 @@ package net.dnorberg.rivencraft.book; import java.util.ArrayList; +import net.dnorberg.rivencraft.shared.StaticSkyResolution; import java.util.HashSet; import java.util.List; import java.util.Random; @@ -9,12 +10,18 @@ import net.dnorberg.rivencraft.writing.SymbolSemantics; import net.minecraft.resources.ResourceLocation; /** The ordered, deterministic sky specification for an Age. No client data is trusted here. */ -public record AgeSkyProfile(Style style, int color, List bodies) { +public record AgeSkyProfile(Style style, int color, List bodies, int staticResolution) { public static final int RANDOM_SKY_GENERATION_VERSION = 17; private static final int[] COLORS = {0xB74A50, 0xD9834B, 0xDBC574, 0x5AAB80, 0x6FA8DF, 0x9870B9, 0xD5DBE1, 0x252531}; + public AgeSkyProfile(Style style, int color, List bodies) { + this(style, color, bodies, StaticSkyResolution.DEFAULT); + } + public AgeSkyProfile { + staticResolution = style == Style.STATIC ? StaticSkyResolution.clamp(staticResolution) + : StaticSkyResolution.DEFAULT; bodies = List.copyOf(bodies); long suns = bodies.stream().filter(body -> body.kind() == Kind.SUN).count(); long moons = bodies.size() - suns; @@ -137,7 +144,22 @@ public record AgeSkyProfile(Style style, int color, List bodies) { symbol.semantics().role() == SymbolSemantics.Role.CELESTIAL)) { bodies.addAll(random(plan.ageSeed(), seeded).bodies()); } - return new AgeSkyProfile(style, color, bodies); + return new AgeSkyProfile(style, color, bodies, staticResolution(plan)); + } + + public static int staticResolution(AgeGenerationPlan plan) { + if (plan == null) return StaticSkyResolution.DEFAULT; + return StaticSkyResolution.requested(plan.symbols().stream() + .sorted(java.util.Comparator.comparingInt(AgeGenerationPlan.ResolvedSymbol::index)) + .map(symbol -> { + var semantics = symbol.semantics(); + if (semantics.role() == SymbolSemantics.Role.COLOR_NUMBER) + return (int) ((SymbolSemantics.NumberValue) semantics.value()).amount(); + if (semantics.role() == SymbolSemantics.Role.SKY) + return ((SymbolSemantics.ChoiceValue) semantics.value()).id().equals("static") + ? StaticSkyResolution.STATIC : StaticSkyResolution.OTHER_SKY; + return StaticSkyResolution.OTHER; + }).toList()); } public static int mixColors(List colors) { diff --git a/src/main/java/net/dnorberg/rivencraft/book/NativeBiomePools.java b/src/main/java/net/dnorberg/rivencraft/book/NativeBiomePools.java new file mode 100644 index 0000000..dbd9a6e --- /dev/null +++ b/src/main/java/net/dnorberg/rivencraft/book/NativeBiomePools.java @@ -0,0 +1,53 @@ +package net.dnorberg.rivencraft.book; + +import java.util.List; +import java.util.stream.Stream; +import net.dnorberg.rivencraft.shared.NativeBiomeKind; +import net.dnorberg.rivencraft.compat.TerraBlenderBiomes; +import net.minecraft.core.Holder; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.BiomeTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; + +/** Family pools are resolved only when binding new writing, never re-filtered on load. */ +public final class NativeBiomePools { + private NativeBiomePools() {} + public static final TagKey CAVES = TagKey.create(Registries.BIOME, + ResourceLocation.fromNamespaceAndPath("rivencraft", "cave_biomes")); + + public static List pool(net.minecraft.core.RegistryAccess registries, NativeBiomeKind kind) { + var biomes = registries.lookupOrThrow(Registries.BIOME); + var nether = java.util.Set.copyOf(TerraBlenderBiomes.nether(registries)); + java.util.function.Predicate> isNether = + biome -> biome.is(BiomeTags.IS_NETHER) || nether.contains(biome.key().location()); + var selected = biomes.listElements() + .filter(biome -> !biome.key().location().equals(ResourceLocation.parse("terrablender:deferred_placeholder"))) + .filter(biome -> switch (kind) { + case CAVES -> biome.is(CAVES) && !isNether.test(biome); + case NETHER -> isNether.test(biome); + case END -> biome.is(BiomeTags.IS_END); + case TERRAIN -> throw new IllegalArgumentException("Terrain Native uses its own preset"); + }).map(biome -> biome.key().location()).toList(); + // Built-in family members remain recognizable if a data pack replaces the broad tags. + List vanilla = switch (kind) { + case CAVES -> List.of("lush_caves", "dripstone_caves", "deep_dark"); + case NETHER -> List.of("nether_wastes", "soul_sand_valley", "crimson_forest", "warped_forest", "basalt_deltas"); + case END -> List.of("the_end", "end_highlands", "end_midlands", "small_end_islands", "end_barrens"); + default -> List.of(); + }; + var fallback = vanilla.stream().map(ResourceLocation::withDefaultNamespace) + .filter(id -> biomes.get(ResourceKey.create(Registries.BIOME, id)) + .filter(biome -> kind != NativeBiomeKind.CAVES || !isNether.test(biome)).isPresent()); + var result = Stream.concat(selected.stream(), fallback).distinct().sorted().toList(); + if (!result.isEmpty()) return result; // A one-biome family becomes a safe FixedBiomeSource. + var safe = kind == NativeBiomeKind.CAVES ? biomes.listElements().filter(biome -> !isNether.test(biome) + && !biome.key().location().equals(ResourceLocation.parse("terrablender:deferred_placeholder"))) + .map(biome -> biome.key().location()).sorted().findFirst() + : java.util.Optional.empty(); + return safe.map(List::of).orElseThrow(() -> new IllegalArgumentException("No usable " + kind + " biomes")); + } +} diff --git a/src/main/java/net/dnorberg/rivencraft/book/RandomPagePolicy.java b/src/main/java/net/dnorberg/rivencraft/book/RandomPagePolicy.java index a137d2c..ff80152 100644 --- a/src/main/java/net/dnorberg/rivencraft/book/RandomPagePolicy.java +++ b/src/main/java/net/dnorberg/rivencraft/book/RandomPagePolicy.java @@ -56,7 +56,7 @@ public record RandomPagePolicy(Set allowlist, Set dimension, float angle buffer.writeFloat(payload.angle()); buffer.writeEnum(payload.sky().style()); buffer.writeInt(payload.sky().color()); + buffer.writeVarInt(payload.sky().staticResolution()); buffer.writeVarInt(payload.sky().bodies().size()); for (AgeSkyProfile.Body body : payload.sky().bodies()) { buffer.writeEnum(body.kind()); @@ -39,6 +40,7 @@ public record AgeCelestialAnglePayload(ResourceKey dimension, float angle float angle = buffer.readFloat(); AgeSkyProfile.Style style = buffer.readEnum(AgeSkyProfile.Style.class); int color = buffer.readInt(); + int resolution = buffer.readVarInt(); int count = buffer.readVarInt(); if (count < 0 || count > 20) throw new IllegalArgumentException("Invalid celestial body count"); java.util.List bodies = new java.util.ArrayList<>(count); @@ -47,7 +49,7 @@ public record AgeCelestialAnglePayload(ResourceKey dimension, float angle buffer.readFloat(), buffer.readFloat(), buffer.readDouble(), buffer.readFloat(), buffer.readBoolean())); return new AgeCelestialAnglePayload(dimension, angle, - new AgeSkyProfile(style, color, bodies)); + new AgeSkyProfile(style, color, bodies, resolution)); } ); diff --git a/src/main/java/net/dnorberg/rivencraft/network/ModNetworking.java b/src/main/java/net/dnorberg/rivencraft/network/ModNetworking.java index e9fc91c..d5fc3d7 100644 --- a/src/main/java/net/dnorberg/rivencraft/network/ModNetworking.java +++ b/src/main/java/net/dnorberg/rivencraft/network/ModNetworking.java @@ -61,7 +61,7 @@ public final class ModNetworking { } public static void register(RegisterPayloadHandlersEvent event) { - PayloadRegistrar registrar = event.registrar("18"); + PayloadRegistrar registrar = event.registrar("19"); registrar.playToServer(RequestDescriptiveBookScreenPayload.TYPE, RequestDescriptiveBookScreenPayload.STREAM_CODEC, ModNetworking::requestDescriptiveBookScreen); registrar.playToClient(OpenDescriptiveBookScreenPayload.TYPE, OpenDescriptiveBookScreenPayload.STREAM_CODEC, diff --git a/src/main/java/net/dnorberg/rivencraft/world/AgeFeatureChunkGenerator.java b/src/main/java/net/dnorberg/rivencraft/world/AgeFeatureChunkGenerator.java index 6ac63ae..1da0562 100644 --- a/src/main/java/net/dnorberg/rivencraft/world/AgeFeatureChunkGenerator.java +++ b/src/main/java/net/dnorberg/rivencraft/world/AgeFeatureChunkGenerator.java @@ -246,9 +246,8 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator { continue; } if (AgeFeatureSelection.surfaceVegetation(choice.id())) { - int surface = chunk.getHeight(Heightmap.Types.WORLD_SURFACE_WG, 8, 8); - if (!AgeFeatureSelection.supportsSurfaceVegetation( - level.getBiome(new BlockPos(x + 8, surface, z + 8)))) continue; + AgeSurfaceVegetation.place(level, this, chunk, choice, ageSeed, occurrence); + continue; } ResourceLocation key = AgeFeatureSelection.placedFeature(choice.id()); if (key == null) continue; // Carvers are applied before decoration. diff --git a/src/main/java/net/dnorberg/rivencraft/world/AgeFlatChunkGenerator.java b/src/main/java/net/dnorberg/rivencraft/world/AgeFlatChunkGenerator.java index 59506fb..fab7704 100644 --- a/src/main/java/net/dnorberg/rivencraft/world/AgeFlatChunkGenerator.java +++ b/src/main/java/net/dnorberg/rivencraft/world/AgeFlatChunkGenerator.java @@ -150,7 +150,12 @@ public final class AgeFlatChunkGenerator extends ChunkGenerator { super.applyBiomeDecoration(level, chunk, structures); int spikeOccurrence = 0; int obeliskOccurrence = 0; + Map vegetationOccurrences = new HashMap<>(); for (AgeFeatureSelection.Choice choice : features) { + if (AgeFeatureSelection.surfaceVegetation(choice.id())) { + int occurrence = vegetationOccurrences.merge(choice, 1, Integer::sum) - 1; + AgeSurfaceVegetation.place(level, this, chunk, choice, ageSeed, occurrence); + } if (AgeFeatureSelection.spikes(choice.id())) SpikesFeature.generate(level, chunk, ageSeed, choice, spikeOccurrence++); if (AgeFeatureSelection.obelisks(choice.id())) diff --git a/src/main/java/net/dnorberg/rivencraft/world/AgeSurfaceVegetation.java b/src/main/java/net/dnorberg/rivencraft/world/AgeSurfaceVegetation.java new file mode 100644 index 0000000..2734121 --- /dev/null +++ b/src/main/java/net/dnorberg/rivencraft/world/AgeSurfaceVegetation.java @@ -0,0 +1,102 @@ +package net.dnorberg.rivencraft.world; + +import java.util.Optional; +import net.dnorberg.rivencraft.book.AgeFeatureSelection; +import java.util.stream.Stream; +import net.dnorberg.rivencraft.shared.DesertVegetation; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.chunk.ChunkAccess; +import net.minecraft.world.level.chunk.ChunkGenerator; +import net.minecraft.world.level.levelgen.Heightmap; +import net.minecraft.world.level.levelgen.placement.BiomeFilter; +import net.minecraft.world.level.levelgen.placement.PlacementContext; + +/** Routes only the three generic plant pages by the actual candidate biome. */ +public final class AgeSurfaceVegetation { + public static final TagKey DESERTS = TagKey.create(Registries.BIOME, + ResourceLocation.fromNamespaceAndPath("rivencraft", "desert_vegetation")); + + private AgeSurfaceVegetation() {} + + public static boolean isDesert(Holder biome) { + return biome.is(DESERTS) && AgeFeatureSelection.supportsSurfaceVegetation(biome); + } + + public static void place(WorldGenLevel level, ChunkGenerator generator, ChunkAccess chunk, + AgeFeatureSelection.Choice choice, long ageSeed, int occurrence) { + int x = chunk.getPos().getMinBlockX(); + int z = chunk.getPos().getMinBlockZ(); + long seed = ageSeed ^ (long) x * 341873128712L ^ (long) z * 132897987541L + ^ (long) choice.hashCode() * 0x9E3779B97F4A7C15L + ^ (long) occurrence * 0xD1B54A32D192ED03L; + place(level, generator, chunk, choice.id().getPath(), + AgeFeatureSelection.placedFeature(choice.id()), RandomSource.create(seed)); + } + + private static void place(WorldGenLevel level, ChunkGenerator generator, ChunkAccess chunk, + String page, ResourceLocation placedId, RandomSource random) { + DesertVegetation.Kind kind = switch (page) { + case "flowers" -> DesertVegetation.Kind.FLOWERS; + case "trees" -> DesertVegetation.Kind.TREES; + case "huge_trees" -> DesertVegetation.Kind.HUGE_TREES; + default -> throw new IllegalArgumentException("Not a generic vegetation page: " + page); + }; + int x = chunk.getPos().getMinBlockX(); + int z = chunk.getPos().getMinBlockZ(); + // Separate streams keep ordinary non-desert placement independent of desert attempts. + RandomSource desertRandom = RandomSource.create(random.nextLong()); + DesertVegetation.place(new DesertVegetation.World() { + public int surfaceY(int px, int pz) { + return level.getHeight(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, px, pz); + } + public int maxY() { return level.getMaxBuildHeight(); } + public boolean desert(int px, int py, int pz) { + return isDesert(level.getBiome(new BlockPos(px, py, pz))); + } + public DesertVegetation.Ground ground(int px, int py, int pz) { + var state = level.getBlockState(new BlockPos(px, py, pz)); + if (state.is(Blocks.SAND) || state.is(Blocks.RED_SAND)) return DesertVegetation.Ground.SAND; + return state.is(BlockTags.DIRT) + && level.getBlockState(new BlockPos(px, py - 1, pz)).isFaceSturdy( + level, new BlockPos(px, py - 1, pz), net.minecraft.core.Direction.UP) + ? DesertVegetation.Ground.SOIL : DesertVegetation.Ground.OTHER; + } + public boolean air(int px, int py, int pz) { + return level.getBlockState(new BlockPos(px, py, pz)).isAir(); + } + public void set(int px, int py, int pz, DesertVegetation.Plant plant) { + var block = switch (plant) { + case SAND -> Blocks.SAND; + case CACTUS -> Blocks.CACTUS; + case DEAD_BUSH -> Blocks.DEAD_BUSH; + }; + level.setBlock(new BlockPos(px, py, pz), block.defaultBlockState(), 2); + } + }, kind, x, z, desertRandom::nextInt); + + var vanilla = level.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE) + .getOrThrow(ResourceKey.create(Registries.PLACED_FEATURE, placedId)).value(); + var context = new PlacementContext(level, generator, Optional.empty()); + Stream positions = Stream.of(new BlockPos(x, level.getMinBuildHeight(), z)); + for (var modifier : vanilla.placement()) { + if (!(modifier instanceof BiomeFilter)) + positions = positions.flatMap(pos -> modifier.getPositions(context, random, pos)); + } + // Keep vanilla count/height/ground rules, but never add generic flowers/oaks/spruces in deserts. + positions.forEach(pos -> { + Holder biome = level.getBiome(pos); + if (AgeFeatureSelection.supportsSurfaceVegetation(biome) && !isDesert(biome)) + vanilla.feature().value().place(level, generator, random, pos); + }); + } +} diff --git a/src/main/java/net/dnorberg/rivencraft/writing/SymbolSemantics.java b/src/main/java/net/dnorberg/rivencraft/writing/SymbolSemantics.java index c020df0..b8094e9 100644 --- a/src/main/java/net/dnorberg/rivencraft/writing/SymbolSemantics.java +++ b/src/main/java/net/dnorberg/rivencraft/writing/SymbolSemantics.java @@ -74,7 +74,7 @@ public record SymbolSemantics(Role role, Value value) { public enum Role { TERRAIN("terrain", Kind.RESOURCE), BIOME_CONTROLLER("biome_controller", Kind.CHOICE, - "native", "single", "tiled", "grid", "tiny", "small", "medium", "large", "huge"), + "native", "native_caves", "native_nether", "native_end", "single", "tiled", "grid", "tiny", "small", "medium", "large", "huge"), BIOME("biome", Kind.RESOURCE), LIGHTING("lighting", Kind.CHOICE, "normal", "dark", "bright"), SKY("sky", Kind.CHOICE, "overworld", "nether", "end", "static"), diff --git a/src/main/java/net/dnorberg/rivencraft/writing/WritingGrammar.java b/src/main/java/net/dnorberg/rivencraft/writing/WritingGrammar.java index 1510a70..f4e501b 100644 --- a/src/main/java/net/dnorberg/rivencraft/writing/WritingGrammar.java +++ b/src/main/java/net/dnorberg/rivencraft/writing/WritingGrammar.java @@ -74,16 +74,16 @@ public final class WritingGrammar { Role role = semantics.orElseThrow().role(); ParsedSymbol parsed = new ParsedSymbol(index, reference, semantics.orElseThrow()); symbols.add(parsed); - if (pendingNumber != null && !numberTarget(role) && role != Role.COLOR_NUMBER) { + if (pendingNumber != null && !numberTarget(role, semantics.orElseThrow()) && role != Role.COLOR_NUMBER) { diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingNumber.index(), - "A number page must be immediately followed by a color, celestial modifier or Flooded page")); + "A number page must be immediately followed by a color, celestial modifier, Static Sky or Flooded page")); pendingNumber = null; } if (role == Role.COLOR_NUMBER) { - if (pendingNumber != null && !numberRunTargetsFlooded(writing, index, resolver)) diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, - pendingNumber.index(), "A number page must be immediately followed by a color, celestial modifier or Flooded page")); + if (pendingNumber != null && !numberRunTargetsInteger(writing, index, resolver)) diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, + pendingNumber.index(), "A number page must be immediately followed by a color, celestial modifier, Static Sky or Flooded page")); pendingNumber = parsed; - } else if (numberTarget(role)) { + } else if (numberTarget(role, semantics.orElseThrow())) { pendingNumber = null; } if (modifier(role)) { @@ -147,7 +147,7 @@ public final class WritingGrammar { ParsedSymbol controller = singular.get(Role.BIOME_CONTROLLER); if (controller != null && controller.semantics().value() instanceof ChoiceValue choice - && choice.id().equals("native") && biomeCount > 0) { + && net.dnorberg.rivencraft.shared.NativeBiomeKind.isController(choice.id()) && biomeCount > 0) { diagnostics.add(new Diagnostic(Code.CONFLICT, controller.index(), "Native biome distribution cannot use authored biome pages")); } else if (controller != null && controller.semantics().value() instanceof ChoiceValue choice @@ -167,7 +167,7 @@ public final class WritingGrammar { int minimum = switch (choice.id()) { case "single" -> 1; case "tiled", "grid" -> 2; - case "native" -> 0; + case "native", "native_caves", "native_nether", "native_end" -> 0; default -> 2; }; if (biomeCount < minimum) diagnostics.add(new Diagnostic(Code.INCOMPLETE, -1, @@ -189,7 +189,7 @@ public final class WritingGrammar { || role == Role.CELESTIAL_COLOR || role == Role.DIRECTION_MODIFIER; } - private static boolean numberRunTargetsFlooded(OrderedWriting writing, int index, + private static boolean numberRunTargetsInteger(OrderedWriting writing, int index, Function> resolver) { for (int next = index + 1; next < writing.entries().size(); next++) { var reference = writing.entries().get(next).symbol(); @@ -197,15 +197,17 @@ public final class WritingGrammar { var semantics = resolver.apply(reference.get()).flatMap(SymbolDefinition::semantics); if (semantics.isEmpty()) return false; Role role = semantics.get().role(); - if (role != Role.COLOR_NUMBER) return role == Role.FLOODING; + if (role != Role.COLOR_NUMBER) return role == Role.FLOODING + || role == Role.SKY && ((SymbolSemantics.ChoiceValue) semantics.get().value()).id().equals("static"); } return false; } - private static boolean numberTarget(Role role) { + private static boolean numberTarget(Role role, SymbolSemantics semantics) { return role == Role.COLOR || role == Role.PERIOD_MODIFIER || role == Role.ANGLE_MODIFIER || role == Role.PHASE_MODIFIER - || role == Role.SIZE_MODIFIER || role == Role.FLOODING; + || role == Role.SIZE_MODIFIER || role == Role.FLOODING + || role == Role.SKY && ((SymbolSemantics.ChoiceValue) semantics.value()).id().equals("static"); } private static int stage(Role role) { @@ -307,7 +309,7 @@ public final class WritingGrammar { active.sort(Comparator.comparingInt(symbol -> stage(symbol.semantics().role()))); ParsedSymbol controller = lastChoice.get(Role.BIOME_CONTROLLER); if (controller != null && controller.semantics().value() instanceof ChoiceValue choice) { - if (choice.id().equals("native")) { + if (net.dnorberg.rivencraft.shared.NativeBiomeKind.isController(choice.id())) { active.removeIf(symbol -> symbol.semantics().role() == Role.BIOME); } else if (choice.id().equals("single")) { boolean retained = false; diff --git a/src/main/resources/assets/rivencraft/lang/en_us.json b/src/main/resources/assets/rivencraft/lang/en_us.json index 7e5748f..58497a3 100644 --- a/src/main/resources/assets/rivencraft/lang/en_us.json +++ b/src/main/resources/assets/rivencraft/lang/en_us.json @@ -169,7 +169,7 @@ "symbol.rivencraft.terrain.amplified": "Amplified Terrain", "symbol.rivencraft.terrain.amplified.description": "Tall, sharply varied Overworld terrain.", "symbol.rivencraft.terrain.cave": "Cave Terrain", - "symbol.rivencraft.terrain.cave.description": "An enclosed cave-shaped world with a sheltered arrival.", + "symbol.rivencraft.terrain.cave.description": "An enclosed cave-shaped world with a sheltered arrival. Native selects non-Nether cave biomes; other controllers can author Nether biomes explicitly.", "symbol.rivencraft.terrain.island": "Island Terrain", "symbol.rivencraft.terrain.island.description": "Floating-island terrain above the void.", "symbol.rivencraft.terrain.flat": "Flat Terrain", @@ -177,7 +177,7 @@ "symbol.rivencraft.terrain.void": "Void Terrain", "symbol.rivencraft.terrain.void.description": "An empty world with a safe arrival platform.", "symbol.rivencraft.biome.native": "Native Biomes", - "symbol.rivencraft.biome.native.description": "Use the terrain profile's native biome climate.", + "symbol.rivencraft.biome.native.description": "Use the terrain’s Native biome distribution. Cave terrain selects non-Nether cave biomes; explicit Native family pages work on any terrain.", "symbol.rivencraft.biome.the_end": "The End Biome", "symbol.rivencraft.biome.the_end.description": "Use the End biome in a written Age, including sky islands.", "symbol.rivencraft.biome.lush_caves": "Lush Caves Biome", @@ -224,7 +224,7 @@ "symbol.rivencraft.sky.end": "End Sky", "symbol.rivencraft.sky.end.description": "Use the End sky and dark preview background.", "symbol.rivencraft.sky.static": "Static Sky", - "symbol.rivencraft.sky.static.description": "Fill the sky with shifting television static.", + "symbol.rivencraft.sky.static.description": "Fill the sky with shifting television static. Adjacent Number Pages set cells per face in base 25 (1-128); default 48.", "symbol.rivencraft.color.red": "Red Color", "symbol.rivencraft.color.red.description": "Add red to the next Sky, Sun, or Moon. A number page directly before this page sets its strength.", "symbol.rivencraft.color.green": "Green Color", @@ -260,7 +260,7 @@ "symbol.rivencraft.number.22": "D'ni 22", "symbol.rivencraft.number.23": "D'ni 23", "symbol.rivencraft.number.24": "D'ni 24", - "symbol.rivencraft.number.description": "Set the next color page to this number × 10, Angle or Phase to × 15°, Length to × 0.08, or Celestial Size from 0.25× to 3×. A number page affects only the immediately following page.", + "symbol.rivencraft.number.description": "Set the next color page to this number × 10, Angle or Phase to × 15°, Length to × 0.08, or Celestial Size from 0.25× to 3×. Adjacent Number Pages before Flooded or Static Sky form a base-25 height or resolution; other targets use one immediately preceding number.", "symbol.rivencraft.weather.normal": "Normal Weather", "symbol.rivencraft.weather.normal.description": "Use the normal weather cycle.", "symbol.rivencraft.weather.fast": "Fast Weather", @@ -329,13 +329,13 @@ "symbol.rivencraft.feature.caves.description": "Add extra caves to the chosen noise terrain.", "symbol.rivencraft.block.generated.description": "Place before a compatible feature page, or let the Age choose a compatible feature.", "symbol.rivencraft.feature.flowers": "Flowers", - "symbol.rivencraft.feature.flowers.description": "Add vanilla flower patches to surface terrain.", + "symbol.rivencraft.feature.flowers.description": "Add flower patches to surface terrain, or dead bushes in tagged deserts. Repeated pages add more attempts.", "symbol.rivencraft.feature.trees": "Trees", - "symbol.rivencraft.feature.trees.description": "Add vanilla plains trees to surface terrain.", + "symbol.rivencraft.feature.trees.description": "Add plains trees to surface terrain, or cacti in tagged deserts. Repeated pages add more attempts.", "symbol.rivencraft.feature.rocks": "Rocks", "symbol.rivencraft.feature.rocks.description": "Add boulders using a random solid material, or specify one with a block page.", "symbol.rivencraft.feature.huge_trees": "Huge Trees", - "symbol.rivencraft.feature.huge_trees.description": "Add vanilla old-growth spruce trees to surface terrain.", + "symbol.rivencraft.feature.huge_trees.description": "Add old-growth spruce trees to surface terrain, or tall cacti in tagged deserts. Repeated pages add more attempts.", "symbol.rivencraft.feature.surface_lakes": "Surface Lakes", "symbol.rivencraft.feature.surface_lakes.description": "Add surface lakes using a random fluid, or specify one with a fluid page.", "symbol.rivencraft.feature.deep_lakes": "Deep Lakes", @@ -475,5 +475,11 @@ "advancement.rivencraft.open_portal.title": "A Window Between Ages", "advancement.rivencraft.open_portal.description": "Activate a Crystal Portal with a bound book.", "symbol.rivencraft.environment.flooded": "Flooded", - "symbol.rivencraft.environment.flooded.description": "Fill open space with water up to Y=63, or the base-25 Number Pages immediately before this page. Works in Cave terrain. Last Flooded wins; heights are bounded for safe arrival." + "symbol.rivencraft.environment.flooded.description": "Fill open space with water up to Y=63, or the base-25 Number Pages immediately before this page. Works in Cave terrain. Last Flooded wins; heights are bounded for safe arrival.", + "symbol.rivencraft.biome.native_caves": "Native Caves", + "symbol.rivencraft.biome.native_caves.description": "Use recognized non-Nether cave biomes in seeded regions on any terrain. Native controllers choose their own pool; individual biome pages are not used.", + "symbol.rivencraft.biome.native_nether": "Native Nether", + "symbol.rivencraft.biome.native_nether.description": "Use recognized Nether biomes, including TerraBlender Nether regions, on any terrain. Native controllers choose their own pool; individual biome pages are not used.", + "symbol.rivencraft.biome.native_end": "Native End", + "symbol.rivencraft.biome.native_end.description": "Use recognized End biomes in seeded regions on any terrain. Native controllers choose their own pool; individual biome pages are not used." } diff --git a/src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_caves.json b/src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_caves.json new file mode 100644 index 0000000..3ea9f1b --- /dev/null +++ b/src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_caves.json @@ -0,0 +1,11 @@ +{ + "schema_version": 2, + "name": "symbol.rivencraft.biome.native_caves", + "description": "symbol.rivencraft.biome.native_caves.description", + "category": "rivencraft:biome", + "semantics": { + "role": "biome_controller", + "value": "native_caves" + }, + "poem": "Constraint Nature Void Sustain" +} diff --git a/src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_end.json b/src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_end.json new file mode 100644 index 0000000..1066cee --- /dev/null +++ b/src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_end.json @@ -0,0 +1,11 @@ +{ + "schema_version": 2, + "name": "symbol.rivencraft.biome.native_end", + "description": "symbol.rivencraft.biome.native_end.description", + "category": "rivencraft:biome", + "semantics": { + "role": "biome_controller", + "value": "native_end" + }, + "poem": "Constraint Nature Celestial Sustain" +} diff --git a/src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_nether.json b/src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_nether.json new file mode 100644 index 0000000..8646cce --- /dev/null +++ b/src/main/resources/data/rivencraft/rivencraft/symbols/biome/native_nether.json @@ -0,0 +1,11 @@ +{ + "schema_version": 2, + "name": "symbol.rivencraft.biome.native_nether", + "description": "symbol.rivencraft.biome.native_nether.description", + "category": "rivencraft:biome", + "semantics": { + "role": "biome_controller", + "value": "native_nether" + }, + "poem": "Constraint Nature Dynamic Flux" +} diff --git a/src/main/resources/data/rivencraft/tags/worldgen/biome/cave_biomes.json b/src/main/resources/data/rivencraft/tags/worldgen/biome/cave_biomes.json index 1f0ddfb..06117b5 100644 --- a/src/main/resources/data/rivencraft/tags/worldgen/biome/cave_biomes.json +++ b/src/main/resources/data/rivencraft/tags/worldgen/biome/cave_biomes.json @@ -3,6 +3,10 @@ "values": [ "minecraft:lush_caves", "minecraft:dripstone_caves", - "minecraft:deep_dark" + "minecraft:deep_dark", + { + "id": "#c:is_cave", + "required": false + } ] } diff --git a/src/main/resources/data/rivencraft/tags/worldgen/biome/desert_vegetation.json b/src/main/resources/data/rivencraft/tags/worldgen/biome/desert_vegetation.json new file mode 100644 index 0000000..2163539 --- /dev/null +++ b/src/main/resources/data/rivencraft/tags/worldgen/biome/desert_vegetation.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:desert", + { + "id": "#c:is_desert", + "required": false + } + ] +}