Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f439d1febc | ||
|
|
6dbe208c42 | ||
|
|
a9a6f7205d | ||
|
|
98a959f621 | ||
|
|
a574008472 | ||
|
|
66b4c56eb6 | ||
|
|
a9040e8712 | ||
|
|
bb88bad8a6 | ||
|
|
916755e810 |
No files matched your search
|
After Width: | Height: | Size: 510 KiB |
@@ -40,6 +40,153 @@ profiles, not claims that Legacy had identically named terrain symbols.
|
|||||||
Every family retains a safe cobblestone arrival platform. An omitted terrain
|
Every family retains a safe cobblestone arrival platform. An omitted terrain
|
||||||
page still uses the deterministic seed-selected profile.
|
page still uses the deterministic seed-selected profile.
|
||||||
|
|
||||||
|
The separate **Floating Islands** feature page adds rare high-altitude island
|
||||||
|
clusters above Standard, Amplified, Sky Islands, Flat, or Void terrain; it does
|
||||||
|
not replace the terrain page. The feature is seeded by the Age and saved with the written
|
||||||
|
plan, so revisiting an Age recreates the same islands. Without a preceding
|
||||||
|
Block page, the Age seed chooses one valid full-collision block from the Block
|
||||||
|
Pages pool for the island body. A full-block material page immediately before
|
||||||
|
Floating Islands overrides that choice. Ordinary surface biomes still get
|
||||||
|
dirt/grass top layers; Nether and End biomes use the chosen block throughout.
|
||||||
|
The feature is additive even on Sky Islands terrain,
|
||||||
|
which already forms its own islands. Cave terrain rejects it. A page-free random
|
||||||
|
Age may also roll Floating Islands as one of its material features.
|
||||||
|
|
||||||
|
An unpaired Block or Fluid page chooses a compatible feature from the Age seed:
|
||||||
|
full blocks can become Rocks, Floating Islands, Tendrils, Spheres, or Spikes; source fluids can become one
|
||||||
|
of the lake features. Flat terrain can use Floating Islands, Tendrils, Spheres,
|
||||||
|
or Spikes; Void can use Floating Islands, Tendrils, or Spheres; Cave can use
|
||||||
|
Spheres or Tendrils. A page-free
|
||||||
|
random Age rolls zero, one, or two distinct compatible material features, choosing each
|
||||||
|
material from the Block or Fluid Pages pool. The choices are saved on the Age
|
||||||
|
definition, so opening the Age again does not reroll them.
|
||||||
|
Repeated Block/Fluid and Feature pages remain separate entries in authored
|
||||||
|
writing. Each unpaired material gets its own compatible feature, and repeated
|
||||||
|
decorations use separate placement rolls. Repeated unmodified feature pages
|
||||||
|
choose different compatible materials until their material pool is exhausted.
|
||||||
|
|
||||||
|
Structure pages are separate Feature symbols. Legacy's Dungeons, Mineshafts,
|
||||||
|
Nether Fortresses, Strongholds, and Villages have writable pages, as do modern
|
||||||
|
Trial Chambers, Bastion Remnants, Buried Treasure, Shipwrecks, Ocean Ruins,
|
||||||
|
Pillager Outposts, Ruined Portals, Nether Fossils, Ancient Cities, and Trail
|
||||||
|
Ruins. They use Minecraft's 1.21.1 structure templates and placement rules,
|
||||||
|
not a recreation of 1.12.2 structure geometry. A page enables only its own
|
||||||
|
structure set; absent pages do not inherit these structures from a biome.
|
||||||
|
Nether Fortresses and Bastions use separate sets instead of vanilla's shared
|
||||||
|
Nether-complexes set, so writing one does not enable the other. Dungeons use
|
||||||
|
the vanilla monster-room feature with eight attempts per chunk; unpaged Ages
|
||||||
|
do not inherit biome-default monster-room attempts. A page-free random Age
|
||||||
|
may choose zero to two distinct compatible structure types, frozen on creation.
|
||||||
|
An authored structure needs a compatible biome in the Age's selected pool.
|
||||||
|
Fortresses, Bastions, and Nether Fossils require Cave terrain plus a Nether
|
||||||
|
biome; surface-only structures reject Cave terrain. Void rejects all of these
|
||||||
|
structure pages. Villages and Strongholds can also be written into Flat Ages.
|
||||||
|
|
||||||
|
For visual testing, write a Standard/Plains/Single Age with Mineshafts,
|
||||||
|
Villages, and Trial Chambers, then use `/locate structure` in that Age to find
|
||||||
|
each. An unwritten Pillager Outpost should not locate there. Test a Cave Age
|
||||||
|
with Nether Wastes/Single and either the Nether Fortresses or Bastion page:
|
||||||
|
only the selected type should locate. Ocean structures need their matching
|
||||||
|
ocean or beach biome page; Ancient Cities need Deep Dark. Check the new pages
|
||||||
|
in Rivencraft's Feature creative tab and JEI as well.
|
||||||
|
|
||||||
|
**Dense Ores** is an authored-only Feature page. Each copy replays one extra
|
||||||
|
pass of every ore placement registered in the Age's nearby biomes, using that
|
||||||
|
placement's existing height, vein-size, rarity, and biome rules. It therefore
|
||||||
|
also densifies conventional mod-added ores without hard-coded mod IDs. Output
|
||||||
|
blocks tagged `c:ores` qualify; OreConfiguration outputs with `_ore` in their
|
||||||
|
registry name also qualify. A mod with a custom, non-OreConfiguration placed
|
||||||
|
feature can opt in by tagging that feature `rivencraft:dense_ores`. Non-ore
|
||||||
|
stone/dirt blobs are not repeated. Flat and Void reject the page, as does a
|
||||||
|
biome pool without any ore placements. Page-free random Ages never roll Dense
|
||||||
|
Ores. The extra pass applies only as new chunks generate; it does not retrofit
|
||||||
|
existing chunks or discover ore systems that bypass biome placed features.
|
||||||
|
|
||||||
|
For an in-game check, write a Standard/Plains/Single Age with Dense Ores and
|
||||||
|
verify that new underground chunks contain visibly more vanilla ore while
|
||||||
|
stone/dirt blob frequency remains unchanged. With an ore-adding mod installed,
|
||||||
|
write an Age using a biome where that mod registers its ore and verify the ore
|
||||||
|
also appears more often. Check that Flat plus Dense Ores is rejected by the
|
||||||
|
Binder and that a random, Link-Panel-only Age has no Dense Ores feature page.
|
||||||
|
|
||||||
|
**Obelisks** adds Legacy-shaped, rare 4×4 plinths with a 2×2 shaft rising 12
|
||||||
|
blocks, at most one attempt per 128 chunks per page. A preceding full-block
|
||||||
|
Block page chooses the material; otherwise the Age seed chooses from valid
|
||||||
|
block pages. Repeated Obelisks pages make independent attempts. Generation is
|
||||||
|
deterministic and stays within one chunk; it requires a reasonably level,
|
||||||
|
exposed solid surface, so Cave and Void terrain reject the page. Standard,
|
||||||
|
Amplified, Sky Islands, and Flat terrain permit it. Page-free random surface
|
||||||
|
Ages can roll Obelisks as one of their material features.
|
||||||
|
|
||||||
|
For a visual check, write a Standard or Flat Age with an Obelisks page and
|
||||||
|
search newly generated terrain for the 4×4 base and 12-block shaft. Try a
|
||||||
|
Block page such as Obsidian immediately before Obelisks to verify its material
|
||||||
|
changes. The Binder should reject Obelisks in Cave and Void Ages. Placement
|
||||||
|
is deliberately rare, so several hundred fresh chunks may be needed.
|
||||||
|
|
||||||
|
For an in-game visual check, bind Descriptive Books with a Link Panel,
|
||||||
|
one of Standard, Amplified, Sky Islands, Flat, or Void terrain, and the Floating Islands
|
||||||
|
feature page in that order. Fly through each Age at roughly Y=170–220 and
|
||||||
|
verify the elevated clusters appear above its unchanged base terrain. Reopen
|
||||||
|
the same Age to check that island positions stay fixed. Islands should be less
|
||||||
|
common than in the first test build (one source chunk in 128 instead of 64).
|
||||||
|
Sky Islands should retain its terrain islands and gain occasional additional
|
||||||
|
feature islands. Try Cave terrain too; the Binder should reject that pairing.
|
||||||
|
|
||||||
|
**Skylands** is a separate subtractive feature, not the Sky Islands terrain
|
||||||
|
profile or the additive Floating Islands feature. Following Legacy's primer
|
||||||
|
filter, it removes base terrain below a smooth, seven-octave cutoff around
|
||||||
|
world Y=76 and removes liquid above the cutoff. The selected terrain still
|
||||||
|
generates first; Floating Islands and Tendrils are added afterward, so they
|
||||||
|
can coexist with Skylands. Skylands has no Block-page modifier. It can be
|
||||||
|
authored on every terrain, though Flat loses its low ground and Void has no
|
||||||
|
base terrain to change. Page-free random noise Ages have a seeded one-in-eight
|
||||||
|
chance to gain Skylands; random Flat and Void Ages do not roll this ineffective
|
||||||
|
filter. The cloud-height and horizon changes from Legacy are not included yet.
|
||||||
|
|
||||||
|
For an in-game check, compare Standard terrain with and without a Skylands
|
||||||
|
page. Skylands should leave upper hills suspended over open space, while a
|
||||||
|
Floating Islands page instead adds isolated high islands without removing the
|
||||||
|
ground below. Try Sky Islands terrain plus Skylands to confirm the page filters
|
||||||
|
the terrain rather than replacing its generator. A book with both Skylands and
|
||||||
|
Floating Islands should retain the added feature islands above the cutoff.
|
||||||
|
|
||||||
|
The **Tendrils** feature adapts Legacy's winding, branching cave-node geometry
|
||||||
|
into solid tubes. It is additive on all current terrain families, including
|
||||||
|
Flat, Void, and Cave; it does not change biome selection. A preceding full-
|
||||||
|
collision Block page chooses the tendril material. Otherwise the Age seed
|
||||||
|
chooses a valid Block Pages material, consistent with other authored material
|
||||||
|
features. Page-free random Ages can select Tendrils as a solid-material feature,
|
||||||
|
including on Cave terrain where the surface material features are unavailable.
|
||||||
|
The shape and placement use only the Age seed and source-chunk coordinates, so
|
||||||
|
revisiting an Age recreates the same geometry.
|
||||||
|
|
||||||
|
**Spheres** and **Spikes** are two separate Feature pages. Spheres adds
|
||||||
|
winding chains of solid sphere nodes within terrain generation; like Tendrils,
|
||||||
|
it works on all terrain families, even Void and Cave. Spikes is a later,
|
||||||
|
rarer surface decoration (roughly one attempt per 18 chunks) that rises from
|
||||||
|
solid ground on Standard, Amplified, Sky Islands, or Flat terrain. Cave and
|
||||||
|
Void reject the Spikes page because they do not provide a suitable exposed
|
||||||
|
surface. Each page accepts its own immediately preceding full-collision Block
|
||||||
|
page; without one, the Age seed chooses a compatible material. The pages
|
||||||
|
remain distinct in the catalog, Creative menu, JEI, ordered writing, and
|
||||||
|
saved Age definition. Page-free random Ages can select either where compatible.
|
||||||
|
|
||||||
|
For an in-game check, make separate Void/Spheres and Flat/Spikes books with
|
||||||
|
Glowstone Block pages directly before their respective Feature pages. Spheres
|
||||||
|
should form connected bright globes across chunk boundaries in Void; Spikes
|
||||||
|
should appear as rare upward clusters rooted on the Flat surface. Revisit the
|
||||||
|
same Ages to confirm stable locations. Check that a Void/Spikes book is
|
||||||
|
rejected, and that Spheres and Spikes remain two independently selectable
|
||||||
|
pages in Creative and JEI.
|
||||||
|
|
||||||
|
For a clear visual check, bind a Void Age with a Glowstone Block page followed
|
||||||
|
by Tendrils. Fly around world Y=0–120 across several chunks: branching solid
|
||||||
|
forms should appear in the otherwise empty dimension, continue across chunk
|
||||||
|
borders, and remain in place after leaving and returning. Repeat with a lone
|
||||||
|
Tendrils page to confirm its seed-chosen material, and with Cave terrain to
|
||||||
|
confirm the feature does not require a surface biome.
|
||||||
|
|
||||||
## Written biome selection (generation version 16)
|
## Written biome selection (generation version 16)
|
||||||
|
|
||||||
Biome pages follow the terrain page and precede the distribution-control page
|
Biome pages follow the terrain page and precede the distribution-control page
|
||||||
@@ -72,8 +219,15 @@ also accepted. Other cave/biome pairings are diagnosed and blocked for now.
|
|||||||
Milestone 6 instability should allow such illegal combinations as unstable
|
Milestone 6 instability should allow such illegal combinations as unstable
|
||||||
Ages, without silently treating them as ordinary cave generation. Flat terrain
|
Ages, without silently treating them as ordinary cave generation. Flat terrain
|
||||||
uses Overworld choices when a distribution is authored; its Native default
|
uses Overworld choices when a distribution is authored; its Native default
|
||||||
remains Plains. Void terrain defaults to The Void and needs additional authored
|
remains Plains. Void terrain defaults to The Void when no biome page is written,
|
||||||
biomes for a multi-biome distribution.
|
but accepts authored biome pages. One authored biome uses Single distribution
|
||||||
|
when no controller is written. An explicit multi-biome distribution needs enough
|
||||||
|
authored biomes; The Void is not silently added to fill missing positions. These
|
||||||
|
biome regions exist even without blocks or a Floating Islands page, so biome-
|
||||||
|
dependent weather and optional season behavior can still vary there. To check
|
||||||
|
this in-game, bind Void terrain with a Desert Biome page and no feature page:
|
||||||
|
the Age should be empty while F3 reports Desert. A Void book without biome
|
||||||
|
pages should instead report The Void.
|
||||||
|
|
||||||
The resolved list of biome IDs, their order/repetitions, and distribution are
|
The resolved list of biome IDs, their order/repetitions, and distribution are
|
||||||
frozen into the Age plan. A removed biome ID emits a warning and uses an
|
frozen into the Age plan. A removed biome ID emits a warning and uses an
|
||||||
|
|||||||
@@ -25,6 +25,9 @@ project's GNU LGPL v3 license. Rivencraft itself uses the same license.
|
|||||||
| `assets/rivencraft/textures/item/page_link_panel.png` | `page_background.png` and `PageBuilder.BasicPageSprite` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Reproduces the legacy 160 px scale, black panel at `(25,30)`–`(135,75)`, and 128 px resample |
|
| `assets/rivencraft/textures/item/page_link_panel.png` | `page_background.png` and `PageBuilder.BasicPageSprite` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Reproduces the legacy 160 px scale, black panel at `(25,30)`–`(135,75)`, and 128 px resample |
|
||||||
| `assets/rivencraft/textures/gui/symbolcomponents.png` | `assets/mystcraft/textures/symbolcomponents.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Byte-identical shared 512×512 component sheet for client-side page composition |
|
| `assets/rivencraft/textures/gui/symbolcomponents.png` | `assets/mystcraft/textures/symbolcomponents.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Byte-identical shared 512×512 component sheet for client-side page composition |
|
||||||
| Runtime-composed symbol pages (`SymbolPageTextures`) | `page_background.png`, `textures/symbolcomponents.png`, `WordData`, `ModSymbols`, and `PageBuilder.PageSprite` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Replaces the six pre-generated symbol PNGs; layers four poem words on the shared page background and caches bounded client textures |
|
| Runtime-composed symbol pages (`SymbolPageTextures`) | `page_background.png`, `textures/symbolcomponents.png`, `WordData`, `ModSymbols`, and `PageBuilder.PageSprite` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Replaces the six pre-generated symbol PNGs; layers four poem words on the shared page background and caches bounded client textures |
|
||||||
|
| `assets/rivencraft/textures/block/crystal_block.png`, `budding_crystal.png` | `assets/mystcraft/textures/blocks/crystal.png` | Legacy 0.13.7.06 local extraction | Exact 16×16 blue tile reused for both solid crystal blocks |
|
||||||
|
| `assets/rivencraft/textures/block/{small,medium,large}_crystal_bud.png`, `crystal_cluster.png` | Minecraft 1.21.1 `textures/block/{small,medium,large}_amethyst_bud.png`, `amethyst_cluster.png` | Minecraft 1.21.1 | Original 16×16 alpha masks and silhouettes preserved; hue shifted toward Legacy blue, with brighter saturation; exported as 8-bit RGBA (not indexed PNG) |
|
||||||
|
| `assets/rivencraft/textures/item/crystal_shard.png` | Original sprite generated with OpenAI ImageGen from the Legacy crystal palette | 2026-10-05 | Cropped and nearest-neighbor scaled to 16×16 |
|
||||||
|
|
||||||
Mystcraft Legacy identifies XCompWiz as its project developer and includes the
|
Mystcraft Legacy identifies XCompWiz as its project developer and includes the
|
||||||
full LGPL v3 text in its root `LICENSE` file. Rivencraft's root `LICENSE`
|
full LGPL v3 text in its root `LICENSE` file. Rivencraft's root `LICENSE`
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# Descriptive Book presentation (Milestone 5, issue #40)
|
||||||
|
|
||||||
|
The Legacy-style front spread has the Age name and author on the left and the destination panel on the right. The reference screenshots are `dev images/Pasted image.png` (front spread) and `dev images/Pasted image (2).png` (single-symbol spread). An authored book shows one full-size composed symbol on each turned right page, in the order stored in `BOOK_WRITING`; the former plain-text name and symbol ID are not shown for resolved pages. The last authored symbol is the last normal page, not a blank trailing page.
|
||||||
|
|
||||||
|
The Binder records the taking player's name on the finished book; direct Age binding also records the binding player. Older books without this component display `Unknown author` rather than attributing them to whoever happens to open them. Link-Panel-only and older page-free books retain their random-Age glyph details and destination preview. On authored books, hovering the front-page name exposes the existing trait summary without filling the left page with text.
|
||||||
|
|
||||||
|
The server resolves symbol display metadata from its current catalog. A missing data-pack symbol draws the unresolved page artwork and its original ID. Descriptive Books do not show writing notes or grammar warning markers; grammar validation remains in the Binder and on the server when an Age is created. Opening a book never changes its persisted Age plan. Symbol pages use the same bounded, runtime glyph composition as Page items and do not require Create, Ponder, or Immersive Portals.
|
||||||
|
|
||||||
|
## Manual visual and behavior checks
|
||||||
|
|
||||||
|
1. Bind a Descriptive Book with two distinct symbol pages. Open it: the front spread shows its Age name, your player name, and the link panel. Turn twice and confirm exactly one large symbol on each right page, in authored order, with no plain-text symbol description or blank trailing page.
|
||||||
|
2. Hover the front-page name to confirm the trait summary remains accessible. Click the link panel to confirm normal travel; repeat from a lectern to check the name, panel, and page-turn layout.
|
||||||
|
3. Open a Link-Panel-only book and confirm its existing random-Age details and destination preview still appear.
|
||||||
|
4. In a copy of a test world, remove a data pack that supplied one authored symbol. Reopen the book: its original symbol ID should remain readable beside the unresolved artwork, with no writing-notes pages. Restore the pack and verify the page artwork returns without changing the saved Age.
|
||||||
|
|
||||||
|
`./gradlew build --offline` verifies compilation and jar assembly. The visual and data-pack-removal checks require an in-game client.
|
||||||
@@ -18,7 +18,7 @@ Legacy does **not** reject a book just because it omits terrain, biome, weather,
|
|||||||
| `WeatherNorm`, `Fast`, `Slow`, `Off`, `On`, `Cloudy`, `Rain`, `Snow`, `Storm` | `AgeTraits.Weather` has matching names except Legacy `On` maps to `ALWAYS` | Compile weather semantics separately from biome selection. `Snow` must remain deferred until optional season integration; do not silently substitute another weather mode. |
|
| `WeatherNorm`, `Fast`, `Slow`, `Off`, `On`, `Cloudy`, `Rain`, `Snow`, `Storm` | `AgeTraits.Weather` has matching names except Legacy `On` maps to `ALWAYS` | Compile weather semantics separately from biome selection. `Snow` must remain deferred until optional season integration; do not silently substitute another weather mode. |
|
||||||
| Suns, moons, starfields; angle, phase, period, color/gradient/sunset modifiers | One `celestialPeriod`, `celestialAngle`, `celestialPhase` on `AgeTraits` | Compile only the representable single-cycle subset first. Multiple celestial bodies, independent periods, custom stars, gradients and sunsets need a richer definition and renderer, not flattening into one value. |
|
| Suns, moons, starfields; angle, phase, period, color/gradient/sunset modifiers | One `celestialPeriod`, `celestialAngle`, `celestialPhase` on `AgeTraits` | Compile only the representable single-cycle subset first. Multiple celestial bodies, independent periods, custom stars, gradients and sunsets need a richer definition and renderer, not flattening into one value. |
|
||||||
| Sky/fog/cloud/grass/foliage/water colors, natural variants, horizon, rainbow | Existing sky/dimension visuals and preview | Require an explicit modern client/biome-color design; metadata-only symbol pages must not pretend to change rendering. |
|
| Sky/fog/cloud/grass/foliage/water colors, natural variants, horizon, rainbow | Existing sky/dimension visuals and preview | Require an explicit modern client/biome-color design; metadata-only symbol pages must not pretend to change rendering. |
|
||||||
| Caves, ores, huge trees, lakes, floating islands, tendrils, skylands, spheres, spikes, crystals; vanilla villages, strongholds, mineshafts, dungeons, fortresses, obelisks, fissures | Current cave profile and vanilla data-pack generation | Compile only features for which registered 1.21.1 placed features/structures exist. Defer bespoke structures and polish to milestone 7. |
|
| Caves, ores, huge trees, lakes, floating islands, tendrils, skylands, spheres, spikes, crystals; vanilla villages, strongholds, mineshafts, dungeons, fortresses, obelisks, fissures | Current cave profile, authored Floating Islands/Tendrils/Skylands/Spheres/Spikes/Obelisks/Crystal Formations and Dense Ores, and page-gated vanilla Dungeons/Mineshafts/Nether Fortresses/Strongholds/Villages | The five Legacy vanilla structure symbols gate Minecraft 1.21.1 generation. Dungeons use monster-room placement; the others use vanilla structure sets. Obelisks use a bespoke 4×4 plinth and 2×12×2 shaft with safe modern placement. Crystal Formations retain Legacy's blue tile and one-in-fifteen attempt rate but use new budding, shard-producing mounds. Fissures and exact 1.12 structure geometry remain separate work. |
|
||||||
| `EnvAccel`, explosions, lightning, meteors, scorching; PvP and dummy suppression pages | No equivalent Age-definition effect | Defer environmental hazards/instability effects to milestone 6, PvP rule to a separately scoped server policy; retain authored IDs without fake behavior. |
|
| `EnvAccel`, explosions, lightning, meteors, scorching; PvP and dummy suppression pages | No equivalent Age-definition effect | Defer environmental hazards/instability effects to milestone 6, PvP rule to a separately scoped server policy; retain authored IDs without fake behavior. |
|
||||||
|
|
||||||
The Legacy symbol list and page names come from [ModSymbols](https://github.com/Mystcraft/Mystcraft-Legacy/blob/9bc8ddc061845df0cd5ea47f4fdef773cff786ae/src/main/java/com/xcompwiz/mystcraft/data/ModSymbols.java#L129-L240) and [SymbolRules](https://github.com/Mystcraft/Mystcraft-Legacy/blob/9bc8ddc061845df0cd5ea47f4fdef773cff786ae/src/main/java/com/xcompwiz/mystcraft/data/SymbolRules.java#L19-L137). Rivencraft's [catalog](../src/main/java/net/dnorberg/rivencraft/writing/SymbolCatalog.java) currently holds display metadata only; its built-in set is just standard terrain, native biomes, normal weather, normal lighting, normal time, and caves. [OrderedWriting](../src/main/java/net/dnorberg/rivencraft/writing/OrderedWriting.java) preserves page order, but no compiler yet connects it to [AgeTraits](../src/main/java/net/dnorberg/rivencraft/book/AgeTraits.java) or [Age profiles](AGE_PROFILES.md).
|
The Legacy symbol list and page names come from [ModSymbols](https://github.com/Mystcraft/Mystcraft-Legacy/blob/9bc8ddc061845df0cd5ea47f4fdef773cff786ae/src/main/java/com/xcompwiz/mystcraft/data/ModSymbols.java#L129-L240) and [SymbolRules](https://github.com/Mystcraft/Mystcraft-Legacy/blob/9bc8ddc061845df0cd5ea47f4fdef773cff786ae/src/main/java/com/xcompwiz/mystcraft/data/SymbolRules.java#L19-L137). Rivencraft's [catalog](../src/main/java/net/dnorberg/rivencraft/writing/SymbolCatalog.java) currently holds display metadata only; its built-in set is just standard terrain, native biomes, normal weather, normal lighting, normal time, and caves. [OrderedWriting](../src/main/java/net/dnorberg/rivencraft/writing/OrderedWriting.java) preserves page order, but no compiler yet connects it to [AgeTraits](../src/main/java/net/dnorberg/rivencraft/book/AgeTraits.java) or [Age profiles](AGE_PROFILES.md).
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ Serene Seasons 10.1.0.8 has no public dynamic-dimension registration hook, so th
|
|||||||
3. Without restarting or reconnecting, travel into the Age and check `/season get`; change its season with `/season set mid_winter` and check the Overworld and another Age separately.
|
3. Without restarting or reconnecting, travel into the Age and check `/season get`; change its season with `/season set mid_winter` and check the Overworld and another Age separately.
|
||||||
4. Reconnect another client and confirm it receives the same whitelist. Restart the server and confirm both the whitelist entry and the Age's season persisted.
|
4. Reconnect another client and confirm it receives the same whitelist. Restart the server and confirm both the whitelist entry and the Age's season persisted.
|
||||||
5. Build separate Ages with No Seasons, Seasons, and each Eternal page. Confirm No Seasons stays absent from Serene's whitelist, Seasons advances, and each Eternal Age remains in its named mid-season across several in-game days, a reconnect, and a server restart. Verify the Overworld still advances normally. The Eternal page should not stop the Age's sun or moon. With Serene removed, No Seasons should still bind, but the other five pages should refuse to bind with a clear message.
|
5. Build separate Ages with No Seasons, Seasons, and each Eternal page. Confirm No Seasons stays absent from Serene's whitelist, Seasons advances, and each Eternal Age remains in its named mid-season across several in-game days, a reconnect, and a server restart. Verify the Overworld still advances normally. The Eternal page should not stop the Age's sun or moon. With Serene removed, No Seasons should still bind, but the other five pages should refuse to bind with a clear message.
|
||||||
|
6. With Serene installed and `auto_whitelist_ages=true`, create several new Link-Panel-only Ages and Ages with symbols but no season page. `/rivencraft age list` shows each saved random `season:` choice. Check that No Seasons is absent from Serene's whitelist, Seasons advances, and each Eternal choice holds its season. Reopen the world and confirm the listed choices do not change. Without Serene, create another unpaged Age and confirm the list has no saved season choice for it.
|
||||||
|
|
||||||
For a local development run, `./gradlew runClient -PwithSereneSeasons=true` adds these two mods only to that run. The published Rivencraft jar does not include or require them.
|
For a local development run, `./gradlew runClient -PwithSereneSeasons=true` adds these two mods only to that run. The published Rivencraft jar does not include or require them.
|
||||||
|
|
||||||
@@ -31,7 +32,7 @@ An Age may specify one of six mutually exclusive seasonal modes:
|
|||||||
| Eternal Fall | Hold this Age in fall/autumn. |
|
| Eternal Fall | Hold this Age in fall/autumn. |
|
||||||
| Eternal Spring | Hold this Age in spring. |
|
| Eternal Spring | Hold this Age in spring. |
|
||||||
|
|
||||||
The six pages are available in the Season creative tab and the same page feed used by JEI. The writing grammar accepts at most one seasonal page, and its choice is saved in the Age plan. No Seasons removes that Age's ID from Serene's whitelist, even if it was previously enrolled; the other explicit pages enroll it regardless of the automatic-enrollment setting. An Age without a seasonal page follows the server's `auto_whitelist_ages` setting. If Serene Seasons is absent, No Seasons remains valid, but the other five pages reject **new** Age creation with a missing-dependency message rather than silently doing nothing. Existing Ages remain loadable with their saved pages, though their season effects are inactive until a supported season mod returns. The Ecliptic Seasons adapter is separate future work, and only one season mod is expected to be installed at a time.
|
The six pages are available in the Season creative tab and the same page feed used by JEI. The writing grammar accepts at most one seasonal page, and its choice is saved in the Age plan. No Seasons removes that Age's ID from Serene's whitelist, even if it was previously enrolled; the other explicit pages enroll it regardless of the automatic-enrollment setting. When a **new** Age has no season page and Serene Seasons is installed, Rivencraft chooses one of these six modes from the Age seed and saves that choice in the Age definition. A Link-Panel-only random Age is included. The choice does not change on reload or when the spawn moves. If Serene is absent at creation, no random seasonal modifier is assigned. Older Ages without a stored choice keep their previous normal-cycle behavior. The server's `auto_whitelist_ages=false` setting still prevents implicit (unpaged) modes other than No Seasons from enrolling the Age; explicit seasonal pages override it. If Serene Seasons is absent, No Seasons remains valid, but the other five pages reject **new** Age creation with a missing-dependency message rather than silently doing nothing. Existing Ages remain loadable with their saved pages, though their season effects are inactive until a supported season mod returns. Ecliptic Seasons integration was closed as unsupported for dynamic Ages in issue #39.
|
||||||
|
|
||||||
For an eternal mode, Rivencraft sets Serene's per-Age saved clock to the midpoint of the chosen season and resets it before it leaves that mid-season. Clients receive Serene's normal season sync. This does not freeze the Age's day/night cycle or change the Overworld's season. Eternal Winter does not guarantee snow in every biome.
|
For an eternal mode, Rivencraft sets Serene's per-Age saved clock to the midpoint of the chosen season and resets it before it leaves that mid-season. Clients receive Serene's normal season sync. This does not freeze the Age's day/night cycle or change the Overworld's season. Eternal Winter does not guarantee snow in every biome.
|
||||||
|
|
||||||
@@ -44,3 +45,5 @@ For an eternal mode, Rivencraft sets Serene's per-Age saved clock to the midpoin
|
|||||||
## Verification so far
|
## Verification so far
|
||||||
|
|
||||||
`./gradlew build` passed for candidate 0.4.9.2, and the baseline plus archived environment GameTests passed (35 required tests). The archive now covers seasonal page visibility, exclusivity, and saved-plan persistence without Serene installed. With Serene Seasons 10.1.0.8 and GlitchCore 2.1.0.2 in the optional local runtime, the GameTest server previously crashed when Serene Seasons sent `sereneseasons:sync_season_cycle` to a GameTest mock player that had not negotiated its client payload channel. The stack trace originates in Serene Seasons' `SeasonHandler.sendSeasonUpdate`, through GlitchCore's packet handler and NeoForge's packet check. This is a GameTest mock-network limitation, not a completed absent/present compatibility check. Do not keep rerunning that suite with Serene Seasons; use the real-client test path above instead.
|
`./gradlew build` passed for candidate 0.4.9.2, and the baseline plus archived environment GameTests passed (35 required tests). The archive now covers seasonal page visibility, exclusivity, and saved-plan persistence without Serene installed. With Serene Seasons 10.1.0.8 and GlitchCore 2.1.0.2 in the optional local runtime, the GameTest server previously crashed when Serene Seasons sent `sereneseasons:sync_season_cycle` to a GameTest mock player that had not negotiated its client payload channel. The stack trace originates in Serene Seasons' `SeasonHandler.sendSeasonUpdate`, through GlitchCore's packet handler and NeoForge's packet check. This is a GameTest mock-network limitation, not a completed absent/present compatibility check. Do not keep rerunning that suite with Serene Seasons; use the real-client test path above instead.
|
||||||
|
|
||||||
|
For candidate 0.4.10.1, `./gradlew build --offline` and the focused environment archive passed (36 required GameTests). The new regression check covers omitted-page selection, explicit-page precedence, no-Serene behavior, and save/reload. Actual Serene weather, whitelisting, and eternal-season visuals still require the real-client steps above.
|
||||||
@@ -16,6 +16,8 @@ Feature pages come after the celestial section. Their order is retained in the p
|
|||||||
|
|
||||||
Flowers, Trees, Huge Trees, Rocks, Surface Lakes, Deep Lakes, and Small Lakes add vanilla placed features after normal biome decoration. Huge Trees currently use vanilla old-growth spruce placement as a modern approximation of Legacy's huge-tree page; it is not the custom Legacy tree generator. Without a preceding material page, Rocks select a valid solid block and each lake page selects a valid source-fluid block from the registered pool. The selection is deterministic for an Age seed and feature ID, so all chunks in that Age use the same material across restarts with the same block registry. The page-specific feature preserves vanilla placement rules other than the biome-list filter, since an authored page deliberately adds it to the Age. Surface and Small Lakes use a more visible one-in-twelve-chunks attempt rate instead of vanilla lava lakes' one-in-two-hundred; Deep Lakes retain their underground placement. Vanilla biome lava lakes are separate and can still appear alongside authored fluid lakes. These decorations require surface Noise terrain; Cave, Flat, and Void reject them. Flowers and both tree pages require at least one surface Overworld biome and only run in compatible chunks; Nether, End, and tagged cave biomes do not receive surface vegetation. Ravines add a separate Age-seeded vanilla canyon-carving pass to Noise terrain. Unsupported feature IDs and missing vanilla registry entries produce diagnostics instead of becoming no-ops.
|
Flowers, Trees, Huge Trees, Rocks, Surface Lakes, Deep Lakes, and Small Lakes add vanilla placed features after normal biome decoration. Huge Trees currently use vanilla old-growth spruce placement as a modern approximation of Legacy's huge-tree page; it is not the custom Legacy tree generator. Without a preceding material page, Rocks select a valid solid block and each lake page selects a valid source-fluid block from the registered pool. The selection is deterministic for an Age seed and feature ID, so all chunks in that Age use the same material across restarts with the same block registry. The page-specific feature preserves vanilla placement rules other than the biome-list filter, since an authored page deliberately adds it to the Age. Surface and Small Lakes use a more visible one-in-twelve-chunks attempt rate instead of vanilla lava lakes' one-in-two-hundred; Deep Lakes retain their underground placement. Vanilla biome lava lakes are separate and can still appear alongside authored fluid lakes. These decorations require surface Noise terrain; Cave, Flat, and Void reject them. Flowers and both tree pages require at least one surface Overworld biome and only run in compatible chunks; Nether, End, and tagged cave biomes do not receive surface vegetation. Ravines add a separate Age-seeded vanilla canyon-carving pass to Noise terrain. Unsupported feature IDs and missing vanilla registry entries produce diagnostics instead of becoming no-ops.
|
||||||
|
|
||||||
Material pages are generated for registered full-collision, non-fluid blocks and genuine source-fluid blocks, including eligible blocks supplied by other mods. Blocks with block entities are excluded. Waterlogged plants and coral are not fluid blocks and receive no pages. Valid source-fluid blocks appear only in the Fluid Pages creative tab; valid full-collision solids appear only in Block Pages. Both categories use the same saved material-page semantics. Put a Block Page immediately before Rocks to choose a rock material, or a Fluid Page immediately before Surface Lakes, Deep Lakes, or Small Lakes to choose a lake fluid. A material page left alone, placed before a different category, or attached to an incompatible feature is rejected. Both the feature and material ID are frozen in the saved plan, so future chunks retain their choice after restart. Existing chunks are not retroactively decorated. Custom structures, crystals, portals, and the Cave-terrain bug are outside this slice.
|
Material pages are generated for registered full-collision, non-fluid blocks and genuine source-fluid blocks, including eligible blocks supplied by other mods. Blocks with block entities are excluded. Waterlogged plants and coral are not fluid blocks and receive no pages. Valid source-fluid blocks appear only in the Fluid Pages creative tab; valid full-collision solids appear only in Block Pages. Both categories use the same saved material-page semantics. Put a Block Page immediately before Rocks to choose a rock material, or a Fluid Page immediately before Surface Lakes, Deep Lakes, or Small Lakes to choose a lake fluid. A material page left alone, placed before a different category, or attached to an incompatible feature is rejected. Both the feature and material ID are frozen in the saved plan, so future chunks retain their choice after restart. Existing chunks are not retroactively decorated. Portals and the Cave-terrain bug remain separate work.
|
||||||
|
|
||||||
|
Crystal Formations are an authored, material-free feature on exposed solid terrain, including Flat terrain; Cave and Void reject the page. Like Legacy, one in fifteen eligible chunks attempts a formation, with the site fixed by the Age seed and chunk coordinates. The modern formation is a compact mound with budding hearts instead of Legacy's long crystal lines. Budding blocks grow through small, medium, and large buds into clusters using vanilla amethyst timing and sounds. Non-silk cluster harvest yields Crystal Shards; four shards craft one Crystal Block. These blocks and shards use 16×16 textures: Legacy's crystal tile for solids and hue-shifted vanilla amethyst sprites for buds and clusters. A page-free Age can also randomly select Crystal Formations; an authored page always retains its exact choice in the saved plan.
|
||||||
|
|
||||||
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. 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.
|
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. 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.
|
||||||
@@ -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.
|
# 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
|
mod_license=LGPL-3.0-or-later
|
||||||
# The mod version. Rivencraft uses the x.y.z.b policy documented in README.md.
|
# The mod version. Rivencraft uses the x.y.z.b policy documented in README.md.
|
||||||
mod_version=0.4.9.2
|
mod_version=0.4.18.2
|
||||||
immersive_portals_version=6.0.7
|
immersive_portals_version=6.0.7
|
||||||
terrablender_version=4.1.0.8
|
terrablender_version=4.1.0.8
|
||||||
serene_seasons_version_id=B6nTjh4b
|
serene_seasons_version_id=B6nTjh4b
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
package net.dnorberg.rivencraft.block;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.registry.ModBlocks;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.server.level.ServerLevel;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.level.block.AmethystBlock;
|
||||||
|
import net.minecraft.world.level.block.AmethystClusterBlock;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.BuddingAmethystBlock;
|
||||||
|
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.material.Fluids;
|
||||||
|
|
||||||
|
/** Vanilla amethyst growth, mapped to Rivencraft's blue crystal stages. */
|
||||||
|
public final class BuddingCrystalBlock extends AmethystBlock {
|
||||||
|
public BuddingCrystalBlock(BlockBehaviour.Properties properties) {
|
||||||
|
super(properties);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
|
||||||
|
if (random.nextInt(5) != 0) return;
|
||||||
|
Direction direction = Direction.values()[random.nextInt(Direction.values().length)];
|
||||||
|
BlockPos target = pos.relative(direction);
|
||||||
|
BlockState existing = level.getBlockState(target);
|
||||||
|
Block next = nextStage(existing, direction);
|
||||||
|
if (next == null) return;
|
||||||
|
level.setBlockAndUpdate(target, next.defaultBlockState()
|
||||||
|
.setValue(AmethystClusterBlock.FACING, direction)
|
||||||
|
.setValue(AmethystClusterBlock.WATERLOGGED,
|
||||||
|
existing.getFluidState().getType() == Fluids.WATER));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Block nextStage(BlockState existing, Direction direction) {
|
||||||
|
if (BuddingAmethystBlock.canClusterGrowAtState(existing)) return ModBlocks.SMALL_CRYSTAL_BUD.get();
|
||||||
|
if (!existing.hasProperty(AmethystClusterBlock.FACING)
|
||||||
|
|| existing.getValue(AmethystClusterBlock.FACING) != direction) return null;
|
||||||
|
if (existing.is(ModBlocks.SMALL_CRYSTAL_BUD)) return ModBlocks.MEDIUM_CRYSTAL_BUD.get();
|
||||||
|
if (existing.is(ModBlocks.MEDIUM_CRYSTAL_BUD)) return ModBlocks.LARGE_CRYSTAL_BUD.get();
|
||||||
|
if (existing.is(ModBlocks.LARGE_CRYSTAL_BUD)) return ModBlocks.CRYSTAL_CLUSTER.get();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -48,7 +48,8 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
|||||||
distribution = AgeTraits.BiomeDistribution.SINGLE;
|
distribution = AgeTraits.BiomeDistribution.SINGLE;
|
||||||
}
|
}
|
||||||
if (controller.isEmpty() && !authored.isEmpty()) {
|
if (controller.isEmpty() && !authored.isEmpty()) {
|
||||||
if (distribution == AgeTraits.BiomeDistribution.NATIVE
|
if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID
|
||||||
|
|| distribution == AgeTraits.BiomeDistribution.NATIVE
|
||||||
|| (distribution == AgeTraits.BiomeDistribution.SINGLE && authored.size() > 1)) {
|
|| (distribution == AgeTraits.BiomeDistribution.SINGLE && authored.size() > 1)) {
|
||||||
distribution = authored.size() == 1 ? AgeTraits.BiomeDistribution.SINGLE
|
distribution = authored.size() == 1 ? AgeTraits.BiomeDistribution.SINGLE
|
||||||
: authored.size() == 2 ? AgeTraits.BiomeDistribution.TILED
|
: authored.size() == 2 ? AgeTraits.BiomeDistribution.TILED
|
||||||
@@ -87,7 +88,9 @@ public record AgeBiomeSelection(AgeTraits.BiomeDistribution distribution, List<R
|
|||||||
target += new Random(seed ^ 0x42494F4D45434F55L).nextInt(maximum - minimum + 1);
|
target += new Random(seed ^ 0x42494F4D45434F55L).nextInt(maximum - minimum + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
List<ResourceLocation> filler = new ArrayList<>(availableBiomes);
|
// An authored Void Age must not acquire The Void as an unrequested second biome.
|
||||||
|
List<ResourceLocation> filler = profile.terrain() == AgeRuntimeProfile.Terrain.VOID && !authored.isEmpty()
|
||||||
|
? new ArrayList<>() : new ArrayList<>(availableBiomes);
|
||||||
java.util.Collections.shuffle(filler, new Random(seed ^ 0x42494F4D45504F4FL));
|
java.util.Collections.shuffle(filler, new Random(seed ^ 0x42494F4D45504F4FL));
|
||||||
for (ResourceLocation id : filler) {
|
for (ResourceLocation id : filler) {
|
||||||
if (distinct.size() >= target) break;
|
if (distinct.size() >= target) break;
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
package net.dnorberg.rivencraft.book;
|
package net.dnorberg.rivencraft.book;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
/** Immutable, server-owned generation definition for one Age. */
|
/** Immutable, server-owned generation definition for one Age. */
|
||||||
public record AgeDefinition(
|
public record AgeDefinition(
|
||||||
@@ -17,7 +19,9 @@ public record AgeDefinition(
|
|||||||
ResourceLocation dimensionId,
|
ResourceLocation dimensionId,
|
||||||
BlockPos spawn,
|
BlockPos spawn,
|
||||||
AgeTraits traits,
|
AgeTraits traits,
|
||||||
AgeGenerationPlan plan
|
AgeGenerationPlan plan,
|
||||||
|
@Nullable AgeSeasonMode seasonMode,
|
||||||
|
List<AgeFeatureSelection.Choice> randomFeatures
|
||||||
) {
|
) {
|
||||||
public static final ResourceLocation RANDOM_VANILLA_PROFILE = ResourceLocation.fromNamespaceAndPath(
|
public static final ResourceLocation RANDOM_VANILLA_PROFILE = ResourceLocation.fromNamespaceAndPath(
|
||||||
Rivencraft.MOD_ID, "random_vanilla"
|
Rivencraft.MOD_ID, "random_vanilla"
|
||||||
@@ -30,6 +34,10 @@ public record AgeDefinition(
|
|||||||
Objects.requireNonNull(generationProfile, "generationProfile");
|
Objects.requireNonNull(generationProfile, "generationProfile");
|
||||||
Objects.requireNonNull(dimensionId, "dimensionId");
|
Objects.requireNonNull(dimensionId, "dimensionId");
|
||||||
Objects.requireNonNull(traits, "traits");
|
Objects.requireNonNull(traits, "traits");
|
||||||
|
randomFeatures = List.copyOf(randomFeatures);
|
||||||
|
if (plan != null && !randomFeatures.isEmpty()) {
|
||||||
|
throw new IllegalArgumentException("Authored Ages cannot also have random features");
|
||||||
|
}
|
||||||
if (plan != null && plan.ageSeed() != seed) {
|
if (plan != null && plan.ageSeed() != seed) {
|
||||||
throw new IllegalArgumentException("Age plan seed does not match its Age definition");
|
throw new IllegalArgumentException("Age plan seed does not match its Age definition");
|
||||||
}
|
}
|
||||||
@@ -39,7 +47,22 @@ public record AgeDefinition(
|
|||||||
int generationVersion, long createdGameTime, ResourceLocation dimensionId,
|
int generationVersion, long createdGameTime, ResourceLocation dimensionId,
|
||||||
BlockPos spawn, AgeTraits traits) {
|
BlockPos spawn, AgeTraits traits) {
|
||||||
this(id, name, seed, generationProfile, generationVersion, createdGameTime,
|
this(id, name, seed, generationProfile, generationVersion, createdGameTime,
|
||||||
dimensionId, spawn, traits, null);
|
dimensionId, spawn, traits, null, null, List.of());
|
||||||
|
}
|
||||||
|
|
||||||
|
public AgeDefinition(UUID id, String name, long seed, ResourceLocation generationProfile,
|
||||||
|
int generationVersion, long createdGameTime, ResourceLocation dimensionId,
|
||||||
|
BlockPos spawn, AgeTraits traits, AgeGenerationPlan plan) {
|
||||||
|
this(id, name, seed, generationProfile, generationVersion, createdGameTime,
|
||||||
|
dimensionId, spawn, traits, plan, null, List.of());
|
||||||
|
}
|
||||||
|
|
||||||
|
public AgeDefinition(UUID id, String name, long seed, ResourceLocation generationProfile,
|
||||||
|
int generationVersion, long createdGameTime, ResourceLocation dimensionId,
|
||||||
|
BlockPos spawn, AgeTraits traits, AgeGenerationPlan plan,
|
||||||
|
@Nullable AgeSeasonMode seasonMode) {
|
||||||
|
this(id, name, seed, generationProfile, generationVersion, createdGameTime,
|
||||||
|
dimensionId, spawn, traits, plan, seasonMode, List.of());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ResourceLocation dimensionId(UUID ageId) {
|
public static ResourceLocation dimensionId(UUID ageId) {
|
||||||
@@ -70,6 +93,6 @@ public record AgeDefinition(
|
|||||||
|
|
||||||
public AgeDefinition withSpawn(BlockPos spawn) {
|
public AgeDefinition withSpawn(BlockPos spawn) {
|
||||||
return new AgeDefinition(id, name, seed, generationProfile, generationVersion,
|
return new AgeDefinition(id, name, seed, generationProfile, generationVersion,
|
||||||
createdGameTime, dimensionId, spawn.immutable(), traits, plan);
|
createdGameTime, dimensionId, spawn.immutable(), traits, plan, seasonMode, randomFeatures);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -302,6 +302,8 @@ public final class AgeDimensionService {
|
|||||||
private static ChunkGenerator createGenerator(MinecraftServer server, AgeDefinition age) {
|
private static ChunkGenerator createGenerator(MinecraftServer server, AgeDefinition age) {
|
||||||
AgeRuntimeProfile profile = runtimeProfile(age);
|
AgeRuntimeProfile profile = runtimeProfile(age);
|
||||||
BiomeSource biomeSource = createBiomeSource(server, age, profile);
|
BiomeSource biomeSource = createBiomeSource(server, age, profile);
|
||||||
|
List<AgeFeatureSelection.Choice> features = age.plan() == null
|
||||||
|
? age.randomFeatures() : AgeFeatureSelection.resolved(age.plan());
|
||||||
if (profile.terrain() == AgeRuntimeProfile.Terrain.FLAT) {
|
if (profile.terrain() == AgeRuntimeProfile.Terrain.FLAT) {
|
||||||
var settings = FlatLevelGeneratorSettings.getDefault(
|
var settings = FlatLevelGeneratorSettings.getDefault(
|
||||||
server.registryAccess().lookupOrThrow(Registries.BIOME),
|
server.registryAccess().lookupOrThrow(Registries.BIOME),
|
||||||
@@ -309,7 +311,7 @@ public final class AgeDimensionService {
|
|||||||
server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE)
|
server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE)
|
||||||
);
|
);
|
||||||
return age.generationVersion() < AgeDefinition.CURRENT_GENERATION_VERSION
|
return age.generationVersion() < AgeDefinition.CURRENT_GENERATION_VERSION
|
||||||
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings);
|
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings, features, age.seed());
|
||||||
}
|
}
|
||||||
if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID) {
|
if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID) {
|
||||||
FlatLevelGeneratorSettings settings = new FlatLevelGeneratorSettings(
|
FlatLevelGeneratorSettings settings = new FlatLevelGeneratorSettings(
|
||||||
@@ -319,7 +321,7 @@ public final class AgeDimensionService {
|
|||||||
);
|
);
|
||||||
settings.updateLayers();
|
settings.updateLayers();
|
||||||
return age.generationVersion() < AgeDefinition.CURRENT_GENERATION_VERSION
|
return age.generationVersion() < AgeDefinition.CURRENT_GENERATION_VERSION
|
||||||
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings);
|
? new FlatLevelSource(settings) : new AgeFlatChunkGenerator(biomeSource, settings, features, age.seed());
|
||||||
}
|
}
|
||||||
|
|
||||||
var noiseSettings = server.registryAccess().lookupOrThrow(Registries.NOISE_SETTINGS);
|
var noiseSettings = server.registryAccess().lookupOrThrow(Registries.NOISE_SETTINGS);
|
||||||
@@ -327,8 +329,8 @@ public final class AgeDimensionService {
|
|||||||
Registries.NOISE_SETTINGS, profile.noiseSettings());
|
Registries.NOISE_SETTINGS, profile.noiseSettings());
|
||||||
NoiseGeneratorSettings baseSettings = noiseSettings.getOrThrow(settingsKey).value();
|
NoiseGeneratorSettings baseSettings = noiseSettings.getOrThrow(settingsKey).value();
|
||||||
Holder<NoiseGeneratorSettings> settings = Holder.direct(withBiomeMaterialRules(baseSettings));
|
Holder<NoiseGeneratorSettings> settings = Holder.direct(withBiomeMaterialRules(baseSettings));
|
||||||
List<AgeFeatureSelection.Choice> features = AgeFeatureSelection.resolved(age.plan());
|
return age.generationVersion() < AgeDefinition.CURRENT_GENERATION_VERSION
|
||||||
return features.isEmpty() ? new NoiseBasedChunkGenerator(biomeSource, settings)
|
? new NoiseBasedChunkGenerator(biomeSource, settings)
|
||||||
: new AgeFeatureChunkGenerator(biomeSource, settings, features, age.seed());
|
: new AgeFeatureChunkGenerator(biomeSource, settings, features, age.seed());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,11 +3,17 @@ package net.dnorberg.rivencraft.book;
|
|||||||
import com.mojang.serialization.Codec;
|
import com.mojang.serialization.Codec;
|
||||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
import java.util.Random;
|
||||||
import net.dnorberg.rivencraft.writing.BlockSymbolPages;
|
import net.dnorberg.rivencraft.writing.BlockSymbolPages;
|
||||||
|
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||||
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||||
import net.dnorberg.rivencraft.writing.WritingGrammar;
|
import net.dnorberg.rivencraft.writing.WritingGrammar;
|
||||||
|
import net.dnorberg.rivencraft.world.AgeDenseOres;
|
||||||
import net.minecraft.core.Holder;
|
import net.minecraft.core.Holder;
|
||||||
import net.minecraft.core.RegistryAccess;
|
import net.minecraft.core.RegistryAccess;
|
||||||
import net.minecraft.core.registries.BuiltInRegistries;
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
@@ -20,6 +26,14 @@ import net.minecraft.world.level.block.Blocks;
|
|||||||
|
|
||||||
/** Validates and freezes supported feature pages and their preceding material modifiers. */
|
/** Validates and freezes supported feature pages and their preceding material modifiers. */
|
||||||
public final class AgeFeatureSelection {
|
public final class AgeFeatureSelection {
|
||||||
|
private static final List<ResourceLocation> BLOCK_FEATURES = List.of(
|
||||||
|
id("rocks"), id("floating_islands"), id("tendrils"), id("spheres"), id("spikes"),
|
||||||
|
id("obelisks"));
|
||||||
|
private static final List<ResourceLocation> FLUID_FEATURES = List.of(
|
||||||
|
id("surface_lakes"), id("deep_lakes"), id("lava_lakes"));
|
||||||
|
private static final long RANDOM_SKYLANDS_SALT = 0x534B594C414E4453L;
|
||||||
|
public static final ResourceLocation CRYSTAL_FORMATIONS = id("crystal_formations");
|
||||||
|
|
||||||
private AgeFeatureSelection() {}
|
private AgeFeatureSelection() {}
|
||||||
|
|
||||||
public record Choice(ResourceLocation id, Optional<ResourceLocation> material) {
|
public record Choice(ResourceLocation id, Optional<ResourceLocation> material) {
|
||||||
@@ -34,11 +48,15 @@ public final class AgeFeatureSelection {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static List<Choice> compile(WritingGrammar.Result writing, AgeRuntimeProfile profile,
|
public static List<Choice> compile(WritingGrammar.Result writing, AgeRuntimeProfile profile,
|
||||||
AgeBiomeSelection biomes, RegistryAccess registries) {
|
AgeBiomeSelection biomes, RegistryAccess registries, long ageSeed) {
|
||||||
List<Choice> choices = choices(writing.symbols().stream()
|
List<Choice> choices = choices(writing.symbols().stream()
|
||||||
.map(symbol -> symbol.semantics()).toList());
|
.map(symbol -> symbol.semantics()).toList(), profile, ageSeed);
|
||||||
for (Choice choice : choices) {
|
for (Choice choice : choices) {
|
||||||
String error = error(choice.id(), profile, registries);
|
String error = error(choice.id(), profile, registries);
|
||||||
|
if (error == null && AgeStructureSelection.feature(choice.id()))
|
||||||
|
error = AgeStructureSelection.error(choice.id(), profile, biomes, registries);
|
||||||
|
if (error == null && choice.id().equals(AgeDenseOres.ID))
|
||||||
|
error = AgeDenseOres.error(profile, biomes, registries);
|
||||||
if (error == null) error = materialError(choice);
|
if (error == null) error = materialError(choice);
|
||||||
if (error != null) throw new IllegalArgumentException(error);
|
if (error != null) throw new IllegalArgumentException(error);
|
||||||
if (surfaceVegetation(choice.id()) && biomes.biomes().stream()
|
if (surfaceVegetation(choice.id()) && biomes.biomes().stream()
|
||||||
@@ -50,10 +68,15 @@ public final class AgeFeatureSelection {
|
|||||||
return choices;
|
return choices;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<Choice> choices(List<SymbolSemantics> symbols) {
|
private static List<Choice> choices(List<SymbolSemantics> symbols, AgeRuntimeProfile profile, long ageSeed) {
|
||||||
List<Choice> choices = new ArrayList<>();
|
List<Choice> choices = new ArrayList<>();
|
||||||
ResourceLocation pendingMaterial = null;
|
ResourceLocation pendingMaterial = null;
|
||||||
for (SymbolSemantics semantics : symbols) {
|
for (int index = 0; index < symbols.size(); index++) {
|
||||||
|
SymbolSemantics semantics = symbols.get(index);
|
||||||
|
if (pendingMaterial != null && semantics.role() != SymbolSemantics.Role.FEATURE) {
|
||||||
|
choices.add(implied(pendingMaterial, profile, ageSeed, index - 1));
|
||||||
|
pendingMaterial = null;
|
||||||
|
}
|
||||||
if (semantics.role() == SymbolSemantics.Role.BLOCK) {
|
if (semantics.role() == SymbolSemantics.Role.BLOCK) {
|
||||||
pendingMaterial = ((SymbolSemantics.ResourceValue) semantics.value()).id();
|
pendingMaterial = ((SymbolSemantics.ResourceValue) semantics.value()).id();
|
||||||
} else if (semantics.role() == SymbolSemantics.Role.FEATURE) {
|
} else if (semantics.role() == SymbolSemantics.Role.FEATURE) {
|
||||||
@@ -62,29 +85,151 @@ public final class AgeFeatureSelection {
|
|||||||
pendingMaterial = null;
|
pendingMaterial = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (pendingMaterial != null) choices.add(implied(pendingMaterial, profile, ageSeed, symbols.size() - 1));
|
||||||
return List.copyOf(choices);
|
return List.copyOf(choices);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static Choice implied(ResourceLocation material, AgeRuntimeProfile profile, long ageSeed, int index) {
|
||||||
|
List<ResourceLocation> candidates = compatibleFeatures(material, profile);
|
||||||
|
if (candidates.isEmpty()) throw new IllegalArgumentException("No compatible feature for material "
|
||||||
|
+ material + " on " + profile.terrain() + " terrain");
|
||||||
|
long mixed = mix(ageSeed ^ (long) material.hashCode() * 0x9E3779B97F4A7C15L ^ index);
|
||||||
|
return new Choice(candidates.get(Math.floorMod(mixed, candidates.size())), Optional.of(material));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean supportsUnpairedMaterials(WritingGrammar.Result writing, AgeRuntimeProfile profile) {
|
||||||
|
List<SymbolSemantics> symbols = writing.symbols().stream().map(symbol -> symbol.semantics()).toList();
|
||||||
|
ResourceLocation pending = null;
|
||||||
|
for (SymbolSemantics symbol : symbols) {
|
||||||
|
if (pending != null && symbol.role() != SymbolSemantics.Role.FEATURE) {
|
||||||
|
if (compatibleFeatures(pending, profile).isEmpty()) return false;
|
||||||
|
pending = null;
|
||||||
|
}
|
||||||
|
if (symbol.role() == SymbolSemantics.Role.BLOCK)
|
||||||
|
pending = ((SymbolSemantics.ResourceValue) symbol.value()).id();
|
||||||
|
else if (symbol.role() == SymbolSemantics.Role.FEATURE) pending = null;
|
||||||
|
}
|
||||||
|
return pending == null || !compatibleFeatures(pending, profile).isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<ResourceLocation> compatibleFeatures(ResourceLocation material, AgeRuntimeProfile profile) {
|
||||||
|
var block = BuiltInRegistries.BLOCK.getOptional(material);
|
||||||
|
if (block.isEmpty()) return List.of();
|
||||||
|
List<ResourceLocation> candidates = BlockSymbolPages.isFluidMaterial(block.orElseThrow())
|
||||||
|
? FLUID_FEATURES : BlockSymbolPages.isRockMaterial(block.orElseThrow())
|
||||||
|
? BLOCK_FEATURES : List.of();
|
||||||
|
return candidates.stream().filter(id -> compatible(id, profile)).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean compatible(ResourceLocation feature, AgeRuntimeProfile profile) {
|
||||||
|
if (tendrils(feature) || spheres(feature)) return true;
|
||||||
|
if (obelisks(feature)) return !AgeBiomeSelection.isCave(profile)
|
||||||
|
&& profile.terrain() != AgeRuntimeProfile.Terrain.VOID;
|
||||||
|
if (AgeBiomeSelection.isCave(profile)) return false;
|
||||||
|
if (spikes(feature)) return profile.terrain() != AgeRuntimeProfile.Terrain.VOID;
|
||||||
|
return floatingIslands(feature) || profile.terrain() == AgeRuntimeProfile.Terrain.NOISE;
|
||||||
|
}
|
||||||
|
|
||||||
public static List<Choice> resolved(AgeGenerationPlan plan) {
|
public static List<Choice> resolved(AgeGenerationPlan plan) {
|
||||||
if (plan == null) return List.of();
|
if (plan == null) return List.of();
|
||||||
return choices(plan.symbols().stream().map(symbol -> symbol.semantics()).toList()).stream()
|
Map<ResourceLocation, List<ResourceLocation>> materialOrders = new HashMap<>();
|
||||||
.map(choice -> choice.material().isPresent() || !isRock(choice.id()) && !isLake(choice.id())
|
Map<ResourceLocation, Integer> occurrences = new HashMap<>();
|
||||||
? choice : new Choice(choice.id(), Optional.of(randomMaterial(plan.ageSeed(), choice.id()))))
|
List<Choice> resolved = new ArrayList<>();
|
||||||
.toList();
|
for (Choice choice : choices(plan.symbols().stream().map(symbol -> symbol.semantics()).toList(),
|
||||||
|
plan.runtimeProfile(), plan.ageSeed())) {
|
||||||
|
if (choice.material().isPresent()
|
||||||
|
|| !isRock(choice.id()) && !isLake(choice.id())
|
||||||
|
&& !floatingIslands(choice.id()) && !tendrils(choice.id())
|
||||||
|
&& !spheres(choice.id()) && !spikes(choice.id())
|
||||||
|
&& !obelisks(choice.id())) {
|
||||||
|
resolved.add(choice);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
List<ResourceLocation> materials = materialOrders.computeIfAbsent(choice.id(),
|
||||||
|
id -> shuffledMaterials(plan.ageSeed(), id));
|
||||||
|
int occurrence = occurrences.merge(choice.id(), 1, Integer::sum) - 1;
|
||||||
|
resolved.add(new Choice(choice.id(), Optional.of(materials.get(occurrence % materials.size()))));
|
||||||
|
}
|
||||||
|
return List.copyOf(resolved);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static ResourceLocation randomMaterial(long ageSeed, ResourceLocation feature) {
|
/** Page-free Ages roll up to two material features, plus rare Skylands, once at creation. */
|
||||||
var category = isRock(feature) ? BlockSymbolPages.CATEGORY : BlockSymbolPages.FLUID_CATEGORY;
|
public static List<Choice> randomChoices(long ageSeed, AgeRuntimeProfile profile, RegistryAccess registries) {
|
||||||
List<ResourceLocation> pool = BlockSymbolPages.availableBlocks(category).stream()
|
Random random = new Random(ageSeed ^ 0x4D4154455249414CL);
|
||||||
.filter(id -> materialError(new Choice(feature, Optional.of(id))) == null).toList();
|
int count = random.nextInt(3);
|
||||||
|
List<ResourceLocation> features = new ArrayList<>();
|
||||||
|
for (ResourceLocation id : BLOCK_FEATURES) if (error(id, profile, registries) == null) features.add(id);
|
||||||
|
for (ResourceLocation id : FLUID_FEATURES) if (error(id, profile, registries) == null) features.add(id);
|
||||||
|
Collections.shuffle(features, random);
|
||||||
|
List<Choice> choices = new ArrayList<>();
|
||||||
|
for (ResourceLocation feature : features) {
|
||||||
|
if (choices.size() >= count) break;
|
||||||
|
var category = solidFeature(feature)
|
||||||
|
? BlockSymbolPages.CATEGORY : BlockSymbolPages.FLUID_CATEGORY;
|
||||||
|
List<ResourceLocation> materials = BlockSymbolPages.availableBlocks(category).stream()
|
||||||
|
.filter(id -> materialError(new Choice(feature, Optional.of(id))) == null).toList();
|
||||||
|
if (!materials.isEmpty()) choices.add(new Choice(feature,
|
||||||
|
Optional.of(materials.get(random.nextInt(materials.size())))));
|
||||||
|
}
|
||||||
|
if (profile.terrain() == AgeRuntimeProfile.Terrain.NOISE
|
||||||
|
&& Math.floorMod(mix(ageSeed ^ RANDOM_SKYLANDS_SALT), 8) == 0)
|
||||||
|
choices.add(new Choice(id("skylands"), Optional.empty()));
|
||||||
|
if (error(CRYSTAL_FORMATIONS, profile, registries) == null && random.nextInt(10) == 0)
|
||||||
|
choices.add(new Choice(CRYSTAL_FORMATIONS, Optional.empty()));
|
||||||
|
AgeBiomeSelection biomes = AgeBiomeSelection.compile(WritingGrammar.parse(OrderedWriting.EMPTY),
|
||||||
|
AgeTraits.select(ageSeed), profile, ageSeed, registries);
|
||||||
|
choices.addAll(AgeStructureSelection.randomChoices(ageSeed, profile, biomes, registries));
|
||||||
|
return List.copyOf(choices);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static List<ResourceLocation> shuffledMaterials(long ageSeed, ResourceLocation feature) {
|
||||||
|
var category = solidFeature(feature)
|
||||||
|
? BlockSymbolPages.CATEGORY : BlockSymbolPages.FLUID_CATEGORY;
|
||||||
|
List<ResourceLocation> pool = new ArrayList<>(BlockSymbolPages.availableBlocks(category).stream()
|
||||||
|
.filter(id -> materialError(new Choice(feature, Optional.of(id))) == null).toList());
|
||||||
if (pool.isEmpty()) throw new IllegalStateException("No valid material blocks for " + feature);
|
if (pool.isEmpty()) throw new IllegalStateException("No valid material blocks for " + feature);
|
||||||
long mixed = ageSeed ^ (long) feature.hashCode() * 0x9E3779B97F4A7C15L;
|
Collections.shuffle(pool, new Random(mix(ageSeed ^ (long) feature.hashCode() * 0x9E3779B97F4A7C15L)));
|
||||||
mixed = (mixed ^ mixed >>> 30) * 0xBF58476D1CE4E5B9L;
|
return pool;
|
||||||
mixed = (mixed ^ mixed >>> 27) * 0x94D049BB133111EBL;
|
}
|
||||||
return pool.get(Math.floorMod(mixed ^ mixed >>> 31, pool.size()));
|
|
||||||
|
private static long mix(long value) {
|
||||||
|
value = (value ^ value >>> 30) * 0xBF58476D1CE4E5B9L;
|
||||||
|
value = (value ^ value >>> 27) * 0x94D049BB133111EBL;
|
||||||
|
return value ^ value >>> 31;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ResourceLocation id(String path) {
|
||||||
|
return ResourceLocation.fromNamespaceAndPath("rivencraft", path);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String error(ResourceLocation choice, AgeRuntimeProfile profile, RegistryAccess registries) {
|
public static String error(ResourceLocation choice, AgeRuntimeProfile profile, RegistryAccess registries) {
|
||||||
|
if (AgeStructureSelection.feature(choice))
|
||||||
|
return AgeStructureSelection.error(choice, profile, null, registries);
|
||||||
|
if (choice.equals(AgeDenseOres.ID))
|
||||||
|
return AgeDenseOres.error(profile, null, registries);
|
||||||
|
if (choice.equals(CRYSTAL_FORMATIONS)) {
|
||||||
|
if (AgeBiomeSelection.isCave(profile) || profile.terrain() == AgeRuntimeProfile.Terrain.VOID)
|
||||||
|
return "Feature " + choice + " needs exposed solid ground, not Cave or Void terrain";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (skylands(choice)) return null;
|
||||||
|
if (tendrils(choice)) return null;
|
||||||
|
if (spheres(choice)) return null;
|
||||||
|
if (spikes(choice)) {
|
||||||
|
if (AgeBiomeSelection.isCave(profile) || profile.terrain() == AgeRuntimeProfile.Terrain.VOID)
|
||||||
|
return "Feature " + choice + " needs an exposed solid surface, not Cave or Void terrain";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (obelisks(choice)) {
|
||||||
|
if (AgeBiomeSelection.isCave(profile) || profile.terrain() == AgeRuntimeProfile.Terrain.VOID)
|
||||||
|
return "Feature " + choice + " needs exposed solid surface terrain, not Cave or Void";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if (floatingIslands(choice)) {
|
||||||
|
if (AgeBiomeSelection.isCave(profile))
|
||||||
|
return "Feature " + choice + " cannot form above Cave terrain";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
if (caves(choice) || ravines(choice)) {
|
if (caves(choice) || ravines(choice)) {
|
||||||
if (profile.terrain() != AgeRuntimeProfile.Terrain.NOISE) {
|
if (profile.terrain() != AgeRuntimeProfile.Terrain.NOISE) {
|
||||||
return "Feature " + choice + " requires noise terrain with stone to carve; not Flat or Void";
|
return "Feature " + choice + " requires noise terrain with stone to carve; not Flat or Void";
|
||||||
@@ -118,7 +263,7 @@ public final class AgeFeatureSelection {
|
|||||||
if (block.isEmpty() || block.orElseThrow() == Blocks.AIR) {
|
if (block.isEmpty() || block.orElseThrow() == Blocks.AIR) {
|
||||||
return "Feature " + choice.id() + " references missing block material " + material;
|
return "Feature " + choice.id() + " references missing block material " + material;
|
||||||
}
|
}
|
||||||
if (isRock(choice.id())) {
|
if (solidFeature(choice.id())) {
|
||||||
if (!BlockSymbolPages.isRockMaterial(block.orElseThrow())) {
|
if (!BlockSymbolPages.isRockMaterial(block.orElseThrow())) {
|
||||||
return "Feature " + choice.id() + " needs a full solid block without a block entity: " + material;
|
return "Feature " + choice.id() + " needs a full solid block without a block entity: " + material;
|
||||||
}
|
}
|
||||||
@@ -154,6 +299,35 @@ public final class AgeFeatureSelection {
|
|||||||
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "ravines"));
|
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "ravines"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean floatingIslands(ResourceLocation choice) {
|
||||||
|
return choice.equals(ResourceLocation.fromNamespaceAndPath("rivencraft", "floating_islands"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean tendrils(ResourceLocation choice) {
|
||||||
|
return choice.equals(id("tendrils"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean spheres(ResourceLocation choice) {
|
||||||
|
return choice.equals(id("spheres"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean spikes(ResourceLocation choice) {
|
||||||
|
return choice.equals(id("spikes"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean obelisks(ResourceLocation choice) {
|
||||||
|
return choice.equals(id("obelisks"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean solidFeature(ResourceLocation choice) {
|
||||||
|
return isRock(choice) || floatingIslands(choice) || tendrils(choice)
|
||||||
|
|| spheres(choice) || spikes(choice) || obelisks(choice);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean skylands(ResourceLocation choice) {
|
||||||
|
return choice.equals(id("skylands"));
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean supportsSurfaceVegetation(ResourceLocation id, RegistryAccess registries) {
|
public static boolean supportsSurfaceVegetation(ResourceLocation id, RegistryAccess registries) {
|
||||||
var biome = registries.lookupOrThrow(Registries.BIOME)
|
var biome = registries.lookupOrThrow(Registries.BIOME)
|
||||||
.get(ResourceKey.create(Registries.BIOME, id));
|
.get(ResourceKey.create(Registries.BIOME, id));
|
||||||
@@ -173,6 +347,7 @@ public final class AgeFeatureSelection {
|
|||||||
case "trees" -> ResourceLocation.withDefaultNamespace("trees_plains");
|
case "trees" -> ResourceLocation.withDefaultNamespace("trees_plains");
|
||||||
case "huge_trees" -> ResourceLocation.withDefaultNamespace("trees_old_growth_spruce_taiga");
|
case "huge_trees" -> ResourceLocation.withDefaultNamespace("trees_old_growth_spruce_taiga");
|
||||||
case "rocks" -> ResourceLocation.withDefaultNamespace("forest_rock");
|
case "rocks" -> ResourceLocation.withDefaultNamespace("forest_rock");
|
||||||
|
case "dungeons" -> ResourceLocation.fromNamespaceAndPath("rivencraft", "dungeons");
|
||||||
case "surface_lakes", "lava_lakes" -> ResourceLocation.withDefaultNamespace("lake_lava_surface");
|
case "surface_lakes", "lava_lakes" -> ResourceLocation.withDefaultNamespace("lake_lava_surface");
|
||||||
case "deep_lakes" -> ResourceLocation.withDefaultNamespace("lake_lava_underground");
|
case "deep_lakes" -> ResourceLocation.withDefaultNamespace("lake_lava_underground");
|
||||||
default -> null;
|
default -> null;
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public record AgeGenerationPlan(int version, long ageSeed, OrderedWriting writin
|
|||||||
AgeRuntimeProfile profile = AgeRuntimeProfiles.profiles().get(selected);
|
AgeRuntimeProfile profile = AgeRuntimeProfiles.profiles().get(selected);
|
||||||
if (profile == null) throw new IllegalArgumentException("Unsupported Age terrain profile " + selected);
|
if (profile == null) throw new IllegalArgumentException("Unsupported Age terrain profile " + selected);
|
||||||
AgeBiomeSelection biomes = AgeBiomeSelection.compile(parsed, traits, profile, ageSeed, registries);
|
AgeBiomeSelection biomes = AgeBiomeSelection.compile(parsed, traits, profile, ageSeed, registries);
|
||||||
AgeFeatureSelection.compile(parsed, profile, biomes, registries);
|
AgeFeatureSelection.compile(parsed, profile, biomes, registries, ageSeed);
|
||||||
AgeGenerationPlan plan = new AgeGenerationPlan(CURRENT_VERSION, ageSeed, writing,
|
AgeGenerationPlan plan = new AgeGenerationPlan(CURRENT_VERSION, ageSeed, writing,
|
||||||
parsed.symbols().stream().map(symbol -> new ResolvedSymbol(
|
parsed.symbols().stream().map(symbol -> new ResolvedSymbol(
|
||||||
symbol.index(), symbol.reference(), symbol.semantics())).toList(),
|
symbol.index(), symbol.reference(), symbol.semantics())).toList(),
|
||||||
|
|||||||
@@ -66,7 +66,32 @@ public final class AgePersistenceGameTests {
|
|||||||
new AgeReference(UUID.randomUUID(), "Panel Only"),
|
new AgeReference(UUID.randomUUID(), "Panel Only"),
|
||||||
new OrderedWriting(List.of(WritingEntry.linkPanel())));
|
new OrderedWriting(List.of(WritingEntry.linkPanel())));
|
||||||
helper.assertTrue(pageFree.plan() == null && panelOnly.plan() == null,
|
helper.assertTrue(pageFree.plan() == null && panelOnly.plan() == null,
|
||||||
"Old and Link-Panel-only books must retain the random Age path");
|
"Page-free and Link-Panel-only books must retain the random Age path");
|
||||||
|
for (AgeDefinition age : List.of(pageFree, panelOnly)) {
|
||||||
|
helper.assertTrue(age.randomFeatures().stream().filter(choice -> choice.material().isPresent())
|
||||||
|
.count() <= 2,
|
||||||
|
"A random Age may roll at most two material features");
|
||||||
|
helper.assertTrue(age.randomFeatures().stream().filter(choice ->
|
||||||
|
AgeFeatureSelection.skylands(choice.id())).count() <= 1,
|
||||||
|
"A random Age may roll at most one Skylands filter");
|
||||||
|
helper.assertTrue(age.randomFeatures().stream().filter(choice ->
|
||||||
|
AgeStructureSelection.feature(choice.id())).count() <= 2,
|
||||||
|
"A random Age may roll at most two distinct structure features");
|
||||||
|
for (AgeFeatureSelection.Choice choice : age.randomFeatures()) {
|
||||||
|
helper.assertTrue(AgeFeatureSelection.skylands(choice.id())
|
||||||
|
|| AgeStructureSelection.feature(choice.id())
|
||||||
|
? choice.material().isEmpty()
|
||||||
|
: choice.material().isPresent()
|
||||||
|
&& AgeFeatureSelection.materialError(choice) == null,
|
||||||
|
"Random material features need valid blocks or fluids; Skylands and structures need none");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
AgeRegistrySavedData registry = AgeRegistrySavedData.get(helper.getLevel());
|
||||||
|
var restored = AgeRegistrySavedData.load(
|
||||||
|
registry.save(new CompoundTag(), helper.getLevel().registryAccess()),
|
||||||
|
helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(restored.find(pageFree.id()).orElseThrow().randomFeatures(),
|
||||||
|
pageFree.randomFeatures(), "Random material features must survive a saved-data round trip");
|
||||||
helper.succeed();
|
helper.succeed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import net.minecraft.resources.ResourceLocation;
|
|||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
import net.minecraft.util.datafix.DataFixTypes;
|
import net.minecraft.util.datafix.DataFixTypes;
|
||||||
import net.minecraft.world.level.saveddata.SavedData;
|
import net.minecraft.world.level.saveddata.SavedData;
|
||||||
|
import net.neoforged.fml.ModList;
|
||||||
|
|
||||||
/** Server-wide persistent mapping from stable book UUIDs to immutable Age definitions. */
|
/** Server-wide persistent mapping from stable book UUIDs to immutable Age definitions. */
|
||||||
public final class AgeRegistrySavedData extends SavedData {
|
public final class AgeRegistrySavedData extends SavedData {
|
||||||
@@ -32,6 +33,8 @@ public final class AgeRegistrySavedData extends SavedData {
|
|||||||
private static final String SPAWN_Z_TAG = "SpawnZ";
|
private static final String SPAWN_Z_TAG = "SpawnZ";
|
||||||
private static final String TRAITS_TAG = "Traits";
|
private static final String TRAITS_TAG = "Traits";
|
||||||
private static final String PLAN_TAG = "GenerationPlan";
|
private static final String PLAN_TAG = "GenerationPlan";
|
||||||
|
private static final String RANDOM_FEATURES_TAG = "RandomFeatures";
|
||||||
|
private static final String SEASON_MODE_TAG = "SeasonMode";
|
||||||
private static final String BIOME_DISTRIBUTION_TAG = "BiomeDistribution";
|
private static final String BIOME_DISTRIBUTION_TAG = "BiomeDistribution";
|
||||||
private static final String LIGHTING_TAG = "Lighting";
|
private static final String LIGHTING_TAG = "Lighting";
|
||||||
private static final String WEATHER_TAG = "Weather";
|
private static final String WEATHER_TAG = "Weather";
|
||||||
@@ -130,7 +133,10 @@ public final class AgeRegistrySavedData extends SavedData {
|
|||||||
dimensionId,
|
dimensionId,
|
||||||
null,
|
null,
|
||||||
AgeEnvironmentCompiler.apply(plan, traits),
|
AgeEnvironmentCompiler.apply(plan, traits),
|
||||||
plan
|
plan,
|
||||||
|
AgeSeasonMode.select(plan, seed, ModList.get().isLoaded("sereneseasons")),
|
||||||
|
plan == null ? AgeFeatureSelection.randomChoices(seed,
|
||||||
|
AgeRuntimeProfiles.resolve(seedProfile), registries) : List.of()
|
||||||
);
|
);
|
||||||
ages.put(created.id(), created);
|
ages.put(created.id(), created);
|
||||||
setDirty();
|
setDirty();
|
||||||
@@ -174,7 +180,10 @@ public final class AgeRegistrySavedData extends SavedData {
|
|||||||
spawn,
|
spawn,
|
||||||
readTraits(entry),
|
readTraits(entry),
|
||||||
entry.contains(PLAN_TAG, CompoundTag.TAG_COMPOUND)
|
entry.contains(PLAN_TAG, CompoundTag.TAG_COMPOUND)
|
||||||
? AgeGenerationPlan.load(entry.getCompound(PLAN_TAG)) : null
|
? AgeGenerationPlan.load(entry.getCompound(PLAN_TAG)) : null,
|
||||||
|
entry.contains(SEASON_MODE_TAG, CompoundTag.TAG_STRING)
|
||||||
|
? AgeSeasonMode.parseOrNull(entry.getString(SEASON_MODE_TAG)) : null,
|
||||||
|
readRandomFeatures(entry)
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
return data;
|
return data;
|
||||||
@@ -208,12 +217,35 @@ public final class AgeRegistrySavedData extends SavedData {
|
|||||||
traits.putFloat(CELESTIAL_PHASE_TAG, age.traits().celestialPhase());
|
traits.putFloat(CELESTIAL_PHASE_TAG, age.traits().celestialPhase());
|
||||||
entry.put(TRAITS_TAG, traits);
|
entry.put(TRAITS_TAG, traits);
|
||||||
if (age.plan() != null) entry.put(PLAN_TAG, age.plan().save());
|
if (age.plan() != null) entry.put(PLAN_TAG, age.plan().save());
|
||||||
|
if (!age.randomFeatures().isEmpty()) {
|
||||||
|
ListTag featureTags = new ListTag();
|
||||||
|
for (AgeFeatureSelection.Choice choice : age.randomFeatures()) {
|
||||||
|
CompoundTag feature = new CompoundTag();
|
||||||
|
feature.putString("Id", choice.id().toString());
|
||||||
|
choice.material().ifPresent(id -> feature.putString("Material", id.toString()));
|
||||||
|
featureTags.add(feature);
|
||||||
|
}
|
||||||
|
entry.put(RANDOM_FEATURES_TAG, featureTags);
|
||||||
|
}
|
||||||
|
if (age.seasonMode() != null) entry.putString(SEASON_MODE_TAG, age.seasonMode().name());
|
||||||
serializedAges.add(entry);
|
serializedAges.add(entry);
|
||||||
});
|
});
|
||||||
tag.put(AGES_TAG, serializedAges);
|
tag.put(AGES_TAG, serializedAges);
|
||||||
return tag;
|
return tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static List<AgeFeatureSelection.Choice> readRandomFeatures(CompoundTag age) {
|
||||||
|
ListTag tags = age.getList(RANDOM_FEATURES_TAG, CompoundTag.TAG_COMPOUND);
|
||||||
|
List<AgeFeatureSelection.Choice> features = new java.util.ArrayList<>();
|
||||||
|
for (int index = 0; index < tags.size(); index++) {
|
||||||
|
CompoundTag item = tags.getCompound(index);
|
||||||
|
features.add(new AgeFeatureSelection.Choice(ResourceLocation.parse(item.getString("Id")),
|
||||||
|
item.contains("Material", CompoundTag.TAG_STRING)
|
||||||
|
? Optional.of(ResourceLocation.parse(item.getString("Material"))) : Optional.empty()));
|
||||||
|
}
|
||||||
|
return List.copyOf(features);
|
||||||
|
}
|
||||||
|
|
||||||
private static AgeTraits readTraits(CompoundTag age) {
|
private static AgeTraits readTraits(CompoundTag age) {
|
||||||
if (!age.contains(TRAITS_TAG, CompoundTag.TAG_COMPOUND)) {
|
if (!age.contains(TRAITS_TAG, CompoundTag.TAG_COMPOUND)) {
|
||||||
return AgeTraits.LEGACY_DEFAULTS;
|
return AgeTraits.LEGACY_DEFAULTS;
|
||||||
|
|||||||
@@ -72,13 +72,17 @@ public final class AgeRuntimeProfiles {
|
|||||||
List<ResourceLocation> features = parsed.symbols().stream()
|
List<ResourceLocation> features = parsed.symbols().stream()
|
||||||
.filter(symbol -> symbol.semantics().role() == SymbolSemantics.Role.FEATURE)
|
.filter(symbol -> symbol.semantics().role() == SymbolSemantics.Role.FEATURE)
|
||||||
.map(symbol -> ((SymbolSemantics.ResourceValue) symbol.semantics().value()).id()).toList();
|
.map(symbol -> ((SymbolSemantics.ResourceValue) symbol.semantics().value()).id()).toList();
|
||||||
if (features.isEmpty() || PROFILES.isEmpty()) return selected;
|
boolean hasMaterial = parsed.symbols().stream().anyMatch(symbol ->
|
||||||
|
symbol.semantics().role() == SymbolSemantics.Role.BLOCK);
|
||||||
|
if ((features.isEmpty() && !hasMaterial) || PROFILES.isEmpty()) return selected;
|
||||||
AgeRuntimeProfile initial = PROFILES.get(selected);
|
AgeRuntimeProfile initial = PROFILES.get(selected);
|
||||||
if (initial != null && features.stream().allMatch(id ->
|
if (initial != null && features.stream().allMatch(id ->
|
||||||
AgeFeatureSelection.error(id, initial, registries) == null)) return selected;
|
AgeFeatureSelection.error(id, initial, registries) == null)
|
||||||
|
&& AgeFeatureSelection.supportsUnpairedMaterials(parsed, initial)) return selected;
|
||||||
List<ResourceLocation> compatible = PROFILES.entrySet().stream()
|
List<ResourceLocation> compatible = PROFILES.entrySet().stream()
|
||||||
.filter(entry -> features.stream().allMatch(id ->
|
.filter(entry -> features.stream().allMatch(id ->
|
||||||
AgeFeatureSelection.error(id, entry.getValue(), registries) == null))
|
AgeFeatureSelection.error(id, entry.getValue(), registries) == null)
|
||||||
|
&& AgeFeatureSelection.supportsUnpairedMaterials(parsed, entry.getValue()))
|
||||||
.map(Map.Entry::getKey).sorted().toList();
|
.map(Map.Entry::getKey).sorted().toList();
|
||||||
return compatible.isEmpty() ? selected
|
return compatible.isEmpty() ? selected
|
||||||
: compatible.get(Math.floorMod(Long.hashCode(seed), compatible.size()));
|
: compatible.get(Math.floorMod(Long.hashCode(seed), compatible.size()));
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
package net.dnorberg.rivencraft.book;
|
package net.dnorberg.rivencraft.book;
|
||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
import java.util.Random;
|
||||||
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
||||||
import net.neoforged.fml.ModList;
|
import net.neoforged.fml.ModList;
|
||||||
|
|
||||||
/** One authored season policy per Age; unspecified Ages retain the normal cycle. */
|
/** One authored or seed-selected season policy per Age. */
|
||||||
public enum AgeSeasonMode {
|
public enum AgeSeasonMode {
|
||||||
NO_SEASONS,
|
NO_SEASONS,
|
||||||
SEASONS,
|
SEASONS,
|
||||||
@@ -13,6 +14,32 @@ public enum AgeSeasonMode {
|
|||||||
ETERNAL_FALL,
|
ETERNAL_FALL,
|
||||||
ETERNAL_SPRING;
|
ETERNAL_SPRING;
|
||||||
|
|
||||||
|
private static final long RANDOM_SALT = 0x5E45_0A5E_5EED_21L;
|
||||||
|
|
||||||
|
/** An omitted page is selected once when an Age is created with Serene installed. */
|
||||||
|
public static AgeSeasonMode select(AgeGenerationPlan plan, long ageSeed, boolean sereneInstalled) {
|
||||||
|
if (hasAuthoredPage(plan)) return from(plan);
|
||||||
|
return sereneInstalled ? values()[new Random(ageSeed ^ RANDOM_SALT).nextInt(values().length)] : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Existing Ages without a stored choice retain their old cycling behavior. */
|
||||||
|
public static AgeSeasonMode from(AgeDefinition age) {
|
||||||
|
return age.seasonMode() == null ? from(age.plan()) : age.seasonMode();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean hasAuthoredPage(AgeGenerationPlan plan) {
|
||||||
|
return plan != null && plan.symbols().stream()
|
||||||
|
.anyMatch(symbol -> symbol.semantics().role() == SymbolSemantics.Role.SEASON);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static AgeSeasonMode parseOrNull(String value) {
|
||||||
|
try {
|
||||||
|
return valueOf(value);
|
||||||
|
} catch (IllegalArgumentException exception) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static AgeSeasonMode from(AgeGenerationPlan plan) {
|
public static AgeSeasonMode from(AgeGenerationPlan plan) {
|
||||||
if (plan == null) return SEASONS;
|
if (plan == null) return SEASONS;
|
||||||
return plan.symbols().stream()
|
return plan.symbols().stream()
|
||||||
@@ -24,9 +51,7 @@ public enum AgeSeasonMode {
|
|||||||
|
|
||||||
public static void validate(AgeGenerationPlan plan) {
|
public static void validate(AgeGenerationPlan plan) {
|
||||||
if (plan == null) return;
|
if (plan == null) return;
|
||||||
boolean authored = plan.symbols().stream()
|
if (hasAuthoredPage(plan) && from(plan) != NO_SEASONS
|
||||||
.anyMatch(symbol -> symbol.semantics().role() == SymbolSemantics.Role.SEASON);
|
|
||||||
if (authored && from(plan) != NO_SEASONS
|
|
||||||
&& !ModList.get().isLoaded("sereneseasons")) {
|
&& !ModList.get().isLoaded("sereneseasons")) {
|
||||||
throw new IllegalArgumentException("This seasonal page requires Serene Seasons to create the Age");
|
throw new IllegalArgumentException("This seasonal page requires Serene Seasons to create the Age");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package net.dnorberg.rivencraft.book;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||||
|
import net.dnorberg.rivencraft.writing.WritingEntry;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
|
import net.minecraft.gametest.framework.GameTestHelper;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.level.levelgen.structure.BuiltinStructureSets;
|
||||||
|
import net.minecraft.world.level.levelgen.structure.StructureSet;
|
||||||
|
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||||
|
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||||
|
|
||||||
|
/** Authored structure pages gate their own structure sets without enabling unrelated structures. */
|
||||||
|
@GameTestHolder(Rivencraft.MOD_ID)
|
||||||
|
@PrefixGameTestTemplate(false)
|
||||||
|
public final class AgeStructureGameTests {
|
||||||
|
private static final Map<String, ResourceLocation> SETS = Map.ofEntries(
|
||||||
|
Map.entry("mineshafts", BuiltinStructureSets.MINESHAFTS.location()),
|
||||||
|
Map.entry("nether_fortresses", id("fortresses")),
|
||||||
|
Map.entry("strongholds", BuiltinStructureSets.STRONGHOLDS.location()),
|
||||||
|
Map.entry("villages", BuiltinStructureSets.VILLAGES.location()),
|
||||||
|
Map.entry("trial_chambers", BuiltinStructureSets.TRIAL_CHAMBERS.location()),
|
||||||
|
Map.entry("bastions", id("bastions")),
|
||||||
|
Map.entry("buried_treasure", BuiltinStructureSets.BURIED_TREASURES.location()),
|
||||||
|
Map.entry("shipwrecks", BuiltinStructureSets.SHIPWRECKS.location()),
|
||||||
|
Map.entry("ocean_ruins", BuiltinStructureSets.OCEAN_RUINS.location()),
|
||||||
|
Map.entry("pillager_outposts", BuiltinStructureSets.PILLAGER_OUTPOSTS.location()),
|
||||||
|
Map.entry("ruined_portals", BuiltinStructureSets.RUINED_PORTALS.location()),
|
||||||
|
Map.entry("nether_fossils", BuiltinStructureSets.NETHER_FOSSILS.location()),
|
||||||
|
Map.entry("ancient_cities", BuiltinStructureSets.ANCIENT_CITIES.location()),
|
||||||
|
Map.entry("trail_ruins", BuiltinStructureSets.TRAIL_RUINS.location()));
|
||||||
|
|
||||||
|
private AgeStructureGameTests() {}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void structurePagesGateDistinctVanillaSets(GameTestHelper helper) {
|
||||||
|
var lookup = helper.getLevel().registryAccess().lookupOrThrow(Registries.STRUCTURE_SET);
|
||||||
|
for (var entry : SETS.entrySet()) {
|
||||||
|
var setKey = ResourceKey.create(Registries.STRUCTURE_SET, entry.getValue());
|
||||||
|
helper.assertTrue(lookup.get(setKey).isPresent(), entry.getKey() + " needs a registered structure set");
|
||||||
|
var filtered = AgeStructureSelection.filteredLookup(lookup,
|
||||||
|
List.of(new AgeFeatureSelection.Choice(id(entry.getKey()), Optional.empty())));
|
||||||
|
helper.assertTrue(filtered.get(setKey).isPresent(), entry.getKey() + " must enable its structure set");
|
||||||
|
helper.assertTrue(filtered.get(ResourceKey.create(Registries.STRUCTURE_SET,
|
||||||
|
BuiltinStructureSets.NETHER_COMPLEXES.location())).isEmpty(),
|
||||||
|
"Vanilla Nether complexes must stay disabled to keep fortresses and bastions separate");
|
||||||
|
for (var other : SETS.entrySet()) {
|
||||||
|
if (other.getKey().equals(entry.getKey())) continue;
|
||||||
|
helper.assertTrue(filtered.get(ResourceKey.create(Registries.STRUCTURE_SET,
|
||||||
|
other.getValue())).isEmpty(),
|
||||||
|
entry.getKey() + " must not enable " + other.getKey());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
helper.assertTrue(AgeStructureSelection.filteredLookup(lookup, List.of()).listElements()
|
||||||
|
.noneMatch(holder -> SETS.containsValue(holder.key().location())),
|
||||||
|
"An Age without structure pages must not inherit these structures from vanilla biomes");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void authoredPagesPersistAndRejectIncompatibleTerrain(GameTestHelper helper) {
|
||||||
|
var registries = helper.getLevel().registryAccess();
|
||||||
|
OrderedWriting written = new OrderedWriting(List.of(WritingEntry.linkPanel(), page("terrain/standard"),
|
||||||
|
page("biome/plains"), page("biome/single"), page("feature/mineshafts"),
|
||||||
|
page("feature/villages"), page("feature/trial_chambers")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(written, 149L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(149L), registries);
|
||||||
|
List<AgeFeatureSelection.Choice> expected = AgeFeatureSelection.resolved(plan);
|
||||||
|
helper.assertValueEqual(expected.stream().map(AgeFeatureSelection.Choice::id).toList(),
|
||||||
|
List.of(id("mineshafts"), id("villages"), id("trial_chambers")),
|
||||||
|
"Authored structure pages must retain their order");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), expected,
|
||||||
|
"Authored structure choices must survive an Age plan reload");
|
||||||
|
var filtered = AgeStructureSelection.filteredLookup(registries.lookupOrThrow(Registries.STRUCTURE_SET), expected);
|
||||||
|
helper.assertTrue(filtered.get(ResourceKey.create(Registries.STRUCTURE_SET,
|
||||||
|
BuiltinStructureSets.VILLAGES.location())).isPresent(), "Village set must be enabled");
|
||||||
|
helper.assertTrue(filtered.get(ResourceKey.create(Registries.STRUCTURE_SET,
|
||||||
|
BuiltinStructureSets.PILLAGER_OUTPOSTS.location())).isEmpty(), "Unwritten outposts must stay disabled");
|
||||||
|
String error = AgeStructureSelection.error(id("bastions"),
|
||||||
|
AgeRuntimeProfiles.profiles().get(id("standard")), null, registries);
|
||||||
|
helper.assertTrue(error != null && error.contains("Cave terrain"),
|
||||||
|
"Bastion page must not silently run on Standard terrain");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ResourceLocation id(String path) {
|
||||||
|
return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static WritingEntry page(String path) {
|
||||||
|
return WritingEntry.symbol(new SymbolReference(id(path)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
package net.dnorberg.rivencraft.book;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Random;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.HolderLookup;
|
||||||
|
import net.minecraft.core.HolderSet;
|
||||||
|
import net.minecraft.core.RegistryAccess;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.tags.TagKey;
|
||||||
|
import net.minecraft.world.level.levelgen.structure.BuiltinStructureSets;
|
||||||
|
import net.minecraft.world.level.levelgen.structure.StructureSet;
|
||||||
|
|
||||||
|
/** Frozen Age structure-page choices and their vanilla structure-set gate. */
|
||||||
|
public final class AgeStructureSelection {
|
||||||
|
private static final ResourceLocation FORTRESSES = ResourceLocation.fromNamespaceAndPath("rivencraft", "fortresses");
|
||||||
|
private static final ResourceLocation BASTIONS = ResourceLocation.fromNamespaceAndPath("rivencraft", "bastions");
|
||||||
|
private static final List<ResourceLocation> FEATURES = List.of(
|
||||||
|
id("dungeons"), id("mineshafts"), id("nether_fortresses"), id("strongholds"),
|
||||||
|
id("villages"), id("trial_chambers"), id("bastions"), id("buried_treasure"),
|
||||||
|
id("shipwrecks"), id("ocean_ruins"), id("pillager_outposts"), id("ruined_portals"),
|
||||||
|
id("nether_fossils"), id("ancient_cities"), id("trail_ruins"));
|
||||||
|
private static final Map<ResourceLocation, ResourceLocation> STRUCTURE_SETS = Map.ofEntries(
|
||||||
|
Map.entry(id("mineshafts"), BuiltinStructureSets.MINESHAFTS.location()),
|
||||||
|
Map.entry(id("nether_fortresses"), FORTRESSES),
|
||||||
|
Map.entry(id("strongholds"), BuiltinStructureSets.STRONGHOLDS.location()),
|
||||||
|
Map.entry(id("villages"), BuiltinStructureSets.VILLAGES.location()),
|
||||||
|
Map.entry(id("trial_chambers"), BuiltinStructureSets.TRIAL_CHAMBERS.location()),
|
||||||
|
Map.entry(id("bastions"), BASTIONS),
|
||||||
|
Map.entry(id("buried_treasure"), BuiltinStructureSets.BURIED_TREASURES.location()),
|
||||||
|
Map.entry(id("shipwrecks"), BuiltinStructureSets.SHIPWRECKS.location()),
|
||||||
|
Map.entry(id("ocean_ruins"), BuiltinStructureSets.OCEAN_RUINS.location()),
|
||||||
|
Map.entry(id("pillager_outposts"), BuiltinStructureSets.PILLAGER_OUTPOSTS.location()),
|
||||||
|
Map.entry(id("ruined_portals"), BuiltinStructureSets.RUINED_PORTALS.location()),
|
||||||
|
Map.entry(id("nether_fossils"), BuiltinStructureSets.NETHER_FOSSILS.location()),
|
||||||
|
Map.entry(id("ancient_cities"), BuiltinStructureSets.ANCIENT_CITIES.location()),
|
||||||
|
Map.entry(id("trail_ruins"), BuiltinStructureSets.TRAIL_RUINS.location()));
|
||||||
|
private static final Set<ResourceLocation> CONTROLLED_SETS = Set.of(
|
||||||
|
BuiltinStructureSets.MINESHAFTS.location(), BuiltinStructureSets.NETHER_COMPLEXES.location(),
|
||||||
|
BuiltinStructureSets.STRONGHOLDS.location(), BuiltinStructureSets.VILLAGES.location(),
|
||||||
|
BuiltinStructureSets.TRIAL_CHAMBERS.location(), FORTRESSES, BASTIONS,
|
||||||
|
BuiltinStructureSets.BURIED_TREASURES.location(), BuiltinStructureSets.SHIPWRECKS.location(),
|
||||||
|
BuiltinStructureSets.OCEAN_RUINS.location(), BuiltinStructureSets.PILLAGER_OUTPOSTS.location(),
|
||||||
|
BuiltinStructureSets.RUINED_PORTALS.location(), BuiltinStructureSets.NETHER_FOSSILS.location(),
|
||||||
|
BuiltinStructureSets.ANCIENT_CITIES.location(), BuiltinStructureSets.TRAIL_RUINS.location());
|
||||||
|
|
||||||
|
private AgeStructureSelection() {}
|
||||||
|
|
||||||
|
private static ResourceLocation id(String path) {
|
||||||
|
return ResourceLocation.fromNamespaceAndPath("rivencraft", path);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean feature(ResourceLocation id) {
|
||||||
|
return FEATURES.contains(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean dungeons(ResourceLocation id) {
|
||||||
|
return id.equals(id("dungeons"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ResourceLocation setId(ResourceLocation feature) {
|
||||||
|
return STRUCTURE_SETS.get(feature);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String error(ResourceLocation feature, AgeRuntimeProfile profile,
|
||||||
|
AgeBiomeSelection biomes, RegistryAccess registries) {
|
||||||
|
if (!feature(feature)) return "Unsupported structure feature " + feature;
|
||||||
|
if (profile.terrain() == AgeRuntimeProfile.Terrain.VOID)
|
||||||
|
return "Feature " + feature + " requires terrain, not Void";
|
||||||
|
if (dungeons(feature)) {
|
||||||
|
if (profile.terrain() != AgeRuntimeProfile.Terrain.NOISE)
|
||||||
|
return "Feature " + feature + " needs enclosed noise terrain, not Flat";
|
||||||
|
return placedExists(registries, id("dungeons")) ? null
|
||||||
|
: "Feature " + feature + " requires missing placed feature rivencraft:dungeons";
|
||||||
|
}
|
||||||
|
if (!feature.equals(id("villages")) && !feature.equals(id("strongholds"))
|
||||||
|
&& profile.terrain() != AgeRuntimeProfile.Terrain.NOISE)
|
||||||
|
return "Feature " + feature + " needs noise terrain, not Flat";
|
||||||
|
if (feature.equals(id("nether_fortresses")) || feature.equals(id("bastions"))
|
||||||
|
|| feature.equals(id("nether_fossils"))) {
|
||||||
|
if (!AgeBiomeSelection.isCave(profile))
|
||||||
|
return "Feature " + feature + " requires Cave terrain with a Nether biome";
|
||||||
|
} else if (feature.equals(id("villages")) || feature.equals(id("strongholds"))
|
||||||
|
|| feature.equals(id("buried_treasure")) || feature.equals(id("shipwrecks"))
|
||||||
|
|| feature.equals(id("ocean_ruins")) || feature.equals(id("pillager_outposts"))
|
||||||
|
|| feature.equals(id("trail_ruins"))) {
|
||||||
|
if (AgeBiomeSelection.isCave(profile))
|
||||||
|
return "Feature " + feature + " requires surface terrain, not Cave";
|
||||||
|
}
|
||||||
|
ResourceLocation setId = setId(feature);
|
||||||
|
var set = registries.lookupOrThrow(Registries.STRUCTURE_SET)
|
||||||
|
.get(ResourceKey.create(Registries.STRUCTURE_SET, setId));
|
||||||
|
if (set.isEmpty()) return "Feature " + feature + " requires missing structure set " + setId;
|
||||||
|
if (biomes == null) return null;
|
||||||
|
Set<ResourceLocation> selected = Set.copyOf(biomes.biomes());
|
||||||
|
boolean compatible = set.orElseThrow().value().structures().stream()
|
||||||
|
.flatMap(entry -> entry.structure().value().biomes().stream())
|
||||||
|
.map(holder -> holder.unwrapKey().map(ResourceKey::location).orElse(null))
|
||||||
|
.anyMatch(selected::contains);
|
||||||
|
return compatible ? null : "Feature " + feature
|
||||||
|
+ " needs at least one biome allowed by structure set " + setId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean placedExists(RegistryAccess registries, ResourceLocation id) {
|
||||||
|
return registries.lookupOrThrow(Registries.PLACED_FEATURE)
|
||||||
|
.get(ResourceKey.create(Registries.PLACED_FEATURE, id)).isPresent();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<AgeFeatureSelection.Choice> randomChoices(long ageSeed, AgeRuntimeProfile profile,
|
||||||
|
AgeBiomeSelection biomes, RegistryAccess registries) {
|
||||||
|
List<ResourceLocation> eligible = new ArrayList<>(FEATURES.stream()
|
||||||
|
.filter(id -> error(id, profile, biomes, registries) == null).toList());
|
||||||
|
Random random = new Random(ageSeed ^ 0x5354525543545552L);
|
||||||
|
Collections.shuffle(eligible, random);
|
||||||
|
int count = random.nextInt(3);
|
||||||
|
return eligible.stream().limit(count)
|
||||||
|
.map(id -> new AgeFeatureSelection.Choice(id, Optional.empty())).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Set<ResourceLocation> enabledSets(List<AgeFeatureSelection.Choice> choices) {
|
||||||
|
return choices.stream().filter(choice -> feature(choice.id()) && !dungeons(choice.id()))
|
||||||
|
.map(choice -> setId(choice.id())).collect(java.util.stream.Collectors.toUnmodifiableSet());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Stream<Holder<StructureSet>> allowedSets(Stream<Holder<StructureSet>> sets,
|
||||||
|
List<AgeFeatureSelection.Choice> choices) {
|
||||||
|
Set<ResourceLocation> enabled = enabledSets(choices);
|
||||||
|
return sets.filter(holder -> holder.unwrapKey()
|
||||||
|
.map(key -> allowed(key.location(), enabled)).orElse(false));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static HolderLookup<StructureSet> filteredLookup(HolderLookup<StructureSet> lookup,
|
||||||
|
List<AgeFeatureSelection.Choice> choices) {
|
||||||
|
Set<ResourceLocation> enabled = enabledSets(choices);
|
||||||
|
return new HolderLookup<>() {
|
||||||
|
@Override
|
||||||
|
public Optional<Holder.Reference<StructureSet>> get(ResourceKey<StructureSet> key) {
|
||||||
|
return allowed(key.location(), enabled) ? lookup.get(key) : Optional.empty();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Optional<HolderSet.Named<StructureSet>> get(TagKey<StructureSet> key) {
|
||||||
|
return lookup.get(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Stream<Holder.Reference<StructureSet>> listElements() {
|
||||||
|
return lookup.listElements().filter(holder -> allowed(holder.key().location(), enabled));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Stream<HolderSet.Named<StructureSet>> listTags() {
|
||||||
|
return lookup.listTags();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean allowed(ResourceLocation set, Set<ResourceLocation> enabled) {
|
||||||
|
return !CONTROLLED_SETS.contains(set) || enabled.contains(set);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,9 @@ import net.dnorberg.rivencraft.writing.WritingEntry;
|
|||||||
import net.dnorberg.rivencraft.writing.WritingGrammar;
|
import net.dnorberg.rivencraft.writing.WritingGrammar;
|
||||||
import net.minecraft.gametest.framework.GameTest;
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
import net.minecraft.gametest.framework.GameTestHelper;
|
import net.minecraft.gametest.framework.GameTestHelper;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.nbt.CompoundTag;
|
||||||
|
import net.minecraft.nbt.ListTag;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
|
import net.minecraft.world.level.dimension.BuiltinDimensionTypes;
|
||||||
import net.neoforged.neoforge.gametest.GameTestHolder;
|
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||||
@@ -93,6 +96,43 @@ public final class EnvironmentWritingGameTests {
|
|||||||
helper.succeed();
|
helper.succeed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void omittedSeasonPageSelectsOnlyWhenSereneIsPresent(GameTestHelper helper) {
|
||||||
|
helper.assertTrue(AgeSeasonMode.select(null, 42L, false) == null,
|
||||||
|
"An Age made without Serene must not receive a random seasonal modifier");
|
||||||
|
AgeSeasonMode selected = AgeSeasonMode.select(null, 42L, true);
|
||||||
|
helper.assertValueEqual(selected, AgeSeasonMode.select(null, 42L, true),
|
||||||
|
"The same Age seed must select the same seasonal modifier");
|
||||||
|
helper.assertTrue(selected != null, "Serene must select a mode when no season page is authored");
|
||||||
|
AgeDefinition age = new AgeDefinition(UUID.randomUUID(), "Season Test", 42L,
|
||||||
|
AgeGenerationProfiles.STANDARD, AgeDefinition.CURRENT_GENERATION_VERSION, 0L,
|
||||||
|
AgeDefinition.dimensionId(UUID.randomUUID()), null, AgeTraits.select(42L), null, selected);
|
||||||
|
helper.assertValueEqual(AgeSeasonMode.from(age.withSpawn(BlockPos.ZERO)), selected,
|
||||||
|
"Updating an Age spawn must preserve the chosen seasonal modifier");
|
||||||
|
OrderedWriting explicit = new OrderedWriting(List.of(WritingEntry.linkPanel(), page("season/no_seasons")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(explicit, 42L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(42L), helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(AgeSeasonMode.select(plan, 42L, true), AgeSeasonMode.NO_SEASONS,
|
||||||
|
"An authored season page must override random selection");
|
||||||
|
AgeReference reference = new AgeReference(UUID.randomUUID(), "Season Persistence");
|
||||||
|
AgeRegistrySavedData data = AgeRegistrySavedData.get(helper.getLevel());
|
||||||
|
AgeRegistrySavedData.resolveOrCreate(helper.getLevel(), reference);
|
||||||
|
CompoundTag saved = data.save(new CompoundTag(), helper.getLevel().registryAccess());
|
||||||
|
ListTag entries = saved.getList("Ages", CompoundTag.TAG_COMPOUND);
|
||||||
|
for (int index = 0; index < entries.size(); index++) {
|
||||||
|
CompoundTag entry = entries.getCompound(index);
|
||||||
|
if (entry.getUUID("Id").equals(reference.id())) {
|
||||||
|
entry.putString("SeasonMode", selected.name());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
AgeDefinition restored = AgeRegistrySavedData.load(saved, helper.getLevel().registryAccess())
|
||||||
|
.find(reference.id()).orElseThrow();
|
||||||
|
helper.assertValueEqual(restored.seasonMode(), selected,
|
||||||
|
"The selected seasonal modifier must survive Age data reload");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
@GameTest(template = "empty")
|
@GameTest(template = "empty")
|
||||||
public static void writtenEnvironmentPersistsAndPageFreeAgesStaySeeded(GameTestHelper helper) {
|
public static void writtenEnvironmentPersistsAndPageFreeAgesStaySeeded(GameTestHelper helper) {
|
||||||
OrderedWriting writing = new OrderedWriting(List.of(
|
OrderedWriting writing = new OrderedWriting(List.of(
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import java.util.UUID;
|
|||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.dnorberg.rivencraft.item.PageItem;
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
import net.dnorberg.rivencraft.world.AgeFeatureChunkGenerator;
|
import net.dnorberg.rivencraft.world.AgeFeatureChunkGenerator;
|
||||||
|
import net.dnorberg.rivencraft.world.AgeDenseOres;
|
||||||
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||||
import net.dnorberg.rivencraft.writing.BlockSymbolPages;
|
import net.dnorberg.rivencraft.writing.BlockSymbolPages;
|
||||||
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
||||||
@@ -31,7 +32,15 @@ public final class FeatureWritingGameTests {
|
|||||||
var registries = helper.getLevel().registryAccess();
|
var registries = helper.getLevel().registryAccess();
|
||||||
Set<String> pages = Set.of("feature/caves", "feature/flowers", "feature/trees",
|
Set<String> pages = Set.of("feature/caves", "feature/flowers", "feature/trees",
|
||||||
"feature/huge_trees", "feature/rocks", "feature/lava_lakes",
|
"feature/huge_trees", "feature/rocks", "feature/lava_lakes",
|
||||||
"feature/surface_lakes", "feature/deep_lakes", "feature/ravines");
|
"feature/surface_lakes", "feature/deep_lakes", "feature/ravines",
|
||||||
|
"feature/floating_islands", "feature/tendrils", "feature/skylands",
|
||||||
|
"feature/spheres", "feature/spikes", "feature/dungeons",
|
||||||
|
"feature/mineshafts", "feature/nether_fortresses",
|
||||||
|
"feature/strongholds", "feature/villages", "feature/trial_chambers",
|
||||||
|
"feature/bastions", "feature/buried_treasure", "feature/shipwrecks",
|
||||||
|
"feature/ocean_ruins", "feature/pillager_outposts", "feature/ruined_portals",
|
||||||
|
"feature/nether_fossils", "feature/ancient_cities", "feature/trail_ruins",
|
||||||
|
"feature/dense_ores", "feature/obelisks", "feature/crystal_formations");
|
||||||
helper.assertTrue(PageItem.bundledCreativeSymbols().containsAll(pages),
|
helper.assertTrue(PageItem.bundledCreativeSymbols().containsAll(pages),
|
||||||
"Supported feature pages must appear in the creative and JEI symbol feed");
|
"Supported feature pages must appear in the creative and JEI symbol feed");
|
||||||
for (String path : pages) {
|
for (String path : pages) {
|
||||||
@@ -57,7 +66,15 @@ public final class FeatureWritingGameTests {
|
|||||||
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())),
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())),
|
||||||
AgeFeatureSelection.resolved(plan), "Features must survive the saved-plan round trip");
|
AgeFeatureSelection.resolved(plan), "Features must survive the saved-plan round trip");
|
||||||
for (AgeFeatureSelection.Choice choice : AgeFeatureSelection.resolved(plan)) {
|
for (AgeFeatureSelection.Choice choice : AgeFeatureSelection.resolved(plan)) {
|
||||||
if (AgeFeatureSelection.caves(choice.id()) || AgeFeatureSelection.ravines(choice.id())) continue;
|
if (AgeFeatureSelection.caves(choice.id()) || AgeFeatureSelection.ravines(choice.id())
|
||||||
|
|| AgeFeatureSelection.floatingIslands(choice.id())
|
||||||
|
|| AgeFeatureSelection.tendrils(choice.id())
|
||||||
|
|| AgeFeatureSelection.skylands(choice.id())
|
||||||
|
|| AgeFeatureSelection.spheres(choice.id())
|
||||||
|
|| AgeFeatureSelection.spikes(choice.id())
|
||||||
|
|| AgeFeatureSelection.obelisks(choice.id())
|
||||||
|
|| choice.id().equals(AgeFeatureSelection.CRYSTAL_FORMATIONS)
|
||||||
|
|| choice.id().equals(AgeDenseOres.ID)) continue;
|
||||||
var placement = AgeFeatureSelection.placedFeature(choice.id());
|
var placement = AgeFeatureSelection.placedFeature(choice.id());
|
||||||
helper.assertTrue(registries.lookupOrThrow(Registries.PLACED_FEATURE)
|
helper.assertTrue(registries.lookupOrThrow(Registries.PLACED_FEATURE)
|
||||||
.get(ResourceKey.create(Registries.PLACED_FEATURE, placement)).isPresent(),
|
.get(ResourceKey.create(Registries.PLACED_FEATURE, placement)).isPresent(),
|
||||||
@@ -92,11 +109,206 @@ public final class FeatureWritingGameTests {
|
|||||||
AgeBiomeSelection.compile(net.dnorberg.rivencraft.writing.WritingGrammar.parse(
|
AgeBiomeSelection.compile(net.dnorberg.rivencraft.writing.WritingGrammar.parse(
|
||||||
new OrderedWriting(List.of(panel(), page("terrain/standard"), page("feature/flowers")))),
|
new OrderedWriting(List.of(panel(), page("terrain/standard"), page("feature/flowers")))),
|
||||||
AgeTraits.select(87L), AgeRuntimeProfiles.resolve(AgeGenerationProfiles.STANDARD),
|
AgeTraits.select(87L), AgeRuntimeProfiles.resolve(AgeGenerationProfiles.STANDARD),
|
||||||
87L, registries), registries).contains(choice("flowers")),
|
87L, registries), registries, 87L).contains(choice("flowers")),
|
||||||
"A valid surface feature must still compile");
|
"A valid surface feature must still compile");
|
||||||
helper.succeed();
|
helper.succeed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void floatingIslandsAreAdditiveAcrossSupportedTerrains(GameTestHelper helper) {
|
||||||
|
for (String terrain : List.of("standard", "amplified", "flat", "void")) {
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/" + terrain),
|
||||||
|
page("feature/floating_islands")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 450L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(plan.authoredTerrain(), id(terrain),
|
||||||
|
"Floating Islands must not replace the terrain page");
|
||||||
|
List<AgeFeatureSelection.Choice> resolved = AgeFeatureSelection.resolved(plan);
|
||||||
|
helper.assertValueEqual(resolved.stream().map(AgeFeatureSelection.Choice::id).toList(),
|
||||||
|
List.of(id("floating_islands")),
|
||||||
|
"The island feature must be frozen independently of terrain");
|
||||||
|
helper.assertTrue(resolved.getFirst().material().isPresent()
|
||||||
|
&& AgeFeatureSelection.materialError(resolved.getFirst()) == null,
|
||||||
|
"An unmodified island feature must choose a valid full-block material");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())),
|
||||||
|
resolved, "The seeded island material must survive an Age reload");
|
||||||
|
}
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/cave"),
|
||||||
|
page("feature/floating_islands"))), "cannot form above Cave terrain");
|
||||||
|
OrderedWriting materialWriting = new OrderedWriting(List.of(panel(), page("terrain/flat"),
|
||||||
|
block("glowstone"), page("feature/floating_islands")));
|
||||||
|
AgeGenerationPlan materialPlan = AgeGenerationPlan.compile(materialWriting, 450L,
|
||||||
|
AgeGenerationProfiles.STANDARD, AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(materialPlan), List.of(
|
||||||
|
new AgeFeatureSelection.Choice(id("floating_islands"), Optional.of(
|
||||||
|
ResourceLocation.withDefaultNamespace("glowstone")))),
|
||||||
|
"A preceding full-block page must set the island interior");
|
||||||
|
AgeGenerationPlan randomPlan = AgeGenerationPlan.compile(new OrderedWriting(List.of(panel())),
|
||||||
|
450L, AgeGenerationProfiles.STANDARD, AgeTraits.select(450L),
|
||||||
|
helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(randomPlan), List.of(),
|
||||||
|
"A page-free plan must not implicitly author Floating Islands");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void tendrilsAreAuthoredAndCanAppearInRandomAges(GameTestHelper helper) {
|
||||||
|
var registries = helper.getLevel().registryAccess();
|
||||||
|
AgeRuntimeProfiles.profiles().forEach((profileId, profile) ->
|
||||||
|
helper.assertTrue(AgeFeatureSelection.error(id("tendrils"), profile, registries) == null,
|
||||||
|
"Tendrils must support loaded terrain profile " + profileId));
|
||||||
|
for (String terrain : List.of("standard", "amplified", "island", "flat", "void", "cave")) {
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/" + terrain),
|
||||||
|
page("feature/tendrils")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 450L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(450L), registries);
|
||||||
|
List<AgeFeatureSelection.Choice> choices = AgeFeatureSelection.resolved(plan);
|
||||||
|
helper.assertValueEqual(choices.size(), 1, "Tendrils must compile on " + terrain + " terrain");
|
||||||
|
helper.assertValueEqual(choices.getFirst().id(), id("tendrils"),
|
||||||
|
"Tendrils must not replace the terrain page");
|
||||||
|
helper.assertTrue(choices.getFirst().material().isPresent()
|
||||||
|
&& AgeFeatureSelection.materialError(choices.getFirst()) == null,
|
||||||
|
"Unmodified Tendrils must choose a full-block material");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), choices,
|
||||||
|
"The Tendrils material must survive a plan reload");
|
||||||
|
}
|
||||||
|
OrderedWriting materialWriting = new OrderedWriting(List.of(panel(), page("terrain/void"),
|
||||||
|
block("glowstone"), page("feature/tendrils")));
|
||||||
|
AgeGenerationPlan materialPlan = AgeGenerationPlan.compile(materialWriting, 450L,
|
||||||
|
AgeGenerationProfiles.STANDARD, AgeTraits.select(450L), registries);
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(materialPlan), List.of(
|
||||||
|
new AgeFeatureSelection.Choice(id("tendrils"), Optional.of(
|
||||||
|
ResourceLocation.withDefaultNamespace("glowstone")))),
|
||||||
|
"A preceding Block page must set the Tendrils material");
|
||||||
|
var caveProfile = AgeRuntimeProfiles.resolve(id("cave"));
|
||||||
|
boolean found = false;
|
||||||
|
for (long seed = 0; seed < 12; seed++) {
|
||||||
|
List<AgeFeatureSelection.Choice> random = AgeFeatureSelection.randomChoices(seed, caveProfile, registries);
|
||||||
|
helper.assertTrue(random.stream().allMatch(choice -> AgeFeatureSelection.tendrils(choice.id())
|
||||||
|
|| AgeFeatureSelection.spheres(choice.id())
|
||||||
|
|| AgeFeatureSelection.skylands(choice.id())
|
||||||
|
|| AgeStructureSelection.feature(choice.id())),
|
||||||
|
"Cave random Ages must not choose incompatible surface features");
|
||||||
|
if (random.stream().anyMatch(choice -> AgeFeatureSelection.tendrils(choice.id()))) found = true;
|
||||||
|
}
|
||||||
|
helper.assertTrue(found, "A page-free random Cave Age must be able to roll Tendrils");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void skylandsFiltersBaseTerrainIndependentlyOfIslandFeatures(GameTestHelper helper) {
|
||||||
|
var registries = helper.getLevel().registryAccess();
|
||||||
|
for (String terrain : List.of("standard", "amplified", "island", "flat", "void", "cave")) {
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/" + terrain),
|
||||||
|
page("feature/skylands"), page("feature/floating_islands")));
|
||||||
|
if (terrain.equals("cave")) {
|
||||||
|
writing = new OrderedWriting(List.of(panel(), page("terrain/cave"),
|
||||||
|
page("feature/skylands")));
|
||||||
|
}
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 707L,
|
||||||
|
AgeGenerationProfiles.STANDARD, AgeTraits.select(707L), registries);
|
||||||
|
List<AgeFeatureSelection.Choice> resolved = AgeFeatureSelection.resolved(plan);
|
||||||
|
helper.assertValueEqual(resolved.getFirst(), new AgeFeatureSelection.Choice(
|
||||||
|
id("skylands"), Optional.empty()),
|
||||||
|
"Skylands must be a separate material-free feature on " + terrain);
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), resolved,
|
||||||
|
"Skylands and any Floating Islands page must survive a plan reload");
|
||||||
|
}
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
block("stone"), page("feature/skylands"))), "cannot consume a material page");
|
||||||
|
List<AgeFeatureSelection.Choice> randomNoise = AgeFeatureSelection.randomChoices(7L,
|
||||||
|
AgeRuntimeProfiles.resolve(id("standard")), registries);
|
||||||
|
helper.assertTrue(randomNoise.stream().anyMatch(choice -> AgeFeatureSelection.skylands(choice.id())
|
||||||
|
&& choice.material().isEmpty()),
|
||||||
|
"A page-free random noise Age must be able to roll material-free Skylands");
|
||||||
|
for (String terrain : List.of("flat", "void")) {
|
||||||
|
helper.assertTrue(AgeFeatureSelection.randomChoices(7L,
|
||||||
|
AgeRuntimeProfiles.resolve(id(terrain)), registries).stream()
|
||||||
|
.noneMatch(choice -> AgeFeatureSelection.skylands(choice.id())),
|
||||||
|
"Random " + terrain + " Ages must not roll a filter without useful upper terrain");
|
||||||
|
}
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void spheresAndSpikesHaveSeparateAuthoredPagesAndMaterials(GameTestHelper helper) {
|
||||||
|
var registries = helper.getLevel().registryAccess();
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
block("glowstone"), page("feature/spheres"), block("stone"), page("feature/spikes")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 1717L,
|
||||||
|
AgeGenerationProfiles.STANDARD, AgeTraits.select(1717L), registries);
|
||||||
|
List<AgeFeatureSelection.Choice> expected = List.of(
|
||||||
|
new AgeFeatureSelection.Choice(id("spheres"), Optional.of(
|
||||||
|
ResourceLocation.withDefaultNamespace("glowstone"))),
|
||||||
|
new AgeFeatureSelection.Choice(id("spikes"), Optional.of(
|
||||||
|
ResourceLocation.withDefaultNamespace("stone"))));
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(plan), expected,
|
||||||
|
"Each page must preserve its own preceding Block material and writing order");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), expected,
|
||||||
|
"Spheres and Spikes must retain their identities and materials after reload");
|
||||||
|
for (String terrain : List.of("standard", "amplified", "island", "flat", "void", "cave")) {
|
||||||
|
var profile = AgeRuntimeProfiles.resolve(id(terrain));
|
||||||
|
helper.assertTrue(AgeFeatureSelection.error(id("spheres"), profile, registries) == null,
|
||||||
|
"Spheres must be additive on " + terrain + " terrain");
|
||||||
|
boolean surface = !terrain.equals("void") && !terrain.equals("cave");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.error(id("spikes"), profile, registries) == null,
|
||||||
|
surface, "Spikes require a solid surface on " + terrain + " terrain");
|
||||||
|
}
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/void"),
|
||||||
|
page("feature/spikes"))), "needs an exposed solid surface");
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/cave"),
|
||||||
|
page("feature/spikes"))), "needs an exposed solid surface");
|
||||||
|
boolean randomSpheres = false;
|
||||||
|
boolean randomSpikes = false;
|
||||||
|
for (long seed = 0; seed < 80; seed++) {
|
||||||
|
var random = AgeFeatureSelection.randomChoices(seed,
|
||||||
|
AgeRuntimeProfiles.resolve(id("standard")), registries);
|
||||||
|
randomSpheres |= random.stream().anyMatch(choice -> AgeFeatureSelection.spheres(choice.id()));
|
||||||
|
randomSpikes |= random.stream().anyMatch(choice -> AgeFeatureSelection.spikes(choice.id()));
|
||||||
|
}
|
||||||
|
helper.assertTrue(randomSpheres && randomSpikes,
|
||||||
|
"Page-free surface Ages must be able to select both separate features");
|
||||||
|
for (String terrain : List.of("void", "cave")) {
|
||||||
|
var profile = AgeRuntimeProfiles.resolve(id(terrain));
|
||||||
|
for (long seed = 0; seed < 30; seed++) {
|
||||||
|
helper.assertTrue(AgeFeatureSelection.randomChoices(seed, profile, registries).stream()
|
||||||
|
.noneMatch(choice -> AgeFeatureSelection.spikes(choice.id())),
|
||||||
|
"Random " + terrain + " Ages must never choose unsupported Spikes");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void voidBiomesAreIndependentOfFloatingIslands(GameTestHelper helper) {
|
||||||
|
OrderedWriting voidDefault = new OrderedWriting(List.of(panel(), page("terrain/void")));
|
||||||
|
AgeGenerationPlan voidDefaultPlan = AgeGenerationPlan.compile(voidDefault, 450L,
|
||||||
|
AgeGenerationProfiles.STANDARD, AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(voidDefaultPlan.biomeSelection().biomes(),
|
||||||
|
List.of(net.minecraft.world.level.biome.Biomes.THE_VOID.location()),
|
||||||
|
"Void terrain without biome pages must keep The Void biome");
|
||||||
|
OrderedWriting voidDesert = new OrderedWriting(List.of(panel(), page("terrain/void"),
|
||||||
|
page("biome/desert"), page("biome/single")));
|
||||||
|
AgeGenerationPlan voidDesertPlan = AgeGenerationPlan.compile(voidDesert, 450L,
|
||||||
|
AgeGenerationProfiles.STANDARD, AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(voidDesertPlan.biomeSelection().biomes(),
|
||||||
|
List.of(net.minecraft.world.level.biome.Biomes.DESERT.location()),
|
||||||
|
"An authored biome must override The Void even with no generated blocks");
|
||||||
|
helper.assertValueEqual(AgeGenerationPlan.load(voidDesertPlan.save()).biomeSelection(),
|
||||||
|
voidDesertPlan.biomeSelection(), "The Void Age biome must survive reload");
|
||||||
|
OrderedWriting voidDesertWithoutController = new OrderedWriting(List.of(panel(),
|
||||||
|
page("terrain/void"), page("biome/desert")));
|
||||||
|
AgeGenerationPlan implicitSinglePlan = AgeGenerationPlan.compile(voidDesertWithoutController, 450L,
|
||||||
|
AgeGenerationProfiles.STANDARD, AgeTraits.select(450L), helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(implicitSinglePlan.biomeSelection().biomes(),
|
||||||
|
List.of(net.minecraft.world.level.biome.Biomes.DESERT.location()),
|
||||||
|
"A Void Age with one authored biome must not add The Void as filler");
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/void"),
|
||||||
|
page("biome/desert"), page("biome/tiny"))),
|
||||||
|
"requires 2 distinct biomes");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
@GameTest(template = "empty")
|
@GameTest(template = "empty")
|
||||||
public static void blockPagesModifyFeaturesAndSurviveReload(GameTestHelper helper) {
|
public static void blockPagesModifyFeaturesAndSurviveReload(GameTestHelper helper) {
|
||||||
var stone = ResourceLocation.withDefaultNamespace("stone");
|
var stone = ResourceLocation.withDefaultNamespace("stone");
|
||||||
@@ -146,7 +358,45 @@ public final class FeatureWritingGameTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@GameTest(template = "empty")
|
@GameTest(template = "empty")
|
||||||
public static void incompatibleAndMisplacedBlockPagesAreRejected(GameTestHelper helper) {
|
public static void repeatedMaterialAndFeaturePagesRemainInWrittenPlan(GameTestHelper helper) {
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
block("stone"), block("stone"), page("feature/rocks"), page("feature/rocks")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(87L), helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(plan.writing(), writing,
|
||||||
|
"Binding must keep every repeated material and feature page in order");
|
||||||
|
helper.assertValueEqual(plan.symbols().size(), 5,
|
||||||
|
"The frozen plan must retain both material pages and both feature pages");
|
||||||
|
List<AgeFeatureSelection.Choice> choices = AgeFeatureSelection.resolved(plan);
|
||||||
|
helper.assertValueEqual(choices.size(), 3,
|
||||||
|
"The first material gains an inferred feature; both authored features remain");
|
||||||
|
helper.assertValueEqual(choices.get(1), new AgeFeatureSelection.Choice(id("rocks"),
|
||||||
|
Optional.of(ResourceLocation.withDefaultNamespace("stone"))),
|
||||||
|
"The second material must modify the first authored Rocks page");
|
||||||
|
helper.assertValueEqual(choices.get(2).id(), id("rocks"),
|
||||||
|
"The repeated Rocks page must remain a second feature choice");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), choices,
|
||||||
|
"Repeated pages and their feature choices must survive a plan reload");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void repeatedUnmodifiedRocksChooseDistinctMaterials(GameTestHelper helper) {
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
page("feature/rocks"), page("feature/rocks"), page("feature/rocks"), page("feature/rocks")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(87L), helper.getLevel().registryAccess());
|
||||||
|
List<AgeFeatureSelection.Choice> choices = AgeFeatureSelection.resolved(plan);
|
||||||
|
helper.assertValueEqual(choices.size(), 4, "All four Rocks pages must survive binding");
|
||||||
|
helper.assertValueEqual(choices.stream().map(AgeFeatureSelection.Choice::material).distinct().count(), 4L,
|
||||||
|
"Each repeated unmodified Rocks page must receive a distinct material");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), choices,
|
||||||
|
"The four materials must remain stable after reloading the Age plan");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void incompatibleAndUnpairedMaterialPages(GameTestHelper helper) {
|
||||||
helper.assertTrue(AgeFeatureSelection.materialError(new AgeFeatureSelection.Choice(
|
helper.assertTrue(AgeFeatureSelection.materialError(new AgeFeatureSelection.Choice(
|
||||||
id("rocks"), Optional.of(ResourceLocation.withDefaultNamespace("torch"))))
|
id("rocks"), Optional.of(ResourceLocation.withDefaultNamespace("torch"))))
|
||||||
.contains("full solid block"),
|
.contains("full solid block"),
|
||||||
@@ -155,8 +405,30 @@ public final class FeatureWritingGameTests {
|
|||||||
block("stone"), page("feature/surface_lakes"))), "source-fluid block");
|
block("stone"), page("feature/surface_lakes"))), "source-fluid block");
|
||||||
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
block("stone"), page("feature/trees"))), "cannot consume a material page");
|
block("stone"), page("feature/trees"))), "cannot consume a material page");
|
||||||
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
for (String material : List.of("stone", "water")) {
|
||||||
block("stone"))), "immediately before a compatible feature");
|
OrderedWriting writing = new OrderedWriting(List.of(panel(), page("terrain/standard"),
|
||||||
|
block(material)));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 87L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(87L), helper.getLevel().registryAccess());
|
||||||
|
List<AgeFeatureSelection.Choice> choices = AgeFeatureSelection.resolved(plan);
|
||||||
|
helper.assertValueEqual(choices.size(), 1, "An unpaired material page must gain one feature");
|
||||||
|
helper.assertValueEqual(choices.getFirst().material(),
|
||||||
|
Optional.of(ResourceLocation.withDefaultNamespace(material)),
|
||||||
|
"The inferred feature must consume the authored material");
|
||||||
|
helper.assertTrue(material.equals("water")
|
||||||
|
? AgeFeatureSelection.isLake(choices.getFirst().id())
|
||||||
|
: AgeFeatureSelection.isRock(choices.getFirst().id())
|
||||||
|
|| AgeFeatureSelection.floatingIslands(choices.getFirst().id())
|
||||||
|
|| AgeFeatureSelection.tendrils(choices.getFirst().id())
|
||||||
|
|| AgeFeatureSelection.spheres(choices.getFirst().id())
|
||||||
|
|| AgeFeatureSelection.spikes(choices.getFirst().id())
|
||||||
|
|| AgeFeatureSelection.obelisks(choices.getFirst().id()),
|
||||||
|
"The inferred feature must accept the material type");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), choices,
|
||||||
|
"The inferred feature must be deterministic across a plan reload");
|
||||||
|
}
|
||||||
|
rejects(helper, new OrderedWriting(List.of(panel(), page("terrain/void"), block("water"))),
|
||||||
|
"No compatible feature for material");
|
||||||
helper.succeed();
|
helper.succeed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -92,8 +92,10 @@ public final class ClientBookInteractionHandler {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
minecraft.setScreen(payload.fromStand()
|
minecraft.setScreen(payload.fromStand()
|
||||||
? new DescriptiveBookScreen(payload.source().pos(), payload.book(), payload.traits(), payload.writingSymbols())
|
? new DescriptiveBookScreen(payload.source().pos(), payload.book(), payload.traits(),
|
||||||
: new DescriptiveBookScreen(hand, payload.book(), payload.traits(), payload.writingSymbols()));
|
payload.writingSymbols())
|
||||||
|
: new DescriptiveBookScreen(hand, payload.book(), payload.traits(),
|
||||||
|
payload.writingSymbols()));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,9 +2,12 @@ package net.dnorberg.rivencraft.client;
|
|||||||
|
|
||||||
import net.dnorberg.rivencraft.Rivencraft;
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
import net.dnorberg.rivencraft.registry.ModBlockEntities;
|
import net.dnorberg.rivencraft.registry.ModBlockEntities;
|
||||||
|
import net.dnorberg.rivencraft.registry.ModBlocks;
|
||||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
import net.minecraft.client.renderer.item.ItemProperties;
|
import net.minecraft.client.renderer.item.ItemProperties;
|
||||||
|
import net.minecraft.client.renderer.ItemBlockRenderTypes;
|
||||||
|
import net.minecraft.client.renderer.RenderType;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.neoforged.api.distmarker.Dist;
|
import net.neoforged.api.distmarker.Dist;
|
||||||
import net.neoforged.bus.api.SubscribeEvent;
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
@@ -62,11 +65,18 @@ public final class ClientEvents {
|
|||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public static void clientSetup(FMLClientSetupEvent event) {
|
public static void clientSetup(FMLClientSetupEvent event) {
|
||||||
event.enqueueWork(() -> ItemProperties.register(
|
event.enqueueWork(() -> {
|
||||||
ModItems.LINKING_BOOK.get(),
|
ItemProperties.register(
|
||||||
ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "bound"),
|
ModItems.LINKING_BOOK.get(),
|
||||||
(stack, level, entity, seed) -> stack.has(ModDataComponents.LINK_TARGET.get()) ? 1.0F : 0.0F
|
ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "bound"),
|
||||||
));
|
(stack, level, entity, seed) -> stack.has(ModDataComponents.LINK_TARGET.get()) ? 1.0F : 0.0F
|
||||||
|
);
|
||||||
|
// Some renderers still query the block layer instead of the model's render_type hint.
|
||||||
|
ItemBlockRenderTypes.setRenderLayer(ModBlocks.SMALL_CRYSTAL_BUD.get(), RenderType.cutout());
|
||||||
|
ItemBlockRenderTypes.setRenderLayer(ModBlocks.MEDIUM_CRYSTAL_BUD.get(), RenderType.cutout());
|
||||||
|
ItemBlockRenderTypes.setRenderLayer(ModBlocks.LARGE_CRYSTAL_BUD.get(), RenderType.cutout());
|
||||||
|
ItemBlockRenderTypes.setRenderLayer(ModBlocks.CRYSTAL_CLUSTER.get(), RenderType.cutout());
|
||||||
|
});
|
||||||
NeoForge.EVENT_BUS.addListener(ClientBookInteractionHandler::onRightClickItem);
|
NeoForge.EVENT_BUS.addListener(ClientBookInteractionHandler::onRightClickItem);
|
||||||
NeoForge.EVENT_BUS.addListener(ClientBookInteractionHandler::onRightClickBlock);
|
NeoForge.EVENT_BUS.addListener(ClientBookInteractionHandler::onRightClickBlock);
|
||||||
NeoForge.EVENT_BUS.addListener(ClientBookExploreOverlay::onClientTickPre);
|
NeoForge.EVENT_BUS.addListener(ClientBookExploreOverlay::onClientTickPre);
|
||||||
|
|||||||
@@ -69,6 +69,13 @@ public final class SymbolPageTextures {
|
|||||||
return forPage(stack, true);
|
return forPage(stack, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Book pages use the same server-resolved poem and glyph composition as Page items. */
|
||||||
|
public static ResourceLocation forDisplay(SymbolDisplayMetadata display) {
|
||||||
|
return display.resolved()
|
||||||
|
? forSymbol(display.id(), display.poem(), false)
|
||||||
|
: texture("item/page_unresolved");
|
||||||
|
}
|
||||||
|
|
||||||
private static ResourceLocation forPage(ItemStack stack, boolean item) {
|
private static ResourceLocation forPage(ItemStack stack, boolean item) {
|
||||||
PageContent content = PageItem.content(stack);
|
PageContent content = PageItem.content(stack);
|
||||||
if (content.kind() == PageContent.Kind.UNRESOLVED_SYMBOL) return texture("item/page_unresolved");
|
if (content.kind() == PageContent.Kind.UNRESOLVED_SYMBOL) return texture("item/page_unresolved");
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
|||||||
private final OrderedWriting writing;
|
private final OrderedWriting writing;
|
||||||
private final List<SymbolDisplayMetadata> writingSymbols;
|
private final List<SymbolDisplayMetadata> writingSymbols;
|
||||||
private final boolean pageFree;
|
private final boolean pageFree;
|
||||||
|
private final String author;
|
||||||
private final InteractionHand hand;
|
private final InteractionHand hand;
|
||||||
private final BlockPos bookStandPos;
|
private final BlockPos bookStandPos;
|
||||||
private DestinationPreviewRenderer preview;
|
private DestinationPreviewRenderer preview;
|
||||||
@@ -71,6 +72,7 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
|||||||
writing = book.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY);
|
writing = book.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY);
|
||||||
this.writingSymbols = List.copyOf(writingSymbols);
|
this.writingSymbols = List.copyOf(writingSymbols);
|
||||||
pageFree = writing.entries().stream().noneMatch(entry -> entry.kind() == WritingEntry.Kind.SYMBOL);
|
pageFree = writing.entries().stream().noneMatch(entry -> entry.kind() == WritingEntry.Kind.SYMBOL);
|
||||||
|
author = book.get(ModDataComponents.BOOK_AUTHOR.get());
|
||||||
this.hand = hand;
|
this.hand = hand;
|
||||||
bookStandPos = null;
|
bookStandPos = null;
|
||||||
}
|
}
|
||||||
@@ -84,6 +86,7 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
|||||||
writing = book.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY);
|
writing = book.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY);
|
||||||
this.writingSymbols = List.copyOf(writingSymbols);
|
this.writingSymbols = List.copyOf(writingSymbols);
|
||||||
pageFree = writing.entries().stream().noneMatch(entry -> entry.kind() == WritingEntry.Kind.SYMBOL);
|
pageFree = writing.entries().stream().noneMatch(entry -> entry.kind() == WritingEntry.Kind.SYMBOL);
|
||||||
|
author = book.get(ModDataComponents.BOOK_AUTHOR.get());
|
||||||
hand = InteractionHand.MAIN_HAND;
|
hand = InteractionHand.MAIN_HAND;
|
||||||
this.bookStandPos = bookStandPos.immutable();
|
this.bookStandPos = bookStandPos.immutable();
|
||||||
}
|
}
|
||||||
@@ -163,6 +166,26 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
|||||||
else if (pageIndex < pageCount() && mouseX >= left + 293 && mouseX < left + 320)
|
else if (pageIndex < pageCount() && mouseX >= left + 293 && mouseX < left + 320)
|
||||||
graphics.renderTooltip(font, Component.translatable("screen.rivencraft.book.next_page"), mouseX, mouseY);
|
graphics.renderTooltip(font, Component.translatable("screen.rivencraft.book.next_page"), mouseX, mouseY);
|
||||||
}
|
}
|
||||||
|
if (pageIndex == 0 && age != null && !pageFree && traits != null
|
||||||
|
&& mouseX >= left + 38 && mouseX < left + 154
|
||||||
|
&& mouseY >= top + 38 && mouseY < top + 67) {
|
||||||
|
graphics.renderComponentTooltip(font, List.of(
|
||||||
|
Component.translatable("screen.rivencraft.age.trait.biomes",
|
||||||
|
traitName("biome_distribution", traits.biomeDistribution())),
|
||||||
|
Component.translatable("screen.rivencraft.age.trait.lighting",
|
||||||
|
traitName("lighting", traits.lighting())),
|
||||||
|
Component.translatable("screen.rivencraft.age.trait.weather",
|
||||||
|
traitName("weather", traits.weather())),
|
||||||
|
Component.translatable("screen.rivencraft.age.trait.day_length",
|
||||||
|
traits.hasStoppedCelestialCycle()
|
||||||
|
? Component.translatable("trait.rivencraft.day_length.stopped")
|
||||||
|
: Component.literal(String.format(Locale.ROOT, "%.2fx", traits.celestialPeriod()))),
|
||||||
|
Component.translatable("screen.rivencraft.age.trait.celestial_angle",
|
||||||
|
Component.literal(String.format(Locale.ROOT, "%.0f°", traits.celestialAngle()))),
|
||||||
|
Component.translatable("screen.rivencraft.age.trait.celestial_phase",
|
||||||
|
Component.literal(String.format(Locale.ROOT, "%.0f%%", traits.celestialPhase() * 100.0F)))
|
||||||
|
), mouseX, mouseY);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void renderBook(GuiGraphics graphics, float partialTick) {
|
private void renderBook(GuiGraphics graphics, float partialTick) {
|
||||||
@@ -182,7 +205,7 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
|||||||
graphics.enableScissor(left + 38, top + 38, left + 154, top + 174);
|
graphics.enableScissor(left + 38, top + 38, left + 154, top + 174);
|
||||||
renderFirstPageText(graphics, left, top);
|
renderFirstPageText(graphics, left, top);
|
||||||
graphics.disableScissor();
|
graphics.disableScissor();
|
||||||
} else if (pageIndex < pageCount()) {
|
} else if (pageIndex < writing.entries().size()) {
|
||||||
LegacyBookArtwork.drawFullPage(graphics, left, top);
|
LegacyBookArtwork.drawFullPage(graphics, left, top);
|
||||||
renderWrittenPage(graphics, left, top);
|
renderWrittenPage(graphics, left, top);
|
||||||
}
|
}
|
||||||
@@ -193,20 +216,25 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
|||||||
|
|
||||||
private int pageCount() {
|
private int pageCount() {
|
||||||
// Older page-free Descriptive Books do not have a BOOK_WRITING component.
|
// Older page-free Descriptive Books do not have a BOOK_WRITING component.
|
||||||
return Math.max(1, writing.entries().size());
|
return Math.max(1, writing.entries().size() - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void renderFirstPageText(GuiGraphics graphics, int left, int top) {
|
private void renderFirstPageText(GuiGraphics graphics, int left, int top) {
|
||||||
int x = left + 40;
|
int x = left + 40;
|
||||||
drawWrappedWithoutShadow(graphics, Component.translatable("screen.rivencraft.age.title"),
|
|
||||||
x, top + 40, 110);
|
|
||||||
if (age == null) {
|
if (age == null) {
|
||||||
|
drawWrappedWithoutShadow(graphics, Component.translatable("screen.rivencraft.age.title"),
|
||||||
|
x, top + 40, 110);
|
||||||
drawWrappedWithoutShadow(graphics, Component.translatable("screen.rivencraft.age.name_prompt"),
|
drawWrappedWithoutShadow(graphics, Component.translatable("screen.rivencraft.age.name_prompt"),
|
||||||
x, top + 52, 110);
|
x, top + 52, 110);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int detailsY = drawWrappedWithoutShadow(graphics, Component.literal(age.name()),
|
int nameEnd = drawWrappedWithoutShadow(graphics, Component.literal(age.name()),
|
||||||
x + 10, top + 52, 100) + 10;
|
x, top + 40, 110);
|
||||||
|
int detailsY = drawWrappedWithoutShadow(graphics,
|
||||||
|
author == null || author.isBlank()
|
||||||
|
? Component.translatable("screen.rivencraft.age.unknown_author")
|
||||||
|
: Component.literal(author), x + 10, nameEnd + 2, 100) + 10;
|
||||||
|
if (!pageFree) return;
|
||||||
if (generationProfile != null) {
|
if (generationProfile != null) {
|
||||||
Component profileName = generationProfile.getNamespace().equals("rivencraft")
|
Component profileName = generationProfile.getNamespace().equals("rivencraft")
|
||||||
? Component.translatable("generator.rivencraft." + generationProfile.getPath())
|
? Component.translatable("generator.rivencraft." + generationProfile.getPath())
|
||||||
@@ -242,11 +270,15 @@ public final class DescriptiveBookScreen extends Screen implements ExplorableBoo
|
|||||||
.filter(candidate -> candidate.kind() == WritingEntry.Kind.SYMBOL).count() - 1;
|
.filter(candidate -> candidate.kind() == WritingEntry.Kind.SYMBOL).count() - 1;
|
||||||
SymbolDisplayMetadata display = symbolIndex < writingSymbols.size()
|
SymbolDisplayMetadata display = symbolIndex < writingSymbols.size()
|
||||||
? writingSymbols.get(symbolIndex) : SymbolDisplayMetadata.unresolved(entry.symbol().orElseThrow());
|
? writingSymbols.get(symbolIndex) : SymbolDisplayMetadata.unresolved(entry.symbol().orElseThrow());
|
||||||
int color = display.resolved() ? BOOK_TEXT_COLOR : UNRESOLVED_TEXT_COLOR;
|
graphics.enableScissor(left + 174, top + 26, left + 306, top + 172);
|
||||||
drawWrappedWithoutShadow(graphics, Component.translatable(display.nameTranslationKey()),
|
int textureSize = display.resolved() ? 128 : 16;
|
||||||
x, top + 39, 126, color);
|
graphics.blit(SymbolPageTextures.forDisplay(display), left + 177, top + 29,
|
||||||
drawWrappedWithoutShadow(graphics, Component.literal(display.id().toString()),
|
128, 128, 0, 0, textureSize, textureSize, textureSize, textureSize);
|
||||||
x, top + 64, 126, color);
|
if (!display.resolved()) {
|
||||||
|
drawWrappedWithoutShadow(graphics, Component.literal(display.id().toString()),
|
||||||
|
x, top + 151, 126, UNRESOLVED_TEXT_COLOR);
|
||||||
|
}
|
||||||
|
graphics.disableScissor();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void turnPage(int direction) {
|
private void turnPage(int direction) {
|
||||||
|
|||||||
@@ -43,6 +43,8 @@ public final class RivencraftCommands {
|
|||||||
source.sendSuccess(() -> Component.literal(
|
source.sendSuccess(() -> Component.literal(
|
||||||
(loaded ? "[loaded] " : "[unloaded] ")
|
(loaded ? "[loaded] " : "[unloaded] ")
|
||||||
+ age.name() + " — " + age.dimensionId()
|
+ age.name() + " — " + age.dimensionId()
|
||||||
|
+ (age.seasonMode() == null ? "" : " (season: "
|
||||||
|
+ age.seasonMode().name().toLowerCase(java.util.Locale.ROOT) + ")")
|
||||||
), false);
|
), false);
|
||||||
}
|
}
|
||||||
return ages.size();
|
return ages.size();
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import net.dnorberg.rivencraft.book.AgeRegistrySavedData;
|
|||||||
import net.dnorberg.rivencraft.book.AgeSeasonMode;
|
import net.dnorberg.rivencraft.book.AgeSeasonMode;
|
||||||
import net.dnorberg.rivencraft.config.RivencraftConfig;
|
import net.dnorberg.rivencraft.config.RivencraftConfig;
|
||||||
import net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload;
|
import net.dnorberg.rivencraft.network.SereneAgeWhitelistPayload;
|
||||||
import net.dnorberg.rivencraft.writing.SymbolSemantics;
|
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import net.minecraft.server.level.ServerPlayer;
|
import net.minecraft.server.level.ServerPlayer;
|
||||||
@@ -24,9 +23,8 @@ public final class SereneSeasonsCompatibility {
|
|||||||
|
|
||||||
public static void registerAge(MinecraftServer server, AgeDefinition age) {
|
public static void registerAge(MinecraftServer server, AgeDefinition age) {
|
||||||
if (!available() || !isAge(age.dimensionId())) return;
|
if (!available() || !isAge(age.dimensionId())) return;
|
||||||
AgeSeasonMode mode = AgeSeasonMode.from(age.plan());
|
AgeSeasonMode mode = AgeSeasonMode.from(age);
|
||||||
boolean explicit = age.plan() != null && age.plan().symbols().stream()
|
boolean explicit = AgeSeasonMode.hasAuthoredPage(age.plan());
|
||||||
.anyMatch(symbol -> symbol.semantics().role() == SymbolSemantics.Role.SEASON);
|
|
||||||
if (mode != AgeSeasonMode.NO_SEASONS && !explicit && !RivencraftConfig.autoWhitelistSereneAges()) {
|
if (mode != AgeSeasonMode.NO_SEASONS && !explicit && !RivencraftConfig.autoWhitelistSereneAges()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -52,8 +50,9 @@ public final class SereneSeasonsCompatibility {
|
|||||||
AgeDefinition age = AgeRegistrySavedData.get(level)
|
AgeDefinition age = AgeRegistrySavedData.get(level)
|
||||||
.findByDimension(level.dimension().location()).orElse(null);
|
.findByDimension(level.dimension().location()).orElse(null);
|
||||||
if (age == null) return;
|
if (age == null) return;
|
||||||
AgeSeasonMode mode = AgeSeasonMode.from(age.plan());
|
AgeSeasonMode mode = AgeSeasonMode.from(age);
|
||||||
if (!mode.eternal()) return;
|
if (!mode.eternal() || !AgeSeasonMode.hasAuthoredPage(age.plan())
|
||||||
|
&& !RivencraftConfig.autoWhitelistSereneAges()) return;
|
||||||
try {
|
try {
|
||||||
SereneSeasonsAdapter.holdSeason(level, mode);
|
SereneSeasonsAdapter.holdSeason(level, mode);
|
||||||
} catch (RuntimeException exception) {
|
} catch (RuntimeException exception) {
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ public final class RivencraftJeiPlugin implements IModPlugin {
|
|||||||
@Override
|
@Override
|
||||||
public void registerExtraIngredients(IExtraIngredientRegistration registration) {
|
public void registerExtraIngredients(IExtraIngredientRegistration registration) {
|
||||||
List<ItemStack> pages = new ArrayList<>();
|
List<ItemStack> pages = new ArrayList<>();
|
||||||
pages.add(PageItem.createLinkPanelPage());
|
pages.addAll(PageItem.creativeLinkPanelPages());
|
||||||
var connection = Minecraft.getInstance().getConnection();
|
var connection = Minecraft.getInstance().getConnection();
|
||||||
if (connection != null) {
|
if (connection != null) {
|
||||||
pages.addAll(PageItem.creativeSymbolPages(connection.registryAccess()));
|
pages.addAll(PageItem.creativeSymbolPages(connection.registryAccess()));
|
||||||
|
|||||||
@@ -5,8 +5,10 @@ import com.mojang.serialization.JsonOps;
|
|||||||
import io.netty.buffer.Unpooled;
|
import io.netty.buffer.Unpooled;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import net.dnorberg.rivencraft.book.AgeReference;
|
import net.dnorberg.rivencraft.book.AgeReference;
|
||||||
|
import net.dnorberg.rivencraft.book.LinkProperties;
|
||||||
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||||
import net.dnorberg.rivencraft.writing.PageContent;
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
||||||
@@ -42,6 +44,20 @@ public final class WritingDataGameTests {
|
|||||||
private WritingDataGameTests() {
|
private WritingDataGameTests() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void creativeLinkPanelsIncludeEveryActiveModifierCombination(GameTestHelper helper) {
|
||||||
|
List<ItemStack> pages = PageItem.creativeLinkPanelPages();
|
||||||
|
helper.assertValueEqual(pages.size(), 8, "The base panel and seven modifier combinations must be listed");
|
||||||
|
helper.assertTrue(pages.stream().allMatch(page -> PageItem.content(page).kind()
|
||||||
|
== PageContent.Kind.LINK_PANEL), "All variants must be usable Link Panels");
|
||||||
|
Set<Integer> flags = pages.stream().map(page -> page.getOrDefault(
|
||||||
|
ModDataComponents.LINK_PROPERTIES.get(), LinkProperties.NONE).flags())
|
||||||
|
.collect(java.util.stream.Collectors.toSet());
|
||||||
|
helper.assertValueEqual(flags, Set.of(0, 1, 4, 8, 5, 9, 12, 13),
|
||||||
|
"Every active modifier combination must be represented exactly once");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
@GameTest(template = "empty")
|
@GameTest(template = "empty")
|
||||||
public static void orderedWritingPreservesKnownUnknownAndLinkPanelEntries(GameTestHelper helper) {
|
public static void orderedWritingPreservesKnownUnknownAndLinkPanelEntries(GameTestHelper helper) {
|
||||||
SymbolReference known = reference("rivencraft:terrain/standard");
|
SymbolReference known = reference("rivencraft:terrain/standard");
|
||||||
|
|||||||
@@ -99,8 +99,11 @@ public final class WritingGrammarGameTests {
|
|||||||
WritingEntry.symbol(nativeBiomes)), WritingGrammar.Code.CONFLICT);
|
WritingEntry.symbol(nativeBiomes)), WritingGrammar.Code.CONFLICT);
|
||||||
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(plains),
|
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(plains),
|
||||||
WritingEntry.symbol(forest), WritingEntry.symbol(single)), WritingGrammar.Code.CONFLICT);
|
WritingEntry.symbol(forest), WritingEntry.symbol(single)), WritingGrammar.Code.CONFLICT);
|
||||||
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(caves),
|
WritingGrammar.Result repeatedFeatures = parse(resolver, WritingEntry.linkPanel(),
|
||||||
WritingEntry.symbol(caves)), WritingGrammar.Code.DUPLICATE);
|
WritingEntry.symbol(caves), WritingEntry.symbol(caves));
|
||||||
|
helper.assertTrue(repeatedFeatures.canCreate(), "Repeated feature pages must remain authorable");
|
||||||
|
helper.assertValueEqual(repeatedFeatures.symbols().size(), 2,
|
||||||
|
"Repeated feature pages must remain separate ordered symbols");
|
||||||
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(ref("test:missing"))),
|
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(ref("test:missing"))),
|
||||||
WritingGrammar.Code.UNRESOLVED);
|
WritingGrammar.Code.UNRESOLVED);
|
||||||
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(displayOnly)),
|
assertCode(helper, parse(resolver, WritingEntry.linkPanel(), WritingEntry.symbol(displayOnly)),
|
||||||
|
|||||||
@@ -210,6 +210,27 @@ public final class PageItem extends Item {
|
|||||||
return create(PageContent.LINK_PANEL);
|
return create(PageContent.LINK_PANEL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Every Link Panel modifier combination the Ink Mixer can produce. */
|
||||||
|
public static List<ItemStack> creativeLinkPanelPages() {
|
||||||
|
int[] flags = {
|
||||||
|
0,
|
||||||
|
LinkProperties.DISARM,
|
||||||
|
LinkProperties.MAINTAIN_MOMENTUM,
|
||||||
|
LinkProperties.INTRA_LINKING,
|
||||||
|
LinkProperties.DISARM | LinkProperties.MAINTAIN_MOMENTUM,
|
||||||
|
LinkProperties.DISARM | LinkProperties.INTRA_LINKING,
|
||||||
|
LinkProperties.MAINTAIN_MOMENTUM | LinkProperties.INTRA_LINKING,
|
||||||
|
LinkProperties.DISARM | LinkProperties.MAINTAIN_MOMENTUM | LinkProperties.INTRA_LINKING
|
||||||
|
};
|
||||||
|
List<ItemStack> pages = new ArrayList<>(flags.length);
|
||||||
|
for (int flag : flags) {
|
||||||
|
ItemStack page = createLinkPanelPage();
|
||||||
|
if (flag != 0) page.set(ModDataComponents.LINK_PROPERTIES.get(), new LinkProperties(flag));
|
||||||
|
pages.add(page);
|
||||||
|
}
|
||||||
|
return pages;
|
||||||
|
}
|
||||||
|
|
||||||
/** Restores saved unknown references without granting them validity for new writing operations. */
|
/** Restores saved unknown references without granting them validity for new writing operations. */
|
||||||
public static ItemStack createRecoveredPage(SymbolReference reference) {
|
public static ItemStack createRecoveredPage(SymbolReference reference) {
|
||||||
return create(PageContent.unresolved(reference));
|
return create(PageContent.unresolved(reference));
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package net.dnorberg.rivencraft.menu;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import net.dnorberg.rivencraft.block.entity.BookBinderBlockEntity;
|
import net.dnorberg.rivencraft.block.entity.BookBinderBlockEntity;
|
||||||
import net.dnorberg.rivencraft.item.PageItem;
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||||
import net.dnorberg.rivencraft.registry.ModItems;
|
import net.dnorberg.rivencraft.registry.ModItems;
|
||||||
import net.dnorberg.rivencraft.registry.ModMenus;
|
import net.dnorberg.rivencraft.registry.ModMenus;
|
||||||
import net.dnorberg.rivencraft.writing.PageContent;
|
import net.dnorberg.rivencraft.writing.PageContent;
|
||||||
@@ -33,6 +34,7 @@ public final class BookBinderMenu extends AbstractContainerMenu {
|
|||||||
private final Container inputs;
|
private final Container inputs;
|
||||||
private final SimpleContainer result = new SimpleContainer(1);
|
private final SimpleContainer result = new SimpleContainer(1);
|
||||||
private final boolean clientSide;
|
private final boolean clientSide;
|
||||||
|
private final Player bookAuthor;
|
||||||
private int selectedPage = -1;
|
private int selectedPage = -1;
|
||||||
private int grammarErrorCode = -1;
|
private int grammarErrorCode = -1;
|
||||||
private int grammarErrorStripIndex = -1;
|
private int grammarErrorStripIndex = -1;
|
||||||
@@ -47,6 +49,7 @@ public final class BookBinderMenu extends AbstractContainerMenu {
|
|||||||
this.binder = binder;
|
this.binder = binder;
|
||||||
inputs = binder == null ? new SimpleContainer(BookBinderBlockEntity.SIZE) : binder;
|
inputs = binder == null ? new SimpleContainer(BookBinderBlockEntity.SIZE) : binder;
|
||||||
clientSide = inventory.player.level().isClientSide;
|
clientSide = inventory.player.level().isClientSide;
|
||||||
|
bookAuthor = inventory.player;
|
||||||
addDataSlot(new DataSlot() {
|
addDataSlot(new DataSlot() {
|
||||||
@Override public int get() { return selectedPage; }
|
@Override public int get() { return selectedPage; }
|
||||||
@Override public void set(int value) { selectedPage = value; }
|
@Override public void set(int value) { selectedPage = value; }
|
||||||
@@ -167,6 +170,7 @@ public final class BookBinderMenu extends AbstractContainerMenu {
|
|||||||
refreshResult();
|
refreshResult();
|
||||||
if (!binder.canAssemble()) return ItemStack.EMPTY;
|
if (!binder.canAssemble()) return ItemStack.EMPTY;
|
||||||
ItemStack book = binder.previewBook();
|
ItemStack book = binder.previewBook();
|
||||||
|
book.set(ModDataComponents.BOOK_AUTHOR.get(), player.getGameProfile().getName());
|
||||||
ItemStack remainder = book.copy();
|
ItemStack remainder = book.copy();
|
||||||
if (!moveItemStackTo(remainder, PLAYER_START, slots.size(), true) || !remainder.isEmpty()) {
|
if (!moveItemStackTo(remainder, PLAYER_START, slots.size(), true) || !remainder.isEmpty()) {
|
||||||
return ItemStack.EMPTY;
|
return ItemStack.EMPTY;
|
||||||
@@ -221,6 +225,9 @@ public final class BookBinderMenu extends AbstractContainerMenu {
|
|||||||
private void refreshResult() {
|
private void refreshResult() {
|
||||||
if (clientSide) return;
|
if (clientSide) return;
|
||||||
ItemStack preview = binder == null ? ItemStack.EMPTY : binder.previewBook();
|
ItemStack preview = binder == null ? ItemStack.EMPTY : binder.previewBook();
|
||||||
|
if (!preview.isEmpty()) {
|
||||||
|
preview.set(ModDataComponents.BOOK_AUTHOR.get(), bookAuthor.getGameProfile().getName());
|
||||||
|
}
|
||||||
if (!ItemStack.matches(result.getItem(0), preview)) result.setItem(0, preview);
|
if (!ItemStack.matches(result.getItem(0), preview)) result.setItem(0, preview);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package net.dnorberg.rivencraft.mixin;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.world.AgeFeatureChunkGenerator;
|
||||||
|
import net.dnorberg.rivencraft.world.AgeFlatChunkGenerator;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.level.WorldGenLevel;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||||
|
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
|
|
||||||
|
/** Suppresses biome-default monster rooms only in new Rivencraft Ages. */
|
||||||
|
@Mixin(ChunkGenerator.class)
|
||||||
|
public abstract class AgeDungeonPlacementMixin {
|
||||||
|
@Redirect(method = "applyBiomeDecoration", at = @At(value = "INVOKE",
|
||||||
|
target = "Lnet/minecraft/world/level/levelgen/placement/PlacedFeature;placeWithBiomeCheck(Lnet/minecraft/world/level/WorldGenLevel;Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;)Z"))
|
||||||
|
private boolean rivencraft$gateAmbientDungeons(PlacedFeature feature, WorldGenLevel level,
|
||||||
|
ChunkGenerator generator, RandomSource random, BlockPos pos) {
|
||||||
|
if ((Object) this instanceof AgeFeatureChunkGenerator || (Object) this instanceof AgeFlatChunkGenerator) {
|
||||||
|
ResourceLocation id = level.registryAccess().registryOrThrow(Registries.PLACED_FEATURE).getKey(feature);
|
||||||
|
if (ResourceLocation.withDefaultNamespace("monster_room").equals(id)
|
||||||
|
|| ResourceLocation.withDefaultNamespace("monster_room_deep").equals(id)) return false;
|
||||||
|
}
|
||||||
|
return feature.placeWithBiomeCheck(level, generator, random, pos);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -59,7 +59,7 @@ public final class ModNetworking {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void register(RegisterPayloadHandlersEvent event) {
|
public static void register(RegisterPayloadHandlersEvent event) {
|
||||||
PayloadRegistrar registrar = event.registrar("13");
|
PayloadRegistrar registrar = event.registrar("15");
|
||||||
registrar.playToServer(RequestDescriptiveBookScreenPayload.TYPE, RequestDescriptiveBookScreenPayload.STREAM_CODEC,
|
registrar.playToServer(RequestDescriptiveBookScreenPayload.TYPE, RequestDescriptiveBookScreenPayload.STREAM_CODEC,
|
||||||
ModNetworking::requestDescriptiveBookScreen);
|
ModNetworking::requestDescriptiveBookScreen);
|
||||||
registrar.playToClient(OpenDescriptiveBookScreenPayload.TYPE, OpenDescriptiveBookScreenPayload.STREAM_CODEC,
|
registrar.playToClient(OpenDescriptiveBookScreenPayload.TYPE, OpenDescriptiveBookScreenPayload.STREAM_CODEC,
|
||||||
@@ -114,8 +114,9 @@ public final class ModNetworking {
|
|||||||
// Requests run on the same server thread as Age creation. A request queued
|
// Requests run on the same server thread as Age creation. A request queued
|
||||||
// during generation can only open the finished book, never a stale client copy.
|
// during generation can only open the finished book, never a stale client copy.
|
||||||
player.inventoryMenu.broadcastChanges();
|
player.inventoryMenu.broadcastChanges();
|
||||||
List<SymbolDisplayMetadata> writingSymbols = access.stack()
|
OrderedWriting writing = access.stack()
|
||||||
.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY).entries().stream()
|
.getOrDefault(ModDataComponents.BOOK_WRITING.get(), OrderedWriting.EMPTY);
|
||||||
|
List<SymbolDisplayMetadata> writingSymbols = writing.entries().stream()
|
||||||
.filter(entry -> entry.kind() == WritingEntry.Kind.SYMBOL)
|
.filter(entry -> entry.kind() == WritingEntry.Kind.SYMBOL)
|
||||||
.map(entry -> SymbolCatalog.display(entry.symbol().orElseThrow()))
|
.map(entry -> SymbolCatalog.display(entry.symbol().orElseThrow()))
|
||||||
.toList();
|
.toList();
|
||||||
@@ -168,6 +169,7 @@ public final class ModNetworking {
|
|||||||
}
|
}
|
||||||
|
|
||||||
access.stack().set(ModDataComponents.AGE_REFERENCE.get(), reference);
|
access.stack().set(ModDataComponents.AGE_REFERENCE.get(), reference);
|
||||||
|
access.stack().set(ModDataComponents.BOOK_AUTHOR.get(), player.getGameProfile().getName());
|
||||||
AgeRegistrySavedData.get(player.serverLevel()).find(reference.id()).ifPresent(definition ->
|
AgeRegistrySavedData.get(player.serverLevel()).find(reference.id()).ifPresent(definition ->
|
||||||
access.stack().set(ModDataComponents.AGE_GENERATION_PROFILE.get(), definition.generationProfile()));
|
access.stack().set(ModDataComponents.AGE_GENERATION_PROFILE.get(), definition.generationProfile()));
|
||||||
access.stack().set(DataComponents.CUSTOM_NAME, Component.literal(title));
|
access.stack().set(DataComponents.CUSTOM_NAME, Component.literal(title));
|
||||||
|
|||||||
@@ -5,7 +5,11 @@ import net.dnorberg.rivencraft.block.BookStandBlock;
|
|||||||
import net.dnorberg.rivencraft.block.BookBinderBlock;
|
import net.dnorberg.rivencraft.block.BookBinderBlock;
|
||||||
import net.dnorberg.rivencraft.block.WritingDeskBlock;
|
import net.dnorberg.rivencraft.block.WritingDeskBlock;
|
||||||
import net.dnorberg.rivencraft.block.InkMixerBlock;
|
import net.dnorberg.rivencraft.block.InkMixerBlock;
|
||||||
|
import net.dnorberg.rivencraft.block.BuddingCrystalBlock;
|
||||||
|
import net.minecraft.world.level.block.AmethystClusterBlock;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
import net.minecraft.world.level.block.Blocks;
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.material.MapColor;
|
||||||
import net.minecraft.world.level.block.state.BlockBehaviour;
|
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||||
import net.neoforged.bus.api.IEventBus;
|
import net.neoforged.bus.api.IEventBus;
|
||||||
import net.neoforged.neoforge.registries.DeferredBlock;
|
import net.neoforged.neoforge.registries.DeferredBlock;
|
||||||
@@ -31,6 +35,23 @@ public final class ModBlocks {
|
|||||||
"ink_mixer", InkMixerBlock::new,
|
"ink_mixer", InkMixerBlock::new,
|
||||||
BlockBehaviour.Properties.ofFullCopy(Blocks.CRAFTING_TABLE).noOcclusion()
|
BlockBehaviour.Properties.ofFullCopy(Blocks.CRAFTING_TABLE).noOcclusion()
|
||||||
);
|
);
|
||||||
|
public static final DeferredBlock<Block> CRYSTAL_BLOCK = BLOCKS.registerBlock("crystal_block",
|
||||||
|
Block::new, BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_BLOCK).mapColor(MapColor.COLOR_BLUE));
|
||||||
|
public static final DeferredBlock<BuddingCrystalBlock> BUDDING_CRYSTAL = BLOCKS.registerBlock("budding_crystal",
|
||||||
|
BuddingCrystalBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.BUDDING_AMETHYST)
|
||||||
|
.mapColor(MapColor.COLOR_BLUE));
|
||||||
|
public static final DeferredBlock<AmethystClusterBlock> CRYSTAL_CLUSTER = BLOCKS.registerBlock("crystal_cluster",
|
||||||
|
properties -> new AmethystClusterBlock(7.0F, 3.0F, properties),
|
||||||
|
BlockBehaviour.Properties.ofFullCopy(Blocks.AMETHYST_CLUSTER));
|
||||||
|
public static final DeferredBlock<AmethystClusterBlock> LARGE_CRYSTAL_BUD = BLOCKS.registerBlock("large_crystal_bud",
|
||||||
|
properties -> new AmethystClusterBlock(5.0F, 3.0F, properties),
|
||||||
|
BlockBehaviour.Properties.ofFullCopy(Blocks.LARGE_AMETHYST_BUD));
|
||||||
|
public static final DeferredBlock<AmethystClusterBlock> MEDIUM_CRYSTAL_BUD = BLOCKS.registerBlock("medium_crystal_bud",
|
||||||
|
properties -> new AmethystClusterBlock(4.0F, 3.0F, properties),
|
||||||
|
BlockBehaviour.Properties.ofFullCopy(Blocks.MEDIUM_AMETHYST_BUD));
|
||||||
|
public static final DeferredBlock<AmethystClusterBlock> SMALL_CRYSTAL_BUD = BLOCKS.registerBlock("small_crystal_bud",
|
||||||
|
properties -> new AmethystClusterBlock(3.0F, 4.0F, properties),
|
||||||
|
BlockBehaviour.Properties.ofFullCopy(Blocks.SMALL_AMETHYST_BUD));
|
||||||
|
|
||||||
private ModBlocks() {
|
private ModBlocks() {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,13 @@ public final class ModCreativeTabs {
|
|||||||
output.accept(ModItems.WRITING_DESK.get());
|
output.accept(ModItems.WRITING_DESK.get());
|
||||||
output.accept(ModItems.INK_MIXER.get());
|
output.accept(ModItems.INK_MIXER.get());
|
||||||
output.accept(ModItems.BOOK_BINDER.get());
|
output.accept(ModItems.BOOK_BINDER.get());
|
||||||
|
output.accept(ModItems.CRYSTAL_BLOCK.get());
|
||||||
|
output.accept(ModItems.BUDDING_CRYSTAL.get());
|
||||||
|
output.accept(ModItems.CRYSTAL_CLUSTER.get());
|
||||||
|
output.accept(ModItems.LARGE_CRYSTAL_BUD.get());
|
||||||
|
output.accept(ModItems.MEDIUM_CRYSTAL_BUD.get());
|
||||||
|
output.accept(ModItems.SMALL_CRYSTAL_BUD.get());
|
||||||
|
output.accept(ModItems.CRYSTAL_SHARD.get());
|
||||||
})
|
})
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
@@ -38,7 +45,8 @@ public final class ModCreativeTabs {
|
|||||||
CREATIVE_TABS.register("rivencraft_link_pages", () -> CreativeModeTab.builder()
|
CREATIVE_TABS.register("rivencraft_link_pages", () -> CreativeModeTab.builder()
|
||||||
.title(Component.translatable("itemGroup.rivencraft.pages.link"))
|
.title(Component.translatable("itemGroup.rivencraft.pages.link"))
|
||||||
.icon(PageItem::createLinkPanelPage)
|
.icon(PageItem::createLinkPanelPage)
|
||||||
.displayItems((parameters, output) -> output.accept(PageItem.createLinkPanelPage()))
|
.displayItems((parameters, output) ->
|
||||||
|
PageItem.creativeLinkPanelPages().forEach(output::accept))
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
private static final List<String> CATEGORY_ORDER = List.of(
|
private static final List<String> CATEGORY_ORDER = List.of(
|
||||||
|
|||||||
@@ -75,6 +75,12 @@ public final class ModDataComponents {
|
|||||||
.networkSynchronized(OrderedWriting.STREAM_CODEC)
|
.networkSynchronized(OrderedWriting.STREAM_CODEC)
|
||||||
.cacheEncoding()
|
.cacheEncoding()
|
||||||
.build());
|
.build());
|
||||||
|
public static final DeferredHolder<DataComponentType<?>, DataComponentType<String>> BOOK_AUTHOR =
|
||||||
|
DATA_COMPONENTS.register("book_author", () -> DataComponentType.<String>builder()
|
||||||
|
.persistent(Codec.STRING)
|
||||||
|
.networkSynchronized(ByteBufCodecs.STRING_UTF8)
|
||||||
|
.cacheEncoding()
|
||||||
|
.build());
|
||||||
public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> INK_REMAINING =
|
public static final DeferredHolder<DataComponentType<?>, DataComponentType<Integer>> INK_REMAINING =
|
||||||
DATA_COMPONENTS.register("ink_remaining", () -> DataComponentType.<Integer>builder()
|
DATA_COMPONENTS.register("ink_remaining", () -> DataComponentType.<Integer>builder()
|
||||||
.persistent(Codec.intRange(0, 16))
|
.persistent(Codec.intRange(0, 16))
|
||||||
|
|||||||
@@ -43,6 +43,13 @@ public final class ModItems {
|
|||||||
public static final DeferredItem<BlockItem> WRITING_DESK = ITEMS.registerSimpleBlockItem(ModBlocks.WRITING_DESK);
|
public static final DeferredItem<BlockItem> WRITING_DESK = ITEMS.registerSimpleBlockItem(ModBlocks.WRITING_DESK);
|
||||||
public static final DeferredItem<BlockItem> BOOK_BINDER = ITEMS.registerSimpleBlockItem(ModBlocks.BOOK_BINDER);
|
public static final DeferredItem<BlockItem> BOOK_BINDER = ITEMS.registerSimpleBlockItem(ModBlocks.BOOK_BINDER);
|
||||||
public static final DeferredItem<BlockItem> INK_MIXER = ITEMS.registerSimpleBlockItem(ModBlocks.INK_MIXER);
|
public static final DeferredItem<BlockItem> INK_MIXER = ITEMS.registerSimpleBlockItem(ModBlocks.INK_MIXER);
|
||||||
|
public static final DeferredItem<BlockItem> CRYSTAL_BLOCK = ITEMS.registerSimpleBlockItem(ModBlocks.CRYSTAL_BLOCK);
|
||||||
|
public static final DeferredItem<BlockItem> BUDDING_CRYSTAL = ITEMS.registerSimpleBlockItem(ModBlocks.BUDDING_CRYSTAL);
|
||||||
|
public static final DeferredItem<BlockItem> CRYSTAL_CLUSTER = ITEMS.registerSimpleBlockItem(ModBlocks.CRYSTAL_CLUSTER);
|
||||||
|
public static final DeferredItem<BlockItem> LARGE_CRYSTAL_BUD = ITEMS.registerSimpleBlockItem(ModBlocks.LARGE_CRYSTAL_BUD);
|
||||||
|
public static final DeferredItem<BlockItem> MEDIUM_CRYSTAL_BUD = ITEMS.registerSimpleBlockItem(ModBlocks.MEDIUM_CRYSTAL_BUD);
|
||||||
|
public static final DeferredItem<BlockItem> SMALL_CRYSTAL_BUD = ITEMS.registerSimpleBlockItem(ModBlocks.SMALL_CRYSTAL_BUD);
|
||||||
|
public static final DeferredItem<Item> CRYSTAL_SHARD = ITEMS.registerSimpleItem("crystal_shard");
|
||||||
|
|
||||||
private ModItems() {
|
private ModItems() {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,99 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeBiomeSelection;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeGenerationPlan;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeGenerationProfiles;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeRuntimeProfiles;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeTraits;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||||
|
import net.dnorberg.rivencraft.writing.WritingEntry;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
|
import net.minecraft.gametest.framework.GameTestHelper;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
|
||||||
|
import net.minecraft.world.level.levelgen.feature.Feature;
|
||||||
|
import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
|
||||||
|
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
|
||||||
|
import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest;
|
||||||
|
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||||
|
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||||
|
|
||||||
|
/** Dense Ores remains authored-only and discovers ore configurations without a namespace allow-list. */
|
||||||
|
@GameTestHolder(Rivencraft.MOD_ID)
|
||||||
|
@PrefixGameTestTemplate(false)
|
||||||
|
public final class AgeDenseOreGameTests {
|
||||||
|
private AgeDenseOreGameTests() {}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void denseOresPageCompilesAndPersists(GameTestHelper helper) {
|
||||||
|
var registries = helper.getLevel().registryAccess();
|
||||||
|
helper.assertTrue(PageItem.bundledCreativeSymbols().contains("feature/dense_ores"),
|
||||||
|
"Dense Ores must appear in the Creative and JEI page feed");
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(WritingEntry.linkPanel(),
|
||||||
|
page("terrain/standard"), page("biome/plains"), page("biome/single"),
|
||||||
|
page("feature/dense_ores")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 55L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(55L), registries);
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(plan).stream()
|
||||||
|
.map(AgeFeatureSelection.Choice::id).toList(), List.of(AgeDenseOres.ID),
|
||||||
|
"Dense Ores must be saved as an authored feature");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())),
|
||||||
|
AgeFeatureSelection.resolved(plan), "Dense Ores must survive Age-plan reload");
|
||||||
|
for (long seed = 0; seed < 32; seed++) {
|
||||||
|
helper.assertTrue(AgeFeatureSelection.randomChoices(seed,
|
||||||
|
AgeRuntimeProfiles.resolve(id("standard")), registries).stream()
|
||||||
|
.noneMatch(choice -> choice.id().equals(AgeDenseOres.ID)),
|
||||||
|
"Random Ages must not roll an authored-only Dense Ores page");
|
||||||
|
}
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void denseOresRejectsUnsuitableTerrainAndBiome(GameTestHelper helper) {
|
||||||
|
var registries = helper.getLevel().registryAccess();
|
||||||
|
helper.assertTrue(AgeDenseOres.error(AgeRuntimeProfiles.resolve(id("flat")), null, registries)
|
||||||
|
.contains("noise terrain"), "Flat terrain must reject Dense Ores");
|
||||||
|
helper.assertTrue(AgeDenseOres.error(AgeRuntimeProfiles.resolve(id("void")), null, registries)
|
||||||
|
.contains("noise terrain"), "Void terrain must reject Dense Ores");
|
||||||
|
helper.assertTrue(AgeDenseOres.error(AgeRuntimeProfiles.resolve(id("standard")),
|
||||||
|
new AgeBiomeSelection(AgeTraits.BiomeDistribution.SINGLE,
|
||||||
|
List.of(ResourceLocation.withDefaultNamespace("the_end"))), registries)
|
||||||
|
.contains("biome with registered ore"),
|
||||||
|
"A biome without ore placements must not accept a no-op Dense Ores page");
|
||||||
|
helper.assertTrue(AgeDenseOres.error(AgeRuntimeProfiles.resolve(id("cave")),
|
||||||
|
new AgeBiomeSelection(AgeTraits.BiomeDistribution.SINGLE,
|
||||||
|
List.of(ResourceLocation.withDefaultNamespace("nether_wastes"))), registries) == null,
|
||||||
|
"Nether ore placements must qualify for a Cave Age");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void recognizesOreTargetsButNotStoneBlobs(GameTestHelper helper) {
|
||||||
|
helper.assertTrue(AgeDenseOres.isOre(ore(Blocks.IRON_ORE.defaultBlockState())),
|
||||||
|
"Any namespace's OreConfiguration yielding an ore block must qualify");
|
||||||
|
helper.assertTrue(!AgeDenseOres.isOre(ore(Blocks.STONE.defaultBlockState())),
|
||||||
|
"Ordinary stone replacement must not be doubled as an ore");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Holder<PlacedFeature> ore(net.minecraft.world.level.block.state.BlockState output) {
|
||||||
|
var config = new OreConfiguration(new BlockMatchTest(Blocks.STONE), output, 8);
|
||||||
|
var feature = new ConfiguredFeature<>(Feature.ORE, config);
|
||||||
|
return Holder.direct(new PlacedFeature(Holder.direct(feature), List.of()));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ResourceLocation id(String path) {
|
||||||
|
return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static WritingEntry page(String path) {
|
||||||
|
return WritingEntry.symbol(new SymbolReference(id(path)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,101 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.TreeMap;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeBiomeSelection;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeRuntimeProfile;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Holder;
|
||||||
|
import net.minecraft.core.RegistryAccess;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.core.registries.Registries;
|
||||||
|
import net.minecraft.resources.ResourceKey;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
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.state.BlockState;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||||
|
import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration;
|
||||||
|
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.neoforged.neoforge.common.Tags;
|
||||||
|
|
||||||
|
/** Replays eligible biome ore placements once per authored Dense Ores page. */
|
||||||
|
public final class AgeDenseOres {
|
||||||
|
public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "dense_ores");
|
||||||
|
public static final TagKey<PlacedFeature> EXTRA_ORES = TagKey.create(Registries.PLACED_FEATURE, ID);
|
||||||
|
|
||||||
|
private AgeDenseOres() {}
|
||||||
|
|
||||||
|
public static String error(AgeRuntimeProfile profile, AgeBiomeSelection biomes, RegistryAccess registries) {
|
||||||
|
if (profile.terrain() != AgeRuntimeProfile.Terrain.NOISE)
|
||||||
|
return "Dense Ores needs noise terrain with replaceable underground stone or netherrack";
|
||||||
|
if (biomes == null) return null;
|
||||||
|
var registry = registries.lookupOrThrow(Registries.BIOME);
|
||||||
|
boolean eligible = biomes.biomes().stream()
|
||||||
|
.map(id -> registry.get(ResourceKey.create(Registries.BIOME, id)))
|
||||||
|
.flatMap(java.util.Optional::stream)
|
||||||
|
.anyMatch(holder -> oreFeatures(holder).stream().anyMatch(AgeDenseOres::isOre));
|
||||||
|
return eligible ? null : "Dense Ores needs at least one biome with registered ore placements";
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Vanilla-style and modded OreConfiguration targets, or an explicit opt-in tag. */
|
||||||
|
public static boolean isOre(Holder<PlacedFeature> holder) {
|
||||||
|
if (holder.is(EXTRA_ORES)) return true;
|
||||||
|
if (!(holder.value().feature().value().config() instanceof OreConfiguration ore)) return false;
|
||||||
|
return ore.targetStates.stream().anyMatch(target -> isOreBlock(target.state));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isOreBlock(BlockState state) {
|
||||||
|
if (state.is(Tags.Blocks.ORES)) return true;
|
||||||
|
// Some third-party ores omit the common tag; require an ore configuration
|
||||||
|
// as well so similarly named decorative features cannot be selected.
|
||||||
|
String path = BuiltInRegistries.BLOCK.getKey(state.getBlock()).getPath();
|
||||||
|
return path.endsWith("_ore") || path.contains("_ore_");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static java.util.List<Holder<PlacedFeature>> oreFeatures(Holder<Biome> biome) {
|
||||||
|
// A mod may register its ore in a non-vanilla decoration step. Its
|
||||||
|
// configuration and output, not its stage or namespace, decide eligibility.
|
||||||
|
return biome.value().getGenerationSettings().features().stream()
|
||||||
|
.flatMap(net.minecraft.core.HolderSet::stream).toList();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void place(WorldGenLevel level, ChunkAccess chunk, ChunkGenerator generator,
|
||||||
|
long ageSeed, int occurrence) {
|
||||||
|
Set<Holder<Biome>> biomes = new HashSet<>();
|
||||||
|
ChunkPos.rangeClosed(chunk.getPos(), 1).forEach(pos -> {
|
||||||
|
for (var section : level.getChunk(pos.x, pos.z).getSections())
|
||||||
|
section.getBiomes().getAll(biomes::add);
|
||||||
|
});
|
||||||
|
biomes.retainAll(generator.getBiomeSource().possibleBiomes());
|
||||||
|
Map<ResourceLocation, PlacedFeature> ores = new TreeMap<>();
|
||||||
|
for (Holder<Biome> biome : biomes) {
|
||||||
|
for (Holder<PlacedFeature> feature : oreFeatures(biome)) {
|
||||||
|
if (!isOre(feature)) continue;
|
||||||
|
feature.unwrapKey().ifPresent(key -> ores.putIfAbsent(key.location(), feature.value()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
BlockPos origin = new BlockPos(chunk.getPos().getMinBlockX(), level.getMinBuildHeight(),
|
||||||
|
chunk.getPos().getMinBlockZ());
|
||||||
|
for (var entry : ores.entrySet()) {
|
||||||
|
long seed = mix(ageSeed ^ (long) origin.getX() * 341873128712L
|
||||||
|
^ (long) origin.getZ() * 132897987541L
|
||||||
|
^ (long) entry.getKey().hashCode() * 0x9E3779B97F4A7C15L
|
||||||
|
^ (long) occurrence * 0xD1B54A32D192ED03L);
|
||||||
|
entry.getValue().placeWithBiomeCheck(level, generator, RandomSource.create(seed), origin);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long mix(long value) {
|
||||||
|
value = (value ^ value >>> 30) * 0xBF58476D1CE4E5B9L;
|
||||||
|
value = (value ^ value >>> 27) * 0x94D049BB133111EBL;
|
||||||
|
return value ^ value >>> 31;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,8 +3,13 @@ package net.dnorberg.rivencraft.world;
|
|||||||
import com.mojang.serialization.Codec;
|
import com.mojang.serialization.Codec;
|
||||||
import com.mojang.serialization.MapCodec;
|
import com.mojang.serialization.MapCodec;
|
||||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeStructureSelection;
|
||||||
|
import net.minecraft.core.HolderLookup;
|
||||||
import net.minecraft.world.level.levelgen.Heightmap;
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.core.Holder;
|
import net.minecraft.core.Holder;
|
||||||
@@ -22,6 +27,7 @@ import net.minecraft.world.level.biome.BiomeManager;
|
|||||||
import net.minecraft.world.level.biome.BiomeSource;
|
import net.minecraft.world.level.biome.BiomeSource;
|
||||||
import net.minecraft.world.level.chunk.ChunkAccess;
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
import net.minecraft.world.level.chunk.ChunkGenerator;
|
import net.minecraft.world.level.chunk.ChunkGenerator;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkGeneratorStructureState;
|
||||||
import net.minecraft.world.level.chunk.ProtoChunk;
|
import net.minecraft.world.level.chunk.ProtoChunk;
|
||||||
import net.minecraft.world.level.levelgen.GenerationStep;
|
import net.minecraft.world.level.levelgen.GenerationStep;
|
||||||
import net.minecraft.world.level.levelgen.LegacyRandomSource;
|
import net.minecraft.world.level.levelgen.LegacyRandomSource;
|
||||||
@@ -29,10 +35,12 @@ import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
|
|||||||
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
|
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
|
||||||
import net.minecraft.world.level.levelgen.RandomState;
|
import net.minecraft.world.level.levelgen.RandomState;
|
||||||
import net.minecraft.world.level.levelgen.WorldgenRandom;
|
import net.minecraft.world.level.levelgen.WorldgenRandom;
|
||||||
|
import net.minecraft.world.level.levelgen.blending.Blender;
|
||||||
import net.minecraft.world.level.levelgen.carver.CarvingContext;
|
import net.minecraft.world.level.levelgen.carver.CarvingContext;
|
||||||
import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
|
import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
|
||||||
import net.minecraft.world.level.levelgen.placement.BiomeFilter;
|
import net.minecraft.world.level.levelgen.placement.BiomeFilter;
|
||||||
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
|
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
|
||||||
|
import net.minecraft.world.level.levelgen.structure.StructureSet;
|
||||||
import net.minecraft.world.level.levelgen.placement.RarityFilter;
|
import net.minecraft.world.level.levelgen.placement.RarityFilter;
|
||||||
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
|
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
|
||||||
import net.minecraft.world.level.levelgen.feature.Feature;
|
import net.minecraft.world.level.levelgen.feature.Feature;
|
||||||
@@ -67,6 +75,42 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
|
|||||||
@Override
|
@Override
|
||||||
protected MapCodec<? extends ChunkGenerator> codec() { return CODEC; }
|
protected MapCodec<? extends ChunkGenerator> codec() { return CODEC; }
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ChunkGeneratorStructureState createState(HolderLookup<StructureSet> sets, RandomState random, long seed) {
|
||||||
|
return ChunkGeneratorStructureState.createForNormal(random, seed, getBiomeSource(),
|
||||||
|
AgeStructureSelection.filteredLookup(sets, features));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public CompletableFuture<ChunkAccess> fillFromNoise(Blender blender, RandomState random,
|
||||||
|
StructureManager structures, ChunkAccess chunk) {
|
||||||
|
CompletableFuture<ChunkAccess> filled = super.fillFromNoise(blender, random, structures, chunk);
|
||||||
|
if (features.stream().noneMatch(choice -> AgeFeatureSelection.floatingIslands(choice.id())
|
||||||
|
|| AgeFeatureSelection.tendrils(choice.id())
|
||||||
|
|| AgeFeatureSelection.spheres(choice.id())
|
||||||
|
|| AgeFeatureSelection.skylands(choice.id()))) return filled;
|
||||||
|
return filled.thenApply(result -> {
|
||||||
|
// Legacy's Skylands primer filter removes base terrain before large
|
||||||
|
// features add their own blocks to the chunk.
|
||||||
|
if (features.stream().anyMatch(choice -> AgeFeatureSelection.skylands(choice.id())))
|
||||||
|
SkylandsFeature.filter(result, ageSeed);
|
||||||
|
Map<ResourceLocation, Integer> occurrences = new HashMap<>();
|
||||||
|
for (AgeFeatureSelection.Choice choice : features) {
|
||||||
|
if (!AgeFeatureSelection.floatingIslands(choice.id())
|
||||||
|
&& !AgeFeatureSelection.tendrils(choice.id())
|
||||||
|
&& !AgeFeatureSelection.spheres(choice.id())) continue;
|
||||||
|
int occurrence = occurrences.merge(choice.id(), 1, Integer::sum) - 1;
|
||||||
|
long featureSeed = ageSeed ^ (long) occurrence * 0x9E3779B97F4A7C15L;
|
||||||
|
if (AgeFeatureSelection.floatingIslands(choice.id()))
|
||||||
|
FloatingIslandFeature.generate(result, getBiomeSource(), random, featureSeed, choice);
|
||||||
|
else if (AgeFeatureSelection.tendrils(choice.id()))
|
||||||
|
TendrilFeature.generate(result, featureSeed, choice);
|
||||||
|
else SpheresFeature.generate(result, featureSeed, choice);
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void applyCarvers(WorldGenRegion level, long seed, RandomState random, BiomeManager biomes,
|
public void applyCarvers(WorldGenRegion level, long seed, RandomState random, BiomeManager biomes,
|
||||||
StructureManager structures, ChunkAccess chunk, GenerationStep.Carving step) {
|
StructureManager structures, ChunkAccess chunk, GenerationStep.Carving step) {
|
||||||
@@ -116,8 +160,30 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
|
|||||||
int x = chunk.getPos().getMinBlockX();
|
int x = chunk.getPos().getMinBlockX();
|
||||||
int z = chunk.getPos().getMinBlockZ();
|
int z = chunk.getPos().getMinBlockZ();
|
||||||
BlockPos origin = new BlockPos(x, level.getMinBuildHeight(), z);
|
BlockPos origin = new BlockPos(x, level.getMinBuildHeight(), z);
|
||||||
|
Map<AgeFeatureSelection.Choice, Integer> occurrences = new HashMap<>();
|
||||||
|
Map<ResourceLocation, Integer> spikeOccurrences = new HashMap<>();
|
||||||
|
int obeliskOccurrence = 0;
|
||||||
|
int crystalOccurrence = 0;
|
||||||
for (int index = 0; index < features.size(); index++) {
|
for (int index = 0; index < features.size(); index++) {
|
||||||
AgeFeatureSelection.Choice choice = features.get(index);
|
AgeFeatureSelection.Choice choice = features.get(index);
|
||||||
|
int occurrence = occurrences.merge(choice, 1, Integer::sum) - 1;
|
||||||
|
if (AgeFeatureSelection.spikes(choice.id())) {
|
||||||
|
SpikesFeature.generate(level, chunk, ageSeed, choice,
|
||||||
|
spikeOccurrences.merge(choice.id(), 1, Integer::sum) - 1);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (AgeFeatureSelection.obelisks(choice.id())) {
|
||||||
|
ObelisksFeature.generate(level, chunk, ageSeed, choice, obeliskOccurrence++);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (choice.id().equals(AgeFeatureSelection.CRYSTAL_FORMATIONS)) {
|
||||||
|
CrystalFormationsFeature.generate(level, chunk, ageSeed, crystalOccurrence++);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (choice.id().equals(AgeDenseOres.ID)) {
|
||||||
|
AgeDenseOres.place(level, chunk, this, ageSeed, occurrence);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (AgeFeatureSelection.surfaceVegetation(choice.id())) {
|
if (AgeFeatureSelection.surfaceVegetation(choice.id())) {
|
||||||
int surface = chunk.getHeight(Heightmap.Types.WORLD_SURFACE_WG, 8, 8);
|
int surface = chunk.getHeight(Heightmap.Types.WORLD_SURFACE_WG, 8, 8);
|
||||||
if (!AgeFeatureSelection.supportsSurfaceVegetation(
|
if (!AgeFeatureSelection.supportsSurfaceVegetation(
|
||||||
@@ -148,7 +214,8 @@ public final class AgeFeatureChunkGenerator extends NoiseBasedChunkGenerator {
|
|||||||
? RarityFilter.onAverageOnceEvery(12) : modifier)
|
? RarityFilter.onAverageOnceEvery(12) : modifier)
|
||||||
.toList());
|
.toList());
|
||||||
long seed = ageSeed ^ (long) x * 341873128712L ^ (long) z * 132897987541L
|
long seed = ageSeed ^ (long) x * 341873128712L ^ (long) z * 132897987541L
|
||||||
^ (long) choice.hashCode() * 0x9E3779B97F4A7C15L;
|
^ (long) choice.hashCode() * 0x9E3779B97F4A7C15L
|
||||||
|
^ (long) occurrence * 0xD1B54A32D192ED03L;
|
||||||
authored.place(level, this, RandomSource.create(seed), origin);
|
authored.place(level, this, RandomSource.create(seed), origin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,26 @@
|
|||||||
package net.dnorberg.rivencraft.world;
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import com.mojang.serialization.Codec;
|
||||||
import com.mojang.serialization.MapCodec;
|
import com.mojang.serialization.MapCodec;
|
||||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeStructureSelection;
|
||||||
import net.minecraft.Util;
|
import net.minecraft.Util;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.core.Holder;
|
import net.minecraft.core.Holder;
|
||||||
import net.minecraft.core.HolderLookup;
|
import net.minecraft.core.HolderLookup;
|
||||||
import net.minecraft.core.HolderSet;
|
import net.minecraft.core.HolderSet;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.server.level.WorldGenRegion;
|
import net.minecraft.server.level.WorldGenRegion;
|
||||||
import net.minecraft.world.level.LevelHeightAccessor;
|
import net.minecraft.world.level.LevelHeightAccessor;
|
||||||
import net.minecraft.world.level.NoiseColumn;
|
import net.minecraft.world.level.NoiseColumn;
|
||||||
import net.minecraft.world.level.StructureManager;
|
import net.minecraft.world.level.StructureManager;
|
||||||
|
import net.minecraft.world.level.WorldGenLevel;
|
||||||
import net.minecraft.world.level.biome.BiomeManager;
|
import net.minecraft.world.level.biome.BiomeManager;
|
||||||
import net.minecraft.world.level.biome.BiomeSource;
|
import net.minecraft.world.level.biome.BiomeSource;
|
||||||
import net.minecraft.world.level.block.Blocks;
|
import net.minecraft.world.level.block.Blocks;
|
||||||
@@ -32,17 +39,30 @@ import net.minecraft.world.level.levelgen.structure.StructureSet;
|
|||||||
public final class AgeFlatChunkGenerator extends ChunkGenerator {
|
public final class AgeFlatChunkGenerator extends ChunkGenerator {
|
||||||
public static final MapCodec<AgeFlatChunkGenerator> CODEC = RecordCodecBuilder.mapCodec(instance ->
|
public static final MapCodec<AgeFlatChunkGenerator> CODEC = RecordCodecBuilder.mapCodec(instance ->
|
||||||
instance.group(BiomeSource.CODEC.fieldOf("biome_source").forGetter(generator -> generator.biomeSource),
|
instance.group(BiomeSource.CODEC.fieldOf("biome_source").forGetter(generator -> generator.biomeSource),
|
||||||
FlatLevelGeneratorSettings.CODEC.fieldOf("settings").forGetter(AgeFlatChunkGenerator::settings))
|
FlatLevelGeneratorSettings.CODEC.fieldOf("settings").forGetter(AgeFlatChunkGenerator::settings),
|
||||||
|
AgeFeatureSelection.Choice.CODEC.listOf().optionalFieldOf("age_features", List.of())
|
||||||
|
.forGetter(generator -> generator.features),
|
||||||
|
Codec.LONG.optionalFieldOf("age_seed", 0L).forGetter(generator -> generator.ageSeed))
|
||||||
.apply(instance, AgeFlatChunkGenerator::new));
|
.apply(instance, AgeFlatChunkGenerator::new));
|
||||||
|
|
||||||
private final FlatLevelGeneratorSettings settings;
|
private final FlatLevelGeneratorSettings settings;
|
||||||
|
private final List<AgeFeatureSelection.Choice> features;
|
||||||
|
private final long ageSeed;
|
||||||
|
|
||||||
public AgeFlatChunkGenerator(BiomeSource biomeSource, FlatLevelGeneratorSettings settings) {
|
public AgeFlatChunkGenerator(BiomeSource biomeSource, FlatLevelGeneratorSettings settings) {
|
||||||
|
this(biomeSource, settings, List.of(), 0L);
|
||||||
|
}
|
||||||
|
|
||||||
|
public AgeFlatChunkGenerator(BiomeSource biomeSource, FlatLevelGeneratorSettings settings,
|
||||||
|
List<AgeFeatureSelection.Choice> features, long ageSeed) {
|
||||||
super(biomeSource, Util.memoize(settings::adjustGenerationSettings));
|
super(biomeSource, Util.memoize(settings::adjustGenerationSettings));
|
||||||
this.settings = settings;
|
this.settings = settings;
|
||||||
|
this.features = List.copyOf(features);
|
||||||
|
this.ageSeed = ageSeed;
|
||||||
}
|
}
|
||||||
|
|
||||||
public FlatLevelGeneratorSettings settings() { return settings; }
|
public FlatLevelGeneratorSettings settings() { return settings; }
|
||||||
|
public List<AgeFeatureSelection.Choice> ageFeatures() { return features; }
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected MapCodec<? extends ChunkGenerator> codec() { return CODEC; }
|
protected MapCodec<? extends ChunkGenerator> codec() { return CODEC; }
|
||||||
@@ -52,7 +72,8 @@ public final class AgeFlatChunkGenerator extends ChunkGenerator {
|
|||||||
Stream<Holder<StructureSet>> entries = settings.structureOverrides()
|
Stream<Holder<StructureSet>> entries = settings.structureOverrides()
|
||||||
.map(HolderSet::stream)
|
.map(HolderSet::stream)
|
||||||
.orElseGet(() -> structures.listElements().map(holder -> (Holder<StructureSet>) holder));
|
.orElseGet(() -> structures.listElements().map(holder -> (Holder<StructureSet>) holder));
|
||||||
return ChunkGeneratorStructureState.createForFlat(random, seed, biomeSource, entries);
|
return ChunkGeneratorStructureState.createForFlat(random, seed, biomeSource,
|
||||||
|
AgeStructureSelection.allowedSets(entries, features));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -82,9 +103,37 @@ public final class AgeFlatChunkGenerator extends ChunkGenerator {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (features.stream().anyMatch(choice -> AgeFeatureSelection.skylands(choice.id())))
|
||||||
|
SkylandsFeature.filter(chunk, ageSeed);
|
||||||
|
Map<ResourceLocation, Integer> occurrences = new HashMap<>();
|
||||||
|
for (AgeFeatureSelection.Choice choice : features) {
|
||||||
|
if (!AgeFeatureSelection.floatingIslands(choice.id())
|
||||||
|
&& !AgeFeatureSelection.tendrils(choice.id())
|
||||||
|
&& !AgeFeatureSelection.spheres(choice.id())) continue;
|
||||||
|
int occurrence = occurrences.merge(choice.id(), 1, Integer::sum) - 1;
|
||||||
|
long featureSeed = ageSeed ^ (long) occurrence * 0x9E3779B97F4A7C15L;
|
||||||
|
if (AgeFeatureSelection.floatingIslands(choice.id()))
|
||||||
|
FloatingIslandFeature.generate(chunk, biomeSource, random, featureSeed, choice);
|
||||||
|
else if (AgeFeatureSelection.tendrils(choice.id()))
|
||||||
|
TendrilFeature.generate(chunk, featureSeed, choice);
|
||||||
|
else SpheresFeature.generate(chunk, featureSeed, choice);
|
||||||
|
}
|
||||||
return CompletableFuture.completedFuture(chunk);
|
return CompletableFuture.completedFuture(chunk);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void applyBiomeDecoration(WorldGenLevel level, ChunkAccess chunk, StructureManager structures) {
|
||||||
|
super.applyBiomeDecoration(level, chunk, structures);
|
||||||
|
int spikeOccurrence = 0;
|
||||||
|
int obeliskOccurrence = 0;
|
||||||
|
for (AgeFeatureSelection.Choice choice : features) {
|
||||||
|
if (AgeFeatureSelection.spikes(choice.id()))
|
||||||
|
SpikesFeature.generate(level, chunk, ageSeed, choice, spikeOccurrence++);
|
||||||
|
if (AgeFeatureSelection.obelisks(choice.id()))
|
||||||
|
ObelisksFeature.generate(level, chunk, ageSeed, choice, obeliskOccurrence++);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getBaseHeight(int x, int z, Heightmap.Types type, LevelHeightAccessor level, RandomState random) {
|
public int getBaseHeight(int x, int z, Heightmap.Types type, LevelHeightAccessor level, RandomState random) {
|
||||||
List<BlockState> layers = settings.getLayers();
|
List<BlockState> layers = settings.getLayers();
|
||||||
|
|||||||
@@ -0,0 +1,82 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.registry.ModBlocks;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.WorldGenLevel;
|
||||||
|
import net.minecraft.world.level.block.AmethystClusterBlock;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
|
||||||
|
/** A surface crystal mound with budding hearts and initially seeded buds. */
|
||||||
|
final class CrystalFormationsFeature {
|
||||||
|
private static final long SALT = 0x4352595354414C53L;
|
||||||
|
private static final int CHANCE = 15; // Legacy's authored crystal formation frequency.
|
||||||
|
|
||||||
|
private CrystalFormationsFeature() {}
|
||||||
|
|
||||||
|
record Site(int x, int z, long seed) {}
|
||||||
|
|
||||||
|
static Site site(long ageSeed, ChunkPos chunk, int occurrence) {
|
||||||
|
long seed = mix(ageSeed ^ SALT ^ (long) chunk.x * 341873128712L
|
||||||
|
^ (long) chunk.z * 132897987541L ^ (long) occurrence * 0x9E3779B97F4A7C15L);
|
||||||
|
RandomSource random = RandomSource.create(seed);
|
||||||
|
if (random.nextInt(CHANCE) != 0) return null;
|
||||||
|
return new Site(chunk.getMinBlockX() + 5 + random.nextInt(6),
|
||||||
|
chunk.getMinBlockZ() + 5 + random.nextInt(6), seed);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void generate(WorldGenLevel level, ChunkAccess chunk, long ageSeed, int occurrence) {
|
||||||
|
Site site = site(ageSeed, chunk.getPos(), occurrence);
|
||||||
|
if (site == null) return;
|
||||||
|
RandomSource random = RandomSource.create(site.seed() ^ 0x42554444494E474CL);
|
||||||
|
int y = level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, site.x(), site.z());
|
||||||
|
if (y <= level.getMinBuildHeight() + 1 || y + 4 >= level.getMaxBuildHeight()) return;
|
||||||
|
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
|
||||||
|
for (int dx = -1; dx <= 1; dx++) {
|
||||||
|
for (int dz = -1; dz <= 1; dz++) {
|
||||||
|
int x = site.x() + dx;
|
||||||
|
int z = site.z() + dz;
|
||||||
|
if (Math.abs(level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, x, z) - y) > 1) return;
|
||||||
|
BlockState floor = level.getBlockState(pos.set(x, y - 1, z));
|
||||||
|
if (!floor.isFaceSturdy(level, pos, Direction.UP) || !floor.getFluidState().isEmpty()
|
||||||
|
|| floor.hasBlockEntity()) return;
|
||||||
|
for (int h = 0; h < 4; h++) {
|
||||||
|
BlockState existing = level.getBlockState(pos.set(x, y + h, z));
|
||||||
|
if (!existing.isAir() && !existing.canBeReplaced()) return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (int dx = -1; dx <= 1; dx++) {
|
||||||
|
for (int dz = -1; dz <= 1; dz++) {
|
||||||
|
boolean center = dx == 0 && dz == 0;
|
||||||
|
int height = center ? 3 : random.nextInt(3) == 0 ? 2 : 1;
|
||||||
|
for (int h = 0; h < height; h++) {
|
||||||
|
boolean budding = h == height - 1 && (center || random.nextBoolean());
|
||||||
|
level.setBlock(pos.set(site.x() + dx, y + h, site.z() + dz),
|
||||||
|
budding ? ModBlocks.BUDDING_CRYSTAL.get().defaultBlockState()
|
||||||
|
: ModBlocks.CRYSTAL_BLOCK.get().defaultBlockState(), 2);
|
||||||
|
}
|
||||||
|
if (buddingTop(level.getBlockState(pos.set(site.x() + dx, y + height - 1, site.z() + dz)))
|
||||||
|
&& random.nextBoolean()) {
|
||||||
|
level.setBlock(pos.set(site.x() + dx, y + height, site.z() + dz),
|
||||||
|
ModBlocks.SMALL_CRYSTAL_BUD.get().defaultBlockState()
|
||||||
|
.setValue(AmethystClusterBlock.FACING, Direction.UP), 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean buddingTop(BlockState state) {
|
||||||
|
return state.is(ModBlocks.BUDDING_CRYSTAL);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long mix(long value) {
|
||||||
|
value = (value ^ value >>> 30) * 0xBF58476D1CE4E5B9L;
|
||||||
|
value = (value ^ value >>> 27) * 0x94D049BB133111EBL;
|
||||||
|
return value ^ value >>> 31;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Objects;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.block.BuddingCrystalBlock;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeGenerationPlan;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeGenerationProfiles;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeTraits;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.registry.ModBlocks;
|
||||||
|
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||||
|
import net.dnorberg.rivencraft.writing.WritingEntry;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
|
import net.minecraft.gametest.framework.GameTestHelper;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.block.AmethystClusterBlock;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||||
|
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||||
|
|
||||||
|
@GameTestHolder(Rivencraft.MOD_ID)
|
||||||
|
@PrefixGameTestTemplate(false)
|
||||||
|
public final class CrystalFormationsGameTests {
|
||||||
|
private CrystalFormationsGameTests() {}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void authoredCrystalPageAndGrowth(GameTestHelper helper) {
|
||||||
|
var page = PageItem.createBundledCreativePage("feature/crystal_formations");
|
||||||
|
helper.assertTrue(PageItem.isUsableWriting(page), "Crystal Formations page must be writable");
|
||||||
|
var plan = AgeGenerationPlan.compile(new OrderedWriting(List.of(
|
||||||
|
WritingEntry.linkPanel(),
|
||||||
|
WritingEntry.symbol(new SymbolReference(ResourceLocation.fromNamespaceAndPath(
|
||||||
|
Rivencraft.MOD_ID, "terrain/standard"))),
|
||||||
|
WritingEntry.symbol(new SymbolReference(ResourceLocation.fromNamespaceAndPath(
|
||||||
|
Rivencraft.MOD_ID, "feature/crystal_formations"))))),
|
||||||
|
57L, AgeGenerationProfiles.STANDARD, AgeTraits.select(57L),
|
||||||
|
helper.getLevel().registryAccess());
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(plan).getFirst().id(),
|
||||||
|
AgeFeatureSelection.CRYSTAL_FORMATIONS, "Page must compile to the crystal feature");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())),
|
||||||
|
AgeFeatureSelection.resolved(plan), "Crystal choice must survive saving");
|
||||||
|
helper.assertValueEqual(BuddingCrystalBlock.nextStage(Blocks.AIR.defaultBlockState(), Direction.UP),
|
||||||
|
ModBlocks.SMALL_CRYSTAL_BUD.get(), "Air must begin the blue bud sequence");
|
||||||
|
helper.assertValueEqual(BuddingCrystalBlock.nextStage(
|
||||||
|
ModBlocks.SMALL_CRYSTAL_BUD.get().defaultBlockState()
|
||||||
|
.setValue(AmethystClusterBlock.FACING, Direction.UP), Direction.UP),
|
||||||
|
ModBlocks.MEDIUM_CRYSTAL_BUD.get(), "Small buds must grow into medium buds");
|
||||||
|
helper.assertValueEqual(BuddingCrystalBlock.nextStage(
|
||||||
|
ModBlocks.MEDIUM_CRYSTAL_BUD.get().defaultBlockState()
|
||||||
|
.setValue(AmethystClusterBlock.FACING, Direction.UP), Direction.UP),
|
||||||
|
ModBlocks.LARGE_CRYSTAL_BUD.get(), "Medium buds must grow into large buds");
|
||||||
|
helper.assertValueEqual(BuddingCrystalBlock.nextStage(
|
||||||
|
ModBlocks.LARGE_CRYSTAL_BUD.get().defaultBlockState()
|
||||||
|
.setValue(AmethystClusterBlock.FACING, Direction.UP), Direction.UP),
|
||||||
|
ModBlocks.CRYSTAL_CLUSTER.get(), "Large buds must grow into shard-bearing clusters");
|
||||||
|
helper.assertTrue(BuddingCrystalBlock.nextStage(
|
||||||
|
ModBlocks.LARGE_CRYSTAL_BUD.get().defaultBlockState()
|
||||||
|
.setValue(AmethystClusterBlock.FACING, Direction.NORTH), Direction.UP) == null,
|
||||||
|
"Growth must not change a bud facing away from its budding block");
|
||||||
|
helper.assertTrue(ModBlocks.BUDDING_CRYSTAL.get().defaultBlockState().isRandomlyTicking(),
|
||||||
|
"Budding crystals must receive random growth ticks");
|
||||||
|
var site = CrystalFormationsFeature.site(57L, new ChunkPos(10, -3), 0);
|
||||||
|
helper.assertTrue(Objects.equals(site, CrystalFormationsFeature.site(57L, new ChunkPos(10, -3), 0)),
|
||||||
|
"Formation placement must be deterministic per Age and chunk");
|
||||||
|
helper.assertTrue(java.util.stream.IntStream.range(0, 100).anyMatch(x ->
|
||||||
|
CrystalFormationsFeature.site(57L, new ChunkPos(x, -3), 0) != null),
|
||||||
|
"Authored crystal formations must have reachable placement sites");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.book.AgeBiomeSelection;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.QuartPos;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.tags.BiomeTags;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.biome.BiomeSource;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
import net.minecraft.world.level.levelgen.RandomState;
|
||||||
|
|
||||||
|
/** Adds rare, high island clusters to an existing noise terrain before its surface is built. */
|
||||||
|
final class FloatingIslandFeature {
|
||||||
|
private static final long SALT = 0x464C4F4154494E47L;
|
||||||
|
private static final int SOURCE_RANGE = 3;
|
||||||
|
private static final int CHANCE = 128;
|
||||||
|
|
||||||
|
private FloatingIslandFeature() {}
|
||||||
|
|
||||||
|
static void generate(ChunkAccess chunk, BiomeSource biomes, RandomState noise, long ageSeed,
|
||||||
|
AgeFeatureSelection.Choice choice) {
|
||||||
|
ChunkPos target = chunk.getPos();
|
||||||
|
BlockState material = choice.material().map(id -> BuiltInRegistries.BLOCK.get(id).defaultBlockState())
|
||||||
|
.orElse(null);
|
||||||
|
for (int sourceX = target.x - SOURCE_RANGE; sourceX <= target.x + SOURCE_RANGE; sourceX++) {
|
||||||
|
for (int sourceZ = target.z - SOURCE_RANGE; sourceZ <= target.z + SOURCE_RANGE; sourceZ++) {
|
||||||
|
RandomSource random = random(ageSeed, sourceX, sourceZ);
|
||||||
|
if (random.nextInt(CHANCE) != 0) continue;
|
||||||
|
int centerX = sourceX * 16 + random.nextInt(16);
|
||||||
|
int centerZ = sourceZ * 16 + random.nextInt(16);
|
||||||
|
int centerY = Math.min(chunk.getMaxBuildHeight() - 30, 168 + random.nextInt(48));
|
||||||
|
if (centerY < chunk.getMinBuildHeight() + 24) continue;
|
||||||
|
int radiusX = 24 + random.nextInt(18);
|
||||||
|
int radiusZ = 24 + random.nextInt(18);
|
||||||
|
fill(chunk, biomes, noise, ageSeed, material, centerX, centerY, centerZ, radiusX, radiusZ);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void fill(ChunkAccess chunk, BiomeSource biomes, RandomState noise, long ageSeed,
|
||||||
|
BlockState material,
|
||||||
|
int centerX, int centerY, int centerZ, int radiusX, int radiusZ) {
|
||||||
|
int originX = chunk.getPos().getMinBlockX();
|
||||||
|
int originZ = chunk.getPos().getMinBlockZ();
|
||||||
|
Heightmap surface = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE_WG);
|
||||||
|
Heightmap floor = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.OCEAN_FLOOR_WG);
|
||||||
|
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
|
||||||
|
for (int localX = 0; localX < 16; localX++) {
|
||||||
|
int worldX = originX + localX;
|
||||||
|
double dx = (worldX - centerX) / (double) radiusX;
|
||||||
|
for (int localZ = 0; localZ < 16; localZ++) {
|
||||||
|
int worldZ = originZ + localZ;
|
||||||
|
double dz = (worldZ - centerZ) / (double) radiusZ;
|
||||||
|
double distance = dx * dx + dz * dz;
|
||||||
|
if (distance >= 1.0) continue;
|
||||||
|
|
||||||
|
// Coordinate noise keeps adjacent chunks seamless without sharing mutable RNG state.
|
||||||
|
long detail = mix(ageSeed ^ (long) centerX * 341873128712L
|
||||||
|
^ (long) centerZ * 132897987541L ^ (long) worldX * 42317861L
|
||||||
|
^ (long) worldZ * 374761393L);
|
||||||
|
int top = centerY + (int) Math.round(3 * (1 - distance)) + (int) Math.floorMod(detail, 3) - 1;
|
||||||
|
int depth = Math.max(1, (int) Math.round(3 + 17 * Math.pow(1 - distance, 1.5)));
|
||||||
|
var biome = biomes.getNoiseBiome(QuartPos.fromBlock(worldX), QuartPos.fromBlock(top),
|
||||||
|
QuartPos.fromBlock(worldZ), noise.sampler());
|
||||||
|
BlockState base = material != null ? material
|
||||||
|
: biome.is(BiomeTags.IS_NETHER) ? Blocks.NETHERRACK.defaultBlockState()
|
||||||
|
: biome.is(BiomeTags.IS_END) ? Blocks.END_STONE.defaultBlockState()
|
||||||
|
: Blocks.STONE.defaultBlockState();
|
||||||
|
BlockState soil = biome.is(BiomeTags.IS_NETHER) || biome.is(BiomeTags.IS_END)
|
||||||
|
|| biome.is(AgeBiomeSelection.CAVE_BIOMES) ? base : Blocks.DIRT.defaultBlockState();
|
||||||
|
BlockState cap = soil == base ? base : Blocks.GRASS_BLOCK.defaultBlockState();
|
||||||
|
for (int y = Math.max(top - depth, chunk.getMinBuildHeight()); y <= top; y++) {
|
||||||
|
pos.set(worldX, y, worldZ);
|
||||||
|
if (!chunk.getBlockState(pos).isAir()) continue;
|
||||||
|
BlockState state = y == top ? cap : y >= top - 3 ? soil : base;
|
||||||
|
chunk.setBlockState(pos, state, false);
|
||||||
|
surface.update(localX, y, localZ, state);
|
||||||
|
floor.update(localX, y, localZ, state);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static RandomSource random(long ageSeed, int x, int z) {
|
||||||
|
return RandomSource.create(mix(ageSeed ^ SALT ^ (long) x * 341873128712L
|
||||||
|
^ (long) z * 132897987541L));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long mix(long value) {
|
||||||
|
value = (value ^ value >>> 30) * 0xBF58476D1CE4E5B9L;
|
||||||
|
value = (value ^ value >>> 27) * 0x94D049BB133111EBL;
|
||||||
|
return value ^ value >>> 31;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.Direction;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.WorldGenLevel;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
|
||||||
|
/** Rare one-chunk obelisk adapted from Legacy's 4x4 plinth and 2x12x2 shaft. */
|
||||||
|
final class ObelisksFeature {
|
||||||
|
private static final long SALT = 0x4F42454C49534B53L;
|
||||||
|
private static final int CHANCE = 128;
|
||||||
|
private static final int BASE = 4;
|
||||||
|
private static final int HEIGHT = 12;
|
||||||
|
|
||||||
|
private ObelisksFeature() {}
|
||||||
|
|
||||||
|
record Site(int x, int z) {}
|
||||||
|
|
||||||
|
static Site site(long ageSeed, ChunkPos chunk, int occurrence) {
|
||||||
|
RandomSource random = RandomSource.create(mix(ageSeed ^ SALT
|
||||||
|
^ (long) chunk.x * 341873128712L ^ (long) chunk.z * 132897987541L
|
||||||
|
^ (long) occurrence * 0x9E3779B97F4A7C15L));
|
||||||
|
if (random.nextInt(CHANCE) != 0) return null;
|
||||||
|
return new Site(chunk.getMinBlockX() + 4 + random.nextInt(8),
|
||||||
|
chunk.getMinBlockZ() + 4 + random.nextInt(8));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void generate(WorldGenLevel level, ChunkAccess chunk, long ageSeed,
|
||||||
|
AgeFeatureSelection.Choice choice, int occurrence) {
|
||||||
|
Site site = site(ageSeed, chunk.getPos(), occurrence);
|
||||||
|
if (site == null || choice.material().isEmpty()) return;
|
||||||
|
BlockState material = BuiltInRegistries.BLOCK.get(choice.material().orElseThrow()).defaultBlockState();
|
||||||
|
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
|
||||||
|
int minSurface = Integer.MAX_VALUE;
|
||||||
|
int maxSurface = Integer.MIN_VALUE;
|
||||||
|
int[][] surface = new int[BASE][BASE];
|
||||||
|
for (int dx = 0; dx < BASE; dx++) {
|
||||||
|
for (int dz = 0; dz < BASE; dz++) {
|
||||||
|
int x = site.x() + dx;
|
||||||
|
int z = site.z() + dz;
|
||||||
|
int y = level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, x, z);
|
||||||
|
if (y <= level.getMinBuildHeight() + 1) return;
|
||||||
|
BlockState ground = level.getBlockState(pos.set(x, y - 1, z));
|
||||||
|
if (!ground.isFaceSturdy(level, pos, Direction.UP)
|
||||||
|
|| !ground.getFluidState().isEmpty() || ground.hasBlockEntity()) return;
|
||||||
|
surface[dx][dz] = y;
|
||||||
|
minSurface = Math.min(minSurface, y);
|
||||||
|
maxSurface = Math.max(maxSurface, y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (maxSurface - minSurface > 2 || maxSurface + HEIGHT >= level.getMaxBuildHeight()) return;
|
||||||
|
for (int dx = 0; dx < BASE; dx++) {
|
||||||
|
for (int dz = 0; dz < BASE; dz++) {
|
||||||
|
for (int y = surface[dx][dz]; y <= maxSurface; y++) {
|
||||||
|
if (!open(level.getBlockState(pos.set(site.x() + dx, y, site.z() + dz)))) return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (int dx = 1; dx <= 2; dx++) {
|
||||||
|
for (int dz = 1; dz <= 2; dz++) {
|
||||||
|
for (int y = maxSurface + 1; y <= maxSurface + HEIGHT; y++) {
|
||||||
|
if (!open(level.getBlockState(pos.set(site.x() + dx, y, site.z() + dz)))) return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (int dx = 0; dx < BASE; dx++) {
|
||||||
|
for (int dz = 0; dz < BASE; dz++) {
|
||||||
|
for (int y = surface[dx][dz]; y <= maxSurface; y++)
|
||||||
|
level.setBlock(pos.set(site.x() + dx, y, site.z() + dz), material, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (int dx = 1; dx <= 2; dx++) {
|
||||||
|
for (int dz = 1; dz <= 2; dz++) {
|
||||||
|
for (int y = maxSurface + 1; y <= maxSurface + HEIGHT; y++)
|
||||||
|
level.setBlock(pos.set(site.x() + dx, y, site.z() + dz), material, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean open(BlockState state) {
|
||||||
|
return state.getFluidState().isEmpty() && (state.isAir() || state.canBeReplaced());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long mix(long value) {
|
||||||
|
value = (value ^ value >>> 30) * 0xBF58476D1CE4E5B9L;
|
||||||
|
value = (value ^ value >>> 27) * 0x94D049BB133111EBL;
|
||||||
|
return value ^ value >>> 31;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,110 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeGenerationPlan;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeGenerationProfiles;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeRuntimeProfiles;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeTraits;
|
||||||
|
import net.dnorberg.rivencraft.item.PageItem;
|
||||||
|
import net.dnorberg.rivencraft.writing.OrderedWriting;
|
||||||
|
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||||
|
import net.dnorberg.rivencraft.writing.WritingEntry;
|
||||||
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
|
import net.minecraft.gametest.framework.GameTestHelper;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||||
|
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||||
|
|
||||||
|
/** Obelisks must retain ordered materials and generate a stable Legacy-sized shape. */
|
||||||
|
@GameTestHolder(Rivencraft.MOD_ID)
|
||||||
|
@PrefixGameTestTemplate(false)
|
||||||
|
public final class ObelisksGameTests {
|
||||||
|
private ObelisksGameTests() {}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void authoredObelisksKeepTheirMaterialAndTerrainRules(GameTestHelper helper) {
|
||||||
|
var registries = helper.getLevel().registryAccess();
|
||||||
|
helper.assertTrue(PageItem.bundledCreativeSymbols().contains("feature/obelisks"),
|
||||||
|
"Obelisks must appear in the Creative and JEI symbol feed");
|
||||||
|
OrderedWriting writing = new OrderedWriting(List.of(WritingEntry.linkPanel(), page("terrain/standard"),
|
||||||
|
block("obsidian"), page("feature/obelisks"), page("feature/obelisks")));
|
||||||
|
AgeGenerationPlan plan = AgeGenerationPlan.compile(writing, 56L, AgeGenerationProfiles.STANDARD,
|
||||||
|
AgeTraits.select(56L), registries);
|
||||||
|
var choices = AgeFeatureSelection.resolved(plan);
|
||||||
|
helper.assertValueEqual(choices.size(), 2, "Repeated Obelisks pages must remain separate");
|
||||||
|
helper.assertValueEqual(choices.getFirst().material(),
|
||||||
|
Optional.of(ResourceLocation.withDefaultNamespace("obsidian")),
|
||||||
|
"A preceding Block page must set the first obelisk material");
|
||||||
|
helper.assertTrue(choices.getLast().material().isPresent()
|
||||||
|
&& AgeFeatureSelection.materialError(choices.getLast()) == null,
|
||||||
|
"An unmodified Obelisks page must choose a valid material");
|
||||||
|
helper.assertValueEqual(AgeFeatureSelection.resolved(AgeGenerationPlan.load(plan.save())), choices,
|
||||||
|
"Obelisk materials and order must survive Age-plan reload");
|
||||||
|
for (String terrain : List.of("standard", "amplified", "island", "flat"))
|
||||||
|
helper.assertTrue(AgeFeatureSelection.error(id("obelisks"),
|
||||||
|
AgeRuntimeProfiles.resolve(id(terrain)), registries) == null,
|
||||||
|
"Obelisks should be valid on exposed " + terrain + " terrain");
|
||||||
|
for (String terrain : List.of("void", "cave"))
|
||||||
|
helper.assertTrue(AgeFeatureSelection.error(id("obelisks"),
|
||||||
|
AgeRuntimeProfiles.resolve(id(terrain)), registries) != null,
|
||||||
|
"Obelisks must reject " + terrain + " terrain without an exposed surface");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void randomAgesOnlyChooseObelisksOnSupportedTerrain(GameTestHelper helper) {
|
||||||
|
var registries = helper.getLevel().registryAccess();
|
||||||
|
boolean selected = false;
|
||||||
|
for (long seed = 0; seed < 128; seed++) {
|
||||||
|
selected |= AgeFeatureSelection.randomChoices(seed,
|
||||||
|
AgeRuntimeProfiles.resolve(id("standard")), registries).stream()
|
||||||
|
.anyMatch(choice -> AgeFeatureSelection.obelisks(choice.id()));
|
||||||
|
for (String terrain : List.of("void", "cave"))
|
||||||
|
helper.assertTrue(AgeFeatureSelection.randomChoices(seed,
|
||||||
|
AgeRuntimeProfiles.resolve(id(terrain)), registries).stream()
|
||||||
|
.noneMatch(choice -> AgeFeatureSelection.obelisks(choice.id())),
|
||||||
|
"Random " + terrain + " Ages must not gain Obelisks");
|
||||||
|
}
|
||||||
|
helper.assertTrue(selected, "Random surface Ages should be able to select Obelisks");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void obeliskSitesAreSeededAndStayInsideTheirChunk(GameTestHelper helper) {
|
||||||
|
ChunkPos chunk = new ChunkPos(123, -45);
|
||||||
|
int selected = 0;
|
||||||
|
for (long seed = 0; seed < 2048; seed++) {
|
||||||
|
ObelisksFeature.Site site = ObelisksFeature.site(seed, chunk, 0);
|
||||||
|
helper.assertTrue(java.util.Objects.equals(ObelisksFeature.site(seed, chunk, 0), site),
|
||||||
|
"An Age seed must reproduce the same obelisk site");
|
||||||
|
if (site == null) continue;
|
||||||
|
selected++;
|
||||||
|
helper.assertTrue(site.x() >= chunk.getMinBlockX() + 4
|
||||||
|
&& site.x() + 3 < chunk.getMaxBlockX(),
|
||||||
|
"The full 4x4 plinth must remain inside its source chunk");
|
||||||
|
helper.assertTrue(site.z() >= chunk.getMinBlockZ() + 4
|
||||||
|
&& site.z() + 3 < chunk.getMaxBlockZ(),
|
||||||
|
"The full 4x4 plinth must remain inside its source chunk");
|
||||||
|
}
|
||||||
|
helper.assertTrue(selected > 0 && selected < 64,
|
||||||
|
"The 1-in-128 roll should remain rare but reachable");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static ResourceLocation id(String path) {
|
||||||
|
return ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static WritingEntry page(String path) {
|
||||||
|
return WritingEntry.symbol(new SymbolReference(id(path)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static WritingEntry block(String path) {
|
||||||
|
return WritingEntry.symbol(new SymbolReference(net.dnorberg.rivencraft.writing.BlockSymbolPages.symbolId(
|
||||||
|
ResourceLocation.withDefaultNamespace(path))));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Subtractive Skylands terrain filter adapted from Mystcraft Legacy's
|
||||||
|
* SymbolSkylands (LGPL-3.0-or-later). Legacy keeps solid terrain above a
|
||||||
|
* seven-octave cutoff near Y=76 and discards liquid above that cutoff.
|
||||||
|
*/
|
||||||
|
final class SkylandsFeature {
|
||||||
|
private static final long SALT = 0x534B594C414E4453L;
|
||||||
|
private static final int BASE_CUTOFF = 76;
|
||||||
|
private static final BlockState AIR = Blocks.AIR.defaultBlockState();
|
||||||
|
|
||||||
|
private SkylandsFeature() {}
|
||||||
|
|
||||||
|
static void filter(ChunkAccess chunk, long ageSeed) {
|
||||||
|
int originX = chunk.getPos().getMinBlockX();
|
||||||
|
int originZ = chunk.getPos().getMinBlockZ();
|
||||||
|
int minY = chunk.getMinBuildHeight();
|
||||||
|
int maxY = chunk.getMaxBuildHeight();
|
||||||
|
Heightmap surface = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE_WG);
|
||||||
|
Heightmap floor = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.OCEAN_FLOOR_WG);
|
||||||
|
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
|
||||||
|
for (int localX = 0; localX < 16; localX++) {
|
||||||
|
for (int localZ = 0; localZ < 16; localZ++) {
|
||||||
|
int cutoff = cutoff(ageSeed, originX + localX, originZ + localZ);
|
||||||
|
for (int y = minY; y < maxY; y++) {
|
||||||
|
pos.set(originX + localX, y, originZ + localZ);
|
||||||
|
BlockState state = chunk.getBlockState(pos);
|
||||||
|
if (!removes(state, y, cutoff)) continue;
|
||||||
|
chunk.setBlockState(pos, AIR, false);
|
||||||
|
surface.update(localX, y, localZ, AIR);
|
||||||
|
floor.update(localX, y, localZ, AIR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean removes(BlockState state, int y, int cutoff) {
|
||||||
|
return !state.isAir() && (y <= cutoff || state.liquid());
|
||||||
|
}
|
||||||
|
|
||||||
|
static int cutoff(long ageSeed, int x, int z) {
|
||||||
|
double variation = 0.0D;
|
||||||
|
int cellSize = 128;
|
||||||
|
double amplitude = 12.0D;
|
||||||
|
for (int octave = 0; octave < 7; octave++) {
|
||||||
|
variation += valueNoise(ageSeed ^ SALT ^ (long) octave * 0x9E3779B97F4A7C15L,
|
||||||
|
x, z, cellSize) * amplitude;
|
||||||
|
cellSize /= 2;
|
||||||
|
amplitude /= 2.0D;
|
||||||
|
}
|
||||||
|
return BASE_CUTOFF + (int) Math.round(variation);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double valueNoise(long seed, int x, int z, int cellSize) {
|
||||||
|
int cellX = Math.floorDiv(x, cellSize);
|
||||||
|
int cellZ = Math.floorDiv(z, cellSize);
|
||||||
|
double u = smooth((x - cellX * cellSize) / (double) cellSize);
|
||||||
|
double v = smooth((z - cellZ * cellSize) / (double) cellSize);
|
||||||
|
double north = lerp(value(seed, cellX, cellZ), value(seed, cellX + 1, cellZ), u);
|
||||||
|
double south = lerp(value(seed, cellX, cellZ + 1), value(seed, cellX + 1, cellZ + 1), u);
|
||||||
|
return lerp(north, south, v);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double value(long seed, int x, int z) {
|
||||||
|
long hash = mix(seed ^ (long) x * 0xD1B54A32D192ED03L
|
||||||
|
^ (long) z * 0xABC98388FB8FAC03L);
|
||||||
|
return (hash >>> 11) * 0x1.0p-52 - 1.0D;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double smooth(double value) {
|
||||||
|
return value * value * (3.0D - 2.0D * value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static double lerp(double first, double second, double amount) {
|
||||||
|
return first + (second - first) * amount;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long mix(long value) {
|
||||||
|
value = (value ^ value >>> 30) * 0xBF58476D1CE4E5B9L;
|
||||||
|
value = (value ^ value >>> 27) * 0x94D049BB133111EBL;
|
||||||
|
return value ^ value >>> 31;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.Rivencraft;
|
||||||
|
import net.minecraft.gametest.framework.GameTest;
|
||||||
|
import net.minecraft.gametest.framework.GameTestHelper;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||||
|
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
|
||||||
|
|
||||||
|
/** Checks the Legacy-style filter independently of a slow dimension-generation test. */
|
||||||
|
@GameTestHolder(Rivencraft.MOD_ID)
|
||||||
|
@PrefixGameTestTemplate(false)
|
||||||
|
public final class SkylandsFeatureGameTests {
|
||||||
|
private SkylandsFeatureGameTests() {}
|
||||||
|
|
||||||
|
@GameTest(template = "empty")
|
||||||
|
public static void skylandsOnlyKeepsUpperSolidTerrain(GameTestHelper helper) {
|
||||||
|
int cutoff = SkylandsFeature.cutoff(707L, 32, -48);
|
||||||
|
helper.assertValueEqual(SkylandsFeature.cutoff(707L, 32, -48), cutoff,
|
||||||
|
"Skylands cutoff must be deterministic for an Age seed and world column");
|
||||||
|
helper.assertTrue(SkylandsFeature.removes(Blocks.STONE.defaultBlockState(), cutoff, cutoff),
|
||||||
|
"Solid terrain at the cutoff must be removed");
|
||||||
|
helper.assertFalse(SkylandsFeature.removes(Blocks.STONE.defaultBlockState(), cutoff + 1, cutoff),
|
||||||
|
"Solid terrain above the cutoff must remain");
|
||||||
|
helper.assertTrue(SkylandsFeature.removes(Blocks.WATER.defaultBlockState(), cutoff + 1, cutoff),
|
||||||
|
"Liquids above the cutoff must be removed");
|
||||||
|
helper.assertFalse(SkylandsFeature.removes(Blocks.AIR.defaultBlockState(), cutoff - 1, cutoff),
|
||||||
|
"Air must remain air");
|
||||||
|
helper.succeed();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,127 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import java.util.Random;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.util.Mth;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Solid, wandering sphere nodes adapted from Mystcraft Legacy's MapGenSpheresMyst
|
||||||
|
* (Mystcraft contributors, LGPL-3.0-or-later, commit 9bc8ddc). NeoForge chunk
|
||||||
|
* writes and seed mixing are Rivencraft-specific.
|
||||||
|
*/
|
||||||
|
final class SpheresFeature {
|
||||||
|
private static final int SOURCE_RANGE = 8;
|
||||||
|
private static final long SALT = 0x53504845524553L;
|
||||||
|
|
||||||
|
private SpheresFeature() {}
|
||||||
|
|
||||||
|
static void generate(ChunkAccess chunk, long ageSeed, AgeFeatureSelection.Choice choice) {
|
||||||
|
BlockState material = choice.material()
|
||||||
|
.map(id -> BuiltInRegistries.BLOCK.get(id).defaultBlockState())
|
||||||
|
.orElse(Blocks.COBBLESTONE.defaultBlockState());
|
||||||
|
ChunkPos target = chunk.getPos();
|
||||||
|
Random master = new Random(ageSeed ^ SALT);
|
||||||
|
long xSeed = master.nextLong();
|
||||||
|
long zSeed = master.nextLong();
|
||||||
|
for (int sx = target.x - SOURCE_RANGE; sx <= target.x + SOURCE_RANGE; sx++) {
|
||||||
|
for (int sz = target.z - SOURCE_RANGE; sz <= target.z + SOURCE_RANGE; sz++) {
|
||||||
|
Random source = new Random((long) sx * xSeed ^ (long) sz * zSeed ^ ageSeed ^ SALT);
|
||||||
|
if (source.nextFloat() > 0.05F) continue;
|
||||||
|
double x = sx * 16 + source.nextInt(16);
|
||||||
|
double y = source.nextInt(source.nextInt(192) + 1) + 32;
|
||||||
|
double z = sz * 16 + source.nextInt(16);
|
||||||
|
trace(chunk, material, source.nextLong(), x, y, z,
|
||||||
|
1.0F + source.nextFloat() * 4.0F, 0, 0, -1, -1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void trace(ChunkAccess chunk, BlockState material, long seed,
|
||||||
|
double x, double y, double z, float radius, float yaw, float pitch,
|
||||||
|
int step, int length) {
|
||||||
|
Random random = new Random(seed);
|
||||||
|
if (length <= 0) {
|
||||||
|
int maximum = SOURCE_RANGE * 16 - 16;
|
||||||
|
length = maximum - random.nextInt(maximum / 4);
|
||||||
|
}
|
||||||
|
boolean singleNode = step == -1;
|
||||||
|
if (singleNode) step = length / 2;
|
||||||
|
int splitAt = random.nextInt(length / 2) + length / 4;
|
||||||
|
boolean slowPitch = random.nextInt(6) == 0;
|
||||||
|
float yawDrift = 0;
|
||||||
|
float pitchDrift = 0;
|
||||||
|
double middleX = chunk.getPos().getMinBlockX() + 8;
|
||||||
|
double middleZ = chunk.getPos().getMinBlockZ() + 8;
|
||||||
|
for (; step < length; step++) {
|
||||||
|
double nodeRadius = 1.5D + Math.sin(step * Math.PI / length) * radius;
|
||||||
|
float horizontal = Mth.cos(pitch);
|
||||||
|
x += Mth.cos(yaw) * horizontal;
|
||||||
|
y += Mth.sin(pitch);
|
||||||
|
z += Mth.sin(yaw) * horizontal;
|
||||||
|
pitch *= slowPitch ? 0.92F : 0.7F;
|
||||||
|
pitch += pitchDrift * 0.1F;
|
||||||
|
yaw += yawDrift * 0.1F;
|
||||||
|
pitchDrift = pitchDrift * 0.9F
|
||||||
|
+ (random.nextFloat() - random.nextFloat()) * random.nextFloat() * 2.0F;
|
||||||
|
yawDrift = yawDrift * 0.75F
|
||||||
|
+ (random.nextFloat() - random.nextFloat()) * random.nextFloat() * 4.0F;
|
||||||
|
if (!singleNode && step == splitAt && radius > 1.0F) {
|
||||||
|
trace(chunk, material, random.nextLong(), x, y, z,
|
||||||
|
random.nextFloat() * 0.5F + 0.5F, yaw - Mth.HALF_PI, pitch / 3, step, length);
|
||||||
|
trace(chunk, material, random.nextLong(), x, y, z,
|
||||||
|
random.nextFloat() * 0.5F + 0.5F, yaw + Mth.HALF_PI, pitch / 3, step, length);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!singleNode && random.nextInt(4) == 0) continue;
|
||||||
|
double dx = x - middleX;
|
||||||
|
double dz = z - middleZ;
|
||||||
|
double remaining = length - step;
|
||||||
|
double reach = radius + 18;
|
||||||
|
if (dx * dx + dz * dz - remaining * remaining > reach * reach) return;
|
||||||
|
if (Math.abs(dx) <= 16 + nodeRadius * 2 && Math.abs(dz) <= 16 + nodeRadius * 2)
|
||||||
|
fillNode(chunk, material, x, y, z, nodeRadius);
|
||||||
|
if (singleNode) break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void fillNode(ChunkAccess chunk, BlockState material,
|
||||||
|
double centerX, double centerY, double centerZ, double radius) {
|
||||||
|
int originX = chunk.getPos().getMinBlockX();
|
||||||
|
int originZ = chunk.getPos().getMinBlockZ();
|
||||||
|
int minX = Math.max(0, Mth.floor(centerX - radius) - originX - 1);
|
||||||
|
int maxX = Math.min(16, Mth.floor(centerX + radius) - originX + 2);
|
||||||
|
int minZ = Math.max(0, Mth.floor(centerZ - radius) - originZ - 1);
|
||||||
|
int maxZ = Math.min(16, Mth.floor(centerZ + radius) - originZ + 2);
|
||||||
|
int minY = Math.max(chunk.getMinBuildHeight() + 1, Mth.floor(centerY - radius) - 1);
|
||||||
|
int maxY = Math.min(chunk.getMaxBuildHeight(), Mth.floor(centerY + radius) + 2);
|
||||||
|
Heightmap surface = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE_WG);
|
||||||
|
Heightmap floor = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.OCEAN_FLOOR_WG);
|
||||||
|
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
|
||||||
|
for (int worldY = minY; worldY < maxY; worldY++) {
|
||||||
|
double dy = (worldY + 0.5D - centerY) / radius;
|
||||||
|
for (int localZ = minZ; localZ < maxZ; localZ++) {
|
||||||
|
double dz = (originZ + localZ + 0.5D - centerZ) / radius;
|
||||||
|
for (int localX = minX; localX < maxX; localX++) {
|
||||||
|
double dx = (originX + localX + 0.5D - centerX) / radius;
|
||||||
|
if (!insideSphere(dx, dy, dz)) continue;
|
||||||
|
pos.set(originX + localX, worldY, originZ + localZ);
|
||||||
|
if (chunk.getBlockState(pos).is(Blocks.BEDROCK)) continue;
|
||||||
|
chunk.setBlockState(pos, material, false);
|
||||||
|
surface.update(localX, worldY, localZ, material);
|
||||||
|
floor.update(localX, worldY, localZ, material);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean insideSphere(double dx, double dy, double dz) {
|
||||||
|
return dx * dx + dy * dy + dz * dz < 1.0D;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.util.RandomSource;
|
||||||
|
import net.minecraft.world.level.WorldGenLevel;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rare surface spikes adapted from Mystcraft Legacy's WorldGenSpikesAdv
|
||||||
|
* (Mystcraft contributors, LGPL-3.0-or-later, commit 9bc8ddc). The footprint
|
||||||
|
* is kept in one chunk to avoid generation-order seams.
|
||||||
|
*/
|
||||||
|
final class SpikesFeature {
|
||||||
|
private static final long SALT = 0x5350494B4553L;
|
||||||
|
|
||||||
|
private SpikesFeature() {}
|
||||||
|
|
||||||
|
static void generate(WorldGenLevel level, ChunkAccess chunk, long ageSeed,
|
||||||
|
AgeFeatureSelection.Choice choice, int occurrence) {
|
||||||
|
int originX = chunk.getPos().getMinBlockX();
|
||||||
|
int originZ = chunk.getPos().getMinBlockZ();
|
||||||
|
RandomSource random = RandomSource.create(ageSeed ^ SALT
|
||||||
|
^ (long) originX * 341873128712L ^ (long) originZ * 132897987541L
|
||||||
|
^ (long) occurrence * 0x9E3779B97F4A7C15L);
|
||||||
|
if (random.nextInt(18) != 0) return;
|
||||||
|
BlockState material = choice.material()
|
||||||
|
.map(id -> BuiltInRegistries.BLOCK.get(id).defaultBlockState())
|
||||||
|
.orElse(Blocks.STONE.defaultBlockState());
|
||||||
|
// Keep the entire footprint in this chunk; neighboring decoration order
|
||||||
|
// must not decide whether a spike exists or cut it at a chunk border.
|
||||||
|
int x = originX + 4 + random.nextInt(8);
|
||||||
|
int z = originZ + 4 + random.nextInt(8);
|
||||||
|
int y = level.getHeight(Heightmap.Types.WORLD_SURFACE_WG, x, z);
|
||||||
|
int height = 6 + random.nextInt(32);
|
||||||
|
int width = 1 + random.nextInt(4);
|
||||||
|
if (y < level.getMinBuildHeight() + 1 || y + height >= level.getMaxBuildHeight()) return;
|
||||||
|
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
|
||||||
|
if (!level.isEmptyBlock(pos.set(x, y, z))) return;
|
||||||
|
for (int px = x - width; px <= x + width; px++) {
|
||||||
|
for (int pz = z - width; pz <= z + width; pz++) {
|
||||||
|
if (!insideFootprint(px - x, pz - z, width)) continue;
|
||||||
|
if (!level.getBlockState(pos.set(px, y - 1, pz)).isSolid()) return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (int px = x - width; px <= x + width; px++) {
|
||||||
|
for (int pz = z - width; pz <= z + width; pz++) {
|
||||||
|
if (!insideFootprint(px - x, pz - z, width)) continue;
|
||||||
|
int top = y + 1 + random.nextInt(random.nextInt(height) + 1);
|
||||||
|
for (int py = y; py < top; py++) {
|
||||||
|
pos.set(px, py, pz);
|
||||||
|
if (level.isEmptyBlock(pos)) level.setBlock(pos, material, 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static boolean insideFootprint(int dx, int dz, int width) {
|
||||||
|
return dx * dx + dz * dz <= width * width + 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
package net.dnorberg.rivencraft.world;
|
||||||
|
|
||||||
|
import java.util.Random;
|
||||||
|
import net.dnorberg.rivencraft.book.AgeFeatureSelection;
|
||||||
|
import net.minecraft.core.BlockPos;
|
||||||
|
import net.minecraft.core.registries.BuiltInRegistries;
|
||||||
|
import net.minecraft.util.Mth;
|
||||||
|
import net.minecraft.world.level.ChunkPos;
|
||||||
|
import net.minecraft.world.level.block.Blocks;
|
||||||
|
import net.minecraft.world.level.block.state.BlockState;
|
||||||
|
import net.minecraft.world.level.chunk.ChunkAccess;
|
||||||
|
import net.minecraft.world.level.levelgen.Heightmap;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Winding solid volumes adapted from Mystcraft Legacy's SymbolTendrils and
|
||||||
|
* MapGenCavesMyst (LGPL-3.0-or-later). Generation stays inside the target chunk,
|
||||||
|
* while source-chunk seeds make the same tendril meet seamlessly at its borders.
|
||||||
|
*/
|
||||||
|
final class TendrilFeature {
|
||||||
|
private static final long SALT = 0x54454E4452494C53L;
|
||||||
|
private static final int SOURCE_RANGE = 8;
|
||||||
|
private static final int SOURCE_RATE = 15;
|
||||||
|
private static final int SOURCE_SIZE = 18;
|
||||||
|
|
||||||
|
private TendrilFeature() {}
|
||||||
|
|
||||||
|
static void generate(ChunkAccess chunk, long ageSeed, AgeFeatureSelection.Choice choice) {
|
||||||
|
BlockState material = choice.material()
|
||||||
|
.map(id -> BuiltInRegistries.BLOCK.get(id).defaultBlockState())
|
||||||
|
.orElse(Blocks.OAK_LOG.defaultBlockState());
|
||||||
|
ChunkPos target = chunk.getPos();
|
||||||
|
Random master = new Random(ageSeed ^ SALT);
|
||||||
|
long xSeed = master.nextLong();
|
||||||
|
long zSeed = master.nextLong();
|
||||||
|
for (int sourceX = target.x - SOURCE_RANGE; sourceX <= target.x + SOURCE_RANGE; sourceX++) {
|
||||||
|
for (int sourceZ = target.z - SOURCE_RANGE; sourceZ <= target.z + SOURCE_RANGE; sourceZ++) {
|
||||||
|
Random source = new Random((long) sourceX * xSeed ^ (long) sourceZ * zSeed ^ ageSeed ^ SALT);
|
||||||
|
int nodes = source.nextInt(source.nextInt(source.nextInt(SOURCE_SIZE) + 1) + 1);
|
||||||
|
if (source.nextInt(SOURCE_RATE) != 0) continue;
|
||||||
|
for (int node = 0; node < nodes; node++) {
|
||||||
|
double x = sourceX * 16 + source.nextInt(16);
|
||||||
|
double y = source.nextInt(source.nextInt(120) + 8);
|
||||||
|
double z = sourceZ * 16 + source.nextInt(16);
|
||||||
|
int branches = 1;
|
||||||
|
if (source.nextInt(4) == 0) {
|
||||||
|
trace(chunk, material, source.nextLong(), x, y, z,
|
||||||
|
1.0F + source.nextFloat() * 6.0F, 0.0F, 0.0F, -1, -1, 0.5D);
|
||||||
|
branches += source.nextInt(4);
|
||||||
|
}
|
||||||
|
for (int branch = 0; branch < branches; branch++) {
|
||||||
|
float yaw = source.nextFloat() * Mth.TWO_PI;
|
||||||
|
float pitch = (source.nextFloat() - 0.5F) / 4.0F;
|
||||||
|
float radius = source.nextFloat() * 2.0F + source.nextFloat();
|
||||||
|
if (source.nextInt(10) == 0)
|
||||||
|
radius *= source.nextFloat() * source.nextFloat() * 3.0F + 1.0F;
|
||||||
|
trace(chunk, material, source.nextLong(), x, y, z,
|
||||||
|
radius, yaw, pitch, 0, 0, 1.0D);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void trace(ChunkAccess chunk, BlockState material, long seed,
|
||||||
|
double x, double y, double z, float radius, float yaw, float pitch,
|
||||||
|
int step, int length, double verticalScale) {
|
||||||
|
Random random = new Random(seed);
|
||||||
|
if (length <= 0) {
|
||||||
|
int maximum = SOURCE_RANGE * 16 - 16;
|
||||||
|
length = maximum - random.nextInt(maximum / 4);
|
||||||
|
}
|
||||||
|
boolean singleNode = step == -1;
|
||||||
|
if (singleNode) step = length / 2;
|
||||||
|
int splitAt = random.nextInt(length / 2) + length / 4;
|
||||||
|
boolean slowPitch = random.nextInt(6) == 0;
|
||||||
|
float yawDrift = 0.0F;
|
||||||
|
float pitchDrift = 0.0F;
|
||||||
|
double middleX = chunk.getPos().getMinBlockX() + 8;
|
||||||
|
double middleZ = chunk.getPos().getMinBlockZ() + 8;
|
||||||
|
|
||||||
|
for (; step < length; step++) {
|
||||||
|
double horizontalRadius = 1.5D + Math.sin(step * Math.PI / length) * radius;
|
||||||
|
double verticalRadius = horizontalRadius * verticalScale;
|
||||||
|
float horizontalMotion = Mth.cos(pitch);
|
||||||
|
x += Mth.cos(yaw) * horizontalMotion;
|
||||||
|
y += Mth.sin(pitch);
|
||||||
|
z += Mth.sin(yaw) * horizontalMotion;
|
||||||
|
pitch *= slowPitch ? 0.92F : 0.7F;
|
||||||
|
pitch += pitchDrift * 0.1F;
|
||||||
|
yaw += yawDrift * 0.1F;
|
||||||
|
pitchDrift = pitchDrift * 0.9F
|
||||||
|
+ (random.nextFloat() - random.nextFloat()) * random.nextFloat() * 2.0F;
|
||||||
|
yawDrift = yawDrift * 0.75F
|
||||||
|
+ (random.nextFloat() - random.nextFloat()) * random.nextFloat() * 4.0F;
|
||||||
|
|
||||||
|
if (!singleNode && step == splitAt && radius > 1.0F) {
|
||||||
|
trace(chunk, material, random.nextLong(), x, y, z, random.nextFloat() * 0.5F + 0.5F,
|
||||||
|
yaw - Mth.HALF_PI, pitch / 3.0F, step, length, 1.0D);
|
||||||
|
trace(chunk, material, random.nextLong(), x, y, z, random.nextFloat() * 0.5F + 0.5F,
|
||||||
|
yaw + Mth.HALF_PI, pitch / 3.0F, step, length, 1.0D);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!singleNode && random.nextInt(4) == 0) continue;
|
||||||
|
double distanceX = x - middleX;
|
||||||
|
double distanceZ = z - middleZ;
|
||||||
|
double remaining = length - step;
|
||||||
|
double reach = radius + 18.0D;
|
||||||
|
if (distanceX * distanceX + distanceZ * distanceZ - remaining * remaining > reach * reach)
|
||||||
|
return;
|
||||||
|
if (x >= middleX - 16.0D - horizontalRadius * 2.0D
|
||||||
|
&& x <= middleX + 16.0D + horizontalRadius * 2.0D
|
||||||
|
&& z >= middleZ - 16.0D - horizontalRadius * 2.0D
|
||||||
|
&& z <= middleZ + 16.0D + horizontalRadius * 2.0D) {
|
||||||
|
fillNode(chunk, material, x, y, z, horizontalRadius, verticalRadius);
|
||||||
|
}
|
||||||
|
if (singleNode) break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void fillNode(ChunkAccess chunk, BlockState material, double centerX, double centerY,
|
||||||
|
double centerZ, double horizontalRadius, double verticalRadius) {
|
||||||
|
int originX = chunk.getPos().getMinBlockX();
|
||||||
|
int originZ = chunk.getPos().getMinBlockZ();
|
||||||
|
int minX = Math.max(0, Mth.floor(centerX - horizontalRadius) - originX - 1);
|
||||||
|
int maxX = Math.min(16, Mth.floor(centerX + horizontalRadius) - originX + 2);
|
||||||
|
int minZ = Math.max(0, Mth.floor(centerZ - horizontalRadius) - originZ - 1);
|
||||||
|
int maxZ = Math.min(16, Mth.floor(centerZ + horizontalRadius) - originZ + 2);
|
||||||
|
int minY = Math.max(chunk.getMinBuildHeight() + 1, Mth.floor(centerY - verticalRadius) - 1);
|
||||||
|
int maxY = Math.min(chunk.getMaxBuildHeight(), Mth.floor(centerY + verticalRadius) + 2);
|
||||||
|
Heightmap surface = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE_WG);
|
||||||
|
Heightmap floor = chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.OCEAN_FLOOR_WG);
|
||||||
|
BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
|
||||||
|
for (int worldY = minY; worldY < maxY; worldY++) {
|
||||||
|
double dy = (worldY + 0.5D - centerY) / verticalRadius;
|
||||||
|
if (dy <= -0.7D || dy * dy >= 1.0D) continue;
|
||||||
|
for (int localZ = minZ; localZ < maxZ; localZ++) {
|
||||||
|
double dz = (originZ + localZ + 0.5D - centerZ) / horizontalRadius;
|
||||||
|
for (int localX = minX; localX < maxX; localX++) {
|
||||||
|
double dx = (originX + localX + 0.5D - centerX) / horizontalRadius;
|
||||||
|
if (dx * dx + dy * dy + dz * dz >= 1.0D) continue;
|
||||||
|
pos.set(originX + localX, worldY, originZ + localZ);
|
||||||
|
if (chunk.getBlockState(pos).is(Blocks.BEDROCK)) continue;
|
||||||
|
chunk.setBlockState(pos, material, false);
|
||||||
|
surface.update(localX, worldY, localZ, material);
|
||||||
|
floor.update(localX, worldY, localZ, material);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,7 +2,6 @@ package net.dnorberg.rivencraft.writing;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
@@ -37,7 +36,6 @@ public final class WritingGrammar {
|
|||||||
if (writing.entries().isEmpty()) return new Result(symbols, diagnostics);
|
if (writing.entries().isEmpty()) return new Result(symbols, diagnostics);
|
||||||
|
|
||||||
EnumMap<Role, ParsedSymbol> singular = new EnumMap<>(Role.class);
|
EnumMap<Role, ParsedSymbol> singular = new EnumMap<>(Role.class);
|
||||||
Set<ResourceLocation> features = new HashSet<>();
|
|
||||||
int panels = 0;
|
int panels = 0;
|
||||||
int lastStage = -1;
|
int lastStage = -1;
|
||||||
int biomeCount = 0;
|
int biomeCount = 0;
|
||||||
@@ -71,15 +69,16 @@ public final class WritingGrammar {
|
|||||||
ParsedSymbol parsed = new ParsedSymbol(index, reference, semantics.orElseThrow());
|
ParsedSymbol parsed = new ParsedSymbol(index, reference, semantics.orElseThrow());
|
||||||
symbols.add(parsed);
|
symbols.add(parsed);
|
||||||
if (pendingBlock != null && role != Role.FEATURE) {
|
if (pendingBlock != null && role != Role.FEATURE) {
|
||||||
diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
// A material page without a following feature receives a seeded compatible
|
||||||
"Place this material page immediately before a compatible feature"));
|
// feature when the Age plan is compiled.
|
||||||
pendingBlock = null;
|
pendingBlock = null;
|
||||||
}
|
}
|
||||||
if (role == Role.BLOCK) {
|
if (role == Role.BLOCK) {
|
||||||
pendingBlock = parsed;
|
pendingBlock = parsed;
|
||||||
} else if (role == Role.FEATURE && pendingBlock != null) {
|
} else if (role == Role.FEATURE && pendingBlock != null) {
|
||||||
ResourceLocation feature = ((SymbolSemantics.ResourceValue) parsed.semantics().value()).id();
|
ResourceLocation feature = ((SymbolSemantics.ResourceValue) parsed.semantics().value()).id();
|
||||||
if (!Set.of("rocks", "surface_lakes", "deep_lakes", "lava_lakes")
|
if (!Set.of("rocks", "surface_lakes", "deep_lakes", "lava_lakes",
|
||||||
|
"floating_islands", "tendrils", "spheres", "spikes", "obelisks")
|
||||||
.contains(feature.getPath()) || !feature.getNamespace().equals("rivencraft")) {
|
.contains(feature.getPath()) || !feature.getNamespace().equals("rivencraft")) {
|
||||||
diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
||||||
"This feature cannot consume a material page"));
|
"This feature cannot consume a material page"));
|
||||||
@@ -102,10 +101,6 @@ public final class WritingGrammar {
|
|||||||
+ " already supplies that category"));
|
+ " already supplies that category"));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
} else if (role == Role.FEATURE && !features.add(reference.id())) {
|
|
||||||
diagnostics.add(new Diagnostic(Code.DUPLICATE, index,
|
|
||||||
"Remove the repeated feature page " + reference.id()));
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
if (role == Role.BIOME) biomeCount++;
|
if (role == Role.BIOME) biomeCount++;
|
||||||
int stage = stage(role);
|
int stage = stage(role);
|
||||||
@@ -116,8 +111,6 @@ public final class WritingGrammar {
|
|||||||
lastStage = stage;
|
lastStage = stage;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (pendingBlock != null) diagnostics.add(new Diagnostic(Code.MISPLACED_MODIFIER, pendingBlock.index(),
|
|
||||||
"Place this material page immediately before a compatible feature"));
|
|
||||||
if (panels == 0) diagnostics.add(new Diagnostic(Code.MISSING_PANEL, -1,
|
if (panels == 0) diagnostics.add(new Diagnostic(Code.MISSING_PANEL, -1,
|
||||||
"Add a Link Panel as the first page"));
|
"Add a Link Panel as the first page"));
|
||||||
if (symbols.isEmpty()) return new Result(symbols, diagnostics);
|
if (symbols.isEmpty()) return new Result(symbols, diagnostics);
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
{"variants":{"":{"model":"rivencraft:block/budding_crystal"}}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"variants":{"":{"model":"rivencraft:block/crystal_block"}}}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"facing=down,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 180
|
||||||
|
},
|
||||||
|
"facing=down,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 180
|
||||||
|
},
|
||||||
|
"facing=up,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster"
|
||||||
|
},
|
||||||
|
"facing=up,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster"
|
||||||
|
},
|
||||||
|
"facing=north,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 90
|
||||||
|
},
|
||||||
|
"facing=north,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 90
|
||||||
|
},
|
||||||
|
"facing=south,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 90,
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=south,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 90,
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=east,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 90,
|
||||||
|
"y": 90
|
||||||
|
},
|
||||||
|
"facing=east,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 90,
|
||||||
|
"y": 90
|
||||||
|
},
|
||||||
|
"facing=west,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 90,
|
||||||
|
"y": 270
|
||||||
|
},
|
||||||
|
"facing=west,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/crystal_cluster",
|
||||||
|
"x": 90,
|
||||||
|
"y": 270
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"facing=down,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 180
|
||||||
|
},
|
||||||
|
"facing=down,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 180
|
||||||
|
},
|
||||||
|
"facing=up,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud"
|
||||||
|
},
|
||||||
|
"facing=up,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud"
|
||||||
|
},
|
||||||
|
"facing=north,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 90
|
||||||
|
},
|
||||||
|
"facing=north,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 90
|
||||||
|
},
|
||||||
|
"facing=south,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=south,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=east,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 90
|
||||||
|
},
|
||||||
|
"facing=east,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 90
|
||||||
|
},
|
||||||
|
"facing=west,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 270
|
||||||
|
},
|
||||||
|
"facing=west,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/large_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 270
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"facing=down,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 180
|
||||||
|
},
|
||||||
|
"facing=down,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 180
|
||||||
|
},
|
||||||
|
"facing=up,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud"
|
||||||
|
},
|
||||||
|
"facing=up,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud"
|
||||||
|
},
|
||||||
|
"facing=north,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 90
|
||||||
|
},
|
||||||
|
"facing=north,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 90
|
||||||
|
},
|
||||||
|
"facing=south,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=south,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=east,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 90
|
||||||
|
},
|
||||||
|
"facing=east,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 90
|
||||||
|
},
|
||||||
|
"facing=west,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 270
|
||||||
|
},
|
||||||
|
"facing=west,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/medium_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 270
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"facing=down,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 180
|
||||||
|
},
|
||||||
|
"facing=down,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 180
|
||||||
|
},
|
||||||
|
"facing=up,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud"
|
||||||
|
},
|
||||||
|
"facing=up,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud"
|
||||||
|
},
|
||||||
|
"facing=north,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 90
|
||||||
|
},
|
||||||
|
"facing=north,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 90
|
||||||
|
},
|
||||||
|
"facing=south,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=south,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=east,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 90
|
||||||
|
},
|
||||||
|
"facing=east,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 90
|
||||||
|
},
|
||||||
|
"facing=west,waterlogged=false": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 270
|
||||||
|
},
|
||||||
|
"facing=west,waterlogged=true": {
|
||||||
|
"model": "rivencraft:block/small_crystal_bud",
|
||||||
|
"x": 90,
|
||||||
|
"y": 270
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -88,6 +88,7 @@
|
|||||||
"screen.rivencraft.book.unwritten": "This Descriptive Book is unwritten",
|
"screen.rivencraft.book.unwritten": "This Descriptive Book is unwritten",
|
||||||
"screen.rivencraft.age.title": "Age name",
|
"screen.rivencraft.age.title": "Age name",
|
||||||
"screen.rivencraft.age.title_hint": "Name this Age",
|
"screen.rivencraft.age.title_hint": "Name this Age",
|
||||||
|
"screen.rivencraft.age.unknown_author": "Unknown author",
|
||||||
"screen.rivencraft.age.name_prompt": "Name this Age before writing the Descriptive Book",
|
"screen.rivencraft.age.name_prompt": "Name this Age before writing the Descriptive Book",
|
||||||
"screen.rivencraft.age.create": "Create",
|
"screen.rivencraft.age.create": "Create",
|
||||||
"screen.rivencraft.age.generator": "Terrain: %s",
|
"screen.rivencraft.age.generator": "Terrain: %s",
|
||||||
@@ -227,7 +228,7 @@
|
|||||||
"symbol.rivencraft.phase.setting.description": "Set the celestial phase to setting.",
|
"symbol.rivencraft.phase.setting.description": "Set the celestial phase to setting.",
|
||||||
"symbol.rivencraft.feature.caves": "Caves",
|
"symbol.rivencraft.feature.caves": "Caves",
|
||||||
"symbol.rivencraft.feature.caves.description": "Add extra caves to the chosen noise terrain.",
|
"symbol.rivencraft.feature.caves.description": "Add extra caves to the chosen noise terrain.",
|
||||||
"symbol.rivencraft.block.generated.description": "Material modifier; place immediately before a compatible feature page.",
|
"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": "Flowers",
|
||||||
"symbol.rivencraft.feature.flowers.description": "Add vanilla flower patches to surface terrain.",
|
"symbol.rivencraft.feature.flowers.description": "Add vanilla flower patches to surface terrain.",
|
||||||
"symbol.rivencraft.feature.trees": "Trees",
|
"symbol.rivencraft.feature.trees": "Trees",
|
||||||
@@ -242,6 +243,59 @@
|
|||||||
"symbol.rivencraft.feature.deep_lakes.description": "Add underground lakes using a random fluid, or specify one with a fluid page.",
|
"symbol.rivencraft.feature.deep_lakes.description": "Add underground lakes using a random fluid, or specify one with a fluid page.",
|
||||||
"symbol.rivencraft.feature.ravines": "Ravines",
|
"symbol.rivencraft.feature.ravines": "Ravines",
|
||||||
"symbol.rivencraft.feature.ravines.description": "Add vanilla canyon carving to noise terrain.",
|
"symbol.rivencraft.feature.ravines.description": "Add vanilla canyon carving to noise terrain.",
|
||||||
|
"symbol.rivencraft.feature.floating_islands": "Floating Islands",
|
||||||
|
"symbol.rivencraft.feature.floating_islands.description": "Add high floating islands above the chosen surface terrain.",
|
||||||
|
"symbol.rivencraft.feature.tendrils": "Tendrils",
|
||||||
|
"symbol.rivencraft.feature.tendrils.description": "Add winding solid tendrils through the Age, using a random block or a preceding Block page.",
|
||||||
|
"symbol.rivencraft.feature.skylands": "Skylands",
|
||||||
|
"symbol.rivencraft.feature.skylands.description": "Remove terrain below a shifting sky cutoff; unlike Floating Islands, this does not add land.",
|
||||||
|
"symbol.rivencraft.feature.spheres": "Spheres",
|
||||||
|
"symbol.rivencraft.feature.spheres.description": "Add wandering chains of solid spheres through the Age, with a random or selected block material.",
|
||||||
|
"symbol.rivencraft.feature.spikes": "Spikes",
|
||||||
|
"symbol.rivencraft.feature.spikes.description": "Add rare rising spikes on exposed solid ground, with a random or selected block material.",
|
||||||
|
"symbol.rivencraft.feature.dungeons": "Dungeons",
|
||||||
|
"symbol.rivencraft.feature.dungeons.description": "Add monster-room dungeons below ground in this Age.",
|
||||||
|
"symbol.rivencraft.feature.mineshafts": "Mineshafts",
|
||||||
|
"symbol.rivencraft.feature.mineshafts.description": "Allow abandoned mineshafts in compatible terrain and biomes.",
|
||||||
|
"symbol.rivencraft.feature.nether_fortresses": "Nether Fortresses",
|
||||||
|
"symbol.rivencraft.feature.nether_fortresses.description": "Allow Nether fortresses in a Cave Age with a compatible Nether biome.",
|
||||||
|
"symbol.rivencraft.feature.strongholds": "Strongholds",
|
||||||
|
"symbol.rivencraft.feature.strongholds.description": "Allow strongholds with End portal rooms in a compatible Age.",
|
||||||
|
"symbol.rivencraft.feature.villages": "Villages",
|
||||||
|
"symbol.rivencraft.feature.villages.description": "Allow biome-appropriate villages on surface terrain.",
|
||||||
|
"symbol.rivencraft.feature.trial_chambers": "Trial Chambers",
|
||||||
|
"symbol.rivencraft.feature.trial_chambers.description": "Allow underground Trial Chambers in compatible Minecraft 1.21.1 biomes.",
|
||||||
|
"symbol.rivencraft.feature.bastions": "Bastion Remnants",
|
||||||
|
"symbol.rivencraft.feature.bastions.description": "Allow Bastion Remnants in a Cave Age with a compatible Nether biome.",
|
||||||
|
"symbol.rivencraft.feature.buried_treasure": "Buried Treasure",
|
||||||
|
"symbol.rivencraft.feature.buried_treasure.description": "Allow buried treasure beneath compatible beaches.",
|
||||||
|
"symbol.rivencraft.feature.shipwrecks": "Shipwrecks",
|
||||||
|
"symbol.rivencraft.feature.shipwrecks.description": "Allow shipwrecks in compatible ocean and beach biomes.",
|
||||||
|
"symbol.rivencraft.feature.ocean_ruins": "Ocean Ruins",
|
||||||
|
"symbol.rivencraft.feature.ocean_ruins.description": "Allow warm and cold ocean ruins in compatible biomes.",
|
||||||
|
"symbol.rivencraft.feature.pillager_outposts": "Pillager Outposts",
|
||||||
|
"symbol.rivencraft.feature.pillager_outposts.description": "Allow pillager outposts in compatible surface biomes.",
|
||||||
|
"symbol.rivencraft.feature.ruined_portals": "Ruined Portals",
|
||||||
|
"symbol.rivencraft.feature.ruined_portals.description": "Allow ruined portals in compatible surface or Nether biomes.",
|
||||||
|
"symbol.rivencraft.feature.nether_fossils": "Nether Fossils",
|
||||||
|
"symbol.rivencraft.feature.nether_fossils.description": "Allow Nether fossils in a Cave Age with a compatible Nether biome.",
|
||||||
|
"symbol.rivencraft.feature.ancient_cities": "Ancient Cities",
|
||||||
|
"symbol.rivencraft.feature.ancient_cities.description": "Allow ancient cities in compatible Deep Dark biomes.",
|
||||||
|
"symbol.rivencraft.feature.trail_ruins": "Trail Ruins",
|
||||||
|
"symbol.rivencraft.feature.trail_ruins.description": "Allow buried trail ruins in compatible surface biomes.",
|
||||||
|
"symbol.rivencraft.feature.dense_ores": "Dense Ores",
|
||||||
|
"symbol.rivencraft.feature.dense_ores.description": "Repeat compatible vanilla and modded ore placements once per page in this Age.",
|
||||||
|
"symbol.rivencraft.feature.obelisks": "Obelisks",
|
||||||
|
"symbol.rivencraft.feature.obelisks.description": "Add rare tall obelisks on exposed solid ground, with a random or selected block material.",
|
||||||
|
"symbol.rivencraft.feature.crystal_formations": "Crystal Formations",
|
||||||
|
"symbol.rivencraft.feature.crystal_formations.description": "Add blue crystal formations whose budding blocks grow harvestable clusters.",
|
||||||
|
"block.rivencraft.crystal_block": "Crystal Block",
|
||||||
|
"block.rivencraft.budding_crystal": "Budding Crystal",
|
||||||
|
"block.rivencraft.small_crystal_bud": "Small Crystal Bud",
|
||||||
|
"block.rivencraft.medium_crystal_bud": "Medium Crystal Bud",
|
||||||
|
"block.rivencraft.large_crystal_bud": "Large Crystal Bud",
|
||||||
|
"block.rivencraft.crystal_cluster": "Crystal Cluster",
|
||||||
|
"item.rivencraft.crystal_shard": "Crystal Shard",
|
||||||
"symbol.rivencraft.feature.lava_lakes": "Small Lakes",
|
"symbol.rivencraft.feature.lava_lakes": "Small Lakes",
|
||||||
"symbol.rivencraft.feature.lava_lakes.description": "Add small surface lakes using a random fluid, or specify one with a fluid page.",
|
"symbol.rivencraft.feature.lava_lakes.description": "Add small surface lakes using a random fluid, or specify one with a fluid page.",
|
||||||
"generator.rivencraft.standard": "Standard",
|
"generator.rivencraft.standard": "Standard",
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:block/cube_all","textures":{"all":"rivencraft:block/budding_crystal"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:block/cube_all","textures":{"all":"rivencraft:block/crystal_block"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:block/cross","render_type":"minecraft:cutout","textures":{"cross":"rivencraft:block/crystal_cluster"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:block/cross","render_type":"minecraft:cutout","textures":{"cross":"rivencraft:block/large_crystal_bud"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:block/cross","render_type":"minecraft:cutout","textures":{"cross":"rivencraft:block/medium_crystal_bud"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:block/cross","render_type":"minecraft:cutout","textures":{"cross":"rivencraft:block/small_crystal_bud"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"rivencraft:block/budding_crystal"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"rivencraft:block/crystal_block"}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:item/generated","textures":{"layer0":"rivencraft:block/crystal_cluster"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:item/generated","textures":{"layer0":"rivencraft:item/crystal_shard"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:item/generated","textures":{"layer0":"rivencraft:block/large_crystal_bud"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:item/generated","textures":{"layer0":"rivencraft:block/medium_crystal_bud"}}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"parent":"minecraft:item/generated","textures":{"layer0":"rivencraft:block/small_crystal_bud"}}
|
||||||
|
After Width: | Height: | Size: 791 B |
|
After Width: | Height: | Size: 791 B |
|
After Width: | Height: | Size: 612 B |
|
After Width: | Height: | Size: 533 B |
|
After Width: | Height: | Size: 447 B |
|
After Width: | Height: | Size: 408 B |
|
After Width: | Height: | Size: 509 B |
@@ -0,0 +1 @@
|
|||||||
|
{"replace":false,"values":["rivencraft:crystal_block","rivencraft:budding_crystal","rivencraft:small_crystal_bud","rivencraft:medium_crystal_bud","rivencraft:large_crystal_bud","rivencraft:crystal_cluster"]}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{"replace":false,"values":["rivencraft:crystal_block","rivencraft:budding_crystal","rivencraft:small_crystal_bud","rivencraft:medium_crystal_bud","rivencraft:large_crystal_bud","rivencraft:crystal_cluster"]}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:block",
|
||||||
|
"random_sequence": "rivencraft:blocks/budding_crystal"
|
||||||
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:block",
|
||||||
|
"pools": [
|
||||||
|
{
|
||||||
|
"bonus_rolls": 0.0,
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "minecraft:survives_explosion"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"entries": [
|
||||||
|
{
|
||||||
|
"type": "minecraft:item",
|
||||||
|
"name": "rivencraft:crystal_block"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rolls": 1.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"random_sequence": "rivencraft:blocks/crystal_block"
|
||||||
|
}
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:block",
|
||||||
|
"pools": [
|
||||||
|
{
|
||||||
|
"bonus_rolls": 0.0,
|
||||||
|
"entries": [
|
||||||
|
{
|
||||||
|
"type": "minecraft:alternatives",
|
||||||
|
"children": [
|
||||||
|
{
|
||||||
|
"type": "minecraft:item",
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "minecraft:match_tool",
|
||||||
|
"predicate": {
|
||||||
|
"predicates": {
|
||||||
|
"minecraft:enchantments": [
|
||||||
|
{
|
||||||
|
"enchantments": "minecraft:silk_touch",
|
||||||
|
"levels": {
|
||||||
|
"min": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"name": "rivencraft:crystal_cluster"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "minecraft:alternatives",
|
||||||
|
"children": [
|
||||||
|
{
|
||||||
|
"type": "minecraft:item",
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "minecraft:match_tool",
|
||||||
|
"predicate": {
|
||||||
|
"items": "#minecraft:cluster_max_harvestables"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"functions": [
|
||||||
|
{
|
||||||
|
"add": false,
|
||||||
|
"count": 4.0,
|
||||||
|
"function": "minecraft:set_count"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"enchantment": "minecraft:fortune",
|
||||||
|
"formula": "minecraft:ore_drops",
|
||||||
|
"function": "minecraft:apply_bonus"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"name": "rivencraft:crystal_shard"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "minecraft:item",
|
||||||
|
"functions": [
|
||||||
|
{
|
||||||
|
"add": false,
|
||||||
|
"count": 2.0,
|
||||||
|
"function": "minecraft:set_count"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"function": "minecraft:explosion_decay"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"name": "rivencraft:crystal_shard"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rolls": 1.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"random_sequence": "rivencraft:blocks/crystal_cluster"
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:block",
|
||||||
|
"pools": [
|
||||||
|
{
|
||||||
|
"bonus_rolls": 0.0,
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "minecraft:match_tool",
|
||||||
|
"predicate": {
|
||||||
|
"predicates": {
|
||||||
|
"minecraft:enchantments": [
|
||||||
|
{
|
||||||
|
"enchantments": "minecraft:silk_touch",
|
||||||
|
"levels": {
|
||||||
|
"min": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"entries": [
|
||||||
|
{
|
||||||
|
"type": "minecraft:item",
|
||||||
|
"name": "rivencraft:large_crystal_bud"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rolls": 1.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"random_sequence": "rivencraft:blocks/large_crystal_bud"
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:block",
|
||||||
|
"pools": [
|
||||||
|
{
|
||||||
|
"bonus_rolls": 0.0,
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "minecraft:match_tool",
|
||||||
|
"predicate": {
|
||||||
|
"predicates": {
|
||||||
|
"minecraft:enchantments": [
|
||||||
|
{
|
||||||
|
"enchantments": "minecraft:silk_touch",
|
||||||
|
"levels": {
|
||||||
|
"min": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"entries": [
|
||||||
|
{
|
||||||
|
"type": "minecraft:item",
|
||||||
|
"name": "rivencraft:medium_crystal_bud"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rolls": 1.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"random_sequence": "rivencraft:blocks/medium_crystal_bud"
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:block",
|
||||||
|
"pools": [
|
||||||
|
{
|
||||||
|
"bonus_rolls": 0.0,
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "minecraft:match_tool",
|
||||||
|
"predicate": {
|
||||||
|
"predicates": {
|
||||||
|
"minecraft:enchantments": [
|
||||||
|
{
|
||||||
|
"enchantments": "minecraft:silk_touch",
|
||||||
|
"levels": {
|
||||||
|
"min": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"entries": [
|
||||||
|
{
|
||||||
|
"type": "minecraft:item",
|
||||||
|
"name": "rivencraft:small_crystal_bud"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rolls": 1.0
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"random_sequence": "rivencraft:blocks/small_crystal_bud"
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"type": "minecraft:crafting_shaped",
|
||||||
|
"pattern": ["SS", "SS"],
|
||||||
|
"key": {"S": {"item": "rivencraft:crystal_shard"}},
|
||||||
|
"result": {"id": "rivencraft:crystal_block", "count": 1}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.ancient_cities",
|
||||||
|
"description": "symbol.rivencraft.feature.ancient_cities.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:ancient_cities" },
|
||||||
|
"poem": "Civilization Darkness Silence Ancient"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.bastions",
|
||||||
|
"description": "symbol.rivencraft.feature.bastions.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:bastions" },
|
||||||
|
"poem": "Civilization Ruin Greed Nether"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.buried_treasure",
|
||||||
|
"description": "symbol.rivencraft.feature.buried_treasure.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:buried_treasure" },
|
||||||
|
"poem": "Treasure Sand Ocean Memory"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.crystal_formations",
|
||||||
|
"description": "symbol.rivencraft.feature.crystal_formations.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:crystal_formations" },
|
||||||
|
"poem": "Crystal Formation Growth Blue"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.dense_ores",
|
||||||
|
"description": "symbol.rivencraft.feature.dense_ores.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:dense_ores" },
|
||||||
|
"poem": "Nature Material Treasure Abundance"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.dungeons",
|
||||||
|
"description": "symbol.rivencraft.feature.dungeons.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:dungeons" },
|
||||||
|
"poem": "Civilization Constraint Chain Resurrect"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.floating_islands",
|
||||||
|
"description": "symbol.rivencraft.feature.floating_islands.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:floating_islands" },
|
||||||
|
"poem": "Terrain Elevation Island Sky"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.mineshafts",
|
||||||
|
"description": "symbol.rivencraft.feature.mineshafts.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:mineshafts" },
|
||||||
|
"poem": "Civilization Machine Motion Tradition"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.nether_fortresses",
|
||||||
|
"description": "symbol.rivencraft.feature.nether_fortresses.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:nether_fortresses" },
|
||||||
|
"poem": "Civilization Machine Power Entropy"
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"schema_version": 2,
|
||||||
|
"name": "symbol.rivencraft.feature.nether_fossils",
|
||||||
|
"description": "symbol.rivencraft.feature.nether_fossils.description",
|
||||||
|
"category": "rivencraft:feature",
|
||||||
|
"semantics": { "role": "feature", "value": "rivencraft:nether_fossils" },
|
||||||
|
"poem": "Bone Death Nether Time"
|
||||||
|
}
|
||||||